diff --git a/src/main/java/com/ai/da/common/response/Response.java b/src/main/java/com/ai/da/common/response/Response.java index 608cf440..a24ccb53 100644 --- a/src/main/java/com/ai/da/common/response/Response.java +++ b/src/main/java/com/ai/da/common/response/Response.java @@ -31,9 +31,9 @@ public class Response implements Serializable { return success(ResultEnum.SUCCESS.getCode(), ResultEnum.SUCCESS.getMsg(), null); } - public static Response success(String msg) { - return success(ResultEnum.SUCCESS.getCode(), msg, null); - } +// public static Response success(String msg) { +// return success(ResultEnum.SUCCESS.getCode(), msg, null); +// } public static Response success(T data) { return success(ResultEnum.SUCCESS.getCode(), ResultEnum.SUCCESS.getMsg(), data); diff --git a/src/main/java/com/ai/da/controller/AccountController.java b/src/main/java/com/ai/da/controller/AccountController.java index 0944250f..2ec5066f 100644 --- a/src/main/java/com/ai/da/controller/AccountController.java +++ b/src/main/java/com/ai/da/controller/AccountController.java @@ -70,7 +70,7 @@ public class AccountController { @ApiOperation(value = "获取当前用户语言") @PostMapping("/getUserLanguage") - public Response getUserLanguage() { + public Response getUserLanguage() { return Response.success(accountService.getUserLanguage()); } diff --git a/src/main/java/com/ai/da/service/AccountService.java b/src/main/java/com/ai/da/service/AccountService.java index 693ce085..0df98b28 100644 --- a/src/main/java/com/ai/da/service/AccountService.java +++ b/src/main/java/com/ai/da/service/AccountService.java @@ -91,7 +91,7 @@ public interface AccountService extends IService { */ Boolean editUser(AccountEditDTO accountEditDTO); - Language getUserLanguage(); + String getUserLanguage(); String changeUserLanguage(String language); } diff --git a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java index 27ef3440..4761682d 100644 --- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java @@ -404,9 +404,9 @@ public class AccountServiceImpl extends ServiceImpl impl } @Override - public Language getUserLanguage() { + public String getUserLanguage() { AuthPrincipalVo userInfo = UserContext.getUserHolder(); - return Language.valueOf(userInfo.getLanguage()); + return Language.valueOf(userInfo.getLanguage()).name(); } @Override