Skip to content

H
haoban-manage3.0
Commit 36c7a320 by 墨竹
Options

fix：企微授权bug修改

parent 88ec5ba1
Showing with 43 additions and 17 deletions
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-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,9 +51,11 @@
<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.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.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"/>
......@@ -61,25 +63,34 @@
<dubbo:reference interface="com.gic.haoban.manage.api.service.MaterialApiService" id="materialApiService"/>
<dubbo:reference interface="com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService" id="memberUnionidRelatedApiService"/>
<dubbo:reference interface="com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService"
id="memberUnionidRelatedApiService"/>
<dubbo:reference interface="com.gic.wechat.token.api.service.QywxTokenManageService" id="qywxTokenManageService"/>
<dubbo:reference interface="com.gic.haoban.manage.api.service.DealSyncOperationApiService" id="dealSyncOperationApiService"/>
<dubbo:reference interface="com.gic.haoban.manage.api.service.DealSyncOperationApiService"
id="dealSyncOperationApiService"/>
<dubbo:reference id="quartzService" interface="com.gic.quartz.api.service.QuartzService" timeout="10000"/>
<dubbo:reference id="testApiService" interface="com.gic.haoban.manage.api.service.TestApiService" timeout="10000"/>
<dubbo:reference id="applicationTemplateApiService" interface="com.gic.haoban.manage.api.service.ApplicationTemplateApiService" timeout="10000"/>
<dubbo:reference id="applicationTemplateApiService"
interface="com.gic.haoban.manage.api.service.ApplicationTemplateApiService" timeout="10000"/>
<dubbo:reference interface="com.gic.cloud.web.service.api.service.CloudStoreGroupService" id="cloudStoreGroupService" timeout="10000" retries="0" />
<dubbo:reference id="maidianDataService" interface="com.gic.cloud.data.api.service.MaidianDataService" timeout="10000" retries="0" check="false"/>
<dubbo:reference interface="com.gic.cloud.web.service.api.service.CloudStoreGroupService"
id="cloudStoreGroupService" timeout="10000" retries="0"/>
<dubbo:reference id="maidianDataService" interface="com.gic.cloud.data.api.service.MaidianDataService"
timeout="10000" retries="0" check="false"/>
<dubbo:reference id="maidianLogApiService" interface="com.gic.haoban.manage.api.service.MaidianLogApiService" timeout="10000" retries="0" check="false"/>
<dubbo:reference id="maidianLogApiService" interface="com.gic.haoban.manage.api.service.MaidianLogApiService"
timeout="10000" retries="0" check="false"/>
<dubbo:reference id="authorizeService" interface="com.gic.enterprise.api.service.AuthorizeService" timeout="10000"
retries="0" check="false"/>
<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 interface="com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService"
id="externalClerkRelatedApiService"/>
</beans>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment