From 7d55f35e2aaa689ef4a02ec811f3ac7dbeeb59d2 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 13 七月 2020 19:39:10 +0800
Subject: [PATCH] 优化采购
---
service-front/src/main/java/com/java110/front/controller/app/AppController.java | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/rest/RestFrontApi.java b/service-front/src/main/java/com/java110/front/controller/app/AppController.java
similarity index 94%
rename from service-front/src/main/java/com/java110/front/rest/RestFrontApi.java
rename to service-front/src/main/java/com/java110/front/controller/app/AppController.java
index fc492f3..264d67b 100644
--- a/service-front/src/main/java/com/java110/front/rest/RestFrontApi.java
+++ b/service-front/src/main/java/com/java110/front/controller/app/AppController.java
@@ -1,10 +1,9 @@
-package com.java110.front.rest;
+package com.java110.front.controller.app;
import com.alibaba.fastjson.JSONObject;
-import com.java110.front.smo.api.IApiSMO;
import com.java110.core.base.controller.BaseController;
+import com.java110.front.smo.api.IApiSMO;
import com.java110.utils.constant.CommonConstant;
-import com.java110.vo.ResultVo;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
@@ -29,17 +28,17 @@
*/
@RestController
@RequestMapping(path = "/app")
-public class RestFrontApi extends BaseController {
- private final static Logger logger = LoggerFactory.getLogger(RestFrontApi.class);
+public class AppController extends BaseController {
+ private final static Logger logger = LoggerFactory.getLogger(AppController.class);
@Autowired
private IApiSMO apiSMOImpl;
/**
* 璧勬簮璇锋眰 post鏂瑰紡
- *
+ * <p>
* /app/user.listUser
- *
+ * <p>
* /api/user.listUser
*
* @param service 璇锋眰鎺ュ彛鏂瑰紡
@@ -61,7 +60,7 @@
headers.put(CommonConstant.HTTP_SERVICE, service);
headers.put(CommonConstant.HTTP_METHOD, CommonConstant.HTTP_METHOD_POST);
logger.debug("api锛歿} 璇锋眰鎶ユ枃涓猴細{},header淇℃伅涓猴細{}", service, postInfo, headers);
- responseEntity = apiSMOImpl.doApi(postInfo, headers);
+ responseEntity = apiSMOImpl.doApi(postInfo, headers, request);
} catch (Throwable e) {
logger.error("璇锋眰post 鏂规硶[" + service + "]澶辫触锛�" + postInfo, e);
responseEntity = new ResponseEntity<String>("璇锋眰鍙戠敓寮傚父锛�" + e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
@@ -91,7 +90,7 @@
headers.put(CommonConstant.HTTP_SERVICE, service);
headers.put(CommonConstant.HTTP_METHOD, CommonConstant.HTTP_METHOD_GET);
logger.debug("api锛歿} 璇锋眰鎶ユ枃涓猴細{},header淇℃伅涓猴細{}", "", headers);
- responseEntity = apiSMOImpl.doApi(JSONObject.toJSONString(getParameterStringMap(request)), headers);
+ responseEntity = apiSMOImpl.doApi(JSONObject.toJSONString(getParameterStringMap(request)), headers, request);
} catch (Throwable e) {
logger.error("璇锋眰get 鏂规硶[" + service + "]澶辫触锛�", e);
responseEntity = new ResponseEntity<String>("璇锋眰鍙戠敓寮傚父锛�" + e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
@@ -124,7 +123,7 @@
headers.put(CommonConstant.HTTP_ACTION, action);
headers.put(CommonConstant.HTTP_METHOD, CommonConstant.HTTP_METHOD_GET);
logger.debug("api锛歿} 璇锋眰鎶ユ枃涓猴細{},header淇℃伅涓猴細{}", "", headers);
- responseEntity = apiSMOImpl.doApi(JSONObject.toJSONString(getParameterStringMap(request)), headers);
+ responseEntity = apiSMOImpl.doApi(JSONObject.toJSONString(getParameterStringMap(request)), headers, request);
} catch (Throwable e) {
logger.error("璇锋眰get 鏂规硶[" + action + "]澶辫触锛�", e);
responseEntity = new ResponseEntity<String>("璇锋眰鍙戠敓寮傚父锛�" + e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
@@ -159,7 +158,7 @@
headers.put(CommonConstant.HTTP_ACTION, action);
headers.put(CommonConstant.HTTP_METHOD, CommonConstant.HTTP_METHOD_POST);
logger.debug("api锛歿} 璇锋眰鎶ユ枃涓猴細{},header淇℃伅涓猴細{}", action, postInfo, headers);
- responseEntity = apiSMOImpl.doApi(postInfo, headers);
+ responseEntity = apiSMOImpl.doApi(postInfo, headers, request);
} catch (Throwable e) {
logger.error("璇锋眰post 鏂规硶[" + action + "]澶辫触锛�" + postInfo, e);
responseEntity = new ResponseEntity<String>("璇锋眰鍙戠敓寮傚父锛�" + e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
@@ -191,7 +190,7 @@
headers.put(CommonConstant.HTTP_SERVICE, service);
headers.put(CommonConstant.HTTP_METHOD, CommonConstant.HTTP_METHOD_PUT);
logger.debug("api锛歿} 璇锋眰鎶ユ枃涓猴細{},header淇℃伅涓猴細{}", service, postInfo, headers);
- responseEntity = apiSMOImpl.doApi(postInfo, headers);
+ responseEntity = apiSMOImpl.doApi(postInfo, headers, request);
} catch (Throwable e) {
logger.error("璇锋眰put 鏂规硶[" + service + "]澶辫触锛�", e);
responseEntity = new ResponseEntity<String>("璇锋眰鍙戠敓寮傚父锛�" + e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
@@ -221,7 +220,7 @@
headers.put(CommonConstant.HTTP_METHOD, CommonConstant.HTTP_METHOD_DELETE);
logger.debug("api锛歿} 璇锋眰鎶ユ枃涓猴細{},header淇℃伅涓猴細{}", service, "", headers);
- responseEntity = apiSMOImpl.doApi(JSONObject.toJSONString(getParameterStringMap(request)), headers);
+ responseEntity = apiSMOImpl.doApi(JSONObject.toJSONString(getParameterStringMap(request)), headers, request);
} catch (Throwable e) {
logger.error("璇锋眰delete 鏂规硶[" + service + "]澶辫触锛�", e);
responseEntity = new ResponseEntity<String>("璇锋眰鍙戠敓寮傚父锛�" + e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
@@ -261,7 +260,7 @@
for (String key : claims.keySet()) {
- if("userId".equals(key)){
+ if ("userId".equals(key)) {
headers.put("user_id", claims.get(key));
}
headers.put(key, claims.get(key));
--
Gitblit v1.8.0