feat: update out config

caochengxiang · Aug 23, 2023 · ab8a65c · ab8a65c
1 parent 520d656
commit ab8a65c
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 13 deletions.
diff --git a/...era-app/app-server/src/main/java/com/xiaomi/mone/app/controller/HeraAppEnvController.java b/...era-app/app-server/src/main/java/com/xiaomi/mone/app/controller/HeraAppEnvController.java
@@ -6,6 +6,7 @@
 import com.xiaomi.mone.app.valid.AddGroup;
 import com.xiaomi.mone.app.valid.UpdateGroup;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -17,6 +18,7 @@
  */
 @RestController
 @RequestMapping("/hera/app/env")
+@ConditionalOnProperty(name = "service.selector.property", havingValue = "outer")
 public class HeraAppEnvController {
 
     @Autowired

diff --git a/...-all/hera-app/app-server/src/main/java/com/xiaomi/mone/app/controller/TestController.java b/...-all/hera-app/app-server/src/main/java/com/xiaomi/mone/app/controller/TestController.java
@@ -4,6 +4,7 @@
 import com.xiaomi.mone.app.service.env.DefaultEnvIpFetch;
 import com.xiaomi.mone.app.service.env.DefaultHttpEnvIpFetch;
 import com.xiaomi.mone.app.service.env.EnvIpFetch;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,6 +20,7 @@
  */
 @RestController
 @RequestMapping("/test")
+@ConditionalOnProperty(name = "service.selector.property", havingValue = "outer")
 public class TestController {
 
     @Resource

diff --git a/hera-all/hera-app/app-server/src/main/resources/application-open.properties b/hera-all/hera-app/app-server/src/main/resources/application-open.properties
@@ -14,8 +14,4 @@ job_start_flag=false
 
 rocket.mq.producer.group=hera_app
 rocket.mq.hera.app.topic=hera_app_operate
-rocket.mq.hera.app.tag=app_modify
-
-hera.tpc.url=http://mi-tpc:8097
-
-hera.operator.env.url=http://mi-operator-env:8097
+rocket.mq.hera.app.tag=app_modify
diff --git a/hera-all/hera-app/app-server/src/main/resources/application.properties b/hera-all/hera-app/app-server/src/main/resources/application.properties
@@ -30,8 +30,4 @@ job_start_flag=@job_start_flag@
 
 app.ip.fetch.type=nacos
 
-service.selector.property=outer
-
-hera.tpc.url=@hera.tpc.url@
-
-hera.operator.env.url=@hera.operator.env.url@
+service.selector.property=outer
diff --git a/...hera-app/app-service/src/main/java/com/xiaomi/mone/app/service/env/DefaultEnvIpFetch.java b/...hera-app/app-service/src/main/java/com/xiaomi/mone/app/service/env/DefaultEnvIpFetch.java
@@ -1,5 +1,6 @@
 package com.xiaomi.mone.app.service.env;
 
+import com.alibaba.nacos.api.config.annotation.NacosValue;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import com.google.gson.reflect.TypeToken;
@@ -10,6 +11,7 @@
 import okhttp3.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -26,6 +28,7 @@
  */
 @Service
 @Slf4j
+@ConditionalOnProperty(name = "service.selector.property", havingValue = "outer")
 public class DefaultEnvIpFetch {
 
     @Autowired
@@ -37,7 +40,7 @@ public class DefaultEnvIpFetch {
     @Value("${app.ip.fetch.type}")
     private String envApppType;
 
-    @Value("${hera.tpc.url:http://mi-tpc:8097}")
+    @NacosValue(value = "${hera.tpc.url}", autoRefreshed = true)
     private String heraTpcUrl;
 
     @Resource

diff --git a/...-app/app-service/src/main/java/com/xiaomi/mone/app/service/env/DefaultHttpEnvIpFetch.java b/...-app/app-service/src/main/java/com/xiaomi/mone/app/service/env/DefaultHttpEnvIpFetch.java
@@ -1,5 +1,6 @@
 package com.xiaomi.mone.app.service.env;
 
+import com.alibaba.nacos.api.config.annotation.NacosValue;
 import com.google.common.collect.Lists;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
@@ -8,7 +9,7 @@
 import com.xiaomi.mone.app.model.vo.HeraAppEnvVo;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.*;
-import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -24,9 +25,10 @@
  */
 @Service
 @Slf4j
+@ConditionalOnProperty(name = "service.selector.property", havingValue = "outer")
 public class DefaultHttpEnvIpFetch implements EnvIpFetch {
 
-    @Value("$hera.operator.env.url:http://mi-operator-env:8097}")
+    @NacosValue(value = "$hera.operator.env.url}", autoRefreshed = true)
     private String operatorEnvUrl;
     @Resource
     private OkHttpClient okHttpClient;

diff --git a/...app/app-service/src/main/java/com/xiaomi/mone/app/service/impl/HeraAppEnvServiceImpl.java b/...app/app-service/src/main/java/com/xiaomi/mone/app/service/impl/HeraAppEnvServiceImpl.java
@@ -22,6 +22,7 @@
 import org.apache.rocketmq.common.message.Message;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;
@@ -39,6 +40,7 @@
  */
 @Service
 @Slf4j
+@ConditionalOnProperty(name = "service.selector.property", havingValue = "outer")
 public class HeraAppEnvServiceImpl implements HeraAppEnvService {
 
     private final HeraAppBaseInfoMapper heraAppBaseInfoMapper;