From 7324a4e5ae8e0c7039896a14370bf6844ad17462 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 21 九月 2023 11:36:54 +0800
Subject: [PATCH] 代码提交
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java | 26 +++++++++++++++++++-------
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java | 9 +++++----
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/PasswordFreeLoginController.java | 23 ++++++++++++++++++-----
3 files changed, 42 insertions(+), 16 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java
index b82489f..be849ff 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java
@@ -48,9 +48,7 @@
public String applyCode(@RequestParam("dataString")String dataString, @RequestParam("dataType")String dataType, HttpServletRequest request) {
String result="";
try {
- ThreadLocal<HttpServletRequest> threadLocal = new ThreadLocal<>();
- threadLocal.set(request);
- universalInterfaceI.setThreadLocal(threadLocal);
+ this.setHttpToThreadLocal(request);
result = universalInterfaceI.applyCode(dataString, dataType);
}catch (Throwable e){
e.printStackTrace();
@@ -67,9 +65,10 @@
* @throws Throwable
*/
@PostMapping("/syncData")
- public String syncData(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType) {
+ public String syncData(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType, HttpServletRequest request) {
String result="";
try {
+ this.setHttpToThreadLocal(request);
result= universalInterfaceI.syncEditData(dataString,dataType);
}catch (Throwable e){
e.printStackTrace();;
@@ -86,9 +85,10 @@
* @throws Throwable
*/
@PostMapping("/queryClassify")
- public String queryClassify(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType) throws Throwable {
+ public String queryClassify(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType, HttpServletRequest request) throws Throwable {
String result="";
try {
+ this.setHttpToThreadLocal(request);
result = universalInterfaceI.queryClassify(dataString, dataType);
}catch (Throwable e){
e.printStackTrace();
@@ -105,9 +105,10 @@
* @throws Throwable
*/
@PostMapping("/queryData")
- public String queryData(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType) throws Throwable {
+ public String queryData(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType, HttpServletRequest request) throws Throwable {
String result="";
try {
+ this.setHttpToThreadLocal(request);
result= universalInterfaceI.queryData(dataString,dataType);
}catch (Throwable e){
e.printStackTrace();
@@ -124,9 +125,10 @@
* @throws Throwable
*/
@PostMapping("/queryClassifyRule")
- public String queryClassifyRule(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType) throws Throwable {
+ public String queryClassifyRule(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType, HttpServletRequest request) throws Throwable {
String result="";
try {
+ this.setHttpToThreadLocal(request);
result= universalInterfaceI.queryClassifyRule(dataString,dataType);
}catch (Throwable e){
e.printStackTrace();
@@ -135,4 +137,14 @@
return result;
}
+ /**
+ * 璁剧疆request锛屽埌ThreadLocal涓�
+ * @param request
+ */
+ public void setHttpToThreadLocal(HttpServletRequest request){
+ ThreadLocal<HttpServletRequest> threadLocal = new ThreadLocal<>();
+ threadLocal.set(request);
+ universalInterfaceI.setThreadLocal(threadLocal);
+ }
+
}
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 d0cd358..5cb6929 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
@@ -5,12 +5,17 @@
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.tool.api.R;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
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 java.io.IOException;
import static com.vci.ubcs.starter.util.AESUtils.aesDecrypt;
import static com.vci.ubcs.starter.util.AESUtils.aesEncrypt;
@@ -19,16 +24,21 @@
* @author ludc
* @date 2023/9/12 9:07
*/
-@RestController
+@Controller
@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 {
@@ -46,16 +56,19 @@
* @throws Exception
*/
@GetMapping("/ssoLogin")
- public ModelAndView oaSsoLogin(HttpServletRequest request, ModelAndView model){
+ public String oaSsoLogin(HttpServletRequest request) throws IOException {
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;
+// response.setHeader("tokenInfo",token);
+// response.setCharacterEncoding("utf-8");
+// response.setContentType("application/json");
+ request.setAttribute("tokenInfo",token);
+ //response.sendRedirect(ssoRedirectAddr);
+ return "forward:/sso";
}
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java
index 752bf91..5efd2d9 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java
@@ -168,10 +168,11 @@
@Override
public String ssoFreeLogin(ServletRequest servletRequest) throws Exception {
HttpServletRequest request = (HttpServletRequest) servletRequest;
- String content = request.getHeader("empCode");
- if(Func.isBlank(content)){
- throw new ServiceException("鏈幏鍙栧埌empCode鍙傛暟");
- }
+// String content = request.getHeader("empCode");
+ String content = "test";
+// if(Func.isBlank(content)){
+// throw new ServiceException("鏈幏鍙栧埌empCode鍙傛暟");
+// }
//鍔犲瘑
String str1 = aesEncrypt(content, clientId);
String str2 = aesEncrypt(str1, secretKey);
--
Gitblit v1.9.3