diff --git a/huaheng-wms-core/src/main/resources/application-dev.yml b/huaheng-wms-core/src/main/resources/application-dev.yml index 908b2b9..fa4c006 100644 --- a/huaheng-wms-core/src/main/resources/application-dev.yml +++ b/huaheng-wms-core/src/main/resources/application-dev.yml @@ -47,7 +47,7 @@ spring: org: quartz: scheduler: - instanceName: dev + instanceName: test instanceId: AUTO jobStore: class: org.quartz.impl.jdbcjobstore.JobStoreTX @@ -118,7 +118,7 @@ spring: timeBetweenEvictionRunsMillis: 60000 # 配置一个连接在池中最小生存的时间,单位是毫秒 minEvictableIdleTimeMillis: 300000 - validationQuery: SELECT 1 + validationQuery: SELECT 1 FROM DUAL testWhileIdle: true testOnBorrow: false testOnReturn: false @@ -131,9 +131,9 @@ spring: connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 datasource: master: - url: jdbc:mysql://127.0.0.1:3306/wms4?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true + url: jdbc:mysql://localhost:3306/wms4?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true username: root - password: 123456 + password: HHsoft123. driver-class-name: com.mysql.cj.jdbc.Driver # 多数据源配置 # multi-datasource1: @@ -149,9 +149,9 @@ spring: #redis 配置 redis: database: 0 - host: 127.0.0.1 + host: 172.16.29.77 port: 6379 - password: "" + password: 123456 lettuce: pool: min-idle: 0 #最小等待连接中的数量,设 0 为没有限制 @@ -196,17 +196,18 @@ jeecg: #webapp文件路径 webapp: /opt/webapp shiro: - excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/sys/getWarehouseByUserCode,/test/test**,/api/**,/sys/cas/client/validateLogin + excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/sys/getWarehouseByUserCode,/api/**,/sys/cas/client/validateLogin #阿里云oss存储和大鱼短信秘钥配置 oss: accessKey: ?? secretKey: ?? endpoint: oss-cn-beijing.aliyuncs.com bucketName: jeecgdev - # ElasticSearch 6设置 + staticDomain: https://static.jeecg.com + # ElasticSearch 设置 elasticsearch: cluster-name: jeecg-ES - cluster-nodes: 127.0.0.1:9200 + cluster-nodes: 81.70.47.128:9200 check-enabled: false # 表单设计器配置 desform: @@ -268,20 +269,20 @@ jeecg: data-type: database #分布式锁配置 redisson: - address: 127.0.0.1:6379 - password: + address: 172.16.29.77:6379 + password: 123456 type: STANDALONE enabled: true #cas单点登录 cas: - prefixUrl: http://cas.server.com:8443/cas + prefixUrl: http://172.16.29.77:8443/cas #Mybatis输出sql日志 logging: level: - org.jeecg.common: DEBUG - org.jeecg.modules: DEBUG + org.jeecg.common: INFO org.jeecg.modules.wms: DEBUG - org.jeecg.config.shiro: DEBUG + org.jeecg.config.shiro: INFO + org.jeecg.utils: INFO #swagger knife4j: #开启增强配置