From 0b1128c785ff96275a6f1045fd6ba695f2cc4909 Mon Sep 17 00:00:00 2001 From: damonyuan <404054358@qq.com> Date: Fri, 8 Nov 2024 00:00:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=A4=B1=E6=95=88=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mdd/admin/controller/UserController.java | 5 +++-- .../admin/controller/finance/FinanceRechargerController.java | 5 +++-- .../java/com/mdd/admin/controller/system/JobsController.java | 5 +++-- .../admin/controller/system/SystemAuthAdminController.java | 5 +++-- .../src/main/java/com/mdd/common/core/AjaxResult.java | 4 ++++ 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/UserController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/UserController.java index 2d3cd114..4d8e1521 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/UserController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/UserController.java @@ -10,6 +10,7 @@ import com.mdd.admin.validate.user.UserWalletValidate; import com.mdd.admin.vo.user.UserVo; import com.mdd.common.core.AjaxResult; import com.mdd.common.core.PageResult; +import com.mdd.common.enums.ErrorEnum; import com.mdd.common.util.StringUtils; import com.mdd.common.validator.annotation.IDMust; import io.swagger.annotations.Api; @@ -36,9 +37,9 @@ public class UserController { return AjaxResult.success(ret); } else if (StringUtils.isNotNull(searchValidate.getExport()) && searchValidate.getExport().equals(2)) { String path = iUserService.export(searchValidate); - return AjaxResult.success(new JSONObject() {{ + return AjaxResult.success(2, new JSONObject() {{ put("url", path); - }}); + }}, ErrorEnum.SHOW_MSG.getCode()); } else { PageResult list = iUserService.list(pageValidate, searchValidate); return AjaxResult.success(list); diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/finance/FinanceRechargerController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/finance/FinanceRechargerController.java index 099fa110..ba42f840 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/finance/FinanceRechargerController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/finance/FinanceRechargerController.java @@ -10,6 +10,7 @@ import com.mdd.admin.validate.finance.FinanceRefundValidate; import com.mdd.admin.vo.finance.FinanceRechargeListVo; import com.mdd.common.core.AjaxResult; import com.mdd.common.core.PageResult; +import com.mdd.common.enums.ErrorEnum; import com.mdd.common.util.StringUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiModelProperty; @@ -36,9 +37,9 @@ public class FinanceRechargerController { return AjaxResult.success(ret); } else if (StringUtils.isNotNull(searchValidate.getExport()) && searchValidate.getExport().equals(2)) { String path = iFinanceRechargerService.export(searchValidate); - return AjaxResult.success(new JSONObject() {{ + return AjaxResult.success(2, new JSONObject() {{ put("url", path); - }}); + }}, ErrorEnum.SHOW_MSG.getCode()); } else { PageResult list = iFinanceRechargerService.list(pageValidate, searchValidate); return AjaxResult.success(list); diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/system/JobsController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/system/JobsController.java index 65c7cfe8..968c7299 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/system/JobsController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/system/JobsController.java @@ -11,6 +11,7 @@ import com.mdd.admin.validate.system.JobsUpdateValidate; import com.mdd.admin.vo.system.JobsVo; import com.mdd.common.core.AjaxResult; import com.mdd.common.core.PageResult; +import com.mdd.common.enums.ErrorEnum; import com.mdd.common.util.StringUtils; import com.mdd.common.validator.annotation.IDMust; import io.swagger.annotations.Api; @@ -46,9 +47,9 @@ public class JobsController { return AjaxResult.success(ret); } else if (StringUtils.isNotNull(searchValidate.getExport()) && searchValidate.getExport().equals(2)) { String path = iJobsService.export(searchValidate); - return AjaxResult.success(new JSONObject() {{ + return AjaxResult.success(2, new JSONObject() {{ put("url", path); - }}); + }}, ErrorEnum.SHOW_MSG.getCode()); } else { PageResult list = iJobsService.list(pageValidate, searchValidate); return AjaxResult.success(list); diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthAdminController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthAdminController.java index df861457..08a44165 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthAdminController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthAdminController.java @@ -16,6 +16,7 @@ import com.mdd.admin.vo.system.SystemAuthAdminListedVo; import com.mdd.admin.vo.system.SystemAuthAdminSelvesVo; import com.mdd.common.core.AjaxResult; import com.mdd.common.core.PageResult; +import com.mdd.common.enums.ErrorEnum; import com.mdd.common.util.StringUtils; import com.mdd.common.validator.annotation.IDMust; import io.swagger.annotations.Api; @@ -42,9 +43,9 @@ public class SystemAuthAdminController { return AjaxResult.success(ret); } else if (StringUtils.isNotNull(searchValidate.getExport()) && searchValidate.getExport().equals(2)) { String path = iSystemAuthAdminService.export(searchValidate); - return AjaxResult.success(new JSONObject() {{ + return AjaxResult.success(2, new JSONObject() {{ put("url", path); - }}); + }}, ErrorEnum.SHOW_MSG.getCode()); } else { PageResult list = iSystemAuthAdminService.list(pageValidate, searchValidate); return AjaxResult.success(list); diff --git a/server/like-common/src/main/java/com/mdd/common/core/AjaxResult.java b/server/like-common/src/main/java/com/mdd/common/core/AjaxResult.java index 05961b66..e6738496 100644 --- a/server/like-common/src/main/java/com/mdd/common/core/AjaxResult.java +++ b/server/like-common/src/main/java/com/mdd/common/core/AjaxResult.java @@ -116,6 +116,10 @@ public class AjaxResult { return new AjaxResult<>(code, msg, new ArrayList<>(), show); } + public static AjaxResult success(Integer code, T data, Integer show) { + return new AjaxResult<>(code, ErrorEnum.SUCCESS.getMsg(), data, show); + } + /** * 成功返回结果 * From e98c70bd15e89642fd4f2146821f894e18da914e Mon Sep 17 00:00:00 2001 From: damonyuan <404054358@qq.com> Date: Fri, 8 Nov 2024 14:20:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat=20=E4=BC=98=E5=8C=96=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=E7=99=BB=E5=BD=95token?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mdd/front/service/impl/LoginServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java index c7e401d6..e684cb04 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java @@ -438,7 +438,7 @@ public class LoginServiceImpl implements ILoginService { */ private LoginTokenVo __loginToken(Integer userId, String mobile, Integer isNew, Integer terminal) { // 实现账号登录 - StpUtil.login(userId, String.valueOf(terminal)); + StpUtil.login(userId, String.valueOf(terminal + ToolUtils.makeToken())); // 更新登录信息 User user = new User(); From 49ac3a95ebcb25f016f66dbcc41423612a5e57fa Mon Sep 17 00:00:00 2001 From: damonyuan <404054358@qq.com> Date: Fri, 8 Nov 2024 14:32:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat=20=E4=BC=98=E5=8C=96=E5=89=8D=E5=8F=B0?= =?UTF-8?q?=E7=94=9F=E6=88=90token=E7=9A=84=E6=96=B9=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mdd/front/service/impl/LoginServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java index e684cb04..3186348f 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java @@ -438,7 +438,7 @@ public class LoginServiceImpl implements ILoginService { */ private LoginTokenVo __loginToken(Integer userId, String mobile, Integer isNew, Integer terminal) { // 实现账号登录 - StpUtil.login(userId, String.valueOf(terminal + ToolUtils.makeToken())); + StpUtil.login(userId); // 更新登录信息 User user = new User();