Browse Source

feat: 补充日志

master_tdsql
hxh 11 months ago
parent
commit
39a5c432b9
  1. 7
      shuili-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java
  2. 2
      shuili-admin/src/main/java/com/kms/web/utils/WaterRequestUtil.java
  3. 2
      shuili-system/src/main/java/com/kms/framework/web/service/SysPermissionService.java

7
shuili-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java

@ -3,8 +3,6 @@ package com.kms.web.controller.system;
import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.TypeReference;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.kms.common.utils.UserUtils; import com.kms.common.utils.UserUtils;
@ -42,7 +40,6 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.view.RedirectView; import org.springframework.web.servlet.view.RedirectView;
import javax.annotation.PostConstruct;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
@ -216,7 +213,9 @@ public class SysLoginController extends BaseController {
permissionService.setUserMenuFromPortal(simpleUser.getId(), menus); permissionService.setUserMenuFromPortal(simpleUser.getId(), menus);
StpUtil.login(simpleUser.getId()); StpUtil.login(simpleUser.getId());
StpUtil.getSession().set("jianwei-user", simpleUser); StpUtil.getSession().set("jianwei-user", simpleUser);
RedirectView redirectView = new RedirectView(redirect + "?token=" + StpUtil.getTokenValue() + "&page=" + page); String accessToken = StpUtil.getTokenValue();
log.info("登录成功,用户[{}]token:{}", simpleUser.getId(), accessToken);
RedirectView redirectView = new RedirectView(redirect + "?token=" + accessToken + "&page=" + page);
return new ModelAndView(redirectView); return new ModelAndView(redirectView);
} }

2
shuili-admin/src/main/java/com/kms/web/utils/WaterRequestUtil.java

@ -291,6 +291,7 @@ public class WaterRequestUtil {
.execute()) { .execute()) {
body = response.body(); body = response.body();
} }
log.info("--------请求获取门户角色信息,返回结果为:{}", body);
WaterResult waterResult = JSONObject.parseObject(body, WaterResult.class); WaterResult waterResult = JSONObject.parseObject(body, WaterResult.class);
isSuccess(waterResult); isSuccess(waterResult);
//{\"total\":1,\"size\":100,\"records\":[{\"area\":\"440000\",\"systemList\":[{\"area\":\"440000\",\"code\":\"sgc-jg\",\"name\":\"水工程应用-水利工程建设管理模块\",\"id\":\"1732648267643097090\"}],\"code\":\"YW00013\",\"level\":\"1d\",\"dataConfig\":\"none\",\"type\":\"BUSINESS\",\"posts\":[],\"users\":[{\"id\":\"20231225000006\"},{\"id\":\"20240119000002\"}],\"name\":\"水利工程应用-水利工程建设管理模块角色\",\"id\":\"20231213000001\",\"category\":\"BUSINESS\",\"businesses\":[{\"parent\":\"1762458920822599682\",\"businessCode\":\"YWSLGCJSGL0008\",\"parentName\":\"水利工程建设管理\",\"businessName\":\"水利工程建设管理\",\"description\":\"\",\"id\":\"1705128209926942721\",\"delFlag\":0}],\"status\":\"1\"}],\"page\":1} //{\"total\":1,\"size\":100,\"records\":[{\"area\":\"440000\",\"systemList\":[{\"area\":\"440000\",\"code\":\"sgc-jg\",\"name\":\"水工程应用-水利工程建设管理模块\",\"id\":\"1732648267643097090\"}],\"code\":\"YW00013\",\"level\":\"1d\",\"dataConfig\":\"none\",\"type\":\"BUSINESS\",\"posts\":[],\"users\":[{\"id\":\"20231225000006\"},{\"id\":\"20240119000002\"}],\"name\":\"水利工程应用-水利工程建设管理模块角色\",\"id\":\"20231213000001\",\"category\":\"BUSINESS\",\"businesses\":[{\"parent\":\"1762458920822599682\",\"businessCode\":\"YWSLGCJSGL0008\",\"parentName\":\"水利工程建设管理\",\"businessName\":\"水利工程建设管理\",\"description\":\"\",\"id\":\"1705128209926942721\",\"delFlag\":0}],\"status\":\"1\"}],\"page\":1}
@ -310,6 +311,7 @@ public class WaterRequestUtil {
.execute()) { .execute()) {
body = response.body(); body = response.body();
} }
log.info("--------请求获取门户用户信息,返回结果为:{}", body);
WaterResult waterResult = JSONObject.parseObject(body, WaterResult.class); WaterResult waterResult = JSONObject.parseObject(body, WaterResult.class);
isSuccess(waterResult); isSuccess(waterResult);
return waterResult; return waterResult;

2
shuili-system/src/main/java/com/kms/framework/web/service/SysPermissionService.java

@ -58,7 +58,7 @@ public class SysPermissionService {
* @return 菜单权限信息 * @return 菜单权限信息
*/ */
public Set<String> getMenuPermission(SysUser user) { public Set<String> getMenuPermission(SysUser user) {
Set<String> perms = new HashSet<String>(); Set<String> perms = new HashSet<>();
// 管理员拥有所有权限 // 管理员拥有所有权限
if (user.isAdmin()) { if (user.isAdmin()) {
perms.add("*:*:*"); perms.add("*:*:*");

Loading…
Cancel
Save