Merge branch 'developer' into 'master'

Developer

See merge request !88

haoban-manage3-service/pom.xml

@@ -48,7 +48,13 @@
         <groupId>com.gic</groupId>
         <artifactId>haoban-common</artifactId>
         <version>${haoban-common}</version>
-    </dependency>
+<!--         <exclusions> -->
+<!--         	<exclusion> -->
+<!--         		<artifactId>jsqlparser</artifactId> -->
+<!--         		<groupId>com.github.jsqlparser</groupId> -->
+<!--         	</exclusion> -->
+<!--         </exclusions> -->
+        </dependency>
         <dependency>
             <groupId>com.gic</groupId>
             <artifactId>haoban-config</artifactId>
@@ -83,6 +89,12 @@
             <groupId>com.gic</groupId>
             <artifactId>gic-enterprise-api</artifactId>
             <version>${gic-enterprise-api}</version>
+<!--             <exclusions> -->
+<!--             	<exclusion> -->
+<!--             		<artifactId>jsqlparser</artifactId> -->
+<!--             		<groupId>com.github.jsqlparser</groupId> -->
+<!--             	</exclusion> -->
+<!--             </exclusions> -->
         </dependency>
         <dependency>
 			<groupId>com.gic</groupId>
@@ -147,6 +159,11 @@
             <artifactId>hutool-all</artifactId>
             <version>5.5.1</version>
         </dependency>
+<!--         <dependency> -->
+<!-- 			<groupId>com.gic</groupId> -->
+<!-- 			<artifactId>sql-check-sdk</artifactId> -->
+<!-- 			<version>4.0-SNAPSHOT</version> -->
+<!--         </dependency> -->
 		</dependencies>
     
     <build>

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java

@@ -250,14 +250,17 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 		if(dto == null){
 			return "";
 		}
-		
+		//加锁
+		String key = "external" + dto.getWxEnterpriseId() + "_"+ dto.getWxUserId() + "_" + dto.getExternalName() + "_" + dto.getAddCreateTime();
+		RedisUtil.lock(key,3l);
 		//新增成员和外部联系人的关系
 		String memberUnionId = insertMemberUnionIdRelated(dto);
 		
 		//新增导购和外部联系人关系
 		dto.setMemberUnionidRelatedId(memberUnionId);
 		insertExternalClerkRelated(dto);
-		
+		//解锁
+		RedisUtil.unlock(key);
 		return memberUnionId;
 	}
 	
@@ -410,8 +413,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 		String name = pojo.getName();
 		String createTime  = pojo.getAddCreateTime();
 		
-		String key = "external" + wxEnterpriseId + "_"+ userId + "_" + name + "_" + createTime;
-		RedisUtil.lock(key,2l);
 		dto.setWxEnterpriseId(wxEnterpriseId);
 		
 		dto.setExternalName(name);

haoban-manage3-service/src/main/resources/jdbc-haoban-manage-service.xml

@@ -37,6 +37,7 @@
                         </value>
                     </property>
                 </bean>
+<!--                 <bean class="com.gic.sql.interceptor.MybatisSqlInterceptor"/> -->
             </array>
         </property>
     </bean>

haoban-manage3-service/src/main/resources/mapper/TabHaobanExternalClerkRelatedMapper.xml

@@ -340,5 +340,7 @@
     where wx_user_id = #{wxUserId} 
     and member_id = #{memberId}
     and status_flag = 1
+    and external_user_id is not null
+    limit 1
   </select>
 </mapper>
\ No newline at end of file

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/controller/WxEnterpriseController.java

@@ -83,7 +83,7 @@ public class WxEnterpriseController extends WebBaseController{
 	@IgnoreLogin
 	@RequestMapping("wx-enterprise-list")
 	public HaobanResponse wxEnterpriseList() {
-//		String wxEnterpriseId = "123456";
+//		String wxEnterpriseId = "ca66a01b79474c40b3e7c7f93daf1a3b";
 		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
 		String wxEnterpriseId = login.getWxEnterpriseId();
 		List<EnterpriseDetailDTO> list = wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(wxEnterpriseId);

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

@@ -11,6 +11,7 @@ import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.vo.LoginVO;
 
 //import com.gic.redis.data.util.GicRateLimiter;
+import com.gic.redis.data.util.GicRateLimiter;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -101,15 +102,15 @@ public class WebInterceptor extends HandlerInterceptorAdapter {
         }
         String wxEnterpriseId = loginUser.getWxEnterpriseId();
 
-//        GicRateLimiter instance = GicRateLimiter.getInstance(MOUDLE);
-//
-//        Long acquire = instance.acquire(requestURI, wxEnterpriseId);
-//        logger.info("限流返回值：{},{}",requestURI,acquire);
-//        if (acquire.equals(0)) {
-//            this.errorResult(httpServletResponse, HaoBanErrCode.ERR_13);
-//            logger.info("限流!");
-//            return false;
-//        }
+        GicRateLimiter instance = GicRateLimiter.getInstance(MOUDLE);
+
+        Long acquire = instance.acquire(requestURI, wxEnterpriseId);
+        logger.info("限流返回值：{},{}",requestURI,acquire);
+        if (acquire==0L) {
+            this.errorResult(httpServletResponse, HaoBanErrCode.ERR_13);
+            logger.info("限流!");
+            return false;
+        }
         return true;
     }