Quellcode durchsuchen

nacos bootstrap

MaxKey vor 3 Jahren
Ursprung
Commit
fb9b986c7a

+ 0 - 10
maxkey-webs/maxkey-gataway/src/main/resources/application.yml

@@ -28,16 +28,6 @@ spring:
 #          args:
 #            name: default
 #            fallbackUri: 'forward:/defaultFallback'
-
-    nacos:
-      discovery:
-        server-addr: ${NACOS_DISCOVERY_SERVER_ADDR:127.0.0.1:8848}
-        enabled: ${NACOS_DISCOVERY_ENABLED:false}
-      config:
-#        file-extension: yaml
-#        server-addr: 127.0.0.1:8848
-        username: ${NACOS_CONFIG_USERNAME:nacos}
-        password: ${NACOS_CONFIG_PASSWORD:nacos}
         
   main:
     web-application-type: reactive

+ 11 - 2
maxkey-webs/maxkey-gataway/src/main/resources/bootstrap.properties

@@ -6,7 +6,16 @@ spring.cloud.nacos.config.server-addr           =${NACOS_CONFIG_SERVER_ADDR:127.
 # configuration:useLocalCache=true
 spring.application.name                         =maxkey-gateway
 # Suffix for the configuration. Supports properties,yaml,yml,default is properties
-spring.cloud.nacos.config.file-extension        =properties
+spring.cloud.nacos.config.file-extension        =yaml
 #spring.cloud.nacos.config.file-extension=yaml
 #nacos enabled
-spring.cloud.nacos.config.enabled               =${NACOS_CONFIG_ENABLED:false}
+spring.cloud.nacos.config.enabled               =${NACOS_CONFIG_ENABLED:false}
+spring.cloud.nacos.config.namespace				=${NACOS_CONFIG_NAMESPACE:net-maxsso}
+#spring.cloud.nacos.config.username				=${NACOS_CONFIG_USERNAME:nacos}
+#spring.cloud.nacos.config.password				=${NACOS_CONFIG_PASSWORD:nacos}
+
+#nacos discovery
+spring.cloud.nacos.discovery.enabled            =${NACOS_DISCOVERY_ENABLED:false}
+spring.cloud.nacos.discovery.instance-enabled   =false
+spring.cloud.nacos.discovery.server-addr        =${NACOS_DISCOVERY_SERVER_ADDR:127.0.0.1:8848}
+spring.cloud.nacos.discovery.namespace			=${NACOS_DISCOVERY_NAMESPACE:net-maxsso}

+ 0 - 4
maxkey-webs/maxkey-monitor/src/main/resources/application.properties

@@ -19,10 +19,6 @@ application.title                               =MaxKey
 #for dynamic service discovery
 spring.application.name                         =maxkey-monitor
 application.formatted-version                   =v3.5.2 GA
-#nacos discovery
-spring.cloud.nacos.discovery.enabled            =${NACOS_DISCOVERY_ENABLED:false}
-spring.cloud.nacos.discovery.instance-enabled   =false
-spring.cloud.nacos.discovery.server-addr        =${NACOS_DISCOVERY_SERVER_ADDR:127.0.0.1:8848}
 
 server.port                                     =9528
 

+ 8 - 1
maxkey-webs/maxkey-monitor/src/main/resources/bootstrap.properties

@@ -9,4 +9,11 @@ spring.application.name                         =maxkey-monitor
 spring.cloud.nacos.config.file-extension        =properties
 #spring.cloud.nacos.config.file-extension=yaml
 #nacos enabled
-spring.cloud.nacos.config.enabled               =${NACOS_CONFIG_ENABLED:false}
+spring.cloud.nacos.config.enabled               =${NACOS_CONFIG_ENABLED:false}
+spring.cloud.nacos.config.namespace				=${NACOS_CONFIG_NAMESPACE:net-maxsso}
+
+#nacos discovery
+spring.cloud.nacos.discovery.enabled            =${NACOS_DISCOVERY_ENABLED:false}
+spring.cloud.nacos.discovery.instance-enabled   =false
+spring.cloud.nacos.discovery.server-addr        =${NACOS_DISCOVERY_SERVER_ADDR:127.0.0.1:8848}
+spring.cloud.nacos.discovery.namespace			=${NACOS_DISCOVERY_NAMESPACE:net-maxsso}

+ 1 - 4
maxkey-webs/maxkey-web-maxkey/src/main/resources/application-http.properties

@@ -25,10 +25,7 @@ server.port                                     =${SERVER_PORT:9527}
 server.servlet.session.timeout                  =${SERVLET_SESSION_TIMEOUT:600}
 #server context path
 server.servlet.context-path                     =/sign
-#nacos discovery
-spring.cloud.nacos.discovery.enabled            =${NACOS_DISCOVERY_ENABLED:false}
-spring.cloud.nacos.discovery.instance-enabled   =false
-spring.cloud.nacos.discovery.server-addr        =${NACOS_DISCOVERY_SERVER_ADDR:127.0.0.1:8848}
+
 server.frontend.port                            =${SERVER_FRONTEND_PORT:4200}
 ############################################################################
 #domain name configuration                                                 #

+ 8 - 1
maxkey-webs/maxkey-web-maxkey/src/main/resources/bootstrap.properties

@@ -9,4 +9,11 @@ spring.application.name                         =maxkey
 spring.cloud.nacos.config.file-extension        =properties
 #spring.cloud.nacos.config.file-extension=yaml
 #nacos enabled
-spring.cloud.nacos.config.enabled               =${NACOS_CONFIG_ENABLED:false}
+spring.cloud.nacos.config.enabled               =${NACOS_CONFIG_ENABLED:false}
+spring.cloud.nacos.config.namespace				=${NACOS_CONFIG_NAMESPACE:net-maxsso}
+
+#nacos discovery
+spring.cloud.nacos.discovery.enabled            =${NACOS_DISCOVERY_ENABLED:false}
+spring.cloud.nacos.discovery.instance-enabled   =false
+spring.cloud.nacos.discovery.server-addr        =${NACOS_DISCOVERY_SERVER_ADDR:127.0.0.1:8848}
+spring.cloud.nacos.discovery.namespace			=${NACOS_DISCOVERY_NAMESPACE:net-maxsso}

+ 0 - 4
maxkey-webs/maxkey-web-mgt/src/main/resources/application-http.properties

@@ -19,10 +19,6 @@
 server.port                                     =${SERVER_PORT:9526}
 #server context path
 server.servlet.context-path                     =/maxkey-mgt-api
-#nacos discovery
-spring.cloud.nacos.discovery.enabled            =${NACOS_DISCOVERY_ENABLED:false}
-spring.cloud.nacos.discovery.instance-enabled   =false
-spring.cloud.nacos.discovery.server-addr        =${NACOS_DISCOVERY_SERVER_ADDR:127.0.0.1:8848}
 ############################################################################
 #domain name configuration                                                 #
 ############################################################################

+ 11 - 4
maxkey-webs/maxkey-web-mgt/src/main/resources/bootstrap.properties

@@ -1,12 +1,19 @@
 #nacos config
-spring.cloud.nacos.config.server-addr       =${NACOS_CONFIG_SERVER_ADDR:127.0.0.1:8848}
+spring.cloud.nacos.config.server-addr       	=${NACOS_CONFIG_SERVER_ADDR:127.0.0.1:8848}
 # Nacos Console add configuration:
 # Data ID:maxkey.properties
 # Group:DEFAULT_GROUP
 # configuration:useLocalCache=true
-spring.application.name                     =maxkey-mgt
+spring.application.name                     	=maxkey-mgt
 # Suffix for the configuration. Supports properties,yaml,yml,default is properties
-spring.cloud.nacos.config.file-extension    =properties
+spring.cloud.nacos.config.file-extension    	=properties
 #spring.cloud.nacos.config.file-extension=yaml
 #nacos enabled
-spring.cloud.nacos.config.enabled           =${NACOS_CONFIG_ENABLED:false}
+spring.cloud.nacos.config.enabled           	=${NACOS_CONFIG_ENABLED:false}
+spring.cloud.nacos.config.namespace				=${NACOS_CONFIG_NAMESPACE:net-maxsso}
+
+#nacos discovery
+spring.cloud.nacos.discovery.enabled            =${NACOS_DISCOVERY_ENABLED:false}
+spring.cloud.nacos.discovery.instance-enabled   =false
+spring.cloud.nacos.discovery.server-addr        =${NACOS_DISCOVERY_SERVER_ADDR:127.0.0.1:8848}
+spring.cloud.nacos.discovery.namespace			=${NACOS_DISCOVERY_NAMESPACE:net-maxsso}