From 4b164cc0a90c76ac318bb1946f355cdd7ae5dad7 Mon Sep 17 00:00:00 2001 From: "Crystal.Sea" Date: Sun, 24 Oct 2021 09:27:32 +0800 Subject: [PATCH] properties --- .../src/main/resources/bootstrap.properties | 14 +++++----- .../src/main/resources/application.properties | 2 +- .../src/main/resources/bootstrap.properties | 14 +++++----- .../resources/application-http.properties | 26 ++++++++++--------- .../resources/application-https.properties | 26 ++++++++++--------- .../src/main/resources/bootstrap.properties | 14 +++++----- .../resources/application-http.properties | 24 +++++++++-------- .../src/main/resources/bootstrap.properties | 14 +++++----- 8 files changed, 70 insertions(+), 64 deletions(-) diff --git a/maxkey-gataway/src/main/resources/bootstrap.properties b/maxkey-gataway/src/main/resources/bootstrap.properties index e0e394ba..3b582c03 100644 --- a/maxkey-gataway/src/main/resources/bootstrap.properties +++ b/maxkey-gataway/src/main/resources/bootstrap.properties @@ -1,12 +1,12 @@ +#nacos config spring.cloud.nacos.config.server-addr =${NACOS_CONFIG_SERVER_ADDR:127.0.0.1:8848} - -# Nacos \u63A7\u5236\u53F0\u6DFB\u52A0\u914D\u7F6E\uFF1A -# Data ID\uFF1Amaxkey-gateway.properties -# Group\uFF1ADEFAULT_GROUP -# \u914D\u7F6E\u5185\u5BB9\uFF1AuseLocalCache=true +# Nacos Console add configuration: +# Data ID:maxkey.properties +# Group:DEFAULT_GROUP +# configuration:useLocalCache=true spring.application.name =maxkey-gateway -# \u6307\u5B9A\u914D\u7F6E\u7684\u540E\u7F00\uFF0C\u652F\u6301 properties\u3001yaml\u3001yml\uFF0C\u9ED8\u8BA4\u4E3A properties +# 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 -#\u662F\u5426\u542F\u7528nacos\u914D\u7F6E +#nacos enabled spring.cloud.nacos.config.enabled =${NACOS_CONFIG_ENABLED:false} \ No newline at end of file diff --git a/maxkey-webs/maxkey-boot-monitor/src/main/resources/application.properties b/maxkey-webs/maxkey-boot-monitor/src/main/resources/application.properties index ae667073..d6b7399f 100644 --- a/maxkey-webs/maxkey-boot-monitor/src/main/resources/application.properties +++ b/maxkey-webs/maxkey-boot-monitor/src/main/resources/application.properties @@ -19,7 +19,7 @@ application.title =MaxKey #for dynamic service discovery spring.application.name =maxkey-monitor application.formatted-version =v3.1.0 GA -#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} diff --git a/maxkey-webs/maxkey-boot-monitor/src/main/resources/bootstrap.properties b/maxkey-webs/maxkey-boot-monitor/src/main/resources/bootstrap.properties index ba7849d7..c72b6065 100644 --- a/maxkey-webs/maxkey-boot-monitor/src/main/resources/bootstrap.properties +++ b/maxkey-webs/maxkey-boot-monitor/src/main/resources/bootstrap.properties @@ -1,12 +1,12 @@ +#nacos config spring.cloud.nacos.config.server-addr =${NACOS_CONFIG_SERVER_ADDR:127.0.0.1:8848} - -# Nacos \u63A7\u5236\u53F0\u6DFB\u52A0\u914D\u7F6E\uFF1A -# Data ID\uFF1Amaxkey-monitor.properties -# Group\uFF1ADEFAULT_GROUP -# \u914D\u7F6E\u5185\u5BB9\uFF1A +# Nacos Console add configuration: +# Data ID:maxkey.properties +# Group:DEFAULT_GROUP +# configuration:useLocalCache=true spring.application.name =maxkey-monitor -# \u6307\u5B9A\u914D\u7F6E\u7684\u540E\u7F00\uFF0C\u652F\u6301 properties\u3001yaml\u3001yml\uFF0C\u9ED8\u8BA4\u4E3A properties +# 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 -#\u662F\u5426\u542F\u7528nacos\u914D\u7F6E +#nacos enabled spring.cloud.nacos.config.enabled =${NACOS_CONFIG_ENABLED:false} \ No newline at end of file diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-http.properties b/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-http.properties index 1ec7b046..18535098 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-http.properties +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-http.properties @@ -23,7 +23,7 @@ server.port =8080 server.servlet.session.timeout =1800 #server context path server.servlet.context-path =/maxkey -#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} @@ -34,11 +34,11 @@ maxkey.server.scheme =http maxkey.server.basedomain =${SERVER_DOMAIN:maxkey.top} maxkey.server.domain =sso.${maxkey.server.basedomain} maxkey.server.name =${maxkey.server.scheme}://${maxkey.server.domain} -maxkey.server.uri =${maxkey.server.name}:${server.port}/maxkey +maxkey.server.uri =${maxkey.server.name}:${server.port}/${server.servlet.context-path} #default.uri -maxkey.server.default.uri =${maxkey.server.uri}:${server.port}/maxkey/appList +maxkey.server.default.uri =${maxkey.server.uri}/appList maxkey.server.mgt.uri =${maxkey.server.name}:9527/maxkey-mgt/login -maxkey.server.authz.uri =${maxkey.server.name}:${server.port}/maxkey +maxkey.server.authz.uri =${maxkey.server.name}:${server.port}/${server.servlet.context-path} #InMemory 0 , Redis 2 maxkey.server.persistence =${SERVER_PERSISTENCE:0} #identity @@ -68,7 +68,7 @@ maxkey.login.remeberme =${LOGIN_REMEBERME:true} maxkey.login.remeberme.validity =0 #JWT support maxkey.login.jwt =${LOGIN_JWT:true} -maxkey.login.jwt.issuer =${LOGIN_JWT_ISSUER:https://${maxkey.server.domain}/maxkey} +maxkey.login.jwt.issuer =${LOGIN_JWT_ISSUER:${maxkey.server.authz.uri}} #to default application web site maxkey.login.default.uri =appList maxkey.ipaddress.whitelist =false @@ -272,10 +272,10 @@ maxkey.login.wsfederation.logoutUrl =https://adfs.maxkey.top/adfs/ls/? ############################################################################# #OIDC V1.0 METADATA configuration # ############################################################################# -maxkey.oidc.metadata.issuer =${maxkey.server.name}/maxkey -maxkey.oidc.metadata.authorizationEndpoint =${maxkey.server.name}/maxkey/authz/oauth/v20/authorize -maxkey.oidc.metadata.tokenEndpoint =${maxkey.server.name}/maxkey/authz/oauth/v20/token -maxkey.oidc.metadata.userinfoEndpoint =${maxkey.server.name}/maxkey/api/connect/userinfo +maxkey.oidc.metadata.issuer =${maxkey.server.authz.uri} +maxkey.oidc.metadata.authorizationEndpoint =${maxkey.server.authz.uri}/authz/oauth/v20/authorize +maxkey.oidc.metadata.tokenEndpoint =${maxkey.server.authz.uri}/authz/oauth/v20/token +maxkey.oidc.metadata.userinfoEndpoint =${maxkey.server.authz.uri}/api/connect/userinfo ############################################################################# #SAML V2.0 configuration # @@ -292,7 +292,7 @@ maxkey.saml.v20.idp.keystore.private.key.password =maxkey maxkey.saml.v20.idp.keystore =classpath\:config/samlServerKeystore.jks #keystore id for sec maxkey.saml.v20.idp.issuing.entity.id =maxkey.top -maxkey.saml.v20.idp.issuer =https://sso.maxkey.top/maxkey/saml +maxkey.saml.v20.idp.issuer =${maxkey.server.authz.uri}/saml maxkey.saml.v20.idp.receiver.endpoint =https\://sso.maxkey.top/ #saml sp keystore maxkey.saml.v20.sp.keystore.password =maxkey @@ -322,13 +322,15 @@ management.endpoint.health.show-details =ALWAYS spring.boot.admin.client.url =${SPRING_BOOT_ADMIN_URL:http://127.0.0.1:9528} management.health.redis.enabled =false +############################################################################ +#Do not modify the following configuration ############################################################################ #springfox.documentation.swagger.v2.path=/api-docs # #Swagger Configure Properties # ############################################################################ maxkey.swagger.enable =true -maxkey.swagger.title =MaxKey\u5355\u70b9\u767b\u5f55\u8ba4\u8bc1\u7cfb\u7edfapi\u6587\u6863 -maxkey.swagger.description =MaxKey\u5355\u70b9\u767b\u5f55\u8ba4\u8bc1\u7cfb\u7edfapi\u6587\u6863 +maxkey.swagger.title =MaxKey\u5355\u70b9\u767b\u5f55\u8ba4\u8bc1\u7cfb\u7edfAPI\u6587\u6863 +maxkey.swagger.description =MaxKey\u5355\u70b9\u767b\u5f55\u8ba4\u8bc1\u7cfb\u7edfAPI\u6587\u6863 maxkey.swagger.version =${application.formatted-version} ############################################################################ diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-https.properties b/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-https.properties index b0ed4c78..0a24daec 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-https.properties +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-https.properties @@ -23,7 +23,7 @@ server.port =443 server.servlet.session.timeout =1800 #server context path server.servlet.context-path =/maxkey -#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} @@ -34,11 +34,11 @@ maxkey.server.scheme =https maxkey.server.basedomain =${SERVER_DOMAIN:maxkey.top} maxkey.server.domain =sso.${maxkey.server.basedomain} maxkey.server.name =${maxkey.server.scheme}://${maxkey.server.domain} -maxkey.server.uri =${maxkey.server.name}/maxkey +maxkey.server.uri =${maxkey.server.name}/${server.servlet.context-path} #default.uri -maxkey.server.default.uri =${maxkey.server.uri}/maxkey/appList +maxkey.server.default.uri =${maxkey.server.uri}/appList maxkey.server.mgt.uri =${maxkey.server.name}:9527/maxkey-mgt/login -maxkey.server.authz.uri =${maxkey.server.name}/maxkey +maxkey.server.authz.uri =${maxkey.server.name}/${server.servlet.context-path} #InMemory 0 , Redis 2 maxkey.server.persistence =${SERVER_PERSISTENCE:0} #identity @@ -69,7 +69,7 @@ maxkey.login.remeberme =${LOGIN_REMEBERME:true} maxkey.login.remeberme.validity =0 #JWT support maxkey.login.jwt =${LOGIN_JWT:true} -maxkey.login.jwt.issuer =${LOGIN_JWT_ISSUER:https://${maxkey.server.domain}/maxkey} +maxkey.login.jwt.issuer =${LOGIN_JWT_ISSUER:${maxkey.server.authz.uri}} #to default application web site maxkey.login.default.uri =appList maxkey.ipaddress.whitelist =false @@ -274,10 +274,10 @@ maxkey.login.wsfederation.logoutUrl =https://adfs.maxkey.top/adfs/ls/? ############################################################################# #OIDC V1.0 METADATA configuration # ############################################################################# -maxkey.oidc.metadata.issuer =${maxkey.server.name}/maxkey -maxkey.oidc.metadata.authorizationEndpoint =${maxkey.server.name}/maxkey/authz/oauth/v20/authorize -maxkey.oidc.metadata.tokenEndpoint =${maxkey.server.name}/maxkey/authz/oauth/v20/token -maxkey.oidc.metadata.userinfoEndpoint =${maxkey.server.name}/maxkey/api/connect/userinfo +maxkey.oidc.metadata.issuer =${maxkey.server.authz.uri} +maxkey.oidc.metadata.authorizationEndpoint =${maxkey.server.authz.uri}/authz/oauth/v20/authorize +maxkey.oidc.metadata.tokenEndpoint =${maxkey.server.authz.uri}/authz/oauth/v20/token +maxkey.oidc.metadata.userinfoEndpoint =${maxkey.server.authz.uri}/api/connect/userinfo ############################################################################# #SAML V2.0 configuration # @@ -294,7 +294,7 @@ maxkey.saml.v20.idp.keystore.private.key.password =maxkey maxkey.saml.v20.idp.keystore =classpath\:config/samlServerKeystore.jks #keystore id for sec maxkey.saml.v20.idp.issuing.entity.id =maxkey.top -maxkey.saml.v20.idp.issuer =https://sso.maxkey.top/maxkey/saml +maxkey.saml.v20.idp.issuer =${maxkey.server.authz.uri}/saml maxkey.saml.v20.idp.receiver.endpoint =https\://sso.maxkey.top/ #saml sp keystore maxkey.saml.v20.sp.keystore.password =maxkey @@ -324,13 +324,15 @@ management.endpoint.health.show-details =ALWAYS spring.boot.admin.client.url =${SPRING_BOOT_ADMIN_URL:http://127.0.0.1:9528} management.health.redis.enabled =false +############################################################################ +#Do not modify the following configuration ############################################################################ #springfox.documentation.swagger.v2.path=/api-docs # #Swagger Configure Properties # ############################################################################ maxkey.swagger.enable =true -maxkey.swagger.title =MaxKey\u5355\u70b9\u767b\u5f55\u8ba4\u8bc1\u7cfb\u7edfapi\u6587\u6863 -maxkey.swagger.description =MaxKey\u5355\u70b9\u767b\u5f55\u8ba4\u8bc1\u7cfb\u7edfapi\u6587\u6863 +maxkey.swagger.title =MaxKey\u5355\u70b9\u767b\u5f55\u8ba4\u8bc1\u7cfb\u7edfAPI\u6587\u6863 +maxkey.swagger.description =MaxKey\u5355\u70b9\u767b\u5f55\u8ba4\u8bc1\u7cfb\u7edfAPI\u6587\u6863 maxkey.swagger.version =${application.formatted-version} ############################################################################ diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/bootstrap.properties b/maxkey-webs/maxkey-web-maxkey/src/main/resources/bootstrap.properties index 983513fa..da00c352 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/bootstrap.properties +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/bootstrap.properties @@ -1,12 +1,12 @@ +#nacos config spring.cloud.nacos.config.server-addr =${NACOS_CONFIG_SERVER_ADDR:127.0.0.1:8848} - -# Nacos \u63A7\u5236\u53F0\u6DFB\u52A0\u914D\u7F6E\uFF1A -# Data ID\uFF1Amaxkey.properties -# Group\uFF1ADEFAULT_GROUP -# \u914D\u7F6E\u5185\u5BB9\uFF1AuseLocalCache=true +# Nacos Console add configuration: +# Data ID:maxkey.properties +# Group:DEFAULT_GROUP +# configuration:useLocalCache=true spring.application.name =maxkey -# \u6307\u5B9A\u914D\u7F6E\u7684\u540E\u7F00\uFF0C\u652F\u6301 properties\u3001yaml\u3001yml\uFF0C\u9ED8\u8BA4\u4E3A properties +# 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 -#\u662F\u5426\u542F\u7528nacos\u914D\u7F6E +#nacos enabled spring.cloud.nacos.config.enabled =${NACOS_CONFIG_ENABLED:false} \ No newline at end of file diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/application-http.properties b/maxkey-webs/maxkey-web-mgt/src/main/resources/application-http.properties index f00caf5e..252a1b3a 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/application-http.properties +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/application-http.properties @@ -19,7 +19,7 @@ server.port =9527 #server context path server.servlet.context-path =/maxkey-mgt -#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} @@ -30,10 +30,10 @@ maxkey.server.scheme =http maxkey.server.basedomain =${SERVER_DOMAIN:maxkey.top} maxkey.server.domain =sso.${maxkey.server.basedomain} maxkey.server.name =${maxkey.server.scheme}://${maxkey.server.domain} -maxkey.server.uri =${maxkey.server.name}:9527/maxkey-mgt +maxkey.server.uri =${maxkey.server.name}:9527/${server.servlet.context-path} #default.uri maxkey.server.default.uri =${maxkey.server.uri}/main -maxkey.server.mgt.uri =${maxkey.server.name}:9527/maxkey-mgt +maxkey.server.mgt.uri =${maxkey.server.uri} maxkey.server.authz.uri =https://${maxkey.server.domain}/maxkey #InMemory 0 , Redis 2 maxkey.server.persistence =0 @@ -66,7 +66,7 @@ maxkey.login.default.uri =appList maxkey.ipaddress.whitelist =false #JWT support maxkey.login.jwt =${LOGIN_JWT:true} -maxkey.login.jwt.issuer =${LOGIN_JWT_ISSUER:https://${maxkey.server.domain}/maxkey} +maxkey.login.jwt.issuer =${LOGIN_JWT_ISSUER:${maxkey.server.authz.uri}} ############################################################################ #database configuration @@ -184,7 +184,7 @@ maxkey.saml.v20.idp.keystore.private.key.password =maxkey maxkey.saml.v20.idp.keystore =classpath\:config/samlServerKeystore.jks #keystore id for sec maxkey.saml.v20.idp.issuing.entity.id =maxkey.top -maxkey.saml.v20.idp.issuer =https://sso.maxkey.top/maxkey/saml +maxkey.saml.v20.idp.issuer =${maxkey.server.authz.uri}/saml maxkey.saml.v20.idp.receiver.endpoint =https\://sso.maxkey.top/ #saml sp keystore maxkey.saml.v20.sp.keystore.password =maxkey @@ -206,10 +206,10 @@ maxkey.saml.v20.metadata.telephoneNumber =4008981111 ############################################################################# #OIDC V1.0 METADATA configuration # ############################################################################# -maxkey.oidc.metadata.issuer =https://${maxkey.server.domain}/maxkey -maxkey.oidc.metadata.authorizationEndpoint =${maxkey.server.name}/maxkey/authz/oauth/v20/authorize -maxkey.oidc.metadata.tokenEndpoint =${maxkey.server.name}/maxkey/authz/oauth/v20/token -maxkey.oidc.metadata.userinfoEndpoint =${maxkey.server.name}/maxkey/api/connect/userinfo +maxkey.oidc.metadata.issuer =${maxkey.server.authz.uri} +maxkey.oidc.metadata.authorizationEndpoint =${maxkey.server.authz.uri}/authz/oauth/v20/authorize +maxkey.oidc.metadata.tokenEndpoint =${maxkey.server.authz.uri}/authz/oauth/v20/token +maxkey.oidc.metadata.userinfoEndpoint =${maxkey.server.authz.uri}/api/connect/userinfo ############################################################################# #Job Scheduler # @@ -230,13 +230,15 @@ management.endpoint.health.show-details =ALWAYS spring.boot.admin.client.url =${SPRING_BOOT_ADMIN_URL:http://127.0.0.1:9528} management.health.redis.enabled =false +############################################################################ +#Do not modify the following configuration ############################################################################ #springfox.documentation.swagger.v2.path=/api-docs # #Swagger Configure Properties # ############################################################################ maxkey.swagger.enable =true -maxkey.swagger.title =MaxKey\u5355\u70b9\u767b\u5f55\u8ba4\u8bc1\u7cfb\u7edfapi\u6587\u6863 -maxkey.swagger.description =MaxKey\u5355\u70b9\u767b\u5f55\u8ba4\u8bc1\u7cfb\u7edfapi\u6587\u6863 +maxkey.swagger.title =MaxKey\u5355\u70b9\u767b\u5f55\u8ba4\u8bc1\u7cfb\u7edfAPI\u6587\u6863 +maxkey.swagger.description =MaxKey\u5355\u70b9\u767b\u5f55\u8ba4\u8bc1\u7cfb\u7edfAPI\u6587\u6863 maxkey.swagger.version =${application.formatted-version} ############################################################################ diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/bootstrap.properties b/maxkey-webs/maxkey-web-mgt/src/main/resources/bootstrap.properties index baca935a..87933bd0 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/bootstrap.properties +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/bootstrap.properties @@ -1,12 +1,12 @@ +#nacos config spring.cloud.nacos.config.server-addr =${NACOS_CONFIG_SERVER_ADDR:127.0.0.1:8848} - -# Nacos \u63A7\u5236\u53F0\u6DFB\u52A0\u914D\u7F6E\uFF1A -# Data ID\uFF1Amaxkey-mgt.properties -# Group\uFF1ADEFAULT_GROUP -# \u914D\u7F6E\u5185\u5BB9\uFF1A +# Nacos Console add configuration: +# Data ID:maxkey.properties +# Group:DEFAULT_GROUP +# configuration:useLocalCache=true spring.application.name =maxkey-mgt -# \u6307\u5B9A\u914D\u7F6E\u7684\u540E\u7F00\uFF0C\u652F\u6301 properties\u3001yaml\u3001yml\uFF0C\u9ED8\u8BA4\u4E3A properties +# 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 -#\u662F\u5426\u542F\u7528nacos\u914D\u7F6E +#nacos enabled spring.cloud.nacos.config.enabled =${NACOS_CONFIG_ENABLED:false} \ No newline at end of file