配置文件修改

kmall-admin/src/main/resources/conf/cuspay/cuspay-wx.properties

@@ -5,28 +5,40 @@
 wx.payment.declare.url=https://api.mch.weixin.qq.com/cgi-bin/mch/customs/customdeclareorder
 wx.payment.query.url=https://api.mch.weixin.qq.com/cgi-bin/mch/customs/customdeclarequery
 
-# \u5546\u6237\u4FE1\u606F
+# \u6D77\u63A7\u5546\u6237\u4FE1\u606F   \u751F\u4EA7\u914D\u7F6E
 # \u5E73\u53F0\u7F16\u53F7
-merchant.plat-sn=44048600Y8
-# \u5E73\u53F0\u4E2D\u6587\u540D
-merchant.plat-name=\u73E0\u6D77\u6D77\u63A7\u79D1\u6280\u6709\u9650\u516C\u53F8
-# \u5546\u6237\u6D77\u5173\u5907\u6848\u7F16\u53F7
-merchant.customs-code=44048600Y8
-# \u5546\u6237\u6D77\u5173\u5907\u6848\u540D\u79F0
-merchant.customs-name=\u73E0\u6D77\u6D77\u63A7\u79D1\u6280\u6709\u9650\u516C\u53F8
+#merchant.plat-sn=44048600Y8
+## \u5E73\u53F0\u4E2D\u6587\u540D
+#merchant.plat-name=\u73E0\u6D77\u6D77\u63A7\u79D1\u6280\u6709\u9650\u516C\u53F8
+## \u5546\u6237\u6D77\u5173\u5907\u6848\u7F16\u53F7
+#merchant.customs-code=44048600Y8
+## \u5546\u6237\u6D77\u5173\u5907\u6848\u540D\u79F0
+#merchant.customs-name=\u73E0\u6D77\u6D77\u63A7\u79D1\u6280\u6709\u9650\u516C\u53F8
+## appid
+#cus.play.wx.app-id=wxd3e627dd62d6ff32
+## \u5FAE\u4FE1\u652F\u4ED8\u5546\u6237\u53F7
+#cus.play.wx.mch-id=1574349031
+## \u6D77\u5173\uFF0C\u5E7F\u5DDE\uFF08\u603B\u7F72\uFF09
+#cus.play.wx.customs=GUANGZHOU_ZS
 
 
 # \u5B9A\u65F6\u5668\u62A5\u5173\u4E00\u6B21\u533A\u7684\u6570\u636E
 db.wx.declare.limit=20
 db.wx.declare.count=2
 
-# ccnet\u9ED8\u8BA4\u914D\u7F6E\u6587\u4EF6\u7684\u503C
+
+
+# \u4E2D\u7F51\u751F\u4EA7
 # \u4E2D\u7F51\u5FAE\u4FE1\u516C\u4F17ID
-cus.play.wx.app-id=wxd3e627dd62d6ff32
+cus.play.wx.app-id=wxb6b30b1b14ee502a
 # \u5FAE\u4FE1\u652F\u4ED8\u5546\u6237\u53F7
-cus.play.wx.mch-id=1574349031
-# \u6D77\u5173\uFF0C\u5E7F\u5DDE\uFF08\u603B\u7F72\u7248\uFF09
-cus.play.wx.customs=GUANGZHOU_ZS
+cus.play.wx.mch-id=1501125641
+# \u6D77\u5173\uFF0C\u6DF1\u5733
+cus.play.wx.customs=SHENZHEN
+merchant.plat-sn=146001
+merchant.customs-code=4403160Z3Y
+merchant.plat-name=\u4E2D\u7F51\u5546\u57CE
+merchant.customs-name=\u4E2D\u7F51\u79D1\u6280\uFF08\u6DF1\u5733\uFF09\u6709\u9650\u516C\u53F8
 
 # ccnet dev\u914D\u7F6E\u6587\u4EF6\u7684\u503C
 #cus.play.wx.app-id=wx24013b34e349db3c

kmall-admin/src/main/resources/conf/fastdfs.properties

@@ -33,6 +33,44 @@
 #file.author=kmall-pt
 
 #
+##############\u6D4B\u8BD5\u73AF\u5883################
+##\u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4
+connect_timeout=30
+#
+##\u7F51\u7EDC\u8D85\u65F6\u65F6\u95F4
+network_timeout=60
+
+#\u6587\u4EF6\u8DEF\u5F84
+base_path=/data/files/
+
+#tracker server\u662FFastDFS\u6587\u4EF6\u7CFB\u7EDF\u7684\u534F\u8C03\u8005,\u5176\u4E3B\u8981\u4F5C\u7528\u662F\u8D1F\u8F7D\u5747\u8861\u548C\u8C03\u5EA6\u3002
+#Tracker server\u5728\u5185\u5B58\u4E2D\u8BB0\u5F55\u5206\u7EC4\u548CStorage server\u7684\u72B6\u6001\u7B49\u4FE1\u606F\uFF0C\u4E0D\u8BB0\u5F55\u6587\u4EF6\u7D22\u5F15\u4FE1\u606F
+tracker_server=120.76.26.84:22122
+
+log_level=info
+
+use_connection_pool = false
+
+connection_pool_max_idle_time = 3600
+
+load_fdfs_parameters_from_tracker=false
+
+use_storage_id = false
+
+storage_ids_filename = storage_ids.conf
+
+#HTTP \u670D\u52A1\u5668\u5730\u5740
+http.tracket_nginx_addr=120.76.26.84
+
+#HTTP \u670D\u52A1\u5668\u7AEF\u53E3\u53F7
+http.tracker_server_port=80
+
+#\u6587\u4EF6\u4F5C\u8005
+file.author=kmall-pt
+
+
+
+
 ##############\u751F\u4EA7\u73AF\u5883################
 ##\u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4
 #connect_timeout=30
@@ -41,67 +79,29 @@
 #network_timeout=60
 #
 ##\u6587\u4EF6\u8DEF\u5F84
-#base_path=/data/files/
+#base_path=/home/logs/fastdfs
 #
 ##tracker server\u662FFastDFS\u6587\u4EF6\u7CFB\u7EDF\u7684\u534F\u8C03\u8005,\u5176\u4E3B\u8981\u4F5C\u7528\u662F\u8D1F\u8F7D\u5747\u8861\u548C\u8C03\u5EA6\u3002
 ##Tracker server\u5728\u5185\u5B58\u4E2D\u8BB0\u5F55\u5206\u7EC4\u548CStorage server\u7684\u72B6\u6001\u7B49\u4FE1\u606F\uFF0C\u4E0D\u8BB0\u5F55\u6587\u4EF6\u7D22\u5F15\u4FE1\u606F
-#tracker_server=120.76.26.84:22122
+#tracker_server=172.18.246.243:22122
 #
 #log_level=info
 #
-#use_connection_pool = false
+#use_connection_pool=false
 #
-#connection_pool_max_idle_time = 3600
+#connection_pool_max_idle_time=3600
 #
 #load_fdfs_parameters_from_tracker=false
 #
-#use_storage_id = false
+#use_storage_id=false
 #
-#storage_ids_filename = storage_ids.conf
+#storage_ids_filename=storage_ids.conf
 #
 ##HTTP \u670D\u52A1\u5668\u5730\u5740
-#http.tracket_nginx_addr=120.76.26.84
+#http.tracket_nginx_addr=172.18.246.243
 #
 ##HTTP \u670D\u52A1\u5668\u7AEF\u53E3\u53F7
 #http.tracker_server_port=80
 #
 ##\u6587\u4EF6\u4F5C\u8005
-#file.author=kmall-pt
-
-
-
-
-##############\u9884\u53D1\u5E03\u73AF\u5883################
-##\u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4
-connect_timeout=30
-#
-##\u7F51\u7EDC\u8D85\u65F6\u65F6\u95F4
-network_timeout=60
-
-#\u6587\u4EF6\u8DEF\u5F84
-base_path=/home/logs/
-
-#tracker server\u662FFastDFS\u6587\u4EF6\u7CFB\u7EDF\u7684\u534F\u8C03\u8005,\u5176\u4E3B\u8981\u4F5C\u7528\u662F\u8D1F\u8F7D\u5747\u8861\u548C\u8C03\u5EA6\u3002
-#Tracker server\u5728\u5185\u5B58\u4E2D\u8BB0\u5F55\u5206\u7EC4\u548CStorage server\u7684\u72B6\u6001\u7B49\u4FE1\u606F\uFF0C\u4E0D\u8BB0\u5F55\u6587\u4EF6\u7D22\u5F15\u4FE1\u606F
-tracker_server=14.29.226.8:22122
-
-log_level=info
-
-use_connection_pool=false
-
-connection_pool_max_idle_time=3600
-
-load_fdfs_parameters_from_tracker=false
-
-use_storage_id=false
-
-storage_ids_filename=storage_ids.conf
-
-#HTTP \u670D\u52A1\u5668\u5730\u5740
-http.tracket_nginx_addr=14.29.226.8
-
-#HTTP \u670D\u52A1\u5668\u7AEF\u53E3\u53F7
-http.tracker_server_port=88
-
-#\u6587\u4EF6\u4F5C\u8005
-file.author=kmall-haikong
+#file.author=kmall-haikong

kmall-admin/src/main/resources/logback.xml

@@ -6,7 +6,8 @@ debug：当此属性设置为true时，将打印出logback内部日志信息，
 -->
 <configuration scan="false" scanPeriod="60 seconds" debug="false">
 
-    <property name="LOG_HOME" value="/data/project/logs/kmall-haikong/kmall-admin/"/>
+<!--    <property name="LOG_HOME" value="/data/project/logs/kmall-haikong/kmall-admin/"/>-->
+    <property name="LOG_HOME" value="/app/project/logs/kmall-haikong/kmall-admin/"/>
     <!-- 定义日志的根目录 -->
     <property name="TRACE_DIR" value="trace" />
     <property name="DEBUG_DIR" value="debug" />

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

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

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

@@ -1,6 +1,6 @@
 ########## \u6570\u636E\u5E93\u914D\u7F6E ##########
 # \u73AF\u5883\u914D\u7F6E\uFF1A[dev, prod, pre, test]
-jdbc.env=dev
+jdbc.env=test
 ####========== \u6D4B\u8BD5\u73AF\u5883 ==========
 jdbc.test.url=jdbc:mysql://14.29.226.8:3306/kmall-haikong?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
 jdbc.test.username=root
@@ -10,14 +10,13 @@ jdbc.dev.url=jdbc:mysql://192.168.1.202:3306/kmall-haikong?allowMultiQueries=tru
 jdbc.dev.username=root
 jdbc.dev.password=t2GlpD6z
 ####========== \u751F\u4EA7\u73AF\u5883 ==========
-# \u5F85\u5B9A
-jdbc.prod.url=jdbc:mysql://:3306/kmall-haikong?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-jdbc.prod.username=kmall_cw
-jdbc.prod.password=eb6zHJg%x3
+jdbc.prod.url=jdbc:mysql://rm-wz942te7t69x262100o.mysql.rds.aliyuncs.com:3306/kmall-haikong?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+jdbc.prod.username=zhdf
+jdbc.prod.password=Greereal@600185
 # \u9884\u53D1\u5E03\u5E93
-jdbc.pre.url=jdbc:mysql://120.76.84.45:3306/kmall-haikong?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+jdbc.pre.url=jdbc:mysql://127.0.0.1:3306/kmall_haikong?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
 jdbc.pre.username=root
-jdbc.pre.password=Qq123!..
+jdbc.pre.password=G$Debpk^pn
 
 
 # \u901A\u7528\u914D\u7F6E

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

@@ -31,7 +31,7 @@ haikong.test.vmcconnect.secretKey=GXfc6ZtDlnxHxmmAHvfRfqvrqgfwRiJX
 haikong.test.vmcconnect.requestRetry=2
 
 #### \u514D\u7A0Emall\u751F\u4EA7\u73AF\u5883
-haikong.prod.vmcconnect.url=https://mall.greedc.com/openapi/vmcconnect/json
+haikong.prod.vmcconnect.url=https://testmall.greedc.com/openapi/vmcconnect/json
 haikong.prod.vmcconnect.appId=5
 haikong.prod.vmcconnect.secretKey=GXfc6ZtDlnxHxmmAHvfRfqvrqgfwRiJX
 haikong.prod.vmcconnect.requestRetry=2

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

@@ -1,17 +1,19 @@
 ########## redis \u914D\u7F6E ##########1
 
-# [dev, prod]
+# [dev, test, prod]
 redis.env=dev
 
 # \u5F00\u53D1\u73AF\u5883
 redis.dev.keyPrefix=platform
 # \u6D4B\u8BD5redis\uFF0C\u6709\u5BC6\u7801
-#redis.dev.host=183.62.225.124
+redis.dev.host=183.62.225.124
 # \u9884\u53D1\u5E03\u73AF\u5883
-redis.dev.host=14.29.226.8
+#redis.dev.host=14.29.226.8
 #redis.dev.host=127.0.0.1
 redis.dev.port=6379
-redis.dev.password=fdsjk337sdb
+#redis.dev.password=fdsjk337sdb
+# \u6D4B\u8BD5\u73AF\u5883\u5BC6\u7801
+redis.dev.password=Abc-123#*.-
 redis.dev.pool.maxIdle=200
 redis.dev.pool.maxWait=1000
 redis.dev.pool.maxTotal=10000
@@ -29,9 +31,9 @@ redis.dev.pool.testOnBorrow=true
 
 # \u751F\u4EA7\u73AF\u5883
 redis.prod.keyPrefix=platform
-redis.prod.host=120.78.152.8
+redis.prod.host=127.0.0.1
 redis.prod.port=6379
-redis.prod.password=Abc-123#*.-
+redis.prod.password=e415MBsvV7
 redis.prod.pool.maxIdle=200
 redis.prod.pool.maxWait=1000
 redis.prod.pool.maxTotal=10000

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

@@ -1,10 +1,10 @@
-########## \u5FAE\u4FE1\u5C0F\u7A0B\u5E8F\u914D\u7F6E ##########
+########## \u5FAE\u4FE1\u5C0F\u7A0B\u5E8F\u652F\u4ED8\u914D\u7F6E ##########
 
 # [dev, prod]
 pay.wx.env=dev
 
 
-#========== \u5F00\u53D1\u73AF\u5883 ==========
+#========== \u5F00\u53D1\u73AF\u5883 \u4E2D\u7F51\u7684\u914D\u7F6E ==========
 #\u5C0F\u7A0B\u5E8FID
 wx.dev.appId=wxb6b30b1b14ee502a
 #\u5C0F\u7A0B\u5E8F\u5BC6\u94A5
@@ -48,20 +48,20 @@ wx.dev.templateSendUrl=https://api.weixin.qq.com/cgi-bin/message/subscribe/send?
 
 
 
-#========== \u751F\u4EA7\u73AF\u5883 ==========
+#========== \u751F\u4EA7\u73AF\u5883 \u6D77\u63A7\u7684\u914D\u7F6E ==========
 
 #\u5C0F\u7A0B\u5E8FID
-wx.prod.appId=wxb6b30b1b14ee502a
+wx.prod.appId=wxd3e627dd62d6ff32
 #\u5C0F\u7A0B\u5E8F\u5BC6\u94A5
-wx.prod.secret=be0234dbbbde4ce68df43dd2b5e4c7b1
+wx.prod.secret=hkkjkjweixinzhifupassword2020017
 #\u5546\u6237\u53F7
-wx.prod.mchId=1501125641
+wx.prod.mchId=1574349031
 #\u652F\u4ED8\u7B7E\u540D
-wx.prod.paySignKey=Zx1245uytDLliom12345622222222222
+wx.prod.paySignKey=Zx1245uytDLliom123456248798416846
 #\u4EA4\u6613\u7C7B\u578B
 wx.prod.tradeType=JSAPI
 #\u8BC1\u4E66\u540D\u79F0\uFF0C\u5BF9\u5E94\u4E0D\u540C\u7684\u5546\u6237\u53F7
-wx.prod.certName=/app/project/kmall_pt/cert/apiclient_cert.p12
+wx.prod.certName=/app/project/kmall_haikong/cert/apiclient_cert.p12
 #\u652F\u4ED8\u56DE\u8C03\u5730\u5740
 wx.prod.notifyUrl=https://mp.k1net.cn/api/pay/notify
 #\u83B7\u53D6code\u7684\u8BF7\u6C42\u5730\u5740