wms / wms4_xinxiangweiliang · Commits

Commit 777cb329ebfdb193921d97a466c40afb813b82e2

Authored by 肖超群
1 parent ece6f81a

add

Inline Side-by-side
Showing 1 changed file with 16 additions and 15 deletions
huaheng-wms-core/src/main/resources/application-dev.yml
  View file @777cb32
@@ -47,7 +47,7 @@ spring: @@ -47,7 +47,7 @@ spring:
47 org: 47 org:
48 quartz: 48 quartz:
49 scheduler: 49 scheduler:
50 - instanceName: dev 50 + instanceName: test
51 instanceId: AUTO 51 instanceId: AUTO
52 jobStore: 52 jobStore:
53 class: org.quartz.impl.jdbcjobstore.JobStoreTX 53 class: org.quartz.impl.jdbcjobstore.JobStoreTX
@@ -118,7 +118,7 @@ spring: @@ -118,7 +118,7 @@ spring:
118 timeBetweenEvictionRunsMillis: 60000 118 timeBetweenEvictionRunsMillis: 60000
119 # 配置一个连接在池中最小生存的时间，单位是毫秒 119 # 配置一个连接在池中最小生存的时间，单位是毫秒
120 minEvictableIdleTimeMillis: 300000 120 minEvictableIdleTimeMillis: 300000
121 - validationQuery: SELECT 1 121 + validationQuery: SELECT 1 FROM DUAL
122 testWhileIdle: true 122 testWhileIdle: true
123 testOnBorrow: false 123 testOnBorrow: false
124 testOnReturn: false 124 testOnReturn: false
@@ -131,9 +131,9 @@ spring: @@ -131,9 +131,9 @@ spring:
131 connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 131 connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
132 datasource: 132 datasource:
133 master: 133 master:
134 - 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 134 + url: jdbc:mysql://localhost:3306/wms4?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
135 username: root 135 username: root
136 - password: 123456 136 + password: HHsoft123.
137 driver-class-name: com.mysql.cj.jdbc.Driver 137 driver-class-name: com.mysql.cj.jdbc.Driver
138 # 多数据源配置 138 # 多数据源配置
139 # multi-datasource1: 139 # multi-datasource1:
@@ -149,9 +149,9 @@ spring: @@ -149,9 +149,9 @@ spring:
149 #redis 配置 149 #redis 配置
150 redis: 150 redis:
151 database: 0 151 database: 0
152 - host: 127.0.0.1 152 + host: 172.16.29.77
153 port: 6379 153 port: 6379
154 - password: "" 154 + password: 123456
155 lettuce: 155 lettuce:
156 pool: 156 pool:
157 min-idle: 0 #最小等待连接中的数量,设 0 为没有限制 157 min-idle: 0 #最小等待连接中的数量,设 0 为没有限制
@@ -196,17 +196,18 @@ jeecg: @@ -196,17 +196,18 @@ jeecg:
196 #webapp文件路径 196 #webapp文件路径
197 webapp: /opt/webapp 197 webapp: /opt/webapp
198 shiro: 198 shiro:
199 - excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/sys/getWarehouseByUserCode,/test/test**,/api/**,/sys/cas/client/validateLogin 199 + excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/sys/getWarehouseByUserCode,/api/**,/sys/cas/client/validateLogin
200 #阿里云oss存储和大鱼短信秘钥配置 200 #阿里云oss存储和大鱼短信秘钥配置
201 oss: 201 oss:
202 accessKey: ?? 202 accessKey: ??
203 secretKey: ?? 203 secretKey: ??
204 endpoint: oss-cn-beijing.aliyuncs.com 204 endpoint: oss-cn-beijing.aliyuncs.com
205 bucketName: jeecgdev 205 bucketName: jeecgdev
206 - # ElasticSearch 6设置 206 + staticDomain: https://static.jeecg.com
  207 + # ElasticSearch 设置
207 elasticsearch: 208 elasticsearch:
208 cluster-name: jeecg-ES 209 cluster-name: jeecg-ES
209 - cluster-nodes: 127.0.0.1:9200 210 + cluster-nodes: 81.70.47.128:9200
210 check-enabled: false 211 check-enabled: false
211 # 表单设计器配置 212 # 表单设计器配置
212 desform: 213 desform:
@@ -268,20 +269,20 @@ jeecg: @@ -268,20 +269,20 @@ jeecg:
268 data-type: database 269 data-type: database
269 #分布式锁配置 270 #分布式锁配置
270 redisson: 271 redisson:
271 - address: 127.0.0.1:6379  
272 - password: 272 + address: 172.16.29.77:6379
  273 + password: 123456
273 type: STANDALONE 274 type: STANDALONE
274 enabled: true 275 enabled: true
275 #cas单点登录 276 #cas单点登录
276 cas: 277 cas:
277 - prefixUrl: http://cas.server.com:8443/cas 278 + prefixUrl: http://172.16.29.77:8443/cas
278 #Mybatis输出sql日志 279 #Mybatis输出sql日志
279 logging: 280 logging:
280 level: 281 level:
281 - org.jeecg.common: DEBUG  
282 - org.jeecg.modules: DEBUG 282 + org.jeecg.common: INFO
283 org.jeecg.modules.wms: DEBUG 283 org.jeecg.modules.wms: DEBUG
284 - org.jeecg.config.shiro: DEBUG 284 + org.jeecg.config.shiro: INFO
  285 + org.jeecg.utils: INFO
285 #swagger 286 #swagger
286 knife4j: 287 knife4j:
287 #开启增强配置 288 #开启增强配置