Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/TestController.java

@@ -12,10 +12,12 @@ import com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService;
 import com.gic.haoban.manage.api.service.TestApiService;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.qo.QywxXcxSendMessageQo;
+import com.gic.redis.data.util.GicRateLimiter;
 import com.gic.redis.data.util.RedisUtil;
 import com.gic.wechat.api.dto.qywx.QywxXcxSendMessageDTO;
 import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
 
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -152,4 +154,17 @@ public class TestController extends WebBaseController {
     	testApiService.listAllQywxUser(corpid, secretVal, dataId);
         return resultResponse(HaoBanErrCode.ERR_1);
     }
+
+    @RequestMapping("/test-limiter")
+    public HaobanResponse testLimiter(String key,String eid) {
+        if (StringUtils.isAnyBlank(key,eid)) {
+            return resultResponse(HaoBanErrCode.ERR_5);
+        }
+        GicRateLimiter instance = GicRateLimiter.getInstance("haoban-manage3-web");
+        Long acquire = instance.acquire(key, eid);
+        if (acquire == 0L) {
+            return resultResponse(HaoBanErrCode.ERR_13);
+        }
+        return resultResponse(HaoBanErrCode.ERR_1);
+    }
 }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/errCode/HaoBanErrCode.java

@@ -59,7 +59,7 @@ public enum HaoBanErrCode {
     /**
      * 验证码发送失败
      */
-    ERR_13(11, "客官，当前访问人数较多，请稍后再试"),
+    ERR_13(13, "客官，当前访问人数较多，请稍后再试"),
 
     /**
      * 验证码校验失败

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/interceptor/WebInterceptor.java

@@ -106,7 +106,7 @@ public class WebInterceptor extends HandlerInterceptorAdapter {
 
         Long acquire = instance.acquire(requestURI, wxEnterpriseId);
         logger.info("限流返回值：{},{}",requestURI,acquire);
-        if (acquire.equals(0)) {
+        if (acquire==0L) {
             this.errorResult(httpServletResponse, HaoBanErrCode.ERR_13);
             logger.info("限流!");
             return false;