|
@@ -23,6 +23,7 @@ import com.fs.common.utils.PinYinUtil;
|
|
|
import com.fs.common.utils.StringUtils;
|
|
import com.fs.common.utils.StringUtils;
|
|
|
import com.fs.common.utils.bean.BeanUtils;
|
|
import com.fs.common.utils.bean.BeanUtils;
|
|
|
import com.fs.common.utils.http.HttpUtils;
|
|
import com.fs.common.utils.http.HttpUtils;
|
|
|
|
|
+import com.fs.common.utils.sign.Md5Utils;
|
|
|
import com.fs.company.domain.Company;
|
|
import com.fs.company.domain.Company;
|
|
|
import com.fs.company.domain.CompanyUser;
|
|
import com.fs.company.domain.CompanyUser;
|
|
|
import com.fs.company.domain.CompanyUserCard;
|
|
import com.fs.company.domain.CompanyUserCard;
|
|
@@ -210,10 +211,11 @@ public class UserController extends AppBaseController {
|
|
|
|
|
|
|
|
//redisCache.setCacheObject("perms:"+companyUser.getUserId(), JSONUtil.toJsonStr(perms),2592000, TimeUnit.SECONDS);
|
|
//redisCache.setCacheObject("perms:"+companyUser.getUserId(), JSONUtil.toJsonStr(perms),2592000, TimeUnit.SECONDS);
|
|
|
redisCache.setCacheObject("perms:" + companyUser.getUserId(), JSONUtil.toJsonStr(perms), 604800, TimeUnit.SECONDS);
|
|
redisCache.setCacheObject("perms:" + companyUser.getUserId(), JSONUtil.toJsonStr(perms), 604800, TimeUnit.SECONDS);
|
|
|
-
|
|
|
|
|
|
|
+ redisCache.setCacheObject("company-user-token:" + Md5Utils.hash(companyUser.getUserId().toString()), companyUser.getUserId(), 100, TimeUnit.DAYS);
|
|
|
Map<String, Object> result = new HashMap<>();
|
|
Map<String, Object> result = new HashMap<>();
|
|
|
result.put("token", token);
|
|
result.put("token", token);
|
|
|
result.put("user", companyUser);
|
|
result.put("user", companyUser);
|
|
|
|
|
+ result.put("companyUserToken", Md5Utils.hash(companyUser.getUserId().toString()));
|
|
|
result.put("perms", perms);
|
|
result.put("perms", perms);
|
|
|
return R.ok("登录成功").put("data", result);
|
|
return R.ok("登录成功").put("data", result);
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|