ソースを参照

新增扫码登录

tjf 3 年 前
コミット
540bb65d1e

+ 3 - 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -92,7 +92,7 @@ public class SysLoginController
     /**
      * 产生uuid二维码
      */
-    @PostMapping("getQrCode")
+    @PostMapping("/scanCode/getQrCode")
     public R<?> getQrCode() {
         String qrCode = tokenService.getQrCode();
         return R.ok(qrCode);
@@ -101,7 +101,7 @@ public class SysLoginController
     /**
      * 判断二维码是否被扫描
      */
-    @GetMapping("getPool/{uuid}")
+    @GetMapping("/scanCode/getPool/{uuid}")
     public R<?> getPool(@PathVariable String uuid) {
         return tokenService.getPool(uuid);
     }
@@ -112,7 +112,7 @@ public class SysLoginController
      * @param uuid
      * @return
      */
-    @GetMapping(value = "scanCode/{uuid}")
+    @GetMapping(value = "/scanCode/confirm/{uuid}")
     public R<?> scanCode(@PathVariable String uuid) {
         return tokenService.scanCode(uuid);
     }

+ 1 - 7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -241,13 +241,7 @@ public class SysUserController extends BaseController
     }
 
 
-    /**
-     * 获取当前用户信息
-     */
-    @PostMapping("/packInfo")
-    public LoginUser packInfo(@RequestBody SysUser sysUser) {
-        return userService.packPermDeptRoles(sysUser);
-    }
+
 
 
     /**

+ 1 - 0
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -113,6 +113,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers("/*/api-docs").anonymous()
                 .antMatchers("/druid/**").anonymous()
                 .antMatchers("/system/h5/**").anonymous()
+                .antMatchers("/scanCode/**").anonymous()
                 // 除上面外的所有请求全部需要鉴权认证
                 .anyRequest().authenticated()
                 .and()