From 4ed693f48d1435de7a6333df17c2b34154731429 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 05 七月 2023 22:26:27 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/rest/RestApi.java | 167 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 154 insertions(+), 13 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/rest/RestApi.java b/service-api/src/main/java/com/java110/api/rest/RestApi.java
old mode 100644
new mode 100755
index 9a81498..6f2113d
--- a/service-api/src/main/java/com/java110/api/rest/RestApi.java
+++ b/service-api/src/main/java/com/java110/api/rest/RestApi.java
@@ -2,14 +2,16 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.api.smo.IApiServiceSMO;
-import com.java110.utils.constant.CommonConstant;
import com.java110.core.base.controller.BaseController;
-import com.java110.core.smo.user.IUserInnerServiceSMO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
+import com.java110.core.log.LoggerFactory;
+import com.java110.doc.annotation.Java110ApiDoc;
+import com.java110.doc.annotation.Java110RequestMappingDoc;
+import com.java110.doc.annotation.Java110RequestMappingsDoc;
+import com.java110.intf.user.IUserInnerServiceSMO;
+import com.java110.utils.constant.CommonConstant;
+import com.java110.vo.ResultVo;
+import io.swagger.annotations.*;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -30,14 +32,36 @@
@RestController
@RequestMapping(path = "/api")
@Api(value = "瀵瑰缁熶竴鎻愪緵鏈嶅姟鎺ュ彛鏈嶅姟")
+@Java110ApiDoc(
+ title = "HC灏忓尯绠＄悊绯荤粺api鎺ュ彛鏂囨。",
+ description = "HC灏忓尯绠＄悊绯荤粺api鎺ュ彛鏂囨。",
+ company="Java110宸ヤ綔瀹�",
+ version = "v1.4"
+)
+
+@Java110RequestMappingsDoc(
+ mappingsDocs = {
+ @Java110RequestMappingDoc(name="鐢ㄦ埛涓績",resource = "userDoc",url="http://user-service",seq = 1),
+ @Java110RequestMappingDoc(name="璧勪骇涓績",resource = "communityDoc",url="http://community-service",seq = 2),
+ @Java110RequestMappingDoc(name="鍟嗘埛涓績",resource = "storeDoc",url="http://store-service",seq = 3),
+ @Java110RequestMappingDoc(name="璐︽埛涓績",resource = "acctDoc",url="http://acct-service",seq = 4),
+ @Java110RequestMappingDoc(name="閫氱敤涓績",resource = "commonDoc",url="http://common-service",seq = 5),
+ @Java110RequestMappingDoc(name="璐圭敤涓績",resource = "feeDoc",url="http://fee-service",seq = 6),
+ @Java110RequestMappingDoc(name="鎶ヨ〃涓績",resource = "reportDoc",url="http://report-service",seq = 7),
+ }
+)
public class RestApi extends BaseController {
private static Logger logger = LoggerFactory.getLogger(RestApi.class);
+ private static final String VERSION = "version";
+ private static final String VERSION_2 = "2.0";
@Autowired
private IApiServiceSMO apiServiceSMOImpl;
@Autowired
private IUserInnerServiceSMO userInnerServiceSMOImpl;
+
+
/**
* 鍋ュ悍妫�鏌� 鏈嶅姟
@@ -70,7 +94,6 @@
* @param request 璇锋眰瀵硅薄 鏌ヨ澶翠俊鎭� url绛変俊鎭�
* @return http status 200 鎴愬姛 鍏朵粬澶辫触
*/
-
@RequestMapping(path = "/{service:.+}", method = RequestMethod.POST)
@ApiOperation(value = "璧勬簮post璇锋眰", notes = "test: 杩斿洖 2XX 琛ㄧず鏈嶅姟姝ｅ父")
@ApiImplicitParam(paramType = "query", name = "service", value = "鐢ㄦ埛缂栧彿", required = true, dataType = "String")
@@ -78,8 +101,9 @@
@RequestBody String postInfo,
HttpServletRequest request) {
ResponseEntity<String> responseEntity = null;
+ Map<String, String> headers = new HashMap<String, String>();
try {
- Map<String, String> headers = new HashMap<String, String>();
+
this.getRequestInfo(request, headers);
headers.put(CommonConstant.HTTP_SERVICE, service);
headers.put(CommonConstant.HTTP_METHOD, CommonConstant.HTTP_METHOD_POST);
@@ -90,7 +114,13 @@
responseEntity = new ResponseEntity<String>("璇锋眰鍙戠敓寮傚父锛�" + e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
}
logger.debug("api锛歿} 杩斿洖淇℃伅涓猴細{}", service, responseEntity);
-
+ if (responseEntity.getStatusCode() == HttpStatus.OK) {
+ return responseEntity;
+ }
+ //褰� 鎺ュ彛鐗堟湰鍙蜂负2.0鏃� 杩斿洖閿欒澶勭悊
+ if (headers.containsKey(VERSION) && VERSION_2.equals(headers.get(VERSION))) {
+ return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, responseEntity.getBody());
+ }
return responseEntity;
}
@@ -108,18 +138,26 @@
public ResponseEntity<String> serviceGet(@PathVariable String service,
HttpServletRequest request) {
ResponseEntity<String> responseEntity = null;
+ Map<String, String> headers = new HashMap<String, String>();
try {
- Map<String, String> headers = new HashMap<String, String>();
this.getRequestInfo(request, headers);
headers.put(CommonConstant.HTTP_SERVICE, service);
headers.put(CommonConstant.HTTP_METHOD, CommonConstant.HTTP_METHOD_GET);
- logger.debug("api锛歿} 璇锋眰鎶ユ枃涓猴細{},header淇℃伅涓猴細{}", "", headers);
+ logger.debug("api锛歿} 璇锋眰鎶ユ枃涓猴細{},header淇℃伅涓猴細{}", service, headers);
responseEntity = apiServiceSMOImpl.service(JSONObject.toJSONString(getParameterStringMap(request)), headers);
} catch (Throwable e) {
logger.error("璇锋眰get 鏂规硶[" + service + "]澶辫触锛�", e);
responseEntity = new ResponseEntity<String>("璇锋眰鍙戠敓寮傚父锛�" + e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
}
logger.debug("api锛歿} 杩斿洖淇℃伅涓猴細{}", service, responseEntity);
+
+ if (responseEntity.getStatusCode() == HttpStatus.OK) {
+ return responseEntity;
+ }
+ //褰� 鎺ュ彛鐗堟湰鍙蜂负2.0鏃� 杩斿洖閿欒澶勭悊
+ if (headers.containsKey(VERSION) && VERSION_2.equals(headers.get(VERSION))) {
+ return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, responseEntity.getBody());
+ }
return responseEntity;
}
@@ -140,8 +178,9 @@
@RequestBody String postInfo,
HttpServletRequest request) {
ResponseEntity<String> responseEntity = null;
+ Map<String, String> headers = new HashMap<String, String>();
try {
- Map<String, String> headers = new HashMap<String, String>();
+
this.getRequestInfo(request, headers);
headers.put(CommonConstant.HTTP_SERVICE, service);
headers.put(CommonConstant.HTTP_METHOD, CommonConstant.HTTP_METHOD_PUT);
@@ -152,6 +191,14 @@
responseEntity = new ResponseEntity<String>("璇锋眰鍙戠敓寮傚父锛�" + e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
}
logger.debug("api锛歿} 杩斿洖淇℃伅涓猴細{}", service, responseEntity);
+ if (responseEntity.getStatusCode() == HttpStatus.OK) {
+ return responseEntity;
+ }
+ //褰� 鎺ュ彛鐗堟湰鍙蜂负2.0鏃� 杩斿洖閿欒澶勭悊
+ if (headers.containsKey(VERSION) && VERSION_2.equals(headers.get(VERSION))) {
+ return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, responseEntity.getBody());
+ }
+
return responseEntity;
}
@@ -169,8 +216,9 @@
public ResponseEntity<String> serviceDelete(@PathVariable String service,
HttpServletRequest request) {
ResponseEntity<String> responseEntity = null;
+ Map<String, String> headers = new HashMap<String, String>();
try {
- Map<String, String> headers = new HashMap<String, String>();
+
this.getRequestInfo(request, headers);
headers.put(CommonConstant.HTTP_SERVICE, service);
headers.put(CommonConstant.HTTP_METHOD, CommonConstant.HTTP_METHOD_DELETE);
@@ -183,6 +231,13 @@
}
logger.debug("api锛歿} 杩斿洖淇℃伅涓猴細{}", service, responseEntity);
+ if (responseEntity.getStatusCode() == HttpStatus.OK) {
+ return responseEntity;
+ }
+ //褰� 鎺ュ彛鐗堟湰鍙蜂负2.0鏃� 杩斿洖閿欒澶勭悊
+ if (headers.containsKey(VERSION) && VERSION_2.equals(headers.get(VERSION))) {
+ return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, responseEntity.getBody());
+ }
return responseEntity;
}
@@ -205,6 +260,92 @@
}
+ /**
+ * 璧勬簮璇锋眰 post鏂瑰紡
+ *
+ * @param resource 璇锋眰鎺ュ彛鏂瑰紡
+ * @param postInfo post鍐呭
+ * @param request 璇锋眰瀵硅薄 鏌ヨ澶翠俊鎭� url绛変俊鎭�
+ * @return http status 200 鎴愬姛 鍏朵粬澶辫触
+ */
+ @RequestMapping(path = "/{resource}/{action}", method = RequestMethod.POST)
+ @ApiOperation(value = "璧勬簮post璇锋眰", notes = "test: 杩斿洖 2XX 琛ㄧず鏈嶅姟姝ｅ父")
+ @ApiImplicitParam(paramType = "query", name = "subServicePost", value = "鐢ㄦ埛缂栧彿", required = true, dataType = "String")
+ public ResponseEntity<String> subServicePost(
+ @PathVariable String resource,
+ @PathVariable String action,
+ @RequestBody String postInfo,
+ HttpServletRequest request) {
+ ResponseEntity<String> responseEntity = null;
+ Map<String, String> headers = new HashMap<String, String>();
+ try {
+ this.getRequestInfo(request, headers);
+ headers.put(CommonConstant.HTTP_SERVICE, "/" + resource + "/" + action);
+ headers.put(CommonConstant.HTTP_RESOURCE, resource);
+ headers.put(CommonConstant.HTTP_ACTION, action);
+ headers.put(CommonConstant.HTTP_METHOD, CommonConstant.HTTP_METHOD_POST);
+ logger.debug("api锛歿} 璇锋眰鎶ユ枃涓猴細{},header淇℃伅涓猴細{}", action, postInfo, headers);
+ responseEntity = apiServiceSMOImpl.service(postInfo, headers);
+ } catch (Throwable e) {
+ logger.error("璇锋眰post 鏂规硶[" + action + "]澶辫触锛�" + postInfo, e);
+ responseEntity = new ResponseEntity<String>("璇锋眰鍙戠敓寮傚父锛�" + e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ logger.debug("api锛歿} 杩斿洖淇℃伅涓猴細{}", action, responseEntity);
+ if (responseEntity.getStatusCode() == HttpStatus.OK) {
+ return responseEntity;
+ }
+ //褰� 鎺ュ彛鐗堟湰鍙蜂负2.0鏃� 杩斿洖閿欒澶勭悊
+ if (headers.containsKey(VERSION) && VERSION_2.equals(headers.get(VERSION))) {
+ return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, responseEntity.getBody());
+ }
+ return responseEntity;
+ }
+
+ /**
+ * 璧勬簮璇锋眰 get鏂瑰紡
+ *
+ * @param request 璇锋眰瀵硅薄 鏌ヨ澶翠俊鎭� url绛変俊鎭�
+ * @return http status 200 鎴愬姛 鍏朵粬澶辫触
+ */
+
+ @RequestMapping(path = "/{resource}/{action}", method = RequestMethod.GET)
+ @ApiOperation(value = "璧勬簮get璇锋眰", notes = "test: 杩斿洖 2XX 琛ㄧず鏈嶅姟姝ｅ父")
+ @ApiImplicitParam(paramType = "query", name = "subServiceGet", value = "鐢ㄦ埛缂栧彿", required = true, dataType = "String")
+ public ResponseEntity<String> subServiceGet(
+ @PathVariable String resource,
+ @PathVariable String action,
+ HttpServletRequest request) {
+ ResponseEntity<String> responseEntity = null;
+ Map<String, String> headers = new HashMap<String, String>();
+ try {
+ this.getRequestInfo(request, headers);
+ headers.put(CommonConstant.HTTP_SERVICE, "/" + resource + "/" + action);
+ headers.put(CommonConstant.HTTP_RESOURCE, resource);
+ headers.put(CommonConstant.HTTP_ACTION, action);
+ headers.put(CommonConstant.HTTP_METHOD, CommonConstant.HTTP_METHOD_GET);
+ logger.debug("api锛歿} 璇锋眰鎶ユ枃涓猴細{},header淇℃伅涓猴細{}", "", headers);
+ responseEntity = apiServiceSMOImpl.service(JSONObject.toJSONString(getParameterStringMap(request)), headers);
+ } catch (Throwable e) {
+ logger.error("璇锋眰get 鏂规硶[" + action + "]澶辫触锛�", e);
+ responseEntity = new ResponseEntity<String>("璇锋眰鍙戠敓寮傚父锛�" + e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ logger.debug("api锛歿} 杩斿洖淇℃伅涓猴細{}", action, responseEntity);
+
+ if (responseEntity.getStatusCode() == HttpStatus.OK) {
+ return responseEntity;
+ }
+ //褰� 鎺ュ彛鐗堟湰鍙蜂负2.0鏃� 杩斿洖閿欒澶勭悊
+ if (headers.containsKey(VERSION) && VERSION_2.equals(headers.get(VERSION))) {
+ return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, responseEntity.getBody());
+ }
+
+ return responseEntity;
+ }
+
+
+
+
+
public IApiServiceSMO getApiServiceSMOImpl() {
return apiServiceSMOImpl;
}
--
Gitblit v1.8.0