正式环境最新配置更新

kmall-admin/src/main/webapp/js/sale/sale.js

@@ -1303,9 +1303,9 @@ function openWebSocket() {
         //kmall测试环境
         // webSocket = new WebSocket("ws://183.62.225.124:8080/ws/server/"+storeId);
         //kmall正式环境
-        // webSocket = new WebSocket("ws://8.135.102.238:8080/ws/server/"+storeId);
+        webSocket = new WebSocket("ws://8.135.102.238:8080/ws/server/"+storeId);
         //kmall本地环境
-        webSocket = new WebSocket("ws://127.0.0.1:50/ws/server/"+163);
+        // webSocket = new WebSocket("ws://127.0.0.1:50/ws/server/"+163);
         // webSocket = new WebSocket("wss://cb.k1net.cn/ws/server/"+storeId);
         if (webSocket.readyState === webSocket.CONNECTING) {
             console.log('1.连接正在打开......');

kmall-manager/src/main/resources/conf/cus.properties

@@ -1,7 +1,7 @@
 ########## \u6D77\u5173 \u914D\u7F6E ##########
 
 # [dev, prod]
-cus.env = dev
+cus.env = prod
 
 # \u5F00\u53D1\u73AF\u5883
 # \u4F01\u4E1A\u8FD4\u56DE\u6D77\u5173\u5B9E\u65F6\u6570\u636E\u63A5\u53E3\u5730\u5740

kmall-manager/src/main/resources/conf/oms-merch.properties

@@ -29,7 +29,7 @@ merch.wxOrderResendUrl=http://8.135.102.238:8680/wx/wxOrderResendQueryAll
 #merch.pdProductImgInsertOrUpdateUrl=http://127.0.0.1:8181/pdProductImg/insertOrUpdateSkuImg
 
 
-###oms\u751F\u4EA7\u73AF\u5883\u5BC6\u94A5
+##oms\u751F\u4EA7\u73AF\u5883\u5BC6\u94A5
 merch.md5Salt=IxyIvP0sJqlUZinx
 ##oms\u751F\u4EA7\u73AF\u5883\u6D3B\u4F53\u4EBA\u8138\u6838\u8EAB\u63A5\u53E3
 merch.livenessRecognitionUrl=http://ws.ds-bay.com/al/faceid/livenessRecognition
@@ -39,6 +39,8 @@ merch.quotaInquiryUrl=http://ws.ds-bay.com/al/cus/yearLimit
 merch.addPdProductListUrl=http://ws.ds-bay.com/al/product/addPdProductList
 #\u4EA7\u54C1\u5907\u6848\u56FE\u7247\u66F4\u65B0\u63A5\u53E3
 merch.pdProductImgInsertOrUpdateUrl=http://ws.ds-bay.com/oms-controller-mgt/pdProductImg/insertOrUpdateSkuImg
+#\u4EA7\u54C1\u5907\u6848\u4FE1\u606F\u62C9\u53D6
+merch.pdProductInfoPull=http://ws.ds-bay.com/oms-controller-mgt/
 
 
 
@@ -49,7 +51,10 @@ merch.pdProductImgInsertOrUpdateUrl=http://ws.ds-bay.com/oms-controller-mgt/pdPr
 #merch.livenessRecognitionUrl=http://183.3.221.143:8680/al/faceid/livenessRecognition
 ##oms\u6D4B\u8BD5\u73AF\u5883\u8DE8\u5883\u989D\u5EA6\u67E5\u8BE2\u63A5\u53E3
 #merch.quotaInquiryUrl=http://183.3.221.143:8680/al/cus/yearLimit
-#\u7533\u8BF7\u4EA7\u54C1\u5907\u6848\u63A5\u53E3
+## \u7533\u8BF7\u4EA7\u54C1\u5907\u6848\u63A5\u53E3
 #merch.addPdProductListUrl=http://183.3.221.143:8680/al/product/addPdProductList
-#\u4EA7\u54C1\u5907\u6848\u56FE\u7247\u66F4\u65B0\u63A5\u53E3
+## \u4EA7\u54C1\u5907\u6848\u56FE\u7247\u66F4\u65B0\u63A5\u53E3
 #merch.pdProductImgInsertOrUpdateUrl=http://183.3.221.143:8080/oms-controller-mgt/pdProductImg/insertOrUpdateSkuImg
+#
+## \u4EA7\u54C1\u5907\u6848\u4FE1\u606F\u62C9\u53D6
+#merch.pdProductPull=http://183.3.221.143:8080/oms-controller-mgt/pdProductImg/insertOrUpdateSkuImg

kmall-manager/src/main/resources/conf/pingan-pay.properties

@@ -1,7 +1,7 @@
 ########## \u5E73\u5B89\u652F\u4ED8\u914D\u7F6E ##########
 
 # [dev, prod]
-pay.pingan.env = dev
+pay.pingan.env = prod
 
 
 #========== \u5F00\u53D1\u73AF\u5883 ==========

kmall-manager/src/main/resources/conf/redis.properties

@@ -26,6 +26,7 @@ redis.dev.pool.testOnBorrow=true
 redis.prod.keyPrefix=platform
 redis.prod.host=127.0.0.1
 redis.prod.port=6379
+redis.prod.password=
 redis.prod.pool.maxIdle=200
 redis.prod.pool.maxWait=1000
 redis.prod.pool.maxTotal=10000

kmall-manager/src/main/resources/conf/wx-global.properties

@@ -1,7 +1,7 @@
 ########## \u5FAE\u4FE1\u5C0F\u7A0B\u5E8F\u914D\u7F6E ##########
 
 # [dev, prod]
-pay.wx.global.env = dev
+pay.wx.global.env = prod
 
 
 #========== \u5F00\u53D1\u73AF\u5883 ==========