elink-star
/
epmet-cloud-lingshan
forked from luyan/epmet-cloud-lingshan
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/dev_thirdplatform' into dev

master
zxc 5 years ago
parent
1b0b069a23 c06ff8ce42
commit
5b34f79ae4
6 changed files with 102 additions and 75 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ComponentVerifyTicketDao.java
  2. 7
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/OpenPlatformAccountDao.java
  3. 148
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java
  4. 7
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java
  5. 6
      epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ComponentVerifyTicketDao.xml
  6. 5
      epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/OpenFlatformAccountDao.xml

4
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ComponentVerifyTicketDao.java
View File

@ -39,10 +39,10 @@ public interface ComponentVerifyTicketDao extends BaseDao<ComponentVerifyTicketE
void insertComponentVerifyTicket(ComponentVerifyTicketFormDTO formDTO); void insertComponentVerifyTicket(ComponentVerifyTicketFormDTO formDTO);
/** /**
* @Description 逻辑删除 【component_verify_ticket】 * @Description 物理删除 【component_verify_ticket】
* @param * @param
* @author zxc * @author zxc
*/ */
void updateOldComponentVerifyTicket(); void deleteOldComponentVerifyTicket();
} }

7
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/OpenPlatformAccountDao.java
View File

@ -41,6 +41,13 @@ public interface OpenPlatformAccountDao extends BaseDao<OpenPlatformAccountEntit
*/ */
void insertOpenPlatFormAccount(CreateOpenFormDTO coForm); void insertOpenPlatFormAccount(CreateOpenFormDTO coForm);
/**
* @Description 删除客户下报废的开放平台账号信息
* @param customerId
* @author zxc
*/
void deleteOldOpenPlatFprmAccount(@Param("customerId")String customerId);
/** /**
* @Description 根据客户Id查询已绑定开放平台的账号ID * @Description 根据客户Id查询已绑定开放平台的账号ID
* @param customerId * @param customerId

148
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java
View File

@ -119,7 +119,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
log.info(String.format(ThirdRunTimeInfoConstant.MSG,msg)); log.info(String.format(ThirdRunTimeInfoConstant.MSG,msg));
// 将xml转为map // 将xml转为map
Map<String, String> result = WXXmlToMapUtil.xmlToMap(msg); Map<String, String> result = WXXmlToMapUtil.xmlToMap(msg);
String infotype = result.get(ModuleConstant.INFO_TYPE); //获取infotype,注：微信开放平台文档中标明固定为："component_verify_ticket",但参考其他代码，还包含authorized？？？ String infotype = result.get(ModuleConstant.INFO_TYPE);
log.info(infotype); log.info(infotype);
switch (infotype){ switch (infotype){
case ModuleConstant.TICKET_UNDERLINE_KEY: //接收票据 【component_verify_ticket】 case ModuleConstant.TICKET_UNDERLINE_KEY: //接收票据 【component_verify_ticket】
@ -131,7 +131,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
ticketFormDTO.setComponentAppId(componentAppId); ticketFormDTO.setComponentAppId(componentAppId);
ticketFormDTO.setComponentVerifyTicket(ComponentVerifyTicket); ticketFormDTO.setComponentVerifyTicket(ComponentVerifyTicket);
//先逻辑删 //先逻辑删
ticketDao.updateOldComponentVerifyTicket(); ticketDao.deleteOldComponentVerifyTicket();
ticketDao.insertComponentVerifyTicket(ticketFormDTO); ticketDao.insertComponentVerifyTicket(ticketFormDTO);
log.info(ModuleConstant.TICKET_UNDERLINE_KEY+"："+ComponentVerifyTicket); log.info(ModuleConstant.TICKET_UNDERLINE_KEY+"："+ComponentVerifyTicket);
break; break;
@ -509,79 +509,87 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
} }
public void createAndBindOpenAccount(String customerId,String authAppId,String clientType){ public void createAndBindOpenAccount(String customerId,String authAppId,String clientType){
log.info("开始创建开放平台账号并绑定");
List<String> authCount = customerMpDao.selectAuthCount(customerId);
String openPlatformId = null;
if (authCount.size()>0){
openPlatformId = openPlatformAccountDao.selectOpenAppIdByCustomerId(customerId);
}
Map<String, Object> authorizerRefreshToken = redisThird.getAuthorizerRefreshToken(customerId + ThirdRedisKeyConstant.COLON + clientType); Map<String, Object> authorizerRefreshToken = redisThird.getAuthorizerRefreshToken(customerId + ThirdRedisKeyConstant.COLON + clientType);
String authorizerAccessToken = authorizerRefreshToken.get("authorizerAccessToken").toString(); String authorizerAccessToken = authorizerRefreshToken.get("authorizerAccessToken").toString();
if (authCount.size()==NumConstant.ZERO){ JSONObject bindInfoForm = new JSONObject();
log.info("未查询到该客户授权信息，先创建开放平台账号，再绑定"); bindInfoForm.put(ModuleConstant.LOW_APP_ID,authAppId);
//没有任何一个小程序/公众号授权,【先创建，再绑定】 String bindResult = HttpClientManager.getInstance().sendPostByJSON(WxMaCodeConstant.API_OPEN_GET + authorizerAccessToken, JSON.toJSONString(bindInfoForm)).getData();
JSONObject jsonObject = new JSONObject(); Map<String,Object> bindInfo = JSON.parseObject(bindResult, Map.class);
jsonObject.put(ModuleConstant.LOW_APP_ID,authAppId); boolean bindStatus = bindInfo.containsKey(ModuleConstant.OPEN_APP_ID);
// 此处的 access_token 为 【authorizer_access_token】 if (bindStatus != true) {
String data = HttpClientManager.getInstance().sendPostByJSON(WxMaCodeConstant.API_CREATE_OPEN + authorizerAccessToken, JSON.toJSONString(jsonObject)).getData(); log.info("开始创建开放平台账号并绑定");
Map<String,Object> map = JSON.parseObject(data, Map.class); List<String> authCount = customerMpDao.selectAuthCount(customerId);
openPlatformId = map.get(ModuleConstant.OPEN_APP_ID).toString(); String openPlatformId = null;
CreateOpenResultDTO createOpen = new CreateOpenResultDTO(); if (authCount.size() > 0) {
createOpen.setErrCode((Integer)map.get(ModuleConstant.ERR_CODE)); openPlatformId = openPlatformAccountDao.selectOpenAppIdByCustomerId(customerId);
createOpen.setErrMsg(map.get(ModuleConstant.ERR_MSG).toString());
createOpen.setOpenAppId(map.get(ModuleConstant.OPEN_APP_ID).toString());
switch (createOpen.getErrCode()){
case NumConstant.ZERO:
log.info(CREATE_AND_BIND_SUCCESS);
CreateOpenFormDTO coForm = new CreateOpenFormDTO();
coForm.setOpenid(map.get(ModuleConstant.OPEN_APP_ID).toString());
coForm.setCustomerId(customerId);
//插入 open_platform_account 表
openPlatformAccountDao.insertOpenPlatFormAccount(coForm);
break;
case NumConstant.ONE_NEG:
throw new RenException(SYSTEM_ERROR);
case ModuleConstant.FORTY_THOUSAND_AND_THIRTEEN:
throw new RenException(INVALID_APP_ID);
case ModuleConstant.EIGHTY_NINE_THOUSAND:
throw new RenException(ACCOUNT_HAS_BOUND_OPEN);
} }
}else if (authCount.size()>NumConstant.ZERO && !authCount.contains(authAppId)){ if (authCount.size() == NumConstant.ZERO) {
log.info("该客户已创建过开放平台账号，直接绑定"); log.info("未查询到该客户授权信息，先创建开放平台账号，再绑定");
JSONObject jsonObject = new JSONObject(); //没有任何一个小程序/公众号授权,【先创建，再绑定】
jsonObject.put(ModuleConstant.LOW_APP_ID,authAppId); JSONObject jsonObject = new JSONObject();
jsonObject.put(ModuleConstant.OPEN_APP_ID,openPlatformId); jsonObject.put(ModuleConstant.LOW_APP_ID, authAppId);
String data = HttpClientManager.getInstance().sendPostByJSON(WxMaCodeConstant.API_BIND_OPEN + authorizerAccessToken, JSON.toJSONString(jsonObject)).getData(); // 此处的 access_token 为 【authorizer_access_token】
Map<String,Object> map = JSON.parseObject(data, Map.class); String data = HttpClientManager.getInstance().sendPostByJSON(WxMaCodeConstant.API_CREATE_OPEN + authorizerAccessToken, JSON.toJSONString(jsonObject)).getData();
CreateOpenResultDTO createOpen = new CreateOpenResultDTO(); Map<String, Object> map = JSON.parseObject(data, Map.class);
createOpen.setErrCode((Integer)map.get(ModuleConstant.ERR_CODE)); openPlatformId = map.get(ModuleConstant.OPEN_APP_ID).toString();
createOpen.setErrMsg(map.get(ModuleConstant.ERR_MSG).toString()); CreateOpenResultDTO createOpen = new CreateOpenResultDTO();
switch (createOpen.getErrCode()){ createOpen.setErrCode((Integer) map.get(ModuleConstant.ERR_CODE));
case NumConstant.ZERO: createOpen.setErrMsg(map.get(ModuleConstant.ERR_MSG).toString());
log.info(BIND_SUCCESS); createOpen.setOpenAppId(map.get(ModuleConstant.OPEN_APP_ID).toString());
break; switch (createOpen.getErrCode()) {
case NumConstant.ONE_NEG: case NumConstant.ZERO:
throw new RenException(SYSTEM_ERROR); log.info(CREATE_AND_BIND_SUCCESS);
case ModuleConstant.FORTY_THOUSAND_AND_THIRTEEN: CreateOpenFormDTO coForm = new CreateOpenFormDTO();
throw new RenException(INVALID_APP_ID); coForm.setOpenid(map.get(ModuleConstant.OPEN_APP_ID).toString());
case ModuleConstant.EIGHTY_NINE_THOUSAND: coForm.setCustomerId(customerId);
throw new RenException(ACCOUNT_HAS_BOUND_OPEN); //插入 open_platform_account 表
case ModuleConstant.EIGHTY_NINE_THOUSAND_AND_ONE: openPlatformAccountDao.deleteOldOpenPlatFprmAccount(customerId);
throw new RenException(NOT_SAME_CONTRACTOR); openPlatformAccountDao.insertOpenPlatFormAccount(coForm);
case ModuleConstant.EIGHTY_NINE_THOUSAND_AND_THREE: break;
throw new RenException(NOT_ALLOWED_OPERATE); case NumConstant.ONE_NEG:
case ModuleConstant.EIGHTY_NINE_THOUSAND_AND_FOUR: throw new RenException(SYSTEM_ERROR);
throw new RenException(TO_LIMIT); case ModuleConstant.FORTY_THOUSAND_AND_THIRTEEN:
throw new RenException(INVALID_APP_ID);
case ModuleConstant.EIGHTY_NINE_THOUSAND:
throw new RenException(ACCOUNT_HAS_BOUND_OPEN);
}
} else if (authCount.size() > NumConstant.ZERO && !authCount.contains(authAppId)) {
log.info("该客户已创建过开放平台账号，直接绑定");
JSONObject jsonObject = new JSONObject();
jsonObject.put(ModuleConstant.LOW_APP_ID, authAppId);
jsonObject.put(ModuleConstant.OPEN_APP_ID, openPlatformId);
String data = HttpClientManager.getInstance().sendPostByJSON(WxMaCodeConstant.API_BIND_OPEN + authorizerAccessToken, JSON.toJSONString(jsonObject)).getData();
Map<String, Object> map = JSON.parseObject(data, Map.class);
CreateOpenResultDTO createOpen = new CreateOpenResultDTO();
createOpen.setErrCode((Integer) map.get(ModuleConstant.ERR_CODE));
createOpen.setErrMsg(map.get(ModuleConstant.ERR_MSG).toString());
switch (createOpen.getErrCode()) {
case NumConstant.ZERO:
log.info(BIND_SUCCESS);
break;
case NumConstant.ONE_NEG:
throw new RenException(SYSTEM_ERROR);
case ModuleConstant.FORTY_THOUSAND_AND_THIRTEEN:
throw new RenException(INVALID_APP_ID);
case ModuleConstant.EIGHTY_NINE_THOUSAND:
throw new RenException(ACCOUNT_HAS_BOUND_OPEN);
case ModuleConstant.EIGHTY_NINE_THOUSAND_AND_ONE:
throw new RenException(NOT_SAME_CONTRACTOR);
case ModuleConstant.EIGHTY_NINE_THOUSAND_AND_THREE:
throw new RenException(NOT_ALLOWED_OPERATE);
case ModuleConstant.EIGHTY_NINE_THOUSAND_AND_FOUR:
throw new RenException(TO_LIMIT);
}
} }
//插入 binding_account
BindingAccountFormDTO bindingAccount = new BindingAccountFormDTO();
bindingAccount.setOpenPlatformAccountId(openPlatformId);
bindingAccount.setAuthAppId(authAppId);
bindingAccount.setClientType(clientType);
bindingAccount.setCustomerId(customerId);
bindingAccountDao.insertBindingAccount(bindingAccount);
log.info("创建绑定账号结束");
} }
//插入 binding_account
BindingAccountFormDTO bindingAccount = new BindingAccountFormDTO();
bindingAccount.setOpenPlatformAccountId(openPlatformId);
bindingAccount.setAuthAppId(authAppId);
bindingAccount.setClientType(clientType);
bindingAccount.setCustomerId(customerId);
bindingAccountDao.insertBindingAccount(bindingAccount);
log.info("创建绑定账号结束");
} }
/** /**

7
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java
View File

@ -40,6 +40,8 @@ public interface WxMaCodeConstant {
* component_appid:第三方AppId * component_appid:第三方AppId
* pre_auth_code：预授权码 * pre_auth_code：预授权码
* redirect_uri：回调url（获取授权码） * redirect_uri：回调url（获取授权码）
* 上面url为扫码形式
* 下面注释url为按钮形式
*/ */
String API_AUTH_REGISTER_URL = "https://mp.weixin.qq.com/cgi-bin/componentloginpage?component_appid=%s&pre_auth_code=%s&redirect_uri=%s"; String API_AUTH_REGISTER_URL = "https://mp.weixin.qq.com/cgi-bin/componentloginpage?component_appid=%s&pre_auth_code=%s&redirect_uri=%s";
// String API_AUTH_REGISTER_URL = "https://mp.weixin.qq.com/safe/bindcomponent?action=bindcomponent&auth_type=3&no_scan=1&component_appid=%s&pre_auth_code=%s&redirect_uri=%s#wechat_redirect"; // String API_AUTH_REGISTER_URL = "https://mp.weixin.qq.com/safe/bindcomponent?action=bindcomponent&auth_type=3&no_scan=1&component_appid=%s&pre_auth_code=%s&redirect_uri=%s#wechat_redirect";
@ -59,6 +61,11 @@ public interface WxMaCodeConstant {
*/ */
String API_GET_AUTHORIZER_INFO = "https://api.weixin.qq.com/cgi-bin/component/api_get_authorizer_info?component_access_token="; String API_GET_AUTHORIZER_INFO = "https://api.weixin.qq.com/cgi-bin/component/api_get_authorizer_info?component_access_token=";
/**
* 获取公众号/小程序所绑定的开放平台帐号
*/
String API_OPEN_GET = "https://api.weixin.qq.com/cgi-bin/open/get?access_token=";
/** /**
* 为授权的小程序帐号上传小程序代码. * 为授权的小程序帐号上传小程序代码.
*/ */

6
epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ComponentVerifyTicketDao.xml
View File

@ -21,9 +21,9 @@
</insert> </insert>
<!-- 逻辑删除 【component_verify_ticket】 --> <!-- 逻辑删除 【component_verify_ticket】 -->
<update id="updateOldComponentVerifyTicket"> <delete id="deleteOldComponentVerifyTicket">
update component_verify_ticket set del_flag = 1 DELETE FROM component_verify_ticket WHERE del_flag = 0
</update> </delete>
</mapper> </mapper>

5
epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/OpenFlatformAccountDao.xml
View File

@ -23,6 +23,11 @@
) )
</insert> </insert>
<!-- 删除客户下报废的开放平台账号信息 -->
<update id="deleteOldOpenPlatFprmAccount">
UPDATE open_platform_account set del_flag = 1 where customer_id = #{customerId}
</update>
<!-- 根据客户Id查询已绑定开放平台的账号ID --> <!-- 根据客户Id查询已绑定开放平台的账号ID -->
<select id="selectOpenAppIdByCustomerId" resultType="java.lang.String"> <select id="selectOpenAppIdByCustomerId" resultType="java.lang.String">
SELECT SELECT

Write Preview
Loading…
Cancel
Save