From 52ffefd06e59cbd56c1a919972866592379cfed2 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 21 九月 2023 11:27:11 +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 | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 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 7b4157f..d0cd358 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
@@ -2,10 +2,18 @@
import com.vci.ubcs.code.service.IPasswordFreeLoginService;
import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.tool.api.R;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import static com.vci.ubcs.starter.util.AESUtils.aesDecrypt;
+import static com.vci.ubcs.starter.util.AESUtils.aesEncrypt;
/**
* @author ludc
@@ -14,18 +22,40 @@
@RestController
@RequestMapping("/passwordFree")
@Api(value = "鍏嶅瘑鐧诲綍鎺ュ彛", tags = "鍏嶅瘑鐧诲綍鎺ュ彛")
+@Slf4j
public class PasswordFreeLoginController {
@Resource
private IPasswordFreeLoginService passwordFreeLoginService;
@PostMapping("/login")
- public R passwordFreeLogin(@RequestParam String username) {
- boolean resBoolean = passwordFreeLoginService.passwordFreeLogin(username);
- return R.status(resBoolean);
+ public R passwordFreeLogin(@RequestParam("userName") String username, HttpServletRequest request) {
+ boolean status;
+ try {
+ status = passwordFreeLoginService.pwdFreeLoginByBoolean(username,request);
+ }catch (Exception e){
+ throw new ServiceException("鍏嶅瘑鐧诲綍鑾峰彇token澶辫触锛�"+e.getMessage());
+ }
+ return R.status(status);
}
-
-
+ /**
+ * 鍗曠偣鐧诲綍
+ * @param request
+ * @return
+ * @throws Exception
+ */
+ @GetMapping("/ssoLogin")
+ public ModelAndView oaSsoLogin(HttpServletRequest request, ModelAndView model){
+ String token;
+ try {
+ token = passwordFreeLoginService.ssoFreeLogin(request);
+ }catch (Exception e){
+ throw new ServiceException("鍗曠偣鐧诲綍鑾峰彇token澶辫触:"+e.getMessage());
+ }
+ model.addObject("token",token);
+ model.setViewName("sso");
+ return model;
+ }
}
--
Gitblit v1.9.3