肖紫光 / trobs-config · 提交

转到一个项目

作者 rayray20
提交 df34f88633665067dfe1b2e2ec68a0d19b832f30 1 个父辈 cfa82b30

修改配置

内嵌 并排对比
正在显示 23 个修改的文件 包含 58 行增加 和 58 行删除
... ... @@ -10,10 +10,10 @@ spring:
password: ZtbViC4jpH0gP6Ky
database: 14
rabbitmq:
host: 172.18.90.250
host: rabbitmq.aukeyit.com
port: 5672
username: yuanlierp
password: 0nzeo8MGKqx2CfFk
username: aukeyit
password: Aukey@2018
servlet:
multipart:
max-file-size: 1000MB
... ... @@ -101,13 +101,13 @@ security:
token-info-uri: http://trobs-auth/oauth/check_token
##首页
trobs:
index: http://yrerp.yuanlierp.com
index: http://trobs.aukeyit.com
##ftp服务器
aukey:
ftp:
host: 172.18.90.249
host: tp.ftp.aukeyit.com
port: 21
username: yuanli
password: Bp5v1zJh
username: golden
password: golden123456
binaryTransfer: true
localActive: false
... ...
... ... @@ -4,8 +4,8 @@ spring:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
username: trobs
password: +bdKL~ykG4
url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
password: !j2sBwZ@Ir!0
url: jdbc:mysql://jserp.mysql.db.com:20110/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
freemarker:
allow-request-override: false
allow-session-override: false
... ...
... ... @@ -15,7 +15,7 @@ spring:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
username: trobs
password: +bdKL~ykG4
url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
password: !j2sBwZ@Ir!0
url: jdbc:mysql://jserp.mysql.db.com:20110/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
resources:
static-locations: classpath:/static/,classpath:/views/
... ...
... ... @@ -11,7 +11,7 @@ spring:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
username: trobs
password: +bdKL~ykG4
url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs_report?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
password: !j2sBwZ@Ir!0
url: jdbc:mysql://jserp.mysql.db.com:20110/trobs_report?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
resources:
static-locations: classpath:/static/,classpath:/views/
... ...
... ... @@ -11,7 +11,7 @@ spring:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
username: trobs
password: +bdKL~ykG4
url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
password: !j2sBwZ@Ir!0
url: jdbc:mysql://jserp.mysql.db.com:20110/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
resources:
static-locations: classpath:/static/,classpath:/views/
... ...
... ... @@ -11,7 +11,7 @@ spring:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
username: trobs
password: +bdKL~ykG4
url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
password: !j2sBwZ@Ir!0
url: jdbc:mysql://jserp.mysql.db.com:20110/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
resources:
static-locations: classpath:/static/,classpath:/views/
... ...
... ... @@ -11,7 +11,7 @@ spring:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
username: trobs
password: +bdKL~ykG4
url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
password: !j2sBwZ@Ir!0
url: jdbc:mysql://jserp.mysql.db.com:20110/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
resources:
static-locations: classpath:/static/,classpath:/views/
... ...
... ... @@ -11,7 +11,7 @@ spring:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
username: trobs
password: +bdKL~ykG4
url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
password: !j2sBwZ@Ir!0
url: jdbc:mysql://jserp.mysql.db.com:20110/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
resources:
static-locations: classpath:/static/,classpath:/views/
\ No newline at end of file
... ...
... ... @@ -11,7 +11,7 @@ spring:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
username: trobs
password: +bdKL~ykG4
url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
password: !j2sBwZ@Ir!0
url: jdbc:mysql://jserp.mysql.db.com:20110/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
resources:
static-locations: classpath:/static/,classpath:/views/
\ No newline at end of file
... ...
... ... @@ -11,7 +11,7 @@ spring:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
username: trobs
password: +bdKL~ykG4
url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
password: !j2sBwZ@Ir!0
url: jdbc:mysql://jserp.mysql.db.com:20110/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
resources:
static-locations: classpath:/static/,classpath:/views/
... ...
... ... @@ -11,7 +11,7 @@ spring:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
username: trobs
password: +bdKL~ykG4
url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
password: !j2sBwZ@Ir!0
url: jdbc:mysql://jserp.mysql.db.com:20110/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
resources:
static-locations: classpath:/static/,classpath:/views/
... ...
... ... @@ -11,7 +11,7 @@ spring:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
username: trobs
password: +bdKL~ykG4
url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
password: !j2sBwZ@Ir!0
url: jdbc:mysql://jserp.mysql.db.com:20110/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
resources:
static-locations: classpath:/static/,classpath:/views/
... ...
... ... @@ -10,8 +10,8 @@ spring:
datasource:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
username: trobs_report
password: V4dt*1Gt4Q
url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
username: trobs
password: !j2sBwZ@Ir!0
url: jdbc:mysql://jserp.mysql.db.com:20110/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
resources:
static-locations: classpath:/static/,classpath:/views/
... ...
... ... @@ -11,8 +11,8 @@ spring:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
username: trobs
password: +bdKL~ykG4
url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
password: !j2sBwZ@Ir!0
url: jdbc:mysql://jserp.mysql.db.com:20110/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
resources:
static-locations: classpath:/static/,classpath:/views/
... ...
... ... @@ -11,7 +11,7 @@ spring:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
username: trobs
password: +bdKL~ykG4
url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
password: !j2sBwZ@Ir!0
url: jdbc:mysql://jserp.mysql.db.com:20110/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
resources:
static-locations: classpath:/static/,classpath:/views/
... ...
... ... @@ -11,7 +11,7 @@ spring:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
username: trobs
password: +bdKL~ykG4
url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
password: !j2sBwZ@Ir!0
url: jdbc:mysql://jserp.mysql.db.com:20110/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
resources:
static-locations: classpath:/static/,classpath:/views/
... ...
... ... @@ -11,7 +11,7 @@ spring:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
username: trobs
password: +bdKL~ykG4
url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
password: !j2sBwZ@Ir!0
url: jdbc:mysql://jserp.mysql.db.com:20110/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
resources:
static-locations: classpath:/static/,classpath:/views/
... ...
... ... @@ -11,7 +11,7 @@ spring:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
username: trobs
password: +bdKL~ykG4
url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
password: !j2sBwZ@Ir!0
url: jdbc:mysql://jserp.mysql.db.com:20110/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
resources:
static-locations: classpath:/static/,classpath:/views/
... ...
... ... @@ -11,17 +11,17 @@ spring:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
username: trobs
password: +bdKL~ykG4
url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
password: !j2sBwZ@Ir!0
url: jdbc:mysql://jserp.mysql.db.com:20110/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
resources:
static-locations: classpath:/static/,classpath:/views/
#微信配置（物流信息推送）
weixin:
gettoken: https://qyapi.weixin.qq.com/cgi-bin/gettoken
sendmessage: https://qyapi.weixin.qq.com/cgi-bin/message/send
notify:
head: 消息通知
culture: 付出 简单 开放
sysname: 猿人创新 原力ERP
url: http://yrerp.yuanlierp.com
tail: 前往原力
## notify:
## head: 消息通知
## culture: 付出 简单 开放
## sysname: 猿人创新 原力ERP
## url: http://yrerp.yuanlierp.com
## tail: 前往原力
... ...
... ... @@ -11,8 +11,8 @@ spring:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
username: trobs
password: +bdKL~ykG4
url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
password: !j2sBwZ@Ir!0
url: jdbc:mysql://jserp.mysql.db.com:20110/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
resources:
static-locations: classpath:/static/,classpath:/views/
... ...
... ... @@ -11,7 +11,7 @@ spring:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
username: trobs
password: +bdKL~ykG4
url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs_report?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
password: !j2sBwZ@Ir!0
url: jdbc:mysql://jserp.mysql.db.com:20110/trobs_report?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
resources:
static-locations: classpath:/static/,classpath:/views/
... ...
... ... @@ -24,8 +24,8 @@ spring:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
username: trobs
password: +bdKL~ykG4
url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
password: !j2sBwZ@Ir!0
url: jdbc:mysql://jserp.mysql.db.com:20110/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
# swagger相关配置,覆盖全局配置
swagger:
... ...
... ... @@ -11,7 +11,7 @@ spring:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
username: trobs
password: +bdKL~ykG4
url: jdbc:mysql://rm-wz98uta593nt9fnha.mysql.rds.aliyuncs.com/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
password: !j2sBwZ@Ir!0
url: jdbc:mysql://jserp.mysql.db.com:20110/trobs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
resources:
static-locations: classpath:/static/,classpath:/views/
... ...