修改依赖层级，防止依赖循环

hx-api/file-serve-api/pom.xml

@@ -16,19 +16,4 @@
         <maven.compiler.target>8</maven.compiler.target>
     </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-starter-mybatis</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>hx-tool</artifactId>
-        </dependency>
-    </dependencies>
-
 </project>

hx-api/iot-management-api/pom.xml

@@ -18,18 +18,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-starter-mybatis</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-        <dependency>
             <groupId>com.fjhx</groupId>
-            <artifactId>hx-tool</artifactId>
+            <artifactId>file-serve-api</artifactId>
         </dependency>
     </dependencies>
 
-
 </project>

hx-api/pom.xml

@@ -51,7 +51,28 @@
                 <version>${hx.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.fjhx</groupId>
+                <artifactId>file-serve-api</artifactId>
+                <version>${hx.version}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-mybatis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-tool</artifactId>
+        </dependency>
+    </dependencies>
+
 </project>

hx-api/product-library-api/pom.xml

@@ -16,19 +16,4 @@
         <maven.compiler.target>8</maven.compiler.target>
     </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-starter-mybatis</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>hx-tool</artifactId>
-        </dependency>
-    </dependencies>
-
 </project>

hx-api/storage-api/pom.xml

@@ -16,19 +16,4 @@
         <maven.compiler.target>8</maven.compiler.target>
     </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-starter-mybatis</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>hx-tool</artifactId>
-        </dependency>
-    </dependencies>
-
 </project>

hx-common/client-util/pom.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>hx-common</artifactId>
+        <groupId>com.fjhx</groupId>
+        <version>3.2.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>client-util</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-user-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>file-serve-api</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

hx-common/hx-tool/src/main/java/com/fjhx/utils/feign/FileClientUtil.java → hx-common/client-util/src/main/java/com/fjhx/ClientUtils/FileClientUtil.java

@@ -1,4 +1,4 @@
-package com.fjhx.utils.feign;
+package com.fjhx.ClientUtils;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.spring.SpringUtil;

hx-common/hx-tool/src/main/java/com/fjhx/utils/feign/UserClientUtil.java → hx-common/client-util/src/main/java/com/fjhx/ClientUtils/UserClientUtil.java

@@ -1,4 +1,4 @@
-package com.fjhx.utils.feign;
+package com.fjhx.ClientUtils;
 
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.api.ResultCode;

hx-common/hx-tool/pom.xml

@@ -41,16 +41,16 @@
         </dependency>
 
         <!--    用户模块    -->
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-user-api</artifactId>
-        </dependency>
+        <!--        <dependency>-->
+        <!--            <groupId>org.springblade</groupId>-->
+        <!--            <artifactId>blade-user-api</artifactId>-->
+        <!--        </dependency>-->
 
         <!--    文件模块    -->
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>file-serve-api</artifactId>
-        </dependency>
+        <!--        <dependency>-->
+        <!--            <groupId>com.fjhx</groupId>-->
+        <!--            <artifactId>file-serve-api</artifactId>-->
+        <!--        </dependency>-->
 
     </dependencies>
 

hx-common/hx-tool/src/main/java/com/fjhx/base/BaseService.java

@@ -52,6 +52,7 @@ public interface BaseService<T> extends IService<T> {
         return new Page<>(pageNum, pageSize);
     }
 
+
     /**
      * 执行分页查询
      *

hx-common/pom.xml

@@ -15,6 +15,7 @@
     <modules>
         <module>code-generator</module>
         <module>hx-tool</module>
+        <module>client-util</module>
     </modules>
 
     <properties>
@@ -50,12 +51,6 @@
                 <version>${hx.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>com.fjhx</groupId>
-                <artifactId>file-serve-api</artifactId>
-                <version>${hx.version}</version>
-            </dependency>
-
             <!-- hutool 工具包 -->
             <dependency>
                 <groupId>cn.hutool</groupId>
@@ -76,6 +71,12 @@
                 <version>${bladex.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.fjhx</groupId>
+                <artifactId>file-serve-api</artifactId>
+                <version>${hx.version}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 

hx-serve/file-serve/pom.xml

@@ -20,11 +20,6 @@
 
         <dependency>
             <groupId>com.fjhx</groupId>
-            <artifactId>hx-tool</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fjhx</groupId>
             <artifactId>file-serve-api</artifactId>
         </dependency>
 

hx-serve/iot-management/pom.xml

@@ -20,7 +20,7 @@
 
         <dependency>
             <groupId>com.fjhx</groupId>
-            <artifactId>hx-tool</artifactId>
+            <artifactId>client-util</artifactId>
         </dependency>
 
         <dependency>

hx-serve/iot-management/src/main/java/com/fjhx/serve/bom/service/impl/BomServiceImpl.java

@@ -3,6 +3,8 @@ package com.fjhx.serve.bom.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.ClientUtils.FileClientUtil;
+import com.fjhx.ClientUtils.UserClientUtil;
 import com.fjhx.constants.StatusConstant;
 import com.fjhx.entity.bom.Bom;
 import com.fjhx.enums.bom.BomTypeEnum;
@@ -11,8 +13,6 @@ import com.fjhx.params.bom.BomVo;
 import com.fjhx.serve.bom.mapper.BomMapper;
 import com.fjhx.serve.bom.service.BomService;
 import com.fjhx.utils.WrapperUtil;
-import com.fjhx.utils.feign.FileClientUtil;
-import com.fjhx.utils.feign.UserClientUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

hx-serve/iot-management/src/main/java/com/fjhx/serve/workshop/service/impl/WorkshopServiceImpl.java

@@ -4,15 +4,15 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.ClientUtils.UserClientUtil;
 import com.fjhx.base.BaseEntity;
 import com.fjhx.entity.workshop.Workshop;
 import com.fjhx.params.workshop.WorkshopEx;
 import com.fjhx.params.workshop.WorkshopVo;
-import com.fjhx.utils.HxBeanUtil;
-import com.fjhx.utils.WrapperUtil;
-import com.fjhx.utils.feign.UserClientUtil;
 import com.fjhx.serve.workshop.mapper.WorkshopMapper;
 import com.fjhx.serve.workshop.service.WorkshopService;
+import com.fjhx.utils.HxBeanUtil;
+import com.fjhx.utils.WrapperUtil;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springframework.stereotype.Service;
 

hx-serve/pom.xml

@@ -48,6 +48,12 @@
 
             <dependency>
                 <groupId>com.fjhx</groupId>
+                <artifactId>client-util</artifactId>
+                <version>${hx.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.fjhx</groupId>
                 <artifactId>iot-management-api</artifactId>
                 <version>${hx.version}</version>
             </dependency>
@@ -73,6 +79,15 @@
         </dependencies>
     </dependencyManagement>
 
+    <dependencies>
+
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-tool</artifactId>
+        </dependency>
+
+    </dependencies>
+
     <build>
         <resources>
             <resource>

hx-serve/product-library/pom.xml

@@ -20,11 +20,6 @@
 
         <dependency>
             <groupId>com.fjhx</groupId>
-            <artifactId>hx-tool</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fjhx</groupId>
             <artifactId>product-library-api</artifactId>
         </dependency>