Merge remote-tracking branch 'origin/dev' into dev

sso-server/src/main/resources/config/application-prod.properties

@@ -1,4 +1,4 @@
-datasource.url=jdbc:mysql://10.10.100.18:3306/sso?characterEncoding=utf-8
+datasource.url=jdbc:mysql://192.168.253.6:3306/sso?characterEncoding=utf-8
 datasource.username=root
 datasource.password=select111***
 datasource.driverClassName=com.mysql.jdbc.Driver

sso-server/src/main/resources/dev/account.properties

@@ -2,7 +2,7 @@
 sso.app=sso
 # token secretkey
 sso.secretkey=0taQcW073Z7G628g5H
-sso.cookie.domain=ubtob.com
+#sso.cookie.domain=ubtob.com
 sso.cookie.secure=false
 sso.login.url=http://192.168.253.12:32323/
 #sso.proxy.uri=http://192.168.253.118:3001/