diff --git a/nc_wms_java/sa-admin/src/main/resources/dev/application.yaml b/nc_wms_java/sa-admin/src/main/resources/dev/application.yaml index a989e13..fe11e16 100644 --- a/nc_wms_java/sa-admin/src/main/resources/dev/application.yaml +++ b/nc_wms_java/sa-admin/src/main/resources/dev/application.yaml @@ -8,11 +8,17 @@ # 项目配置: 名称、日志目录 project: name: sa-admin - log-directory: ${localPath:/home}/logs/smart_admin_v3/${project.name}/${spring.profiles.active} + log-directory: /home/logs/nc_wms/${project.name}/${spring.profiles.active} # 项目端口和url根路径 server: port: 8000 + ssl: + key-store: classpath:javaboy.p12 + key-store-type: PKCS12 + key-store-password: 123456 + key-alias: tomcathttps + enabled: true servlet: context-path: / diff --git a/nc_wms_java/sa-admin/src/main/resources/javaboy.p12 b/nc_wms_java/sa-admin/src/main/resources/javaboy.p12 new file mode 100644 index 0000000..de3cea2 Binary files /dev/null and b/nc_wms_java/sa-admin/src/main/resources/javaboy.p12 differ diff --git a/nc_wms_java/sa-admin/src/main/resources/prod/application.yaml b/nc_wms_java/sa-admin/src/main/resources/prod/application.yaml index 228a06a..fe11e16 100644 --- a/nc_wms_java/sa-admin/src/main/resources/prod/application.yaml +++ b/nc_wms_java/sa-admin/src/main/resources/prod/application.yaml @@ -8,11 +8,17 @@ # 项目配置: 名称、日志目录 project: name: sa-admin - log-directory: /home/logs/smart_admin_v3/${project.name}/${spring.profiles.active} + log-directory: /home/logs/nc_wms/${project.name}/${spring.profiles.active} # 项目端口和url根路径 server: port: 8000 + ssl: + key-store: classpath:javaboy.p12 + key-store-type: PKCS12 + key-store-password: 123456 + key-alias: tomcathttps + enabled: true servlet: context-path: / diff --git a/nc_wms_java/sa-base/src/main/resources/dev/sa-base.yaml b/nc_wms_java/sa-base/src/main/resources/dev/sa-base.yaml index 3700071..f74f9e6 100644 --- a/nc_wms_java/sa-base/src/main/resources/dev/sa-base.yaml +++ b/nc_wms_java/sa-base/src/main/resources/dev/sa-base.yaml @@ -1,9 +1,9 @@ spring: # 数据库连接信息 datasource: - url: jdbc:p6spy:mysql://123.60.65.29:3306/nc_wms?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai + url: jdbc:p6spy:mysql://47.103.100.52:53306/nc_wms?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai username: root - password: root + password: Youchain@56 driver-class-name: com.p6spy.engine.spy.P6SpyDriver initial-size: 2 min-idle: 2 @@ -23,10 +23,12 @@ spring: # redis 连接池配置信息 data: redis: + sentinel: + master: mymaster + nodes: 47.117.45.79:26379,8.133.200.233:26379,123.60.65.29:26379 + password: 123456 # Sentinel 密码 + password: 123456 # Redis 主从节点密码 database: 1 - host: 127.0.0.1 - port: 6379 - password: timeout: 10000ms lettuce: pool: @@ -82,7 +84,7 @@ file: storage: mode: local local: - upload-path: /home/smart_admin_v3/upload/ #文件上传目录 + upload-path: /home/ncwms/upload/ #文件上传目录 url-prefix: cloud: region: oss-cn-hangzhou diff --git a/nc_wms_java/sa-base/src/main/resources/prod/sa-base.yaml b/nc_wms_java/sa-base/src/main/resources/prod/sa-base.yaml index 623c25f..71384ca 100644 --- a/nc_wms_java/sa-base/src/main/resources/prod/sa-base.yaml +++ b/nc_wms_java/sa-base/src/main/resources/prod/sa-base.yaml @@ -1,9 +1,9 @@ spring: # 数据库连接信息 datasource: - url: jdbc:p6spy:mysql://123.60.65.29:3306/nc_wms?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useCursorFetch=true + url: jdbc:p6spy:mysql://47.103.100.52:53306/nc_wms?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useCursorFetch=true username: root - password: root + password: Youchain@56 driver-class-name: com.p6spy.engine.spy.P6SpyDriver initial-size: 10 min-idle: 10 @@ -23,16 +23,18 @@ spring: # redis 连接池配置信息 data: redis: + sentinel: + master: mymaster + nodes: 47.117.45.79:26379,8.133.200.233:26379,123.60.65.29:26379 + password: 123456 # Sentinel 密码 + password: 123456 # Redis 主从节点密码 database: 1 - host: 123.60.65.29 - port: 6379 - password: 123456 timeout: 10000ms lettuce: pool: - max-active: 100 - min-idle: 10 - max-idle: 50 + max-active: 5 + min-idle: 1 + max-idle: 3 max-wait: 30000ms # 邮件,置以SSL的方式发送, 这个需要使用这种方式并且端口是465 @@ -82,7 +84,7 @@ file: storage: mode: local local: - upload-path: /home/smart_admin_v3/upload/ #文件上传目录 + upload-path: /home/nc_wms/upload/ #文件上传目录 url-prefix: http://123.60.65.29:8000/upload/ cloud: region: oss-cn-hangzhou