Skip to content

Y
yichengstreet-be
Commit 75db214a authored by lixuan's avatar lixuan
Browse files
Options

Merge branch 'dev'

parents d49d8369 ee1bfb6a
Pipeline #143777 failed with stages
      in 28 minutes and 57 seconds
      Hide whitespace changes
      Inline Side-by-side
      Showing with 5 additions and 5 deletions
      ruoyi-admin/src/main/resources/application-dev.yml
      View file @ 75db214a
      ...@@ -97,14 +97,14 @@ spring: ...@@ -97,14 +97,14 @@ spring:
      druid: druid:
      # 主库数据源 # 主库数据源
      master: master:
      url: jdbc:mysql://mysql-test.yx-street.svc.cluster.local:3306/yichengstreet?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 url: jdbc:mysql://2.2.0.23:31642/yichengstreet?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
      username: root username: root
      password: P@44w0rd password: P@44w0rd
      # 从库数据源 # 从库数据源
      slave: slave:
      # 从数据源开关/默认关闭 # 从数据源开关/默认关闭
      enabled: true enabled: true
      url: jdbc:mysql://mysql-test.yx-street.svc.cluster.local:3306/yichengstreet-party?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 url: jdbc:mysql://2.2.0.23:31642/yichengstreet-party?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
      username: root username: root
      password: P@44w0rd password: P@44w0rd
      # 初始连接数 # 初始连接数
      ......
      ruoyi-admin/src/main/resources/application-prod.yml
      View file @ 75db214a
      ...@@ -96,14 +96,14 @@ spring: ...@@ -96,14 +96,14 @@ spring:
      druid: druid:
      # 主库数据源 # 主库数据源
      master: master:
      url: jdbc:mysql://mysql-prod.yx-street.svc.cluster.local:3306/yichengstreet?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 url: jdbc:mysql://2.2.0.23:30296/yichengstreet?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
      username: root username: root
      password: P@44w0rd password: P@44w0rd
      # 从库数据源 # 从库数据源
      slave: slave:
      # 从数据源开关/默认关闭 # 从数据源开关/默认关闭
      enabled: true enabled: true
      url: jdbc:mysql://mysql-prod.yx-street.svc.cluster.local:3306/yichengstreet-party?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 url: jdbc:mysql://2.2.0.23:30296/yichengstreet-party?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
      username: root username: root
      password: P@44w0rd password: P@44w0rd
      # 初始连接数 # 初始连接数
      ...@@ -217,4 +217,4 @@ app: ...@@ -217,4 +217,4 @@ app:
      mybatis: mybatis:
      configuration: configuration:
      log-impl: org.apache.ibatis.logging.stdout.StdOutImpl log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
      \ No newline at end of file
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment