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

@@ -129,14 +129,16 @@ 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
-
-#txmanager地址
-tm:
-  manager:
-    url: http://192.168.29.13:5004/tx/manager/
-
-#文件服务器
-file:
-  server:
-    url:  http://trobs.download.aukeyit.com/
+      
+##首页
+trobs:
+  index: http://trobs.aukeyit.com
+  
+##ftp服务器
+aukey:
+  ftp:
+    host: 10.1.2.165
+    port: 21
+    username: yuanli
+    password: yuanli@159
 
 

+## spring security 配置
+security:
+  oauth2:
+    client:
+      client-id: ENC(OjrrhBd8+O+pZAfFv0L1FRPimfF/HEJUDrguOhTKLZU=)
+      client-secret: ENC(OjrrhBd8+O+pZAfFv0L1FRPimfF/HEJUDrguOhTKLZU=)
+      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/

@@ -15,14 +15,13 @@ spring:
     url: jdbc:mysql://10.1.1.86:3306/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
     url: jdbc:mysql://10.1.1.86:3306/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
   resources:
   resources:
     static-locations: classpath:/static/,classpath:/views/
     static-locations: classpath:/static/,classpath:/views/
-
-#文件下载地址
-file:
-  download:
-    url: http://trobs.download.aukeyit.com 
     
     
 #文件服务器地址
 #文件服务器地址
 aukey:
 aukey:
   smb:
   smb:
     url: smb://aukeyit:aukeyit2016@10.1.1.186/files
     url: smb://aukeyit:aukeyit2016@10.1.1.186/files
-   
+  ftp:
+    host: 10.1.2.165
+    port: 21
+    username: yuanli
+    password: yuanli@159

@@ -14,8 +14,4 @@ spring:
     password: dfU76$N(kp
     password: dfU76$N(kp
     url: jdbc:mysql://10.1.1.86:3306/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
     url: jdbc:mysql://10.1.1.86:3306/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
   resources:
   resources:
-    static-locations: classpath:/static/,classpath:/views/
-#文件服务器
-trobs:
-  upload-file:
-    url: http://trobs.download.aukeyit.com/
+    static-locations: classpath:/static/,classpath:/views/

@@ -15,7 +15,3 @@ spring:
     url: jdbc:mysql://10.1.1.86:3306/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
     url: jdbc:mysql://10.1.1.86:3306/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
   resources:
   resources:
     static-locations: classpath:/static/,classpath:/views/
     static-locations: classpath:/static/,classpath:/views/
-#文件服务器
-trobs:
-  upload-file:
-    url: http://trobs.download.aukeyit.com/

@@ -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: 前往原力