From 9ed1d4ece13f1bfc21877c165ad9e9bcf7653aa3 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 23 五月 2024 18:25:19 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/system_service/src/main/java/com/doumee/api/system/SystemController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/api/system/SystemController.java b/server/system_service/src/main/java/com/doumee/api/system/SystemController.java
index 8b7ba74..9c397cb 100644
--- a/server/system_service/src/main/java/com/doumee/api/system/SystemController.java
+++ b/server/system_service/src/main/java/com/doumee/api/system/SystemController.java
@@ -16,9 +16,10 @@
import org.apache.shiro.subject.Subject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.web.bind.annotation.*;
/**
* @author Eva.Caesar Liu
@@ -56,7 +57,7 @@
@ApiOperation("淇敼褰撳墠鐢ㄦ埛瀵嗙爜")
@PostMapping("/updatePwd")
public ApiResponse updatePwd (@Validated @RequestBody UpdatePwdDto dto) {
- dto.setUserId(this.getLoginUser().getId());
+ dto.setUserId(this.getLoginUser(null).getId());
systemUserBiz.updatePwd(dto);
return ApiResponse.success(null);
}
@@ -64,6 +65,6 @@
@ApiOperation("鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴蜂俊鎭�")
@GetMapping("/getUserInfo")
public ApiResponse<LoginUserInfo> getUserInfo () {
- return ApiResponse.success(this.getLoginUser());
+ return ApiResponse.success(this.getLoginUser(null));
}
}
--
Gitblit v1.9.3