From 5eef918d2779271af896ae6f746664d70d21056a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Thu, 16 Mar 2023 15:49:03 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91GatewayRoutersConf?=
 =?UTF-8?q?iguration=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/GatewayRoutersConfiguration.java   | 55 ++++++++++---------
 .../src/main/resources/bootstrap.yml          |  3 +
 2 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/jero-boot/jero-cloud-module/jero-cloud-gateway/src/main/java/com/jero/config/GatewayRoutersConfiguration.java b/jero-boot/jero-cloud-module/jero-cloud-gateway/src/main/java/com/jero/config/GatewayRoutersConfiguration.java
index 3c2868b9..9c57f391 100644
--- a/jero-boot/jero-cloud-module/jero-cloud-gateway/src/main/java/com/jero/config/GatewayRoutersConfiguration.java
+++ b/jero-boot/jero-cloud-module/jero-cloud-gateway/src/main/java/com/jero/config/GatewayRoutersConfiguration.java
@@ -36,45 +36,55 @@ public class GatewayRoutersConfiguration {
 
     public static String ROUTE_GROUP;
 
-    public static String USERNAME;
-
-    public static String PASSWORD;
-
     /**
      * 路由配置文件数据获取方式yml,nacos,database
      */
     public static String DATA_TYPE;
 
     @Value("${spring.cloud.nacos.discovery.server-addr}")
-    public static void setServerAddr(String serverAddr) {
-        SERVER_ADDR = serverAddr;
+    public void setServerAddr(String serverAddr) {
+        synchronized (GatewayRoutersConfiguration.class){
+            if(SERVER_ADDR == null){
+                SERVER_ADDR = serverAddr;
+            }
+        }
     }
 
     @Value("${spring.cloud.nacos.discovery.namespace}")
-    public static void setNamespace(String namespace) {
-        NAMESPACE = namespace;
+    public void setNamespace(String namespace) {
+        synchronized (GatewayRoutersConfiguration.class){
+            if(NAMESPACE == null){
+                NAMESPACE = namespace;
+            }
+        }
     }
 
     @Value("${jero.route.config.data-id:#{null}}")
-    public static void setRouteDataId(String dataId) {
-        DATA_ID = dataId + ".json";
+    public void setRouteDataId(String dataId) {
+        synchronized (GatewayRoutersConfiguration.class){
+            if(DATA_ID == null){
+                DATA_ID = dataId + ".json";
+            }
+        }
     }
 
     @Value("${jero.route.config.group:DEFAULT_GROUP:#{null}}")
-    public static void setRouteGroup(String routeGroup) {
-        ROUTE_GROUP = routeGroup;
+    public void setRouteGroup(String routeGroup) {
+        synchronized (GatewayRoutersConfiguration.class){
+            if(ROUTE_GROUP == null){
+                ROUTE_GROUP = routeGroup;
+            }
+        }
     }
 
     @Value("${jero.route.config.data-type}")
-    public static void  setDataType(String dataType) { DATA_TYPE = dataType; }
+    public void setDataType(String dataType) {
+        synchronized (GatewayRoutersConfiguration.class){
+            if(DATA_TYPE == null){
+                DATA_TYPE = dataType;
+            }
+        }
 
-    @Value("${spring.cloud.nacos.config.username}")
-    public static void setUsername(String username) {
-        USERNAME = username;
-    }
-    @Value("${spring.cloud.nacos.config.password}")
-    public static void setPassword(String password) {
-        PASSWORD = password;
     }
 
 
@@ -89,11 +99,6 @@ public class GatewayRoutersConfiguration {
 
     }
 
-    /**
-     * 映射接口文档默认地址（通过9999端口直接访问）
-     * @param indexHtml
-     * @return
-     */
     @Bean
     public RouterFunction<ServerResponse> indexRouter(@Value("classpath:/META-INF/resources/doc.html") final org.springframework.core.io.Resource indexHtml) {
         return route(GET("/"), request -> ok().contentType(MediaType.TEXT_HTML).syncBody(indexHtml));
diff --git a/jero-boot/jero-cloud-module/jero-cloud-gateway/src/main/resources/bootstrap.yml b/jero-boot/jero-cloud-module/jero-cloud-gateway/src/main/resources/bootstrap.yml
index 1255c25a..336a8cf2 100644
--- a/jero-boot/jero-cloud-module/jero-cloud-gateway/src/main/resources/bootstrap.yml
+++ b/jero-boot/jero-cloud-module/jero-cloud-gateway/src/main/resources/bootstrap.yml
@@ -42,3 +42,6 @@ jero:
   fileSuffixLimits: 0x00,%00,\\00,.jsp,.exe,.php,.asp,.aspx,.jspx,.xml,.html,.js,.sh,.bin
   # 跨站白名单
   whiteUrls:
+  route:
+    config:
+      data-type: yml