Преглед изворни кода

feature: 配置文件修改

mazq пре 1 година
родитељ
комит
719401973e

+ 5 - 75
dcuc-duceap-service/src/main/assembly/conf/application.yml

@@ -1,37 +1,6 @@
 spring:
-  datasource:
-    username: jzpt_bu
-    password: dragon
-    driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://192.168.120.142:3306/dcuc_2.0?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC
-
-    #    username: DCUC2_GD
-    #    password: dragon
-    #    driver-class-name: oracle.jdbc.driver.OracleDriver
-    #    url: jdbc:oracle:thin:@192.168.6.120:1521:orcl
-    druid:
-      filters: sqlaudit
-  application:
-    name: dcuc-duceap
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 127.0.0.1:8848
-  cache:
-    type: redis
-  redis:
-    host: 127.0.0.1
-    port: 6379
-  kafka:
-    consumer:
-      bootstrap-servers: 10.254.10.15:9092
-server:
-  port: 21899
-management:
-  endpoints:
-    web:
-      exposure:
-        include: '*'
+  profiles:
+    include: base,dcuc_duceap
 apollo:
   # 配置中心地址(服务端)
   meta: http://192.168.6.132:8080
@@ -39,47 +8,8 @@ apollo:
     # 命名空间,支持多个逗号隔开。按命名空间顺序依次加载,可用于公共配置
     namespaces: application,dragonsoft.dcuc
     # 是否启用apollo
-    enabled: true
+    enabled: false
   # 集群,默认default
-  cluster: GD
+  cluster: default
   # 取消placeholder的自动更新功能(默认true)
-  autoUpdateInjectedSpringProperties: false
-duceap:
-  #通过配置duceap.datasource.dynamic.{dataSourceName}.{dataSourceProp},将自动启用多数据源
-  #用apollo配置数据源方式
-  #  datasource:
-  #    dynamic:
-  #      dcuc:
-  #        url:
-  #        username:
-  #        password:
-  #        driver-class-name:
-  datasource:
-    dynamic:
-      enabled: false
-  auditlog:
-    login:
-      enabled: false
-    audit:
-      enabled: false
-    sqlaudit:
-      output: kafka
-      exclude-tables: T_LOG_*
-  code:
-    enums:
-      scan-package: com.dragonsoft.**.enumresources,com.dragonsoft.**.enums,com.dragoninfo.**.enums,com.dragoninfo.**.enumresources
-  license:
-    #配置用来指定license对接的后端项目地址(格式:ip:port/context,如http://10.10.10.10:8080/ctx),
-    #默认使用HttpServletRequest.getLocalAddr()方法获取ip地址,
-    #应用在docker部署环境中无法获取机子的真实ip地址 考虑以配置参数的形式传入
-    address: http://127.0.0.1:21899
-    dataCacheMethod: apollo
-  apollo:
-    client:
-      #apollo客户端(许可)
-      host: http://10.201.3.20:8070
-dcuc:
-  duceap:
-    es:
-      enabled: false
-      datasourceId: HW_DS_ElASTICSEARCH
+  autoUpdateInjectedSpringProperties: false

+ 2 - 14
dcuc-duceap-service/src/main/resources/application-base.yml

@@ -3,7 +3,7 @@ spring:
     username: dcuc
     password: 123
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://10.254.10.31:3306/dcuc_gd_2.0?useUnicode=true&characterEncoding=UTF-8
+    url: jdbc:mysql://10.254.10.31:3306/dcuc_tjdsj_2.0?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false
     druid:
       filters: sqlaudit
   application:
@@ -20,7 +20,7 @@ spring:
   cache:
     type: redis
   redis:
-    host: 10.254.10.15
+    host: 127.0.0.1
     port: 6379
   kafka:
     consumer:
@@ -34,23 +34,11 @@ management:
         include: '*'
 
 duceap:
-  #通过配置duceap.datasource.dynamic.{dataSourceName}.{dataSourceProp},将自动启用多数据源
-  #用apollo配置数据源方式
-  #  datasource:
-  #    dynamic:
-  #      dcuc:
-  #        url: jdbc:mysql://192.168.120.142:3306/dcuc_2.0?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC
-  #        username: dcuc
-  #        password: 123
-  #        driver-class-name: com.mysql.jdbc.Driver
   flyway:
     # 是否执行flyway
     enabled: false
     # 执行flyway路径
     locations: classpath:/config/mysql
-  datasource:
-    dynamic:
-      enabled: false
   auditlog:
     login:
       enabled: false