Commit bfe2a06e9e1fc5931f1b5963ca8b370402c3b6d2

Authored by 谭毅彬
1 parent c0e6edd2

调整测试环境配置

Signed-off-by: TanYibin <5491541@qq.com>
huaheng-wms-core/src/main/resources/application-test.yml
... ... @@ -159,10 +159,10 @@ spring:
159 159 datasource:
160 160 master:
161 161 # mysql数据源配置
162   - #url: jdbc:log4jdbc:mysql://172.16.29.45:3306/wms4?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
163   - #username: root
164   - #password: hhsoftware
165   - #driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
  162 + # url: jdbc:log4jdbc:mysql://127.0.0.1:3306/wms4?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
  163 + # username: root
  164 + # password: HHsoft123.
  165 + # driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
166 166 # sqlserver 数据源配置
167 167 url: jdbc:sqlserver://172.16.29.91:1433;DatabaseName=wms4_andritz;encrypt=false;SelectMethod=cursor;
168 168 username: sa
... ... @@ -170,21 +170,22 @@ spring:
170 170 driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
171 171 # 多数据源配置
172 172 # multi-datasource1:
173   - # url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
  173 + # url: jdbc:mysql://127.0.0.1:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
174 174 # username: root
175 175 # password: root
176 176 # driver-class-name: com.mysql.cj.jdbc.Driver
177   - # 达梦数据库链接驱动
  177 + # # 达梦数据库链接驱动
178 178 # url: jdbc:dm://192.168.225.128:5236?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
179 179 # username: WMS4
180 180 # password: 123456
181 181 # driver-class-name: dm.jdbc.driver.DmDriver
  182 +
182 183 #redis 配置
183 184 redis:
184 185 database: 0
185   - host: 127.0.0.1
  186 + host: 172.16.29.77
186 187 port: 6379
187   - password: ''
  188 + password: 123456
188 189 timeout: 5000 #超时时间ms
189 190 lettuce:
190 191 pool:
... ... @@ -209,7 +210,7 @@ mybatis-plus:
209 210 map-underscore-to-camel-case: true
210 211 auto-mapping-behavior: full
211 212 # 这个配置不打印自带的SQL日志
212   - log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
  213 + # log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
213 214 # 返回类型为Map,显示null对应的字段
214 215 call-setters-on-nulls: true
215 216 #jeecg专用配置
... ... @@ -277,11 +278,7 @@ jeecg:
277 278 - title: 条码单边打印机纸
278 279 size:
279 280 - 60
280   - - 100
281   - - title: 80*60打印机纸
282   - size:
283 281 - 80
284   - - 60
285 282 mode: dev
286 283 #数据字典是否进行saas数据隔离,自己看自己的字典
287 284 saas: false
... ... @@ -321,8 +318,8 @@ jeecg:
321 318 data-type: database
322 319 #分布式锁配置
323 320 redisson:
324   - address: 127.0.0.1:6379
325   - password: ''
  321 + address: 172.16.29.77:6379
  322 + password: 123456
326 323 type: STANDALONE
327 324 enabled: true
328 325 #cas单点登录
... ...