|
@@ -1,6 +1,7 @@
|
|
package com.boman.auth.controller;
|
|
package com.boman.auth.controller;
|
|
|
|
|
|
import com.boman.auth.service.SysLoginService;
|
|
import com.boman.auth.service.SysLoginService;
|
|
|
|
+
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
|
|
|
@@ -17,6 +18,7 @@ import com.boman.system.api.model.LoginUser;
|
|
import com.boman.wechat.api.RemoteWechatService;
|
|
import com.boman.wechat.api.RemoteWechatService;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
+
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
|
|
|
|
|
|
|
|
@@ -90,12 +92,13 @@ public class TokenController {
|
|
|
|
|
|
/**
|
|
/**
|
|
* 扫码成功进入确认登录页面记录状态
|
|
* 扫码成功进入确认登录页面记录状态
|
|
|
|
+ *
|
|
* @param uuid
|
|
* @param uuid
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@GetMapping(value = "scanCode/{uuid}")
|
|
@GetMapping(value = "scanCode/{uuid}")
|
|
public R<?> scanCode(@PathVariable String uuid) {
|
|
public R<?> scanCode(@PathVariable String uuid) {
|
|
- return tokenService.scanCode(uuid);
|
|
|
|
|
|
+ return tokenService.scanCode(uuid);
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -105,8 +108,8 @@ public class TokenController {
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@PostMapping("phoneScanLogin")
|
|
@PostMapping("phoneScanLogin")
|
|
- public void phoneScanLogin(@RequestBody LoginBody form) {
|
|
|
|
- sysLoginService.phoneScanLogin(form);
|
|
|
|
|
|
+ public R<?> phoneScanLogin(@RequestBody LoginBody form) {
|
|
|
|
+ return sysLoginService.phoneScanLogin(form);
|
|
}
|
|
}
|
|
|
|
|
|
@DeleteMapping("logout")
|
|
@DeleteMapping("logout")
|