Merge branch 'dev'

# Conflicts:
#	src/main/resources/config/application-dev.properties

src/main/resources/config/application-dev.properties

@@ -4,7 +4,7 @@ datasource.password=select111***
 datasource.driverClassName=com.mysql.jdbc.Driver
 datasource.initialSize=1
 datasource.minIdle=1
-datasource.maxActive=500
+datasource.maxActive=100
 datasource.maxWait=60000
 datasource.timeBetweenEvictionRunsMillis=60000
 datasource.minEvictableIdleTimeMillis=300000

src/main/resources/config/application-txcloud.properties

@@ -21,7 +21,7 @@ datasource.maxPoolPreparedStatementPerConnectionSize=20
 datasource.filters=stat,slf4j
 datasource.connectionProperties=druid.stat.mergeSql=false;druid.stat.slowSqlMillis=5000
 
-url.b2c-url=https://www.usoftmall.com
+url.b2c-url=https://mall.usoftchina.com
 
 #search url
 url.search-url=http://172.16.0.34:8081