From 4cf1a8984c27fd4449fa6149a7374dcfff5cf361 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 21 九月 2023 11:40:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java | 26 +++++++-------------------
1 files changed, 7 insertions(+), 19 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 be849ff..b82489f 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,7 +48,9 @@
public String applyCode(@RequestParam("dataString")String dataString, @RequestParam("dataType")String dataType, HttpServletRequest request) {
String result="";
try {
- this.setHttpToThreadLocal(request);
+ ThreadLocal<HttpServletRequest> threadLocal = new ThreadLocal<>();
+ threadLocal.set(request);
+ universalInterfaceI.setThreadLocal(threadLocal);
result = universalInterfaceI.applyCode(dataString, dataType);
}catch (Throwable e){
e.printStackTrace();
@@ -65,10 +67,9 @@
* @throws Throwable
*/
@PostMapping("/syncData")
- public String syncData(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType, HttpServletRequest request) {
+ public String syncData(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType) {
String result="";
try {
- this.setHttpToThreadLocal(request);
result= universalInterfaceI.syncEditData(dataString,dataType);
}catch (Throwable e){
e.printStackTrace();;
@@ -85,10 +86,9 @@
* @throws Throwable
*/
@PostMapping("/queryClassify")
- public String queryClassify(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType, HttpServletRequest request) throws Throwable {
+ public String queryClassify(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType) throws Throwable {
String result="";
try {
- this.setHttpToThreadLocal(request);
result = universalInterfaceI.queryClassify(dataString, dataType);
}catch (Throwable e){
e.printStackTrace();
@@ -105,10 +105,9 @@
* @throws Throwable
*/
@PostMapping("/queryData")
- public String queryData(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType, HttpServletRequest request) throws Throwable {
+ public String queryData(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType) throws Throwable {
String result="";
try {
- this.setHttpToThreadLocal(request);
result= universalInterfaceI.queryData(dataString,dataType);
}catch (Throwable e){
e.printStackTrace();
@@ -125,26 +124,15 @@
* @throws Throwable
*/
@PostMapping("/queryClassifyRule")
- public String queryClassifyRule(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType, HttpServletRequest request) throws Throwable {
+ public String queryClassifyRule(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType) throws Throwable {
String result="";
try {
- this.setHttpToThreadLocal(request);
result= universalInterfaceI.queryClassifyRule(dataString,dataType);
}catch (Throwable e){
e.printStackTrace();
logger.error("queryData->"+e.getMessage());
}
return result;
- }
-
- /**
- * 璁剧疆request锛屽埌ThreadLocal涓�
- * @param request
- */
- public void setHttpToThreadLocal(HttpServletRequest request){
- ThreadLocal<HttpServletRequest> threadLocal = new ThreadLocal<>();
- threadLocal.set(request);
- universalInterfaceI.setThreadLocal(threadLocal);
}
}
--
Gitblit v1.9.3