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

base-common/src/main/java/com/ozs/common/utils/ip/AddressUtils.java

@@ -42,9 +42,9 @@ public class AddressUtils
                     return UNKNOWN;
                 }
                 JSONObject obj = JSON.parseObject(rspStr);
-                String region = obj.getString("pro");
+                //String region = obj.getString("pro");
                 String city = obj.getString("city");
-                return String.format("%s %s", region, city);
+                return String.format("%s",  city);
             }
             catch (Exception e)
             {

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

@@ -183,7 +183,7 @@ public class TokenService
         loginUser.setExpireTime(loginUser.getLoginTime() + expireTimeApp * MILLIS_MINUTE);
         // 根据uuid将loginUser缓存
         String userKey = getTokenKey(loginUser.getToken());
-        redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES);
+        redisCache.setCacheObject(userKey, loginUser, expireTimeApp, TimeUnit.MINUTES);
     }
 
     /**

base-system/src/main/java/com/ozs/system/domain/SysLoginInfo.java

@@ -56,7 +56,6 @@ public class SysLoginInfo extends BaseEntityExp {
     /**
      * 浏览器类型
      */
-    @Excel(name = "浏览器")
     private String browser;
 
     /**