From a25b7bc43c24983fac49961f11944540c6572e53 Mon Sep 17 00:00:00 2001
From: yechenhao <yechenhao>
Date: Sun, 26 Apr 2020 14:33:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E5=87=BA=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../login/service/impl/LoginServiceImpl.java  |  2 +-
 .../controller/WebAppMyController.java        |  9 +++++++
 .../ic/webappmy/service/WebAppService.java    | 27 +++++++++++++++++++
 .../wx/service/QWMailListManageService.java   |  2 +-
 4 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/com/kiisoo/ic/webappmy/service/WebAppService.java

diff --git a/src/main/java/com/kiisoo/ic/login/service/impl/LoginServiceImpl.java b/src/main/java/com/kiisoo/ic/login/service/impl/LoginServiceImpl.java
index c5aee6e..84fba4d 100644
--- a/src/main/java/com/kiisoo/ic/login/service/impl/LoginServiceImpl.java
+++ b/src/main/java/com/kiisoo/ic/login/service/impl/LoginServiceImpl.java
@@ -120,8 +120,8 @@ public class LoginServiceImpl implements LoginService {
         if (!isMD5){
             password = MD5FileUtil.getMD5String(password);
         }
-        UsernamePasswordToken token = new UsernamePasswordToken(login, password, false);
         Subject subject = SecurityUtils.getSubject();
+        UsernamePasswordToken token = new UsernamePasswordToken(login, password, true);
 
         try {
             subject.login(token);
diff --git a/src/main/java/com/kiisoo/ic/webappmy/controller/WebAppMyController.java b/src/main/java/com/kiisoo/ic/webappmy/controller/WebAppMyController.java
index dec825e..c845dc0 100644
--- a/src/main/java/com/kiisoo/ic/webappmy/controller/WebAppMyController.java
+++ b/src/main/java/com/kiisoo/ic/webappmy/controller/WebAppMyController.java
@@ -7,9 +7,12 @@ import com.kiisoo.ic.store.entity.PoiStoreStaff;
 import com.kiisoo.ic.store.entity.StoreUserDTO;
 import com.kiisoo.ic.store.mapper.PoiStoreStaffDOMapper;
 import com.kiisoo.ic.store.mapper.PrivilageCpUserStoreDOMapper;
+import com.kiisoo.ic.webappmy.service.WebAppService;
 import com.kiisoo.ic.webappmy.vo.StafferInfoVO;
 import com.kiisoo.ic.webappmy.vo.UserParam;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
@@ -32,6 +35,9 @@ public class WebAppMyController extends BaseController {
 
     @Autowired
     private PrivilageCpUserStoreDOMapper privilageCpUserStoreDOMapper;
+
+    @Autowired
+    private WebAppService webAppService;
     /**
      * 获取用户信息
      */
@@ -102,6 +108,9 @@ public class WebAppMyController extends BaseController {
     @PostMapping(value = "/login/quit")
     public Map<String,Object> webAppUserQuitLogin(@RequestBody UserParam param){
         try {
+            Subject subject = SecurityUtils.getSubject();
+            webAppService.unbindAccount(param.getUserId());
+            subject.logout();
             return data(param.getUserId());
         }catch (Exception e){
             log.error("退出登入异常",e);
diff --git a/src/main/java/com/kiisoo/ic/webappmy/service/WebAppService.java b/src/main/java/com/kiisoo/ic/webappmy/service/WebAppService.java
new file mode 100644
index 0000000..d290cfa
--- /dev/null
+++ b/src/main/java/com/kiisoo/ic/webappmy/service/WebAppService.java
@@ -0,0 +1,27 @@
+package com.kiisoo.ic.webappmy.service;
+
+import com.kiisoo.ic.system.enums.AccountEnum;
+import com.kiisoo.ic.system.mapper.PrivilageAccountDOMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *  小程序-我的功能请求service
+ * Created by hc on 2020/4/26
+ */
+@Service
+public class WebAppService {
+
+    @Autowired
+    private PrivilageAccountDOMapper privilageAccountDOMapper;
+
+    public void unbindAccount(long userId) {
+        Map<String,Object> params = new HashMap<>();
+        params.put("user_id",userId);
+        params.put("type", AccountEnum.ACCOUNT_TYPE_QYWX.getType());
+        privilageAccountDOMapper.deleteByMap(params);
+    }
+}
diff --git a/src/main/java/com/kiisoo/ic/wx/service/QWMailListManageService.java b/src/main/java/com/kiisoo/ic/wx/service/QWMailListManageService.java
index 4717e8a..1724ba4 100644
--- a/src/main/java/com/kiisoo/ic/wx/service/QWMailListManageService.java
+++ b/src/main/java/com/kiisoo/ic/wx/service/QWMailListManageService.java
@@ -243,7 +243,7 @@ public class QWMailListManageService {
      * @throws WxErrorException
      */
     public String getCpUserIdByCode(String code) throws WxErrorException {
-        wxCpService = WxCpConfiguration.getCpService(1000043);
+        wxCpService = WxCpConfiguration.getCpService(1);
         WxCpMaJsCode2SessionResult wxCpMaJsCode2SessionResult = wxCpService.jsCode2Session(code);
         return wxCpMaJsCode2SessionResult.getUserId();
     }