|
@@ -196,7 +196,7 @@ public class SaasLoginController {
|
|
|
// 生成token,并验证之前登录是否为记住登录
|
|
|
SecureAES aes = new SecureAES(properties.getAesKey(), properties.getAesIv());
|
|
|
// 对称性加密用户信息
|
|
|
- String data = aes.encryptAccount(this.tokenAccountInfo(account, remember));
|
|
|
+ String data = aes.encryptAccount(this.tokenAccountInfo(account, loginApp, remember));
|
|
|
// token存在判断
|
|
|
String sign = (String)this.redisTemplate.opsForValue().get(account.getId());
|
|
|
if (sign != null) {
|
|
@@ -220,15 +220,15 @@ public class SaasLoginController {
|
|
|
/**
|
|
|
* 账号信息
|
|
|
*
|
|
|
- * @param groupCode
|
|
|
- * @param appId
|
|
|
- * @param accountId
|
|
|
- * @param accountBelong
|
|
|
+ * @param saasAccount
|
|
|
+ * @param loginApp
|
|
|
+ * @param remember
|
|
|
* @return
|
|
|
*/
|
|
|
- private JSONObject tokenAccountInfo(SaasAccount saasAccount, boolean remember) {
|
|
|
+ private JSONObject tokenAccountInfo(SaasAccount saasAccount, String loginApp, boolean remember) {
|
|
|
JSONObject object = new JSONObject();
|
|
|
object.put(SaasCommonConstant.REMEMBER, remember);
|
|
|
+ object.put(SaasCommonConstant.APP_ID, loginApp);
|
|
|
object.put(SaasCommonConstant.GROUP_CODE, saasAccount.getGroupCode());
|
|
|
object.put(SaasCommonConstant.ACCOUNT_ID, saasAccount.getId());
|
|
|
return object;
|