添加操作日志工具类

gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/CollaboratorController.java

@@ -27,6 +27,7 @@ import com.gic.download.utils.DataDownloadUtils;
 import com.gic.download.utils.DownloadReport;
 import com.gic.download.utils.DownloadUtils;
 import com.gic.download.utils.ExecutorPoolSingleton;
+import com.gic.download.utils.log.LogUtils;
 import com.gic.enterprise.response.EnterpriseRestResponse;
 import com.gic.enterprise.utils.ResultControllerUtils;
 import com.gic.enterprise.utils.UserDetail;
@@ -107,6 +108,7 @@ public class CollaboratorController extends DownloadUtils{
 
     @RequestMapping("/get-detail")
     public RestResponse getDetail(Integer collaboratorId) {
+        LogUtils.createLog("获取协作人明细", "北丐测试");
         return ResultControllerUtils.commonResultOne(
                 collaboratorApiService.getDetail(collaboratorId), CollaboratorDetailVO.class);
     }

gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/LoginController.java

@@ -9,6 +9,7 @@ import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.Md5Util;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.enterprise.base.EnterpriseInfo;
+import com.gic.enterprise.base.MenuInfo;
 import com.gic.enterprise.base.UserInfo;
 import com.gic.enterprise.dto.EnterpriseDTO;
 import com.gic.enterprise.error.ErrorCode;
@@ -97,14 +98,19 @@ public class LoginController {
                     ServiceResponse<List<MenuDTO>> menuResult = menuApiService.listUserMenu(userDetail.getUserId());
                     if (menuResult.isSuccess()) {
                         List<MenuDTO> menuList = menuResult.getResult();
+                        List<MenuInfo> menuInfoList = EntityUtil.changeEntityListNew(MenuInfo.class, menuList);
                         Map<String, Object> map = new HashMap<>(16);
-                        for (MenuDTO menuDTO : menuList) {
+                        Map<String, MenuInfo> moduleMap = new HashMap<>(16);
+                        for (MenuInfo menuDTO : menuInfoList) {
                             if (StringUtils.isBlank(menuDTO.getMenuUrl())) {
                                 continue;
                             }
-                            map.put(menuDTO.getMenuUrl(), "1");
+                            moduleMap.put(menuDTO.getProjectUrlForWeb() + menuDTO.getMenuUrl(), menuDTO);
+                            map.put(menuDTO.getMenuUrl(), menuDTO);
                         }
+                        userDetail.setMenuInfoList(menuInfoList);
                         userDetail.setMenuUrlMap(map);
+                        userDetail.setModuleUrlMap(moduleMap);
                     }
                     //塞缓存
                     UserDetailUtils.setUserDetail(userDetail);