feat: bug-243 管理端权限调整,添加对客户端菜单的支持
This commit is contained in:
parent
8689bc6ef1
commit
5d26533fa5
|
|
@ -1,42 +0,0 @@
|
||||||
package com.nflg.mobilebroken.auth.config;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.databind.DeserializationFeature;
|
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
||||||
import com.fasterxml.jackson.databind.SerializationFeature;
|
|
||||||
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
|
|
||||||
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
|
|
||||||
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
|
|
||||||
import org.springframework.context.annotation.Bean;
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
|
||||||
import java.time.format.DateTimeFormatter;
|
|
||||||
|
|
||||||
@Configuration
|
|
||||||
public class JacksonConfig {
|
|
||||||
|
|
||||||
// 定义全局日期时间格式
|
|
||||||
private static final String DATETIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
public ObjectMapper objectMapper() {
|
|
||||||
ObjectMapper objectMapper = new ObjectMapper();
|
|
||||||
|
|
||||||
// 创建并注册 JavaTimeModule,设置日期格式化
|
|
||||||
JavaTimeModule javaTimeModule = new JavaTimeModule();
|
|
||||||
javaTimeModule.addSerializer(
|
|
||||||
java.time.LocalDateTime.class,
|
|
||||||
new LocalDateTimeSerializer(DateTimeFormatter.ofPattern(DATETIME_FORMAT))
|
|
||||||
);
|
|
||||||
javaTimeModule.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern(DATETIME_FORMAT)));
|
|
||||||
|
|
||||||
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
|
|
||||||
// 注册模块到 ObjectMapper
|
|
||||||
objectMapper.registerModule(javaTimeModule);
|
|
||||||
|
|
||||||
// 禁用时间戳(默认是 true,会序列化为数组)
|
|
||||||
objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
|
|
||||||
|
|
||||||
return objectMapper;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -10,13 +10,12 @@ import com.nflg.mobilebroken.common.pojo.ApiResult;
|
||||||
import com.nflg.mobilebroken.common.pojo.vo.AppLoginVO;
|
import com.nflg.mobilebroken.common.pojo.vo.AppLoginVO;
|
||||||
import com.nflg.mobilebroken.common.pojo.vo.MenuVO;
|
import com.nflg.mobilebroken.common.pojo.vo.MenuVO;
|
||||||
import com.nflg.mobilebroken.common.util.AppUserUtil;
|
import com.nflg.mobilebroken.common.util.AppUserUtil;
|
||||||
import com.nflg.mobilebroken.common.util.SaTokenAdminUtil;
|
|
||||||
import com.nflg.mobilebroken.common.util.SaTokenAppUtil;
|
import com.nflg.mobilebroken.common.util.SaTokenAppUtil;
|
||||||
import com.nflg.mobilebroken.common.util.VUtils;
|
import com.nflg.mobilebroken.common.util.VUtils;
|
||||||
import com.nflg.mobilebroken.repository.entity.AdminUser;
|
import com.nflg.mobilebroken.repository.entity.AdminUser;
|
||||||
import com.nflg.mobilebroken.repository.entity.AppUser;
|
import com.nflg.mobilebroken.repository.entity.AppUser;
|
||||||
import com.nflg.mobilebroken.repository.service.IAdminUserService;
|
|
||||||
import com.nflg.mobilebroken.repository.service.IAdminRoleService;
|
import com.nflg.mobilebroken.repository.service.IAdminRoleService;
|
||||||
|
import com.nflg.mobilebroken.repository.service.IAdminUserService;
|
||||||
import com.nflg.mobilebroken.repository.service.IAppUserService;
|
import com.nflg.mobilebroken.repository.service.IAppUserService;
|
||||||
import com.nflg.mobilebroken.repository.service.IDictionaryItemTranslateService;
|
import com.nflg.mobilebroken.repository.service.IDictionaryItemTranslateService;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
|
|
@ -120,7 +119,7 @@ public class AppController extends ControllerBase {
|
||||||
*/
|
*/
|
||||||
@GetMapping("getPermissionMenus")
|
@GetMapping("getPermissionMenus")
|
||||||
public ApiResult<List<MenuVO>> getPermissionMenus() {
|
public ApiResult<List<MenuVO>> getPermissionMenus() {
|
||||||
VUtils.trueThrow(!SaTokenAdminUtil.isLogin()).throwMessage(STATE.LoginError,"请重新登录");
|
VUtils.trueThrow(!SaTokenAppUtil.isLogin()).throwMessage(STATE.LoginError,"请重新登录");
|
||||||
return ApiResult.success(adminRoleService.getMenusByRoleCodes("app",AppUserUtil.getUserId(), "app"));
|
return ApiResult.success(adminRoleService.getMenusByRoleCodes(AppUserUtil.getFrom(),AppUserUtil.getUserId(), "app"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -107,6 +107,7 @@ public class UserController extends ControllerBase {
|
||||||
.setEmail(adminUser.getEmail())
|
.setEmail(adminUser.getEmail())
|
||||||
.setAvatar(adminUser.getAvatar())
|
.setAvatar(adminUser.getAvatar())
|
||||||
.setPhone(adminUser.getPhone())
|
.setPhone(adminUser.getPhone())
|
||||||
|
.setTitle(adminUser.getTitleName())
|
||||||
.setPlatform("admin"));
|
.setPlatform("admin"));
|
||||||
}
|
}
|
||||||
VUtils.trueThrowBusinessError(true).throwMessage("不支持的平台:" + AppUserUtil.getFrom());
|
VUtils.trueThrowBusinessError(true).throwMessage("不支持的平台:" + AppUserUtil.getFrom());
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue