Ver código fonte

配置修改

lhm 3 anos atrás
pai
commit
0d0030f908

+ 47 - 9
kmall-admin/src/main/resources/conf/fastdfs.properties

@@ -35,35 +35,73 @@
 #
 ##############\u751F\u4EA7\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
+
+
+
+
+##############\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=/data/files/
+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=120.76.26.84:22122
+tracker_server=14.29.226.8: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=14.29.226.8
 
 #HTTP \u670D\u52A1\u5668\u7AEF\u53E3\u53F7
-http.tracker_server_port=80
+http.tracker_server_port=88
 
 #\u6587\u4EF6\u4F5C\u8005
-file.author=kmall-pt
+file.author=kmall-haikong

+ 3 - 1
kmall-admin/src/main/webapp/js/sale/sale.js

@@ -1450,7 +1450,9 @@ function openWebSocket() {
         //无法使用wss,浏览器打开WebSocket时报错
         //ws对应http、wss对应https。
         //kmall测试环境
-        webSocket = new WebSocket("ws://183.62.225.124:3080/ws/server/"+storeId);
+        // webSocket = new WebSocket("ws://183.62.225.124:3080/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本地环境

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

@@ -1,18 +1,18 @@
-########## \u6570\u636E\u5E93\u914D\u7F6E ##########
+########## \u6570\u636E\u5E93\u914D\u7F6E ##########1
 
 ####========== \u5F00\u53D1\u73AF\u5883 ==========
-jdbc.url=jdbc:mysql://14.29.226.8:3306/kmall-haikong?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-jdbc.username=root
-jdbc.password=G$Debpk^pn
+#jdbc.url=jdbc:mysql://14.29.226.8:3306/kmall-haikong?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+#jdbc.username=root
+#jdbc.password=G$Debpk^pn
 ####========== \u6D4B\u8BD5\u73AF\u5883 ==========
 #jdbc.url=jdbc:mysql://192.168.1.202:3306/kmall-haikong?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
 #jdbc.username=root
 #jdbc.password=t2GlpD6z
 ####========== \u751F\u4EA7\u73AF\u5883 ==========
 # \u5F85\u5B9A
-#jdbc.url=jdbc:mysql://:3306/kmall-haikong?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-#jdbc.username=kmall_cw
-#jdbc.password=eb6zHJg%x3
+jdbc.url=jdbc:mysql://120.76.84.45:3306/kmall-haikong?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+jdbc.username=root
+jdbc.password=Qq123!..
 #\u672C\u5730\u6D4B\u8BD5\u5E93
 #jdbc.url=jdbc:mysql://192.168.1.202:3306/kmall-haikong?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
 #jdbc.username=root

+ 1 - 1
kmall-manager/src/main/resources/conf/express-kdn.properties

@@ -1,7 +1,7 @@
 ########## \u5FEB\u9012-\u5FEB\u9012\u9E1F\u914D\u7F6E ##########
 
 # [dev, prod]
-express.kdn.env=prod
+express.kdn.env=dev
 
 #========== \u5F00\u53D1\u73AF\u5883 ==========
 #\u7535\u5546ID

+ 5 - 3
kmall-manager/src/main/resources/conf/redis.properties

@@ -1,4 +1,4 @@
-########## redis \u914D\u7F6E ##########
+########## redis \u914D\u7F6E ##########1
 
 # [dev, prod]
 redis.env=dev
@@ -6,10 +6,12 @@ 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=127.0.0.1
 redis.dev.port=6379
-redis.dev.password=Abc-123#*.-
+redis.dev.password=fdsjk337sdb
 redis.dev.pool.maxIdle=200
 redis.dev.pool.maxWait=1000
 redis.dev.pool.maxTotal=10000

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

@@ -16,7 +16,7 @@ wx.dev.paySignKey=Zx1245uytDLliom12345622222222222
 #\u4EA4\u6613\u7C7B\u578B
 wx.dev.tradeType=JSAPI
 #\u8BC1\u4E66\u540D\u79F0\uFF0C\u5BF9\u5E94\u4E0D\u540C\u7684\u5546\u6237\u53F7
-wx.dev.certName=/cert/apiclient_cert.p12
+wx.dev.certName=/app/project/kmall_pt/cert/apiclient_cert.p12
 #\u652F\u4ED8\u56DE\u8C03\u5730\u5740
 wx.dev.notifyUrl=http://qhdswl.f3322.net:9001/platform-framework/api/pay/notify
 #\u83B7\u53D6code\u7684\u8BF7\u6C42\u5730\u5740