Merge remote-tracking branch 'origin/20240309-saq-fix' into lcytest

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/feign/service/RedisService.java

@@ -10,13 +10,16 @@ import org.springframework.web.bind.annotation.PostMapping;
 import java.util.List;
 import java.util.Map;
 
-//@FeignClient(name = "test", url = "http://10.15.12.72:8001", fallback = RedisServiceFallback.class, configuration = FeignConfiguration.class)
+/**
+ * TODO 线上时候将注解替换掉
+ */
+@FeignClient(name = "test", url = "http://127.0.0.1:8001",path = "/simulation/resource/common", fallback = RedisServiceFallback.class, configuration = FeignConfiguration.class)
 //@FeignClient(name = "test1", url = "http://47.93.217.159", path = "/simulation/resource/common", fallback = RedisServiceFallback.class, configuration = FeignConfiguration.class)
-@FeignClient(value = "simulation-resource-common",
-        contextId = "redis",
-        path = "/simulation/resource/common",
-        fallback = RedisServiceFallback.class,
-        configuration = FeignConfiguration.class)
+//@FeignClient(value = "simulation-resource-common",
+//        contextId = "redis",
+//        path = "/simulation/resource/common",
+//        fallback = RedisServiceFallback.class,
+//        configuration = FeignConfiguration.class)
 public interface RedisService {
 
     @PostMapping("/redis/setDictLists")