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

src/main/java/com/uas/ps/product/controller/ProductGetController.java

@@ -12,6 +12,7 @@ import com.uas.ps.product.service.ProductService;
 import com.uas.ps.product.search.model.SPage;
 import com.uas.ps.product.search.service.SearchService;
 import com.uas.ps.product.service.ProductUsersService;
+import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Sort;
@@ -50,6 +51,8 @@ public class ProductGetController {
      */
     final String PRODUCT_TABLE_NAME = "v$product$private";
 
+    private static final Logger LOGGER = Logger.getLogger(ProductGetController.class);
+
     /**
      * 根据enUU和code查找企业物料
      * @param enUU  企业UU
@@ -71,6 +74,7 @@ public class ProductGetController {
     public List<Product> findByEnUUAndCodes(@RequestParam("enUU") Long enUU, @RequestParam("codes") String codes) throws UnsupportedEncodingException {
         codes = URLDecoder.decode(codes, "UTF-8");
         List<String> codeList = JSON.parseArray(codes, String.class);
+        LOGGER.info(codeList);
         return productService.findByEnUUAndCodes(enUU, codeList);
     }
 

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

@@ -23,4 +23,4 @@ datasource.connectionProperties=druid.stat.mergeSql=false;druid.stat.slowSqlMill
 url.b2c-url=http://192.168.253.12:23400/
 
 #search url
-url.search-url=http://10.10.100.191:8092
+url.search-url=http://192.168.253.6:8092

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

@@ -1,6 +1,6 @@
-datasource.url=jdbc:mysql://10.10.0.208:3306/mall_prod?characterEncoding=utf-8&useSSL=false
+datasource.url=jdbc:mysql://192.168.78.3:3306/mall_prod?characterEncoding=utf-8&useSSL=false
 datasource.username=sa
-datasource.password=Select123!#%*(
+datasource.password=select111***
 datasource.driverClassName=com.mysql.jdbc.Driver
 datasource.initialSize=1
 datasource.minIdle=1
@@ -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=http://192.168.78.7:3000
 
 #search url
-url.search-url=http://10.10.0.76:8081
+url.search-url=http://192.168.78.12:8080

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

@@ -0,0 +1,27 @@
+datasource.url=jdbc:mysql://192.168.100.3:3306/mall_test_dev?characterEncoding=utf-8&useSSL=false
+datasource.username=sa
+datasource.password=select111***
+datasource.driverClassName=com.mysql.jdbc.Driver
+datasource.initialSize=1
+datasource.minIdle=1
+datasource.maxActive=200
+datasource.maxWait=60000
+datasource.timeBetweenEvictionRunsMillis=60000
+datasource.minEvictableIdleTimeMillis=300000
+datasource.validationQuery=SELECT 1 FROM DUAL
+datasource.testWhileIdle=true
+datasource.testOnBorrow=true
+datasource.testOnReturn=false
+datasource.removeAbandoned=true
+datasource.removeAbandonedTimeout=1800
+datasource.logAbandoned=true
+datasource.poolPreparedStatements=true
+datasource.timeBetweenLogStatsMillis=60000
+datasource.maxPoolPreparedStatementPerConnectionSize=20
+datasource.filters=stat,slf4j
+datasource.connectionProperties=druid.stat.mergeSql=false;druid.stat.slowSqlMillis=5000
+
+url.b2c-url=http://192.168.100.5:8080
+
+#search url
+url.search-url=http://192.168.100.12:8080

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

@@ -24,4 +24,4 @@ datasource.connectionProperties=druid.stat.mergeSql=false;druid.stat.slowSqlMill
 url.b2c-url=http://218.17.158.219:9090/platform-b2c
 
 #search url
-url.search-url=http://10.10.100.191:8092
+url.search-url=http://192.168.253.6:8092