diff --git a/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/NacosConfigUtil.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/NacosConfigUtil.java index 3f52cf2b..fb77b31b 100644 --- a/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/NacosConfigUtil.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/NacosConfigUtil.java @@ -61,32 +61,32 @@ public final class NacosConfigUtil { public static String getApiDefinitionDataId(String appName) { - return String.format("%s-%s%s", API_DEFINITION_DATA_ID_POSTFIX, appName, GLOBAL_DATA_ID_POSTFIX); + return String.format("%s%s%s", appName, API_DEFINITION_DATA_ID_POSTFIX, GLOBAL_DATA_ID_POSTFIX); } public static String getGatewayFlowDataId(String appName) { - return String.format("%s-%s%s", GATEWAY_FLOW_DATA_ID_POSTFIX, appName, GLOBAL_DATA_ID_POSTFIX); + return String.format("%s%s%s", appName, GATEWAY_FLOW_DATA_ID_POSTFIX, GLOBAL_DATA_ID_POSTFIX); } public static String getSystemRuleDataId(String appName) { - return String.format("%s-%s%s", appName, SYSTEM_DATA_ID_POSTFIX, GLOBAL_DATA_ID_POSTFIX); + return String.format("%s%s%s", appName, SYSTEM_DATA_ID_POSTFIX, GLOBAL_DATA_ID_POSTFIX); } public static String getAuthorityRuleDataId(String appName) { - return String.format("%s-%s%s", appName, AUTHORITY_DATA_ID_POSTFIX, GLOBAL_DATA_ID_POSTFIX); + return String.format("%s%s%s", appName, AUTHORITY_DATA_ID_POSTFIX, GLOBAL_DATA_ID_POSTFIX); } public static String getDegradeRuleDataId(String appName) { - return String.format("%s-%s%s", appName, DEGRADE_DATA_ID_POSTFIX, GLOBAL_DATA_ID_POSTFIX); + return String.format("%s%s%s", appName, DEGRADE_DATA_ID_POSTFIX, GLOBAL_DATA_ID_POSTFIX); } public static String getParamRuleDataId(String appName) { - return String.format("%s-%s%s", appName, PARAM_FLOW_DATA_ID_POSTFIX, GLOBAL_DATA_ID_POSTFIX); + return String.format("%s%s%s", appName, PARAM_FLOW_DATA_ID_POSTFIX, GLOBAL_DATA_ID_POSTFIX); } public static String getFlowRuleDataId(String appName) { - return String.format("%s-%s%s", appName, FLOW_DATA_ID_POSTFIX, GLOBAL_DATA_ID_POSTFIX); + return String.format("%s%s%s", appName, FLOW_DATA_ID_POSTFIX, GLOBAL_DATA_ID_POSTFIX); } } diff --git a/sentinel-dashboard/src/main/resources/application.properties b/sentinel-dashboard/src/main/resources/application.properties index 51cb2f0d..896fbb11 100755 --- a/sentinel-dashboard/src/main/resources/application.properties +++ b/sentinel-dashboard/src/main/resources/application.properties @@ -6,7 +6,7 @@ server.servlet.encoding.enabled=true server.servlet.session.cookie.name=sentinel_dashboard_cookie #logging settings logging.level.org.springframework.web=INFO -logging.file.name=./logs/csp/sentinel-dashboard.log +logging.file.name=${user.home}/logs/csp/sentinel-dashboard.log logging.pattern.file=%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n #logging.pattern.console= %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n #auth settings @@ -21,8 +21,8 @@ auth.password=admin sentinel.dashboard.version=@project.version@ ############################################################## # nacos config -nacos.config.server-addr=http://127.0.0.1:8848 -#nacos.config.server-addr=http://172.16.8.70:8848 +#nacos.config.server-addr=http://127.0.0.1:8848 +nacos.config.server-addr=http://172.16.8.70:8848 nacos.config.namespace=namespace-sentinel nacos.config.groupId=DEFAULT_GROUP nacos.config.username=