From a3eaa78c6d839b640c728f4c7d8eb27732627b07 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 20 Oct 2023 14:51:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into qa
---
screen-api/src/main/java/com/moral/api/controller/AppUserController.java | 64 ++++++++++++++++++++++++++++++++
1 files changed, 64 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/AppUserController.java b/screen-api/src/main/java/com/moral/api/controller/AppUserController.java
new file mode 100644
index 0000000..ffe52c1
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/controller/AppUserController.java
@@ -0,0 +1,64 @@
+package com.moral.api.controller;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+import com.moral.api.service.UserService;
+
+import com.moral.constant.ResponseCodeEnum;
+import com.moral.constant.ResultMessage;
+
+
+@Slf4j
+@Api(tags = {"���������������������"})
+@RestController
+@RequestMapping("/AppUser")
+public class AppUserController {
+
+ @Autowired
+ private UserService userService;
+
+ @ApiOperation(value = "������������")
+ @PostMapping("logins")
+ public ResultMessage login(@RequestBody Map<String, Object> parameters) {
+ if (!(parameters.containsKey("account") && parameters.containsKey("password"))) {
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ Map<String, Object> result = userService.loginSmallRoutine(parameters);
+ if (!result.containsKey("token")) {
+ return ResultMessage.fail((int) result.get("code"), (String) result.get("msg"));
+ }
+ return ResultMessage.ok(result);
+ }
+
+
+ @GetMapping("/wx/login")
+ @ApiOperation(value = "���������������")
+ public ResultMessage userLogin(@RequestParam(value = "code") String code
+ ) {
+ Map<String, Object> result = userService.wxLogin(code);
+ return ResultMessage.ok(result);
+ }
+
+ @GetMapping("/wx/exit")
+ @ApiOperation(value = "���������������")
+ public ResultMessage updateUserId(@RequestParam @ApiParam(value = "userId",name = "������������") Integer userId) {
+ userService.updateUserId(userId);
+ return ResultMessage.ok();
+ }
+
+}
--
Gitblit v1.8.0