Merge branch 'developer' of…

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

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

@@ -104,6 +104,7 @@ public class AuthInterceptor extends HandlerInterceptorAdapter {
             MenuInfo menuInfo = moduleUrlMap.get(moduleUrl);
             if (menuInfo != null) {
                 Map<String, MenuInfo> tempMap = listToMap(menuInfoList);
+                log.info("接口的菜单信息:{}", JSON.toJSONString(menuInfo));
 
                 Integer temp = menuInfo.getMenuId();
                 //获取第二层级的页面
@@ -120,11 +121,16 @@ public class AuthInterceptor extends HandlerInterceptorAdapter {
                 //用于下载文件，跳转到频道页的地址
                 String secondLevelUrl = "https://four.gicdev.com";
                 //如果是第二级的
-                if (menuInfo.getLevel().intValue() == 2) {
+                if (tempMap.get(temp.toString()).getLevel().intValue() == 2) {
                     MenuInfo secondMenuInfo = tempMap.get(temp.toString());
                     secondLevelMenuId = secondMenuInfo.getMenuId();
                     secondLevelMenuName = secondMenuInfo.getMenuName();
-                    secondLevelUrl = secondLevelUrl + secondMenuInfo.getProjectUrlForWeb() + secondMenuInfo.getMenuUrl();
+                    if (StringUtils.isNotBlank(secondMenuInfo.getProjectUrlForWeb())) {
+                        secondLevelUrl = secondLevelUrl + secondMenuInfo.getProjectUrlForWeb();
+                    }
+                    if (StringUtils.isNotBlank(secondMenuInfo.getMenuUrl())) {
+                        secondLevelUrl += secondMenuInfo.getMenuUrl();
+                    }
                     //获取第一层级的页面
                     temp = getOperationModule(secondMenuInfo.getMenuId(), tempMap);
                     firstLevelMenuId = tempMap.get(temp.toString()).getMenuId();
@@ -135,7 +141,12 @@ public class AuthInterceptor extends HandlerInterceptorAdapter {
                     firstLevelMenuId = firstMenuInfo.getMenuId();
                     secondLevelMenuId = firstMenuInfo.getMenuId();
                     firstLevelMenuName = firstMenuInfo.getMenuName();
-                    secondLevelUrl = secondLevelUrl + firstMenuInfo.getProjectUrlForWeb() + firstMenuInfo.getMenuUrl();
+                    if (StringUtils.isNotBlank(firstMenuInfo.getProjectUrlForWeb())) {
+                        secondLevelUrl = secondLevelUrl + firstMenuInfo.getProjectUrlForWeb();
+                    }
+                    if (StringUtils.isNotBlank(firstMenuInfo.getMenuUrl())) {
+                        secondLevelUrl += firstMenuInfo.getMenuUrl();
+                    }
                 }
                 log.info("一级页面的ID和名称:{},{}", firstLevelMenuId, firstLevelMenuName);
                 log.info("二级页面的ID和名称:{},{}", secondLevelMenuId, secondLevelMenuName);

gic-enterprise-download/src/main/java/com/gic/download/utils/log/LogUtils.java

@@ -38,14 +38,15 @@ public class LogUtils {
         UserDetail userDetail = UserDetailUtils.getUserDetail();
         SystemSetLogDTO logDTO = new SystemSetLogDTO();
         //操作时间
+        logDTO.setLogTime(new Date());
         logDTO.setCreateTime(new Date());
         //操作人
         logDTO.setUserId(Long.valueOf(userDetail.getUserInfo().getUserId()));
         logDTO.setUserName(userDetail.getUserInfo().getUserName());
         //操作内容
-        logDTO.setContent(content);
+        logDTO.setContent(operationObject + "-" + content);
         //todo 暂时用这个
-        logDTO.setInterfaceName(content);
+        logDTO.setInterfaceName(operationObject + "-" + content);
         //操作模块
         String moduleMenuName = (String) RequestContext.getContext().getRequest().getAttribute("moduleMenuName");
         Integer moduleMenuId = (Integer) RequestContext.getContext().getRequest().getAttribute("moduleMenuId");
@@ -82,6 +83,7 @@ public class LogUtils {
         UserDetail userDetail = UserDetailUtils.getUserDetail();
         SystemSetLogDTO logDTO = new SystemSetLogDTO();
         //操作时间
+        logDTO.setLogTime(new Date());
         logDTO.setCreateTime(new Date());
         //操作人
 //        logDTO.setUserId(Long.valueOf(userDetail.getUserInfo().getUserId()));