From 9ae195f84421cf10868c97b2338943d30ff6530d Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 10 Jan 2019 20:53:38 +0800 Subject: [PATCH] =?UTF-8?q?[DEV=5FDB][=E4=BF=AE=E6=94=B9]:DEV=20DB?= =?UTF-8?q?=E5=AF=86=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 43 ++++++++++++++++++- .../src/main/resources/application.yml | 40 ----------------- .../src/main/resources/application-dev.yml | 28 ++++++++++-- .../src/main/resources/application.yml | 14 ------ .../src/main/resources/application-dev.yml | 29 +++++++++++-- .../src/main/resources/application.yml | 14 ------ .../src/main/resources/application-dev.yml | 27 ++++++++++-- .../src/main/resources/application.yml | 20 +-------- 8 files changed, 116 insertions(+), 99 deletions(-) diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml index 55d8b9612..f7f87cb06 100644 --- a/mallinkAdmin/src/main/resources/application-dev.yml +++ b/mallinkAdmin/src/main/resources/application-dev.yml @@ -3,7 +3,7 @@ spring: datasource: url: jdbc:mysql://202.165.179.86:3306/mallinkDev?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false username: ENC(dZ8fmrtuBMQYaRytKQgTqg==) - password: ENC(OZXsE6/Tj+V1Yu2wdjnIGbNOaBVQzi9W) + password: ENC(WGu0+1DPIHrqorDhrbq1+7wr7xNG53mN) type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver filters: stat @@ -38,6 +38,47 @@ spring: max-idle: 500 max-wait: -1 min-idle: 10 + # EMAIL + mail: + host: smtp.exmail.qq.com + username: ENC(R0bER9E9OB9/YQcpNXMyYDwofNVb8/pFl4nrApS8mi0=) + password: ENC(50YqJd0iK/2r2YnmEd5RKaki3ktU73UDapBJrVYfqmc=) # 授权密码 + properties: + mail: + smtp: + auth: true + starttls: + enable: true +aws: + clientRegion: cn-northwest-1 + bucketName: iformall-net + access: ENC(3gx5ghDFBqGrEhO3Wf8aYmXsnwHO7Cj3HNKJGOeUj0o=) + secret: ENC(HVKIJwCJKVXLlUpGlQPwNqJOlnpxn4xYuy91SH0seTSm2uAttIQHvA49fXWWax90v5wloIk0QuU=) + +wechat: + open: + componentAppId: "wx897e4673286c915d" + componentSecret: "cdfdfda65c45689beb6766c4c427eed2" + componentToken: "formall2018" + componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN" + redis: + host: 202.165.179.86 + port: 6379 + password: ENC(aYJ3Wr2UWtkORRQjjrWWpz2ZeTISsHOA) + timeout: 3600 + expire: 1800 #30分钟 + database: 1 + defaultExpiration: 2592000 # 默认生命周期30天 + jedis: + pool: + max-active: 100 + max-idle: 500 + max-wait: -1 + min-idle: 10 + +jasypt: + encryptor: + password: oRqdnDbK5pj3eMmB fm: exception: false diff --git a/mallinkAdmin/src/main/resources/application.yml b/mallinkAdmin/src/main/resources/application.yml index b42f55151..7dd25fcdc 100644 --- a/mallinkAdmin/src/main/resources/application.yml +++ b/mallinkAdmin/src/main/resources/application.yml @@ -21,16 +21,6 @@ spring: cache-names: redis_cache #缓存的名字(可以不指定) redis: time-to-live: 60000ms #很重要,缓存的有效时间,以便缓存的过期(单位为毫秒) - mail: - host: smtp.exmail.qq.com - username: ENC(R0bER9E9OB9/YQcpNXMyYDwofNVb8/pFl4nrApS8mi0=) - password: ENC(50YqJd0iK/2r2YnmEd5RKaki3ktU73UDapBJrVYfqmc=) # 授权密码 - properties: - mail: - smtp: - auth: true - starttls: - enable: true # @{link} https://github.com/abel533 #Mybatis @@ -63,35 +53,5 @@ mapper: pay: real: true -aws: - clientRegion: cn-northwest-1 - bucketName: iformall-net - access: ENC(3gx5ghDFBqGrEhO3Wf8aYmXsnwHO7Cj3HNKJGOeUj0o=) - secret: ENC(HVKIJwCJKVXLlUpGlQPwNqJOlnpxn4xYuy91SH0seTSm2uAttIQHvA49fXWWax90v5wloIk0QuU=) - -wechat: - open: - componentAppId: "wx897e4673286c915d" - componentSecret: "cdfdfda65c45689beb6766c4c427eed2" - componentToken: "formall2018" - componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN" - redis: - host: 202.165.179.86 - port: 6379 - password: ENC(aYJ3Wr2UWtkORRQjjrWWpz2ZeTISsHOA) - timeout: 3600 - expire: 1800 #30分钟 - database: 1 - defaultExpiration: 2592000 # 默认生命周期30天 - jedis: - pool: - max-active: 100 - max-idle: 500 - max-wait: -1 - min-idle: 10 - -jasypt: - encryptor: - password: oRqdnDbK5pj3eMmB version: @project.version@ \ No newline at end of file diff --git a/mallinkBApi/src/main/resources/application-dev.yml b/mallinkBApi/src/main/resources/application-dev.yml index 693737f24..48db5e133 100644 --- a/mallinkBApi/src/main/resources/application-dev.yml +++ b/mallinkBApi/src/main/resources/application-dev.yml @@ -1,9 +1,9 @@ spring: # JDBC datasource: - url: jdbc:mysql://202.165.179.86:3306/mallinkDev?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false + url: jdbc:mysql://202.165.179.86:3306/mallinkDev?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false username: ENC(dZ8fmrtuBMQYaRytKQgTqg==) - password: ENC(OZXsE6/Tj+V1Yu2wdjnIGbNOaBVQzi9W) + password: ENC(WGu0+1DPIHrqorDhrbq1+7wr7xNG53mN) type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver filters: stat @@ -33,10 +33,30 @@ spring: defaultExpiration: 2592000 # 默认生命周期30天 jedis: pool: - max-active: 8 - max-idle: 8 + max-active: 50 + max-idle: 30 max-wait: -1 min-idle: 0 + # EMAIL + mail: + host: smtp.exmail.qq.com + username: ENC(R0bER9E9OB9/YQcpNXMyYDwofNVb8/pFl4nrApS8mi0=) + password: ENC(50YqJd0iK/2r2YnmEd5RKaki3ktU73UDapBJrVYfqmc=) # 授权密码 + properties: + mail: + smtp: + auth: true + starttls: + enable: true +aws: + clientRegion: cn-northwest-1 + bucketName: iformall-net + access: ENC(3gx5ghDFBqGrEhO3Wf8aYmXsnwHO7Cj3HNKJGOeUj0o=) + secret: ENC(HVKIJwCJKVXLlUpGlQPwNqJOlnpxn4xYuy91SH0seTSm2uAttIQHvA49fXWWax90v5wloIk0QuU=) + +jasypt: + encryptor: + password: oRqdnDbK5pj3eMmB fm: exception: false diff --git a/mallinkBApi/src/main/resources/application.yml b/mallinkBApi/src/main/resources/application.yml index 50d22354f..0e4588f52 100644 --- a/mallinkBApi/src/main/resources/application.yml +++ b/mallinkBApi/src/main/resources/application.yml @@ -1,4 +1,3 @@ -debug: true server: port: 8000 servlet: @@ -13,16 +12,6 @@ spring: date-format: yyyy-MM-dd HH:mm:ss time-zone: GMT+8 default-property-inclusion: non_null - mail: - host: smtp.exmail.qq.com - username: ENC(R0bER9E9OB9/YQcpNXMyYDwofNVb8/pFl4nrApS8mi0=) - password: ENC(50YqJd0iK/2r2YnmEd5RKaki3ktU73UDapBJrVYfqmc=) # 授权密码 - properties: - mail: - smtp: - auth: true - starttls: - enable: true # @{link} https://github.com/abel533 #Mybatis @@ -54,8 +43,5 @@ mapper: pay: real: true -jasypt: - encryptor: - password: oRqdnDbK5pj3eMmB version: @project.version@ \ No newline at end of file diff --git a/mallinkCApi/src/main/resources/application-dev.yml b/mallinkCApi/src/main/resources/application-dev.yml index a0bb7f6f1..41aa1cdae 100644 --- a/mallinkCApi/src/main/resources/application-dev.yml +++ b/mallinkCApi/src/main/resources/application-dev.yml @@ -1,9 +1,9 @@ spring: # JDBC datasource: - url: jdbc:mysql://202.165.179.86:3306/mallinkDev?useUnicode=true&characterEncoding=UTF-8&useSSL=false + url: jdbc:mysql://202.165.179.86:3306/mallinkDev?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false username: ENC(dZ8fmrtuBMQYaRytKQgTqg==) - password: ENC(OZXsE6/Tj+V1Yu2wdjnIGbNOaBVQzi9W) + password: ENC(WGu0+1DPIHrqorDhrbq1+7wr7xNG53mN) type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver filters: stat @@ -32,10 +32,31 @@ spring: database: 1 jedis: pool: - max-active: 8 - max-idle: 8 + max-active: 200 + max-idle: 100 max-wait: -1 min-idle: 0 + # EMAIL + mail: + host: smtp.exmail.qq.com + username: ENC(R0bER9E9OB9/YQcpNXMyYDwofNVb8/pFl4nrApS8mi0=) + password: ENC(50YqJd0iK/2r2YnmEd5RKaki3ktU73UDapBJrVYfqmc=) # 授权密码 + properties: + mail: + smtp: + auth: true + starttls: + enable: true +aws: + clientRegion: cn-northwest-1 + bucketName: iformall-net + access: ENC(3gx5ghDFBqGrEhO3Wf8aYmXsnwHO7Cj3HNKJGOeUj0o=) + secret: ENC(HVKIJwCJKVXLlUpGlQPwNqJOlnpxn4xYuy91SH0seTSm2uAttIQHvA49fXWWax90v5wloIk0QuU=) + + +jasypt: + encryptor: + password: oRqdnDbK5pj3eMmB fm: exception: false diff --git a/mallinkCApi/src/main/resources/application.yml b/mallinkCApi/src/main/resources/application.yml index a0d7a4395..bf31b2046 100644 --- a/mallinkCApi/src/main/resources/application.yml +++ b/mallinkCApi/src/main/resources/application.yml @@ -12,17 +12,6 @@ spring: date-format: yyyy-MM-dd HH:mm:ss time-zone: GMT+8 default-property-inclusion: non_null - mail: - host: smtp.exmail.qq.com - username: ENC(R0bER9E9OB9/YQcpNXMyYDwofNVb8/pFl4nrApS8mi0=) - password: ENC(50YqJd0iK/2r2YnmEd5RKaki3ktU73UDapBJrVYfqmc=) # 授权密码 - properties: - mail: - smtp: - auth: true - starttls: - enable: true - # @{link} https://github.com/abel533 #Mybatis @@ -54,8 +43,5 @@ mapper: pay: real: true -jasypt: - encryptor: - password: oRqdnDbK5pj3eMmB version: @project.version@ \ No newline at end of file diff --git a/mallinkSchedule/src/main/resources/application-dev.yml b/mallinkSchedule/src/main/resources/application-dev.yml index 16f0cf6ec..4d216e66a 100644 --- a/mallinkSchedule/src/main/resources/application-dev.yml +++ b/mallinkSchedule/src/main/resources/application-dev.yml @@ -3,7 +3,7 @@ spring: datasource: url: jdbc:mysql://202.165.179.86:3306/mallinkDev?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false username: ENC(dZ8fmrtuBMQYaRytKQgTqg==) - password: ENC(OZXsE6/Tj+V1Yu2wdjnIGbNOaBVQzi9W) + password: ENC(WGu0+1DPIHrqorDhrbq1+7wr7xNG53mN) type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver filters: stat @@ -34,10 +34,31 @@ spring: defaultExpiration: 2592000 # 默认生命周期30天 jedis: pool: - max-active: 100 - max-idle: 500 + max-active: 50 + max-idle: 50 max-wait: -1 min-idle: 10 + # EMAIL + mail: + host: smtp.exmail.qq.com + username: ENC(R0bER9E9OB9/YQcpNXMyYDwofNVb8/pFl4nrApS8mi0=) + password: ENC(50YqJd0iK/2r2YnmEd5RKaki3ktU73UDapBJrVYfqmc=) # 授权密码 + properties: + mail: + smtp: + auth: true + starttls: + enable: true +aws: + clientRegion: cn-northwest-1 + bucketName: iformall-net + access: ENC(3gx5ghDFBqGrEhO3Wf8aYmXsnwHO7Cj3HNKJGOeUj0o=) + secret: ENC(HVKIJwCJKVXLlUpGlQPwNqJOlnpxn4xYuy91SH0seTSm2uAttIQHvA49fXWWax90v5wloIk0QuU=) + + +jasypt: + encryptor: + password: oRqdnDbK5pj3eMmB fm: exception: false diff --git a/mallinkSchedule/src/main/resources/application.yml b/mallinkSchedule/src/main/resources/application.yml index 32c467676..14e568b8c 100644 --- a/mallinkSchedule/src/main/resources/application.yml +++ b/mallinkSchedule/src/main/resources/application.yml @@ -21,16 +21,7 @@ spring: cache-names: redis_cache #缓存的名字(可以不指定) redis: time-to-live: 60000ms #很重要,缓存的有效时间,以便缓存的过期(单位为毫秒) - mail: - host: smtp.exmail.qq.com - username: ENC(R0bER9E9OB9/YQcpNXMyYDwofNVb8/pFl4nrApS8mi0=) - password: ENC(50YqJd0iK/2r2YnmEd5RKaki3ktU73UDapBJrVYfqmc=) # 授权密码 - properties: - mail: - smtp: - auth: true - starttls: - enable: true + # @{link} https://github.com/abel533 @@ -63,14 +54,5 @@ mapper: pay: real: true -aws: - clientRegion: cn-northwest-1 - bucketName: iformall-net - access: ENC(3gx5ghDFBqGrEhO3Wf8aYmXsnwHO7Cj3HNKJGOeUj0o=) - secret: ENC(HVKIJwCJKVXLlUpGlQPwNqJOlnpxn4xYuy91SH0seTSm2uAttIQHvA49fXWWax90v5wloIk0QuU=) - -jasypt: - encryptor: - password: oRqdnDbK5pj3eMmB version: @project.version@ \ No newline at end of file