From 74fab5598d9b28dd12db3e2991d45e4081104753 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 02 八月 2023 13:37:25 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/controller/app/AppController.java | 98 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 75 insertions(+), 23 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/controller/app/AppController.java b/service-api/src/main/java/com/java110/api/controller/app/AppController.java
index 21cbb9f..cb72564 100644
--- a/service-api/src/main/java/com/java110/api/controller/app/AppController.java
+++ b/service-api/src/main/java/com/java110/api/controller/app/AppController.java
@@ -16,14 +16,19 @@
package com.java110.api.controller.app;
import com.alibaba.fastjson.JSONObject;
+import com.java110.api.smo.IApiServiceSMO;
+import com.java110.api.smo.api.IApiSMO;
+import com.java110.api.smo.privilege.IPrivilegeSMO;
import com.java110.core.base.controller.BaseController;
import com.java110.core.context.IPageData;
-import com.java110.api.smo.api.IApiSMO;
+import com.java110.core.language.Java110Lang;
+import com.java110.core.log.LoggerFactory;
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;
-import org.slf4j.LoggerFactory;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -48,11 +53,16 @@
public class AppController extends BaseController {
private final static Logger logger = LoggerFactory.getLogger(AppController.class);
+
+
@Autowired
private IApiSMO apiSMOImpl;
@Autowired
private RestTemplate restTemplate;
+
+ @Autowired
+ private IPrivilegeSMO privilegeSMOImpl;
/**
* 璧勬簮璇锋眰 post鏂瑰紡
@@ -70,6 +80,7 @@
@RequestMapping(path = "/{service:.+}", method = RequestMethod.POST)
@ApiOperation(value = "璧勬簮post璇锋眰", notes = "test: 杩斿洖 2XX 琛ㄧず鏈嶅姟姝ｅ父")
@ApiImplicitParam(paramType = "query", name = "service", value = "鐢ㄦ埛缂栧彿", required = true, dataType = "String")
+ @Java110Lang
public ResponseEntity<String> servicePost(@PathVariable String service,
@RequestBody String postInfo,
HttpServletRequest request) {
@@ -81,15 +92,51 @@
headers.put(CommonConstant.HTTP_METHOD, CommonConstant.HTTP_METHOD_POST);
logger.debug("api锛歿} 璇锋眰鎶ユ枃涓猴細{},header淇℃伅涓猴細{}", service, postInfo, headers);
IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);
- hasPrivilege(restTemplate, pd, "/app/" + service);
- responseEntity = apiSMOImpl.doApi(postInfo, headers, request);
+ privilegeSMOImpl.hasPrivilege(restTemplate, pd, "/app/" + service);
+ responseEntity = apiSMOImpl.doApi(postInfo, headers,request);
+ //todo 鍐欏叆 token
+ wirteToken(request,pd,service,responseEntity);
} catch (Throwable e) {
logger.error("璇锋眰post 鏂规硶[" + service + "]澶辫触锛�" + postInfo, e);
- responseEntity = new ResponseEntity<String>("璇锋眰鍙戠敓寮傚父锛�" + e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+ responseEntity = ResultVo.error("璇锋眰鍙戠敓寮傚父锛�" + e.getMessage(),HttpStatus.INTERNAL_SERVER_ERROR);
}
logger.debug("api锛歿} 杩斿洖淇℃伅涓猴細{}", service, responseEntity);
return responseEntity;
+ }
+
+ /**
+ * 鍐欏叆 token
+ * @param request
+ * @param pd
+ * @param service
+ * @param responseEntity
+ */
+ private void wirteToken(HttpServletRequest request, IPageData pd, String service, ResponseEntity<String> responseEntity) {
+ String[] services = new String[]{
+ "login.accessTokenLogin"
+ };
+
+ if(responseEntity.getStatusCode() != HttpStatus.OK){
+ return;
+ }
+ boolean flag = false;
+ for(String tmpService : services){
+ if(tmpService.equals(service)){
+ flag =true;
+ }
+ }
+
+ if(!flag){
+ return;
+ }
+
+ JSONObject paramOut = JSONObject.parseObject(responseEntity.getBody());
+ if(!"0".equals(paramOut.getString("code"))){
+ return;
+ }
+ String token = paramOut.getJSONObject("data").getString("token");
+ pd.setToken(token);
}
/**
@@ -103,6 +150,7 @@
@RequestMapping(path = "/{service:.+}", method = RequestMethod.GET)
@ApiOperation(value = "璧勬簮get璇锋眰", notes = "test: 杩斿洖 2XX 琛ㄧず鏈嶅姟姝ｅ父")
@ApiImplicitParam(paramType = "query", name = "service", value = "鐢ㄦ埛缂栧彿", required = true, dataType = "String")
+ @Java110Lang
public ResponseEntity<String> serviceGet(@PathVariable String service,
HttpServletRequest request) {
ResponseEntity<String> responseEntity = null;
@@ -113,11 +161,12 @@
headers.put(CommonConstant.HTTP_METHOD, CommonConstant.HTTP_METHOD_GET);
logger.debug("api锛歿} 璇锋眰鎶ユ枃涓猴細{},header淇℃伅涓猴細{}", "", headers);
IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);
- hasPrivilege(restTemplate, pd, "/app/" + service);
+ privilegeSMOImpl.hasPrivilege(restTemplate, pd, "/app/" + service);
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);
+ responseEntity = ResultVo.error("璇锋眰鍙戠敓寮傚父锛�" + e.getMessage(),HttpStatus.INTERNAL_SERVER_ERROR);
}
logger.debug("api锛歿} 杩斿洖淇℃伅涓猴細{}", service, responseEntity);
@@ -134,6 +183,7 @@
@RequestMapping(path = "/{resource}/{action}", method = RequestMethod.GET)
@ApiOperation(value = "璧勬簮get璇锋眰", notes = "test: 杩斿洖 2XX 琛ㄧず鏈嶅姟姝ｅ父")
@ApiImplicitParam(paramType = "query", name = "subServiceGet", value = "鐢ㄦ埛缂栧彿", required = true, dataType = "String")
+ @Java110Lang
public ResponseEntity<String> subServiceGet(
@PathVariable String resource,
@PathVariable String action,
@@ -148,11 +198,12 @@
headers.put(CommonConstant.HTTP_METHOD, CommonConstant.HTTP_METHOD_GET);
logger.debug("api锛歿} 璇锋眰鎶ユ枃涓猴細{},header淇℃伅涓猴細{}", "", headers);
IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);
- hasPrivilege(restTemplate, pd, "/app/" + resource + "/" + action);
+ privilegeSMOImpl.hasPrivilege(restTemplate, pd, "/app/" + resource + "/" + action);
responseEntity = apiSMOImpl.doApi(JSONObject.toJSONString(getParameterStringMap(request)), headers, request);
+ //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);
+ responseEntity = ResultVo.error("璇锋眰鍙戠敓寮傚父锛�" + e.getMessage(),HttpStatus.INTERNAL_SERVER_ERROR);
}
logger.debug("api锛歿} 杩斿洖淇℃伅涓猴細{}", action, responseEntity);
@@ -170,6 +221,7 @@
@RequestMapping(path = "/{resource}/{action}", method = RequestMethod.POST)
@ApiOperation(value = "璧勬簮post璇锋眰", notes = "test: 杩斿洖 2XX 琛ㄧず鏈嶅姟姝ｅ父")
@ApiImplicitParam(paramType = "query", name = "subServicePost", value = "鐢ㄦ埛缂栧彿", required = true, dataType = "String")
+ @Java110Lang
public ResponseEntity<String> subServicePost(
@PathVariable String resource,
@PathVariable String action,
@@ -185,11 +237,12 @@
headers.put(CommonConstant.HTTP_METHOD, CommonConstant.HTTP_METHOD_POST);
logger.debug("api锛歿} 璇锋眰鎶ユ枃涓猴細{},header淇℃伅涓猴細{}", action, postInfo, headers);
IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);
- hasPrivilege(restTemplate, pd, "/app/" + resource + "/" + action);
+ privilegeSMOImpl.hasPrivilege(restTemplate, pd, "/app/" + resource + "/" + action);
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);
+ responseEntity = ResultVo.error("璇锋眰鍙戠敓寮傚父锛�" + e.getMessage(),HttpStatus.INTERNAL_SERVER_ERROR);
}
logger.debug("api锛歿} 杩斿洖淇℃伅涓猴細{}", action, responseEntity);
@@ -208,6 +261,7 @@
@RequestMapping(path = "/{service:.+}", method = RequestMethod.PUT)
@ApiOperation(value = "璧勬簮put璇锋眰", notes = "test: 杩斿洖 2XX 琛ㄧず鏈嶅姟姝ｅ父")
@ApiImplicitParam(paramType = "query", name = "service", value = "鐢ㄦ埛缂栧彿", required = true, dataType = "String")
+ @Java110Lang
public ResponseEntity<String> servicePut(@PathVariable String service,
@RequestBody String postInfo,
HttpServletRequest request) {
@@ -219,11 +273,12 @@
headers.put(CommonConstant.HTTP_METHOD, CommonConstant.HTTP_METHOD_PUT);
logger.debug("api锛歿} 璇锋眰鎶ユ枃涓猴細{},header淇℃伅涓猴細{}", service, postInfo, headers);
IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);
- hasPrivilege(restTemplate, pd, "/app/" + service );
+ privilegeSMOImpl.hasPrivilege(restTemplate, pd, "/app/" + service);
responseEntity = apiSMOImpl.doApi(postInfo, headers, request);
+ //responseEntity = apiServiceSMOImpl.service(JSONObject.toJSONString(getParameterStringMap(request)), headers);
} catch (Throwable e) {
logger.error("璇锋眰put 鏂规硶[" + service + "]澶辫触锛�", e);
- responseEntity = new ResponseEntity<String>("璇锋眰鍙戠敓寮傚父锛�" + e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+ responseEntity = ResultVo.error("璇锋眰鍙戠敓寮傚父锛�" + e.getMessage(),HttpStatus.INTERNAL_SERVER_ERROR);
}
logger.debug("api锛歿} 杩斿洖淇℃伅涓猴細{}", service, responseEntity);
return responseEntity;
@@ -240,6 +295,7 @@
@RequestMapping(path = "/{service:.+}", method = RequestMethod.DELETE)
@ApiOperation(value = "璧勬簮delete璇锋眰", notes = "test: 杩斿洖 2XX 琛ㄧず鏈嶅姟姝ｅ父")
@ApiImplicitParam(paramType = "query", name = "service", value = "鐢ㄦ埛缂栧彿", required = true, dataType = "String")
+ @Java110Lang
public ResponseEntity<String> serviceDelete(@PathVariable String service,
HttpServletRequest request) {
ResponseEntity<String> responseEntity = null;
@@ -250,11 +306,12 @@
headers.put(CommonConstant.HTTP_METHOD, CommonConstant.HTTP_METHOD_DELETE);
logger.debug("api锛歿} 璇锋眰鎶ユ枃涓猴細{},header淇℃伅涓猴細{}", service, "", headers);
IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);
- hasPrivilege(restTemplate, pd, "/app/" + service );
+ privilegeSMOImpl.hasPrivilege(restTemplate, pd, "/app/" + service);
responseEntity = apiSMOImpl.doApi(JSONObject.toJSONString(getParameterStringMap(request)), headers, request);
+ //responseEntity = apiServiceSMOImpl.service(JSONObject.toJSONString(getParameterStringMap(request)), headers);
} catch (Throwable e) {
logger.error("璇锋眰delete 鏂规硶[" + service + "]澶辫触锛�", e);
- responseEntity = new ResponseEntity<String>("璇锋眰鍙戠敓寮傚父锛�" + e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+ responseEntity = ResultVo.error("璇锋眰鍙戠敓寮傚父锛�" + e.getMessage(),HttpStatus.INTERNAL_SERVER_ERROR);
}
logger.debug("api锛歿} 杩斿洖淇℃伅涓猴細{}", service, responseEntity);
@@ -294,15 +351,10 @@
if ("userId".equals(key)) {
headers.put("user_id", claims.get(key));
}
+ if("userName".equals(key)){
+ headers.put("userName", "-");
+ }
headers.put(key, claims.get(key));
}
- }
-
- public IApiSMO getApiSMOImpl() {
- return apiSMOImpl;
- }
-
- public void setApiSMOImpl(IApiSMO apiSMOImpl) {
- this.apiSMOImpl = apiSMOImpl;
}
}
--
Gitblit v1.8.0