zhongrj
2023-09-08 d7408ab642caf3458df75699614ad0471ede797d
nacos test 配置修改,在用模块新增 test yml 配置
3 files modified
5 files added
254 ■■■■■ changed files
skjcmanager/skjcmanager-auth/src/main/resources/application-test.yml 14 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/constant/LauncherConstant.java 5 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/resources/application-test.yml 54 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/resources/application-test.yml 39 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-pwd/src/main/resources/application-test.yml 36 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/resources/application-prod.yml 17 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/resources/application-test.yml 47 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-xxljob/src/main/resources/application-test.yml 42 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-auth/src/main/resources/application-test.yml
@@ -13,3 +13,17 @@
social:
  enabled: true
  domain: http://127.0.0.1:1888
#oauth2统一单点登录
oauth:
  config:
    client-id: hbxskkey
    client-secret: hbxsksecret
    app-key: uaq775d4a7ufmefyf7sm16vs
    app-secret: qjq1qizyo1baoyvzdlbu226hkhrs4vl2
    server-url-prefix: http://10.42.6.99:30000/api/IAM
    token-url: ${oauth.config.server-url-prefix}/cas/oauth2.0/accessToken
    profile-url: ${oauth.config.server-url-prefix}/api-auth/inspur/cas/oauth2.0/profile
    redirect-uri: http://10.10.3.99:32182/api/blade-auth/oauth/tokenLoginUI
    redirect-web-uri: http://10.10.3.99:32182/#/tokenlogin
    redirect-exit-uri: http://10.10.3.99:32182/#/index
skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/constant/LauncherConstant.java
@@ -45,7 +45,8 @@
    /**
     * nacos prod 地址
     */
    String NACOS_PROD_ADDR = "127.0.0.1:8888";
//    String NACOS_PROD_ADDR = "nacos01.zhsk.svc.cluster.local:8848";
    String NACOS_PROD_ADDR = "nacos.zhsk:8848";
    String NACOS_USERNAME = "nacos";
@@ -54,7 +55,7 @@
    /**
     * nacos test 地址
     */
    String NACOS_TEST_ADDR = "172.30.0.48:8848";
    String NACOS_TEST_ADDR = "127.0.0.1:8888";
    /**
     * sentinel dev 地址
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/resources/application-test.yml
New file
@@ -0,0 +1,54 @@
#服务器端口
server:
  port: 8111
#数据源配置
#spring:
#  datasource:
#    url: ${blade.datasource.test.url}
#    username: ${blade.datasource.test.username}
#    password: ${blade.datasource.test.password}
#多数据源配置
spring:
  #排除DruidDataSourceAutoConfigure
  autoconfigure:
    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
  datasource:
    dynamic:
      #设置默认的数据源或者数据源组,默认值即为master
      primary: master
      datasource:
        master:
          url: ${blade.datasource.test.url}
          username: ${blade.datasource.test.username}
          password: ${blade.datasource.test.password}
        zt:
          url: ${blade.datasource.test.zt.url}
          username: ${blade.datasource.test.zt.username}
          password: ${blade.datasource.test.zt.password}
        # 智能外呼数据库
        ztznwh:
          url: ${blade.datasource.test.ztznwh.url}
          username: ${blade.datasource.test.ztznwh.username}
          password: ${blade.datasource.test.ztznwh.password}
        ## 定时器数据源
        xxljob:
          url: ${blade.datasource.test.xxljob.url}
          username: ${blade.datasource.test.xxljob.username}
          password: ${blade.datasource.test.xxljob.password}
        ## 智能外呼数据源(mysql)
        znwh:
          driver-class-name: ${blade.datasource.test.znwh.driver-class-name}
          url: ${blade.datasource.test.znwh.url}
          username: ${blade.datasource.test.znwh.username}
          password: ${blade.datasource.test.znwh.password}
  main:
    allow-circular-references: true
getui:
  appId: "zyUET0RTBHAzLyMhV7dY32"
  appKey: "wuY8226sbu66P6tF9T0Fj5"
  appSecret: "IN3UEIeUccAiYgcBTLcK3A"
  masterSecret: "vlhKpASV66AJEfWnCgFsB2"
  # Url前缀
  baseUrl: "https://restapi.getui.com/v2/"
skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/resources/application-test.yml
New file
@@ -0,0 +1,39 @@
#服务器端口
server:
  port: 8115
#数据源配置
#spring:
#  datasource:
#    url: ${blade.datasource.test.url}
#    username: ${blade.datasource.test.username}
#    password: ${blade.datasource.test.password}
#多数据源配置
spring:
  rabbitmq:
    host: 10.42.7.146
    port: 5672
    username: algo
    password: P6#yzdd7
    virtual-host: /
  #排除DruidDataSourceAutoConfigure
  autoconfigure:
    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
  datasource:
    dynamic:
      #设置默认的数据源或者数据源组,默认值即为master
      primary: master
      datasource:
        master:
          url: ${blade.datasource.test.url}
          username: ${blade.datasource.test.username}
          password: ${blade.datasource.test.password}
        zt:
          url: ${blade.datasource.test.zt.url}
          username: ${blade.datasource.test.zt.username}
          password: ${blade.datasource.test.zt.password}
  main:
    allow-circular-references: true
skjcmanager/skjcmanager-service/skjcmanager-pwd/src/main/resources/application-test.yml
New file
@@ -0,0 +1,36 @@
#服务器端口
server:
  port: 8120
#数据源配置
#spring:
#  datasource:
#    url: ${blade.datasource.test.url}
#    username: ${blade.datasource.test.username}
#    password: ${blade.datasource.test.password}
#多数据源配置
spring:
  #排除DruidDataSourceAutoConfigure
  autoconfigure:
    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
  datasource:
    dynamic:
      #设置默认的数据源或者数据源组,默认值即为master
      primary: master
      datasource:
        master:
          url: ${blade.datasource.test.url}
          username: ${blade.datasource.test.username}
          password: ${blade.datasource.test.password}
        zt:
          url: ${blade.datasource.test.zt.url}
          username: ${blade.datasource.test.zt.username}
          password: ${blade.datasource.test.zt.password}
  main:
    allow-circular-references: true
yunPwd:
  config:
    url-prefix: http://10.10.1.1
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/resources/application-prod.yml
@@ -45,20 +45,3 @@
          password: ${blade.datasource.prod.znwh.password}
  main:
    allow-circular-references: true
#xxl:
#  job:
#    accessToken: ''
#    admin:
#      ### 调度中心部署根地址 [选填]:如调度中心集群部署存在多个地址则用逗号分隔。执行器将会使用该地址进行"执行器心跳注册"和"任务结果回调";为空则关闭自动注册;
#      addresses: http://127.0.0.1:7009/xxl-job-admin
#    executor:
#      ### 执行器AppName [选填]:执行器心跳注册分组依据;为空则关闭自动注册
#      appname: blade-xxljob
#      ### 执行器IP [选填]:默认为空表示自动获取IP,多网卡时可手动设置指定IP,该IP不会绑定Host仅作为通讯实用;地址信息用于 "执行器注册" 和 "调度中心请求并触发任务";
#      ip: 127.0.0.1
#      ### 执行器运行日志文件存储磁盘路径 [选填] :需要对该路径拥有读写权限;为空则使用默认路径;
#      logpath: ../data/applogs/xxl-job/jobhandler
#      ### 执行器日志文件保存天数 [选填] : 过期日志自动清理, 限制值大于等于3时生效; 否则, 如-1, 关闭自动清理功能;
#      logretentiondays: -1
#      ### 执行器端口号 [选填]:小于等于0则自动获取;默认端口为9999,单机部署多个执行器时,注意要配置不同执行器端口;
#      port: 7018
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/resources/application-test.yml
New file
@@ -0,0 +1,47 @@
#服务器端口
server:
  port: 8110
#数据源配置
#spring:
#  datasource:
#    url: ${blade.datasource.test.url}
#    username: ${blade.datasource.test.username}
#    password: ${blade.datasource.test.password}
#多数据源配置
spring:
  #排除DruidDataSourceAutoConfigure
  autoconfigure:
    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
  datasource:
    dynamic:
      #设置默认的数据源或者数据源组,默认值即为master
      primary: master
      datasource:
        master:
          url: ${blade.datasource.test.url}
          username: ${blade.datasource.test.username}
          password: ${blade.datasource.test.password}
        zt:
          url: ${blade.datasource.test.zt.url}
          username: ${blade.datasource.test.zt.username}
          password: ${blade.datasource.test.zt.password}
        # 智能外呼数据库
        ztznwh:
          url: ${blade.datasource.test.ztznwh.url}
          username: ${blade.datasource.test.ztznwh.username}
          password: ${blade.datasource.test.ztznwh.password}
        ## 定时器数据源
        xxljob:
          url: ${blade.datasource.test.xxljob.url}
          username: ${blade.datasource.test.xxljob.username}
          password: ${blade.datasource.test.xxljob.password}
        ## 智能外呼数据源(mysql)
        znwh:
          driver-class-name: ${blade.datasource.test.znwh.driver-class-name}
          url: ${blade.datasource.test.znwh.url}
          username: ${blade.datasource.test.znwh.username}
          password: ${blade.datasource.test.znwh.password}
  main:
    allow-circular-references: true
skjcmanager/skjcmanager-service/skjcmanager-xxljob/src/main/resources/application-test.yml
New file
@@ -0,0 +1,42 @@
#多数据源配置
spring:
  #排除DruidDataSourceAutoConfigure
  autoconfigure:
    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
  datasource:
    dynamic:
      #设置默认的数据源或者数据源组,默认值即为master
      primary: master
      datasource:
        master:
          url: ${blade.datasource.test.url}
          username: ${blade.datasource.test.username}
          password: ${blade.datasource.test.password}
        zt:
          url: ${blade.datasource.test.zt.url}
          username: ${blade.datasource.test.zt.username}
          password: ${blade.datasource.test.zt.password}
        # 智能外呼数据库
        ztznwh:
          url: ${blade.datasource.test.ztznwh.url}
          username: ${blade.datasource.test.ztznwh.username}
          password: ${blade.datasource.test.ztznwh.password}
        ## 定时器数据源
        xxljob:
          url: ${blade.datasource.test.xxljob.url}
          username: ${blade.datasource.test.xxljob.username}
          password: ${blade.datasource.test.xxljob.password}
  main:
    allow-circular-references: true
xxl:
  job:
    accessToken: ''
    admin:
      addresses: ${xxl.job.test.addresses}
    executor:
      appname: blade-xxljob
      ip: ${xxl.job.test.ip}
      logpath: ${xxl.job.test.logpath}
      logretentiondays: -1
      port: ${xxl.job.test.port}