Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-enterprise-base into developer

gic-enterprise-base-api/src/main/java/com/gic/enterprise/base/EnterpriseInfo.java

@@ -54,6 +54,25 @@ public class EnterpriseInfo implements Serializable {
      */
     private Integer isInitComplete;
 
+    /**
+     * 基础服务过期时间
+     */
+    private Date auditTime;
+
+    /**
+     * 版本code
+     */
+    private String versionCode;
+
+    /**
+     * 版本名称
+     */
+    private String versionName;
+    /**
+     * 服务状态 0:无服务 1:正常 2:停用
+     */
+    private Integer serviceStatus;
+
     public Integer getEnterpriseId() {
         return enterpriseId;
     }
@@ -133,4 +152,36 @@ public class EnterpriseInfo implements Serializable {
     public void setIsInitComplete(Integer isInitComplete) {
         this.isInitComplete = isInitComplete;
     }
+
+    public Date getAuditTime() {
+        return auditTime;
+    }
+
+    public void setAuditTime(Date auditTime) {
+        this.auditTime = auditTime;
+    }
+
+    public String getVersionCode() {
+        return versionCode;
+    }
+
+    public void setVersionCode(String versionCode) {
+        this.versionCode = versionCode;
+    }
+
+    public String getVersionName() {
+        return versionName;
+    }
+
+    public void setVersionName(String versionName) {
+        this.versionName = versionName;
+    }
+
+    public Integer getServiceStatus() {
+        return serviceStatus;
+    }
+
+    public void setServiceStatus(Integer serviceStatus) {
+        this.serviceStatus = serviceStatus;
+    }
 }

gic-enterprise-base-api/src/main/java/com/gic/enterprise/context/UserContext.java

@@ -58,7 +58,15 @@ public class UserContext {
         return new UserDetail();
     }
 
-    public void init(UserDetail userDetail){
+    /**
+     * 返回token值
+     * @Title: init

+     * @Description:
+    
 * @author guojuxing
+     * @param userDetail

+     * @return  java.lang.String

+    
 */
+    public String init(UserDetail userDetail){
         String uuId = ToolUtil.randomUUID();
         String key = Constants.TOKEN_KEY+uuId;
         RedisUtil.setCache(key, userDetail, expireLength, TimeUnit.HOURS);
@@ -68,6 +76,7 @@ public class UserContext {
         if(response != null){
             response.addCookie(cookie);
         }
+        return uuId;
     }
 
     public void refresh(){

gic-enterprise-base-api/src/main/java/com/gic/enterprise/utils/UserDetailUtils.java

@@ -6,8 +6,16 @@ public class UserDetailUtils {
         return UserContext.getContext().get();
     }
 
-    public static void setUserDetail(UserDetail userDetail){
-        UserContext.getContext().init(userDetail);
+    /**
+     * 返回token值
+     * @Title: setUserDetail

+     * @Description:
+    
 * @author guojuxing
+     * @param userDetail

+     * @return  java.lang.String

+    
 */
+    public static String setUserDetail(UserDetail userDetail){
+        return UserContext.getContext().init(userDetail);
     }
 
     public static void destory(){

gic-enterprise-common/src/main/java/com/gic/enterprise/interceptor/AuthInterceptor.java

@@ -101,12 +101,14 @@ public class AuthInterceptor extends HandlerInterceptorAdapter {
             if (menuInfo != null) {
                 Map<String, MenuInfo> tempMap = listToMap(menuInfoList);
 
-                Integer temp = getOperationModule(menuInfo.getMenuId(), tempMap);
+                Integer temp = menuInfo.getMenuId();
                 //获取第二层级的页面
-                while (tempMap.get(temp.toString()).getLevel().intValue() != 2) {
-                    temp = getOperationModule(tempMap.get(temp.toString()).getMenuId(), tempMap);
+                if (menuInfo.getLevel().intValue() > 2) {
+                    temp = getOperationModule(menuInfo.getMenuId(), tempMap);
+                    while (tempMap.get(temp.toString()).getLevel().intValue() != 2) {
+                        temp = getOperationModule(tempMap.get(temp.toString()).getMenuId(), tempMap);
+                    }
                 }
-
                 int secondLevelMenuId = tempMap.get(temp.toString()).getMenuId();
                 String secondLevelMenuName = tempMap.get(temp.toString()).getMenuName();
                 //获取第一层级的页面
@@ -117,7 +119,7 @@ public class AuthInterceptor extends HandlerInterceptorAdapter {
                 log.info("一级页面的ID和名称:{},{}", firstLevelMenuId, firstLevelMenuName);
                 log.info("二级页面的ID和名称:{},{}", secondLevelMenuId, secondLevelMenuName);
                 request.setAttribute("moduleMenuId", secondLevelMenuId);
-                request.setAttribute("moduleMenuName", firstLevelMenuName + "-" + secondLevelMenuId);
+                request.setAttribute("moduleMenuName", firstLevelMenuName + "-" + secondLevelMenuName);
             }
         }