diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml
index 715510f67d..8163d2ecc9 100644
--- a/epmet-module/epmet-third/epmet-third-server/pom.xml
+++ b/epmet-module/epmet-third/epmet-third-server/pom.xml
@@ -182,7 +182,7 @@
6379
123456
- false
+ true
122.152.200.70:8848
fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java
index 39bcec97d4..dce046fc84 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java
@@ -22,6 +22,7 @@ public interface ModuleConstant {
String AUTHORIZED = "authorized";
String NULL_CHAR = "";
String SUCCESS = "success";
+ String AUTHORIZER_APP_ID_HUMP = "AuthorizerAppid";
// 获取 component_access_token 如下
String COMPONENT_APPID = "component_appid";
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java
index 38d4a12b86..6e2916dac6 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java
@@ -160,7 +160,9 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
this.saveAuthAccountInfo(customerId,authAppId,clientType);
// customerMpDao.updateAuthorizationFlag(authAppId);
case ModuleConstant.UNAUTHORIZED://用户取消授权
- return ModuleConstant.SUCCESS;
+ //todo 取消授权
+ String authorizerAppId = result.get(ModuleConstant.AUTHORIZER_APP_ID_HUMP);
+ customerMpDao.updateAuthorizationFlag(authorizerAppId);
}
} catch (Exception e) {
log.error(e.getMessage());
@@ -498,9 +500,9 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
*/
@Transactional(rollbackFor = Exception.class)
public void updateCustomerMpAppIdAndCreateOpenPlatform(String customerId,String authAppId,String clientType){
- Integer notAuthCount = customerMpDao.selectAuthCount(customerId);
+ Integer authCount = customerMpDao.selectAuthCount(customerId);
String openPlatformId = null;
- if (notAuthCount==NumConstant.ZERO){
+ if (authCount==NumConstant.ZERO){
//没有任何一个小程序/公众号授权,【先创建,再绑定】
JSONObject jsonObject = new JSONObject();
jsonObject.put(ModuleConstant.APP_ID,authAppId);
@@ -527,7 +529,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
//插入 open_platform_account 表
openPlatformAccountDao.insertOpenPlatFormAccount(coForm);
openPlatformId = coForm.getId();
- }else if (notAuthCount>NumConstant.ZERO){
+ }else if (authCount>NumConstant.ZERO){
String openAppId = openPlatformAccountDao.selectOpenAppIdByCustomerId(customerId);
JSONObject jsonObject = new JSONObject();
jsonObject.put(ModuleConstant.LOW_APP_ID,componentAppId);
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml
index a280e32b0d..56a7c1b6dd 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml
@@ -102,6 +102,5 @@ third:
platform:
appId: wx9681884b28ed7927
appSecret: xxx
- aesKey: xxx
- componentToken: xcsfdfdff
- token: developerToken
\ No newline at end of file
+ aesKey: d6dbde92c67e11eabac1c03fd56f7847qazxswedcvg
+ token: 1ae5f230c67f11eabac1c03fd56f7847
\ No newline at end of file
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml
index 6a8e5330bf..ac7b8b4346 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml
@@ -27,7 +27,6 @@
WHERE
del_flag = '0'
AND customer_id = #{customerId}
- AND app_id NOT NULL
AND authorization_flag = 0
@@ -44,7 +43,7 @@
UPDATE customer_mp
- SET authorization_flag = 1
+ SET authorization_flag = 0
WHERE
app_id = #{authAppId}