diff --git a/common/generator-v1/pom.xml b/common/generator-v1/pom.xml deleted file mode 100644 index 8822048..0000000 --- a/common/generator-v1/pom.xml +++ /dev/null @@ -1,72 +0,0 @@ - - 4.0.0 - - cn.bunny - common - 0.0.1-SNAPSHOT - - - generator-v1 - jar - - common-utils - https://maven.apache.org - - - UTF-8 - - - - - cn.bunny - dao - 0.0.1-SNAPSHOT - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - - - io.jsonwebtoken - jjwt - - - - cn.hutool - hutool-all - - - - com.mysql - mysql-connector-j - - - - com.zaxxer - HikariCP - - - javax.xml.bind - jaxb-api - 2.1 - - - - com.baomidou - mybatis-plus-generator - 3.5.6 - - - org.apache.velocity - velocity-engine-core - 2.3 - - - - com.google.guava - guava - 33.3.0-jre - - - diff --git a/common/generator-v1/src/main/java/cn/bunny/common/generator/entity/BaseField.java b/common/generator-v1/src/main/java/cn/bunny/common/generator/entity/BaseField.java deleted file mode 100644 index d4e0a79..0000000 --- a/common/generator-v1/src/main/java/cn/bunny/common/generator/entity/BaseField.java +++ /dev/null @@ -1,30 +0,0 @@ -package cn.bunny.common.generator.entity; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -@ApiModel(value = "BaseEntity对象", description = "生成类基础内容") -public class BaseField { - @ApiModelProperty("字段名称") - private String name; - - @ApiModelProperty("注释内容") - private String annotation; - - @ApiModelProperty("TS类型") - private String type; - - @ApiModelProperty("是否必须参数") - private Boolean require; - - @ApiModelProperty("是否必须参数消息内容") - private String requireMessage; -} diff --git a/common/generator-v1/src/main/java/cn/bunny/common/generator/entity/BaseResultMap.java b/common/generator-v1/src/main/java/cn/bunny/common/generator/entity/BaseResultMap.java deleted file mode 100644 index af19c77..0000000 --- a/common/generator-v1/src/main/java/cn/bunny/common/generator/entity/BaseResultMap.java +++ /dev/null @@ -1,21 +0,0 @@ -package cn.bunny.common.generator.entity; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -@Schema(name = "BaseResultMap对象", title = "数据库基础字段返回映射", description = "数据库基础字段返回映射") -public class BaseResultMap { - - @Schema(name = "column", title = "数据库字段") - private String column; - - @Schema(name = "property", title = "实体类字段") - private String property; -} diff --git a/common/generator-v1/src/main/java/cn/bunny/common/generator/entity/ColumnsField.java b/common/generator-v1/src/main/java/cn/bunny/common/generator/entity/ColumnsField.java deleted file mode 100644 index d1e3cc4..0000000 --- a/common/generator-v1/src/main/java/cn/bunny/common/generator/entity/ColumnsField.java +++ /dev/null @@ -1,21 +0,0 @@ -package cn.bunny.common.generator.entity; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -@ApiModel(value = "ColumnsField对象", description = "columns列字段名称") -public class ColumnsField { - @ApiModelProperty("列字段名称") - private String name; - - @ApiModelProperty("列字段值") - private String value; -} diff --git a/common/generator-v1/src/main/java/cn/bunny/common/generator/entity/StoreTypeField.java b/common/generator-v1/src/main/java/cn/bunny/common/generator/entity/StoreTypeField.java deleted file mode 100644 index 3fb03a0..0000000 --- a/common/generator-v1/src/main/java/cn/bunny/common/generator/entity/StoreTypeField.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.bunny.common.generator.entity; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.List; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -@ApiModel(value = "StoreTypeField对象", description = "仓库类型生成内容") -public class StoreTypeField { - - private List baseFieldList; - - @ApiModelProperty("接口名称") - private String interfaceName; - - @ApiModelProperty("接口注释内容") - private String interfaceAnnotation; -} \ No newline at end of file diff --git a/common/generator-v1/src/main/java/cn/bunny/common/generator/generator/AdminCodeGenerator.java b/common/generator-v1/src/main/java/cn/bunny/common/generator/generator/AdminCodeGenerator.java deleted file mode 100644 index 88afe38..0000000 --- a/common/generator-v1/src/main/java/cn/bunny/common/generator/generator/AdminCodeGenerator.java +++ /dev/null @@ -1,76 +0,0 @@ -package cn.bunny.common.generator.generator; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.generator.FastAutoGenerator; -import com.baomidou.mybatisplus.generator.config.OutputFile; -import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy; -import org.apache.ibatis.annotations.Mapper; - -import java.util.Collections; - -public class AdminCodeGenerator { - // 数据连接 - public static final String sqlHost = "jdbc:mysql://192.168.3.98:3304/auth_admin?serverTimezone=GMT%2B8&useSSL=false&characterEncoding=utf-8&allowPublicKeyRetrieval=true"; - // 作者名称 - public static final String author = "Bunny"; - // 公共路径 - // public static final String outputDir = "D:\\MyFolder\\auth-admin\\auth-server-java\\service"; - public static final String outputDir = "D:\\Project\\web\\PC\\auth\\auth-server-java\\service"; - // 实体类名称 - public static final String entity = "Bunny"; - - public static void main(String[] args) { - Generation("sys_message_received"); - } - - /** - * 根据表名生成相应结构代码 - * - * @param tableName 表名 - */ - public static void Generation(String... tableName) { - // 修改数据库路径、账户、密码 - FastAutoGenerator.create(sqlHost, "root", "02120212") - .globalConfig(builder -> { - // 添加作者名称 - builder.author(author) - // 启用swagger - .enableSwagger() - // 指定输出目录 - .outputDir(outputDir + "/src/main/java"); - }) - .packageConfig(builder -> builder.entity(entity)// 实体类包名 - // 父包名。如果为空,将下面子包名必须写全部, 否则就只需写子包名 - .parent("cn.bunny.services") - .controller("controller")// 控制层包名 - .mapper("mapper")// mapper层包名 - .service("service")// service层包名 - .serviceImpl("service.impl")// service实现类包名 - // 自定义mapper.xml文件输出目录 - .pathInfo(Collections.singletonMap(OutputFile.xml, outputDir + "/src/main/resources/mapper"))) - .strategyConfig(builder -> { - // 设置要生成的表名 - builder.addInclude(tableName) - .addTablePrefix("sys_", "v_", "log_") - .entityBuilder() - .enableLombok() - .enableChainModel() - .naming(NamingStrategy.underline_to_camel)// 数据表映射实体命名策略:默认下划线转驼峰underline_to_camel - .columnNaming(NamingStrategy.underline_to_camel)// 表字段映射实体属性命名规则:默认null,不指定按照naming执行 - .idType(IdType.AUTO)// 添加全局主键类型 - .formatFileName("%s")// 格式化实体名称,%s取消首字母I, - .mapperBuilder() - .mapperAnnotation(Mapper.class)// 开启mapper注解 - .enableBaseResultMap()// 启用xml文件中的BaseResultMap 生成 - .enableBaseColumnList()// 启用xml文件中的BaseColumnList - .formatMapperFileName("%sMapper")// 格式化Dao类名称 - .formatXmlFileName("%sMapper")// 格式化xml文件名称 - .serviceBuilder() - .formatServiceFileName("%sService")// 格式化 service 接口文件名称 - .formatServiceImplFileName("%sServiceImpl")// 格式化 service 接口文件名称 - .controllerBuilder() - .enableRestStyle(); - }) - .execute(); - } -} diff --git a/common/generator-v1/src/main/java/cn/bunny/common/generator/generator/I18nCodeGenerator.java b/common/generator-v1/src/main/java/cn/bunny/common/generator/generator/I18nCodeGenerator.java deleted file mode 100644 index f0855c8..0000000 --- a/common/generator-v1/src/main/java/cn/bunny/common/generator/generator/I18nCodeGenerator.java +++ /dev/null @@ -1,75 +0,0 @@ -package cn.bunny.common.generator.generator; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.generator.FastAutoGenerator; -import com.baomidou.mybatisplus.generator.config.OutputFile; -import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy; -import org.apache.ibatis.annotations.Mapper; - -import java.util.Collections; - -public class I18nCodeGenerator { - // 数据连接 - public static final String sqlHost = "jdbc:mysql://106.15.251.123:3305/bunny_docs_i18n?serverTimezone=GMT%2B8&useSSL=false&characterEncoding=utf-8&allowPublicKeyRetrieval=true"; - // 作者名称 - public static final String author = "Bunny"; - // 公共路径 - public static final String outputDir = "D:\\MyFolder\\Bunny\\BunnyBBS\\BunnyBBS-server-admin\\service"; - // 实体类名称 - public static final String entity = "Bunny"; - - public static void main(String[] args) { - Generation("language"); - } - - /** - * 根据表名生成相应结构代码 - * - * @param tableName 表名 - */ - public static void Generation(String... tableName) { - FastAutoGenerator.create(sqlHost, "root", "02120212") - .globalConfig(builder -> { - // 添加作者名称 - builder.author(author) - // 启用swagger - .enableSwagger() - // 指定输出目录 - .outputDir(outputDir + "/src/main/java"); - }) - .packageConfig(builder -> { - builder.entity(entity)// 实体类包名 - .parent("cn.bunny.service.admin") - .controller("controller.i18n")// 控制层包名 - .mapper("mapper.i18n")// mapper层包名 - .service("service.i18n")// service层包名 - .serviceImpl("service.i18n.impl")// service实现类包名 - // 自定义mapper.xml文件输出目录 - .pathInfo(Collections.singletonMap(OutputFile.xml, outputDir + "/src/main/resources/mapper/i18n")); - }) - .strategyConfig(builder -> { - // 设置要生成的表名 - builder.addInclude(tableName) - //.addTablePrefix("sys_")// 设置表前缀过滤 - .entityBuilder() - .enableLombok() - .enableChainModel() - .naming(NamingStrategy.underline_to_camel)// 数据表映射实体命名策略:默认下划线转驼峰underline_to_camel - .columnNaming(NamingStrategy.underline_to_camel)// 表字段映射实体属性命名规则:默认null,不指定按照naming执行 - .idType(IdType.AUTO)// 添加全局主键类型 - .formatFileName("%s")// 格式化实体名称,%s取消首字母I, - .mapperBuilder() - .mapperAnnotation(Mapper.class)// 开启mapper注解 - .enableBaseResultMap()// 启用xml文件中的BaseResultMap 生成 - .enableBaseColumnList()// 启用xml文件中的BaseColumnList - .formatMapperFileName("%sMapper")// 格式化Dao类名称 - .formatXmlFileName("%sMapper")// 格式化xml文件名称 - .serviceBuilder() - .formatServiceFileName("%sService")// 格式化 service 接口文件名称 - .formatServiceImplFileName("%sServiceImpl")// 格式化 service 接口文件名称 - .controllerBuilder() - .enableRestStyle(); - }) - .execute(); - } -} diff --git a/common/generator-v1/src/main/java/cn/bunny/common/generator/generator/WebGeneratorCode.java b/common/generator-v1/src/main/java/cn/bunny/common/generator/generator/WebGeneratorCode.java deleted file mode 100644 index 2f8d550..0000000 --- a/common/generator-v1/src/main/java/cn/bunny/common/generator/generator/WebGeneratorCode.java +++ /dev/null @@ -1,275 +0,0 @@ -package cn.bunny.common.generator.generator; - -import cn.bunny.common.generator.entity.BaseField; -import cn.bunny.common.generator.entity.BaseResultMap; -import cn.bunny.common.generator.utils.GeneratorCodeUtils; -import cn.bunny.dao.dto.system.user.AdminUserAddDto; -import cn.bunny.dao.dto.system.user.AdminUserDto; -import cn.bunny.dao.dto.system.user.AdminUserUpdateDto; -import cn.bunny.dao.entity.system.AdminUser; -import cn.bunny.dao.vo.system.user.AdminUserVo; -import com.baomidou.mybatisplus.annotation.TableName; -import com.google.common.base.CaseFormat; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import org.apache.velocity.Template; -import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.Velocity; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - -import java.io.FileWriter; -import java.io.IOException; -import java.lang.reflect.Field; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.Arrays; -import java.util.List; -import java.util.Properties; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -/** - * * 代码生成器入口点 - */ -@Service -public class WebGeneratorCode { - // 公共路径 - // public static String commonPath = "D:\\Project\\web\\PC\\financial\\financial-web\\src"; - public static String commonPath = "D:\\MyFolder\\financial\\financial-web\\src"; - // 生成API请求路径 - public static String apiPath = commonPath + "\\api\\v1\\financial\\"; - // 生成vue路径 - public static String vuePath = commonPath + "\\views\\financial\\"; - // 生成仓库路径 - public static String storePath = commonPath + "\\store\\financial\\"; - // 后端controller - public static String controllerPath = "D:\\MyFolder\\financial\\financial-server\\service\\src\\main\\java\\cn\\bunny\\services\\controller\\financial\\"; - public static String servicePath = "D:\\MyFolder\\financial\\financial-server\\service\\src\\main\\java\\cn\\bunny\\services\\service\\financial\\"; - public static String serviceImplPath = "D:\\MyFolder\\financial\\financial-server\\service\\src\\main\\java\\cn\\bunny\\services\\service\\financial\\impl\\"; - public static String mapperPath = "D:\\MyFolder\\financial\\financial-server\\service\\src\\main\\java\\cn\\bunny\\services\\mapper\\financial\\"; - public static String resourceMapperPath = "D:\\MyFolder\\financial\\financial-server\\service\\src\\main\\resources\\mapper\\financial\\"; - - public static void main(String[] args) throws Exception { - Class originalClass = AdminUser.class; - Class dtoClass = AdminUserDto.class; - Class addDtoClass = AdminUserAddDto.class; - Class updateDtoClass = AdminUserUpdateDto.class; - Class voClass = AdminUserVo.class; - - // 设置velocity资源加载器 - Properties prop = new Properties(); - prop.put("file.resource.loader.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader"); - Velocity.init(prop); - // 创建Velocity容器 - VelocityContext context = new VelocityContext(); - - // 原始类名称 - String originalName = originalClass.getSimpleName(); - // 转成开头小写类名称,作为文件名 - String lowercaseName = originalName.substring(0, 1).toLowerCase() + originalName.substring(1); - // 转成中划线,做vue命名使用 - String lowerHyphen = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_HYPHEN, originalName); - // 生成字段xxx管理 - String classDescription = originalClass.getAnnotation(Schema.class).description(); - // 类注解标题 - String classTitle = originalClass.getAnnotation(Schema.class).title(); - - context.put("originalName", originalName); - context.put("lowercaseName", lowercaseName); - context.put("lowerHyphen", lowerHyphen); - context.put("classDescription", classDescription); - context.put("classTitle", classTitle); - context.put("leftBrace", "${"); - context.put("date", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); - - // 生成前端内容 - generatorWebCode(dtoClass, addDtoClass, context); - - // 生成后端 - generatorServerCode(originalClass, dtoClass, voClass, context); - - // 写入文件 - writeFiles(lowercaseName, lowerHyphen, originalName, context); - } - - /** - * * web端生成字段 - */ - public static void generatorWebCode(Class dtoClass, Class addDtoClass, VelocityContext context) { - // 生成 Store 中 form 表单内容 - List formList = Arrays.stream(dtoClass.getDeclaredFields()) - .filter(field -> !field.getName().equals("id")) - .map(field -> BaseField.builder().name(field.getName()).annotation(field.getAnnotation(Schema.class).title()).build()) - .toList(); - - // 添加表单字段值 - List addFormList = Arrays.stream(addDtoClass.getDeclaredFields()).map(Field::getName).toList(); - - // 是否必须字段设置 - List baseFieldList = Arrays.stream(addDtoClass.getDeclaredFields()).map(field -> { - try { - String message = ""; - boolean hasMessage = false; - // 验证消息 - NotBlank messageAnnotation = field.getAnnotation(NotBlank.class); - if (messageAnnotation != null) { - message = messageAnnotation.message(); - hasMessage = StringUtils.hasText(message); - if (!hasMessage) message = field.getAnnotation(NotNull.class).message(); - } - - - // 设置基础字段注解和是否必填项 - BaseField baseField = new BaseField(); - baseField.setName(field.getName()); - baseField.setType(baseField.getType()); - baseField.setAnnotation(field.getAnnotation(Schema.class).title()); - baseField.setType(GeneratorCodeUtils.convertJavaTypeToTypeScript(field.getType())); - baseField.setRequire(hasMessage); - if (hasMessage) baseField.setRequireMessage(message); - - return baseField; - } catch (Exception e) { - throw new RuntimeException(e); - } - }).toList(); - - // 生成查询表单字段 - context.put("formList", formList); - context.put("addFormList", addFormList); - context.put("baseFieldList", baseFieldList); - } - - /** - * 生成后端内容 - */ - public static void generatorServerCode(Class originalClass, Class dtoClass, Class voClass, VelocityContext context) { - Field[] superFields = originalClass.getSuperclass().getDeclaredFields(); - Field[] declaredFields = originalClass.getDeclaredFields(); - Field[] mergedArray = new Field[superFields.length + declaredFields.length]; - System.arraycopy(superFields, 0, mergedArray, 0, superFields.length); - System.arraycopy(declaredFields, 0, mergedArray, superFields.length, declaredFields.length); - - // 添加BaseResultMap - List baseResultMaps = Arrays.stream(mergedArray).map(field -> { - // 转成下划线 - String fieldName = field.getName(); - String lowerUnderscore = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, fieldName); - - BaseResultMap baseResultMap = new BaseResultMap(); - baseResultMap.setColumn(lowerUnderscore); - baseResultMap.setProperty(fieldName); - return baseResultMap; - }).toList(); - - // 分页查询内容 - List pageQueryMap = Arrays.stream(dtoClass.getDeclaredFields()).map(field -> { - String name = field.getName(); - String column = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, name); - - return BaseResultMap.builder().column(column).property(name).build(); - }).toList(); - - // 生层Base_Column_List - String baseColumnList = Stream.of(mergedArray) - .map(field -> CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, field.getName())) - .collect(Collectors.joining(", ")); - - // 表名 - String tableName = originalClass.getAnnotation(TableName.class).value(); - - context.put("baseResultMaps", baseResultMaps); - context.put("type", originalClass.getName()); - context.put("voClassType", voClass.getName()); - context.put("baseColumnList", baseColumnList); - context.put("tableName", tableName); - context.put("pageQueryMap", pageQueryMap); - } - - /** - * * 写入文件 - */ - public static void writeFiles(String lowercaseName, String lowerHyphen, String originalName, VelocityContext context) throws IOException { - context.put("apiPath", GeneratorCodeUtils.ReplacePathHandle(apiPath) + lowercaseName); - context.put("storePath", GeneratorCodeUtils.ReplacePathHandle(storePath) + lowercaseName); - context.put("typesPath", GeneratorCodeUtils.ReplacePathHandle(vuePath) + lowercaseName + "/utils/types"); - context.put("hookPath", GeneratorCodeUtils.ReplacePathHandle(vuePath) + lowercaseName + "/utils/hooks"); - context.put("columnsPath", GeneratorCodeUtils.ReplacePathHandle(vuePath) + lowercaseName + "/utils/columns"); - context.put("dialogPath", GeneratorCodeUtils.ReplacePathHandle(vuePath) + lowercaseName + "/" + lowerHyphen + "-dialog.vue"); - - // 写入api模板 - Template apiTemplate = Velocity.getTemplate("vms/web/api.vm", "UTF-8"); - FileWriter apiTemplateFileWriter = new FileWriter(apiPath + lowercaseName + ".ts"); - apiTemplate.merge(context, apiTemplateFileWriter); - apiTemplateFileWriter.close(); - - // 写入弹窗模板 - Template dialogTemplate = Velocity.getTemplate("vms/web/dialog.vm", "UTF-8"); - FileWriter dialogTemplateFileWriter = new FileWriter(vuePath + lowercaseName + "\\" + lowerHyphen + "-dialog.vue"); - dialogTemplate.merge(context, dialogTemplateFileWriter); - dialogTemplateFileWriter.close(); - - // 写入hook模板 - Template hookTemplate = Velocity.getTemplate("vms/web/hook.vm", "UTF-8"); - FileWriter hookTemplateFileWriter = new FileWriter(vuePath + lowercaseName + "\\utils\\hooks.ts"); - hookTemplate.merge(context, hookTemplateFileWriter); - hookTemplateFileWriter.close(); - - // 写入hook模板 - Template storeTemplate = Velocity.getTemplate("vms/web/store.vm", "UTF-8"); - FileWriter storeTemplateFileWriter = new FileWriter(storePath + "\\" + lowercaseName + ".ts"); - storeTemplate.merge(context, storeTemplateFileWriter); - storeTemplateFileWriter.close(); - - // 写入types模板 - Template typesTemplate = Velocity.getTemplate("vms/web/types.vm", "UTF-8"); - FileWriter typesTemplateFileWriter = new FileWriter(vuePath + lowercaseName + "\\utils\\types.ts"); - typesTemplate.merge(context, typesTemplateFileWriter); - typesTemplateFileWriter.close(); - - // 写入index模板 - Template indexTemplate = Velocity.getTemplate("vms/web/index.vm", "UTF-8"); - FileWriter indexTemplateFileWriter = new FileWriter(vuePath + lowercaseName + "\\index.vue"); - indexTemplate.merge(context, indexTemplateFileWriter); - indexTemplateFileWriter.close(); - - // 写入columns模板 - Template columnsTemplate = Velocity.getTemplate("vms/web/columns.vm", "UTF-8"); - FileWriter columnsTemplateFileWriter = new FileWriter(vuePath + lowercaseName + "\\utils\\columns.ts"); - columnsTemplate.merge(context, columnsTemplateFileWriter); - columnsTemplateFileWriter.close(); - - // 写入controller模板 - Template controllerTemplate = Velocity.getTemplate("vms/server/controller.vm", "UTF-8"); - FileWriter controllerTemplateFileWriter = new FileWriter(controllerPath + originalName + "Controller.java"); - controllerTemplate.merge(context, controllerTemplateFileWriter); - controllerTemplateFileWriter.close(); - - // 写入servicePath模板 - Template servicePathTemplate = Velocity.getTemplate("vms/server/service.vm", "UTF-8"); - FileWriter servicePathTemplateFileWriter = new FileWriter(servicePath + originalName + "Service.java"); - servicePathTemplate.merge(context, servicePathTemplateFileWriter); - servicePathTemplateFileWriter.close(); - - // 写入serviceImplPath模板 - Template serviceImplPathTemplate = Velocity.getTemplate("vms/server/serviceImpl.vm", "UTF-8"); - FileWriter serviceImplPathTemplateFileWriter = new FileWriter(serviceImplPath + originalName + "ServiceImpl.java"); - serviceImplPathTemplate.merge(context, serviceImplPathTemplateFileWriter); - serviceImplPathTemplateFileWriter.close(); - - // 写入serviceImplPath模板 - Template mapperPathTemplate = Velocity.getTemplate("vms/server/mapper.vm", "UTF-8"); - FileWriter mapperPathTemplateFileWriter = new FileWriter(mapperPath + originalName + "Mapper.java"); - mapperPathTemplate.merge(context, mapperPathTemplateFileWriter); - mapperPathTemplateFileWriter.close(); - - // 写入resourceMapperPath模板 - Template resourceMapperPathTemplate = Velocity.getTemplate("vms/server/resourceMapper.vm", "UTF-8"); - FileWriter resourceMapperPathTemplateFileWriter = new FileWriter(resourceMapperPath + originalName + "Mapper.xml"); - resourceMapperPathTemplate.merge(context, resourceMapperPathTemplateFileWriter); - resourceMapperPathTemplateFileWriter.close(); - } -} - diff --git a/common/generator-v1/src/main/java/cn/bunny/common/generator/utils/GeneratorCodeUtils.java b/common/generator-v1/src/main/java/cn/bunny/common/generator/utils/GeneratorCodeUtils.java deleted file mode 100644 index 470e33e..0000000 --- a/common/generator-v1/src/main/java/cn/bunny/common/generator/utils/GeneratorCodeUtils.java +++ /dev/null @@ -1,98 +0,0 @@ -package cn.bunny.common.generator.utils; - -import cn.bunny.common.generator.entity.BaseField; -import cn.bunny.common.generator.entity.StoreTypeField; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -import java.lang.reflect.Field; -import java.util.*; - -import static cn.bunny.common.generator.generator.WebGeneratorCode.commonPath; - - -public class GeneratorCodeUtils { - public static String convertJavaTypeToTypeScript(Class javaType) { - if (javaType.isPrimitive()) { - return getPrimitiveTypeMapping(javaType.getSimpleName()); - } else if (javaType.isArray()) { - return "Array<" + convertJavaTypeToTypeScript(javaType.getComponentType()) + ">"; - } else if (javaType.equals(List.class) || javaType.equals(Set.class) || javaType.equals(Map.class)) { - return "any"; - } else { - return getPrimitiveTypeMapping(javaType.getSimpleName()); - } - } - - /** - * * 将Java类型转成JS/TS类型 - * - * @param primitiveType Java的类型 - * @return 转换后的类型 - */ - private static String getPrimitiveTypeMapping(String primitiveType) { - return switch (primitiveType) { - case "int", "long", "short", "byte", "float", "double", "Byte", "Integer", "Long", "Float", "Double" -> - "number"; - case "boolean", "Boolean" -> "boolean"; - case "char", "Character", "String" -> "string"; - default -> "any"; - }; - } - - /** - * * 生成返回对象类字段 - * 返回字段包含:TS接口名称,TS接口名称注释,TS接口字段、TS字段类型、TS字段注释、TS字段注释解释 - * - * @param voClass 返回对象类 - * @return 整理好返回字段 - */ - public static StoreTypeField handleGenerator(Class voClass) { - // 类的详细信息 - String interfaceAnnotation = voClass.getAnnotation(ApiModel.class).description(); - - // 字段 - List fields = new ArrayList<>(Arrays.stream(voClass.getDeclaredFields()).toList()); - List superList = Arrays.stream(voClass.getSuperclass().getDeclaredFields()).toList(); - fields.addAll(superList); - - List list = fields.stream() - .map(field -> { - field.setAccessible(true); - - // 将类型转成TS - Class type = field.getType(); - String convertJavaTypeToTypeScript = GeneratorCodeUtils.convertJavaTypeToTypeScript(type); - - // 注释内容 - String annotationName = Objects.requireNonNull(field.getAnnotation(ApiModelProperty.class).name()); - // 注释解释 - String value = field.getAnnotation(ApiModelProperty.class).value(); - - // 构建返回内容 - BaseField storeTypeField = new BaseField(); - storeTypeField.setName(field.getName()); - storeTypeField.setAnnotation(annotationName); - storeTypeField.setType(convertJavaTypeToTypeScript); - - return storeTypeField; - }).toList(); - - StoreTypeField storeTypeField = new StoreTypeField(); - storeTypeField.setBaseFieldList(list); - storeTypeField.setInterfaceName(voClass.getSimpleName()); - storeTypeField.setInterfaceAnnotation(interfaceAnnotation); - - return storeTypeField; - } - - /** - * * 通用处理路径内容 - * - * @param path 路径 - * @return 处理好的路径 - */ - public static String ReplacePathHandle(String path) { - return "@" + path.replace(commonPath, "").replace("\\", "/"); - } -} \ No newline at end of file diff --git a/common/generator-v1/src/main/resources/vms/server/controller.vm b/common/generator-v1/src/main/resources/vms/server/controller.vm deleted file mode 100644 index 893074a..0000000 --- a/common/generator-v1/src/main/resources/vms/server/controller.vm +++ /dev/null @@ -1,65 +0,0 @@ -package cn.bunny.services.controller; - -import cn.bunny.dao.pojo.result.Result; -import cn.bunny.dao.pojo.result.ResultCodeEnum; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import reactor.core.publisher.Mono; -import cn.bunny.dao.pojo.result.PageResult; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import java.util.List; - -/** - *

- * ${classTitle}表 前端控制器 - *

- * - * @author Bunny - * @since ${date} - */ -@Tag(name = "${classTitle}" , description = "${classTitle}相关接口" ) -@RestController -@RequestMapping("admin/${lowercaseName}" ) -public class ${originalName}Controller { - - @Autowired - private ${originalName}Service ${lowercaseName}Service; - - @Operation(summary = "分页查询${classTitle}" , description = "分页查询${classTitle}" ) - @GetMapping("get${originalName}List/{page}/{limit}" ) - public Mono>> get${originalName}List( - @Parameter(name = "page" , description = "当前页" , required = true) - @PathVariable("page" ) Integer page, - @Parameter(name = "limit" , description = "每页记录数" , required = true) - @PathVariable("limit" ) Integer limit, - ${originalName}Dto dto) { - Page<${originalName}> pageParams = new Page<>(page, limit); - PageResult<${originalName}Vo> pageResult = ${lowercaseName}Service.get${originalName}List(pageParams, dto); - return Mono.just(Result.success(pageResult)); - } - - @Operation(summary = "添加${classTitle}" , description = "添加${classTitle}" ) - @PostMapping("add${originalName}" ) - public Mono> add${originalName}(@Valid @RequestBody ${originalName}AddDto dto) { - ${lowercaseName}Service.add${originalName}(dto); - return Mono.just(Result.success(ResultCodeEnum.ADD_SUCCESS)); - } - - @Operation(summary = "更新${classTitle}" , description = "更新${classTitle}" ) - @PutMapping("update${originalName}" ) - public Mono> update${originalName}(@Valid @RequestBody ${originalName}UpdateDto dto) { - ${lowercaseName}Service.update${originalName}(dto); - return Mono.just(Result.success(ResultCodeEnum.UPDATE_SUCCESS)); - } - - @Operation(summary = "删除${classTitle}" , description = "删除${classTitle}" ) - @DeleteMapping("delete${originalName}" ) - public Mono> delete${originalName}(@RequestBody List ids) { - ${lowercaseName}Service.delete${originalName}(ids); - return Mono.just(Result.success(ResultCodeEnum.DELETE_SUCCESS)); - } -} \ No newline at end of file diff --git a/common/generator-v1/src/main/resources/vms/server/mapper.vm b/common/generator-v1/src/main/resources/vms/server/mapper.vm deleted file mode 100644 index 5029be8..0000000 --- a/common/generator-v1/src/main/resources/vms/server/mapper.vm +++ /dev/null @@ -1,35 +0,0 @@ -package cn.bunny.services.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.apache.ibatis.annotations.Param; -import java.util.List; - -/** - *

- * ${classTitle} Mapper 接口 - *

- * - * @author Bunny - * @since ${date} - */ -@Mapper -public interface ${originalName}Mapper extends BaseMapper<${originalName}> { - - /** - * * 分页查询${classTitle}内容 - * - * @param pageParams ${classTitle}分页参数 - * @param dto ${classTitle}查询表单 - * @return ${classTitle}分页结果 - */ - IPage<${originalName}Vo> selectListByPage(@Param("page") Page<${originalName}> pageParams, @Param("dto") ${originalName}Dto dto); - - /** - * 物理删除${classTitle} - * - * @param ids 删除 id 列表 - */ - void deleteBatchIdsWithPhysics(List ids); -} diff --git a/common/generator-v1/src/main/resources/vms/server/resourceMapper.vm b/common/generator-v1/src/main/resources/vms/server/resourceMapper.vm deleted file mode 100644 index 2b1d789..0000000 --- a/common/generator-v1/src/main/resources/vms/server/resourceMapper.vm +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - #foreach($field in $baseResultMaps) - - #end - - - - - $baseColumnList - - - - - - - - delete - from $tableName - where id in - - #{id} - - - - diff --git a/common/generator-v1/src/main/resources/vms/server/service.vm b/common/generator-v1/src/main/resources/vms/server/service.vm deleted file mode 100644 index fafe220..0000000 --- a/common/generator-v1/src/main/resources/vms/server/service.vm +++ /dev/null @@ -1,49 +0,0 @@ -package cn.bunny.services.service; - -import cn.bunny.dao.entity.system.MenuIcon; -import cn.bunny.dao.pojo.result.PageResult; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.IService; -import jakarta.validation.Valid; - -import java.util.HashMap; -import java.util.List; - -/** - *

- * ${classTitle} 服务类 - *

- * - * @author Bunny - * @since ${date} - */ -public interface ${originalName}Service extends IService<${originalName}> { - - /** - * * 获取${classTitle}列表 - * - * @return ${classTitle}返回列表 - */ - PageResult<${originalName}Vo> get${originalName}List(Page<${originalName}> pageParams, ${originalName}Dto dto); - - /** - * * 添加${classTitle} - * - * @param dto 添加表单 - */ - void add${originalName}(@Valid ${originalName}AddDto dto); - - /** - * * 更新${classTitle} - * - * @param dto 更新表单 - */ - void update${originalName}(@Valid ${originalName}UpdateDto dto); - - /** - * * 删除|批量删除${classTitle}类型 - * - * @param ids 删除id列表 - */ - void delete${originalName}(List ids); -} diff --git a/common/generator-v1/src/main/resources/vms/server/serviceImpl.vm b/common/generator-v1/src/main/resources/vms/server/serviceImpl.vm deleted file mode 100644 index b418d2b..0000000 --- a/common/generator-v1/src/main/resources/vms/server/serviceImpl.vm +++ /dev/null @@ -1,78 +0,0 @@ -package cn.bunny.services.service.impl; - -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.services.mapper.${originalName}Mapper; -import cn.bunny.services.service.${originalName}Service; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - *

- * ${classTitle} 服务实现类 - *

- * - * @author Bunny - * @since ${date} - */ -@Service -public class ${originalName}ServiceImpl extends ServiceImpl<${originalName}Mapper, ${originalName}> implements ${originalName}Service { - - /** - * * ${classTitle} 服务实现类 - * - * @param pageParams ${classTitle}分页查询page对象 - * @param dto ${classTitle}分页查询对象 - * @return 查询分页${classTitle}返回对象 - */ - @Override - public PageResult<${originalName}Vo> get${originalName}List(Page<${originalName}> pageParams, ${originalName}Dto dto) { - IPage<${originalName}Vo> page = baseMapper.selectListByPage(pageParams, dto); - - return PageResult.<${originalName}Vo>builder() - .list(page.getRecords()) - .pageNo(page.getCurrent()) - .pageSize(page.getSize()) - .total(page.getTotal()) - .build(); - } - /** - * 添加${classTitle} - * - * @param dto ${classTitle}添加 - */ - @Override - public void add${originalName}(@Valid ${originalName}AddDto dto) { - // 保存数据 - ${originalName} ${lowercaseName} = new ${originalName}(); - BeanUtils.copyProperties(dto, ${lowercaseName}); - save(${lowercaseName}); - } - - /** - * 更新${classTitle} - * - * @param dto ${classTitle}更新 - */ - @Override - public void update${originalName}(@Valid ${originalName}UpdateDto dto) { - // 更新内容 - ${originalName} ${lowercaseName} = new ${originalName}(); - BeanUtils.copyProperties(dto, ${lowercaseName}); - updateById(${lowercaseName}); - } - - /** - * 删除|批量删除${classTitle} - * - * @param ids 删除id列表 - */ - @Override - public void delete${originalName}(List ids) { - baseMapper.deleteBatchIdsWithPhysics(ids); - } -} diff --git a/common/generator-v1/src/main/resources/vms/web/api.vm b/common/generator-v1/src/main/resources/vms/web/api.vm deleted file mode 100644 index b49e6ae..0000000 --- a/common/generator-v1/src/main/resources/vms/web/api.vm +++ /dev/null @@ -1,22 +0,0 @@ -import { http } from '@/api/service/request'; -import type { BaseResult, ResultTable } from '@/api/service/types'; - -/** ${classDescription}---获取${classDescription}列表 */ -export const fetchGet${originalName}List = (data: any) => { - return http.request>('get', `${lowercaseName}/get${originalName}List/${data.currentPage}/${data.pageSize}`, { params: data }); -}; - -/** ${classDescription}---添加${classDescription} */ -export const fetchAdd${originalName} = (data: any) => { - return http.request>('post', '${lowercaseName}/add${originalName}', { data }); -}; - -/** ${classDescription}---更新${classDescription} */ -export const fetchUpdate${originalName} = (data: any) => { - return http.request>('put', '${lowercaseName}/update${originalName}', { data }); -}; - -/** ${classDescription}---删除${classDescription} */ -export const fetchDelete${originalName} = (data: any) => { - return http.request>('delete', '${lowercaseName}/delete${originalName}', { data }); -}; \ No newline at end of file diff --git a/common/generator-v1/src/main/resources/vms/web/columns.vm b/common/generator-v1/src/main/resources/vms/web/columns.vm deleted file mode 100644 index 712c6cc..0000000 --- a/common/generator-v1/src/main/resources/vms/web/columns.vm +++ /dev/null @@ -1,27 +0,0 @@ -import { reactive, ref } from 'vue'; -import { $t } from '@/plugins/i18n'; -import type { FormRules } from 'element-plus'; - -// 表格列 -export const columns: TableColumnList = [ -{ type: 'selection', align: 'left' }, -{ type: 'index', index: (index: number) => index + 1, label: '序号', width: 60 }, -#foreach($field in $baseFieldList) -// $field.annotation -{ label: $t('$field.name'), prop: '$field.name' }, -#end -{ label: $t('table.updateTime'), prop: 'updateTime', sortable: true, width: 160 }, -{ label: $t('table.createTime'), prop: 'createTime', sortable: true, width: 160 }, -{ label: $t('table.createUser'), prop: 'createUser', slot: 'createUser', width: 130 }, -{ label: $t('table.updateUser'), prop: 'updateUser', slot: 'updateUser', width: 130 }, -{ label: $t('table.operation'), fixed: 'right', width: 210, slot: 'operation' }, -]; - -// 添加规则 -export const rules = reactive -({ - #foreach($field in $baseFieldList) - // $field.annotation - $field.name: [{ required: true, message: `$leftBrace$t('input')}$leftBrace$t('${field.name}')}`, trigger: 'blur' }], - #end - }); diff --git a/common/generator-v1/src/main/resources/vms/web/dialog.vm b/common/generator-v1/src/main/resources/vms/web/dialog.vm deleted file mode 100644 index 14324e0..0000000 --- a/common/generator-v1/src/main/resources/vms/web/dialog.vm +++ /dev/null @@ -1,36 +0,0 @@ - - - diff --git a/common/generator-v1/src/main/resources/vms/web/hook.vm b/common/generator-v1/src/main/resources/vms/web/hook.vm deleted file mode 100644 index f948132..0000000 --- a/common/generator-v1/src/main/resources/vms/web/hook.vm +++ /dev/null @@ -1,130 +0,0 @@ -import { deviceDetection } from '@pureadmin/utils'; -import { addDialog } from '@/components/BaseDialog/index'; -import ${originalName}Dialog from '${dialogPath}'; -import { use${originalName}Store } from '${storePath}'; -import { h, ref } from 'vue'; -import { messageBox } from '@/utils/message'; -import type { FormItemProps } from '${typesPath}'; -import { $t } from '@/plugins/i18n'; -import { message, messageBox } from "@/utils/message"; -import DeleteBatchDialog from "@/components/Table/DeleteBatchDialog.vue"; - -export const formRef = ref(); -// 删除ids -export const deleteIds = ref([]); -const ${lowercaseName}Store = use${originalName}Store(); - -/** 搜索初始化${classTitle} */ -export async function onSearch() { - ${lowercaseName}Store.loading = true; - await ${lowercaseName}Store.get${originalName}List(); - ${lowercaseName}Store.loading = false; -} - -/** 添加${classTitle} */ -export function onAdd() { - addDialog({ - title: `$leftBrace $t("addNew")}$leftBrace$t("${lowercaseName}")}`, - width: '30%', - props: { - formInline: { -#foreach($item in $addFormList) - $!{item}: undefined, -#end - }, - }, - draggable: true, - fullscreenIcon: true, - closeOnClickModal: false, - contentRenderer: () => h(${originalName}Dialog, { ref: formRef }), - beforeSure: (done, { options }) => { - const form = options.props.formInline as FormItemProps; - formRef.value.formRef.validate(async (valid: any) => { - if (!valid) return; - - const result = await ${lowercaseName}Store.add${originalName}(form); - if (!result) return; - done(); - await onSearch(); - }); - }, - }); -} - -/** 更新${classTitle} */ -export function onUpdate(row: any) { - addDialog({ - title: `$leftBrace$t("modify")}$leftBrace$t("${lowercaseName}")}`, - width: '30%', - props: { - formInline: { -#foreach($item in $addFormList) - $!{item}: row.$!{item}, -#end - } -}, - draggable: true, - fullscreenIcon: true, - closeOnClickModal: false, - contentRenderer: () => h(${originalName}Dialog, { ref: formRef }), - beforeSure: (done, { options }) => { - const form = options.props.formInline as FormItemProps; - formRef.value.formRef.validate(async (valid: any) => { - if (!valid) return; - - const result = await ${lowercaseName}Store.update${originalName}({ ...form, id: row.id }); - if (!result) return; - done(); - await onSearch(); - }); - }, - }); -} - -/** 删除${classTitle} */ -export const onDelete = async (row: any) => { - const id = row.id; - - // 是否确认删除 - const result = await messageBox({ - title: $t('confirmDelete'), - showMessage: false, - confirmMessage: undefined, - cancelMessage: $t("cancel_delete"), - }); - if (!result) return; - - // 删除数据 - await ${lowercaseName}Store.delete${originalName}([id]); - await onSearch(); -}; - -/** 批量删除 */ -export const onDeleteBatch = async () => { - const ids = deleteIds.value; - const formDeletedBatchRef = ref(); - - addDialog({ - title: $t('deleteBatchTip'), - width: '30%', - props: { formInline: { confirmText: '' } }, - draggable: true, - fullscreenIcon: true, - closeOnClickModal: false, - contentRenderer: () => h(DeleteBatchDialog, { ref: formDeletedBatchRef }), - beforeSure: (done, { options }) => { - formDeletedBatchRef.value.formDeletedBatchRef.validate(async (valid: any) => { - if (!valid) return; - - const text = options.props.formInline.confirmText.toLowerCase(); - if (text === 'yes' || text === 'y') { - // 删除数据 - await ${lowercaseName}Store.delete${originalName}(ids); - await onSearch(); - - done(); - } else message($t('deleteBatchTip'), { type: 'warning' }); - }); - }, - }); -}; \ No newline at end of file diff --git a/common/generator-v1/src/main/resources/vms/web/index.vm b/common/generator-v1/src/main/resources/vms/web/index.vm deleted file mode 100644 index 668241a..0000000 --- a/common/generator-v1/src/main/resources/vms/web/index.vm +++ /dev/null @@ -1,121 +0,0 @@ - - - diff --git a/common/generator-v1/src/main/resources/vms/web/store.vm b/common/generator-v1/src/main/resources/vms/web/store.vm deleted file mode 100644 index 7b504d6..0000000 --- a/common/generator-v1/src/main/resources/vms/web/store.vm +++ /dev/null @@ -1,69 +0,0 @@ -import { defineStore } from 'pinia'; -import { fetchAdd${originalName}, fetchDelete${originalName}, fetchGet${originalName}List, fetchUpdate${originalName} } from '${apiPath}'; -import { pageSizes } from '@/enums/baseConstant'; -import { storeMessage } from '@/utils/message'; -import { storePagination } from '@/store/useStorePagination'; - -/** -* ${classTitle} Store -*/ -export const use${originalName}Store = defineStore('${lowercaseName}Store', { -state() { -return { -// ${classTitle}列表 -datalist: [], -// 查询表单 -form: { -#foreach($item in $formList) -// $!{item.annotation} - $!{item.name}: undefined, -#end -}, -// 分页查询结果 -pagination: { -currentPage: 1, -pageSize: 30, -total: 1, -pageSizes, -}, -// 加载 -loading: false, -}; -}, -getters: {}, -actions: { -/** 获取${classTitle} */ -async get${originalName}List() { -// 整理请求参数 -const data = { ...this.pagination, ...this.form }; -delete data.pageSizes; -delete data.total; -delete data.background; - -// 获取${classTitle}列表 -const result = await fetchGet${originalName}List(data); - -// 公共页面函数hook -const pagination = storePagination.bind(this); -return pagination(result); -}, - -/** 添加${classTitle} */ -async add${originalName}(data: any) { -const result = await fetchAdd${originalName}(data); -return storeMessage(result); -}, - -/** 修改${classTitle} */ -async update${originalName}(data: any) { -const result = await fetchUpdate${originalName}(data); -return storeMessage(result); -}, - -/** 删除${classTitle} */ -async delete${originalName}(data: any) { -const result = await fetchDelete${originalName}(data); -return storeMessage(result); -}, -}, -}); diff --git a/common/generator-v1/src/main/resources/vms/web/types.vm b/common/generator-v1/src/main/resources/vms/web/types.vm deleted file mode 100644 index 07dab1f..0000000 --- a/common/generator-v1/src/main/resources/vms/web/types.vm +++ /dev/null @@ -1,12 +0,0 @@ -// 添加或者修改表单元素 -export interface FormItemProps { -#foreach($field in $baseFieldList) - // $field.annotation - $field.name: $field.type; -#end -} - -// 添加或修改表单Props -export interface FormProps { - formInline: FormItemProps; -} diff --git a/common/pom.xml b/common/pom.xml deleted file mode 100644 index 47a0e2c..0000000 --- a/common/pom.xml +++ /dev/null @@ -1,18 +0,0 @@ - - 4.0.0 - - cn.bunny - auth-server-java - 0.0.1-SNAPSHOT - - - common - pom - common Maven Webapp - https://maven.apache.org - - generator-code - generator-v1 - - diff --git a/common/generator-code/pom.xml b/generator-code/pom.xml similarity index 100% rename from common/generator-code/pom.xml rename to generator-code/pom.xml diff --git a/common/generator-code/src/main/java/cn/bunny/GeneratorCodeMainApplication.java b/generator-code/src/main/java/cn/bunny/GeneratorCodeMainApplication.java similarity index 100% rename from common/generator-code/src/main/java/cn/bunny/GeneratorCodeMainApplication.java rename to generator-code/src/main/java/cn/bunny/GeneratorCodeMainApplication.java diff --git a/common/generator-code/src/main/java/cn/bunny/config/ControllerStringParamTrimConfig.java b/generator-code/src/main/java/cn/bunny/config/ControllerStringParamTrimConfig.java similarity index 100% rename from common/generator-code/src/main/java/cn/bunny/config/ControllerStringParamTrimConfig.java rename to generator-code/src/main/java/cn/bunny/config/ControllerStringParamTrimConfig.java diff --git a/common/generator-code/src/main/java/cn/bunny/config/Knife4jConfig.java b/generator-code/src/main/java/cn/bunny/config/Knife4jConfig.java similarity index 100% rename from common/generator-code/src/main/java/cn/bunny/config/Knife4jConfig.java rename to generator-code/src/main/java/cn/bunny/config/Knife4jConfig.java diff --git a/common/generator-code/src/main/java/cn/bunny/config/VmsHolder.java b/generator-code/src/main/java/cn/bunny/config/VmsHolder.java similarity index 100% rename from common/generator-code/src/main/java/cn/bunny/config/VmsHolder.java rename to generator-code/src/main/java/cn/bunny/config/VmsHolder.java diff --git a/common/generator-code/src/main/java/cn/bunny/controller/IndexController.java b/generator-code/src/main/java/cn/bunny/controller/IndexController.java similarity index 100% rename from common/generator-code/src/main/java/cn/bunny/controller/IndexController.java rename to generator-code/src/main/java/cn/bunny/controller/IndexController.java diff --git a/common/generator-code/src/main/java/cn/bunny/controller/TableController.java b/generator-code/src/main/java/cn/bunny/controller/TableController.java similarity index 100% rename from common/generator-code/src/main/java/cn/bunny/controller/TableController.java rename to generator-code/src/main/java/cn/bunny/controller/TableController.java diff --git a/common/generator-code/src/main/java/cn/bunny/controller/VmsController.java b/generator-code/src/main/java/cn/bunny/controller/VmsController.java similarity index 100% rename from common/generator-code/src/main/java/cn/bunny/controller/VmsController.java rename to generator-code/src/main/java/cn/bunny/controller/VmsController.java diff --git a/common/generator-code/src/main/java/cn/bunny/dao/dto/VmsArgumentDto.java b/generator-code/src/main/java/cn/bunny/dao/dto/VmsArgumentDto.java similarity index 100% rename from common/generator-code/src/main/java/cn/bunny/dao/dto/VmsArgumentDto.java rename to generator-code/src/main/java/cn/bunny/dao/dto/VmsArgumentDto.java diff --git a/common/generator-code/src/main/java/cn/bunny/dao/entity/ColumnMetaData.java b/generator-code/src/main/java/cn/bunny/dao/entity/ColumnMetaData.java similarity index 100% rename from common/generator-code/src/main/java/cn/bunny/dao/entity/ColumnMetaData.java rename to generator-code/src/main/java/cn/bunny/dao/entity/ColumnMetaData.java diff --git a/common/generator-code/src/main/java/cn/bunny/dao/entity/TableMetaData.java b/generator-code/src/main/java/cn/bunny/dao/entity/TableMetaData.java similarity index 100% rename from common/generator-code/src/main/java/cn/bunny/dao/entity/TableMetaData.java rename to generator-code/src/main/java/cn/bunny/dao/entity/TableMetaData.java diff --git a/common/generator-code/src/main/java/cn/bunny/dao/result/PageResult.java b/generator-code/src/main/java/cn/bunny/dao/result/PageResult.java similarity index 100% rename from common/generator-code/src/main/java/cn/bunny/dao/result/PageResult.java rename to generator-code/src/main/java/cn/bunny/dao/result/PageResult.java diff --git a/common/generator-code/src/main/java/cn/bunny/dao/result/Result.java b/generator-code/src/main/java/cn/bunny/dao/result/Result.java similarity index 100% rename from common/generator-code/src/main/java/cn/bunny/dao/result/Result.java rename to generator-code/src/main/java/cn/bunny/dao/result/Result.java diff --git a/common/generator-code/src/main/java/cn/bunny/dao/result/ResultCodeEnum.java b/generator-code/src/main/java/cn/bunny/dao/result/ResultCodeEnum.java similarity index 100% rename from common/generator-code/src/main/java/cn/bunny/dao/result/ResultCodeEnum.java rename to generator-code/src/main/java/cn/bunny/dao/result/ResultCodeEnum.java diff --git a/common/generator-code/src/main/java/cn/bunny/dao/vo/GeneratorVo.java b/generator-code/src/main/java/cn/bunny/dao/vo/GeneratorVo.java similarity index 100% rename from common/generator-code/src/main/java/cn/bunny/dao/vo/GeneratorVo.java rename to generator-code/src/main/java/cn/bunny/dao/vo/GeneratorVo.java diff --git a/common/generator-code/src/main/java/cn/bunny/dao/vo/TableInfoVo.java b/generator-code/src/main/java/cn/bunny/dao/vo/TableInfoVo.java similarity index 100% rename from common/generator-code/src/main/java/cn/bunny/dao/vo/TableInfoVo.java rename to generator-code/src/main/java/cn/bunny/dao/vo/TableInfoVo.java diff --git a/common/generator-code/src/main/java/cn/bunny/dao/vo/VmsPathVo.java b/generator-code/src/main/java/cn/bunny/dao/vo/VmsPathVo.java similarity index 100% rename from common/generator-code/src/main/java/cn/bunny/dao/vo/VmsPathVo.java rename to generator-code/src/main/java/cn/bunny/dao/vo/VmsPathVo.java diff --git a/common/generator-code/src/main/java/cn/bunny/exception/AuthCustomerException.java b/generator-code/src/main/java/cn/bunny/exception/AuthCustomerException.java similarity index 100% rename from common/generator-code/src/main/java/cn/bunny/exception/AuthCustomerException.java rename to generator-code/src/main/java/cn/bunny/exception/AuthCustomerException.java diff --git a/common/generator-code/src/main/java/cn/bunny/exception/GlobalExceptionHandler.java b/generator-code/src/main/java/cn/bunny/exception/GlobalExceptionHandler.java similarity index 100% rename from common/generator-code/src/main/java/cn/bunny/exception/GlobalExceptionHandler.java rename to generator-code/src/main/java/cn/bunny/exception/GlobalExceptionHandler.java diff --git a/common/generator-code/src/main/java/cn/bunny/service/TableService.java b/generator-code/src/main/java/cn/bunny/service/TableService.java similarity index 100% rename from common/generator-code/src/main/java/cn/bunny/service/TableService.java rename to generator-code/src/main/java/cn/bunny/service/TableService.java diff --git a/common/generator-code/src/main/java/cn/bunny/service/VmsService.java b/generator-code/src/main/java/cn/bunny/service/VmsService.java similarity index 100% rename from common/generator-code/src/main/java/cn/bunny/service/VmsService.java rename to generator-code/src/main/java/cn/bunny/service/VmsService.java diff --git a/common/generator-code/src/main/java/cn/bunny/service/impl/TableServiceImpl.java b/generator-code/src/main/java/cn/bunny/service/impl/TableServiceImpl.java similarity index 100% rename from common/generator-code/src/main/java/cn/bunny/service/impl/TableServiceImpl.java rename to generator-code/src/main/java/cn/bunny/service/impl/TableServiceImpl.java diff --git a/common/generator-code/src/main/java/cn/bunny/service/impl/VmsServiceImpl.java b/generator-code/src/main/java/cn/bunny/service/impl/VmsServiceImpl.java similarity index 100% rename from common/generator-code/src/main/java/cn/bunny/service/impl/VmsServiceImpl.java rename to generator-code/src/main/java/cn/bunny/service/impl/VmsServiceImpl.java diff --git a/common/generator-code/src/main/java/cn/bunny/utils/ConvertUtil.java b/generator-code/src/main/java/cn/bunny/utils/ConvertUtil.java similarity index 100% rename from common/generator-code/src/main/java/cn/bunny/utils/ConvertUtil.java rename to generator-code/src/main/java/cn/bunny/utils/ConvertUtil.java diff --git a/common/generator-code/src/main/java/cn/bunny/utils/DbInfoUtil.java b/generator-code/src/main/java/cn/bunny/utils/DbInfoUtil.java similarity index 100% rename from common/generator-code/src/main/java/cn/bunny/utils/DbInfoUtil.java rename to generator-code/src/main/java/cn/bunny/utils/DbInfoUtil.java diff --git a/common/generator-code/src/main/java/cn/bunny/utils/ResourceFileUtil.java b/generator-code/src/main/java/cn/bunny/utils/ResourceFileUtil.java similarity index 100% rename from common/generator-code/src/main/java/cn/bunny/utils/ResourceFileUtil.java rename to generator-code/src/main/java/cn/bunny/utils/ResourceFileUtil.java diff --git a/common/generator-code/src/main/java/cn/bunny/utils/VmsUtil.java b/generator-code/src/main/java/cn/bunny/utils/VmsUtil.java similarity index 100% rename from common/generator-code/src/main/java/cn/bunny/utils/VmsUtil.java rename to generator-code/src/main/java/cn/bunny/utils/VmsUtil.java diff --git a/common/generator-code/src/main/resources/application-dev.yml b/generator-code/src/main/resources/application-dev.yml similarity index 100% rename from common/generator-code/src/main/resources/application-dev.yml rename to generator-code/src/main/resources/application-dev.yml diff --git a/common/generator-code/src/main/resources/application.yml b/generator-code/src/main/resources/application.yml similarity index 100% rename from common/generator-code/src/main/resources/application.yml rename to generator-code/src/main/resources/application.yml diff --git a/common/generator-code/src/main/resources/banner.txt b/generator-code/src/main/resources/banner.txt similarity index 100% rename from common/generator-code/src/main/resources/banner.txt rename to generator-code/src/main/resources/banner.txt diff --git a/common/generator-code/src/main/resources/database.sqlite b/generator-code/src/main/resources/database.sqlite similarity index 100% rename from common/generator-code/src/main/resources/database.sqlite rename to generator-code/src/main/resources/database.sqlite diff --git a/common/generator-code/src/main/resources/logback.xml b/generator-code/src/main/resources/logback.xml similarity index 100% rename from common/generator-code/src/main/resources/logback.xml rename to generator-code/src/main/resources/logback.xml diff --git a/common/generator-code/src/main/resources/static/error/400.html b/generator-code/src/main/resources/static/error/400.html similarity index 100% rename from common/generator-code/src/main/resources/static/error/400.html rename to generator-code/src/main/resources/static/error/400.html diff --git a/common/generator-code/src/main/resources/static/error/403.html b/generator-code/src/main/resources/static/error/403.html similarity index 100% rename from common/generator-code/src/main/resources/static/error/403.html rename to generator-code/src/main/resources/static/error/403.html diff --git a/common/generator-code/src/main/resources/static/error/404.html b/generator-code/src/main/resources/static/error/404.html similarity index 100% rename from common/generator-code/src/main/resources/static/error/404.html rename to generator-code/src/main/resources/static/error/404.html diff --git a/common/generator-code/src/main/resources/static/error/500.html b/generator-code/src/main/resources/static/error/500.html similarity index 100% rename from common/generator-code/src/main/resources/static/error/500.html rename to generator-code/src/main/resources/static/error/500.html diff --git a/common/generator-code/src/main/resources/static/error/501.html b/generator-code/src/main/resources/static/error/501.html similarity index 100% rename from common/generator-code/src/main/resources/static/error/501.html rename to generator-code/src/main/resources/static/error/501.html diff --git a/common/generator-code/src/main/resources/static/error/502.html b/generator-code/src/main/resources/static/error/502.html similarity index 100% rename from common/generator-code/src/main/resources/static/error/502.html rename to generator-code/src/main/resources/static/error/502.html diff --git a/common/generator-code/src/main/resources/static/error/503.html b/generator-code/src/main/resources/static/error/503.html similarity index 100% rename from common/generator-code/src/main/resources/static/error/503.html rename to generator-code/src/main/resources/static/error/503.html diff --git a/common/generator-code/src/main/resources/static/error/504.html b/generator-code/src/main/resources/static/error/504.html similarity index 100% rename from common/generator-code/src/main/resources/static/error/504.html rename to generator-code/src/main/resources/static/error/504.html diff --git a/common/generator-code/src/main/resources/static/error/505.html b/generator-code/src/main/resources/static/error/505.html similarity index 100% rename from common/generator-code/src/main/resources/static/error/505.html rename to generator-code/src/main/resources/static/error/505.html diff --git a/common/generator-code/src/main/resources/static/error/506.html b/generator-code/src/main/resources/static/error/506.html similarity index 100% rename from common/generator-code/src/main/resources/static/error/506.html rename to generator-code/src/main/resources/static/error/506.html diff --git a/common/generator-code/src/main/resources/static/error/507.html b/generator-code/src/main/resources/static/error/507.html similarity index 100% rename from common/generator-code/src/main/resources/static/error/507.html rename to generator-code/src/main/resources/static/error/507.html diff --git a/common/generator-code/src/main/resources/static/error/509.html b/generator-code/src/main/resources/static/error/509.html similarity index 100% rename from common/generator-code/src/main/resources/static/error/509.html rename to generator-code/src/main/resources/static/error/509.html diff --git a/common/generator-code/src/main/resources/static/error/510.html b/generator-code/src/main/resources/static/error/510.html similarity index 100% rename from common/generator-code/src/main/resources/static/error/510.html rename to generator-code/src/main/resources/static/error/510.html diff --git a/common/generator-code/src/main/resources/static/favicon.ico b/generator-code/src/main/resources/static/favicon.ico similarity index 100% rename from common/generator-code/src/main/resources/static/favicon.ico rename to generator-code/src/main/resources/static/favicon.ico diff --git a/common/generator-code/src/main/resources/static/static/css/404-XvabTZcV.css b/generator-code/src/main/resources/static/static/css/404-XvabTZcV.css similarity index 100% rename from common/generator-code/src/main/resources/static/static/css/404-XvabTZcV.css rename to generator-code/src/main/resources/static/static/css/404-XvabTZcV.css diff --git a/common/generator-code/src/main/resources/static/static/css/index-pFzuzMch.css b/generator-code/src/main/resources/static/static/css/index-pFzuzMch.css similarity index 100% rename from common/generator-code/src/main/resources/static/static/css/index-pFzuzMch.css rename to generator-code/src/main/resources/static/static/css/index-pFzuzMch.css diff --git a/common/generator-code/src/main/resources/static/static/css/vendor-D-laMJ-n.css b/generator-code/src/main/resources/static/static/css/vendor-D-laMJ-n.css similarity index 100% rename from common/generator-code/src/main/resources/static/static/css/vendor-D-laMJ-n.css rename to generator-code/src/main/resources/static/static/css/vendor-D-laMJ-n.css diff --git a/common/generator-code/src/main/resources/static/static/js/404-CevxQWvM.js b/generator-code/src/main/resources/static/static/js/404-CevxQWvM.js similarity index 100% rename from common/generator-code/src/main/resources/static/static/js/404-CevxQWvM.js rename to generator-code/src/main/resources/static/static/js/404-CevxQWvM.js diff --git a/common/generator-code/src/main/resources/static/static/js/index-BpUqUWfK.js b/generator-code/src/main/resources/static/static/js/index-BpUqUWfK.js similarity index 100% rename from common/generator-code/src/main/resources/static/static/js/index-BpUqUWfK.js rename to generator-code/src/main/resources/static/static/js/index-BpUqUWfK.js diff --git a/common/generator-code/src/main/resources/static/static/js/index-CQCEdnrc.js b/generator-code/src/main/resources/static/static/js/index-CQCEdnrc.js similarity index 100% rename from common/generator-code/src/main/resources/static/static/js/index-CQCEdnrc.js rename to generator-code/src/main/resources/static/static/js/index-CQCEdnrc.js diff --git a/common/generator-code/src/main/resources/static/static/js/index-Cu3qqaMR.js b/generator-code/src/main/resources/static/static/js/index-Cu3qqaMR.js similarity index 100% rename from common/generator-code/src/main/resources/static/static/js/index-Cu3qqaMR.js rename to generator-code/src/main/resources/static/static/js/index-Cu3qqaMR.js diff --git a/common/generator-code/src/main/resources/static/static/js/index-DPBlXgzE.js b/generator-code/src/main/resources/static/static/js/index-DPBlXgzE.js similarity index 100% rename from common/generator-code/src/main/resources/static/static/js/index-DPBlXgzE.js rename to generator-code/src/main/resources/static/static/js/index-DPBlXgzE.js diff --git a/common/generator-code/src/main/resources/static/static/js/table-4Oe8H9vJ.js b/generator-code/src/main/resources/static/static/js/table-4Oe8H9vJ.js similarity index 100% rename from common/generator-code/src/main/resources/static/static/js/table-4Oe8H9vJ.js rename to generator-code/src/main/resources/static/static/js/table-4Oe8H9vJ.js diff --git a/common/generator-code/src/main/resources/static/static/js/vendor-BkJtItE3.js b/generator-code/src/main/resources/static/static/js/vendor-BkJtItE3.js similarity index 100% rename from common/generator-code/src/main/resources/static/static/js/vendor-BkJtItE3.js rename to generator-code/src/main/resources/static/static/js/vendor-BkJtItE3.js diff --git a/common/generator-code/src/main/resources/static/static/png/404-D6_y3Jr2.png b/generator-code/src/main/resources/static/static/png/404-D6_y3Jr2.png similarity index 100% rename from common/generator-code/src/main/resources/static/static/png/404-D6_y3Jr2.png rename to generator-code/src/main/resources/static/static/png/404-D6_y3Jr2.png diff --git a/common/generator-code/src/main/resources/templates/index.html b/generator-code/src/main/resources/templates/index.html similarity index 100% rename from common/generator-code/src/main/resources/templates/index.html rename to generator-code/src/main/resources/templates/index.html diff --git a/common/generator-code/src/main/resources/vms/server/controller.java.vm b/generator-code/src/main/resources/vms/server/controller.java.vm similarity index 100% rename from common/generator-code/src/main/resources/vms/server/controller.java.vm rename to generator-code/src/main/resources/vms/server/controller.java.vm diff --git a/common/generator-code/src/main/resources/vms/server/mapper.java.vm b/generator-code/src/main/resources/vms/server/mapper.java.vm similarity index 100% rename from common/generator-code/src/main/resources/vms/server/mapper.java.vm rename to generator-code/src/main/resources/vms/server/mapper.java.vm diff --git a/common/generator-code/src/main/resources/vms/server/resourceMapper.xml.vm b/generator-code/src/main/resources/vms/server/resourceMapper.xml.vm similarity index 100% rename from common/generator-code/src/main/resources/vms/server/resourceMapper.xml.vm rename to generator-code/src/main/resources/vms/server/resourceMapper.xml.vm diff --git a/common/generator-code/src/main/resources/vms/server/service.java.vm b/generator-code/src/main/resources/vms/server/service.java.vm similarity index 100% rename from common/generator-code/src/main/resources/vms/server/service.java.vm rename to generator-code/src/main/resources/vms/server/service.java.vm diff --git a/common/generator-code/src/main/resources/vms/server/serviceImpl.java.vm b/generator-code/src/main/resources/vms/server/serviceImpl.java.vm similarity index 100% rename from common/generator-code/src/main/resources/vms/server/serviceImpl.java.vm rename to generator-code/src/main/resources/vms/server/serviceImpl.java.vm diff --git a/common/generator-code/src/main/resources/vms/web/api.ts.vm b/generator-code/src/main/resources/vms/web/api.ts.vm similarity index 100% rename from common/generator-code/src/main/resources/vms/web/api.ts.vm rename to generator-code/src/main/resources/vms/web/api.ts.vm diff --git a/common/generator-code/src/main/resources/vms/web/columns.tsx.vm b/generator-code/src/main/resources/vms/web/columns.tsx.vm similarity index 100% rename from common/generator-code/src/main/resources/vms/web/columns.tsx.vm rename to generator-code/src/main/resources/vms/web/columns.tsx.vm diff --git a/common/generator-code/src/main/resources/vms/web/dialog.vue.vm b/generator-code/src/main/resources/vms/web/dialog.vue.vm similarity index 100% rename from common/generator-code/src/main/resources/vms/web/dialog.vue.vm rename to generator-code/src/main/resources/vms/web/dialog.vue.vm diff --git a/common/generator-code/src/main/resources/vms/web/hook.tsx.vm b/generator-code/src/main/resources/vms/web/hook.tsx.vm similarity index 100% rename from common/generator-code/src/main/resources/vms/web/hook.tsx.vm rename to generator-code/src/main/resources/vms/web/hook.tsx.vm diff --git a/common/generator-code/src/main/resources/vms/web/index.vue.vm b/generator-code/src/main/resources/vms/web/index.vue.vm similarity index 100% rename from common/generator-code/src/main/resources/vms/web/index.vue.vm rename to generator-code/src/main/resources/vms/web/index.vue.vm diff --git a/common/generator-code/src/main/resources/vms/web/store.ts.vm b/generator-code/src/main/resources/vms/web/store.ts.vm similarity index 100% rename from common/generator-code/src/main/resources/vms/web/store.ts.vm rename to generator-code/src/main/resources/vms/web/store.ts.vm diff --git a/common/generator-code/src/main/resources/vms/web/types.ts.vm b/generator-code/src/main/resources/vms/web/types.ts.vm similarity index 100% rename from common/generator-code/src/main/resources/vms/web/types.ts.vm rename to generator-code/src/main/resources/vms/web/types.ts.vm diff --git a/common/generator-code/src/test/java/cn/bunny/JDBCTest.java b/generator-code/src/test/java/cn/bunny/JDBCTest.java similarity index 100% rename from common/generator-code/src/test/java/cn/bunny/JDBCTest.java rename to generator-code/src/test/java/cn/bunny/JDBCTest.java diff --git a/common/generator-code/src/test/java/cn/bunny/service/impl/VmsServiceImplTest.java b/generator-code/src/test/java/cn/bunny/service/impl/VmsServiceImplTest.java similarity index 100% rename from common/generator-code/src/test/java/cn/bunny/service/impl/VmsServiceImplTest.java rename to generator-code/src/test/java/cn/bunny/service/impl/VmsServiceImplTest.java diff --git a/common/generator-code/src/test/java/cn/bunny/utils/DbInfoUtilTest.java b/generator-code/src/test/java/cn/bunny/utils/DbInfoUtilTest.java similarity index 100% rename from common/generator-code/src/test/java/cn/bunny/utils/DbInfoUtilTest.java rename to generator-code/src/test/java/cn/bunny/utils/DbInfoUtilTest.java diff --git a/pom.xml b/pom.xml index b0b7aae..0696b48 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ bunny-template - common + generator-code dao service