hecheng %!s(int64=3) %!d(string=hai) anos
pai
achega
e980a01329

+ 4 - 5
zd-common/common-core/src/main/java/com/zd/common/core/security/TokenServiceImpl.java

@@ -8,6 +8,7 @@ import com.zd.model.entity.LoginUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map;
@@ -37,7 +38,7 @@ public class TokenServiceImpl implements TokenService {
     @Override
     @Override
     public Map<String, Object> createToken(LoginUser loginUser) {
     public Map<String, Object> createToken(LoginUser loginUser) {
         Map<String, Object> map = createCommonToken(loginUser, EXPIRE_TIME);
         Map<String, Object> map = createCommonToken(loginUser, EXPIRE_TIME);
-        redisTemplate.opsForValue().set(ACCESS_TOKEN + map.get("access_token"), loginUser,EXPIRE_TIME, TimeUnit.SECONDS);
+        redisTemplate.opsForValue().set(ACCESS_TOKEN + map.get("access_token"), loginUser, EXPIRE_TIME, TimeUnit.SECONDS);
         //redisService.setCacheObject(ACCESS_TOKEN + map.get("access_token"), loginUser, EXPIRE_TIME, TimeUnit.SECONDS);
         //redisService.setCacheObject(ACCESS_TOKEN + map.get("access_token"), loginUser, EXPIRE_TIME, TimeUnit.SECONDS);
         return map;
         return map;
     }
     }
@@ -72,10 +73,8 @@ public class TokenServiceImpl implements TokenService {
         map.put("expires_in", expiresIn);
         map.put("expires_in", expiresIn);
         map.put("type", loginUser.getSysUser().getUserType());
         map.put("type", loginUser.getSysUser().getUserType());
         map.put("nickName", loginUser.getSysUser().getNickName());
         map.put("nickName", loginUser.getSysUser().getNickName());
-        if (SpringUtils.getActiveProfile().equals("dev")) {
-            map.put("user_id", loginUser.getUserid());
-            map.put("username", loginUser.getUsername());
-        }
+        map.put("user_id", loginUser.getUserid());
+        map.put("username", loginUser.getUsername());
         return map;
         return map;
     }
     }