From 5d26533fa5b196adf420c62cef460d95a0ce1b17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 23 Jun 2025 10:09:37 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20bug-243=20=20=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=AB=AF=E6=9D=83=E9=99=90=E8=B0=83=E6=95=B4=EF=BC=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=AF=B9=E5=AE=A2=E6=88=B7=E7=AB=AF=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E7=9A=84=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/config/JacksonConfig.java | 42 ------------------- .../auth/controller/AppController.java | 7 ++-- .../cfs/controller/UserController.java | 1 + 3 files changed, 4 insertions(+), 46 deletions(-) delete mode 100644 nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/config/JacksonConfig.java diff --git a/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/config/JacksonConfig.java b/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/config/JacksonConfig.java deleted file mode 100644 index 4773053d..00000000 --- a/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/config/JacksonConfig.java +++ /dev/null @@ -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; - } -} diff --git a/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AppController.java b/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AppController.java index f0003466..2a1e3f1b 100644 --- a/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AppController.java +++ b/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AppController.java @@ -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.MenuVO; 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.VUtils; import com.nflg.mobilebroken.repository.entity.AdminUser; 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.IAdminUserService; import com.nflg.mobilebroken.repository.service.IAppUserService; import com.nflg.mobilebroken.repository.service.IDictionaryItemTranslateService; import org.springframework.web.bind.annotation.GetMapping; @@ -120,7 +119,7 @@ public class AppController extends ControllerBase { */ @GetMapping("getPermissionMenus") public ApiResult> getPermissionMenus() { - VUtils.trueThrow(!SaTokenAdminUtil.isLogin()).throwMessage(STATE.LoginError,"请重新登录"); - return ApiResult.success(adminRoleService.getMenusByRoleCodes("app",AppUserUtil.getUserId(), "app")); + VUtils.trueThrow(!SaTokenAppUtil.isLogin()).throwMessage(STATE.LoginError,"请重新登录"); + return ApiResult.success(adminRoleService.getMenusByRoleCodes(AppUserUtil.getFrom(),AppUserUtil.getUserId(), "app")); } } diff --git a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/UserController.java b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/UserController.java index 762bdc03..2d2ac936 100644 --- a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/UserController.java +++ b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/UserController.java @@ -107,6 +107,7 @@ public class UserController extends ControllerBase { .setEmail(adminUser.getEmail()) .setAvatar(adminUser.getAvatar()) .setPhone(adminUser.getPhone()) + .setTitle(adminUser.getTitleName()) .setPlatform("admin")); } VUtils.trueThrowBusinessError(true).throwMessage("不支持的平台:" + AppUserUtil.getFrom());