Merge branch 'feature/login-token' into developer

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

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

@@ -19,7 +19,6 @@ import com.gic.haoban.manage.service.entity.TabMiniprogramSetting;
 import com.gic.haoban.manage.service.entity.TabWelcome;
 import com.gic.haoban.manage.service.pojo.bo.StaffPrivacyUseLogBO;
 import com.gic.haoban.manage.service.service.*;
-import com.gic.wechat.api.service.qywx.QywxUserApiService;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import org.apache.commons.lang3.StringUtils;
@@ -54,8 +53,6 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
     private TabHaobanWelcomeMapper welcomeMapper;
     @Autowired
     private StaffPrivacyUseLogService staffPrivacyUseLogService;
-    @Autowired
-    private QywxUserApiService qywxUserApiService;
 
     @Override
     public void callbackReviceEnterprise(QywxCorpInfoSimpleDTO dto) {
@@ -75,9 +72,10 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
         TabHaobanWxEnterprise enterprise = this.wxEnterpriseService.getEnterpriseByCorpName(corpName);
         if (enterprise != null) {
             wxEnterpriseId = enterprise.getWxEnterpriseId();
-            wxDTO.setWxEnterpriseId(enterprise.getWxEnterpriseId());
-            wxDTO.setStatusFlag(1);
-            wxDTO.setBindFlag(1);
+            WxEnterpriseDTO wxEnterpriseDTO = new WxEnterpriseDTO();
+            wxEnterpriseDTO.setWxEnterpriseId(enterprise.getWxEnterpriseId());
+            wxEnterpriseDTO.setStatusFlag(1);
+            wxEnterpriseDTO.setBindFlag(1);
             wxEnterpriseService.update(wxDTO);
         } else {
             wxEnterpriseId = wxEnterpriseService.add(wxDTO);

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

@@ -3,6 +3,7 @@
 <mapper namespace="com.gic.haoban.manage.service.dao.mapper.WxApplicationMapper">
     <resultMap id="BaseResultMap" type="com.gic.haoban.manage.service.entity.TabHaobanWxApplication">
         <id column="wx_application_id" property="wxApplicationId" jdbcType="VARCHAR"/>
+        <result column="corpid" property="corpid" jdbcType="VARCHAR"/>
         <result column="site_id" property="siteId" jdbcType="VARCHAR"/>
         <result column="name" property="name" jdbcType="VARCHAR"/>
         <result column="permanent_code" property="permanentCode" jdbcType="VARCHAR"/>
@@ -16,7 +17,7 @@
         <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
     </resultMap>
     <sql id="Base_Column_List">
-        wx_application_id, site_id, name, permanent_code, agent_name, agent_id, application_type,
+        wx_application_id,corpid, site_id, name, permanent_code, agent_name, agent_id, application_type,
     wx_enterprise_id, status_flag, create_time, update_time,is_customized_app
     </sql>
 
@@ -39,6 +40,9 @@
             <if test="wxApplicationId != null">
                 wx_application_id,
             </if>
+            <if test="corpid != null">
+                corpid,
+            </if>
             <if test="siteId != null">
                 site_id,
             </if>
@@ -77,6 +81,9 @@
             <if test="wxApplicationId != null">
                 #{wxApplicationId,jdbcType=VARCHAR},
             </if>
+            <if test="corpid != null">
+                #{corpid,jdbcType=VARCHAR},
+            </if>
             <if test="siteId != null">
                 #{siteId,jdbcType=VARCHAR},
             </if>
@@ -116,6 +123,9 @@
             parameterType="com.gic.haoban.manage.service.entity.TabHaobanWxApplication">
         update tab_haoban_wx_application
         <set>
+            <if test="corpid != null">
+                corpid = #{corpid,jdbcType=VARCHAR},
+            </if>
             <if test="siteId != null">
                 site_id = #{siteId,jdbcType=VARCHAR},
             </if>

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

 package com.gic.haoban.manage.web.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.Page;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.manage.api.dto.DepartmentDTO;
 import com.gic.haoban.manage.api.dto.MaidianLogDTO;
+import com.gic.haoban.manage.api.dto.QywxCorpInfoSimpleDTO;
 import com.gic.haoban.manage.api.service.*;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.qo.QywxXcxSendMessageQo;
@@ -41,14 +43,14 @@ public class TestController extends WebBaseController {
 
     private static final Logger logger = LoggerFactory.getLogger(TestController.class);
 
+    private final ExecutorService pools = Executors.newFixedThreadPool(500);
+
     @Autowired
     private QywxSuiteApiService qywxSuiteApiService;
 
     @Autowired
     private MemberUnionidRelatedApiService memberUnionidRelatedApiService;
 
-    private final ExecutorService pools = Executors.newFixedThreadPool(500);
-
     @Autowired
     private TestApiService testApiService;
 
@@ -63,6 +65,8 @@ public class TestController extends WebBaseController {
 
     @Autowired
     private ExternalClerkRelatedApiService externalClerkRelatedApiService;
+    @Autowired
+    private WxEnterpriseApiService wxEnterpriseApiService;
 
     @RequestMapping("/send-message-test")
     public HaobanResponse testSendMessage(QywxXcxSendMessageQo qo) {
@@ -213,4 +217,17 @@ public class TestController extends WebBaseController {
             return resultResponse(HaoBanErrCode.ERR_0);
         }
     }
+
+    /**
+     * 测试授权回调
+     *
+     * @param param
+     * @return
+     */
+    @RequestMapping("/callbackReviceEnterprise")
+    public HaobanResponse callbackReviceEnterprise(String param) {
+        QywxCorpInfoSimpleDTO qywxCorpInfoSimpleDTO = JSON.parseObject(param, QywxCorpInfoSimpleDTO.class);
+        wxEnterpriseApiService.callbackReviceEnterprise(qywxCorpInfoSimpleDTO);
+        return resultResponse(HaoBanErrCode.ERR_1);
+    }
 }

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

@@ -51,14 +51,16 @@
 	<dubbo:reference interface="com.gic.wechat.api.service.qywx.QywxUserApiService" id="qywxUserApiService"/>
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.WxApplicationApiService" id="wxApplicationApiService"/>
 
-	<dubbo:reference interface="com.gic.haoban.communicate.api.service.valid.ValidationCodeService" id="validationCodeService"/>
-	
-	<dubbo:reference interface="com.gic.haoban.manage.api.service.ApplicationSettingApiService" id="applicationSettingApiService"/>
+	<dubbo:reference interface="com.gic.haoban.communicate.api.service.valid.ValidationCodeService"
+					 id="validationCodeService"/>
+
+	<dubbo:reference interface="com.gic.haoban.manage.api.service.ApplicationSettingApiService"
+					 id="applicationSettingApiService"/>
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.AuditApiService" id="auditApiService"/>
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.AuditSettingApiService" id="auditSettingApiService"/>
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.DictApiService" id="dictApiService"/>
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.HelpApiService" id="helpApiService"/>
-	
+
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.MaterialApiService" id="materialApiService"/>
 
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService"
@@ -87,10 +89,15 @@
 
 	<dubbo:reference id="operationSettingApiServiceImpl"
 					 interface="com.gic.haoban.manage.api.service.OperationSettingApiService" timeout="10000"
+	<dubbo:reference id="operationSettingApiServiceImpl"
+					 interface="com.gic.haoban.manage.api.service.OperationSettingApiService" timeout="10000"
 					 retries="0" check="false"/>
 
 	<dubbo:reference id="externalClerkRelatedApiService"
 					 interface="com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService" timeout="10000"
 					 retries="0" check="false"/>
 
+	<dubbo:reference interface="com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService"
+					 id="externalClerkRelatedApiService"/>
+
 </beans>