From f22c4b9230808fed4fec80c435eccb4c833349a0 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期五, 21 十月 2022 18:36:38 +0800
Subject: [PATCH] 2022.10.21 1.环境守法小程序后台功能首发版本完成

---
 src/main/kotlin/cn/flightfeather/supervision/lightshare/web/UserinfoController.kt |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/UserinfoController.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/UserinfoController.kt
index bdd9749..d69f90d 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/UserinfoController.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/UserinfoController.kt
@@ -51,6 +51,12 @@
         @ApiParam("娉ㄥ唽淇℃伅") @RequestBody loginRequestVo: LoginRequestVo
     ) = userinfoService.register(loginRequestVo)
 
+    @ApiOperation(value = "娉ㄥ唽")
+    @PostMapping("/register2")
+    fun register2(
+        @ApiParam("娉ㄥ唽淇℃伅") @RequestBody loginRequestVo: LoginRequestVo
+    ) = userinfoService.register2(loginRequestVo)
+
     @ApiOperation(value = "鑾峰彇鐢ㄦ埛閫氳褰�")
     @GetMapping("/addressBook")
     fun getAddressBook(
@@ -65,7 +71,7 @@
     ) = userinfoService.upLoadAccountPic(userId, files)
 
     @ApiOperation(value = "淇敼瀵嗙爜")
-    @PostMapping("/password/change/{userId}")
+    @PostMapping("/password/change")
     fun changePassword(
         @ApiParam("鐢ㄦ埛id") @RequestParam("userId") userId: String,
         @ApiParam("鏃у瘑鐮�") @RequestParam("oldPassword") oldPassword: String,
@@ -85,8 +91,9 @@
     @ApiOperation(value = "鑾峰彇鐢ㄦ埛鍩烘湰淇℃伅")
     @GetMapping("/baseInfo")
     fun getBaseInfo(
-        @ApiParam("鐢ㄦ埛id") @RequestParam("userId") userId: String
-    ) = userinfoService.getBaseInfo(userId)
+        @ApiParam("鐢ㄦ埛id") @RequestParam("userId") userId: String,
+        @ApiParam("寰俊鐢ㄦ埛id") @RequestParam(value = "wxUserId", required = false) wxUserId: String?
+    ) = userinfoService.getBaseInfo(userId, wxUserId)
 
     @ApiOperation(value = "鏍规嵁缁欏畾鏉′欢锛屾悳绱㈢敤鎴�")
     @GetMapping("/search")

--
Gitblit v1.9.3