update config

application-beta.yml

@@ -1,5 +1,5 @@
 spring:
-  #数据源连接--start
+  # 数据源连接--start
   datasource:
     url: jdbc:mysql://10.104.59.165:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
     username: developer
@@ -15,7 +15,7 @@ spring:
       max-lifetime: 1800000
       connection-timeout: 30000
       connection-test-query: SELECT 1
-  #数据源连接--end
+  # 数据源连接--end
 
   redis:
     host: 10.104.50.235
@@ -36,28 +36,36 @@ spring:
     #连接超时时间（毫秒）
     timeout: 5000
 
-#上传文件大小
-  servlet:
-    multipart:
-      max-file-size: 10MB
-      max-request-size: 100MB
+#整合mybatis
+mybatis:
+  #加载Mybatis映射文件
+  mapper-locations:
+    - classpath:mapper/*.xml
+
+# 指定服务注册中心的地址
+eureka:
+  instance:
+    prefer-ip-address: true       # 是否使用 ip 地址注册
+    instance-id: ${spring.cloud.client.ip-address}:${server.port} # ip:port
+  client:
+    service-url:                  # 设置服务注册中心地址
+      defaultZone: http://localhost:18000/eureka/
+
 
 #日志配置
 logging:
   file:
-    path: /mnt/newdatadrive/data/runtime/tomcat-instance/spi/logs
+    path: /mnt/newdatadrive/data/runtime/cloud-instance/user/logs
   level:
     root: info
 
-# swagger文档显示配置
-swagger:
-  enable: false
 
 #自定义配置
 wx:
   AppId: wx22be9ab1a6aa4715
   AppSecret: ebf8cfc4dbadae3431a8b0267c4fd09f
-  redirect_uri: https://www.caimei365.com/user/wechatLogin-b
+  # 微信授权回调（扫码），nginx中转
+  redirect-uri: https://www.caimei365.com/auth/callback/beta
   #小程序wx信息
   mini_AppId: wxf3cd4ae0cdd11c36
   mini_AppSecret: f5707c40c07adf0e2110c58ce6a4f4b3
@@ -65,43 +73,14 @@ wx:
   crm_AppId: wxea43a0f9ebce9e66
   crm_AppSecret: 1c3cd60908e72dd280840bee9e15f7f6
 
-# 新旧www服务域名
-caimei:
-  oldapi: https://www-b.caimei365.com
-  newapi: https://spi-b.caimei365.com
-  imageDomain: https://img-b.caimei365.com
-  #  第三方金太阳域名
-  thirdPartyDomain: https://test.askinchoice.com
-  #  第三方金太阳Id
-  thirdPartyId: 1
-  #  第三方金太阳秘钥
-  thirdPartySecret: $2y$10$o2B41rnW21ahVwme1S5A.eiuz.Zh1wfxGI/Hn2c6W.9aFgH5Npfwy
-  #  采美Secret：beta&jty
-  caimeiSecret: b05abc6515095b86efa14c601ffd9a72
-  #小程序邀请码过期天数
-  ValidTime: 7
-  #支付异步回调地址
-  notifyUrl: https://spi-b.caimei365.com/PayOrder/paymentCallback
-  #支付链接重定向地址
-  redirectLink: https://spi-b.caimei365.com/PayOrder/jumpPage
-  #链接页面
-  linkPage: https://www-b.caimei365.com/pay/caimei-pay.html
-  #二手支付异步回调地址
-  secondHandUrl: https://spi-b.caimei365.com/PayOrder/secondHandPayCallBack
+# swagger配置
+swagger:
+  # swagger开启状态,true开启，false关闭
+  enabled: true
+  ui-config:
+    operations-sorter: method
 
-#DFS配置
-fdfs:
-  so-timeout: 5000 #上传的超时时间
-  connect-timeout: 2000 #连接超时时间
-  thumb-image:             #缩略图生成参数
-    width: 150
-    height: 150
-  tracker-list:            #TrackerList参数,支持多个
-  - 10.104.50.235:22122
+caimei:
+  # 小程序邀请码过期天数
+  validTime: 7
 
-# 阿里云开放搜索
-aliyunConfig:
-  accessKey: LTAI4GBL3o4YkWnbKYgf2Xia
-  secret: dBjAXqbYiEPP6Ukuk2ZsXQeET7FVkK
-  searchHost: http://opensearch-cn-shenzhen.aliyuncs.com
-  searchName: caimei_search_test

application-dev.yml

@@ -1,4 +1,5 @@
 spring:
+  # 数据源连接--start
   datasource:
     url: jdbc:mysql://192.168.2.100:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
     username: developer
@@ -13,6 +14,8 @@ spring:
       max-lifetime: 1800000
       connection-timeout: 30000
       connection-test-query: SELECT 1
+  # 数据源连接--end
+  
   redis:
     host: 119.29.0.46
     port: 6380
@@ -53,12 +56,14 @@ logging:
     root: info
     com.caimei365.user.mapper: debug
 
+
 # 微信配置
 wx:
   #pcwx信息
   app-id: wx22be9ab1a6aa4715
   app-secret: ebf8cfc4dbadae3431a8b0267c4fd09f
-  redirect-uri: https://www.caimei365.com/user/wechatLogin
+  # 微信授权回调（扫码），nginx中转
+  redirect-uri: https://www.caimei365.com/auth/callback/beta
   #小程序wx信息
   mini-app-id: wxf3cd4ae0cdd11c36
   mini-app-secret: f5707c40c07adf0e2110c58ce6a4f4b3

application-prod.yml

@@ -1,5 +1,5 @@
 spring:
-  #数据源连接--start
+  # 数据源连接--start
   datasource:
     url: jdbc:mysql://rm-wz928s8btl7kxil44.mysql.rds.aliyuncs.com:3306/caimei?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
     username: coder
@@ -15,7 +15,7 @@ spring:
       max-lifetime: 1800000
       connection-timeout: 30000
       connection-test-query: SELECT 1
-  #数据源连接--end
+  # 数据源连接--end
 
   redis:
     host: 172.31.165.23
@@ -36,29 +36,37 @@ spring:
     #连接超时时间（毫秒）
     timeout: 5000
 
-  #上传文件大小
-  servlet:
-    multipart:
-      max-file-size: 10MB
-      max-request-size: 100MB
+#整合mybatis
+mybatis:
+  #加载Mybatis映射文件
+  mapper-locations:
+    - classpath:mapper/*.xml
+
+# 指定服务注册中心的地址
+eureka:
+  instance:
+    prefer-ip-address: true       # 是否使用 ip 地址注册
+    instance-id: ${spring.cloud.client.ip-address}:${server.port} # ip:port
+  client:
+    service-url:                  # 设置服务注册中心地址
+      defaultZone: http://localhost:18000/eureka/
+
 
 #日志配置
 logging:
   file:
-    path: /mnt/newdatadrive/data/runtime/jar-instance/spi/logs
+    path: /mnt/newdatadrive/data/runtime/cloud-instance/user/logs
   level:
     root: info
 
-# swagger文档显示配置
-swagger:
-  enable: false
 
 #自定义配置
 wx:
   #pcwx信息
   AppId: wx22be9ab1a6aa4715
   AppSecret: ebf8cfc4dbadae3431a8b0267c4fd09f
-  redirect_uri: https://www.caimei365.com/user/wechatLogin
+  # 微信授权回调（扫码），nginx中转
+  redirect-uri: https://www.caimei365.com/auth/callback
   #小程序wx信息
   mini_AppId: wxf3cd4ae0cdd11c36
   mini_AppSecret: f5707c40c07adf0e2110c58ce6a4f4b3
@@ -66,46 +74,15 @@ wx:
   crm_AppId: wxea43a0f9ebce9e66
   crm_AppSecret: 1c3cd60908e72dd280840bee9e15f7f6
 
+# swagger配置
+swagger:
+  # swagger开启状态,true开启，false关闭
+  enabled: true
+  ui-config:
+    operations-sorter: method
 
-# 新旧www服务域名
 caimei:
-  oldapi: https://www.caimei365.com
-  newapi: https://spi.caimei365.com
-  imageDomain: https://img.caimei365.com
-  #  第三方金太阳域名
-  thirdPartyDomain: https://www.askinchoice.com
-  #  第三方金太阳Id
-  thirdPartyId: 1
-  #  第三方金太阳秘钥
-  thirdPartySecret: $2y$10$R7D3hNF1sQAN3JJjSEUUlOlq7zGe1yDOBiiZLTFcSAzXUDT00qdaa
-  #  采美Secret：product&jty
-  caimeiSecret: ae2a2c3aaf9d34defe8be2c427034c92
-
-  #小程序邀请码过期天数
-  ValidTime: 7
-  #支付异步回调地址
-  notifyUrl: https://spi.caimei365.com/PayOrder/paymentCallback
-  #支付链接重定向地址
-  redirectLink: https://spi.caimei365.com/PayOrder/jumpPage
-  #链接页面
-  linkPage: https://www.caimei365.com/pay/caimei-pay.html
-  #二手支付异步回调地址
-  secondHandUrl: https://spi.caimei365.com/PayOrder/secondHandPayCallBack
-
-#DFS配置
-fdfs:
-  so-timeout: 5000 #上传的超时时间
-  connect-timeout: 2000 #连接超时时间
-  thumb-image:             #缩略图生成参数
-    width: 150
-    height: 150
-  tracker-list:            #TrackerList参数,支持多个
-  - 172.31.165.24:22122
+  # 小程序邀请码过期天数
+  validTime: 7
 
-# 阿里云开放搜索
-aliyunConfig:
-  accessKey: LTAI4GBL3o4YkWnbKYgf2Xia
-  secret: dBjAXqbYiEPP6Ukuk2ZsXQeET7FVkK
-  searchHost: http://opensearch-cn-shenzhen.aliyuncs.com
-  searchName: caimei_search