From a8894e0347bbabe6d4d570bafa2a166e18c66e83 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 25 九月 2023 14:52:50 +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 | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 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 5cb6929..ab96de7 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
@@ -10,10 +10,14 @@
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+import org.springframework.web.servlet.view.RedirectView;
import javax.annotation.Resource;
+import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
import java.io.IOException;
@@ -24,21 +28,22 @@
* @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;
+ @Value("${password-free.client-id:a104c4fd2f0e4958}")
+ private String clientId;//搴旂敤ID
+
+ @Value("${password-free.secret-key:9fbd170bd83eb869}")
+ private String secretKey;//搴旂敤绉橀挜
@Resource
private IPasswordFreeLoginService passwordFreeLoginService;
@PostMapping("/login")
- @ResponseBody
public R passwordFreeLogin(@RequestParam("userName") String username, HttpServletRequest request) {
boolean status;
try {
@@ -51,24 +56,19 @@
/**
* 鍗曠偣鐧诲綍
- * @param request
+ * @param empCode
* @return
* @throws Exception
*/
@GetMapping("/ssoLogin")
- public String oaSsoLogin(HttpServletRequest request) throws IOException {
+ 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());
}
-// response.setHeader("tokenInfo",token);
-// response.setCharacterEncoding("utf-8");
-// response.setContentType("application/json");
- request.setAttribute("tokenInfo",token);
- //response.sendRedirect(ssoRedirectAddr);
- return "forward:/sso";
+ return token;
}
}
--
Gitblit v1.9.3