From 6c7c4d8724330faf2b191e10a4336939a06e0ecf Mon Sep 17 00:00:00 2001 From: nieziyan Date: Thu, 12 Oct 2023 19:18:15 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/native_jni/AnalysisProcess.java | 1 - .../pom.xml | 2 +- .../jeecg/JeecgAbnormalAlarmApplication.java | 0 .../src/main/resources/application.yml | 4 ++-- .../src/main/resources/logback-spring.xml | 0 .../pom.xml | 2 +- .../jeecg/JeecgAutoProcessApplication.java | 0 .../src/main/resources/application.yml | 5 +++-- .../src/main/resources/logback-spring.xml | 0 .../Dockerfile | 0 .../README.md | 0 .../pom.xml | 2 +- .../org/jeecg/JeecgGatewayApplication.java | 0 .../jeecg/config/GatewayRoutersConfig.java | 0 .../config/RateLimiterConfiguration.java | 0 .../java/org/jeecg/config/RouterDataType.java | 0 .../jeecg/fallback/FallbackController.java | 0 .../fallback/HystrixFallbackHandler.java | 0 .../GatewaySentinelExceptionConfig.java | 0 .../sentinel/SentinelBlockRequestHandler.java | 0 .../jeecg/filter/GlobalAccessTokenFilter.java | 0 .../filter/SentinelFilterContextConfig.java | 0 .../org/jeecg/handler/LoderRouderHandler.java | 0 .../swagger/MySwaggerResourceProvider.java | 0 .../swagger/SwaggerResourceController.java | 0 .../org/jeecg/loader/DynamicRouteLoader.java | 0 .../repository/DynamicRouteService.java | 0 .../MyInMemoryRouteDefinitionRepository.java | 0 .../org/jeecg/loader/vo/GatewayRouteVo.java | 0 .../jeecg/loader/vo/MyRouteDefinition.java | 0 .../src/main/resources/application.yml | 2 +- .../src/main/resources/logback-spring.xml | 0 .../Dockerfile | 0 .../README.md | 0 .../docs/config/jeecg-dev.yaml | 0 .../docs/config/jeecg-gateway-dev.yaml | 0 .../docs/config/jeecg-gateway-router.json | 0 .../docs/config/jeecg.yaml | 0 .../config/分库分表/jeecg-sharding-multi.yaml | 0 .../docs/config/分库分表/jeecg-sharding.yaml | 0 .../pom.xml | 4 ++-- .../alibaba/nacos/JeecgNacosApplication.java | 0 .../src/main/resources/application.yml | 0 .../Dockerfile | 0 .../README.md | 0 .../pom.xml | 2 +- .../org/jeecg/JeecgDemoCloudApplication.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/logback-spring.xml | 0 .../pom.xml | 2 +- .../org/jeecg/JeecgLogManageApplication.java | 0 .../src/main/resources/application.yml | 4 ++-- .../src/main/resources/logback-spring.xml | 0 .../pom.xml | 2 +- .../JeecgSpectrumAnalysisApplication.java | 0 .../src/main/resources/application.yml | 5 +++-- .../resources/jeecg/jeecg_config.properties | 0 .../resources/jeecg/jeecg_database.properties | 0 .../src/main/resources/logback-spring.xml | 0 .../pom.xml | 2 +- .../JeecgStationOperationApplication.java | 0 .../src/main/resources/application.yml | 4 ++-- .../resources/jeecg/jeecg_config.properties | 0 .../resources/jeecg/jeecg_database.properties | 0 .../src/main/resources/logback-spring.xml | 0 .../Dockerfile | 0 .../README.md | 0 .../pom.xml | 2 +- .../jeecg/JeecgSystemCloudApplication.java | 0 .../src/main/resources/application.yml | 4 ++-- .../resources/jeecg/jeecg_config.properties | 0 .../resources/jeecg/jeecg_database.properties | 0 .../src/main/resources/logback-spring.xml | 0 .../pom.xml | 2 +- .../jeecg/JeecgWebStatisticsApplication.java | 0 .../src/main/resources/application.yml | 4 ++-- .../resources/jeecg/jeecg_config.properties | 0 .../resources/jeecg/jeecg_database.properties | 0 .../src/main/resources/logback-spring.xml | 0 jeecg-server-cloud/pom.xml | 20 +++++++++---------- 80 files changed, 38 insertions(+), 37 deletions(-) rename jeecg-server-cloud/{jeecg-abnormal-alarm-start => armd-abnormal-alarm-start}/pom.xml (96%) rename jeecg-server-cloud/{jeecg-abnormal-alarm-start => armd-abnormal-alarm-start}/src/main/java/org/jeecg/JeecgAbnormalAlarmApplication.java (100%) rename jeecg-server-cloud/{jeecg-abnormal-alarm-start => armd-abnormal-alarm-start}/src/main/resources/application.yml (79%) rename jeecg-server-cloud/{jeecg-abnormal-alarm-start => armd-abnormal-alarm-start}/src/main/resources/logback-spring.xml (100%) rename jeecg-server-cloud/{jeecg-auto-process-start => armd-auto-process-start}/pom.xml (96%) rename jeecg-server-cloud/{jeecg-auto-process-start => armd-auto-process-start}/src/main/java/org/jeecg/JeecgAutoProcessApplication.java (100%) rename jeecg-server-cloud/{jeecg-auto-process-start => armd-auto-process-start}/src/main/resources/application.yml (70%) rename jeecg-server-cloud/{jeecg-auto-process-start => armd-auto-process-start}/src/main/resources/logback-spring.xml (100%) rename jeecg-server-cloud/{jeecg-cloud-gateway => armd-cloud-gateway}/Dockerfile (100%) rename jeecg-server-cloud/{jeecg-cloud-gateway => armd-cloud-gateway}/README.md (100%) rename jeecg-server-cloud/{jeecg-cloud-gateway => armd-cloud-gateway}/pom.xml (98%) rename jeecg-server-cloud/{jeecg-cloud-gateway => armd-cloud-gateway}/src/main/java/org/jeecg/JeecgGatewayApplication.java (100%) rename jeecg-server-cloud/{jeecg-cloud-gateway => armd-cloud-gateway}/src/main/java/org/jeecg/config/GatewayRoutersConfig.java (100%) rename jeecg-server-cloud/{jeecg-cloud-gateway => armd-cloud-gateway}/src/main/java/org/jeecg/config/RateLimiterConfiguration.java (100%) rename jeecg-server-cloud/{jeecg-cloud-gateway => armd-cloud-gateway}/src/main/java/org/jeecg/config/RouterDataType.java (100%) rename jeecg-server-cloud/{jeecg-cloud-gateway => armd-cloud-gateway}/src/main/java/org/jeecg/fallback/FallbackController.java (100%) rename jeecg-server-cloud/{jeecg-cloud-gateway => armd-cloud-gateway}/src/main/java/org/jeecg/fallback/HystrixFallbackHandler.java (100%) rename jeecg-server-cloud/{jeecg-cloud-gateway => armd-cloud-gateway}/src/main/java/org/jeecg/fallback/sentinel/GatewaySentinelExceptionConfig.java (100%) rename jeecg-server-cloud/{jeecg-cloud-gateway => armd-cloud-gateway}/src/main/java/org/jeecg/fallback/sentinel/SentinelBlockRequestHandler.java (100%) rename jeecg-server-cloud/{jeecg-cloud-gateway => armd-cloud-gateway}/src/main/java/org/jeecg/filter/GlobalAccessTokenFilter.java (100%) rename jeecg-server-cloud/{jeecg-cloud-gateway => armd-cloud-gateway}/src/main/java/org/jeecg/filter/SentinelFilterContextConfig.java (100%) rename jeecg-server-cloud/{jeecg-cloud-gateway => armd-cloud-gateway}/src/main/java/org/jeecg/handler/LoderRouderHandler.java (100%) rename jeecg-server-cloud/{jeecg-cloud-gateway => armd-cloud-gateway}/src/main/java/org/jeecg/handler/swagger/MySwaggerResourceProvider.java (100%) rename jeecg-server-cloud/{jeecg-cloud-gateway => armd-cloud-gateway}/src/main/java/org/jeecg/handler/swagger/SwaggerResourceController.java (100%) rename jeecg-server-cloud/{jeecg-cloud-gateway => armd-cloud-gateway}/src/main/java/org/jeecg/loader/DynamicRouteLoader.java (100%) rename jeecg-server-cloud/{jeecg-cloud-gateway => armd-cloud-gateway}/src/main/java/org/jeecg/loader/repository/DynamicRouteService.java (100%) rename jeecg-server-cloud/{jeecg-cloud-gateway => armd-cloud-gateway}/src/main/java/org/jeecg/loader/repository/MyInMemoryRouteDefinitionRepository.java (100%) rename jeecg-server-cloud/{jeecg-cloud-gateway => armd-cloud-gateway}/src/main/java/org/jeecg/loader/vo/GatewayRouteVo.java (100%) rename jeecg-server-cloud/{jeecg-cloud-gateway => armd-cloud-gateway}/src/main/java/org/jeecg/loader/vo/MyRouteDefinition.java (100%) rename jeecg-server-cloud/{jeecg-cloud-gateway => armd-cloud-gateway}/src/main/resources/application.yml (99%) rename jeecg-server-cloud/{jeecg-cloud-gateway => armd-cloud-gateway}/src/main/resources/logback-spring.xml (100%) rename jeecg-server-cloud/{jeecg-cloud-nacos => armd-cloud-nacos}/Dockerfile (100%) rename jeecg-server-cloud/{jeecg-cloud-nacos => armd-cloud-nacos}/README.md (100%) rename jeecg-server-cloud/{jeecg-cloud-nacos => armd-cloud-nacos}/docs/config/jeecg-dev.yaml (100%) rename jeecg-server-cloud/{jeecg-cloud-nacos => armd-cloud-nacos}/docs/config/jeecg-gateway-dev.yaml (100%) rename jeecg-server-cloud/{jeecg-cloud-nacos => armd-cloud-nacos}/docs/config/jeecg-gateway-router.json (100%) rename jeecg-server-cloud/{jeecg-cloud-nacos => armd-cloud-nacos}/docs/config/jeecg.yaml (100%) rename jeecg-server-cloud/{jeecg-cloud-nacos => armd-cloud-nacos}/docs/config/分库分表/jeecg-sharding-multi.yaml (100%) rename jeecg-server-cloud/{jeecg-cloud-nacos => armd-cloud-nacos}/docs/config/分库分表/jeecg-sharding.yaml (100%) rename jeecg-server-cloud/{jeecg-cloud-nacos => armd-cloud-nacos}/pom.xml (97%) rename jeecg-server-cloud/{jeecg-cloud-nacos => armd-cloud-nacos}/src/main/java/com/alibaba/nacos/JeecgNacosApplication.java (100%) rename jeecg-server-cloud/{jeecg-cloud-nacos => armd-cloud-nacos}/src/main/resources/application.yml (100%) rename jeecg-server-cloud/{jeecg-demo-cloud-start => armd-demo-cloud-start}/Dockerfile (100%) rename jeecg-server-cloud/{jeecg-demo-cloud-start => armd-demo-cloud-start}/README.md (100%) rename jeecg-server-cloud/{jeecg-demo-cloud-start => armd-demo-cloud-start}/pom.xml (97%) rename jeecg-server-cloud/{jeecg-demo-cloud-start => armd-demo-cloud-start}/src/main/java/org/jeecg/JeecgDemoCloudApplication.java (100%) rename jeecg-server-cloud/{jeecg-demo-cloud-start => armd-demo-cloud-start}/src/main/resources/application.yml (100%) rename jeecg-server-cloud/{jeecg-demo-cloud-start => armd-demo-cloud-start}/src/main/resources/logback-spring.xml (100%) rename jeecg-server-cloud/{jeecg-log-manage-start => armd-log-manage-start}/pom.xml (95%) rename jeecg-server-cloud/{jeecg-log-manage-start => armd-log-manage-start}/src/main/java/org/jeecg/JeecgLogManageApplication.java (100%) rename jeecg-server-cloud/{jeecg-log-manage-start => armd-log-manage-start}/src/main/resources/application.yml (79%) rename jeecg-server-cloud/{jeecg-log-manage-start => armd-log-manage-start}/src/main/resources/logback-spring.xml (100%) rename jeecg-server-cloud/{jeecg-spectrum-analysis-start => armd-spectrum-analysis-start}/pom.xml (96%) rename jeecg-server-cloud/{jeecg-spectrum-analysis-start => armd-spectrum-analysis-start}/src/main/java/org/jeecg/JeecgSpectrumAnalysisApplication.java (100%) rename jeecg-server-cloud/{jeecg-spectrum-analysis-start => armd-spectrum-analysis-start}/src/main/resources/application.yml (70%) rename jeecg-server-cloud/{jeecg-spectrum-analysis-start => armd-spectrum-analysis-start}/src/main/resources/jeecg/jeecg_config.properties (100%) rename jeecg-server-cloud/{jeecg-spectrum-analysis-start => armd-spectrum-analysis-start}/src/main/resources/jeecg/jeecg_database.properties (100%) rename jeecg-server-cloud/{jeecg-spectrum-analysis-start => armd-spectrum-analysis-start}/src/main/resources/logback-spring.xml (100%) rename jeecg-server-cloud/{jeecg-station-operation-start => armd-station-operation-start}/pom.xml (96%) rename jeecg-server-cloud/{jeecg-station-operation-start => armd-station-operation-start}/src/main/java/org/jeecg/JeecgStationOperationApplication.java (100%) rename jeecg-server-cloud/{jeecg-station-operation-start => armd-station-operation-start}/src/main/resources/application.yml (79%) rename jeecg-server-cloud/{jeecg-station-operation-start => armd-station-operation-start}/src/main/resources/jeecg/jeecg_config.properties (100%) rename jeecg-server-cloud/{jeecg-station-operation-start => armd-station-operation-start}/src/main/resources/jeecg/jeecg_database.properties (100%) rename jeecg-server-cloud/{jeecg-station-operation-start => armd-station-operation-start}/src/main/resources/logback-spring.xml (100%) rename jeecg-server-cloud/{jeecg-system-cloud-start => armd-system-cloud-start}/Dockerfile (100%) rename jeecg-server-cloud/{jeecg-system-cloud-start => armd-system-cloud-start}/README.md (100%) rename jeecg-server-cloud/{jeecg-system-cloud-start => armd-system-cloud-start}/pom.xml (98%) rename jeecg-server-cloud/{jeecg-system-cloud-start => armd-system-cloud-start}/src/main/java/org/jeecg/JeecgSystemCloudApplication.java (100%) rename jeecg-server-cloud/{jeecg-system-cloud-start => armd-system-cloud-start}/src/main/resources/application.yml (79%) rename jeecg-server-cloud/{jeecg-system-cloud-start => armd-system-cloud-start}/src/main/resources/jeecg/jeecg_config.properties (100%) rename jeecg-server-cloud/{jeecg-system-cloud-start => armd-system-cloud-start}/src/main/resources/jeecg/jeecg_database.properties (100%) rename jeecg-server-cloud/{jeecg-system-cloud-start => armd-system-cloud-start}/src/main/resources/logback-spring.xml (100%) rename jeecg-server-cloud/{jeecg-web-statistics-start => armd-web-statistics-start}/pom.xml (96%) rename jeecg-server-cloud/{jeecg-web-statistics-start => armd-web-statistics-start}/src/main/java/org/jeecg/JeecgWebStatisticsApplication.java (100%) rename jeecg-server-cloud/{jeecg-web-statistics-start => armd-web-statistics-start}/src/main/resources/application.yml (79%) rename jeecg-server-cloud/{jeecg-web-statistics-start => armd-web-statistics-start}/src/main/resources/jeecg/jeecg_config.properties (100%) rename jeecg-server-cloud/{jeecg-web-statistics-start => armd-web-statistics-start}/src/main/resources/jeecg/jeecg_database.properties (100%) rename jeecg-server-cloud/{jeecg-web-statistics-start => armd-web-statistics-start}/src/main/resources/logback-spring.xml (100%) diff --git a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/native_jni/AnalysisProcess.java b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/native_jni/AnalysisProcess.java index 995c8415..c302563d 100644 --- a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/native_jni/AnalysisProcess.java +++ b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/native_jni/AnalysisProcess.java @@ -10,7 +10,6 @@ import org.jeecg.common.constant.WebsocketConst; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.modules.base.entity.postgre.SysUser; import org.jeecg.modules.entity.vo.PHDFile; -import org.jeecg.modules.feignclient.SystemClient; import org.jeecgframework.core.util.ApplicationContextUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; diff --git a/jeecg-server-cloud/jeecg-abnormal-alarm-start/pom.xml b/jeecg-server-cloud/armd-abnormal-alarm-start/pom.xml similarity index 96% rename from jeecg-server-cloud/jeecg-abnormal-alarm-start/pom.xml rename to jeecg-server-cloud/armd-abnormal-alarm-start/pom.xml index 8a354d85..6c7e7966 100644 --- a/jeecg-server-cloud/jeecg-abnormal-alarm-start/pom.xml +++ b/jeecg-server-cloud/armd-abnormal-alarm-start/pom.xml @@ -9,7 +9,7 @@ 3.5.1 - jeecg-abnormal-alarm-start + armd-abnormal-alarm-start diff --git a/jeecg-server-cloud/jeecg-abnormal-alarm-start/src/main/java/org/jeecg/JeecgAbnormalAlarmApplication.java b/jeecg-server-cloud/armd-abnormal-alarm-start/src/main/java/org/jeecg/JeecgAbnormalAlarmApplication.java similarity index 100% rename from jeecg-server-cloud/jeecg-abnormal-alarm-start/src/main/java/org/jeecg/JeecgAbnormalAlarmApplication.java rename to jeecg-server-cloud/armd-abnormal-alarm-start/src/main/java/org/jeecg/JeecgAbnormalAlarmApplication.java diff --git a/jeecg-server-cloud/jeecg-abnormal-alarm-start/src/main/resources/application.yml b/jeecg-server-cloud/armd-abnormal-alarm-start/src/main/resources/application.yml similarity index 79% rename from jeecg-server-cloud/jeecg-abnormal-alarm-start/src/main/resources/application.yml rename to jeecg-server-cloud/armd-abnormal-alarm-start/src/main/resources/application.yml index f10a11e4..6605266d 100644 --- a/jeecg-server-cloud/jeecg-abnormal-alarm-start/src/main/resources/application.yml +++ b/jeecg-server-cloud/armd-abnormal-alarm-start/src/main/resources/application.yml @@ -14,5 +14,5 @@ spring: server-addr: ${spring.cloud.nacos.config.server-addr} config: import: - - optional:nacos:jeecg.yaml - - optional:nacos:jeecg-@profile.name@.yaml \ No newline at end of file + - optional:nacos:armd.yaml + - optional:nacos:armd-@profile.name@.yaml \ No newline at end of file diff --git a/jeecg-server-cloud/jeecg-abnormal-alarm-start/src/main/resources/logback-spring.xml b/jeecg-server-cloud/armd-abnormal-alarm-start/src/main/resources/logback-spring.xml similarity index 100% rename from jeecg-server-cloud/jeecg-abnormal-alarm-start/src/main/resources/logback-spring.xml rename to jeecg-server-cloud/armd-abnormal-alarm-start/src/main/resources/logback-spring.xml diff --git a/jeecg-server-cloud/jeecg-auto-process-start/pom.xml b/jeecg-server-cloud/armd-auto-process-start/pom.xml similarity index 96% rename from jeecg-server-cloud/jeecg-auto-process-start/pom.xml rename to jeecg-server-cloud/armd-auto-process-start/pom.xml index bf367068..3d01ee25 100644 --- a/jeecg-server-cloud/jeecg-auto-process-start/pom.xml +++ b/jeecg-server-cloud/armd-auto-process-start/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - jeecg-auto-process-start + armd-auto-process-start diff --git a/jeecg-server-cloud/jeecg-auto-process-start/src/main/java/org/jeecg/JeecgAutoProcessApplication.java b/jeecg-server-cloud/armd-auto-process-start/src/main/java/org/jeecg/JeecgAutoProcessApplication.java similarity index 100% rename from jeecg-server-cloud/jeecg-auto-process-start/src/main/java/org/jeecg/JeecgAutoProcessApplication.java rename to jeecg-server-cloud/armd-auto-process-start/src/main/java/org/jeecg/JeecgAutoProcessApplication.java diff --git a/jeecg-server-cloud/jeecg-auto-process-start/src/main/resources/application.yml b/jeecg-server-cloud/armd-auto-process-start/src/main/resources/application.yml similarity index 70% rename from jeecg-server-cloud/jeecg-auto-process-start/src/main/resources/application.yml rename to jeecg-server-cloud/armd-auto-process-start/src/main/resources/application.yml index a5d0fe92..b77b9afe 100644 --- a/jeecg-server-cloud/jeecg-auto-process-start/src/main/resources/application.yml +++ b/jeecg-server-cloud/armd-auto-process-start/src/main/resources/application.yml @@ -14,6 +14,7 @@ spring: server-addr: ${spring.cloud.nacos.config.server-addr} config: import: - - optional:nacos:jeecg.yaml - - optional:nacos:jeecg-@profile.name@-pbl.yaml + - optional:nacos:armd.yaml + - optional:nacos:armd-@profile.name@.yaml + - optional:nacos:armd-analysis-@profile.name@.yaml diff --git a/jeecg-server-cloud/jeecg-auto-process-start/src/main/resources/logback-spring.xml b/jeecg-server-cloud/armd-auto-process-start/src/main/resources/logback-spring.xml similarity index 100% rename from jeecg-server-cloud/jeecg-auto-process-start/src/main/resources/logback-spring.xml rename to jeecg-server-cloud/armd-auto-process-start/src/main/resources/logback-spring.xml diff --git a/jeecg-server-cloud/jeecg-cloud-gateway/Dockerfile b/jeecg-server-cloud/armd-cloud-gateway/Dockerfile similarity index 100% rename from jeecg-server-cloud/jeecg-cloud-gateway/Dockerfile rename to jeecg-server-cloud/armd-cloud-gateway/Dockerfile diff --git a/jeecg-server-cloud/jeecg-cloud-gateway/README.md b/jeecg-server-cloud/armd-cloud-gateway/README.md similarity index 100% rename from jeecg-server-cloud/jeecg-cloud-gateway/README.md rename to jeecg-server-cloud/armd-cloud-gateway/README.md diff --git a/jeecg-server-cloud/jeecg-cloud-gateway/pom.xml b/jeecg-server-cloud/armd-cloud-gateway/pom.xml similarity index 98% rename from jeecg-server-cloud/jeecg-cloud-gateway/pom.xml rename to jeecg-server-cloud/armd-cloud-gateway/pom.xml index 8dbf9868..b782d202 100644 --- a/jeecg-server-cloud/jeecg-cloud-gateway/pom.xml +++ b/jeecg-server-cloud/armd-cloud-gateway/pom.xml @@ -8,7 +8,7 @@ 3.5.1 4.0.0 - jeecg-cloud-gateway + armd-cloud-gateway diff --git a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/JeecgGatewayApplication.java b/jeecg-server-cloud/armd-cloud-gateway/src/main/java/org/jeecg/JeecgGatewayApplication.java similarity index 100% rename from jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/JeecgGatewayApplication.java rename to jeecg-server-cloud/armd-cloud-gateway/src/main/java/org/jeecg/JeecgGatewayApplication.java diff --git a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/config/GatewayRoutersConfig.java b/jeecg-server-cloud/armd-cloud-gateway/src/main/java/org/jeecg/config/GatewayRoutersConfig.java similarity index 100% rename from jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/config/GatewayRoutersConfig.java rename to jeecg-server-cloud/armd-cloud-gateway/src/main/java/org/jeecg/config/GatewayRoutersConfig.java diff --git a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/config/RateLimiterConfiguration.java b/jeecg-server-cloud/armd-cloud-gateway/src/main/java/org/jeecg/config/RateLimiterConfiguration.java similarity index 100% rename from jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/config/RateLimiterConfiguration.java rename to jeecg-server-cloud/armd-cloud-gateway/src/main/java/org/jeecg/config/RateLimiterConfiguration.java diff --git a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/config/RouterDataType.java b/jeecg-server-cloud/armd-cloud-gateway/src/main/java/org/jeecg/config/RouterDataType.java similarity index 100% rename from jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/config/RouterDataType.java rename to jeecg-server-cloud/armd-cloud-gateway/src/main/java/org/jeecg/config/RouterDataType.java diff --git a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/fallback/FallbackController.java b/jeecg-server-cloud/armd-cloud-gateway/src/main/java/org/jeecg/fallback/FallbackController.java similarity index 100% rename from jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/fallback/FallbackController.java rename to jeecg-server-cloud/armd-cloud-gateway/src/main/java/org/jeecg/fallback/FallbackController.java diff --git a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/fallback/HystrixFallbackHandler.java b/jeecg-server-cloud/armd-cloud-gateway/src/main/java/org/jeecg/fallback/HystrixFallbackHandler.java similarity index 100% rename from jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/fallback/HystrixFallbackHandler.java rename to jeecg-server-cloud/armd-cloud-gateway/src/main/java/org/jeecg/fallback/HystrixFallbackHandler.java diff --git a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/fallback/sentinel/GatewaySentinelExceptionConfig.java b/jeecg-server-cloud/armd-cloud-gateway/src/main/java/org/jeecg/fallback/sentinel/GatewaySentinelExceptionConfig.java similarity index 100% rename from jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/fallback/sentinel/GatewaySentinelExceptionConfig.java rename to jeecg-server-cloud/armd-cloud-gateway/src/main/java/org/jeecg/fallback/sentinel/GatewaySentinelExceptionConfig.java diff --git a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/fallback/sentinel/SentinelBlockRequestHandler.java b/jeecg-server-cloud/armd-cloud-gateway/src/main/java/org/jeecg/fallback/sentinel/SentinelBlockRequestHandler.java similarity index 100% rename from jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/fallback/sentinel/SentinelBlockRequestHandler.java rename to jeecg-server-cloud/armd-cloud-gateway/src/main/java/org/jeecg/fallback/sentinel/SentinelBlockRequestHandler.java diff --git a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/filter/GlobalAccessTokenFilter.java b/jeecg-server-cloud/armd-cloud-gateway/src/main/java/org/jeecg/filter/GlobalAccessTokenFilter.java similarity index 100% rename from jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/filter/GlobalAccessTokenFilter.java rename to jeecg-server-cloud/armd-cloud-gateway/src/main/java/org/jeecg/filter/GlobalAccessTokenFilter.java diff --git a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/filter/SentinelFilterContextConfig.java b/jeecg-server-cloud/armd-cloud-gateway/src/main/java/org/jeecg/filter/SentinelFilterContextConfig.java similarity index 100% rename from jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/filter/SentinelFilterContextConfig.java rename to jeecg-server-cloud/armd-cloud-gateway/src/main/java/org/jeecg/filter/SentinelFilterContextConfig.java diff --git a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/handler/LoderRouderHandler.java b/jeecg-server-cloud/armd-cloud-gateway/src/main/java/org/jeecg/handler/LoderRouderHandler.java similarity index 100% rename from jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/handler/LoderRouderHandler.java rename to jeecg-server-cloud/armd-cloud-gateway/src/main/java/org/jeecg/handler/LoderRouderHandler.java diff --git a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/handler/swagger/MySwaggerResourceProvider.java b/jeecg-server-cloud/armd-cloud-gateway/src/main/java/org/jeecg/handler/swagger/MySwaggerResourceProvider.java similarity index 100% rename from jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/handler/swagger/MySwaggerResourceProvider.java rename to jeecg-server-cloud/armd-cloud-gateway/src/main/java/org/jeecg/handler/swagger/MySwaggerResourceProvider.java diff --git a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/handler/swagger/SwaggerResourceController.java b/jeecg-server-cloud/armd-cloud-gateway/src/main/java/org/jeecg/handler/swagger/SwaggerResourceController.java similarity index 100% rename from jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/handler/swagger/SwaggerResourceController.java rename to jeecg-server-cloud/armd-cloud-gateway/src/main/java/org/jeecg/handler/swagger/SwaggerResourceController.java diff --git a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/DynamicRouteLoader.java b/jeecg-server-cloud/armd-cloud-gateway/src/main/java/org/jeecg/loader/DynamicRouteLoader.java similarity index 100% rename from jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/DynamicRouteLoader.java rename to jeecg-server-cloud/armd-cloud-gateway/src/main/java/org/jeecg/loader/DynamicRouteLoader.java diff --git a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/repository/DynamicRouteService.java b/jeecg-server-cloud/armd-cloud-gateway/src/main/java/org/jeecg/loader/repository/DynamicRouteService.java similarity index 100% rename from jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/repository/DynamicRouteService.java rename to jeecg-server-cloud/armd-cloud-gateway/src/main/java/org/jeecg/loader/repository/DynamicRouteService.java diff --git a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/repository/MyInMemoryRouteDefinitionRepository.java b/jeecg-server-cloud/armd-cloud-gateway/src/main/java/org/jeecg/loader/repository/MyInMemoryRouteDefinitionRepository.java similarity index 100% rename from jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/repository/MyInMemoryRouteDefinitionRepository.java rename to jeecg-server-cloud/armd-cloud-gateway/src/main/java/org/jeecg/loader/repository/MyInMemoryRouteDefinitionRepository.java diff --git a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/vo/GatewayRouteVo.java b/jeecg-server-cloud/armd-cloud-gateway/src/main/java/org/jeecg/loader/vo/GatewayRouteVo.java similarity index 100% rename from jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/vo/GatewayRouteVo.java rename to jeecg-server-cloud/armd-cloud-gateway/src/main/java/org/jeecg/loader/vo/GatewayRouteVo.java diff --git a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/vo/MyRouteDefinition.java b/jeecg-server-cloud/armd-cloud-gateway/src/main/java/org/jeecg/loader/vo/MyRouteDefinition.java similarity index 100% rename from jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/vo/MyRouteDefinition.java rename to jeecg-server-cloud/armd-cloud-gateway/src/main/java/org/jeecg/loader/vo/MyRouteDefinition.java diff --git a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/resources/application.yml b/jeecg-server-cloud/armd-cloud-gateway/src/main/resources/application.yml similarity index 99% rename from jeecg-server-cloud/jeecg-cloud-gateway/src/main/resources/application.yml rename to jeecg-server-cloud/armd-cloud-gateway/src/main/resources/application.yml index 7e3cbb2a..d2dc6114 100644 --- a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/resources/application.yml +++ b/jeecg-server-cloud/armd-cloud-gateway/src/main/resources/application.yml @@ -3,7 +3,7 @@ server: spring: application: - name: jeecg-gateway + name: armd-gateway main: allow-circular-references: true config: diff --git a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/resources/logback-spring.xml b/jeecg-server-cloud/armd-cloud-gateway/src/main/resources/logback-spring.xml similarity index 100% rename from jeecg-server-cloud/jeecg-cloud-gateway/src/main/resources/logback-spring.xml rename to jeecg-server-cloud/armd-cloud-gateway/src/main/resources/logback-spring.xml diff --git a/jeecg-server-cloud/jeecg-cloud-nacos/Dockerfile b/jeecg-server-cloud/armd-cloud-nacos/Dockerfile similarity index 100% rename from jeecg-server-cloud/jeecg-cloud-nacos/Dockerfile rename to jeecg-server-cloud/armd-cloud-nacos/Dockerfile diff --git a/jeecg-server-cloud/jeecg-cloud-nacos/README.md b/jeecg-server-cloud/armd-cloud-nacos/README.md similarity index 100% rename from jeecg-server-cloud/jeecg-cloud-nacos/README.md rename to jeecg-server-cloud/armd-cloud-nacos/README.md diff --git a/jeecg-server-cloud/jeecg-cloud-nacos/docs/config/jeecg-dev.yaml b/jeecg-server-cloud/armd-cloud-nacos/docs/config/jeecg-dev.yaml similarity index 100% rename from jeecg-server-cloud/jeecg-cloud-nacos/docs/config/jeecg-dev.yaml rename to jeecg-server-cloud/armd-cloud-nacos/docs/config/jeecg-dev.yaml diff --git a/jeecg-server-cloud/jeecg-cloud-nacos/docs/config/jeecg-gateway-dev.yaml b/jeecg-server-cloud/armd-cloud-nacos/docs/config/jeecg-gateway-dev.yaml similarity index 100% rename from jeecg-server-cloud/jeecg-cloud-nacos/docs/config/jeecg-gateway-dev.yaml rename to jeecg-server-cloud/armd-cloud-nacos/docs/config/jeecg-gateway-dev.yaml diff --git a/jeecg-server-cloud/jeecg-cloud-nacos/docs/config/jeecg-gateway-router.json b/jeecg-server-cloud/armd-cloud-nacos/docs/config/jeecg-gateway-router.json similarity index 100% rename from jeecg-server-cloud/jeecg-cloud-nacos/docs/config/jeecg-gateway-router.json rename to jeecg-server-cloud/armd-cloud-nacos/docs/config/jeecg-gateway-router.json diff --git a/jeecg-server-cloud/jeecg-cloud-nacos/docs/config/jeecg.yaml b/jeecg-server-cloud/armd-cloud-nacos/docs/config/jeecg.yaml similarity index 100% rename from jeecg-server-cloud/jeecg-cloud-nacos/docs/config/jeecg.yaml rename to jeecg-server-cloud/armd-cloud-nacos/docs/config/jeecg.yaml diff --git a/jeecg-server-cloud/jeecg-cloud-nacos/docs/config/分库分表/jeecg-sharding-multi.yaml b/jeecg-server-cloud/armd-cloud-nacos/docs/config/分库分表/jeecg-sharding-multi.yaml similarity index 100% rename from jeecg-server-cloud/jeecg-cloud-nacos/docs/config/分库分表/jeecg-sharding-multi.yaml rename to jeecg-server-cloud/armd-cloud-nacos/docs/config/分库分表/jeecg-sharding-multi.yaml diff --git a/jeecg-server-cloud/jeecg-cloud-nacos/docs/config/分库分表/jeecg-sharding.yaml b/jeecg-server-cloud/armd-cloud-nacos/docs/config/分库分表/jeecg-sharding.yaml similarity index 100% rename from jeecg-server-cloud/jeecg-cloud-nacos/docs/config/分库分表/jeecg-sharding.yaml rename to jeecg-server-cloud/armd-cloud-nacos/docs/config/分库分表/jeecg-sharding.yaml diff --git a/jeecg-server-cloud/jeecg-cloud-nacos/pom.xml b/jeecg-server-cloud/armd-cloud-nacos/pom.xml similarity index 97% rename from jeecg-server-cloud/jeecg-cloud-nacos/pom.xml rename to jeecg-server-cloud/armd-cloud-nacos/pom.xml index 4ad6f1b0..7026ffe7 100644 --- a/jeecg-server-cloud/jeecg-cloud-nacos/pom.xml +++ b/jeecg-server-cloud/armd-cloud-nacos/pom.xml @@ -2,8 +2,8 @@ 4.0.0 - jeecg-cloud-nacos - jeecg-cloud-nacos + armd-cloud-nacos + armd-cloud-nacos nacos启动模块 3.5.1 diff --git a/jeecg-server-cloud/jeecg-cloud-nacos/src/main/java/com/alibaba/nacos/JeecgNacosApplication.java b/jeecg-server-cloud/armd-cloud-nacos/src/main/java/com/alibaba/nacos/JeecgNacosApplication.java similarity index 100% rename from jeecg-server-cloud/jeecg-cloud-nacos/src/main/java/com/alibaba/nacos/JeecgNacosApplication.java rename to jeecg-server-cloud/armd-cloud-nacos/src/main/java/com/alibaba/nacos/JeecgNacosApplication.java diff --git a/jeecg-server-cloud/jeecg-cloud-nacos/src/main/resources/application.yml b/jeecg-server-cloud/armd-cloud-nacos/src/main/resources/application.yml similarity index 100% rename from jeecg-server-cloud/jeecg-cloud-nacos/src/main/resources/application.yml rename to jeecg-server-cloud/armd-cloud-nacos/src/main/resources/application.yml diff --git a/jeecg-server-cloud/jeecg-demo-cloud-start/Dockerfile b/jeecg-server-cloud/armd-demo-cloud-start/Dockerfile similarity index 100% rename from jeecg-server-cloud/jeecg-demo-cloud-start/Dockerfile rename to jeecg-server-cloud/armd-demo-cloud-start/Dockerfile diff --git a/jeecg-server-cloud/jeecg-demo-cloud-start/README.md b/jeecg-server-cloud/armd-demo-cloud-start/README.md similarity index 100% rename from jeecg-server-cloud/jeecg-demo-cloud-start/README.md rename to jeecg-server-cloud/armd-demo-cloud-start/README.md diff --git a/jeecg-server-cloud/jeecg-demo-cloud-start/pom.xml b/jeecg-server-cloud/armd-demo-cloud-start/pom.xml similarity index 97% rename from jeecg-server-cloud/jeecg-demo-cloud-start/pom.xml rename to jeecg-server-cloud/armd-demo-cloud-start/pom.xml index 656f7e74..2e3435e2 100644 --- a/jeecg-server-cloud/jeecg-demo-cloud-start/pom.xml +++ b/jeecg-server-cloud/armd-demo-cloud-start/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - jeecg-demo-cloud-start + armd-demo-cloud-start Demo微服务启动 diff --git a/jeecg-server-cloud/jeecg-demo-cloud-start/src/main/java/org/jeecg/JeecgDemoCloudApplication.java b/jeecg-server-cloud/armd-demo-cloud-start/src/main/java/org/jeecg/JeecgDemoCloudApplication.java similarity index 100% rename from jeecg-server-cloud/jeecg-demo-cloud-start/src/main/java/org/jeecg/JeecgDemoCloudApplication.java rename to jeecg-server-cloud/armd-demo-cloud-start/src/main/java/org/jeecg/JeecgDemoCloudApplication.java diff --git a/jeecg-server-cloud/jeecg-demo-cloud-start/src/main/resources/application.yml b/jeecg-server-cloud/armd-demo-cloud-start/src/main/resources/application.yml similarity index 100% rename from jeecg-server-cloud/jeecg-demo-cloud-start/src/main/resources/application.yml rename to jeecg-server-cloud/armd-demo-cloud-start/src/main/resources/application.yml diff --git a/jeecg-server-cloud/jeecg-demo-cloud-start/src/main/resources/logback-spring.xml b/jeecg-server-cloud/armd-demo-cloud-start/src/main/resources/logback-spring.xml similarity index 100% rename from jeecg-server-cloud/jeecg-demo-cloud-start/src/main/resources/logback-spring.xml rename to jeecg-server-cloud/armd-demo-cloud-start/src/main/resources/logback-spring.xml diff --git a/jeecg-server-cloud/jeecg-log-manage-start/pom.xml b/jeecg-server-cloud/armd-log-manage-start/pom.xml similarity index 95% rename from jeecg-server-cloud/jeecg-log-manage-start/pom.xml rename to jeecg-server-cloud/armd-log-manage-start/pom.xml index 1ad7845d..d5174b2e 100644 --- a/jeecg-server-cloud/jeecg-log-manage-start/pom.xml +++ b/jeecg-server-cloud/armd-log-manage-start/pom.xml @@ -9,7 +9,7 @@ 3.5.1 - jeecg-log-manage-start + armd-log-manage-start diff --git a/jeecg-server-cloud/jeecg-log-manage-start/src/main/java/org/jeecg/JeecgLogManageApplication.java b/jeecg-server-cloud/armd-log-manage-start/src/main/java/org/jeecg/JeecgLogManageApplication.java similarity index 100% rename from jeecg-server-cloud/jeecg-log-manage-start/src/main/java/org/jeecg/JeecgLogManageApplication.java rename to jeecg-server-cloud/armd-log-manage-start/src/main/java/org/jeecg/JeecgLogManageApplication.java diff --git a/jeecg-server-cloud/jeecg-log-manage-start/src/main/resources/application.yml b/jeecg-server-cloud/armd-log-manage-start/src/main/resources/application.yml similarity index 79% rename from jeecg-server-cloud/jeecg-log-manage-start/src/main/resources/application.yml rename to jeecg-server-cloud/armd-log-manage-start/src/main/resources/application.yml index 8467c72d..cdf9afda 100644 --- a/jeecg-server-cloud/jeecg-log-manage-start/src/main/resources/application.yml +++ b/jeecg-server-cloud/armd-log-manage-start/src/main/resources/application.yml @@ -14,5 +14,5 @@ spring: server-addr: ${spring.cloud.nacos.config.server-addr} config: import: - - optional:nacos:jeecg.yaml - - optional:nacos:jeecg-@profile.name@.yaml \ No newline at end of file + - optional:nacos:armd.yaml + - optional:nacos:armd-@profile.name@.yaml \ No newline at end of file diff --git a/jeecg-server-cloud/jeecg-log-manage-start/src/main/resources/logback-spring.xml b/jeecg-server-cloud/armd-log-manage-start/src/main/resources/logback-spring.xml similarity index 100% rename from jeecg-server-cloud/jeecg-log-manage-start/src/main/resources/logback-spring.xml rename to jeecg-server-cloud/armd-log-manage-start/src/main/resources/logback-spring.xml diff --git a/jeecg-server-cloud/jeecg-spectrum-analysis-start/pom.xml b/jeecg-server-cloud/armd-spectrum-analysis-start/pom.xml similarity index 96% rename from jeecg-server-cloud/jeecg-spectrum-analysis-start/pom.xml rename to jeecg-server-cloud/armd-spectrum-analysis-start/pom.xml index a169d457..fa32dba0 100644 --- a/jeecg-server-cloud/jeecg-spectrum-analysis-start/pom.xml +++ b/jeecg-server-cloud/armd-spectrum-analysis-start/pom.xml @@ -9,7 +9,7 @@ 3.5.1 - jeecg-spectrum-analysis-start + armd-spectrum-analysis-start diff --git a/jeecg-server-cloud/jeecg-spectrum-analysis-start/src/main/java/org/jeecg/JeecgSpectrumAnalysisApplication.java b/jeecg-server-cloud/armd-spectrum-analysis-start/src/main/java/org/jeecg/JeecgSpectrumAnalysisApplication.java similarity index 100% rename from jeecg-server-cloud/jeecg-spectrum-analysis-start/src/main/java/org/jeecg/JeecgSpectrumAnalysisApplication.java rename to jeecg-server-cloud/armd-spectrum-analysis-start/src/main/java/org/jeecg/JeecgSpectrumAnalysisApplication.java diff --git a/jeecg-server-cloud/jeecg-spectrum-analysis-start/src/main/resources/application.yml b/jeecg-server-cloud/armd-spectrum-analysis-start/src/main/resources/application.yml similarity index 70% rename from jeecg-server-cloud/jeecg-spectrum-analysis-start/src/main/resources/application.yml rename to jeecg-server-cloud/armd-spectrum-analysis-start/src/main/resources/application.yml index 16026513..3deaf293 100644 --- a/jeecg-server-cloud/jeecg-spectrum-analysis-start/src/main/resources/application.yml +++ b/jeecg-server-cloud/armd-spectrum-analysis-start/src/main/resources/application.yml @@ -14,5 +14,6 @@ spring: server-addr: ${spring.cloud.nacos.config.server-addr} config: import: - - optional:nacos:jeecg.yaml - - optional:nacos:jeecg-@profile.name@.yaml \ No newline at end of file + - optional:nacos:armd.yaml + - optional:nacos:armd-@profile.name@.yaml + - optional:nacos:armd-analysis-@profile.name@.yaml diff --git a/jeecg-server-cloud/jeecg-spectrum-analysis-start/src/main/resources/jeecg/jeecg_config.properties b/jeecg-server-cloud/armd-spectrum-analysis-start/src/main/resources/jeecg/jeecg_config.properties similarity index 100% rename from jeecg-server-cloud/jeecg-spectrum-analysis-start/src/main/resources/jeecg/jeecg_config.properties rename to jeecg-server-cloud/armd-spectrum-analysis-start/src/main/resources/jeecg/jeecg_config.properties diff --git a/jeecg-server-cloud/jeecg-spectrum-analysis-start/src/main/resources/jeecg/jeecg_database.properties b/jeecg-server-cloud/armd-spectrum-analysis-start/src/main/resources/jeecg/jeecg_database.properties similarity index 100% rename from jeecg-server-cloud/jeecg-spectrum-analysis-start/src/main/resources/jeecg/jeecg_database.properties rename to jeecg-server-cloud/armd-spectrum-analysis-start/src/main/resources/jeecg/jeecg_database.properties diff --git a/jeecg-server-cloud/jeecg-spectrum-analysis-start/src/main/resources/logback-spring.xml b/jeecg-server-cloud/armd-spectrum-analysis-start/src/main/resources/logback-spring.xml similarity index 100% rename from jeecg-server-cloud/jeecg-spectrum-analysis-start/src/main/resources/logback-spring.xml rename to jeecg-server-cloud/armd-spectrum-analysis-start/src/main/resources/logback-spring.xml diff --git a/jeecg-server-cloud/jeecg-station-operation-start/pom.xml b/jeecg-server-cloud/armd-station-operation-start/pom.xml similarity index 96% rename from jeecg-server-cloud/jeecg-station-operation-start/pom.xml rename to jeecg-server-cloud/armd-station-operation-start/pom.xml index 40fe4e9a..48901876 100644 --- a/jeecg-server-cloud/jeecg-station-operation-start/pom.xml +++ b/jeecg-server-cloud/armd-station-operation-start/pom.xml @@ -9,7 +9,7 @@ 3.5.1 - jeecg-station-operation-start + armd-station-operation-start diff --git a/jeecg-server-cloud/jeecg-station-operation-start/src/main/java/org/jeecg/JeecgStationOperationApplication.java b/jeecg-server-cloud/armd-station-operation-start/src/main/java/org/jeecg/JeecgStationOperationApplication.java similarity index 100% rename from jeecg-server-cloud/jeecg-station-operation-start/src/main/java/org/jeecg/JeecgStationOperationApplication.java rename to jeecg-server-cloud/armd-station-operation-start/src/main/java/org/jeecg/JeecgStationOperationApplication.java diff --git a/jeecg-server-cloud/jeecg-station-operation-start/src/main/resources/application.yml b/jeecg-server-cloud/armd-station-operation-start/src/main/resources/application.yml similarity index 79% rename from jeecg-server-cloud/jeecg-station-operation-start/src/main/resources/application.yml rename to jeecg-server-cloud/armd-station-operation-start/src/main/resources/application.yml index faa36051..8b26da19 100644 --- a/jeecg-server-cloud/jeecg-station-operation-start/src/main/resources/application.yml +++ b/jeecg-server-cloud/armd-station-operation-start/src/main/resources/application.yml @@ -14,5 +14,5 @@ spring: server-addr: ${spring.cloud.nacos.config.server-addr} config: import: - - optional:nacos:jeecg.yaml - - optional:nacos:jeecg-@profile.name@.yaml \ No newline at end of file + - optional:nacos:armd.yaml + - optional:nacos:armd-@profile.name@.yaml \ No newline at end of file diff --git a/jeecg-server-cloud/jeecg-station-operation-start/src/main/resources/jeecg/jeecg_config.properties b/jeecg-server-cloud/armd-station-operation-start/src/main/resources/jeecg/jeecg_config.properties similarity index 100% rename from jeecg-server-cloud/jeecg-station-operation-start/src/main/resources/jeecg/jeecg_config.properties rename to jeecg-server-cloud/armd-station-operation-start/src/main/resources/jeecg/jeecg_config.properties diff --git a/jeecg-server-cloud/jeecg-station-operation-start/src/main/resources/jeecg/jeecg_database.properties b/jeecg-server-cloud/armd-station-operation-start/src/main/resources/jeecg/jeecg_database.properties similarity index 100% rename from jeecg-server-cloud/jeecg-station-operation-start/src/main/resources/jeecg/jeecg_database.properties rename to jeecg-server-cloud/armd-station-operation-start/src/main/resources/jeecg/jeecg_database.properties diff --git a/jeecg-server-cloud/jeecg-station-operation-start/src/main/resources/logback-spring.xml b/jeecg-server-cloud/armd-station-operation-start/src/main/resources/logback-spring.xml similarity index 100% rename from jeecg-server-cloud/jeecg-station-operation-start/src/main/resources/logback-spring.xml rename to jeecg-server-cloud/armd-station-operation-start/src/main/resources/logback-spring.xml diff --git a/jeecg-server-cloud/jeecg-system-cloud-start/Dockerfile b/jeecg-server-cloud/armd-system-cloud-start/Dockerfile similarity index 100% rename from jeecg-server-cloud/jeecg-system-cloud-start/Dockerfile rename to jeecg-server-cloud/armd-system-cloud-start/Dockerfile diff --git a/jeecg-server-cloud/jeecg-system-cloud-start/README.md b/jeecg-server-cloud/armd-system-cloud-start/README.md similarity index 100% rename from jeecg-server-cloud/jeecg-system-cloud-start/README.md rename to jeecg-server-cloud/armd-system-cloud-start/README.md diff --git a/jeecg-server-cloud/jeecg-system-cloud-start/pom.xml b/jeecg-server-cloud/armd-system-cloud-start/pom.xml similarity index 98% rename from jeecg-server-cloud/jeecg-system-cloud-start/pom.xml rename to jeecg-server-cloud/armd-system-cloud-start/pom.xml index 211baba6..052069dd 100644 --- a/jeecg-server-cloud/jeecg-system-cloud-start/pom.xml +++ b/jeecg-server-cloud/armd-system-cloud-start/pom.xml @@ -8,7 +8,7 @@ 3.5.1 4.0.0 - jeecg-system-cloud-start + armd-system-cloud-start System项目微服务启动 diff --git a/jeecg-server-cloud/jeecg-system-cloud-start/src/main/java/org/jeecg/JeecgSystemCloudApplication.java b/jeecg-server-cloud/armd-system-cloud-start/src/main/java/org/jeecg/JeecgSystemCloudApplication.java similarity index 100% rename from jeecg-server-cloud/jeecg-system-cloud-start/src/main/java/org/jeecg/JeecgSystemCloudApplication.java rename to jeecg-server-cloud/armd-system-cloud-start/src/main/java/org/jeecg/JeecgSystemCloudApplication.java diff --git a/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/application.yml b/jeecg-server-cloud/armd-system-cloud-start/src/main/resources/application.yml similarity index 79% rename from jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/application.yml rename to jeecg-server-cloud/armd-system-cloud-start/src/main/resources/application.yml index cf102c45..05439a60 100644 --- a/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/application.yml +++ b/jeecg-server-cloud/armd-system-cloud-start/src/main/resources/application.yml @@ -14,5 +14,5 @@ spring: server-addr: ${spring.cloud.nacos.config.server-addr} config: import: - - optional:nacos:jeecg.yaml - - optional:nacos:jeecg-@profile.name@.yaml + - optional:nacos:armd.yaml + - optional:nacos:armd-@profile.name@.yaml diff --git a/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/jeecg/jeecg_config.properties b/jeecg-server-cloud/armd-system-cloud-start/src/main/resources/jeecg/jeecg_config.properties similarity index 100% rename from jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/jeecg/jeecg_config.properties rename to jeecg-server-cloud/armd-system-cloud-start/src/main/resources/jeecg/jeecg_config.properties diff --git a/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/jeecg/jeecg_database.properties b/jeecg-server-cloud/armd-system-cloud-start/src/main/resources/jeecg/jeecg_database.properties similarity index 100% rename from jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/jeecg/jeecg_database.properties rename to jeecg-server-cloud/armd-system-cloud-start/src/main/resources/jeecg/jeecg_database.properties diff --git a/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/logback-spring.xml b/jeecg-server-cloud/armd-system-cloud-start/src/main/resources/logback-spring.xml similarity index 100% rename from jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/logback-spring.xml rename to jeecg-server-cloud/armd-system-cloud-start/src/main/resources/logback-spring.xml diff --git a/jeecg-server-cloud/jeecg-web-statistics-start/pom.xml b/jeecg-server-cloud/armd-web-statistics-start/pom.xml similarity index 96% rename from jeecg-server-cloud/jeecg-web-statistics-start/pom.xml rename to jeecg-server-cloud/armd-web-statistics-start/pom.xml index 97eaa1d1..bd59d28d 100644 --- a/jeecg-server-cloud/jeecg-web-statistics-start/pom.xml +++ b/jeecg-server-cloud/armd-web-statistics-start/pom.xml @@ -9,7 +9,7 @@ 3.5.1 - jeecg-web-statistics-start + armd-web-statistics-start diff --git a/jeecg-server-cloud/jeecg-web-statistics-start/src/main/java/org/jeecg/JeecgWebStatisticsApplication.java b/jeecg-server-cloud/armd-web-statistics-start/src/main/java/org/jeecg/JeecgWebStatisticsApplication.java similarity index 100% rename from jeecg-server-cloud/jeecg-web-statistics-start/src/main/java/org/jeecg/JeecgWebStatisticsApplication.java rename to jeecg-server-cloud/armd-web-statistics-start/src/main/java/org/jeecg/JeecgWebStatisticsApplication.java diff --git a/jeecg-server-cloud/jeecg-web-statistics-start/src/main/resources/application.yml b/jeecg-server-cloud/armd-web-statistics-start/src/main/resources/application.yml similarity index 79% rename from jeecg-server-cloud/jeecg-web-statistics-start/src/main/resources/application.yml rename to jeecg-server-cloud/armd-web-statistics-start/src/main/resources/application.yml index 821b2c41..b0595745 100644 --- a/jeecg-server-cloud/jeecg-web-statistics-start/src/main/resources/application.yml +++ b/jeecg-server-cloud/armd-web-statistics-start/src/main/resources/application.yml @@ -14,5 +14,5 @@ spring: server-addr: ${spring.cloud.nacos.config.server-addr} config: import: - - optional:nacos:jeecg.yaml - - optional:nacos:jeecg-@profile.name@.yaml \ No newline at end of file + - optional:nacos:armd.yaml + - optional:nacos:armd-@profile.name@.yaml \ No newline at end of file diff --git a/jeecg-server-cloud/jeecg-web-statistics-start/src/main/resources/jeecg/jeecg_config.properties b/jeecg-server-cloud/armd-web-statistics-start/src/main/resources/jeecg/jeecg_config.properties similarity index 100% rename from jeecg-server-cloud/jeecg-web-statistics-start/src/main/resources/jeecg/jeecg_config.properties rename to jeecg-server-cloud/armd-web-statistics-start/src/main/resources/jeecg/jeecg_config.properties diff --git a/jeecg-server-cloud/jeecg-web-statistics-start/src/main/resources/jeecg/jeecg_database.properties b/jeecg-server-cloud/armd-web-statistics-start/src/main/resources/jeecg/jeecg_database.properties similarity index 100% rename from jeecg-server-cloud/jeecg-web-statistics-start/src/main/resources/jeecg/jeecg_database.properties rename to jeecg-server-cloud/armd-web-statistics-start/src/main/resources/jeecg/jeecg_database.properties diff --git a/jeecg-server-cloud/jeecg-web-statistics-start/src/main/resources/logback-spring.xml b/jeecg-server-cloud/armd-web-statistics-start/src/main/resources/logback-spring.xml similarity index 100% rename from jeecg-server-cloud/jeecg-web-statistics-start/src/main/resources/logback-spring.xml rename to jeecg-server-cloud/armd-web-statistics-start/src/main/resources/logback-spring.xml diff --git a/jeecg-server-cloud/pom.xml b/jeecg-server-cloud/pom.xml index 3d22dd33..5c14dcd0 100644 --- a/jeecg-server-cloud/pom.xml +++ b/jeecg-server-cloud/pom.xml @@ -14,19 +14,19 @@ JEECG SERVER CLOUD - jeecg-cloud-gateway - jeecg-cloud-nacos - jeecg-system-cloud-start - jeecg-demo-cloud-start + armd-cloud-gateway + armd-cloud-nacos + armd-system-cloud-start + armd-demo-cloud-start jeecg-visual - jeecg-station-operation-start - jeecg-web-statistics-start - jeecg-log-manage-start - jeecg-abnormal-alarm-start - jeecg-auto-process-start - jeecg-spectrum-analysis-start + armd-station-operation-start + armd-web-statistics-start + armd-log-manage-start + armd-abnormal-alarm-start + armd-auto-process-start + armd-spectrum-analysis-start \ No newline at end of file