From b7f0865107438d5f57b1ec39ca28d81e52bc13fc Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期二, 24 十月 2023 21:26:07 +0800
Subject: [PATCH] 127836

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index 45e5a2b..b3231d9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.system;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
 
@@ -45,15 +46,32 @@
     @PostMapping("/login")
     public AjaxResult login(@RequestBody LoginBody loginBody)
     {
-        AjaxResult ajax = AjaxResult.success();
         // 鐢熸垚浠ょ墝
         String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
                 loginBody.getUuid());
-        ajax.put(Constants.TOKEN, token);
-        return ajax;
+        HashMap<String, String> tokenMap = new HashMap<>();
+        tokenMap.put("token",token);
+        return AjaxResult.success(tokenMap);
     }
 
     /**
+     * 鐧诲綍鏂规硶锛堜笉闇�瑕侀獙璇佺爜锛�
+     *
+     * @param loginBody 鐧诲綍淇℃伅
+     * @return 缁撴灉
+     */
+    @PostMapping("/login/no")
+    public AjaxResult login2(@RequestBody LoginBody loginBody)
+    {
+        // 鐢熸垚浠ょ墝
+        String token = loginService.loginWithoutValidate(loginBody.getUsername(), loginBody.getPassword());
+        HashMap<String, String> tokenMap = new HashMap<>();
+        tokenMap.put("token",token);
+        return AjaxResult.success(tokenMap);
+    }
+
+
+    /**
      * 鑾峰彇鐢ㄦ埛淇℃伅
      * 
      * @return 鐢ㄦ埛淇℃伅

--
Gitblit v1.9.1