Merge branch 'GJYZJ_V1.0' of http://gitlab.archser.com/common/aserver

src/main/resources/config-pro.properties

-
-dbType=DM
-jdbcUrl=jdbc:dm://39.104.28.145:5236
-jdbc.driver=dm.jdbc.driver.DmDriver
-user=archser_yz
-password=archser_yz
-basic.url=http://39.104.28.145:11028
-
-devMode =true
-engineDevMode=true
-
-authUrl=http://125.77.26.133:7001/auth/token
-userInfoUrl=http://125.77.26.133:7001/api/info/user_info
-redirect_uri=http://192.168.31.17:8080/
-
-# --- 消息中心websocket配置 ---
-##  定时发送消息的周期   单位毫秒
-messageWsDelay=5000
-##  延期，第二次发送消息的延期时间，第一次发送在开始连接时就会发送 单位毫秒
-messageWsPeriod=5000
-## 消息发送成功后，等待客户端反馈时间，超出此时间表示连接已经断开，会关闭连接 单位毫秒
-messageWsTimeout=30000
-## 是否开启消息中心的websocket
-openMessageWebSocket=true
-
-MyIpAddress=127.0.0.1,39.104.28.145
+
+dbType=DM
+jdbcUrl=jdbc:dm://39.104.28.145:5236
+jdbc.driver=dm.jdbc.driver.DmDriver
+user=archser_yz
+password=archser_yz
+basic.url=http://39.104.28.145:11028
+
+devMode =true
+engineDevMode=true
+
+authUrl=http://125.77.26.133:7001/auth/token
+userInfoUrl=http://125.77.26.133:7001/api/info/user_info
+redirect_uri=http://192.168.31.17:8080/
+
+# --- 消息中心websocket配置 ---
+##  定时发送消息的周期   单位毫秒
+messageWsDelay=5000
+##  延期，第二次发送消息的延期时间，第一次发送在开始连接时就会发送 单位毫秒
+messageWsPeriod=5000
+## 消息发送成功后，等待客户端反馈时间，超出此时间表示连接已经断开，会关闭连接 单位毫秒
+messageWsTimeout=30000
+## 是否开启消息中心的websocket
+openMessageWebSocket=true
+
+MyIpAddress=127.0.0.1,39.104.28.145

src/main/resources/config.properties

-# ---\u5F00\u53D1\u73AF\u5883\u914D\u7F6E\u6587\u4EF6---
-
-#database config
-dbType=DM
-#jdbcUrl=jdbc:oracle:thin:@db.archser.com:1521:ychy
-#jdbc.driver=oracle.jdbc.driver.OracleDriver
-#user = archser_yz_test
-#password =archser_yz_test
-
-jdbcUrl=jdbc:dm://192.168.31.119:5236
-jdbc.driver=dm.jdbc.driver.DmDriver
-user=archser_yz
-password=archser_yz
-basic.url=http://192.168.31.119:11028
-
-devMode =true
-engineDevMode=true
-
-
-authUrl=http://125.77.26.133:7001/auth/token
-userInfoUrl=http://125.77.26.133:7001/api/info/user_info
-redirect_uri=http://192.168.31.17:8080/
-
-# --- \u6D88\u606F\u4E2D\u5FC3websocket\u914D\u7F6E ---
-##  \u5B9A\u65F6\u53D1\u9001\u6D88\u606F\u7684\u5468\u671F   \u5355\u4F4D\u6BEB\u79D2
-messageWsDelay=5000
-##  \u5EF6\u671F\uFF0C\u7B2C\u4E8C\u6B21\u53D1\u9001\u6D88\u606F\u7684\u5EF6\u671F\u65F6\u95F4\uFF0C\u7B2C\u4E00\u6B21\u53D1\u9001\u5728\u5F00\u59CB\u8FDE\u63A5\u65F6\u5C31\u4F1A\u53D1\u9001 \u5355\u4F4D\u6BEB\u79D2
-messageWsPeriod=5000
-## \u6D88\u606F\u53D1\u9001\u6210\u529F\u540E\uFF0C\u7B49\u5F85\u5BA2\u6237\u7AEF\u53CD\u9988\u65F6\u95F4\uFF0C\u8D85\u51FA\u6B64\u65F6\u95F4\u8868\u793A\u8FDE\u63A5\u5DF2\u7ECF\u65AD\u5F00\uFF0C\u4F1A\u5173\u95ED\u8FDE\u63A5 \u5355\u4F4D\u6BEB\u79D2
-messageWsTimeout=30000
-## \u662F\u5426\u5F00\u542F\u6D88\u606F\u4E2D\u5FC3\u7684websocket
-## 是否开启消息中心的websocket
-openMessageWebSocket=true
-
-MyIpAddress=127.0.0.1,192.168.31.192,192.168.31.119
-
-# -------############------------------
+# ---\u5F00\u53D1\u73AF\u5883\u914D\u7F6E\u6587\u4EF6---
+
+#database config
+dbType=DM
+#jdbcUrl=jdbc:oracle:thin:@db.archser.com:1521:ychy
+#jdbc.driver=oracle.jdbc.driver.OracleDriver
+#user = archser_yz_test
+#password =archser_yz_test
+
+jdbcUrl=jdbc:dm://192.168.31.119:5236
+jdbc.driver=dm.jdbc.driver.DmDriver
+user=archser_yz
+password=archser_yz
+basic.url=http://192.168.31.119:11028
+
+devMode =true
+engineDevMode=true
+
+
+authUrl=http://125.77.26.133:7001/auth/token
+userInfoUrl=http://125.77.26.133:7001/api/info/user_info
+redirect_uri=http://192.168.31.17:8080/
+
+# --- \u6D88\u606F\u4E2D\u5FC3websocket\u914D\u7F6E ---
+##  \u5B9A\u65F6\u53D1\u9001\u6D88\u606F\u7684\u5468\u671F   \u5355\u4F4D\u6BEB\u79D2
+messageWsDelay=5000
+##  \u5EF6\u671F\uFF0C\u7B2C\u4E8C\u6B21\u53D1\u9001\u6D88\u606F\u7684\u5EF6\u671F\u65F6\u95F4\uFF0C\u7B2C\u4E00\u6B21\u53D1\u9001\u5728\u5F00\u59CB\u8FDE\u63A5\u65F6\u5C31\u4F1A\u53D1\u9001 \u5355\u4F4D\u6BEB\u79D2
+messageWsPeriod=5000
+## \u6D88\u606F\u53D1\u9001\u6210\u529F\u540E\uFF0C\u7B49\u5F85\u5BA2\u6237\u7AEF\u53CD\u9988\u65F6\u95F4\uFF0C\u8D85\u51FA\u6B64\u65F6\u95F4\u8868\u793A\u8FDE\u63A5\u5DF2\u7ECF\u65AD\u5F00\uFF0C\u4F1A\u5173\u95ED\u8FDE\u63A5 \u5355\u4F4D\u6BEB\u79D2
+messageWsTimeout=30000
+## \u662F\u5426\u5F00\u542F\u6D88\u606F\u4E2D\u5FC3\u7684websocket
+## 是否开启消息中心的websocket
+openMessageWebSocket=true
+
+MyIpAddress=127.0.0.1,192.168.31.192,192.168.31.119
+
+# -------############------------------