Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/BaseMonitor

 Conflicts:

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

base-common/src/main/java/com/ozs/common/utils/AppTokenUtils.java

@@ -7,6 +7,7 @@ import com.ozs.common.utils.uuid.IdUtils;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -19,6 +20,7 @@ import java.util.concurrent.TimeUnit;
 
 
 @Component
+@Slf4j
 public class AppTokenUtils {
 
     @Autowired
@@ -51,6 +53,7 @@ public class AppTokenUtils {
     public String getGeoHazardMonitorToken(HttpServletRequest request) {
         // 获取请求携带的令牌
         String token = getGeoToken(request);
+        log.info("request token:{}", token);
         if (StringUtils.isNotEmpty(token)) {
             try {
                 Claims claims = parseToken(token);
@@ -58,6 +61,7 @@ public class AppTokenUtils {
                 String uuid = (String) claims.get(Constants.APP_KEY);
                 String userKey = getGeoHazardMonitorTokenKey(uuid);
                 String tokens = redisCache.getCacheObject(userKey);
+                log.info("tokens:{}", tokens);
                 return tokens;
             } catch (Exception e) {
             }

base-framework/src/main/java/com/ozs/framework/config/SecurityConfig.java

@@ -115,7 +115,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 过滤请求
                 .authorizeRequests()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                .antMatchers("/login", "/loginApp", "/register", "/captchaImage", "/sdk/**", "/test/**").permitAll()
+                .antMatchers("/login", "/loginApp", "/register", "/captchaImage", "/sdk/**", "/test/**", "/api/**").permitAll()
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()

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

@@ -9,6 +9,7 @@ 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;
@@ -33,8 +34,7 @@ import org.springframework.util.ObjectUtils;
  * @author hx
  */
 @Component
-public class TokenService
-{
+public class TokenService {
     // 令牌自定义标识
     @Value("${token.header}")
     private String header;
@@ -68,30 +68,30 @@ public class TokenService
      *
      * @return 用户信息
      */
-    public LoginUser getLoginUser(HttpServletRequest request)
-    {
+    public LoginUser getLoginUser(HttpServletRequest request) {
         // 获取请求携带的令牌
         String token = getToken(request);
-        if (StringUtils.isNotEmpty(token))
-        {
-            try
-            {
+        if (StringUtils.isNotEmpty(token)) {
+            try {
                 Claims claims = parseToken(token);
+                String app = "";
                 // 解析对应的权限以及用户信息
                 String uuid = (String) claims.get(Constants.LOGIN_USER_KEY);
-                if(StringUtils.isEmpty(uuid)){
+                if (StringUtils.isEmpty(uuid)) {
                     uuid = (String) claims.get(Constants.LOGIN_USER_KEY_APP);
+                    app = "APP";
                 }
                 String userKey = getTokenKey(uuid);
                 LoginUser user = redisCache.getCacheObject(userKey);
                 String userId = redisCache.getCacheObject(user.getUsername());
-                if (!token.equals(userId)){
+                if (!StringUtils.isEmpty(app)) {
+                    userId = redisCache.getCacheObject(app + user.getUsername());
+                }
+                if (!token.equals(userId)) {
                     return null;
                 }
                 return user;
-            }
-            catch (Exception e)
-            {
+            } catch (Exception e) {
             }
         }
         return null;
@@ -100,10 +100,8 @@ public class TokenService
     /**
      * 设置用户身份信息
      */
-    public void setLoginUser(LoginUser loginUser)
-    {
-        if (StringUtils.isNotNull(loginUser) && StringUtils.isNotEmpty(loginUser.getToken()))
-        {
+    public void setLoginUser(LoginUser loginUser) {
+        if (StringUtils.isNotNull(loginUser) && StringUtils.isNotEmpty(loginUser.getToken())) {
             refreshToken(loginUser);
         }
     }
@@ -111,10 +109,8 @@ public class TokenService
     /**
      * 删除用户身份信息
      */
-    public void delLoginUser(String token)
-    {
-        if (StringUtils.isNotEmpty(token))
-        {
+    public void delLoginUser(String token) {
+        if (StringUtils.isNotEmpty(token)) {
             String userKey = getTokenKey(token);
             redisCache.deleteObject(userKey);
         }
@@ -126,8 +122,7 @@ public class TokenService
      * @param loginUser 用户信息
      * @return 令牌
      */
-    public String createToken(LoginUser loginUser)
-    {
+    public String createToken(LoginUser loginUser) {
         String token = IdUtils.fastUUID();
 //        String token = loginUser.getUserId();
         loginUser.setToken(token);
@@ -140,14 +135,14 @@ public class TokenService
         redisCache.setCacheObject(loginUser.getUsername(), token1, expireTime, TimeUnit.MINUTES);
         return token1;
     }
+
     /**
      * 创建令牌
      *
      * @param loginUser 用户信息
      * @return 令牌
      */
-    public String createTokenApp(LoginUser loginUser)
-    {
+    public String createTokenApp(LoginUser loginUser) {
 //        String token = IdUtils.fastUUID();
         String token = loginUser.getUserId();
         loginUser.setToken(token);
@@ -157,7 +152,7 @@ public class TokenService
         Map<String, Object> claims = new HashMap<>();
         claims.put(Constants.LOGIN_USER_KEY_APP, token);
         String token1 = createToken(claims);
-        redisCache.setCacheObject(loginUser.getUsername(), token1, expireTime, TimeUnit.MINUTES);
+        redisCache.setCacheObject("APP" + loginUser.getUsername(), token1, expireTime, TimeUnit.MINUTES);
         return token1;
     }
 
@@ -167,12 +162,10 @@ public class TokenService
      * @param loginUser
      * @return 令牌
      */
-    public void verifyToken(LoginUser loginUser)
-    {
+    public void verifyToken(LoginUser loginUser) {
         long expireTime = loginUser.getExpireTime();
         long currentTime = System.currentTimeMillis();
-        if (expireTime - currentTime <= MILLIS_MINUTE_TEN)
-        {
+        if (expireTime - currentTime <= MILLIS_MINUTE_TEN) {
             refreshToken(loginUser);
         }
     }
@@ -182,8 +175,7 @@ public class TokenService
      *
      * @param loginUser 登录信息
      */
-    public void refreshToken(LoginUser loginUser)
-    {
+    public void refreshToken(LoginUser loginUser) {
         loginUser.setLoginTime(System.currentTimeMillis());
         loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE);
         // 根据uuid将loginUser缓存
@@ -191,13 +183,13 @@ public class TokenService
         List<SysDictData> data = dictTypeService.selectDictDataByType("expire_time");
         redisCache.setCacheObject(userKey, loginUser, Integer.valueOf(data.get(0).getDictValue()), TimeUnit.MINUTES);
     }
+
     /**
      * 刷新令牌有效期
      *
      * @param loginUser 登录信息
      */
-    public void refreshTokenApp(LoginUser loginUser)
-    {
+    public void refreshTokenApp(LoginUser loginUser) {
         loginUser.setLoginTime(System.currentTimeMillis());
         loginUser.setExpireTime(loginUser.getLoginTime() + expireTimeApp * MILLIS_MINUTE);
         // 根据uuid将loginUser缓存
@@ -210,8 +202,7 @@ public class TokenService
      *
      * @param loginUser 登录信息
      */
-    public void setUserAgent(LoginUser loginUser)
-    {
+    public void setUserAgent(LoginUser loginUser) {
         UserAgent userAgent = UserAgent.parseUserAgentString(ServletUtils.getRequest().getHeader("User-Agent"));
         String ip = IpUtils.getIpAddr(ServletUtils.getRequest());
         loginUser.setIpaddr(ip);
@@ -226,8 +217,7 @@ public class TokenService
      * @param claims 数据声明
      * @return 令牌
      */
-    private String createToken(Map<String, Object> claims)
-    {
+    private String createToken(Map<String, Object> claims) {
         String token = Jwts.builder()
                 .setClaims(claims)
                 .signWith(SignatureAlgorithm.HS512, secret).compact();
@@ -240,8 +230,7 @@ public class TokenService
      * @param token 令牌
      * @return 数据声明
      */
-    private Claims parseToken(String token)
-    {
+    private Claims parseToken(String token) {
         return Jwts.parser()
                 .setSigningKey(secret)
                 .parseClaimsJws(token)
@@ -254,8 +243,7 @@ public class TokenService
      * @param token 令牌
      * @return 用户名
      */
-    public String getUsernameFromToken(String token)
-    {
+    public String getUsernameFromToken(String token) {
         Claims claims = parseToken(token);
         return claims.getSubject();
     }
@@ -266,20 +254,18 @@ public class TokenService
      * @param request
      * @return token
      */
-    private String getToken(HttpServletRequest request)
-    {
+    private String getToken(HttpServletRequest request) {
         String token = request.getHeader(header);
-        if (StringUtils.isNotEmpty(token) && token.startsWith(Constants.TOKEN_PREFIX))
-        {
+        if (StringUtils.isNotEmpty(token) && token.startsWith(Constants.TOKEN_PREFIX)) {
             token = token.replace(Constants.TOKEN_PREFIX, "");
         }
         return token;
     }
 
-    private String getTokenKey(String uuid)
-    {
+    private String getTokenKey(String uuid) {
         return CacheConstants.LOGIN_TOKEN_KEY + uuid;
     }
+
     public LoginUser getLoginedUserByToken(String token) {
         try {
             Claims claims = parseToken(token);
@@ -292,6 +278,7 @@ public class TokenService
         }
         return null;
     }
+
     public LoginUser getLoginedUserByTokenApp(String token) {
         try {
             Claims claims = parseToken(token);
@@ -304,6 +291,7 @@ public class TokenService
         }
         return null;
     }
+
     /**
      * 判断是不是app token
      *
@@ -313,11 +301,11 @@ public class TokenService
     public boolean getTagByToken(HttpServletRequest request) {
         try {
             String token = getToken(request);
-            if(StringUtils.isNotEmpty(token)){
+            if (StringUtils.isNotEmpty(token)) {
                 Claims claims = parseToken(token);
                 // 解析对应的权限以及用户信息
                 String uuid = (String) claims.get(Constants.LOGIN_USER_KEY_APP);
-                if(StringUtils.isNotEmpty(uuid)){
+                if (StringUtils.isNotEmpty(uuid)) {
                     return true;
                 }
             }