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

src/main/java/com/uas/ps/inquiry/service/impl/PublicInquiryServiceImpl.java

@@ -1513,7 +1513,6 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
             String cmpCode = item.getCmpCode();
             String cmp = cmpCode.length() > 10 ? cmpCode.substring(0, 10).concat("...") : cmpCode;
             String content = "您收到了" + item.getVendName() + "关于“型号：" + cmp + "“的报价，马上去看一看吧！";
-
             MessageModel model = new MessageModel();
             model.setType(INQUIRY_TYPE_MALL);
             model.setProducerApp(sourceApp);

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

@@ -3,12 +3,12 @@ datasource.username=sa
 datasource.password=Select123!#%*(
 datasource.driverClassName=com.mysql.jdbc.Driver
 datasource.initialSize=1
-datasource.minIdle=1
+datasource.minIdle=30
 datasource.maxActive=100
-datasource.maxWait=60000
+datasource.maxWait=5000
 datasource.timeBetweenEvictionRunsMillis=60000
 datasource.minEvictableIdleTimeMillis=300000
-datasource.validationQuery=SELECT 1 FROM DUAL
+datasource.validationQuery=SELECT 1
 datasource.testWhileIdle=true
 datasource.testOnBorrow=true
 datasource.testOnReturn=false

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

@@ -3,12 +3,12 @@ datasource.username=root
 datasource.password=select111***
 datasource.driverClassName=com.mysql.jdbc.Driver
 datasource.initialSize=1
-datasource.minIdle=1
-datasource.maxActive=20
-datasource.maxWait=60000
+datasource.minIdle=30
+datasource.maxActive=100
+datasource.maxWait=5000
 datasource.timeBetweenEvictionRunsMillis=60000
 datasource.minEvictableIdleTimeMillis=300000
-datasource.validationQuery=SELECT 1 FROM DUAL
+datasource.validationQuery=SELECT 1
 datasource.testWhileIdle=true
 datasource.testOnBorrow=true
 datasource.testOnReturn=false
@@ -17,7 +17,6 @@ datasource.timeBetweenLogStatsMillis=60000
 datasource.maxPoolPreparedStatementPerConnectionSize=20
 datasource.filters=stat,slf4j
 datasource.connectionProperties=druid.stat.mergeSql=false;druid.stat.slowSqlMillis=5000
-
 # Access path
 #ps.product.url=http://192.168.253.12:24000/
 #dong localhost