修改门户资源鉴权

base-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthTokenServiceImpl.java

@@ -95,16 +95,20 @@ public class AuthTokenServiceImpl implements IAuthTokenService {
                 String userKey = getTokenKey(uuid);
                 cacheService.select(portalDb);
                 String userStr = cacheService.get(userKey);
+                //刷新token时间
+                UserEntity userEntity = JSONObject.parseObject(userStr, UserEntity.class);
+                if (!ObjectUtils.isEmpty(userEntity)) {
+                    verifyToken(userEntity);
+                }
                 cacheService.select(db);
-
-//                Rest<String> rest = userFeign.getToken(userKey);
-//                String userStr = rest.getData();
-                if (StringUtils.isNotEmpty(userStr)) {
-                    UserEntity userEntity = JSONObject.parseObject(userStr, UserEntity.class);
-                    userEntity.setToken(token);
-
-                    UserEntity temp = userService.selectOne(new UserQuery().loginName(userEntity.getLoginName()));
-                    if(!ObjectUtils.isEmpty(temp)){
+                if (!ObjectUtils.isEmpty(userEntity)) {
+//                    UserEntity temp = userService.selectOne(new UserQuery().loginName(userEntity.getLoginName()));
+//                    if(!ObjectUtils.isEmpty(temp)){
+//                        userEntity.setId(temp.getId());
+//                    }
+
+                    UserEntity temp = userService.getExtCache(userEntity.getLoginName());
+                    if (!ObjectUtils.isEmpty(temp)) {
                         userEntity.setId(temp.getId());
                     }
 

base-manager/src/main/java/com/mortals/xhx/base/system/user/service/UserService.java

@@ -10,6 +10,7 @@ package com.mortals.xhx.base.system.user.service;
 
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Result;
+import com.mortals.framework.service.ICRUDCacheService;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.framework.service.IUser;
 import com.mortals.xhx.base.system.menu.model.MenuEntity;
@@ -28,7 +29,7 @@ import java.util.Set;
  * @version 1.0.0
  */
 
-public interface UserService extends ICRUDService<UserEntity,Long> {
+public interface UserService extends ICRUDCacheService<UserEntity,Long> {
     /**
      * 用户登录
      *

base-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java

@@ -17,6 +17,7 @@ import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
 import com.mortals.framework.service.IUser;
+import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.util.SecurityUtil;
 import com.mortals.framework.util.StringUtils;
@@ -60,12 +61,20 @@ import java.util.stream.Collectors;
  * @version 1.0.0
  */
 @Service("userService")
-public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity, Long> implements UserService {
+public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserEntity, Long> implements UserService {
     @Autowired
     private MenuService menuService;
     @Autowired
     private ResourceService resourceService;
 
+    /**
+     * @param data
+     * @return
+     */
+    @Override
+    protected String getExtKey(UserEntity data) {
+        return data.getLoginName();
+    }
 
     private void doHandlerUser(UserEntity entity) throws AppException {
         if (StringUtils.isNotEmpty(entity.getLoginPwd())) {
@@ -336,7 +345,7 @@ public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity
         //分组刷新节点 新增
         Map<String, List<UserEntity>> saveSitesCollect = userEntitySave.stream().collect(Collectors.groupingBy(x -> x.getSiteIds()));
 
-       // Map<String, List<UserEntity>> updateSitesCollect = userEntityUpdate.stream().collect(Collectors.groupingBy(x -> x.getSiteIds()));
+        // Map<String, List<UserEntity>> updateSitesCollect = userEntityUpdate.stream().collect(Collectors.groupingBy(x -> x.getSiteIds()));
 
         saveSitesCollect.entrySet().stream().forEach(item -> {
             String siteIds = item.getKey();