From 6a9605d7e333d4af8ba89f9b3b1c2f8332289587 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期一, 18 九月 2023 10:33:05 +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 |    8 ++++----
 1 files changed, 4 insertions(+), 4 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 8ca959b..0d10fee 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
@@ -22,14 +22,14 @@
 	private IPasswordFreeLoginService passwordFreeLoginService;
 
 	@PostMapping("/login")
-	public String passwordFreeLogin(@RequestParam String username, HttpServletRequest request) {
-		String token = "";
+	public R passwordFreeLogin(@RequestParam String username, HttpServletRequest request) {
+		boolean status;
 		try {
-			token = passwordFreeLoginService.passwordFreeLogin(username,request);
+			status = passwordFreeLoginService.passwordFreeLogin(username,request);
 		}catch (Exception e){
 			throw new ServiceException("鍏嶅瘑鐧诲綍鑾峰彇token澶辫触锛�"+e.getMessage());
 		}
-		return token;
+		return R.status(status);
 	}
 
 }

--
Gitblit v1.9.3