Sfoglia il codice sorgente

feature: yml文件修改
1. yml文件修改

fuzq 4 anni fa
parent
commit
a0bb53e44d

+ 6 - 81
src/main/assembly/conf/application.yml

@@ -1,86 +1,11 @@
 spring:
-  application:
-    name: dcuc-auth-back
-  cloud:
-    nacos:
-      discovery:
-        # 配置nacos地址
-        server-addr: 127.0.0.1:8848
-  servlet:
-    multipart:
-      # 设置文件上传大小,springboot默认的最大上传大小是1MB
-      max-file-size: 150MB
-      max-request-size: 150MB
-server:
-  port: 8861
-  servlet:
-    context-path: /dcucauth
-    jsp:
-      init-parameters:
-        development: true
-management:
-  endpoints:
-    web:
-      exposure:
-        include: '*'
-duceap:
-  swagger:
-    enabled: false
-    package-path: com.dragoninfo.dcuc.authweb
-  license:
-    #配置用来指定license对接的后端项目地址(格式:ip:port/context,如http://10.10.10.10:8080/ctx),
-    #默认使用HttpServletRequest.getLocalAddr()方法获取ip地址,
-    #应用在docker部署环境中无法获取机子的真实ip地址 考虑以配置参数的形式传入
-    address: http://127.0.0.1:8861/dcucauth
-    dataCacheMethod: apollo
-  security:
-    type: dcuc
-    dcuc:
-      cas-server-url-prefix: http://10.11.1.142:8877/dcucserver
-      server-name: 10.11.0.240:8871
-      ignore-pattern: '/js/*|/img/*|/css/*|/api/*|/*.png|/rest/*|/webSocket/*|/oauthLogin/*|/authorizationPage.html|/importAuthorizationFile.html|/license/LicenseManagerServlet|/authorizationFile/'
-      app-code: QXXT0000000000000001
-      api-url: http://127.0.0.1:8861/dcucauth
-    dids2:
-      appCode: YHZX0000000000000001
-      SSOLoginUrl: http://192.168.6.128:9995/didsserver/login
-      #单点登录服务接口地址
-      SSOValidateUrl:  http://192.168.6.128:9995/didsserver/serviceValidate
-      #跳转前端地址
-      SSOServiceUrl: http://10.11.0.240:18871/dcuc/login
-      #单点登录服务接口地址
-      webServiceUrl: http://192.168.6.128:9995/didsserver/webservices/
-      noFilterUrl: services,hessian,commons,install.action,.xml,/install,/widgets-src/,/authorizationPage.html,/importAuthorizationFile.html,/license/LicenseManagerServlet,/authorizationFile/,/api/,/js/,/png/,/rest/
-  apollo:
-    client:
-      host: http://10.201.3.20:8070
+  profiles:
+    include: base
+#apollo配置
 apollo:
-  # 配置中心地址(服务端)
-  meta: http://192.168.6.123:8080
-  # 集群,默认default
-  cluster: GD
-  # 取消placeholder的自动更新功能(默认true)
   autoUpdateInjectedSpringProperties: false
   bootstrap:
-    # 命名空间,支持多个逗号隔开。按命名空间顺序依次加载,可用于公共配置
-    namespaces: application,dragonsoft.dcuc
-    # 是否启用apollo
     enabled: true
-hystrix:
-  command:
-    default:
-      execution:
-        timeout:
-          #hystrix熔断器开关
-          enabled: true
-        isolation:
-          thread:
-            #hystrix熔断器熔断时间
-            timeoutInMilliseconds: 30000
-ribbon:
-  ReadTimeout: 30000
-  ConnectTimeout: 30000
-dcuc:
-  userweb:
-    app-code: YHZX0000000000000001
-    auth-access: false
+    namespaces: application,dragonsoft.dcuc
+  cluster: default
+  meta: http://192.168.10.80:8081

+ 74 - 0
src/main/resources/application-base.yml

@@ -0,0 +1,74 @@
+spring:
+  application:
+    name: dcuc-auth-back
+  cloud:
+    nacos:
+      discovery:
+        # 配置nacos地址
+        server-addr: 127.0.0.1:8848
+  servlet:
+    multipart:
+      # 设置文件上传大小,springboot默认的最大上传大小是1MB
+      max-file-size: 150MB
+      max-request-size: 150MB
+server:
+  port: 8861
+  servlet:
+    context-path: /dcucauth
+    jsp:
+      init-parameters:
+        development: true
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'
+duceap:
+  swagger:
+    enabled: true
+    package-path: com.dragoninfo.dcuc.authweb
+  license:
+    #配置用来指定license对接的后端项目地址(格式:ip:port/context,如http://10.10.10.10:8080/ctx),
+    #默认使用HttpServletRequest.getLocalAddr()方法获取ip地址,
+    #应用在docker部署环境中无法获取机子的真实ip地址 考虑以配置参数的形式传入
+    address: http://127.0.0.1:8861/auth
+  apollo:
+    client:
+      host: http://10.201.3.20:8070
+  security:
+    type: dcuc
+    dcuc:
+      cas-server-url-prefix: http://10.11.1.142:8877/dcucserver
+      server-name: 10.11.0.240:8871
+      ignore-pattern: '/js/*|/img/*|/css/*|/api/*|/*.png|/rest/*|/webSocket/*|/oauthLogin/*|/authorizationPage.html|/importAuthorizationFile.html|/license/LicenseManagerServlet|/authorizationFile/'
+      app-code: QXXT0000000000000001
+      api-url: http://127.0.0.1:8861/dcucauth
+    dids2:
+      appCode: YHZX0000000000000001
+      SSOLoginUrl: http://192.168.6.128:9995/didsserver/login
+      #单点登录服务接口地址
+      SSOValidateUrl:  http://192.168.6.128:9995/didsserver/serviceValidate
+      #跳转前端地址
+      SSOServiceUrl: http://10.11.0.240:18871/dcuc/login
+      #单点登录服务接口地址
+      webServiceUrl: http://192.168.6.128:9995/didsserver/webservices/
+      noFilterUrl: services,hessian,commons,install.action,.xml,/install,/widgets-src/,/authorizationPage.html,/importAuthorizationFile.html,/license/LicenseManagerServlet,/authorizationFile/,/api/,/js/,/png/,/rest/
+hystrix:
+  command:
+    default:
+      execution:
+        timeout:
+          #hystrix熔断器开关
+          enabled: true
+        isolation:
+          thread:
+            #hystrix熔断器熔断时间
+            timeoutInMilliseconds: 30000
+ribbon:
+  ReadTimeout: 30000
+  ConnectTimeout: 30000
+dcuc:
+  authweb:
+    app-code: QXXT0000000000000001
+    auth-access: true
+    enable-api-check: false

+ 9 - 82
src/main/resources/application.yml

@@ -1,87 +1,14 @@
 spring:
-  application:
-    name: dcuc-auth-back
-  cloud:
-    nacos:
-      discovery:
-        # 配置nacos地址
-        server-addr: 127.0.0.1:8848
-  servlet:
-    multipart:
-      # 设置文件上传大小,springboot默认的最大上传大小是1MB
-      max-file-size: 150MB
-      max-request-size: 150MB
-server:
-  port: 8861
-  servlet:
-    context-path: /dcucauth
-    jsp:
-      init-parameters:
-        development: true
-management:
-  endpoints:
-    web:
-      exposure:
-        include: '*'
-duceap:
-  swagger:
-    enabled: true
-    package-path: com.dragoninfo.dcuc.authweb
-  license:
-    #配置用来指定license对接的后端项目地址(格式:ip:port/context,如http://10.10.10.10:8080/ctx),
-    #默认使用HttpServletRequest.getLocalAddr()方法获取ip地址,
-    #应用在docker部署环境中无法获取机子的真实ip地址 考虑以配置参数的形式传入
-    address: http://127.0.0.1:8861/auth
-    enabled: false
-  apollo:
-    client:
-      host: http://10.201.3.20:8070
-  security:
-    type: dcuc
-    dcuc:
-      cas-server-url-prefix: http://10.11.1.142:8877/dcucserver
-      server-name: 10.11.0.240:8871
-      ignore-pattern: '/js/*|/img/*|/css/*|/api/*|/*.png|/rest/*|/webSocket/*|/oauthLogin/*|/authorizationPage.html|/importAuthorizationFile.html|/license/LicenseManagerServlet|/authorizationFile/'
-      app-code: QXXT0000000000000001
-      api-url: http://127.0.0.1:8861/dcucauth
-    dids2:
-      appCode: YHZX0000000000000001
-      SSOLoginUrl: http://192.168.6.128:9995/didsserver/login
-      #单点登录服务接口地址
-      SSOValidateUrl:  http://192.168.6.128:9995/didsserver/serviceValidate
-      #跳转前端地址
-      SSOServiceUrl: http://10.11.0.240:18871/dcuc/login
-      #单点登录服务接口地址
-      webServiceUrl: http://192.168.6.128:9995/didsserver/webservices/
-      noFilterUrl: services,hessian,commons,install.action,.xml,/install,/widgets-src/,/authorizationPage.html,/importAuthorizationFile.html,/license/LicenseManagerServlet,/authorizationFile/,/api/,/js/,/png/,/rest/
+  profiles:
+    include: base
+#apollo配置
 apollo:
-  # 配置中心地址(服务端)
-  meta: http://192.168.6.123:8080
+  autoUpdateInjectedSpringProperties: false
   bootstrap:
-    # 命名空间,支持多个逗号隔开。按命名空间顺序依次加载,可用于公共配置
-    namespaces: application,dragonsoft.dcuc
-    # 是否启用apollo
     enabled: false
-  # 集群,默认default
+    namespaces: application,dragonsoft.dcuc
   cluster: default
-  # 取消placeholder的自动更新功能(默认true)
-  autoUpdateInjectedSpringProperties: false
-hystrix:
-  command:
-    default:
-      execution:
-        timeout:
-          #hystrix熔断器开关
-          enabled: true
-        isolation:
-          thread:
-            #hystrix熔断器熔断时间
-            timeoutInMilliseconds: 30000
-ribbon:
-  ReadTimeout: 30000
-  ConnectTimeout: 30000
-dcuc:
-  authweb:
-    app-code: QXXT0000000000000001
-    auth-access: true
-    enable-api-check: false
+  meta: http://192.168.10.80:8081
+duceap:
+  license:
+    enabled: false