Merge branch 'dev' of http://gitlab.aukeyit.com/xiaoziguang/trobs-config into dev

@@ -113,7 +113,7 @@ swagger:
       - scope: server
       - scope: server
         description: server all
         description: server all
     token-url-list:
     token-url-list:
-      - http://192.168.29.13/api/auth/oauth/token
+      - http://trobs-auth/oauth/token
 
 
 ## spring security 配置
 ## spring security 配置
 security:
 security:
@@ -121,7 +121,7 @@ security:
     client:
     client:
       # 默认放行url,如果子模块重写这里的配置就会被覆盖
       # 默认放行url,如果子模块重写这里的配置就会被覆盖
       ignore-urls:
       ignore-urls:
-        - '/actuator/**'
+        #- '/actuator/**'
         - '/v2/api-docs'
         - '/v2/api-docs'
         - '/swagger**'
         - '/swagger**'
         - '/swagger**/**'
         - '/swagger**/**'
@@ -129,7 +129,17 @@ security:
     resource:
     resource:
       loadBalanced: true
       loadBalanced: true
       token-info-uri: http://trobs-auth/oauth/check_token
       token-info-uri: http://trobs-auth/oauth/check_token
-##配置测试
-my:
-  config:
-    name: zeng曾yi
+##首页
+trobs:
+  index: http://trobs.aukeyit.com
+##ftp服务器
+aukey:
+  ftp:
+    host: 10.1.2.165
+    port: 21
+    username: yuanli
+    password: yuanli@159
+    binaryTransfer: true
+    localActive: true
+    
+

@@ -17,15 +17,11 @@ spring:
     static-locations: classpath:/static/,classpath:/views/
     static-locations: classpath:/static/,classpath:/views/
 #微信配置（物流信息推送）
 #微信配置（物流信息推送）
 weixin:
 weixin:
-  logistic:
-    corpid: WW0f3efc2873ad11c3
-    corpsecret: 1lGrUDZS5Jj82YRCz5VFVU0oFcZY-VzXnBRqwADtO9I
-    agentid: 1000012
-    redisKey: logistic_access_token
-  dinner:
-    corpid: WW0f3efc2873ad11c3
-    corpsecret: 1V9RP-ELM6Th756cDY--OzgxwPXIMPa9StiKd0TQLro
-    agentid: 1000007
-    redisKey: dinner_access_token
   gettoken: https://qyapi.weixin.qq.com/cgi-bin/gettoken
   gettoken: https://qyapi.weixin.qq.com/cgi-bin/gettoken
   sendmessage: https://qyapi.weixin.qq.com/cgi-bin/message/send
   sendmessage: https://qyapi.weixin.qq.com/cgi-bin/message/send
+  notify:
+    head: 消息通知
+    culture: 付出  简单  开放
+    sysname: 猿人创新  原力ERP
+    url: http://trobs.aukeyit.com
+    tail: 前往原力

+## spring security 配置
+security:
+  oauth2:
+    client:
+      client-id: ENC(U2RgKK76tZIVR2iCW/KAs2uaZWgNxlheBqKoD1+0KvU=)
+      client-secret: ENC(U2RgKK76tZIVR2iCW/KAs2uaZWgNxlheBqKoD1+0KvU=)
+      scope: server
+# 数据源配置
+spring:
+  datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    username: trobs
+    password: dfU76$N(kp
+    url: jdbc:mysql://10.1.1.86:3306/trobs_report?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
+  resources:
+    static-locations: classpath:/static/,classpath:/views/

@@ -7,7 +7,7 @@ security:
       scope: server
       scope: server
       # 默认放行url,子模块重写时application-dev.yml中的公共配置会被覆盖,所以要把公共配置中的放行url再写一次
       # 默认放行url,子模块重写时application-dev.yml中的公共配置会被覆盖,所以要把公共配置中的放行url再写一次
       ignore-urls:
       ignore-urls:
-        - '/actuator/**'
+       # - '/actuator/**'
         - '/v2/api-docs'
         - '/v2/api-docs'
         - '/user/info/*'
         - '/user/info/*'
         - '/social/info/*'
         - '/social/info/*'