1.2.3 后台操作按钮调整及其新增开启拼团功能

yshop-api/src/main/resources/config/application-dev.yml

@@ -77,4 +77,5 @@ file:
   avatar: E:\yshop\avatar\
   # 文件大小 /M
   maxSize: 100
-  avatarMaxSize: 5
+  avatarMaxSize: 5
+  localUrl: http://localhost:8000

yshop-api/src/main/resources/config/application-prod.yml

@@ -6,7 +6,7 @@ spring:
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
       url: jdbc:log4jdbc:mysql://localhost:3306/yshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
       username: yshop
-      password:
+      password: yshoP@2019#yx
 
       # 初始化配置
       initial-size: 3
@@ -48,7 +48,7 @@ spring:
     database: 0
     host: 127.0.0.1
     port: 6379
-    password:
+    password: yshop2019@yxtw
     #连接超时时间
     timeout: 5000
 
@@ -85,4 +85,5 @@ file:
   avatar: /home/yshop/avatar/
   # 文件大小 /M
   maxSize: 100
-  avatarMaxSize: 5
+  avatarMaxSize: 5
+  localUrl: http://localhost:8000

yshop-api/src/main/resources/config/application.yml

@@ -52,13 +52,13 @@ mybatis-plus:
 wx:
   mp:
     configs:
-    - appId: wx41db1daef9040a9e
-      secret: a21b79510e45c76d6d543ef3ec020817
-      token: dayouqiantu
-      aesKey: 6wYzx9DyWXHwKSCOBjf8hHQu15d4JI5fVzDDNphaKqM
+    - appId: wxc061dee8806ff712
+      secret: 1dc5b2871d0d5ebd0f1ec7ddb856f805
+      token: yshop
+      aesKey: yYuBUkC8BXImCXyu7O6hkzLj4TC5nxsWPfL4CQAZPNY
   pay:
-    appId: wx41db1daef9040a9e
-    mchId: 1531087341
+    appId: wxc061dee8806ff712
+    mchId: 1493624002
     mchKey: dayouqiantuhupeng8638004yixiangt
     subAppId:
     subMchId:
@@ -69,3 +69,8 @@ logging:
     com.github.binarywang.demo.wx.mp: DEBUG
     me.chanjar.weixin: DEBUG
 
+
+#订单未付款订单时间(单位秒)
+job:
+  unpayorder: 10
+