From 1bbe531a58371ca8f9f2eff05a2cc03f1975b80b Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 06 十二月 2023 17:20:57 +0800
Subject: [PATCH] 集团码导入功能开发

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/PasswordFreeLoginController.java |   26 ++++++++++----------------
 1 files changed, 10 insertions(+), 16 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..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
@@ -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,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 {
@@ -51,24 +50,19 @@
 
 	/**
 	 * 鍗曠偣鐧诲綍
-	 * @param request
+	 * @param empCode
 	 * @return
 	 * @throws Exception
 	 */
-	@GetMapping("/ssoLogin")
-	public String oaSsoLogin(HttpServletRequest request) throws IOException {
+	@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());
 		}
-//		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