token过期时间放入字典

base-framework/src/main/java/com/ozs/framework/web/service/TokenService.java

@@ -2,9 +2,13 @@ package com.ozs.framework.web.service;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import javax.servlet.http.HttpServletRequest;
+
+import com.ozs.common.core.domain.entity.SysDictData;
+import com.ozs.system.service.ISysDictTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -56,6 +60,9 @@ public class TokenService
     @Autowired
     private RedisCache redisCache;
 
+    @Autowired
+    private ISysDictTypeService dictTypeService;
+
     /**
      * 获取用户身份信息
      *
@@ -181,7 +188,8 @@ public class TokenService
         loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE);
         // 根据uuid将loginUser缓存
         String userKey = getTokenKey(loginUser.getToken());
-        redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES);
+        List<SysDictData> data = dictTypeService.selectDictDataByType("expire_time");
+        redisCache.setCacheObject(userKey, loginUser, Integer.valueOf(data.get(0).getDictValue()), TimeUnit.MINUTES);
     }
     /**
      * 刷新令牌有效期

base-system/src/main/java/com/ozs/system/service/ISysUserService.java

@@ -240,7 +240,7 @@ public interface ISysUserService extends JoinIService<SysUser> {
      * @param operName        操作用户
      * @return 结果
      */
-    public String importUser(List<SysUsers> userList, Boolean isUpdateSupport, String operName);
+    public String importUser(List<SysUsers> userList, Boolean isUpdateSupport, String operName,String dictValue);
 
 
     /**

base-system/src/main/java/com/ozs/system/service/impl/SysUserServiceImpl.java

@@ -75,8 +75,6 @@ public class SysUserServiceImpl extends JoinServiceImpl<SysUserMapper, SysUser>
     protected Validator validator;
     @Autowired
     private SysDeptMapper deptMapper;
-    @Value("${base.defaultPassword:yn5aq5Mt.106.tky}")
-    private String defaultPassword;
 
     /**
      * 根据条件分页查询用户列表
@@ -524,7 +522,7 @@ public class SysUserServiceImpl extends JoinServiceImpl<SysUserMapper, SysUser>
      * @return 结果
      */
     @Override
-    public String importUser(List<SysUsers> userList, Boolean isUpdateSupport, String operName) {
+    public String importUser(List<SysUsers> userList, Boolean isUpdateSupport, String operName,String dictValue) {
         if (StringUtils.isNull(userList) || userList.size() == 0) {
             throw new ServiceException("导入用户数据不能为空！");
         }
@@ -560,7 +558,7 @@ public class SysUserServiceImpl extends JoinServiceImpl<SysUserMapper, SysUser>
                         errMsg.append("部门名称:" + user.getDeptName() + "不存在");
                     }
                     sysUser.setDeptId(sysDept.getDeptId());
-                    sysUser.setPassword(SecurityUtils.encryptPassword(defaultPassword));
+                    sysUser.setPassword(SecurityUtils.encryptPassword(dictValue));
                     this.insertUser(sysUser);
                     SysUser sysUser1 = userMapper.selectUserByUserName(user.getUserName());
                     String roleName = sysUser.getRoleName();
@@ -618,7 +616,6 @@ public class SysUserServiceImpl extends JoinServiceImpl<SysUserMapper, SysUser>
     public int saveUser(SysUser user) {
         // 新增用户信息
         user.setUserId(IdUtils.fastSimpleUUID());
-        user.setPassword(SecurityUtils.encryptPassword(defaultPassword));
         int rows = userMapper.insertUser(user);
         // 新增用户与角色管理
         insertUserRole(user);