Merge remote-tracking branch 'origin/master'

guoshilong

2022-08-31 584e6a7781c3c3e53a517a6ffd8e97dbf2f737ba

 src/main/resources/application-dev.yml

@@ -12,13 +12,13 @@
    #  nodes: 127.0.0.1:7001,127.0.0.1:7002,127.0.0.1:7003
    #  commandTimeout: 5000
  datasource:
    url: jdbc:mysql://localhost:3306/zhny?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
    username: root
    password: root
#    url: jdbc:mysql://localhost:3306/zhny?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
#    username: root
#    password: root
    # MySql
#    url: jdbc:mysql://127.0.0.1:3306/zhny?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
#    username: zhny
#    password: ZHny@2022
    url: jdbc:mysql://127.0.0.1:3306/zhny?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
    username: zhny
    password: ZHny@2022
    # PostgreSQL
    #url: jdbc:postgresql://127.0.0.1:5432/bladex_boot
    #username: postgres
@@ -61,5 +61,5 @@

# 溯源码扫描读取页面 url
zhny:
  codeUrl: http://dev.jxpskj.com:8013/traceablityInfo.html
  codeUrl: http://dev.jxpskj.com:8020/zhny-web/traceablityInfo.html