灰度管理

gic-platform-operation-web/src/main/java/com/gic/operation/web/controller/gray/GrayManagerController.java

@@ -4,6 +4,7 @@ import com.gic.api.base.commons.Constant;
 import com.gic.api.base.commons.Page;
 import com.gic.commons.exception.BaseRuntimeException;
 import com.gic.commons.exception.ExceptionManager;
+import com.gic.commons.httpclient.HttpClientUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.dsmongo.api.dto.Criteria;
 import com.gic.dsmongo.api.dto.MongoDelBatchDTO;
@@ -22,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -99,10 +101,11 @@ public class GrayManagerController {
 
 
     @RequestMapping("/refresh-redis-gray-config")
-    public RestResponse refreshRedisGrayConfig() {
+    public RestResponse refreshRedisGrayConfig(HttpServletRequest request) {
         GrayConfigUtil.refreshGrayConfig(null, true, false);
         GrayConfigUtil.refreshGrayConfigChangeTimeByZk();
-        return RestResponse.success();
+        String res = HttpClientUtil.get(request.getScheme() + "://" + request.getServerName() +":"+ request.getServerPort() + "/gray-config-refresh");
+        return RestResponse.success(res);
     }
 
 

gic-platform-operation-web/src/main/java/com/gic/operation/web/controller/gray/RouteManagerController.java

@@ -143,7 +143,7 @@ public class RouteManagerController {
                     nginxLocationConfigStr.append("  ").append(locationConfig).append(";\r\n");
                 }
             }else {
-                nginxLocationConfigStr.append("  set_by_lua_file $target_upstream $grayRoute ").append(nginxLocationConfig.getId()).append(" ").append(nginxLocationConfig.getId()).append(" ").append(nginxLocationConfig.getId()).append(";\r\n");
+                nginxLocationConfigStr.append("  set_by_lua_file $target_upstream $grayRoute ").append(nginxLocationConfig.getId()).append(" ").append(nginxLocationConfig.getId()).append(" ").append(nginxLocationConfig.getId()).append("-gray;\r\n");
                 nginxLocationConfigStr.append("  alias /mydata/gicweb/$target_upstream/;\r\n");
                 nginxLocationConfigStr.append("  try_files $uri $uri/ /");
                 if(StringUtil.isNotBlank(nginxLocationConfig.getModule_path())){