|
@@ -21,10 +21,7 @@ import com.txz.cif.web.bo.UserBo;
|
|
|
import com.txz.cif.web.bo.UserBo2;
|
|
|
import com.txz.cif.web.bo.UserDetailBo;
|
|
|
import com.txz.cif.web.bo.UserInfoBO;
|
|
|
-import com.txz.cif.web.para.LoginAccountParameters;
|
|
|
-import com.txz.cif.web.para.MyUserParam;
|
|
|
-import com.txz.cif.web.para.RegisterAccountParameters;
|
|
|
-import com.txz.cif.web.para.UserInfoForm;
|
|
|
+import com.txz.cif.web.para.*;
|
|
|
import com.txz.cif.core.*;
|
|
|
import com.txz.cif.model.*;
|
|
|
import com.txz.cif.service.*;
|
|
@@ -60,6 +57,29 @@ public class UserController extends AbstractApiController {
|
|
|
@Resource
|
|
|
private ConfigMemberService configMemberService;
|
|
|
|
|
|
+
|
|
|
+ @GetMapping("/update")
|
|
|
+ @ApiOperation(value = "更新用户资料",httpMethod = "GET")
|
|
|
+ public Result update(@RequestBody UserUpdateParam param) {
|
|
|
+ if (param == null){
|
|
|
+ return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
|
|
|
+ }
|
|
|
+ if (param.getId() == null){
|
|
|
+ return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
|
|
|
+ }
|
|
|
+ User user = userService.findById(param.getId());
|
|
|
+ if (user == null){
|
|
|
+ return ResultGenerator.genFailResult(ResultCode.USER_IS_NULL);
|
|
|
+ }
|
|
|
+ User temp = BeanUtil.toBean(param,User.class);
|
|
|
+ if (StrUtil.isNotBlank(param.getPwd())){
|
|
|
+ String pwd2 = SecureUtil.md5(param.getPwd() + user.getSalt()).toUpperCase();
|
|
|
+ temp.setPwd(pwd2);
|
|
|
+ }
|
|
|
+ userService.update(temp);
|
|
|
+ return ResultGenerator.genSuccessResult();
|
|
|
+ }
|
|
|
+
|
|
|
@PostMapping("/list")
|
|
|
@ApiOperation(value = "获取用户",httpMethod = "POST")
|
|
|
public Result<List<UserBo2>> list(@RequestBody MyUserParam param, HttpServletRequest request, @RequestHeader(value = X_CLIENT_TOKEN_USERID,required = false) Long userId) {
|