修正打包问题

boman-api/boman-api-gen/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>boman-api</artifactId>
         <groupId>com.boman</groupId>
-        <version>2.5.0</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -22,12 +22,18 @@
             <groupId>com.boman</groupId>
             <artifactId>boman-common-core</artifactId>
         </dependency>
+
         <dependency>
             <groupId>com.boman</groupId>
-            <artifactId>boman-modules-gen</artifactId>
-            <version>2.5.0</version>
-            <scope>compile</scope>
+            <artifactId>boman-domain</artifactId>
+            <version>2.5.0-SNAPSHOT</version>
         </dependency>
+        <!--        <dependency>-->
+        <!--            <groupId>com.boman</groupId>-->
+        <!--            <artifactId>boman-modules-gen</artifactId>-->
+        <!--            <version>2.5.0</version>-->
+        <!--            <scope>compile</scope>-->
+        <!--        </dependency>-->
 
     </dependencies>
 

boman-api/boman-api-gen/src/main/java/com/boman/gen/api/RemoteGenTableColumnService.java

@@ -2,7 +2,7 @@ package com.boman.gen.api;
 
 import com.boman.common.core.constant.ServiceNameConstants;
 import com.boman.common.core.web.domain.AjaxResult;
-import com.boman.gen.domain.GenTableColumn;
+import com.boman.domain.GenTableColumn;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;

boman-api/boman-api-gen/src/main/java/com/boman/gen/api/RemoteGenTableService.java

@@ -1,7 +1,7 @@
 package com.boman.gen.api;
 
 import com.boman.common.core.constant.ServiceNameConstants;
-import com.boman.gen.domain.GenTable;
+import com.boman.domain.GenTable;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;

boman-api/boman-api-system/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.boman</groupId>
         <artifactId>boman-api</artifactId>
-        <version>2.5.0</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     
@@ -19,7 +19,7 @@
         <dependency>
             <groupId>com.boman</groupId>
             <artifactId>boman-domain</artifactId>
-            <version>2.5.0</version>
+            <version>2.5.0-SNAPSHOT</version>
         </dependency>
         
     </dependencies>

boman-api/boman-domain/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.boman</groupId>
         <artifactId>boman-api</artifactId>
-        <version>2.5.0</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -19,7 +19,7 @@
         <dependency>
             <groupId>com.boman</groupId>
             <artifactId>boman-common-core</artifactId>
-            <version>2.5.0</version>
+            <version>2.5.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

boman-modules/boman-gen/src/main/java/com/boman/gen/domain/GenTable.java → boman-api/boman-domain/src/main/java/com.boman.domain/GenTable.java

@@ -1,4 +1,4 @@
-package com.boman.gen.domain;
+package com.boman.domain;
 
 import java.util.List;
 import javax.validation.Valid;

boman-modules/boman-gen/src/main/java/com/boman/gen/domain/GenTableColumn.java → boman-api/boman-domain/src/main/java/com.boman.domain/GenTableColumn.java

@@ -1,8 +1,7 @@
-package com.boman.gen.domain;
+package com.boman.domain;
 
 import com.boman.common.core.utils.StringUtils;
 import com.boman.common.core.web.domain.BaseEntity;
-import com.boman.domain.SysDictData;
 
 import java.util.List;
 import java.util.Map;

boman-modules/boman-gen/src/main/java/com/boman/gen/domain/GenTableRelation.java → boman-api/boman-domain/src/main/java/com.boman.domain/GenTableRelation.java

@@ -1,4 +1,4 @@
-package com.boman.gen.domain;
+package com.boman.domain;
 
 import com.boman.common.core.web.domain.BaseEntity;
 

boman-modules/boman-gen/src/main/java/com/boman/gen/domain/RoleEnum.java → boman-api/boman-domain/src/main/java/com.boman.domain/RoleEnum.java

@@ -1,4 +1,4 @@
-package com.boman.gen.domain;
+package com.boman.domain;
 
 /**
  * @author tjf

boman-modules/boman-gen/src/main/java/com/boman/gen/domain/TableSql.java → boman-api/boman-domain/src/main/java/com.boman.domain/TableSql.java

@@ -1,4 +1,4 @@
-package com.boman.gen.domain;
+package com.boman.domain;
 
 import com.boman.common.core.web.domain.BaseEntity;
 

boman-api/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.boman</groupId>
         <artifactId>boman</artifactId>
-        <version>2.5.0</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

boman-auth/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.boman</groupId>
         <artifactId>boman</artifactId>
-        <version>2.5.0</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

boman-common/boman-common-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.boman</groupId>
         <artifactId>boman-common</artifactId>
-        <version>2.5.0</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

boman-common/boman-common-datascope/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.boman</groupId>
         <artifactId>boman-common</artifactId>
-        <version>2.5.0</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

boman-common/boman-common-datasource/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.boman</groupId>
         <artifactId>boman-common</artifactId>
-        <version>2.5.0</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

boman-common/boman-common-log/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.boman</groupId>
         <artifactId>boman-common</artifactId>
-        <version>2.5.0</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

boman-common/boman-common-redis/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.boman</groupId>
         <artifactId>boman-common</artifactId>
-        <version>2.5.0</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

boman-common/boman-common-security/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.boman</groupId>
         <artifactId>boman-common</artifactId>
-        <version>2.5.0</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

boman-common/boman-common-swagger/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.boman</groupId>
         <artifactId>boman-common</artifactId>
-        <version>2.5.0</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

boman-common/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.boman</groupId>
         <artifactId>boman</artifactId>
-        <version>2.5.0</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

boman-gateway/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.boman</groupId>
         <artifactId>boman</artifactId>
-        <version>2.5.0</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

boman-modules/boman-file/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.boman</groupId>
         <artifactId>boman-modules</artifactId>
-        <version>2.5.0</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

boman-modules/boman-gen/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.boman</groupId>
         <artifactId>boman-modules</artifactId>
-        <version>2.5.0</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

boman-modules/boman-gen/src/main/java/com/boman/gen/controller/GenController.java

@@ -7,7 +7,6 @@ import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
 import com.boman.common.core.constant.UserConstants;
-import com.boman.common.core.utils.SecurityUtils;
 import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -26,8 +25,8 @@ import com.boman.common.core.web.page.TableDataInfo;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;
 import com.boman.common.security.annotation.PreAuthorize;
-import com.boman.gen.domain.GenTable;
-import com.boman.gen.domain.GenTableColumn;
+import com.boman.domain.GenTable;
+import com.boman.domain.GenTableColumn;
 import com.boman.gen.service.IGenTableColumnService;
 import com.boman.gen.service.IGenTableService;
 

boman-modules/boman-gen/src/main/java/com/boman/gen/controller/GenTableColumnController.java

@@ -2,16 +2,13 @@ package com.boman.gen.controller;
 
 
 import com.boman.common.core.constant.UserConstants;
-import com.boman.common.core.utils.DateUtils;
 import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.web.controller.BaseController;
 import com.boman.common.core.web.domain.AjaxResult;
 import com.boman.common.core.web.page.TableDataInfo;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;
-import com.boman.common.security.annotation.PreAuthorize;
-import com.boman.gen.domain.GenTable;
-import com.boman.gen.domain.GenTableColumn;
+import com.boman.domain.GenTableColumn;
 import com.boman.gen.service.IGenTableColumnService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

boman-modules/boman-gen/src/main/java/com/boman/gen/controller/GenTableRelationController.java

@@ -5,7 +5,7 @@ import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.web.controller.BaseController;
 import com.boman.common.core.web.domain.AjaxResult;
 import com.boman.common.core.web.page.TableDataInfo;
-import com.boman.gen.domain.GenTableRelation;
+import com.boman.domain.GenTableRelation;
 import com.boman.gen.service.IGenTableRelationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

boman-modules/boman-gen/src/main/java/com/boman/gen/controller/MyController.java

@@ -6,9 +6,9 @@ import com.boman.common.core.web.domain.AjaxResult;
 import com.boman.common.redis.RedisKey;
 import com.boman.common.redis.service.RedisService;
 import com.boman.domain.constant.FormDataConstant;
-import com.boman.gen.domain.GenTable;
-import com.boman.gen.domain.GenTableColumn;
-import com.boman.gen.domain.GenTableRelation;
+import com.boman.domain.GenTable;
+import com.boman.domain.GenTableColumn;
+import com.boman.domain.GenTableRelation;
 import com.boman.gen.service.IGenTableColumnService;
 import com.boman.gen.service.IGenTableRelationService;
 import com.boman.gen.service.IGenTableService;

boman-modules/boman-gen/src/main/java/com/boman/gen/controller/TableSqlController.java

@@ -2,7 +2,7 @@ package com.boman.gen.controller;
 
 import com.boman.common.core.web.controller.BaseController;
 import com.boman.common.core.web.domain.AjaxResult;
-import com.boman.gen.domain.TableSql;
+import com.boman.domain.TableSql;
 import com.boman.gen.service.ITableSqlService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

boman-modules/boman-gen/src/main/java/com/boman/gen/mapper/GenTableColumnMapper.java

@@ -1,7 +1,7 @@
 package com.boman.gen.mapper;
 
 import java.util.List;
-import com.boman.gen.domain.GenTableColumn;
+import com.boman.domain.GenTableColumn;
 import org.apache.ibatis.annotations.Param;
 
 /**

boman-modules/boman-gen/src/main/java/com/boman/gen/mapper/GenTableMapper.java

@@ -1,7 +1,7 @@
 package com.boman.gen.mapper;
 
 import java.util.List;
-import com.boman.gen.domain.GenTable;
+import com.boman.domain.GenTable;
 
 /**
  * 业务 数据层

boman-modules/boman-gen/src/main/java/com/boman/gen/mapper/GenTableRelationMapper.java

@@ -1,6 +1,6 @@
 package com.boman.gen.mapper;
 
-import com.boman.gen.domain.GenTableRelation;
+import com.boman.domain.GenTableRelation;
 
 import java.util.List;
 

boman-modules/boman-gen/src/main/java/com/boman/gen/mapper/TableSqlMapper.java

@@ -1,6 +1,6 @@
 package com.boman.gen.mapper;
 
-import com.boman.gen.domain.TableSql;
+import com.boman.domain.TableSql;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

boman-modules/boman-gen/src/main/java/com/boman/gen/service/GenTableColumnServiceImpl.java

@@ -8,9 +8,9 @@ import com.boman.common.core.utils.StringUtils;
 import com.boman.common.core.utils.obj.ObjectUtils;
 import com.boman.common.log.enums.BusinessType;
 import com.boman.domain.constant.FormDataConstant;
-import com.boman.gen.domain.GenTable;
-import com.boman.gen.domain.GenTableColumn;
-import com.boman.gen.domain.TableSql;
+import com.boman.domain.GenTable;
+import com.boman.domain.GenTableColumn;
+import com.boman.domain.TableSql;
 import com.boman.gen.mapper.GenTableColumnMapper;
 import com.boman.gen.mapper.GenTableMapper;
 import com.boman.gen.mapper.TableSqlMapper;

boman-modules/boman-gen/src/main/java/com/boman/gen/service/GenTableRelationServiceImpl.java

@@ -1,8 +1,7 @@
 package com.boman.gen.service;
 
-import com.boman.gen.domain.GenTableRelation;
+import com.boman.domain.GenTableRelation;
 import com.boman.gen.mapper.GenTableRelationMapper;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

boman-modules/boman-gen/src/main/java/com/boman/gen/service/GenTableServiceImpl.java

@@ -7,7 +7,6 @@ import java.io.StringWriter;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.locks.Condition;
 import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
@@ -17,12 +16,11 @@ import com.boman.common.core.text.Convert;
 import com.boman.common.core.utils.DateUtils;
 import com.boman.common.core.web.domain.AjaxResult;
 import com.boman.common.log.enums.BusinessType;
-import com.boman.gen.domain.RoleEnum;
-import com.boman.gen.domain.TableSql;
+import com.boman.domain.RoleEnum;
+import com.boman.domain.TableSql;
 
 import com.boman.system.api.RemoteSysMenuService;
 import com.boman.system.api.domain.SysMenu;
-import io.swagger.models.auth.In;
 import org.apache.commons.io.IOUtils;
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
@@ -41,8 +39,8 @@ import com.boman.common.core.text.CharsetKit;
 import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.common.core.utils.file.FileUtils;
-import com.boman.gen.domain.GenTable;
-import com.boman.gen.domain.GenTableColumn;
+import com.boman.domain.GenTable;
+import com.boman.domain.GenTableColumn;
 import com.boman.gen.mapper.GenTableColumnMapper;
 import com.boman.gen.mapper.GenTableMapper;
 import com.boman.gen.util.GenUtils;

boman-modules/boman-gen/src/main/java/com/boman/gen/service/IGenTableColumnService.java

@@ -1,7 +1,7 @@
 package com.boman.gen.service;
 
 import java.util.List;
-import com.boman.gen.domain.GenTableColumn;
+import com.boman.domain.GenTableColumn;
 
 /**
  * 业务字段 服务层

boman-modules/boman-gen/src/main/java/com/boman/gen/service/IGenTableRelationService.java

@@ -1,6 +1,6 @@
 package com.boman.gen.service;
 
-import com.boman.gen.domain.GenTableRelation;
+import com.boman.domain.GenTableRelation;
 
 import java.util.List;
 

boman-modules/boman-gen/src/main/java/com/boman/gen/service/IGenTableService.java

@@ -4,7 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.boman.common.core.web.domain.AjaxResult;
-import com.boman.gen.domain.GenTable;
+import com.boman.domain.GenTable;
 
 /**
  * 业务 服务层

boman-modules/boman-gen/src/main/java/com/boman/gen/service/ITableSqlService.java

@@ -1,7 +1,7 @@
 package com.boman.gen.service;
 
 import com.boman.common.core.web.domain.AjaxResult;
-import com.boman.gen.domain.TableSql;
+import com.boman.domain.TableSql;
 
 /**
  * @author tjf

boman-modules/boman-gen/src/main/java/com/boman/gen/service/TableSqlServiceImpl.java

@@ -4,11 +4,10 @@ import com.boman.common.core.constant.UserConstants;
 import com.boman.common.core.utils.DateUtils;
 import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.utils.StringUtils;
-import com.boman.common.core.utils.obj.ObjectUtils;
 import com.boman.common.core.web.domain.AjaxResult;
-import com.boman.gen.domain.GenTable;
-import com.boman.gen.domain.GenTableColumn;
-import com.boman.gen.domain.TableSql;
+import com.boman.domain.GenTable;
+import com.boman.domain.GenTableColumn;
+import com.boman.domain.TableSql;
 import com.boman.gen.mapper.GenTableColumnMapper;
 import com.boman.gen.mapper.GenTableMapper;
 import com.boman.gen.mapper.TableSqlMapper;

boman-modules/boman-gen/src/main/java/com/boman/gen/util/GenUtils.java

@@ -3,8 +3,8 @@ package com.boman.gen.util;
 import com.boman.common.core.constant.GenConstants;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.gen.config.GenConfig;
-import com.boman.gen.domain.GenTable;
-import com.boman.gen.domain.GenTableColumn;
+import com.boman.domain.GenTable;
+import com.boman.domain.GenTableColumn;
 import org.apache.commons.lang3.RegExUtils;
 
 import java.util.Arrays;

boman-modules/boman-gen/src/main/java/com/boman/gen/util/VelocityUtils.java

@@ -8,8 +8,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.boman.common.core.constant.GenConstants;
 import com.boman.common.core.utils.DateUtils;
 import com.boman.common.core.utils.StringUtils;
-import com.boman.gen.domain.GenTable;
-import com.boman.gen.domain.GenTableColumn;
+import com.boman.domain.GenTable;
+import com.boman.domain.GenTableColumn;
 
 /**
  * 模板工具类

boman-modules/boman-job/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.boman</groupId>
         <artifactId>boman-modules</artifactId>
-        <version>2.5.0</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

boman-modules/boman-job/src/main/java/com/boman/job/RuoYiJobApplication.java

@@ -1,34 +1,34 @@
-//package com.boman.job;
-//
-//import org.springframework.boot.SpringApplication;
-//import org.springframework.cloud.client.SpringCloudApplication;
-//import com.boman.common.security.annotation.EnableCustomConfig;
-//import com.boman.common.security.annotation.EnableRyFeignClients;
-//import com.boman.common.swagger.annotation.EnableCustomSwagger2;
-//
-///**
-// * 定时任务
-// *
-// * @author ruoyi
-// */
-//@EnableCustomConfig
-//@EnableCustomSwagger2
-//@EnableRyFeignClients
-//@SpringCloudApplication
-//public class RuoYiJobApplication
-//{
-//    public static void main(String[] args)
-//    {
-//        SpringApplication.run(RuoYiJobApplication.class, args);
-//        System.out.println("(♥◠‿◠)ﾉﾞ  定时任务模块启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
-//                " .-------.       ____     __        \n" +
-//                " |  _ _   \\      \\   \\   /  /    \n" +
-//                " | ( ' )  |       \\  _. /  '       \n" +
-//                " |(_ o _) /        _( )_ .'         \n" +
-//                " | (_,_).' __  ___(_ o _)'          \n" +
-//                " |  |\\ \\  |  ||   |(_,_)'         \n" +
-//                " |  | \\ `'   /|   `-'  /           \n" +
-//                " |  |  \\    /  \\      /           \n" +
-//                " ''-'   `'-'    `-..-'              ");
-//    }
-//}
+package com.boman.job;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.cloud.client.SpringCloudApplication;
+import com.boman.common.security.annotation.EnableCustomConfig;
+import com.boman.common.security.annotation.EnableRyFeignClients;
+import com.boman.common.swagger.annotation.EnableCustomSwagger2;
+
+/**
+ * 定时任务
+ *
+ * @author ruoyi
+ */
+@EnableCustomConfig
+@EnableCustomSwagger2
+@EnableRyFeignClients
+@SpringCloudApplication
+public class RuoYiJobApplication
+{
+    public static void main(String[] args)
+    {
+        SpringApplication.run(RuoYiJobApplication.class, args);
+        System.out.println("(♥◠‿◠)ﾉﾞ  定时任务模块启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
+                " .-------.       ____     __        \n" +
+                " |  _ _   \\      \\   \\   /  /    \n" +
+                " | ( ' )  |       \\  _. /  '       \n" +
+                " |(_ o _) /        _( )_ .'         \n" +
+                " | (_,_).' __  ___(_ o _)'          \n" +
+                " |  |\\ \\  |  ||   |(_,_)'         \n" +
+                " |  | \\ `'   /|   `-'  /           \n" +
+                " |  |  \\    /  \\      /           \n" +
+                " ''-'   `'-'    `-..-'              ");
+    }
+}

boman-modules/boman-system/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.boman</groupId>
         <artifactId>boman-modules</artifactId>
-        <version>2.5.0</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 	

boman-modules/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.boman</groupId>
         <artifactId>boman</artifactId>
-        <version>2.5.0</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

boman-visual/boman-monitor/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.boman</groupId>
         <artifactId>boman-visual</artifactId>
-        <version>2.5.0</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 	

boman-visual/boman-monitor/src/main/java/com/boman/modules/monitor/RuoYiMonitorApplication.java

@@ -1,30 +1,30 @@
-//package com.boman.modules.monitor;
-//
-//import de.codecentric.boot.admin.server.config.EnableAdminServer;
-//import org.springframework.boot.SpringApplication;
-//import org.springframework.cloud.client.SpringCloudApplication;
-//
-///**
-// * 监控中心
-// *
-// * @author ruoyi
-// */
-//@EnableAdminServer
-//@SpringCloudApplication
-//public class RuoYiMonitorApplication
-//{
-//    public static void main(String[] args)
-//    {
-//        SpringApplication.run(RuoYiMonitorApplication.class, args);
-//        System.out.println("(♥◠‿◠)ﾉﾞ  监控中心启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
-//                " .-------.       ____     __        \n" +
-//                " |  _ _   \\      \\   \\   /  /    \n" +
-//                " | ( ' )  |       \\  _. /  '       \n" +
-//                " |(_ o _) /        _( )_ .'         \n" +
-//                " | (_,_).' __  ___(_ o _)'          \n" +
-//                " |  |\\ \\  |  ||   |(_,_)'         \n" +
-//                " |  | \\ `'   /|   `-'  /           \n" +
-//                " |  |  \\    /  \\      /           \n" +
-//                " ''-'   `'-'    `-..-'              ");
-//    }
-//}
+package com.boman.modules.monitor;
+
+import de.codecentric.boot.admin.server.config.EnableAdminServer;
+import org.springframework.boot.SpringApplication;
+import org.springframework.cloud.client.SpringCloudApplication;
+
+/**
+ * 监控中心
+ *
+ * @author ruoyi
+ */
+@EnableAdminServer
+@SpringCloudApplication
+public class RuoYiMonitorApplication
+{
+    public static void main(String[] args)
+    {
+        SpringApplication.run(RuoYiMonitorApplication.class, args);
+        System.out.println("(♥◠‿◠)ﾉﾞ  监控中心启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
+                " .-------.       ____     __        \n" +
+                " |  _ _   \\      \\   \\   /  /    \n" +
+                " | ( ' )  |       \\  _. /  '       \n" +
+                " |(_ o _) /        _( )_ .'         \n" +
+                " | (_,_).' __  ___(_ o _)'          \n" +
+                " |  |\\ \\  |  ||   |(_,_)'         \n" +
+                " |  | \\ `'   /|   `-'  /           \n" +
+                " |  |  \\    /  \\      /           \n" +
+                " ''-'   `'-'    `-..-'              ");
+    }
+}

boman-visual/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.boman</groupId>
         <artifactId>boman</artifactId>
-        <version>2.5.0</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

boman-web-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.boman</groupId>
         <artifactId>boman</artifactId>
-        <version>2.5.0</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -90,22 +90,17 @@
         <dependency>
             <groupId>com.boman</groupId>
             <artifactId>boman-api-gen</artifactId>
-            <version>2.5.0</version>
+            <version>2.5.0-SNAPSHOT</version>
         </dependency>
 
         <!--        远程调用 system-->
         <dependency>
             <groupId>com.boman</groupId>
             <artifactId>boman-api-system</artifactId>
-            <version>2.5.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.boman</groupId>
-                    <artifactId>boman-modules-gen</artifactId>
-                </exclusion>
-            </exclusions>
+            <version>2.5.0-SNAPSHOT</version>
         </dependency>
 
+
     </dependencies>
 
     <build>

boman-web-core/src/main/java/com/boman/web/core/BomanWebCoreApplication.java

@@ -5,6 +5,7 @@ import com.boman.common.security.annotation.EnableRyFeignClients;
 import com.boman.common.swagger.annotation.EnableCustomSwagger2;
 import org.springframework.boot.SpringApplication;
 import org.springframework.cloud.client.SpringCloudApplication;
+import org.springframework.context.annotation.ComponentScan;
 
 /**
  * web-core
@@ -15,6 +16,7 @@ import org.springframework.cloud.client.SpringCloudApplication;
 @EnableCustomSwagger2
 @EnableRyFeignClients
 @SpringCloudApplication
+@ComponentScan(value="com.boman")
 public class BomanWebCoreApplication {
 
     public static void main(String[] args) {

boman-web-core/src/main/java/com/boman/web/core/controller/ObjController.java

@@ -1,7 +1,8 @@
 package com.boman.web.core.controller;
 
 import com.boman.common.core.web.domain.AjaxResult;
-import com.boman.gen.controller.MyController;
+import com.boman.domain.GenTable;
+//import com.boman.gen.controller.MyController;
 import com.boman.web.core.domain.FormDataDto;
 import com.boman.web.core.service.TableServiceCmdService;
 import io.swagger.annotations.ApiOperation;
@@ -137,7 +138,7 @@ public class ObjController {
     /**
      * 功能描述: 获取表单查询字段、按钮、表头
      * 注意: 都是从redis中拿的，如果数据库和redis不一致，则需刷新一下redis
-     * 刷新的入口为 {@link MyController#loadTable(com.boman.gen.domain.GenTable)}
+     * 刷新的入口为 {@link MyController#loadTable(GenTable)}
      *
      *                    eg:{
      *                          "table": "sys_config"
@@ -155,7 +156,7 @@ public class ObjController {
     /**
      * 功能描述: 获取表单查询字段
      * 注意: 都是从redis中拿的，如果数据库和redis不一致，则需刷新一下redis
-     * 刷新的入口为 {@link MyController#loadTable(com.boman.gen.domain.GenTable)}
+     * 刷新的入口为 {@link MyController#loadTable(GenTable)}
      *
      *                    eg:{
      *                          "table": "sys_config"
@@ -174,7 +175,7 @@ public class ObjController {
 //    /**
 //     * 功能描述: 获取表单表头
 //     * 注意: 都是从redis中拿的，如果数据库和redis不一致，则需刷新一下redis
-//     * 刷新的入口为 {@link MyController#loadTable(com.boman.gen.domain.GenTable)}
+//     * 刷新的入口为 {@link MyController#loadTable(com.boman.domain.GenTable)}
 //     *
 //     *                    eg:{
 //     *                          "table": "sys_config"
@@ -192,7 +193,7 @@ public class ObjController {
     /**
      * 功能描述: 获取表单按钮
      * 注意: 都是从redis中拿的，如果数据库和redis不一致，则需刷新一下redis
-     * 刷新的入口为 {@link MyController#loadTable(com.boman.gen.domain.GenTable)}
+     * 刷新的入口为 {@link MyController#loadTable(GenTable)}
      *
      *                    eg:{
      *                          "table": "sys_config"

boman-web-core/src/main/java/com/boman/web/core/controller/TableController.java

@@ -1,7 +1,7 @@
 package com.boman.web.core.controller;
 
 import com.boman.common.core.web.domain.AjaxResult;
-import com.boman.gen.domain.GenTable;
+import com.boman.domain.GenTable;
 import com.boman.web.core.service.TableServiceCmdService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

boman-web-core/src/main/java/com/boman/web/core/domain/TableContext.java

@@ -4,8 +4,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.boman.common.core.utils.SpringUtils;
 import com.boman.common.redis.RedisKey;
 import com.boman.common.redis.service.RedisService;
-import com.boman.gen.domain.GenTable;
-import com.boman.gen.domain.GenTableColumn;
+import com.boman.domain.GenTable;
+import com.boman.domain.GenTableColumn;
 import com.boman.web.core.utils.IdUtils;
 
 import java.util.List;

boman-web-core/src/main/java/com/boman/web/core/service/TableServiceCmdService.java

@@ -16,9 +16,9 @@ import com.boman.domain.SysDictData;
 import com.boman.domain.constant.*;
 import com.boman.gen.api.RemoteGenTableColumnService;
 import com.boman.gen.api.RemoteGenTableService;
-import com.boman.gen.controller.MyController;
-import com.boman.gen.domain.GenTable;
-import com.boman.gen.domain.GenTableColumn;
+//import com.boman.gen.controller.MyController;
+import com.boman.domain.GenTable;
+import com.boman.domain.GenTableColumn;
 import com.boman.system.api.RemoteDictDataService;
 import com.boman.system.api.domain.SysFile;
 import com.boman.web.core.domain.*;
@@ -67,7 +67,7 @@ public class TableServiceCmdService {
     @Resource
     private IBaseUpdateService updateService;
     @Resource
-    private  RestTemplate restTemplate;
+    private RestTemplate restTemplate;
     @Resource
     private RemoteDictDataService remoteDictDataService;
     @Resource
@@ -220,15 +220,15 @@ public class TableServiceCmdService {
         // 处理blob
         handlerBlobWithJSONObject(genTable.getIsContainsBlob(), result);
         // 处理日期、外键、字典值
-        handler(result =  filter(result, ObjectUtils::isNotEmpty), columns);
+        handler(result = filter(result, ObjectUtils::isNotEmpty), columns);
         // 定制接口
-        result = isCustomized(dto.getTable(),result,"trigger_retrieve");
+        result = isCustomized(dto.getTable(), result, "trigger_retrieve");
 
         rows.put(PAGE_ROWS, result);
         return AjaxResult.success(rows);
     }
 
-    private void handler(List<JSONObject> result, List<GenTableColumn> columns){
+    private void handler(List<JSONObject> result, List<GenTableColumn> columns) {
         // 处理时间
         handlerDate(result, columns);
         // 处理字典值
@@ -259,7 +259,7 @@ public class TableServiceCmdService {
             for (JSONObject json : result) {
                 if (json.containsKey(selfColumnName.toUpperCase()) || json.containsKey(selfColumnName.toLowerCase())) {
                     Map<String, String> fkInfoMap = column.getFkInfo();
-                    String fkTableName =  fkInfoMap.get(FK_TABLE_NAME);
+                    String fkTableName = fkInfoMap.get(FK_TABLE_NAME);
                     String fkColumnName = fkInfoMap.get(FK_COLUMN_NAME);
                     String dkColumnName = fkInfoMap.get(DK_COLUMN_NAME);
                     Object primaryTableFkValue = json.get(selfColumnName);
@@ -341,7 +341,8 @@ public class TableServiceCmdService {
             for (GenTableColumn column : columns) {
                 if (jsonObject.containsKey(column.getColumnName())) {
                     String value = jsonObject.getString(column.getColumnName());
-                    List<SysFile> fileList = JSON.parseObject(value, new TypeReference<List<SysFile>>(){}.getType());
+                    List<SysFile> fileList = JSON.parseObject(value, new TypeReference<List<SysFile>>() {
+                    }.getType());
                     jsonObject.put(column.getColumnName(), fileList);
                 }
             }
@@ -412,7 +413,7 @@ public class TableServiceCmdService {
                         handlerDate(Collections.singletonList(json), Collections.singletonList(column));
                         handlerForeignKey(Collections.singletonList(json), Collections.singletonList(column));
                         if (GenConstants.HTML_IMAGE_UPLOAD.equalsIgnoreCase(column.getHtmlType())
-                                || GenConstants.HTML_FILE_UPLOAD.equalsIgnoreCase(column.getHtmlType()) ) {
+                                || GenConstants.HTML_FILE_UPLOAD.equalsIgnoreCase(column.getHtmlType())) {
                             handlerAnnex(Collections.singletonList(json), Collections.singletonList(column));
                         }
 
@@ -496,18 +497,18 @@ public class TableServiceCmdService {
         // genTable.getMenuRole() 暂时数据库没有数据，
         jsonObject.put(FormDataConstant.BUTTON_LIST, Strings.nullToEmpty(genTable.getMenuRole()));
 
-         jsonObject.put(ViewConst.VIEW_TYPE, Strings.nullToEmpty(genTable.getTplCategory()));
+        jsonObject.put(ViewConst.VIEW_TYPE, Strings.nullToEmpty(genTable.getTplCategory()));
         return AjaxResult.success(jsonObject);
     }
 
     /**
      * 功能描述: 获取表单查询字段
      * 注意: 都是从redis中拿的，如果数据库和redis不一致，则需刷新一下redis
-     * 刷新的入口为 {@link MyController#loadTable(com.boman.gen.domain.GenTable)}
-     *
-     *                    eg:{
-     *                          "table": "sys_config"
-     *                        }
+     * 刷新的入口为 {@link MyController#loadTable(GenTable)}
+     * <p>
+     * eg:{
+     * "table": "sys_config"
+     * }
      *
      * @param condition condition
      * @return com.boman.common.core.web.domain.AjaxResult
@@ -545,10 +546,11 @@ public class TableServiceCmdService {
 
     /**
      * 根据表对象获取要显示的表头信息
+     *
      * @param genTable
      * @return
      */
-    public List<GenTableColumn> getTableHeadList(GenTable genTable){
+    public List<GenTableColumn> getTableHeadList(GenTable genTable) {
         List<GenTableColumn> columns = genTable.getColumns();
         // 表头
         return filterData(columns, 4, MaskConstant.LIST_VISIBLE::equals);
@@ -647,18 +649,19 @@ public class TableServiceCmdService {
     /**
      * 是否定制
      * 判断是否需要转发到定制接口
+     *
      * @param tableName 表明
-     * @param result 结果
-     * @param action 动作
+     * @param result    结果
+     * @param action    动作
      * @return 结果
      */
     public List<JSONObject> isCustomized(String tableName, List<JSONObject> result, String action) {
         requireNonNull(tableName);
         requireNonNull(action);
-        if (result != null && result.size() > 0){
+        if (result != null && result.size() > 0) {
             //获取到服务名称
             String triggerName = getTriggerName(tableName, action);
-            if(triggerName != null){
+            if (triggerName != null) {
                 //组织请求 acos + RestTemplate
                 return restTemplate.postForObject("http://" + triggerName, result, List.class);
             }
@@ -668,22 +671,23 @@ public class TableServiceCmdService {
 
     /**
      * 判断是什么action
+     *
      * @param tableName 表明
-     * @param action 动作
+     * @param action    动作
      * @return
      */
-    private String getTriggerName(String tableName, String action){
+    private String getTriggerName(String tableName, String action) {
         GenTable genTable = getTableFromRedisByTableName(RedisKey.TABLE_INFO, tableName);
         requireNonNull(genTable);
-        if (action.equals(TriggerActionConstant.ACTION_CREATE)){
+        if (action.equals(TriggerActionConstant.ACTION_CREATE)) {
             return genTable.getTriggerCreate();
-        }else if (action.equals(TriggerActionConstant.ACTION_RETRIEVE)){
+        } else if (action.equals(TriggerActionConstant.ACTION_RETRIEVE)) {
             return genTable.getTriggerRetrieve();
-        }else if (action.equals(TriggerActionConstant.ACTION_UPDATE)){
+        } else if (action.equals(TriggerActionConstant.ACTION_UPDATE)) {
             return genTable.getTriggerUpdate();
-        }else if (action.equals(TriggerActionConstant.ACTION_DELETE)){
+        } else if (action.equals(TriggerActionConstant.ACTION_DELETE)) {
             return genTable.getTriggerDelete();
-        }else if (action.equals(TriggerActionConstant.ACTION_SUBMIT)){
+        } else if (action.equals(TriggerActionConstant.ACTION_SUBMIT)) {
             return genTable.getTriggerSubmit();
         }
         return null;
@@ -694,7 +698,7 @@ public class TableServiceCmdService {
      *
      * @param redisKeyPrefix 前缀
      * @param tableName      表名
-     * @return com.boman.gen.domain.GenTable
+     * @return com.boman.domain.GenTable
      */
     public GenTable getTableFromRedisByTableName(String redisKeyPrefix, String tableName) {
         tableName = tableName.trim().toLowerCase();
@@ -770,7 +774,7 @@ public class TableServiceCmdService {
         return remoteGenTableColumnService.listColumnsByTableId(table.getTableId());
     }
 
-    public List<SysDictData> listSysDictDataByType(String dictType){
+    public List<SysDictData> listSysDictDataByType(String dictType) {
         List<SysDictData> sysDictData = null;
         try {
             sysDictData = remoteDictDataService.listByType(dictType);

boman-web-core/src/main/java/com/boman/web/core/service/common/CommonServiceImpl.java

@@ -3,7 +3,7 @@ package com.boman.web.core.service.common;
 import com.alibaba.fastjson.JSONObject;
 import com.boman.common.redis.RedisKey;
 import com.boman.common.redis.service.RedisService;
-import com.boman.gen.domain.GenTable;
+import com.boman.domain.GenTable;
 import com.boman.web.core.service.TableServiceCmdService;
 import com.boman.web.core.service.select.IBaseSelectService;
 import com.boman.web.core.utils.IdUtils;

boman-web-core/src/main/java/com/boman/web/core/service/save/BaseSaveServiceImpl.java

@@ -7,7 +7,7 @@ import com.boman.common.core.utils.obj.ObjectUtils;
 import com.boman.common.redis.service.RedisService;
 import com.boman.common.security.service.TokenService;
 import com.boman.domain.constant.FormDataConstant;
-import com.boman.gen.domain.GenTableColumn;
+import com.boman.domain.GenTableColumn;
 import com.boman.system.api.model.LoginUser;
 import com.boman.web.core.domain.RowResult;
 import com.boman.web.core.domain.TableContext;

boman-web-core/src/main/java/com/boman/web/core/service/select/BaseSelectServiceImpl.java

@@ -3,7 +3,7 @@ package com.boman.web.core.service.select;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.boman.common.redis.RedisKey;
-import com.boman.gen.domain.GenTable;
+import com.boman.domain.GenTable;
 import com.boman.web.core.mapper.StandardlyMapper;
 import com.boman.web.core.service.TableServiceCmdService;
 import com.boman.web.core.utils.ColumnUtils;

boman-web-core/src/main/java/com/boman/web/core/service/update/BaseUpdateServiceImpl.java

@@ -2,7 +2,7 @@ package com.boman.web.core.service.update;
 
 import com.alibaba.fastjson.JSONObject;
 import com.boman.common.core.utils.obj.ObjectUtils;
-import com.boman.gen.domain.GenTableColumn;
+import com.boman.domain.GenTableColumn;
 import com.boman.web.core.domain.TableContext;
 import com.boman.web.core.mapper.StandardlyMapper;
 import com.boman.web.core.utils.ColumnUtils;

boman-web-core/src/main/java/com/boman/web/core/utils/ColumnUtils.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.utils.obj.ObjectUtils;
-import com.boman.gen.domain.GenTableColumn;
+import com.boman.domain.GenTableColumn;
 import com.boman.domain.exception.UnknownColumnException;
 import com.google.common.collect.Lists;
 import org.apache.commons.collections4.MapUtils;
@@ -259,7 +259,7 @@ public class ColumnUtils {
      * 功能描述: 数字小的在前面，数字大的在后面
      *
      * @param allColumns allColumns
-     * @return java.util.List<com.boman.gen.domain.GenTableColumn>
+     * @return java.util.List<com.boman.domain.GenTableColumn>
      */
     public static List<GenTableColumn> filterHrAndSort(List<GenTableColumn> allColumns) {
         requireNonNull(allColumns, "columns is empty");

boman-web-core/src/main/java/com/boman/web/core/utils/IdUtils.java

@@ -3,7 +3,7 @@ package com.boman.web.core.utils;
 import com.boman.common.core.utils.SpringUtils;
 import com.boman.common.redis.RedisKey;
 import com.boman.common.redis.service.RedisService;
-import com.boman.gen.domain.GenTableColumn;
+import com.boman.domain.GenTableColumn;
 import com.boman.web.core.mapper.StandardlyMapper;
 import org.apache.commons.collections.CollectionUtils;
 

pom.xml

@@ -6,14 +6,14 @@
 
     <groupId>com.boman</groupId>
     <artifactId>boman</artifactId>
-    <version>2.5.0</version>
+    <version>2.5.0-SNAPSHOT</version>
 
     <name>boman</name>
     <url>http://www.boman.vip</url>
     <description>博曼系统</description>
 
     <properties>
-        <boman.version>2.5.0</boman.version>
+        <boman.version>2.5.0-SNAPSHOT</boman.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
@@ -70,11 +70,11 @@
             </dependency>
 			
             <!--  SpringBoot 监控客户端 -->
-            <dependency>
-                <groupId>de.codecentric</groupId>
-                <artifactId>spring-boot-admin-starter-client</artifactId>
-                <version>${spring-boot-admin.version}</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>de.codecentric</groupId>-->
+<!--                <artifactId>spring-boot-admin-starter-client</artifactId>-->
+<!--                <version>${spring-boot-admin.version}</version>-->
+<!--            </dependency>-->
 			
             <!-- FastDFS 分布式文件系统 -->
             <dependency>
@@ -252,4 +252,16 @@
         </plugins>
     </build>
 
+    <distributionManagement>
+        <repository>
+            <id>maven-releases</id>
+            <url>http://dev.xhsoftware.cn:18090/repository/maven-releases</url>
+        </repository>
+
+        <snapshotRepository>
+            <id>maven-snapshots</id>
+            <url>http://dev.xhsoftware.cn:18090/repository/maven-snapshots</url>
+        </snapshotRepository>
+    </distributionManagement>
+
 </project>