From e41ba809d6c587da02618adcb06f2106501ef249 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期一, 25 九月 2023 09:53:41 +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 |   42 ++++++++++++++++++++++++++++++++----------
 1 files changed, 32 insertions(+), 10 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..2583652 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,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 {
@@ -55,20 +56,41 @@
 
 	/**
 	 * 鍗曠偣鐧诲綍
-	 * @param request
+	 * @param empCode
 	 * @return
 	 * @throws Exception
 	 */
 	@GetMapping("/ssoLogin")
-	public String oaSsoLogin(HttpServletRequest request,HttpServletResponse response, RedirectAttributes redirectAttributes) throws IOException, ServletException {
+	public String oaSsoLogin(@RequestParam("empCode") 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;
+	}
+
+	/**
+	 * 鍗曠偣鐧诲綍
+	 * @param empCode
+	 * @return
+	 * @throws Exception
+	 */
+	@GetMapping("/test")
+	public String test(@RequestParam("empCode") String empCode){
+		String enStr2;
+		try {
+			// 鍔犲瘑
+			String pwdfree = aesEncrypt("pwdfree", secretKey);
+			String pwdfree2 = aesEncrypt(pwdfree, clientId);
+			// 瑙e瘑
+			String enStr1 = aesDecrypt(empCode, secretKey);
+			enStr2 = aesDecrypt(enStr1, clientId);
+		}catch (Exception e){
+			throw new ServiceException("鍗曠偣鐧诲綍鑾峰彇token澶辫触:"+e.getMessage());
+		}
+		return enStr2;
 	}
 
 }

--
Gitblit v1.9.3