diff --git a/backup/2020-05-23 b/backup/2020-05-23
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/backup/2020-05-24 b/backup/2020-05-24
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/backup/2020-05-25 b/backup/2020-05-25
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git "a/doc/\351\207\215\350\246\201\346\226\207\346\241\243.txt" "b/doc/\351\207\215\350\246\201\346\226\207\346\241\243.txt"
new file mode 100644
index 0000000000000000000000000000000000000000..51bf975c4028b3988796da23362b0c4e4ee127a2
--- /dev/null
+++ "b/doc/\351\207\215\350\246\201\346\226\207\346\241\243.txt"
@@ -0,0 +1,4 @@
+1 token secret记得要改。
+litemall\litemall-wx-api\src\main\java\org\linlinjava\litemall\wx\util\JwtHelper.java
+里的static final String SECRET  要修改
+
diff --git "a/doc/\351\224\231\350\257\257\350\247\243\345\206\263.txt" "b/doc/\351\224\231\350\257\257\350\247\243\345\206\263.txt"
new file mode 100644
index 0000000000000000000000000000000000000000..3eb8011c2a5b5b7b3554803e192050f25f35c09b
--- /dev/null
+++ "b/doc/\351\224\231\350\257\257\350\247\243\345\206\263.txt"
@@ -0,0 +1,12 @@
+报错信息：
+npm ERR! code ELIFECYCLE
+npm ERR! errno 1
+npm ERR! node-sass@4.14.0 postinstall: `node scripts/build.js`
+npm ERR! Exit status 1
+npm ERR!
+npm ERR! Failed at the node-sass@4.14.0 postinstall script.
+npm ERR! This is probably not a problem with npm. There is likely additional logging output above.
+解决方案：直接在当前目录下进行node-sass 的数据源没设置
+npm config set sass_binary_site=https://npm.taobao.org/mirrors/node-sass
+再次执行：
+npm i
\ No newline at end of file
diff --git a/litemall-admin/.env.deployment b/litemall-admin/.env.deployment
index 5e42a2e892059a4bf17dff5b337e41c23206d95a..3a668fcfac897c07cb3f6f637df12ba4c9a21190 100644
--- a/litemall-admin/.env.deployment
+++ b/litemall-admin/.env.deployment
@@ -4,5 +4,5 @@ NODE_ENV = production
 ENV = 'deploymenet'
 
 # base api
-VUE_APP_BASE_API = 'http://122.51.199.160:8080/admin'
+VUE_APP_BASE_API = 'http://localhost:8080/admin'
 
diff --git a/litemall-admin/.env.production b/litemall-admin/.env.production
index 4c05b967776c4189facc4988bdce4961d87ceee0..5550ded21b1a3a3c771d9b689844abe6707e8cfd 100644
--- a/litemall-admin/.env.production
+++ b/litemall-admin/.env.production
@@ -4,5 +4,5 @@ NODE_ENV = production
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = 'https://www.example.com/admin'
+VUE_APP_BASE_API = 'https://www.jgaogao.com/admin'
 
diff --git a/litemall-core/src/main/resources/application-core.yml b/litemall-core/src/main/resources/application-core.yml
index d665219c0e583af218fef66d18df0581fbae3827..7a27bb2bf8fb57b8f2e10ef44fd519a33f790df8 100644
--- a/litemall-core/src/main/resources/application-core.yml
+++ b/litemall-core/src/main/resources/application-core.yml
@@ -1,11 +1,11 @@
 litemall:
   # 寮�鍙戣�呭簲璇ヨ缃垚鑷繁鐨剋x鐩稿叧淇℃伅
   wx:
-    app-id: wxa5b486c6b918ecfb
-    app-secret: e04004829d4c383b4db7769d88dfbca1
-    mch-id: 111111
-    mch-key: xxxxxx
-    notify-url: http://www.example.com/wx/order/pay-notify
+    app-id: wx46f72a0b984c1e4d
+    app-secret: f70e0493fcb5cad1d6fc79add5c36ffc
+    mch-id: 1575215251
+    mch-key: jgg2019kmeq83nmlc02jkojd4expb37c
+    notify-url: http://www.jgaogao.com/wx/order/pay-notify
     # 鍟嗘埛璇佷功鏂囦欢璺緞
     # 璇峰弬鑰冣�滃晢鎴疯瘉涔︹�濅竴鑺� https://pay.weixin.qq.com/wiki/doc/api/wxa/wxa_api.php?chapter=4_3
     key-path: xxxxx
@@ -24,23 +24,23 @@ litemall:
     # 鐭秷鎭ā鐗堥�氱煡閰嶇疆
     # 鐭俊鎭敤浜庨�氱煡瀹㈡埛锛屼緥濡傚彂璐х煭淇￠�氱煡锛屾敞鎰忛厤缃牸寮忥紱template-name锛宼emplate-templateId 璇峰弬鑰� NotifyType 鏋氫妇鍊�
     sms:
-      enable: false
+      enable: true
       # 濡傛灉鏄吘璁簯鐭俊锛屽垯璁剧疆active鐨勫�紅encent
       # 濡傛灉鏄樋閲屼簯鐭俊锛屽垯璁剧疆active鐨勫�糰liyun
       active: tencent
-      sign: litemall
+      sign: 涓鹃珮楂樼鎶�
       template:
-      - name: paySucceed
-        templateId: 156349
-      - name: captcha
-        templateId: 156433
-      - name: ship
-        templateId: 158002
-      - name: refund
-        templateId: 159447
+        - name: paySucceed
+          templateId: 156349
+        - name: captcha
+          templateId: 156433
+        - name: ship
+          templateId: 158002
+        - name: refund
+          templateId: 159447
       tencent:
-        appid: 111111111
-        appkey: xxxxxxxxxxxxxx
+        appid: 1400321303
+        appkey: d951ebd96cb9033667e145d9e821b241
       aliyun:
         regionId: xxx
         accessKeyId: xxx
@@ -52,32 +52,32 @@ litemall:
     appId: "XXXXXXXXX"
     appKey: "XXXXXXXXXXXXXXXXXXXXXXXXX"
     vendors:
-    - code: "ZTO"
-      name: "涓�氬揩閫�"
-    - code: "YTO"
-      name: "鍦嗛�氶�熼��"
-    - code: "YD"
-      name: "闊佃揪閫熼��"
-    - code: "YZPY"
-      name: "閭斂蹇�掑寘瑁�"
-    - code: "EMS"
-      name: "EMS"
-    - code: "DBL"
-      name: "寰烽偊蹇��"
-    - code: "FAST"
-      name: "蹇嵎蹇��"
-    - code: "ZJS"
-      name: "瀹呮�ラ��"
-    - code: "TNT"
-      name: "TNT蹇��"
-    - code: "UPS"
-      name: "UPS"
-    - code: "DHL"
-      name: "DHL"
-    - code: "FEDEX"
-      name: "FEDEX鑱旈偊(鍥藉唴浠�)"
-    - code: "FEDEX_GJ"
-      name: "FEDEX鑱旈偊(鍥介檯浠�)"
+      - code: "ZTO"
+        name: "涓�氬揩閫�"
+      - code: "YTO"
+        name: "鍦嗛�氶�熼��"
+      - code: "YD"
+        name: "闊佃揪閫熼��"
+      - code: "YZPY"
+        name: "閭斂蹇�掑寘瑁�"
+      - code: "EMS"
+        name: "EMS"
+      - code: "DBL"
+        name: "寰烽偊蹇��"
+      - code: "FAST"
+        name: "蹇嵎蹇��"
+      - code: "ZJS"
+        name: "瀹呮�ラ��"
+      - code: "TNT"
+        name: "TNT蹇��"
+      - code: "UPS"
+        name: "UPS"
+      - code: "DHL"
+        name: "DHL"
+      - code: "FEDEX"
+        name: "FEDEX鑱旈偊(鍥藉唴浠�)"
+      - code: "FEDEX_GJ"
+        name: "FEDEX鑱旈偊(鍥介檯浠�)"
 
   # 瀵硅薄瀛樺偍閰嶇疆
   storage:
@@ -100,7 +100,7 @@ litemall:
       secretId: AKIDOccMr856uoU1Tsa2MQL5aqseBUWRrb5i
       secretKey: XqtgEhIdrupTs4ygaWlkUUXv3w3FiwuD
       region: ap-shanghai
-      bucketName: vytech-1300096589
+      bucketName: jggdrivers-1300825241
     # 涓冪墰浜戝璞″瓨鍌ㄩ厤缃俊鎭�
     qiniu:
       endpoint: http://pd5cb6ulu.bkt.clouddn.com
diff --git a/litemall-db/src/main/resources/application-db.yml b/litemall-db/src/main/resources/application-db.yml
index ef526211806da7e17ca1ac697076325aff1155a9..5c80b0be54fe058e93a1c7554fd2ec58135cc52c 100644
--- a/litemall-db/src/main/resources/application-db.yml
+++ b/litemall-db/src/main/resources/application-db.yml
@@ -9,8 +9,8 @@ spring:
     druid:
       url:  jdbc:mysql://localhost:3306/litemall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false
       driver-class-name:  com.mysql.jdbc.Driver
-      username:  litemall
-      password:  litemall123456
+      username:  root
+      password:  jgg2020
       initial-size:  10
       max-active:  50
       min-idle:  10
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/util/JwtHelper.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/util/JwtHelper.java
index 8f9c30f6e6b926a545d9a57d95a5607944f6cf3b..a1baaf390722755b41cb71ed6af2731e21ef1533 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/util/JwtHelper.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/util/JwtHelper.java
@@ -16,9 +16,9 @@ import com.auth0.jwt.interfaces.DecodedJWT;
 
 public class JwtHelper {
 	// 绉橀挜
-	static final String SECRET = "X-Litemall-Token";
+	static final String SECRET = "vQjdag25KGspt5#&dgyS1b^>Ly9qiL-6NpVn";
 	// 绛惧悕鏄湁璋佺敓鎴�
-	static final String ISSUSER = "LITEMALL";
+	static final String ISSUSER = "JGGDiaoyunla";
 	// 绛惧悕鐨勪富棰�
 	static final String SUBJECT = "this is litemall token";
 	// 绛惧悕鐨勮浼�
diff --git a/litemall-wx/config/api.js b/litemall-wx/config/api.js
index 35ae26a78521e84192ac0483afaca7674f614701..db2258ee1039625d2347726ec069d69e946aa3ce 100644
--- a/litemall-wx/config/api.js
+++ b/litemall-wx/config/api.js
@@ -2,11 +2,11 @@
 // 鏈満寮�鍙戞椂浣跨敤
 // var WxApiRoot = 'http://localhost:8080/wx/';
 // 灞�鍩熺綉娴嬭瘯浣跨敤
-var WxApiRoot = 'http://192.168.1.3:8080/wx/';
+var WxApiRoot = 'http://localhost:8080/wx/';
 // 浜戝钩鍙伴儴缃叉椂浣跨敤
-// var WxApiRoot = 'http://122.51.199.160:8080/wx/';
+// var WxApiRoot = 'http://www.jgaogao.com:8080/wx/';
 // 浜戝钩鍙颁笂绾挎椂浣跨敤
-// var WxApiRoot = 'https://www.menethil.com.cn/wx/';
+// var WxApiRoot = 'https://www.jgaogao.com/api/wx/';
 
 module.exports = {
   IndexUrl: WxApiRoot + 'home/index', //棣栭〉鏁版嵁鎺ュ彛
diff --git a/litemall-wx/package-lock.json b/litemall-wx/package-lock.json
new file mode 100644
index 0000000000000000000000000000000000000000..48e341a0954d5f8c2accf3a6731be28e5bb9c0de
--- /dev/null
+++ b/litemall-wx/package-lock.json
@@ -0,0 +1,3 @@
+{
+  "lockfileVersion": 1
+}
diff --git a/litemall-wx/project.config.json b/litemall-wx/project.config.json
index 67d3b5271de61b1c7776d61ad3784920938282ce..aba56598fc07b9bf8fb2c92fb52a803631b43567 100644
--- a/litemall-wx/project.config.json
+++ b/litemall-wx/project.config.json
@@ -21,7 +21,7 @@
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.4.0",
-	"appid": "wxa5b486c6b918ecfb",
+	"appid": "wx46f72a0b984c1e4d",
 	"projectname": "litemall-wx",
 	"simulatorType": "wechat",
 	"simulatorPluginLibVersion": {},