肖紫光 / trobs-config · 提交

转到一个项目

作者 wangbin
提交 38303b0a49afe51cf57f7e632dca054d9f621656 1 个父辈 129cfdd1

生产环境配置文件

内嵌 并排对比
正在显示 26 个修改的文件 包含 170 行增加 和 88 行删除
@@ -8,13 +8,13 @@ spring: @@ -8,13 +8,13 @@ spring:
8 host: 10.1.1.182 8 host: 10.1.1.182
9 port: 6379 9 port: 6379
10 password: 10 password:
11 - database: 13 11 + database: 14
12 rabbitmq: 12 rabbitmq:
13 - host: 10.1.2.116 13 + host: 10.1.1.60
14 port: 5672 14 port: 5672
15 username: aukeyit 15 username: aukeyit
16 - password: Aukey@2017  
17 - http: 16 + password: Aukey@2018
  17 + servlet:
18 multipart: 18 multipart:
19 max-file-size: 1000MB 19 max-file-size: 1000MB
20 max-request-size: 1000MB 20 max-request-size: 1000MB
@@ -101,7 +101,7 @@ swagger: @@ -101,7 +101,7 @@ swagger:
101 license: Powered By Trobs 101 license: Powered By Trobs
102 licenseUrl: http://www.trobs.com/ 102 licenseUrl: http://www.trobs.com/
103 terms-of-service-url: http://www.trobs.com/ 103 terms-of-service-url: http://www.trobs.com/
104 - host: 192.168.29.13 104 + host: http://www.trobs.com/
105 contact: 105 contact:
106 name: Aukey IT 106 name: Aukey IT
107 email: tslcarmack@gmail.com 107 email: tslcarmack@gmail.com
@@ -113,7 +113,7 @@ swagger: @@ -113,7 +113,7 @@ swagger:
113 - scope: server 113 - scope: server
114 description: server all 114 description: server all
115 token-url-list: 115 token-url-list:
116 - - http://192.168.29.13/auth/oauth/token 116 + - http://trobs-auth/oauth/token
117 117
118 ## spring security 配置 118 ## spring security 配置
119 security: 119 security:
@@ -129,21 +129,9 @@ security: @@ -129,21 +129,9 @@ security:
129 resource: 129 resource:
130 loadBalanced: true 130 loadBalanced: true
131 token-info-uri: http://trobs-auth/oauth/check_token 131 token-info-uri: http://trobs-auth/oauth/check_token
132 -  
133 -#txmanager地址  
134 -tm:  
135 - manager:  
136 - url: http://192.168.29.13:5004/tx/manager/  
137 -  
138 -#文件服务器  
139 -file:  
140 - server:  
141 - url: http://trobs.download.aukeyit.com/  
142 -  
143 ##首页 132 ##首页
144 trobs: 133 trobs:
145 index: http://trobs.aukeyit.com 134 index: http://trobs.aukeyit.com
146 -  
147 ##ftp服务器 135 ##ftp服务器
148 aukey: 136 aukey:
149 ftp: 137 ftp:
@@ -151,5 +139,5 @@ aukey: @@ -151,5 +139,5 @@ aukey:
151 port: 21 139 port: 21
152 username: yuanli 140 username: yuanli
153 password: yuanli@159 141 password: yuanli@159
154 - binaryTransfer: false  
155 - localActive: false  
  142 + binaryTransfer: true
  143 + localActive: true
1 -## spring security 配置  
2 -security:  
3 - oauth2:  
4 - client:  
5 - client-id: ENC(gPFcUOmJm8WqM3k3eSqS0Q==)  
6 - client-secret: ENC(gPFcUOmJm8WqM3k3eSqS0Q==)  
7 - scope: server  
8 - ignore-urls:  
9 - - '/actuator/**'  
10 - - '/v2/api-docs'  
11 - - '/service/**'  
12 - - '/editor-app/**'  
13 - - '/task/view/*'  
14 - - '/process/resource/**'  
15 - - '/modeler.html'  
16 -spring:  
17 - autoconfigure:  
18 - exclude: org.activiti.spring.boot.SecurityAutoConfiguration  
19 - activiti:  
20 - check-process-definitions: false  
21 - datasource:  
22 - type: com.zaxxer.hikari.HikariDataSource  
23 - driver-class-name: com.mysql.cj.jdbc.Driver  
24 - username: trobs  
25 - password: dfU76$N(kp  
26 - url: jdbc:mysql://10.1.1.86:3306/trobs_ac?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true  
@@ -4,8 +4,8 @@ spring: @@ -4,8 +4,8 @@ spring:
4 type: com.zaxxer.hikari.HikariDataSource 4 type: com.zaxxer.hikari.HikariDataSource
5 driver-class-name: com.mysql.cj.jdbc.Driver 5 driver-class-name: com.mysql.cj.jdbc.Driver
6 username: trobs 6 username: trobs
7 - password: dfU76$N(kp  
8 - url: jdbc:mysql://10.1.1.86:3306/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 7 + password: +bdKL~ykG4
  8 + url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
9 freemarker: 9 freemarker:
10 allow-request-override: false 10 allow-request-override: false
11 allow-session-override: false 11 allow-session-override: false
@@ -5,13 +5,17 @@ security: @@ -5,13 +5,17 @@ security:
5 client-id: ENC(YnMAwM39eIVYDUqehHSmdP/2Wcy0fGXGI21p4fKaUuZJEj2RssD7nw==) 5 client-id: ENC(YnMAwM39eIVYDUqehHSmdP/2Wcy0fGXGI21p4fKaUuZJEj2RssD7nw==)
6 client-secret: ENC(YnMAwM39eIVYDUqehHSmdP/2Wcy0fGXGI21p4fKaUuZJEj2RssD7nw==) 6 client-secret: ENC(YnMAwM39eIVYDUqehHSmdP/2Wcy0fGXGI21p4fKaUuZJEj2RssD7nw==)
7 scope: server 7 scope: server
  8 + # 默认放行url,子模块重写时application-dev.yml中的公共配置会被覆盖,所以要把公共配置中的放行url再写一次
  9 +# ignore-urls:
  10 +# - '/bsewarehousetype/**'
  11 +
8 # 数据源配置 12 # 数据源配置
9 spring: 13 spring:
10 datasource: 14 datasource:
11 type: com.zaxxer.hikari.HikariDataSource 15 type: com.zaxxer.hikari.HikariDataSource
12 driver-class-name: com.mysql.cj.jdbc.Driver 16 driver-class-name: com.mysql.cj.jdbc.Driver
13 username: trobs 17 username: trobs
14 - password: dfU76$N(kp  
15 - url: jdbc:mysql://10.1.1.86:3306/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8 18 + password: +bdKL~ykG4
  19 + url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
16 resources: 20 resources:
17 static-locations: classpath:/static/,classpath:/views/ 21 static-locations: classpath:/static/,classpath:/views/
@@ -11,7 +11,7 @@ spring: @@ -11,7 +11,7 @@ spring:
11 type: com.zaxxer.hikari.HikariDataSource 11 type: com.zaxxer.hikari.HikariDataSource
12 driver-class-name: com.mysql.cj.jdbc.Driver 12 driver-class-name: com.mysql.cj.jdbc.Driver
13 username: trobs 13 username: trobs
14 - password: dfU76$N(kp  
15 - url: jdbc:mysql://10.1.1.86:3306/trobs_report?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8 14 + password: +bdKL~ykG4
  15 + url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
16 resources: 16 resources:
17 static-locations: classpath:/static/,classpath:/views/ 17 static-locations: classpath:/static/,classpath:/views/
  1 +## spring security 配置
  2 +security:
  3 + oauth2:
  4 + client:
  5 + client-id: ENC(AD9hQaPSRKmmXTPLBW1HOCGGWU19CckQwuHfXFztfYs=)
  6 + client-secret: ENC(AD9hQaPSRKmmXTPLBW1HOCGGWU19CckQwuHfXFztfYs=)
  7 + scope: server
  8 +# 数据源配置
  9 +spring:
  10 + datasource:
  11 + type: com.zaxxer.hikari.HikariDataSource
  12 + driver-class-name: com.mysql.cj.jdbc.Driver
  13 + username: trobs
  14 + password: +bdKL~ykG4
  15 + url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
  16 + resources:
  17 + static-locations: classpath:/static/,classpath:/views/
@@ -11,7 +11,7 @@ spring: @@ -11,7 +11,7 @@ spring:
11 type: com.zaxxer.hikari.HikariDataSource 11 type: com.zaxxer.hikari.HikariDataSource
12 driver-class-name: com.mysql.cj.jdbc.Driver 12 driver-class-name: com.mysql.cj.jdbc.Driver
13 username: trobs 13 username: trobs
14 - password: dfU76$N(kp  
15 - url: jdbc:mysql://10.1.1.86:3306/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8 14 + password: +bdKL~ykG4
  15 + url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
16 resources: 16 resources:
17 static-locations: classpath:/static/,classpath:/views/ 17 static-locations: classpath:/static/,classpath:/views/
@@ -11,7 +11,7 @@ spring: @@ -11,7 +11,7 @@ spring:
11 type: com.zaxxer.hikari.HikariDataSource 11 type: com.zaxxer.hikari.HikariDataSource
12 driver-class-name: com.mysql.cj.jdbc.Driver 12 driver-class-name: com.mysql.cj.jdbc.Driver
13 username: trobs 13 username: trobs
14 - password: dfU76$N(kp  
15 - url: jdbc:mysql://10.1.1.86:3306/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8 14 + password: +bdKL~ykG4
  15 + url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
16 resources: 16 resources:
17 static-locations: classpath:/static/,classpath:/views/ 17 static-locations: classpath:/static/,classpath:/views/
@@ -11,17 +11,13 @@ spring: @@ -11,17 +11,13 @@ spring:
11 type: com.zaxxer.hikari.HikariDataSource 11 type: com.zaxxer.hikari.HikariDataSource
12 driver-class-name: com.mysql.cj.jdbc.Driver 12 driver-class-name: com.mysql.cj.jdbc.Driver
13 username: trobs 13 username: trobs
14 - password: dfU76$N(kp  
15 - url: jdbc:mysql://10.1.1.86:3306/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8 14 + password: +bdKL~ykG4
  15 + url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
16 resources: 16 resources:
17 static-locations: classpath:/static/,classpath:/views/ 17 static-locations: classpath:/static/,classpath:/views/
18 18
19 -#文件下载地址  
20 -file:  
21 - download:  
22 - url: http://192.168.29.13:8606  
23 19
24 -#文件服务器地址 20 +#smb文件服务器地址
25 aukey: 21 aukey:
26 smb: 22 smb:
27 url: smb://aukeyit:aukeyit2016@10.1.1.186/files 23 url: smb://aukeyit:aukeyit2016@10.1.1.186/files
  1 +## spring security 配置
  2 +security:
  3 + oauth2:
  4 + client:
  5 + client-id: ENC(fHaeVSlARUVMLLRv0SrFKLN02MiZRIOQlZftJrLXuiY=)
  6 + client-secret: ENC(fHaeVSlARUVMLLRv0SrFKLN02MiZRIOQlZftJrLXuiY=)
  7 + scope: server
  8 +# 数据源配置
  9 +spring:
  10 + datasource:
  11 + type: com.zaxxer.hikari.HikariDataSource
  12 + driver-class-name: com.mysql.cj.jdbc.Driver
  13 + username: trobs
  14 + password: +bdKL~ykG4
  15 + url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
  16 + resources:
  17 + static-locations: classpath:/static/,classpath:/views/
@@ -11,11 +11,7 @@ spring: @@ -11,11 +11,7 @@ spring:
11 type: com.zaxxer.hikari.HikariDataSource 11 type: com.zaxxer.hikari.HikariDataSource
12 driver-class-name: com.mysql.cj.jdbc.Driver 12 driver-class-name: com.mysql.cj.jdbc.Driver
13 username: trobs 13 username: trobs
14 - password: dfU76$N(kp  
15 - url: jdbc:mysql://10.1.1.86:3306/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8 14 + password: +bdKL~ykG4
  15 + url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
16 resources: 16 resources:
17 static-locations: classpath:/static/,classpath:/views/ 17 static-locations: classpath:/static/,classpath:/views/
18 -#文件服务器  
19 -trobs:  
20 - upload-file:  
21 - url: http://trobs.download.aukeyit.com/  
  1 +## spring security 配置
  2 +security:
  3 + oauth2:
  4 + client:
  5 + client-id: ENC(mCO495FovYwxqNMIob1vl+qiFK/8ftFKV5uJIPEDy4w=)
  6 + client-secret: ENC(mCO495FovYwxqNMIob1vl+qiFK/8ftFKV5uJIPEDy4w=)
  7 + scope: server
  8 +# 数据源配置
  9 +spring:
  10 + datasource:
  11 + type: com.zaxxer.hikari.HikariDataSource
  12 + driver-class-name: com.mysql.cj.jdbc.Driver
  13 + username: trobs
  14 + password: +bdKL~ykG4
  15 + url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
  16 + resources:
  17 + static-locations: classpath:/static/,classpath:/views/
  1 +## spring security 配置
  2 +security:
  3 + oauth2:
  4 + client:
  5 + client-id: ENC(ING0+zL3mVgUORU8fWs3YMaMDY1its4IN3/pswLRhQU=)
  6 + client-secret: ENC(ING0+zL3mVgUORU8fWs3YMaMDY1its4IN3/pswLRhQU=)
  7 + scope: server
  8 +# 数据源配置
  9 +spring:
  10 + datasource:
  11 + type: com.zaxxer.hikari.HikariDataSource
  12 + driver-class-name: com.mysql.cj.jdbc.Driver
  13 + username: trobs
  14 + password: +bdKL~ykG4
  15 + url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
  16 + resources:
  17 + static-locations: classpath:/static/,classpath:/views/
  1 +## spring security 配置
  2 +security:
  3 + oauth2:
  4 + client:
  5 + client-id: ENC(Vsyi4k1F0BgEvvfwxpbaOx3h1ZlHObYNNWtgzms8hCA=)
  6 + client-secret: ENC(Vsyi4k1F0BgEvvfwxpbaOx3h1ZlHObYNNWtgzms8hCA=)
  7 + scope: server
  8 +# 数据源配置
  9 +spring:
  10 + datasource:
  11 + type: com.zaxxer.hikari.HikariDataSource
  12 + driver-class-name: com.mysql.cj.jdbc.Driver
  13 + username: trobs
  14 + password: +bdKL~ykG4
  15 + url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
  16 + resources:
  17 + static-locations: classpath:/static/,classpath:/views/
@@ -11,7 +11,11 @@ spring: @@ -11,7 +11,11 @@ spring:
11 type: com.zaxxer.hikari.HikariDataSource 11 type: com.zaxxer.hikari.HikariDataSource
12 driver-class-name: com.mysql.cj.jdbc.Driver 12 driver-class-name: com.mysql.cj.jdbc.Driver
13 username: trobs 13 username: trobs
14 - password: dfU76$N(kp  
15 - url: jdbc:mysql://10.1.1.86:3306/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8 14 + password: +bdKL~ykG4
  15 + url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
16 resources: 16 resources:
17 static-locations: classpath:/static/,classpath:/views/ 17 static-locations: classpath:/static/,classpath:/views/
  18 +
  19 +environment:
  20 + test:
  21 + value: dev
@@ -11,7 +11,7 @@ spring: @@ -11,7 +11,7 @@ spring:
11 type: com.zaxxer.hikari.HikariDataSource 11 type: com.zaxxer.hikari.HikariDataSource
12 driver-class-name: com.mysql.cj.jdbc.Driver 12 driver-class-name: com.mysql.cj.jdbc.Driver
13 username: trobs 13 username: trobs
14 - password: dfU76$N(kp  
15 - url: jdbc:mysql://10.1.1.86:3306/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8 14 + password: +bdKL~ykG4
  15 + url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
16 resources: 16 resources:
17 static-locations: classpath:/static/,classpath:/views/ 17 static-locations: classpath:/static/,classpath:/views/
  1 +## spring security 配置
  2 +security:
  3 + oauth2:
  4 + client:
  5 + client-id: ENC(wQrxSDoLroNh3TlORjKvKiTHIa/4HLpQQ9CbX5RCMlk=)
  6 + client-secret: ENC(wQrxSDoLroNh3TlORjKvKiTHIa/4HLpQQ9CbX5RCMlk=)
  7 + scope: server
  8 +# 数据源配置
  9 +spring:
  10 + datasource:
  11 + type: com.zaxxer.hikari.HikariDataSource
  12 + driver-class-name: com.mysql.cj.jdbc.Driver
  13 + username: trobs
  14 + password: +bdKL~ykG4
  15 + url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
  16 + resources:
  17 + static-locations: classpath:/static/,classpath:/views/
@@ -11,7 +11,7 @@ spring: @@ -11,7 +11,7 @@ spring:
11 type: com.zaxxer.hikari.HikariDataSource 11 type: com.zaxxer.hikari.HikariDataSource
12 driver-class-name: com.mysql.cj.jdbc.Driver 12 driver-class-name: com.mysql.cj.jdbc.Driver
13 username: trobs 13 username: trobs
14 - password: dfU76$N(kp  
15 - url: jdbc:mysql://10.1.1.86:3306/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8 14 + password: +bdKL~ykG4
  15 + url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
16 resources: 16 resources:
17 static-locations: classpath:/static/,classpath:/views/ 17 static-locations: classpath:/static/,classpath:/views/
  1 +## spring security 配置
  2 +security:
  3 + oauth2:
  4 + client:
  5 + client-id: ENC(sE4YEEBRxfP2UmSjgtltpq651316A0VtahL04wpYG659AQYATDGy/g==)
  6 + client-secret: ENC(sE4YEEBRxfP2UmSjgtltpq651316A0VtahL04wpYG659AQYATDGy/g==)
  7 + scope: server
  8 +# 数据源配置
  9 +spring:
  10 + datasource:
  11 + type: com.zaxxer.hikari.HikariDataSource
  12 + driver-class-name: com.mysql.cj.jdbc.Driver
  13 + username: trobs
  14 + password: +bdKL~ykG4
  15 + url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
  16 + resources:
  17 + static-locations: classpath:/static/,classpath:/views/
@@ -11,8 +11,8 @@ spring: @@ -11,8 +11,8 @@ spring:
11 type: com.zaxxer.hikari.HikariDataSource 11 type: com.zaxxer.hikari.HikariDataSource
12 driver-class-name: com.mysql.cj.jdbc.Driver 12 driver-class-name: com.mysql.cj.jdbc.Driver
13 username: trobs 13 username: trobs
14 - password: dfU76$N(kp  
15 - url: jdbc:mysql://10.1.1.86:3306/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8 14 + password: +bdKL~ykG4
  15 + url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
16 resources: 16 resources:
17 static-locations: classpath:/static/,classpath:/views/ 17 static-locations: classpath:/static/,classpath:/views/
18 #微信配置（物流信息推送） 18 #微信配置（物流信息推送）
@@ -11,7 +11,8 @@ spring: @@ -11,7 +11,8 @@ spring:
11 type: com.zaxxer.hikari.HikariDataSource 11 type: com.zaxxer.hikari.HikariDataSource
12 driver-class-name: com.mysql.cj.jdbc.Driver 12 driver-class-name: com.mysql.cj.jdbc.Driver
13 username: trobs 13 username: trobs
14 - password: dfU76$N(kp  
15 - url: jdbc:mysql://10.1.1.86:3306/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8 14 + password: +bdKL~ykG4
  15 + url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
16 resources: 16 resources:
17 static-locations: classpath:/static/,classpath:/views/ 17 static-locations: classpath:/static/,classpath:/views/
  18 +
@@ -12,7 +12,6 @@ security: @@ -12,7 +12,6 @@ security:
12 # 不校验验证码终端 12 # 不校验验证码终端
13 ignore: 13 ignore:
14 clients: 14 clients:
15 - - trobs  
16 - test 15 - test
17 swagger-providers: 16 swagger-providers:
18 - trobs-auth 17 - trobs-auth
@@ -11,7 +11,7 @@ spring: @@ -11,7 +11,7 @@ spring:
11 type: com.zaxxer.hikari.HikariDataSource 11 type: com.zaxxer.hikari.HikariDataSource
12 driver-class-name: com.mysql.cj.jdbc.Driver 12 driver-class-name: com.mysql.cj.jdbc.Driver
13 username: trobs 13 username: trobs
14 - password: dfU76$N(kp  
15 - url: jdbc:mysql://10.1.1.86:3306/trobs_report?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8 14 + password: +bdKL~ykG4
  15 + url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
16 resources: 16 resources:
17 static-locations: classpath:/static/,classpath:/views/ 17 static-locations: classpath:/static/,classpath:/views/
@@ -19,6 +19,6 @@ tm: @@ -19,6 +19,6 @@ tm:
19 maxconnection: 1000 #最大链接数 19 maxconnection: 1000 #最大链接数
20 compensate: 20 compensate:
21 auto: false #是否自动补偿 21 auto: false #是否自动补偿
22 - notifyUrl: http://ip:port/path #补偿结果通知（配消息总线里面） 22 + notifyUrl: http://ip:port/path #补偿结果通知（配消息总线里面,补偿机制没有用到）
23 tryTime: 30 # z再次重试时间间隔 23 tryTime: 30 # z再次重试时间间隔
24 maxWaitTime: 5000 # 请求超时的最大时间 (毫秒) 24 maxWaitTime: 5000 # 请求超时的最大时间 (毫秒)
@@ -11,6 +11,7 @@ security: @@ -11,6 +11,7 @@ security:
11 - '/v2/api-docs' 11 - '/v2/api-docs'
12 - '/user/info/*' 12 - '/user/info/*'
13 - '/social/info/*' 13 - '/social/info/*'
  14 + - '/social/getsocialbytype/*'
14 - '/mobile/*' 15 - '/mobile/*'
15 - '/log/save' 16 - '/log/save'
16 - '/swagger**' 17 - '/swagger**'
@@ -23,8 +24,8 @@ spring: @@ -23,8 +24,8 @@ spring:
23 type: com.zaxxer.hikari.HikariDataSource 24 type: com.zaxxer.hikari.HikariDataSource
24 driver-class-name: com.mysql.cj.jdbc.Driver 25 driver-class-name: com.mysql.cj.jdbc.Driver
25 username: trobs 26 username: trobs
26 - password: dfU76$N(kp  
27 - url: jdbc:mysql://10.1.1.86:3306/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true 27 + password: +bdKL~ykG4
  28 + url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
28 29
29 # swagger相关配置,覆盖全局配置 30 # swagger相关配置,覆盖全局配置
30 swagger: 31 swagger:
@@ -39,4 +40,4 @@ swagger: @@ -39,4 +40,4 @@ swagger:
39 # Logger Config 40 # Logger Config
40 logging: 41 logging:
41 level: 42 level:
42 - com.trob4cloud.trobs.admin.mapper: debug 43 + com.trob4cloud.trobs.admin.mapper: info
@@ -11,7 +11,7 @@ spring: @@ -11,7 +11,7 @@ spring:
11 type: com.zaxxer.hikari.HikariDataSource 11 type: com.zaxxer.hikari.HikariDataSource
12 driver-class-name: com.mysql.cj.jdbc.Driver 12 driver-class-name: com.mysql.cj.jdbc.Driver
13 username: trobs 13 username: trobs
14 - password: dfU76$N(kp  
15 - url: jdbc:mysql://10.1.1.86:3306/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8 14 + password: +bdKL~ykG4
  15 + url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
16 resources: 16 resources:
17 static-locations: classpath:/static/,classpath:/views/ 17 static-locations: classpath:/static/,classpath:/views/