Merge remote-tracking branch 'origin/master'

# Conflicts:
#	common-lib/src/main/java/com/mortals/xhx/feign/area/IApiAreaFeign.java

base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteBusinessServiceImpl.java

@@ -60,6 +60,7 @@ public class SiteBusinessServiceImpl extends AbstractCRUDCacheServiceImpl<SiteBu
                 item.setDatashow(businessEntity.getDatashow());
                 item.setEnglishname(businessEntity.getEnglishname());
                 item.setBusinessType(businessEntity.getBusinessType());
+                item.setRemark(businessEntity.getRemark());
                 //判断业务是否含有子业务
                 if (businessEntity.getIsBusiness() == IsBusinessEnum.一级业务.getValue()) {
                     //添加二级业务列表

common-lib/src/main/java/com/mortals/xhx/feign/area/IApiAreaFeign.java

@@ -70,9 +70,6 @@ public interface IApiAreaFeign extends IFeign {
     @PostMapping(value = "/site/getFlatSitesByAreaIds")
     String getFlatSitesByAreaIds(@RequestBody SitePdu query);
 
-    @PostMapping(value = "/site/list")
-    String getSitesByQuery(@RequestBody SitePdu query);
-
 
 }
 
@@ -128,14 +125,6 @@ class AreaFeignFallbackFactory implements FallbackFactory<IApiAreaFeign> {
                 failResp.setMsg("暂时无法获取站点列表，请稍后再试!");
                 return JSON.toJSONString(failResp);
             }
-
-            @Override
-            public String getSitesByQuery(SitePdu query) {
-                ApiResp<String> failResp = new ApiResp<>();
-                failResp.setCode(ApiRespCodeEnum.FAILED.getValue());
-                failResp.setMsg("暂时无法获取站点列表，请稍后再试!");
-                return JSON.toJSONString(failResp);
-            }
         };
     }
 }

common-lib/src/main/java/com/mortals/xhx/feign/user/IApiUserFeign.java

 package com.mortals.xhx.feign.user;
 
+import com.alibaba.fastjson.JSON;
+import com.mortals.xhx.common.code.ApiRespCodeEnum;
 import com.mortals.xhx.feign.IFeign;
 import com.mortals.xhx.feign.req.BaseUserQuery;
 import com.mortals.xhx.feign.req.BaseUserReq;
 import com.mortals.xhx.feign.rsp.ApiResp;
 import com.mortals.xhx.feign.rsp.UserRsp;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -15,7 +20,7 @@ import org.springframework.web.bind.annotation.RequestBody;
  * @author: zxfei
  * @date: 2022/5/30 10:40
  */
-@FeignClient(name = "portal-manager", path = "/zwfw")
+@FeignClient(name = "portal-manager", path = "/zwfw", fallback = UserFeignFallbackFactory.class)
 public interface IApiUserFeign extends IFeign {
 
     /**
@@ -29,3 +34,20 @@ public interface IApiUserFeign extends IFeign {
 
 }
 
+
+@Slf4j
+@Component
+class UserFeignFallbackFactory implements FallbackFactory<IApiUserFeign> {
+    @Override
+    public IApiUserFeign create(Throwable t) {
+        return new IApiUserFeign() {
+            @Override
+            public ApiResp<UserRsp> findAllUser(BaseUserReq<BaseUserQuery> req) {
+                ApiResp<UserRsp> failResp = new ApiResp<>();
+                failResp.setCode(ApiRespCodeEnum.FAILED.getValue());
+                failResp.setMsg("暂时无法获取站点列表，请稍后再试!");
+                return failResp;
+            }
+        };
+    }
+}
\ No newline at end of file

smart-gateway/src/main/java/com/mortals/xhx/base/framework/service/impl/ValidateCodeServiceImpl.java

@@ -7,7 +7,6 @@ import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ReflectUtil;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.service.ICacheService;
-import com.mortals.framework.utils.redis.RedisUtils;
 import com.mortals.xhx.base.framework.config.CaptchaProperties;
 import com.mortals.xhx.base.framework.expection.CaptchaException;
 import com.mortals.xhx.base.framework.expection.CaptchaExpireException;
@@ -98,7 +97,8 @@ public class ValidateCodeServiceImpl implements ValidateCodeService {
         }
         String verifyKey = Constant.CAPTCHA_CODE_KEY + uuid;
         String captcha = cacheService.get(verifyKey);
-        RedisUtils.deleteObject(verifyKey);
+        cacheService.del(verifyKey);
+     //   RedisUtils.deleteObject(verifyKey);
         if (!code.equalsIgnoreCase(captcha)) {
             throw new CaptchaException();
         }