Merge pull request #186 from erupts/develop

1.12.1
erupts · Jul 29, 2023 · 040c08e · 040c08e
2 parents 1f2fc4c + 301ded0
commit 040c08e
Show file tree

Hide file tree

Showing 42 changed files with 104 additions and 143 deletions.
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.0</version>
+ <version>1.12.1</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
 </project>
diff --git a/erupt-annotation/src/main/java/xyz/erupt/annotation/sub_field/sub_edit/DynamicBy.java b/erupt-annotation/src/main/java/xyz/erupt/annotation/sub_field/sub_edit/DynamicBy.java
@@ -12,9 +12,6 @@
 
  boolean enable() default true;
 
-// @Comment("依赖其他表单的值")
-// String[] dependFields();
-
  @Comment("显示条件表达式，支持变量：item 该值表示其他字段的值")
  String expr();
 
@@ -29,7 +26,7 @@ enum Type {
  SHOW, //显示
  HIDE, //隐藏
  SHOW_NOTNULL, //显示且必填
- SHOW_READONLY, //显示且制度
+ SHOW_READONLY, //显示且只读
  }
 
 }
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.0</version>
+ <version>1.12.1</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.0</version>
+ <version>1.12.1</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.0</version>
+ <version>1.12.1</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.0</version>
+ <version>1.12.1</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
@@ -12,6 +12,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.Order;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StreamUtils;
@@ -32,7 +33,6 @@
 import xyz.erupt.core.context.MetaUser;
 import xyz.erupt.core.exception.EruptWebApiRuntimeException;
 import xyz.erupt.core.module.MetaUserinfo;
-import xyz.erupt.core.service.EruptCoreService;
 import xyz.erupt.core.view.EruptBuildModel;
 import xyz.erupt.core.view.EruptModel;
 import xyz.erupt.security.interceptor.EruptSecurityInterceptor;
@@ -104,8 +104,12 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
  if (erupt == null) {
  return true;
  }
- if (!erupt.contains(".")) return true;
- if (null != EruptCoreService.getErupt(erupt)) return true;
+ if (!erupt.contains(".")) {
+ return true;
+ }
+// if (request.getServletPath().contains(EruptRestPath.ERUPT_FILE)) {
+// return true;
+// }
  String token = eruptContextService.getCurrentToken();
  if (null == token || null == eruptSessionService.get(SessionKey.TOKEN_OLINE + token)) {
  response.setStatus(HttpStatus.UNAUTHORIZED.value());
@@ -188,7 +192,7 @@ public HttpResponse httpProxy(HttpServletRequest request, MetaNode metaNode, Str
  String name = headerNames.nextElement();
  headers.put(name, request.getHeader(name));
  }
- headers.remove("host");
+ headers.remove(HttpHeaders.HOST.toLowerCase());
  headers.put(CloudCommonConst.HEADER_ACCESS_TOKEN, metaNode.getAccessToken());
  headers.put(EruptMutualConst.TOKEN, eruptContextService.getCurrentToken());
  headers.put(EruptMutualConst.ERUPT, eruptName);

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.0</version>
+ <version>1.12.1</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
 

diff --git a/erupt-core/src/main/java/xyz/erupt/core/constant/EruptReqHeader.java b/erupt-core/src/main/java/xyz/erupt/core/constant/EruptReqHeader.java
@@ -0,0 +1,21 @@
+package xyz.erupt.core.constant;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author YuePeng
+ * date 2023/7/21 21:29
+ */
+@Getter
+@Setter
+public class EruptReqHeader {
+
+ public static final String DRILL = "Drill";
+
+ public static final String DRILL_VALUE = "DrillValue";
+
+ public static final String DRILL_SOURCE_ERUPT = "DrillSourceErupt";
+
+
+}
diff --git a/erupt-core/src/main/java/xyz/erupt/core/controller/EruptDataController.java b/erupt-core/src/main/java/xyz/erupt/core/controller/EruptDataController.java
diff --git a/erupt-core/src/main/java/xyz/erupt/core/controller/EruptDrillController.java b/erupt-core/src/main/java/xyz/erupt/core/controller/EruptDrillController.java
diff --git a/erupt-core/src/main/java/xyz/erupt/core/controller/EruptModifyController.java b/erupt-core/src/main/java/xyz/erupt/core/controller/EruptModifyController.java
diff --git a/erupt-core/src/main/java/xyz/erupt/core/service/EruptService.java b/erupt-core/src/main/java/xyz/erupt/core/service/EruptService.java
@@ -1,13 +1,17 @@
 package xyz.erupt.core.service;
 
+import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import xyz.erupt.annotation.config.QueryExpression;
 import xyz.erupt.annotation.fun.PowerObject;
 import xyz.erupt.annotation.query.Condition;
+import xyz.erupt.annotation.sub_erupt.Link;
 import xyz.erupt.annotation.sub_erupt.LinkTree;
+import xyz.erupt.core.constant.EruptReqHeader;
 import xyz.erupt.core.exception.EruptNoLegalPowerException;
+import xyz.erupt.core.exception.EruptWebApiRuntimeException;
 import xyz.erupt.core.invoke.DataProcessorManager;
 import xyz.erupt.core.invoke.DataProxyInvoke;
 import xyz.erupt.core.query.EruptQuery;
@@ -19,10 +23,15 @@
 import xyz.erupt.core.view.Page;
 import xyz.erupt.core.view.TableQueryVo;
 
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
+import java.util.function.BiConsumer;
+import java.util.stream.Stream;
 
 /**
  * @author YuePeng
@@ -32,6 +41,9 @@
 @Slf4j
 public class EruptService {
 
+ @Resource
+ private HttpServletRequest request;
+
  /**
  * @param eruptModel eruptModel
  * @param tableQueryVo 前端查询对象
@@ -49,9 +61,10 @@ public Page getEruptData(EruptModel eruptModel, TableQueryVo tableQueryVo, List<
  if (dependTree.dependNode()) return new Page();
  } else {
  EruptModel treeErupt = EruptCoreService.getErupt(ReflectUtil.findClassField(eruptModel.getClazz(), dependTree.field()).getType().getSimpleName());
- conditionStrings.add(dependTree.field() + "." + treeErupt.getErupt().primaryKeyCol() + " = '" + tableQueryVo.getLinkTreeVal() + "'");
+ conditionStrings.add(String.format("%s = '%s'", dependTree.field() + "." + treeErupt.getErupt().primaryKeyCol(), tableQueryVo.getLinkTreeVal()));
  }
  }
+ this.drillProcess(eruptModel, (link, val) -> conditionStrings.add(String.format("%s = '%s'", link.linkErupt().getSimpleName() + "." + link.joinColumn(), val)));
  conditionStrings.addAll(Arrays.asList(customCondition));
  DataProxyInvoke.invoke(eruptModel, (dataProxy -> Optional.ofNullable(dataProxy.beforeFetch(legalConditions)).ifPresent(conditionStrings::add)));
  Optional.ofNullable(serverCondition).ifPresent(legalConditions::addAll);
@@ -63,6 +76,29 @@ public Page getEruptData(EruptModel eruptModel, TableQueryVo tableQueryVo, List<
  return page;
  }
 
+ @SneakyThrows
+ public void drillProcess(EruptModel eruptModel, BiConsumer<Link, Object> consumer) {
+ String drill = request.getHeader(EruptReqHeader.DRILL);
+ if (null != drill) {
+ String drillValue = request.getHeader(EruptReqHeader.DRILL_VALUE);
+ String sourceErupt = request.getHeader(EruptReqHeader.DRILL_SOURCE_ERUPT);
+ if (null == drillValue || null == sourceErupt) {
+ throw new EruptWebApiRuntimeException("Drill Header Illegal ，Lack：" + EruptReqHeader.DRILL_VALUE + "," + EruptReqHeader.DRILL_SOURCE_ERUPT);
+ }
+ EruptModel sourceModel = EruptCoreService.getErupt(sourceErupt);
+ Link link = Stream.of(sourceModel.getErupt().drills()).filter(it -> drill.equals(it.code()))
+ .findFirst().orElseThrow(EruptNoLegalPowerException::new).link();
+ if (!link.linkErupt().getSimpleName().equals(eruptModel.getEruptName())) {
+ throw new EruptWebApiRuntimeException("Illegal erupt from " + drill);
+ }
+ Object data = DataProcessorManager.getEruptDataProcessor(sourceModel.getClazz()).findDataById(sourceModel, EruptUtil.toEruptId(sourceModel, drillValue));
+ Field field = ReflectUtil.findClassField(sourceModel.getClazz(), link.column());
+ field.setAccessible(true);
+ Object val = field.get(data);
+ consumer.accept(link, val);
+ }
+ }
+
  /**
  * 校验id使用权限
  *

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.0</version>
+ <version>1.12.1</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.0</version>
+ <version>1.12.1</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.0</version>
+ <version>1.12.1</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
 

diff --git a/erupt-excel/src/main/java/xyz/erupt/excel/controller/EruptExcelController.java b/erupt-excel/src/main/java/xyz/erupt/excel/controller/EruptExcelController.java
@@ -93,7 +93,7 @@ public void exportData(@PathVariable("erupt") String eruptName,
  @EruptRecordOperate(value = "Import Excel", dynamicConfig = EruptRecordNaming.class)
  @EruptRouter(authIndex = 2, verifyType = EruptRouter.VerifyType.ERUPT)
  @Transactional(rollbackOn = Exception.class)
- public EruptApiModel importExcel(@PathVariable("erupt") String eruptName, @RequestParam("file") MultipartFile file, HttpServletRequest request) {
+ public EruptApiModel importExcel(@PathVariable("erupt") String eruptName, @RequestParam("file") MultipartFile file) {
  EruptModel eruptModel = EruptCoreService.getErupt(eruptName);
  Erupts.powerLegal(eruptModel, PowerObject::isImportable, "Not import permission");
  if (file.isEmpty() || null == file.getOriginalFilename()) return EruptApiModel.errorApi("上传失败，请选择文件");

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.0</version>
+ <version>1.12.1</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.0</version>
+ <version>1.12.1</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.0</version>
+ <version>1.12.1</version>
  <relativePath>../../pom.xml</relativePath>
  </parent>
 

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.0</version>
+ <version>1.12.1</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.0</version>
+ <version>1.12.1</version>
  <relativePath>../../pom.xml</relativePath>
  </parent>