Merge branch 'system-165' of uskycloud/usky-cloud into master

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/TokenController.java

@@ -165,12 +165,12 @@ public class TokenController {
 //    }
 
     @DeleteMapping("logout")
-    public ApiResult<?> logout(HttpServletRequest request) {
+    public ApiResult<?> logout(HttpServletRequest request,@RequestParam(value = "openId",required = false) String openId) {
         String token = SecurityUtils.getToken(request);
         if (StringUtils.isNotEmpty(token)) {
             String username = JwtUtils.getUserName(token);
             // 删除用户缓存记录
-            AuthUtil.logoutByToken(token);
+            AuthUtil.logoutByToken(token,openId);
             // 记录用户退出日志
             sysLoginService.logout(SecurityUtils.getTenantId(),username);
         }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/HceArticleServiceImpl.java

@@ -42,7 +42,8 @@ public class HceArticleServiceImpl extends AbstractCrudService<HceArticleMapper,
         IPage<HceArticle> page = new Page<>(hceArticleVO.getPageNum(),hceArticleVO.getPageSize());
 
         LambdaQueryWrapper<HceArticle> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(hceArticleVO.getCategoryid() != null,HceArticle::getCategoryid,hceArticleVO.getCategoryid())
+        queryWrapper.eq(hceArticleVO.getId() != null,HceArticle::getId,hceArticleVO.getId())
+                .eq(hceArticleVO.getCategoryid() != null,HceArticle::getCategoryid,hceArticleVO.getCategoryid())
                 .like(StringUtils.isNotBlank(hceArticleVO.getTitle()),HceArticle::getTitle,hceArticleVO.getTitle())
                 .between(StringUtils.isNotBlank(hceArticleVO.getStartTime()) && StringUtils.isNotBlank(hceArticleVO.getEndTime()),HceArticle::getCreatedate,hceArticleVO.getStartTime(),hceArticleVO.getEndTime())
                 .orderByDesc(HceArticle::getIstop).orderByAsc(HceArticle::getSortindex, HceArticle::getId);

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/vo/HceArticleVO.java

@@ -4,6 +4,8 @@ import lombok.Data;
 
 @Data
 public class HceArticleVO {
+    private Integer id;
+
     /**
      * 栏目ID
      */

usky-common/usky-common-security/src/main/java/com/usky/common/security/auth/AuthLogic.java

@@ -43,15 +43,15 @@ public class AuthLogic
         {
             return;
         }
-        logoutByToken(token);
+        logoutByToken(token,"");
     }
 
     /**
      * 会话注销，根据指定Token
      */
-    public void logoutByToken(String token)
+    public void logoutByToken(String token,String openId)
     {
-        tokenService.delLoginUser(token);
+        tokenService.delLoginUser(token,openId);
     }
 
     /**

usky-common/usky-common-security/src/main/java/com/usky/common/security/auth/AuthUtil.java

@@ -29,9 +29,9 @@ public class AuthUtil
      * 
      * @param tokenValue 指定token
      */
-    public static void logoutByToken(String token)
+    public static void logoutByToken(String token,String openId)
     {
-        authLogic.logoutByToken(token);
+        authLogic.logoutByToken(token,openId);
     }
 
     /**

usky-common/usky-common-security/src/main/java/com/usky/common/security/service/TokenService.java

@@ -124,11 +124,17 @@ public class TokenService {
     /**
      * 删除用户缓存信息
      */
-    public void delLoginUser(String token) {
+    public void delLoginUser(String token,String openId) {
         if (StringUtils.isNotEmpty(token)) {
             String userkey = JwtUtils.getUserKey(token);
             redisService.delete(getTokenKey(userkey));
         }
+        if((openId != null) && (StringUtils.isNotBlank(openId))){
+            String userKey = LOGIN_OPENID+openId;
+            if(redisService.hasKey(userKey)){
+                redisService.delete(userKey);
+            }
+        }
     }
 
     /**