From 1707976c2f30199565c2ddbea0e2c33edd4688a9 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 26 九月 2023 09:11:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/PasswordFreeLoginController.java | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/PasswordFreeLoginController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/PasswordFreeLoginController.java
index 12b129d..c4d7e8e 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/PasswordFreeLoginController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/PasswordFreeLoginController.java
@@ -28,21 +28,16 @@
* @author ludc
* @date 2023/9/12 9:07
*/
-@Controller
+@RestController
@RequestMapping("/passwordFree")
@Api(value = "鍏嶅瘑鐧诲綍鎺ュ彛", tags = "鍏嶅瘑鐧诲綍鎺ュ彛")
@Slf4j
public class PasswordFreeLoginController {
- // 鍒汉璋冪敤鎴戜滑鐨勫崟鐐归噸瀹氬悜鐨勫湴鍧�
- @Value("${password-free.sso-redirect-addr}")
- private String ssoRedirectAddr;
-
@Resource
private IPasswordFreeLoginService passwordFreeLoginService;
@PostMapping("/login")
- @ResponseBody
public R passwordFreeLogin(@RequestParam("userName") String username, HttpServletRequest request) {
boolean status;
try {
@@ -55,20 +50,19 @@
/**
* 鍗曠偣鐧诲綍
- * @param request
+ * @param empCode
* @return
* @throws Exception
*/
- @GetMapping("/ssoLogin")
- public String oaSsoLogin(HttpServletRequest request,HttpServletResponse response, RedirectAttributes redirectAttributes) throws IOException, ServletException {
+ @PostMapping("/ssoLogin")
+ public String oaSsoLogin(String empCode){
String token;
try {
- token = passwordFreeLoginService.ssoFreeLogin(request);
+ token = passwordFreeLoginService.ssoFreeLogin(empCode);
}catch (Exception e){
throw new ServiceException("鍗曠偣鐧诲綍鑾峰彇token澶辫触:"+e.getMessage());
}
- redirectAttributes.addFlashAttribute("tokenInfo",token);
- return "redirect:"+ssoRedirectAddr;
+ return token;
}
}
--
Gitblit v1.9.3