diff --git a/vetti-admin/src/main/java/com/vetti/web/controller/system/SysProfileController.java b/vetti-admin/src/main/java/com/vetti/web/controller/system/SysProfileController.java index b648cd8..b11f11c 100644 --- a/vetti-admin/src/main/java/com/vetti/web/controller/system/SysProfileController.java +++ b/vetti-admin/src/main/java/com/vetti/web/controller/system/SysProfileController.java @@ -3,6 +3,7 @@ package com.vetti.web.controller.system; import java.util.Map; import cn.hutool.json.JSONUtil; +import com.vetti.common.core.domain.R; import com.vetti.common.enums.UserOperStepsEnum; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -52,14 +53,14 @@ public class SysProfileController extends BaseController */ @ApiOperation("个人信息") @GetMapping("/personalInfo") - public AjaxResult profile() + public R profile() { LoginUser loginUser = getLoginUser(); SysUser user = userService.selectUserById(loginUser.getUserId()); - AjaxResult ajax = AjaxResult.success(user); + R r = R.ok(user); // ajax.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername())); // ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername())); - return ajax; + return r; } @@ -69,7 +70,7 @@ public class SysProfileController extends BaseController @ApiOperation("个人信息完善") @Log(title = "个人信息完善", businessType = BusinessType.UPDATE) @PutMapping("/completeInfo") - public AjaxResult personalInfoProfile(@RequestBody SysUser user) + public R personalInfoProfile(@RequestBody SysUser user) { LoginUser loginUser = getLoginUser(); SysUser currentUser = userService.selectUserById(loginUser.getUserId()); @@ -96,7 +97,7 @@ public class SysProfileController extends BaseController // 更新缓存用户信息 tokenService.setLoginUser(loginUser); } - return success(); + return R.ok(); } diff --git a/vetti-common/src/main/java/com/vetti/common/core/domain/R.java b/vetti-common/src/main/java/com/vetti/common/core/domain/R.java index 75cdbd2..2864001 100644 --- a/vetti-common/src/main/java/com/vetti/common/core/domain/R.java +++ b/vetti-common/src/main/java/com/vetti/common/core/domain/R.java @@ -1,6 +1,8 @@ package com.vetti.common.core.domain; import java.io.Serializable; + +import cn.hutool.core.date.DateUtil; import com.vetti.common.constant.HttpStatus; import com.vetti.common.utils.MessageUtils; @@ -21,7 +23,9 @@ public class R implements Serializable private int code; - private String msg; + private String message; + + private String timestamp; private T data; @@ -70,7 +74,8 @@ public class R implements Serializable R apiResult = new R<>(); apiResult.setCode(code); apiResult.setData(data); - apiResult.setMsg(msg); + apiResult.setMessage(msg); + apiResult.setTimestamp(DateUtil.now()); return apiResult; } @@ -84,14 +89,20 @@ public class R implements Serializable this.code = code; } - public String getMsg() - { - return msg; + public String getMessage() { + return message; } - public void setMsg(String msg) - { - this.msg = msg; + public void setMessage(String message) { + this.message = message; + } + + public String getTimestamp() { + return timestamp; + } + + public void setTimestamp(String timestamp) { + this.timestamp = timestamp; } public T getData() diff --git a/vetti-system/target/classes/mapper/system/SysUserMapper.xml b/vetti-system/target/classes/mapper/system/SysUserMapper.xml index c353378..d6fb590 100644 --- a/vetti-system/target/classes/mapper/system/SysUserMapper.xml +++ b/vetti-system/target/classes/mapper/system/SysUserMapper.xml @@ -25,6 +25,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + @@ -52,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.pwd_update_date, u.create_by, u.create_time, u.remark, d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,u.sys_user_type + ,u.steps,u.job_position,u.experience,u.cv_url,u.location,u.job_type,u.relocate,u.best_side_json from sys_user u left join sys_dept d on u.dept_id = d.dept_id left join sys_user_role ur on u.user_id = ur.user_id @@ -59,7 +70,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"