环境提交

blade-service/blade-archive/pom.xml

@@ -116,12 +116,15 @@
             <groupId>e-iceblue</groupId>
             <artifactId>spire.office.free</artifactId>
             <version>5.3.1</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/../../doc/lib/pdfLib/aspose-words-15.8.0-jdk16.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>com.aspose</groupId>
             <artifactId>aspose-cells</artifactId>
             <version>20.4</version>
-            <scope>compile</scope>
+            <scope>system</scope>
+            <systemPath>${basedir}/../../doc/lib/pdfLib/aspose-cells-20.4-c.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
@@ -158,13 +161,6 @@
             <artifactId>pdfbox</artifactId>
             <version>2.0.24</version>
         </dependency>
-
-        <dependency>
-            <groupId>com.e.visa</groupId>
-            <artifactId>http.client</artifactId>
-            <version>4.5.9</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
     <build>

blade-service/blade-archive/src/main/java/org/springblade/archive/utils/ArchiveTreeUtil.java

@@ -1,18 +1,18 @@
 package org.springblade.archive.utils;
 
-import com.spire.ms.System.Collections.ArrayList;
 import org.apache.commons.lang.StringUtils;
 import org.springblade.common.utils.ForestNodeMergerEx;
-import org.springblade.core.tool.node.ForestNodeMerger;
-import org.springblade.manager.entity.ArchiveTree;
+
 import org.springblade.manager.entity.ArchiveTreeContract;
 import org.springblade.manager.vo.ArchiveTreeContractVO2;
-import org.springblade.manager.vo.ArchiveTreeVO2;
 
+
+import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+
 public class ArchiveTreeUtil {
 
     /**

blade-service/blade-business/pom.xml

@@ -117,12 +117,15 @@
             <groupId>e-iceblue</groupId>
             <artifactId>spire.office.free</artifactId>
             <version>5.3.1</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/../../doc/lib/eVisaLib/spire.office.free-5.3.1.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>com.aspose</groupId>
             <artifactId>aspose-cells</artifactId>
             <version>20.4</version>
-            <scope>compile</scope>
+            <scope>system</scope>
+            <systemPath>${basedir}/../../doc/lib/pdfLib/aspose-cells-20.4-c.jar</systemPath>
         </dependency>
 
         <!--webSocket-->
@@ -179,6 +182,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>

blade-service/blade-land/pom.xml

@@ -80,7 +80,8 @@
             <groupId>com.aspose</groupId>
             <artifactId>aspose-cells</artifactId>
             <version>20.4</version>
-            <scope>compile</scope>
+            <scope>system</scope>
+            <systemPath>${basedir}/../../doc/lib/pdfLib/aspose-cells-20.4-c.jar</systemPath>
         </dependency>
 
     </dependencies>

blade-service/blade-manager/pom.xml

@@ -14,14 +14,6 @@
     <version>${bladex.project.version}</version>
     <packaging>jar</packaging>
 
-    <repositories>
-        <repository>
-            <id>com.e-iceblue</id>
-            <name>e-iceblue</name>
-            <url>https://repo.e-iceblue.cn/repository/maven-public/</url>
-        </repository>
-    </repositories>
-
     <dependencies>
         <dependency>
             <groupId>org.springblade</groupId>
@@ -89,6 +81,8 @@
             <groupId>e-iceblue</groupId>
             <artifactId>spire.xls.free</artifactId>
             <version>5.3.0</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/../../doc/lib/eVisaLib/spire.xls.free-5.3.0.jar</systemPath>
         </dependency>
 
         <dependency>
@@ -121,6 +115,8 @@
             <groupId>com.e.visa</groupId>
             <artifactId>paperless.base</artifactId>
             <version>4.6.0.2</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/../../doc/lib/eVisaLib/PaperlessBase-4.6.0.2.jar</systemPath>
         </dependency>
 
         <!-- 序列化相关-->
@@ -148,7 +144,8 @@
             <groupId>com.aspose</groupId>
             <artifactId>aspose-cells</artifactId>
             <version>20.4</version>
-            <scope>compile</scope>
+            <scope>system</scope>
+            <systemPath>${basedir}/../../doc/lib/pdfLib/aspose-cells-20.4-c.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
@@ -178,6 +175,8 @@
             <groupId>e-iceblue</groupId>
             <artifactId>spire.office.free</artifactId>
             <version>5.3.1</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/../../doc/lib/eVisaLib/spire.office.free-5.3.1.jar</systemPath>
         </dependency>
 
         <!--计量-->

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsInfoServiceImpl.java

@@ -2,7 +2,6 @@ package org.springblade.manager.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.AllArgsConstructor;
-import oracle.sql.BfileDBAccess;
 import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsParamServiceImpl.java

@@ -198,7 +198,7 @@ public class WbsParamServiceImpl extends BaseServiceImpl<WbsParamMapper, WbsPara
         return createFileTitle(wtc);
     }
 
-    @Override
+  //  @Override
     public R getNameRuleByPkeyId(Long pKeyId, Long projectId) {
         //先查询合同段级的
         NameRuleVo vo = this.getNameRuleByPkeyId(pKeyId);

blade-service/blade-meter/pom.xml

@@ -61,7 +61,8 @@
             <groupId>com.aspose</groupId>
             <artifactId>aspose-cells</artifactId>
             <version>20.4</version>
-            <scope>compile</scope>
+            <scope>system</scope>
+            <systemPath>${basedir}/../../doc/lib/pdfLib/aspose-cells-20.4-c.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>

blade-service/blade-system/src/main/java/org/springblade/system/controller/RoleController.java

@@ -22,7 +22,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.*;
 import lombok.AllArgsConstructor;
-import oracle.jdbc.proxy.annotation.Post;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.cache.utils.CacheUtil;
 import org.springblade.core.mp.support.Condition;