westt 2 vuotta sitten
vanhempi
commit
ff3465ee21

+ 11 - 29
pom.xml

@@ -37,22 +37,17 @@
             <optional>true</optional>
         </dependency>
 
-        <!-- 数据库相关 -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.28</version>
-        </dependency>
-        <dependency>
-            <groupId>org.mybatis.spring.boot</groupId>
-            <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>2.3.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-jdbc</artifactId>
-            <version>5.3.14</version>
-        </dependency>
+<!--         数据库相关 -->
+<!--        <dependency>-->
+<!--            <groupId>mysql</groupId>-->
+<!--            <artifactId>mysql-connector-java</artifactId>-->
+<!--            <version>8.0.28</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.springframework</groupId>-->
+<!--            <artifactId>spring-jdbc</artifactId>-->
+<!--            <version>5.3.14</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
@@ -62,14 +57,6 @@
             <artifactId>mybatis-plus-boot-starter</artifactId>
             <version>3.5.2</version>
         </dependency>
-
-        <!-- 登陆/权限相关 -->
-        <dependency>
-            <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-spring-boot-starter</artifactId>
-            <version>1.34.0.temp1</version>
-        </dependency>
-
         <!-- 工具类 -->
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -82,11 +69,6 @@
             <version>5.8.18</version>
         </dependency>
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>

+ 5 - 6
src/main/java/com/example/onlinejudge/controller/UserController.java

@@ -2,6 +2,7 @@ package com.example.onlinejudge.controller;
 
 import cn.dev33.satoken.stp.StpUtil;
 import cn.dev33.satoken.util.SaResult;
+import com.example.onlinejudge.model.entity.result.Result;
 import com.example.onlinejudge.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -26,8 +27,8 @@ public class UserController {
      */
     @RequestMapping("/api/login/{username}/{password}")
     @ResponseBody
-    public SaResult login(@PathVariable("username") String username,
-                          @PathVariable("password") String password) {
+    public Result login(@PathVariable("username") String username,
+                        @PathVariable("password") String password) {
         return userService.login(username, password);
     }
 
@@ -48,11 +49,9 @@ public class UserController {
      */
     @RequestMapping("/api/logout")
     @ResponseBody
-    public SaResult logout() {
+    public Result logout() {
         StpUtil.logout();
-        return SaResult
-                .ok()
-                .set("error_message", "success");
+        return Result.success();
     }
 
 }

+ 5 - 6
src/main/java/com/example/onlinejudge/controller/exception/GlobalExceptionHandler.java → src/main/java/com/example/onlinejudge/exception/GlobalExceptionHandler.java

@@ -1,7 +1,9 @@
-package com.example.onlinejudge.controller.exception;
+package com.example.onlinejudge.exception;
 
 import cn.dev33.satoken.exception.NotLoginException;
 import cn.dev33.satoken.util.SaResult;
+import com.example.onlinejudge.model.entity.result.Result;
+import com.example.onlinejudge.model.entity.result.ResultCode;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
@@ -16,11 +18,8 @@ public class GlobalExceptionHandler {
      * @return 返回未登录错误
      */
     @ExceptionHandler(NotLoginException.class)
-    public SaResult handlerException(NotLoginException e) {
+    public Result handlerException(NotLoginException e) {
         e.printStackTrace();
-        return SaResult
-                .error(e.getMessage())
-                .set("error_message", "not_login")
-                .setCode(401);
+        return Result.error(ResultCode.USER_NOTLOGGED_IN);
     }
 }

+ 2 - 1
src/main/java/com/example/onlinejudge/service/UserService.java

@@ -1,7 +1,8 @@
 package com.example.onlinejudge.service;
 
 import cn.dev33.satoken.util.SaResult;
+import com.example.onlinejudge.model.entity.result.Result;
 
 public interface UserService {
-    SaResult login(String username, String password);
+    Result login(String username, String password);
 }

+ 10 - 6
src/main/java/com/example/onlinejudge/service/impl/UserServiceImpl.java

@@ -5,10 +5,14 @@ import cn.dev33.satoken.stp.StpUtil;
 import cn.dev33.satoken.util.SaResult;
 import com.example.onlinejudge.model.entity.User;
 import com.example.onlinejudge.mapper.UserMapper;
+import com.example.onlinejudge.model.entity.result.Result;
+import com.example.onlinejudge.model.entity.result.ResultCode;
 import com.example.onlinejudge.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.LinkedHashMap;
+
 /**
  * 实现用户服务
  */
@@ -25,23 +29,23 @@ public class UserServiceImpl implements UserService {
      * @return 登录结果
      */
     @Override
-    public SaResult login(String username, String password) {
+    public Result login(String username, String password) {
         if (username == null || password == null) {
-            return SaResult.error("failed").set("error_message", "用户名或密码不能为空");
+            return Result.error(ResultCode.PARAM_IS_BLANK);
         }
         username = username.trim();
         if (username.length() == 0) {
-            return SaResult.error("failed").set("error_message", "用户名长度不能为0");
+            return Result.error(ResultCode.PARAM_IS_BLANK.getCode(), "用户名长度不能为0");
         }
         if (password.length() == 0) {
-            return SaResult.error("failed").set("error_message", "密码长度不能为0");
+            return Result.error(ResultCode.PARAM_IS_BLANK.getCode(), "密码长度不能为0");
         }
         User user = userMapper.selectUserByUsernameAndPassword(username, password);
         if (user != null) {
             StpUtil.login(user.getId());
-            return SaResult.ok("success").set("error_message", "success");
+            return Result.success();
         }
-        return SaResult.error("failed").set("error_message", "用户名或密码错误").setCode(401);
+        return Result.error(ResultCode.USER_LOGIN_ERROR);
     }
 
 }