diff --git a/framework/pom.xml b/framework/pom.xml
index 24c56ec1..04c83b17 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -136,12 +136,6 @@
jasypt-spring-boot-starter
${jasypt-version}
-
-
-
-
-
-
com.aliyun
diff --git a/framework/src/main/java/cn/lili/generator/CodeGenerator.java b/framework/src/main/java/cn/lili/generator/CodeGenerator.java
deleted file mode 100644
index 3c51dab2..00000000
--- a/framework/src/main/java/cn/lili/generator/CodeGenerator.java
+++ /dev/null
@@ -1,345 +0,0 @@
-package cn.lili.generator;
-
-import cn.hutool.core.util.StrUtil;
-import cn.lili.common.exception.ServiceException;
-import cn.lili.common.utils.StringUtils;
-import cn.lili.generator.bean.Entity;
-import org.beetl.core.Configuration;
-import org.beetl.core.GroupTemplate;
-import org.beetl.core.Template;
-import org.beetl.core.resource.ClasspathResourceLoader;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-
-/**
- * 代码生成器 Mybatis-Plus
- *
- * @author Chopper
- */
-public class CodeGenerator {
-
- /**
- * 代码生成在哪个项目
- */
- private static final String PROJECT = "framework";
-
- /**
- * 代码生成在哪个包下边
- */
- private static final String PACKAGES = "cn.lili.modules.";
-
- /**
- * modules
- */
- private static final String MODULES = "message";
-
-
- /**
- * 实体类名
- * 建议仅需修改
- */
- private static final String CLASS_NAME = "ShortLink";
-
- /**
- * 类说明描述
- * 建议仅需修改
- */
- private static final String DESCRIPTION = "短链接";
-
- /**
- * 作者名
- * 建议仅需修改
- */
- private static final String AUTHOR = "Chopper";
-
- /**
- * 数据库表名前缀
- * 下方请根据需要修改
- */
- private static final String TABLE_PRE = "li_";
-
- /**
- * 主键类型
- */
- private static final String PRIMARY_KEY_TYPE = "String";
-
-
- /**
- * endity
- */
- private static final String ENTITY_PACKAGE = PACKAGES + MODULES + ".entity";
-
- /**
- * dao
- */
- private static final String DAO_PACKAGE = PACKAGES + MODULES + ".mapper";
-
- /**
- * service
- */
- private static final String SERVICE_PACKAGE = PACKAGES + MODULES + ".service";
-
- /**
- * serviceImpl
- */
- private static final String SERVICE_IMPL_PACKAGE = PACKAGES + MODULES + ".serviceimpl";
-
- /**
- * controller
- */
- private static final String CONTROLLER_PACKAGE = PACKAGES + MODULES + ".controller";
-
- /**
- * 运行该主函数即可生成代码
- *
- * @param args
- * @throws IOException
- */
- public static void main(String[] args) throws IOException {
- //模板路径
- ClasspathResourceLoader resourceLoader = new ClasspathResourceLoader("/templates/");
- Configuration cfg = Configuration.defaultConfiguration();
- GroupTemplate gt = new GroupTemplate(resourceLoader, cfg);
- //生成代码
- generateCode(gt);
- //根据类名删除生成的代码
-// deleteCode(className);
- }
-
- /**
- * 生成代码
- *
- * @param gt
- * @throws IOException
- */
- private static void generateCode(GroupTemplate gt) throws IOException {
-
- Template entityTemplate = gt.getTemplate("entity.btl");
- Template daoTemplate = gt.getTemplate("mapper.btl");
- Template serviceTemplate = gt.getTemplate("service.btl");
- Template serviceImplTemplate = gt.getTemplate("serviceImpl.btl");
- Template controllerTemplate = gt.getTemplate("controller.btl");
- Template mapperXmlTemplate = gt.getTemplate("mapperXml.btl");
-
- Entity entity = new Entity();
- entity.setEntityPackage(ENTITY_PACKAGE);
- entity.setDaoPackage(DAO_PACKAGE);
- entity.setServicePackage(SERVICE_PACKAGE);
- entity.setServiceImplPackage(SERVICE_IMPL_PACKAGE);
- entity.setControllerPackage(CONTROLLER_PACKAGE);
- entity.setAuthor(AUTHOR);
- entity.setClassName(CLASS_NAME);
- entity.setTableName(TABLE_PRE + StringUtils.camel2Underline(CLASS_NAME));
- entity.setClassNameLowerCase(name(CLASS_NAME, false));
- entity.setDescription(DESCRIPTION);
- entity.setPrimaryKeyType(PRIMARY_KEY_TYPE);
-
- OutputStream out = null;
-
- //生成实体类代码
- entityTemplate.binding("entity", entity);
- String entityResult = entityTemplate.render();
- System.out.println(entityResult);
- //创建文件
- String entityFileUrl = System.getProperty("user.dir") + "/" + PROJECT + "/src/main/java/" + dotToLine(ENTITY_PACKAGE) + "/" + CLASS_NAME + ".java";
- File entityFile = new File(entityFileUrl);
- File entityDir = entityFile.getParentFile();
- if (!entityDir.exists()) {
- entityDir.mkdirs();
- }
- if (!entityFile.exists()) {
- //若文件存在则不重新生成
- entityFile.createNewFile();
- out = new FileOutputStream(entityFile);
- entityTemplate.renderTo(out);
- }
-
- //生成dao代码
- daoTemplate.binding("entity", entity);
- String daoResult = daoTemplate.render();
- System.out.println(daoResult);
- //创建文件
- String daoFileUrl = System.getProperty("user.dir") + "/" + PROJECT + "/src/main/java/" + dotToLine(DAO_PACKAGE) + "/" + CLASS_NAME + "Mapper.java";
- File daoFile = new File(daoFileUrl);
- File daoDir = daoFile.getParentFile();
- if (!daoDir.exists()) {
- daoDir.mkdirs();
- }
- if (!daoFile.exists()) {
- //若文件存在则不重新生成
- daoFile.createNewFile();
- out = new FileOutputStream(daoFile);
- daoTemplate.renderTo(out);
- }
-
- //生成service代码
- serviceTemplate.binding("entity", entity);
- String serviceResult = serviceTemplate.render();
- System.out.println(serviceResult);
- //创建文件
- String serviceFileUrl = System.getProperty("user.dir") + "/" + PROJECT + "/src/main/java/" + dotToLine(SERVICE_PACKAGE) + "/" + CLASS_NAME + "Service.java";
- File serviceFile = new File(serviceFileUrl);
- File serviceDir = serviceFile.getParentFile();
- if (!serviceDir.exists()) {
- serviceDir.mkdirs();
- }
- if (!serviceFile.exists()) {
- //若文件存在则不重新生成
- serviceFile.createNewFile();
- out = new FileOutputStream(serviceFile);
- serviceTemplate.renderTo(out);
- }
-
- //生成serviceImpl代码
- serviceImplTemplate.binding("entity", entity);
- String serviceImplResult = serviceImplTemplate.render();
- System.out.println(serviceImplResult);
- //创建文件
- System.out.println(System.getProperty("user.dir"));
- String serviceImplFileUrl = System.getProperty("user.dir") + "/" + PROJECT + "/src/main/java/" + dotToLine(SERVICE_IMPL_PACKAGE) + "/" + CLASS_NAME + "ServiceImpl.java";
- File serviceImplFile = new File(serviceImplFileUrl);
- File serviceImplDir = serviceImplFile.getParentFile();
- if (!serviceImplDir.exists()) {
- serviceImplDir.mkdirs();
- }
- if (!serviceImplFile.exists()) {
- //若文件存在则不重新生成
- serviceImplFile.createNewFile();
- out = new FileOutputStream(serviceImplFile);
- serviceImplTemplate.renderTo(out);
- }
-
- //生成controller代码
- controllerTemplate.binding("entity", entity);
- String controllerResult = controllerTemplate.render();
- System.out.println(controllerResult);
- //创建文件
- String controllerFileUrl = System.getProperty("user.dir") + "/" + PROJECT + "/src/main/java/" + dotToLine(CONTROLLER_PACKAGE) + "/" + CLASS_NAME + "Controller.java";
- File controllerFile = new File(controllerFileUrl);
- File controllerDir = controllerFile.getParentFile();
- if (!controllerDir.exists()) {
- controllerDir.mkdirs();
- }
- if (!controllerFile.exists()) {
- //若文件存在则不重新生成
- controllerFile.createNewFile();
- out = new FileOutputStream(controllerFile);
- controllerTemplate.renderTo(out);
- }
-
- //生成mapperXml代码
- mapperXmlTemplate.binding("entity", entity);
- String mapperXmlResult = mapperXmlTemplate.render();
- System.out.println(mapperXmlResult);
- //创建文件
- String mapperXmlFileUrl = System.getProperty("user.dir") + "/" + PROJECT + "/src/main/resources/mapper/" + CLASS_NAME + "Mapper.xml";
- File mapperXmlFile = new File(mapperXmlFileUrl);
- File mapperXmlDir = mapperXmlFile.getParentFile();
- if (!mapperXmlDir.exists()) {
- mapperXmlDir.mkdirs();
- }
- if (!mapperXmlFile.exists()) {
- //若文件存在则不重新生成
- mapperXmlFile.createNewFile();
- out = new FileOutputStream(mapperXmlFile);
- mapperXmlTemplate.renderTo(out);
- }
-
- if (out != null) {
- out.close();
- }
- System.out.println("生成代码成功！");
- }
-
- /**
- * 删除指定类代码
- *
- * @param className
- * @throws IOException
- */
- private static void deleteCode(String className) throws IOException {
-
- String entityFileUrl = System.getProperty("user.dir") + "/" + PROJECT + "/src/main/java/" + dotToLine(ENTITY_PACKAGE) + "/" + className + ".java";
- File entityFile = new File(entityFileUrl);
- if (entityFile.exists()) {
- entityFile.delete();
- }
- String daoFileUrl = System.getProperty("user.dir") + "/" + PROJECT + "/src/main/java/" + dotToLine(DAO_PACKAGE) + "/" + className + "Mapper.java";
- File daoFile = new File(daoFileUrl);
- if (daoFile.exists()) {
- daoFile.delete();
- }
-
- String serviceFileUrl = System.getProperty("user.dir") + "/" + PROJECT + "/src/main/java/" + dotToLine(SERVICE_PACKAGE) + "/" + className + "Service.java";
- File serviceFile = new File(serviceFileUrl);
- if (serviceFile.exists()) {
- serviceFile.delete();
- }
-
- String serviceImplFileUrl = System.getProperty("user.dir") + "/" + PROJECT + "/src/main/java/" + dotToLine(SERVICE_IMPL_PACKAGE) + "/" + className + "ServiceImpl.java";
- File serviceImplFile = new File(serviceImplFileUrl);
- if (serviceImplFile.exists()) {
- serviceImplFile.delete();
- }
-
- String controllerFileUrl = System.getProperty("user.dir") + "/" + PROJECT + "/src/main/java/" + dotToLine(CONTROLLER_PACKAGE) + "/" + className + "Controller.java";
- File controllerFile = new File(controllerFileUrl);
- if (controllerFile.exists()) {
- controllerFile.delete();
- }
-
- String mapperXmlFileUrl = System.getProperty("user.dir") + "/" + PROJECT + "/src/main/resources/mapper/" + className + "Mapper.xml";
- File mapperXmlFile = new File(mapperXmlFileUrl);
- if (mapperXmlFile.exists()) {
- mapperXmlFile.delete();
- }
-
- System.out.println("删除代码完毕！");
- }
-
- /**
- * 点转斜线
- *
- * @param str
- * @return
- */
- public static String dotToLine(String str) {
- return str.replace(".", "/");
- }
-
-
- /**
- * 首字母是否大小写
- *
- * @param name
- * @param isFirstUpper
- * @return
- */
- public static String name(String name, boolean isFirstUpper) {
-
- if (StrUtil.isBlank(name)) {
- throw new ServiceException("name不能为空");
- }
-
- if (name.length() == 1) {
- if (isFirstUpper) {
- return name.toUpperCase();
- } else {
- return name.toLowerCase();
- }
- }
-
- StringBuffer sb = new StringBuffer();
- if (isFirstUpper) {
- sb.append(Character.toUpperCase(name.charAt(0)));
- } else {
- sb.append(Character.toLowerCase(name.charAt(0)));
- }
- sb.append(name.substring(1));
- return sb.toString();
- }
-}
diff --git a/framework/src/main/java/cn/lili/generator/bean/Entity.java b/framework/src/main/java/cn/lili/generator/bean/Entity.java
deleted file mode 100644
index 9f0c2957..00000000
--- a/framework/src/main/java/cn/lili/generator/bean/Entity.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package cn.lili.generator.bean;
-
-import lombok.Data;
-
-/**
- * @author Chopper
- */
-@Data
-public class Entity {
-
- /**
- * 实体类，dao，service，controller目录
- */
- private String entityPackage;
-
- private String daoPackage;
-
- private String servicePackage;
-
- private String serviceImplPackage;
-
- private String controllerPackage;
-
-
- /**
- * 作者
- */
- private String author;
-
- /**
- * 类名
- */
- private String className;
-
- /**
- * 首字母小写的类名字，用于模版内的变量名称
- */
- private String classNameLowerCase;
-
- /**
- * 数据库
- */
- private String tableName;
-
- /**
- * 类说明描述,一般设定关键字即可 例如：会员
- */
- private String description;
-
- /**
- * 主键类型
- */
- private String primaryKeyType;
-
-}
diff --git a/framework/src/main/resources/templates/controller.btl b/framework/src/main/resources/templates/controller.btl
deleted file mode 100644
index 5fa132f3..00000000
--- a/framework/src/main/resources/templates/controller.btl
+++ /dev/null
@@ -1,77 +0,0 @@
-package ${entity.controllerPackage};
-
-import cn.lili.mybatis.util.PageUtil;
-import cn.lili.common.enums.ResultUtil;
-import cn.lili.common.vo.PageVO;
-import cn.lili.common.vo.SearchVO;
-import cn.lili.common.vo.ResultMessage;
-import ${entity.entityPackage}.${entity.className};
-import ${entity.servicePackage}.${entity.className}Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import lombok.RequiredArgsConstructor;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-
-/**
- * @author ${entity.author}
- */
-@RestController
-@Api(tags = "${entity.description}接口")
-@RequestMapping("/lili/${entity.classNameLowerCase}")
-@Transactional(rollbackFor = Exception.class)
-
-public class ${entity.className}Controller {
-
- private final ${entity.className}Service ${entity.classNameLowerCase}Service;
-
- @GetMapping(value = "/{id}")
- @ApiOperation(value = "查看${entity.description}详情")
- public ResultMessage<${entity.className}> get(@PathVariable ${entity.primaryKeyType} id){
-
- ${entity.className} ${entity.classNameLowerCase} = ${entity.classNameLowerCase}Service.getById(id);
- return new ResultUtil<${entity.className}>().setData(${entity.classNameLowerCase});
- }
-
- @GetMapping
- @ApiOperation(value = "分页获取${entity.description}")
- public ResultMessage> getByPage(${entity.className} entity,
- SearchVO searchVo,
- PageVO page){
- IPage<${entity.className}> data = ${entity.classNameLowerCase}Service.page(PageUtil.initPage(page),PageUtil.initWrapper(entity, searchVo));
- return new ResultUtil>().setData(data);
- }
-
- @PostMapping
- @ApiOperation(value = "新增${entity.description}")
- public ResultMessage<${entity.className}> save(${entity.className} ${entity.classNameLowerCase}){
-
- if(${entity.classNameLowerCase}Service.save(${entity.classNameLowerCase})){
- return new ResultUtil<${entity.className}>().setData(${entity.classNameLowerCase});
- }
- return new ResultUtil<${entity.className}>().setErrorMsg("未知异常，请稍后重试");
- }
-
- @PutMapping("/{id}")
- @ApiOperation(value = "更新${entity.description}")
- public ResultMessage<${entity.className}> update(@PathVariable String id, ${entity.className} ${entity.classNameLowerCase}){
- if(${entity.classNameLowerCase}Service.updateById(${entity.classNameLowerCase})){
- return new ResultUtil<${entity.className}>().setData(${entity.classNameLowerCase});
- }
- return new ResultUtil<${entity.className}>().setErrorMsg("未知异常，请稍后重试");
- }
-
- @DeleteMapping(value = "/{ids}")
- @ApiOperation(value = "删除${entity.description}")
- public ResultMessage