Merge remote-tracking branch 'origin/master'

doum

20 小时以前 a76e2318dd2731ff713df6e262396a9175d029f7

 server/pom.xml

@@ -284,6 +284,7 @@
      <version>1.15.3</version>
    </dependency>


    <!--<dependency>
      <groupId>com.aliyun.openservices</groupId>
      <artifactId>ons-client</artifactId>