From a216d2503641b1d2ae6d4a2defa870470f2737bb Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 18 九月 2023 14:14:52 +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 | 30 +++++++++---------------------
1 files changed, 9 insertions(+), 21 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 3026afe..61bc9e2 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
@@ -1,7 +1,6 @@
package com.vci.ubcs.code.controller;
import com.vci.ubcs.code.service.UniversalInterfaceI;
-import com.vci.ubcs.code.vo.webserviceModel.PersonData;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springblade.core.tool.api.R;
@@ -10,6 +9,10 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.core.Context;
/**
* 涓婚搴撳垎绫绘帶鍒跺櫒
@@ -20,15 +23,18 @@
@RestController
@RequestMapping("/codeSyncUniversalController")
public class CodeSyncUniversalController {
+
/**
* 鏃ュ織
*/
private Logger logger = LoggerFactory.getLogger(getClass());
+
/**
* 鎺ュ彛闆嗘垚鏈嶅姟
*/
@Autowired
private UniversalInterfaceI universalInterfaceI;
+
/****
* 鐢宠鎺ュ彛
* @param dataString 灞炴�т俊鎭�
@@ -37,8 +43,9 @@
* @throws Throwable
*/
@PostMapping("/applyCode")
- public String applyCode(@RequestParam("dataString")String dataString, @RequestParam("dataType")String dataType) {
+ public String applyCode(@RequestParam("dataString")String dataString, @RequestParam("dataType")String dataType, ServletRequest request) {
String result="";
+ HttpServletRequest httpServletRequest = (HttpServletRequest) request;
try {
result = universalInterfaceI.applyCode(dataString, dataType);
}catch (Throwable e){
@@ -46,24 +53,6 @@
logger.error("applyCode->"+e.getMessage());
}
return result;
- }
-
- /****
- * 鐢宠鎺ュ彛
- * @param personData 鐢宠
- * @return
- * @throws Throwable
- */
- @PostMapping("/applyCodeForPerson")
- public R applyCodeForPerson(@RequestParam PersonData personData) {
- String result="";
- try {
- return universalInterfaceI.applyCodeForPerson(personData);
- }catch (Throwable e){
- e.printStackTrace();
- logger.error("applyCodeForPerson->"+e.getMessage());
- return R.fail("applyCodeForPerson->"+e.getMessage());
- }
}
/****
@@ -84,7 +73,6 @@
}
return result;
}
-
/****
* 鏌ヨ鍒嗙被鍙�
--
Gitblit v1.9.3