Merge pull request #215 from erupts/develop

1.12.7
erupts · Nov 12, 2023 · ea5bcf7 · ea5bcf7
2 parents 5c59287 + 0c29a62
commit ea5bcf7
Show file tree

Hide file tree

Showing 55 changed files with 131 additions and 106 deletions.
diff --git a/erupt-admin/pom.xml b/erupt-admin/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.5</version>
+        <version>1.12.7</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-annotation/pom.xml b/erupt-annotation/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.5</version>
+        <version>1.12.7</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 </project>
diff --git a/erupt-cloud/erupt-cloud-common/pom.xml b/erupt-cloud/erupt-cloud-common/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.5</version>
+        <version>1.12.7</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-cloud/erupt-cloud-node-jpa/pom.xml b/erupt-cloud/erupt-cloud-node-jpa/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.5</version>
+        <version>1.12.7</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-cloud/erupt-cloud-node/pom.xml b/erupt-cloud/erupt-cloud-node/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.5</version>
+        <version>1.12.7</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-cloud/erupt-cloud-server/pom.xml b/erupt-cloud/erupt-cloud-server/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.5</version>
+        <version>1.12.7</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/...-server/src/main/java/xyz/erupt/cloud/server/interceptor/EruptCloudServerInterceptor.java b/...-server/src/main/java/xyz/erupt/cloud/server/interceptor/EruptCloudServerInterceptor.java
@@ -9,6 +9,8 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.map.CaseInsensitiveMap;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.Order;
 import org.springframework.http.HttpHeaders;
@@ -28,6 +30,7 @@
 import xyz.erupt.core.config.GsonFactory;
 import xyz.erupt.core.constant.EruptConst;
 import xyz.erupt.core.constant.EruptMutualConst;
+import xyz.erupt.core.constant.EruptReqHeader;
 import xyz.erupt.core.constant.EruptRestPath;
 import xyz.erupt.core.context.MetaContext;
 import xyz.erupt.core.context.MetaErupt;
@@ -38,6 +41,7 @@
 import xyz.erupt.core.view.EruptModel;
 import xyz.erupt.security.interceptor.EruptSecurityInterceptor;
 import xyz.erupt.security.service.OperationService;
+import xyz.erupt.upms.constant.EruptReqHeaderConst;
 import xyz.erupt.upms.constant.SessionKey;
 import xyz.erupt.upms.service.EruptContextService;
 import xyz.erupt.upms.service.EruptSessionService;
@@ -49,7 +53,6 @@
 import javax.servlet.http.Part;
 import java.nio.charset.StandardCharsets;
 import java.util.Enumeration;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 
@@ -101,9 +104,20 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
         }
         if (null == eruptRouter) return true;
         if (EruptRouter.VerifyType.ERUPT == eruptRouter.verifyType()) {
-            String erupt = request.getHeader(EruptMutualConst.ERUPT);
-            if (erupt == null) {
-                erupt = request.getParameter("_" + EruptMutualConst.ERUPT);
+            String erupt = null;
+            String authErupt = null;
+            if (eruptRouter.verifyMethod() == EruptRouter.VerifyMethod.HEADER) {
+                erupt = request.getHeader(EruptReqHeaderConst.ERUPT_HEADER_KEY);
+                authErupt = request.getHeader(EruptReqHeaderConst.ERUPT_PARENT_HEADER_KEY);
+                if (StringUtils.isBlank(authErupt)) {
+                    authErupt = request.getHeader(EruptReqHeaderConst.ERUPT_HEADER_KEY);
+                }
+            } else if (eruptRouter.verifyMethod() == EruptRouter.VerifyMethod.PARAM) {
+                erupt = request.getParameter(EruptReqHeaderConst.URL_ERUPT_PARAM_KEY);
+                authErupt = request.getParameter(EruptReqHeaderConst.URL_ERUPT_PARENT_PARAM_KEY);
+                if (StringUtils.isBlank(authErupt)) {
+                    authErupt = request.getParameter(EruptReqHeaderConst.URL_ERUPT_PARAM_KEY);
+                }
             }
             if (erupt == null) {
                 return true;
@@ -117,7 +131,7 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
                 response.sendError(HttpStatus.UNAUTHORIZED.value());
                 return false;
             }
-            if (null == eruptUserService.getEruptMenuByValue(erupt)) {
+            if (null == eruptUserService.getEruptMenuByValue(authErupt)) {
                 response.setStatus(HttpStatus.FORBIDDEN.value());
                 response.sendError(HttpStatus.FORBIDDEN.value());
                 return false;
@@ -179,17 +193,26 @@ public HttpResponse httpProxy(HttpServletRequest request, MetaNode metaNode, Str
             count = 0;
         }
         String location = metaNode.getLocations().toArray(new String[0])[metaNode.getLocations().size() <= 1 ? 0 : (count++ % metaNode.getLocations().size())];
-        Map<String, String> headers = new HashMap<>();
+        Map<String, String> headers = new CaseInsensitiveMap<>();
         Enumeration<String> headerNames = request.getHeaderNames();
         while (headerNames.hasMoreElements()) {
             String name = headerNames.nextElement();
             headers.put(name, request.getHeader(name));
         }
-        headers.remove(HttpHeaders.HOST.toLowerCase());
+        headers.remove(HttpHeaders.HOST);
         headers.put(CloudCommonConst.HEADER_ACCESS_TOKEN, metaNode.getAccessToken());
         headers.put(EruptMutualConst.TOKEN, eruptContextService.getCurrentToken());
         headers.put(EruptMutualConst.ERUPT, eruptName);
         headers.put(EruptMutualConst.USER, Base64Encoder.encode(GsonFactory.getGson().toJson(MetaContext.getUser())));
+        if (headers.containsKey(EruptReqHeader.DRILL_SOURCE_ERUPT)) {
+            String dse = headers.get(EruptReqHeader.DRILL_SOURCE_ERUPT);
+            headers.put(EruptReqHeader.DRILL_SOURCE_ERUPT, dse.substring(dse.lastIndexOf(".") + 1));
+        }
+        //process drill header
+        if (headers.containsKey(EruptReqHeader.DRILL_SOURCE_ERUPT)) {
+            String dse = headers.get(EruptReqHeader.DRILL_SOURCE_ERUPT);
+            headers.put(EruptReqHeader.DRILL_SOURCE_ERUPT, dse.substring(dse.lastIndexOf(".") + 1));
+        }
         HttpRequest httpRequest = HttpUtil.createRequest(Method.valueOf(request.getMethod()), location + path + (null == request.getQueryString() ? "" : "?" + request.getQueryString()));
         try {
             if (null != request.getContentType() && request.getContentType().contains("multipart/form-data")) {
@@ -211,7 +234,7 @@ private void eruptBuildProcess(EruptBuildModel eruptBuildModel, String nodeName)
         eruptBuildModel.getEruptModel().setEruptName(prefix + eruptBuildModel.getEruptModel().getEruptName());
         //修改Drill的值
         JsonArray drills = eruptBuildModel.getEruptModel().getEruptJson().getAsJsonArray("drills");
-        if (drills.size() > 0) {
+        if (!drills.isEmpty()) {
             for (JsonElement drill : drills) {
                 JsonObject link = drill.getAsJsonObject().get("link").getAsJsonObject();
                 link.addProperty("linkErupt", prefix + link.get("linkErupt").getAsString());

diff --git a/erupt-cloud/erupt-cloud-server/src/main/java/xyz/erupt/cloud/server/model/CloudNode.java b/erupt-cloud/erupt-cloud-server/src/main/java/xyz/erupt/cloud/server/model/CloudNode.java
@@ -53,7 +53,7 @@
                 title = "查看令牌", icon = "fa fa-shield", mode = RowOperation.Mode.SINGLE,
                 show = @ExprBool(exprHandler = ViaMenuValueCtrl.class, params = CloudServerConst.CLOUD_ACCESS_TOKEN_PERMISSION),
                 type = RowOperation.Type.TPL, tpl = @Tpl(path = "/tpl/node-info.ftl")
-        ), layout = @Layout(tableLeftFixed = 1)
+        ), layout = @Layout(tableLeftFixed = 1, pageSize = 30)
 )
 @Component
 @EruptI18n

diff --git a/erupt-cloud/erupt-cloud-server/src/main/resources/tpl/node-instance.ftl b/erupt-cloud/erupt-cloud-server/src/main/resources/tpl/node-instance.ftl
@@ -40,7 +40,7 @@
                     let arr = paramsArr[i].split('=')
                     param[arr[0]] = arr[1];
                 }
-                axios.get("/erupt-cloud-api/remove-instance/${row.nodeName}?instance=" + item, {
+                axios.get("${request.contextPath}/erupt-cloud-api/remove-instance/${row.nodeName}?instance=" + item, {
                     headers: {
                         token: param["_token"]
                     }

diff --git a/erupt-core/pom.xml b/erupt-core/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.5</version>
+        <version>1.12.7</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-core/src/main/java/xyz/erupt/core/controller/advice/EruptExceptionAdvice.java b/erupt-core/src/main/java/xyz/erupt/core/controller/advice/EruptExceptionAdvice.java
@@ -8,6 +8,7 @@
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
+import xyz.erupt.core.constant.EruptConst;
 import xyz.erupt.core.exception.EruptApiErrorTip;
 import xyz.erupt.core.view.EruptApiModel;
 import xyz.erupt.core.view.EruptExceptionVo;
@@ -19,18 +20,18 @@
  * @author YuePeng
  * date 2020-09-30
  */
-@ControllerAdvice
 @Slf4j
 @Order(Ordered.LOWEST_PRECEDENCE - 1)
+@ControllerAdvice(EruptConst.BASE_PACKAGE)
 public class EruptExceptionAdvice {
-    public static final String API_ERROR = "erupt web api error";
+
     private static final String ERE = "erupt exception";
 
     @ExceptionHandler(EruptApiErrorTip.class)
     @ResponseStatus(value = HttpStatus.OK)
     @ResponseBody
     public EruptApiModel eruptApiErrorTip(EruptApiErrorTip e) {
-        log.error(API_ERROR, e);
+        log.error(ERE, e);
         e.eruptApiModel.setErrorIntercept(false);
         return e.eruptApiModel;
     }

diff --git a/erupt-data/erupt-jpa/pom.xml b/erupt-data/erupt-jpa/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.5</version>
+        <version>1.12.7</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-data/erupt-mongodb/pom.xml b/erupt-data/erupt-mongodb/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.5</version>
+        <version>1.12.7</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-excel/pom.xml b/erupt-excel/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.5</version>
+        <version>1.12.7</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-extra/erupt-flow/pom.xml b/erupt-extra/erupt-flow/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.5</version>
+        <version>1.12.7</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-extra/erupt-generator/pom.xml b/erupt-extra/erupt-generator/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.5</version>
+        <version>1.12.7</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-extra/erupt-job/pom.xml b/erupt-extra/erupt-job/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.5</version>
+        <version>1.12.7</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-extra/erupt-job/src/main/java/xyz/erupt/job/model/EruptJobLog.java b/erupt-extra/erupt-job/src/main/java/xyz/erupt/job/model/EruptJobLog.java
@@ -6,6 +6,7 @@
 import xyz.erupt.annotation.Erupt;
 import xyz.erupt.annotation.EruptField;
 import xyz.erupt.annotation.EruptI18n;
+import xyz.erupt.annotation.constant.AnnotationConst;
 import xyz.erupt.annotation.sub_erupt.Power;
 import xyz.erupt.annotation.sub_field.Edit;
 import xyz.erupt.annotation.sub_field.EditType;
@@ -42,6 +43,7 @@ public class EruptJobLog extends BaseModel {
     )
     private EruptJob eruptJob;
 
+    @Column(length = AnnotationConst.REMARK_LENGTH)
     @EruptField(
             views = @View(title = "任务参数")
     )

diff --git a/erupt-extra/erupt-magic-api/pom.xml b/erupt-extra/erupt-magic-api/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.5</version>
+        <version>1.12.7</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-extra/erupt-monitor/pom.xml b/erupt-extra/erupt-monitor/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.5</version>
+        <version>1.12.7</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-extra/erupt-monitor/src/main/java/xyz/erupt/monitor/vo/redis/RedisInfo.java b/erupt-extra/erupt-monitor/src/main/java/xyz/erupt/monitor/vo/redis/RedisInfo.java
@@ -47,7 +47,7 @@ public RedisInfo(RedisConnectionFactory redisConnectionFactory) {
                             StringUtils.substringBetween(commandStats.getProperty(it), "calls=", ",usec"))).collect(Collectors.toList());
         });
         Optional.ofNullable(redisConnection.info()).ifPresent(properties -> {
-            this.setKeyNum(redisConnectionFactory.getConnection().serverCommands().dbSize());
+            this.setKeyNum(redisConnection.serverCommands().dbSize());
             this.setVersion(properties.getProperty("redis_version"));
             this.setUsedMem(properties.getProperty("used_memory_human"));
             if ("0".equals(properties.getProperty("maxmemory"))) {
@@ -68,5 +68,6 @@ public RedisInfo(RedisConnectionFactory redisConnectionFactory) {
                 this.setAOF(Integer.parseInt(aofEnabled) != 0);
             }
         });
+        redisConnection.close();
     }
 }
diff --git a/erupt-sample/pom.xml b/erupt-sample/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>xyz.erupt</groupId>
 		<artifactId>erupt</artifactId>
-		<version>1.12.5</version>
+		<version>1.12.7</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/erupt-security/pom.xml b/erupt-security/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.5</version>
+        <version>1.12.7</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-security/src/main/java/xyz/erupt/security/interceptor/EruptSecurityInterceptor.java b/erupt-security/src/main/java/xyz/erupt/security/interceptor/EruptSecurityInterceptor.java
@@ -1,5 +1,6 @@
 package xyz.erupt.security.interceptor;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.core.annotation.Order;
 import org.springframework.http.HttpStatus;
@@ -36,6 +37,7 @@
  */
 @Service
 @Order
+@Slf4j
 public class EruptSecurityInterceptor implements AsyncHandlerInterceptor {
 
     @Resource
@@ -50,10 +52,6 @@ public class EruptSecurityInterceptor implements AsyncHandlerInterceptor {
     @Resource
     private OperationService operationService;
 
-    private static final String ERUPT_PARENT_HEADER_KEY = "eruptParent";
-
-    private static final String ERUPT_PARENT_PARAM_KEY = "_eruptParent";
-
     @Resource
     private EruptSessionService sessionService;
 
@@ -71,11 +69,11 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
         if (eruptRouter.verifyMethod() == EruptRouter.VerifyMethod.HEADER) {
             token = request.getHeader(EruptReqHeaderConst.ERUPT_HEADER_TOKEN);
             eruptName = request.getHeader(EruptReqHeaderConst.ERUPT_HEADER_KEY);
-            parentEruptName = request.getHeader(ERUPT_PARENT_HEADER_KEY);
+            parentEruptName = request.getHeader(EruptReqHeaderConst.ERUPT_PARENT_HEADER_KEY);
         } else if (eruptRouter.verifyMethod() == EruptRouter.VerifyMethod.PARAM) {
             token = request.getParameter(EruptReqHeaderConst.URL_ERUPT_PARAM_TOKEN);
             eruptName = request.getParameter(EruptReqHeaderConst.URL_ERUPT_PARAM_KEY);
-            parentEruptName = request.getHeader(ERUPT_PARENT_PARAM_KEY);
+            parentEruptName = request.getHeader(EruptReqHeaderConst.URL_ERUPT_PARENT_PARAM_KEY);
         }
         if (eruptRouter.verifyType().equals(EruptRouter.VerifyType.ERUPT)) {
             MetaContext.register(new MetaErupt(eruptName, eruptName));
@@ -160,8 +158,7 @@ public void afterCompletion(HttpServletRequest request, HttpServletResponse resp
         try {
             operationService.record(handler, ex);
         } catch (Exception e) {
-            //TODO 失败后抛出异常（版本兼容原因未抛出）
-            e.printStackTrace();
+            log.error("operation record error", e);
         } finally {
             MetaContext.remove();
         }

diff --git a/erupt-toolkit/pom.xml b/erupt-toolkit/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.5</version>
+        <version>1.12.7</version>
         <relativePath>../pom.xml</relativePath>
     </parent>