Explorar el Código

项目版本依赖修改

liubo hace 3 años
padre
commit
e356433f0f

+ 2 - 2
zd-auth/pom.xml

@@ -25,10 +25,10 @@
         </dependency>
 
         <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
+        <!--<dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
+        </dependency>-->
 
         <!-- zd Common Security-->
         <dependency>

+ 3 - 3
zd-modules/zd-airbottle/pom.xml

@@ -34,16 +34,16 @@
         </dependency>
 
         <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
+        <!--<dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
         </dependency>
 
-        <!-- SpringBoot Actuator -->
+        &lt;!&ndash; SpringBoot Actuator &ndash;&gt;
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
+        </dependency>-->
 
         <!-- Mysql Connector -->
         <dependency>

+ 3 - 12
zd-modules/zd-base/pom.xml

@@ -25,10 +25,10 @@
         </dependency>
 
         <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
+        <!--<dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
+        </dependency>-->
 
         <!-- Mysql Connector -->
         <dependency>
@@ -137,15 +137,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <!-- 打包时跳过test插件,不运行test测试用例 -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
-                <configuration>
-                    <skipTests>true</skipTests>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
-</project>
+</project>

+ 2 - 2
zd-modules/zd-base/src/main/java/com/zd/base/files/ueditor/upload/UploadUtils.java

@@ -1,6 +1,6 @@
 package com.zd.base.files.ueditor.upload;
 
-import io.netty.util.internal.StringUtil;
+import com.alibaba.nacos.shaded.io.grpc.netty.shaded.io.netty.util.internal.StringUtil;
 import org.apache.commons.io.FileUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -16,7 +16,7 @@ public class UploadUtils {
 
     @Value("${file.path}")
     public void setFilePathStatic(String filePath) {
-        this.filePathStatic = filePath;
+        filePathStatic = filePath;
     }
 
     /**

+ 3 - 3
zd-modules/zd-bottle-parent/zd-bottle/pom.xml

@@ -34,16 +34,16 @@
         </dependency>-->
 
         <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
+        <!--<dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
         </dependency>
 
-        <!-- SpringBoot Actuator -->
+        &lt;!&ndash; SpringBoot Actuator &ndash;&gt;
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
+        </dependency>-->
 
         <!-- Swagger UI -->
         <!--<dependency>

+ 3 - 3
zd-modules/zd-chemical/pom.xml

@@ -26,16 +26,16 @@
         </dependency>
 
         <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
+        <!--<dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
         </dependency>
 
-        <!-- SpringBoot Actuator -->
+        &lt;!&ndash; SpringBoot Actuator &ndash;&gt;
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
+        </dependency>-->
 
         <!-- Mysql Connector -->
         <dependency>

+ 3 - 3
zd-modules/zd-exam/pom.xml

@@ -26,16 +26,16 @@
         </dependency>
 
         <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
+        <!--<dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
         </dependency>
 
-        <!-- SpringBoot Actuator -->
+        &lt;!&ndash; SpringBoot Actuator &ndash;&gt;
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
+        </dependency>-->
 
         <!-- Mysql Connector -->
         <dependency>

+ 4 - 4
zd-modules/zd-exam/src/main/java/com/zd/exam/service/impl/ElPassMarkconfigServiceImpl.java

@@ -1,23 +1,23 @@
 package com.zd.exam.service.impl;
 
-import cn.hutool.core.util.StrUtil;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.DateUtils;
-import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.utils.SaveUtil;
+import com.zd.common.core.utils.SecurityUtils;
 import com.zd.exam.domain.ElPassConfigdetail;
 import com.zd.exam.domain.ElPassMarkconfig;
 import com.zd.exam.domain.vo.ElPassMarkconfigVO;
 import com.zd.exam.mapper.ElPassConfigdetailMapper;
 import com.zd.exam.mapper.ElPassMarkconfigMapper;
 import com.zd.exam.service.IElPassMarkconfigService;
-import io.netty.util.internal.StringUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
 
 /**
  * 信用合格分设置Service业务层处理

+ 3 - 3
zd-modules/zd-modules-laboratory/pom.xml

@@ -32,16 +32,16 @@
         </dependency>-->
 
         <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
+        <!--<dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
         </dependency>
 
-        <!-- SpringBoot Actuator -->
+        &lt;!&ndash; SpringBoot Actuator &ndash;&gt;
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
+        </dependency>-->
 
         <!-- Swagger UI -->
 <!--        <dependency>-->

+ 3 - 3
zd-modules/zd-modules-system/pom.xml

@@ -26,16 +26,16 @@
         </dependency>
 
     	<!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
+        <!--<dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
         </dependency>
 
-    	<!-- SpringBoot Actuator -->
+    	&lt;!&ndash; SpringBoot Actuator &ndash;&gt;
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
+        </dependency>-->
 
         <!-- Mysql Connector -->
         <dependency>

+ 2 - 11
zd-visual/zd-monitor/pom.xml

@@ -36,10 +36,10 @@
         </dependency>
 
         <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
+        <!--<dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
+        </dependency>-->
 
         <!-- SpringBoot Web -->
         <dependency>
@@ -76,15 +76,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <!-- 打包时跳过test插件,不运行test测试用例 -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
-                <configuration>
-                    <skipTests>true</skipTests>
-                </configuration>
-            </plugin>
 
 <!-- docker的maven插件 -->
 <!--            <plugin>-->