mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
pan.wl.2 2024-11-08 14:33:14 +08:00
parent 33b6e49187 49ac3a95eb
commit 26a7c0a350
6 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/like-admin/src/main/java/com/mdd/admin/controller/UserController.java
View File

@ -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<UserVo> list = iUserService.list(pageValidate, searchValidate);
return AjaxResult.success(list);

5
server/like-admin/src/main/java/com/mdd/admin/controller/finance/FinanceRechargerController.java
View File

@ -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<FinanceRechargeListVo> list = iFinanceRechargerService.list(pageValidate, searchValidate);
return AjaxResult.success(list);

5
server/like-admin/src/main/java/com/mdd/admin/controller/system/JobsController.java
View File

@ -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<JobsVo> list = iJobsService.list(pageValidate, searchValidate);
return AjaxResult.success(list);

5
server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthAdminController.java
View File

@ -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<SystemAuthAdminListedVo> list = iSystemAuthAdminService.list(pageValidate, searchValidate);
return AjaxResult.success(list);

4
server/like-common/src/main/java/com/mdd/common/core/AjaxResult.java
View File

@ -116,6 +116,10 @@ public class AjaxResult<T> {
return new AjaxResult<>(code, msg, new ArrayList<>(), show);
}
public static <T>AjaxResult<T> success(Integer code, T data, Integer show) {
return new AjaxResult<>(code, ErrorEnum.SUCCESS.getMsg(), data, show);
}
/**
* 成功返回结果
*

2
server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java
View File

@ -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);
// 更新登录信息
User user = new User();