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 @@
-
-
-
-
-#foreach($item in $baseFieldList)
-
-
-
-
-
-#end
-
-
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 @@
-
-
-
-
-
- #foreach($item in $formList)
-
-
-
-
-
- #end
-
- {{ $t('search')
- }}
-
- {{ $t('buttons.reset') }}
-
-
-
-
-
- {{ $t('addNew') }}
-
-
-
- {{ $t('delete_batches') }}
-
-
-
-
-
-
-
-
- {{ row.createUsername }}
-
-
-
-
-
- {{ row.updateUsername }}
-
-
-
-
- {{ $t('modify')
- }}
-
- {{ $t('addNew') }}
-
-
-
-
-
- {{ $t('delete') }}
-
-
-
-
-
-
-
-
-
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