Merge branch 'master-调整队列' into developer

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

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

@@ -22,6 +22,7 @@ import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.gic.haoban.manage.api.service.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.redisson.api.RRateLimiter;
@@ -51,13 +52,6 @@ import com.gic.haoban.manage.api.dto.WxApplicationDTO;
 import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
 import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
 import com.gic.haoban.manage.api.enums.SecretTypeEnum;
-import com.gic.haoban.manage.api.service.MaidianLogApiService;
-import com.gic.haoban.manage.api.service.QwFriendApiService;
-import com.gic.haoban.manage.api.service.StaffApiService;
-import com.gic.haoban.manage.api.service.TestApiService;
-import com.gic.haoban.manage.api.service.WxApplicationApiService;
-import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
-import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
 import com.gic.haoban.manage.api.service.hm.HmQrcodeApiService;
 import com.gic.haoban.manage.api.service.out.SecretSettingApiService;
 import com.gic.haoban.manage.web.config.Config;
@@ -106,7 +100,14 @@ public class TestController extends WebBaseController {
     private QywxCorpApiService qywxCorpApiService;
     @Autowired
     private QwFriendApiService qwFriendApiService ;
-    
+    @Autowired
+    private QywxTagApiService qywxTagApiService ;
+
+    @RequestMapping("sync-member-tag")
+    public HaobanResponse qwcode(String enterpriseId, String memberTagId) {
+        this.qywxTagApiService.syncTagToQywx(enterpriseId,memberTagId) ;
+        return this.resultResponse(HaoBanErrCode.ERR_0);
+    }
     
     @RequestMapping("/qwcode")
     public HaobanResponse qwcode(String enterpriseId, String unionid,String openid,String wxaUnionid ,String code) {
@@ -615,7 +616,7 @@ public class TestController extends WebBaseController {
         }
         return null;
     }
-    
+
     @RequestMapping("iptest")
     @ResponseBody
     public Object getQwInfo(HttpServletRequest req) {
@@ -625,28 +626,28 @@ public class TestController extends WebBaseController {
         json.put("errcode","0");
         json.put("errmsg",ip) ;
         return json ;
-    } 
-    
+    }
+
     public static String getIpAddr(HttpServletRequest request){
         String ip = request.getHeader("X-Forwarded-For-Pound") ;
-        if (!StringUtils.isBlank(ip) && !"unknown".equalsIgnoreCase(ip)) {  
-          return ip;  
-        }  
-        ip = request.getHeader("X-Real-IP");  
-        if (!StringUtils.isBlank(ip) && !"unknown".equalsIgnoreCase(ip)) {  
-            return ip;  
-        }  
-        ip = request.getHeader("X-Forwarded-For");  
-        if (!StringUtils.isBlank(ip) && !"unknown".equalsIgnoreCase(ip)) {  
-            // 多次反向代理后会有多个IP值，第一个为真实IP。  
-            int index = ip.indexOf(',');  
-            if (index != -1) {  
-                return ip.substring(0, index);  
-            } else {  
-                return ip;  
-            }  
-        } else {  
-            return request.getRemoteAddr();  
-        }  
-    } 
+        if (!StringUtils.isBlank(ip) && !"unknown".equalsIgnoreCase(ip)) {
+          return ip;
+        }
+        ip = request.getHeader("X-Real-IP");
+        if (!StringUtils.isBlank(ip) && !"unknown".equalsIgnoreCase(ip)) {
+            return ip;
+        }
+        ip = request.getHeader("X-Forwarded-For");
+        if (!StringUtils.isBlank(ip) && !"unknown".equalsIgnoreCase(ip)) {
+            // 多次反向代理后会有多个IP值，第一个为真实IP。
+            int index = ip.indexOf(',');
+            if (index != -1) {
+                return ip.substring(0, index);
+            } else {
+                return ip;
+            }
+        } else {
+            return request.getRemoteAddr();
+        }
+    }
 }

haoban-manage3-web/src/main/webapp/WEB-INF/dubbo-haoban-manage-web.xml

@@ -14,7 +14,7 @@
 	<dubbo:application name="haoban-manage3-web"/>
 
 	<dubbo:protocol name="dubbo" port="30009"/>
-	
+	<dubbo:reference interface="com.gic.haoban.manage.api.service.QywxTagApiService" id="qywxTagApiService" timeout="10000"/>
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.WxEnterpriseActiveDataApiService" id="wxEnterpriseActiveDataApiService" timeout="10000"/>
 	<dubbo:reference interface="com.gic.enterprise.api.service.DownloadReportService" id="downloadReportService" timeout="10000"/>
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.chat.GroupChatDataApiService" id="groupChatDataApiService" timeout="10000"/>