Merge branch 'dev_v1.2.10' into release_v1.2.10

merge

themis-admin/src/main/resources/application.properties

@@ -19,11 +19,11 @@ server.tomcat.uri-encoding=UTF-8
 spring.application.name=themis-admin
 
 #\u6570\u636E\u6E90\u914D\u7F6E
-db.host=localhost
-db.port=3306
-db.name=themis_release
-db.username=root
-db.password=123456789
+db.host=192.168.10.136
+db.port=3307
+db.name=themis_release_v1.1
+db.username=online
+db.password=online
 
 #redis\u6570\u636E\u6E90\u914D\u7F6E
 #com.qmth.redis.host=${db.host}
@@ -124,8 +124,8 @@ rocketmq.producer.enable-msg-trace=true
 #com.qmth.solar.access-key=0de21ea8c3f041819af866a160f38b12
 #com.qmth.solar.access-secret=Ly3AxTF2Mbek8vcTmZiKa8zDDKUej4n2
 #\u6D4B\u8BD5\u73AF\u5883
-com.qmth.solar.access-key=0de21ea8c3f041819af866a160f38b12
-com.qmth.solar.access-secret=Ly3AxTF2Mbek8vcTmZiKa8zDDKUej4n2
+com.qmth.solar.access-key=8134f6aae0134770b8618913705d3667
+com.qmth.solar.access-secret=ktrMEVE7PfoxRPeJUPDFeygOIH4aU7
 #com.qmth.solar.license=/Volumes/extend/\u542F\u660E/\u77E5\u5B66\u77E5\u8003/\u897F\u4EA4\u5927\u6FC0\u6D3B\u6587\u4EF6/tc-xjtu.lic
 
 #\u65E0\u9700\u9274\u6743\u7684url

themis-task/src/main/resources/application.properties

@@ -11,11 +11,11 @@ server.tomcat.uri-encoding=UTF-8
 spring.application.name=themis-task
 
 #\u6570\u636E\u6E90\u914D\u7F6E
-db.host=localhost
-db.port=3306
-db.name=themis_release
-db.username=root
-db.password=123456789
+db.host=192.168.10.136
+db.port=3307
+db.name=themis_release_v1.1
+db.username=online
+db.password=online
 
 #redis\u6570\u636E\u6E90\u914D\u7F6E
 #com.qmth.redis.host=${db.host}