diff --git a/README.md b/README.md index 3c300e09bdab2744e51c1b85d7a64b5e4554f399..e505d20bee56d01a4c4aa3ef969f7dbe823c258a 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@
交流三群
- 交流三群 + 交流三群 diff --git a/zlt-business/code-generator/pom.xml b/zlt-business/code-generator/pom.xml deleted file mode 100644 index a3ff689042a2730de99fe4d662767d4cf7399027..0000000000000000000000000000000000000000 --- a/zlt-business/code-generator/pom.xml +++ /dev/null @@ -1,113 +0,0 @@ - - 4.0.0 - - com.zlt - zlt-business - 6.0.0 - - code-generator - - - - com.zlt - zlt-config - - - com.zlt - zlt-log-spring-boot-starter - - - com.zlt - zlt-common-spring-boot-starter - - - com.zlt - zlt-db-spring-boot-starter - - - com.github.xiaoymin - knife4j-openapi3-jakarta-spring-boot-starter - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-actuator - - - commons-io - commons-io - - - mysql - mysql-connector-java - - - - org.apache.velocity - velocity - - - org.apache.commons - commons-configuration2 - - - - io.micrometer - micrometer-registry-prometheus - - - commons-configuration - commons-configuration - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - com.spotify - docker-maven-plugin - - ${docker.image.prefix}/${project.artifactId} - - ${project.version} - latest - - true - ${docker.baseImage} - ${docker.volumes} - - ${docker.java.opts} - - ["sh","-c","java $JAVA_OPTS ${docker.java.security.egd} -jar /${project.build.finalName}.jar"] - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - - - - ${project.artifactId} - - \ No newline at end of file diff --git a/zlt-business/code-generator/src/main/java/com/central/generator/CodeGeneratorApp.java b/zlt-business/code-generator/src/main/java/com/central/generator/CodeGeneratorApp.java deleted file mode 100644 index 5c48b0a4ce374ea1403bc37ba29e164c8628a89f..0000000000000000000000000000000000000000 --- a/zlt-business/code-generator/src/main/java/com/central/generator/CodeGeneratorApp.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.central.generator; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.cloud.openfeign.EnableFeignClients; - -/** - * @author zlt - */ -@EnableDiscoveryClient -@EnableFeignClients(basePackages = "com.central") -@SpringBootApplication -public class CodeGeneratorApp { - public static void main(String[] args) { - SpringApplication.run(CodeGeneratorApp.class, args); - } -} diff --git a/zlt-business/code-generator/src/main/java/com/central/generator/controller/SysGeneratorController.java b/zlt-business/code-generator/src/main/java/com/central/generator/controller/SysGeneratorController.java deleted file mode 100644 index a3217ded33244a0b0c8a993fdf6a57172172883e..0000000000000000000000000000000000000000 --- a/zlt-business/code-generator/src/main/java/com/central/generator/controller/SysGeneratorController.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.central.generator.controller; - -import java.io.IOException; -import java.util.Map; - -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.servlet.http.HttpServletResponse; - -import com.central.common.model.PageResult; -import com.central.generator.service.SysGeneratorService; -import org.apache.commons.io.IOUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -/** - * @Author: zlt - */ -@RestController -@Tag(name = "代码生成器") -@RequestMapping("/generator") -public class SysGeneratorController { - @Autowired - private SysGeneratorService sysGeneratorService; - - /** - * 列表 - */ - @ResponseBody - @GetMapping("/list") - public PageResult getTableList(@RequestParam Map params) { - return sysGeneratorService.queryList(params); - } - - /** - * 生成代码FileUtil - */ - @GetMapping("/code") - public void makeCode(String tables, HttpServletResponse response) throws IOException { - byte[] data = sysGeneratorService.generatorCode(tables.split(",")); - response.reset(); - response.setHeader("Content-Disposition", "attachment; filename=\"generator.zip\""); - response.addHeader("Content-Length", "" + data.length); - response.setContentType("application/octet-stream; charset=UTF-8"); - IOUtils.write(data, response.getOutputStream()); - } -} diff --git a/zlt-business/code-generator/src/main/java/com/central/generator/mapper/SysGeneratorMapper.java b/zlt-business/code-generator/src/main/java/com/central/generator/mapper/SysGeneratorMapper.java deleted file mode 100644 index 3eae9d960ac2d241eb029e2b56b52c7d2f6f2e59..0000000000000000000000000000000000000000 --- a/zlt-business/code-generator/src/main/java/com/central/generator/mapper/SysGeneratorMapper.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.central.generator.mapper; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.central.db.mapper.SuperMapper; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Component; - -import java.util.List; -import java.util.Map; - -/** - * @Author zlt - */ -@Component -@Mapper -public interface SysGeneratorMapper extends SuperMapper { - List> queryList(Page> page, @Param("p") Map map); - - int queryTotal(Map map); - - Map queryTable(String tableName); - - List> queryColumns(String tableName); -} diff --git a/zlt-business/code-generator/src/main/java/com/central/generator/model/ColumnEntity.java b/zlt-business/code-generator/src/main/java/com/central/generator/model/ColumnEntity.java deleted file mode 100644 index 0220a20f44acc1b4fe5716318f75428c8f60b8bb..0000000000000000000000000000000000000000 --- a/zlt-business/code-generator/src/main/java/com/central/generator/model/ColumnEntity.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.central.generator.model; - -/** - * @Author: zlt - */ -public class ColumnEntity { - /** - * 列名 - */ - private String columnName; - /** - * 列名类型 - */ - private String dataType; - /** - * 列名备注 - */ - private String comments; - /** - * 属性名称(第一个字母大写),如:user_name => UserName - */ - private String attrName; - /** - * 属性名称(第一个字母小写),如:user_name => userName - */ - private String attrname; - /** - * 属性类型 - */ - private String attrType; - /** - * auto_increment - */ - private String extra; - - public String getColumnName() { - return columnName; - } - - public void setColumnName(String columnName) { - this.columnName = columnName; - } - - public String getDataType() { - return dataType; - } - - public void setDataType(String dataType) { - this.dataType = dataType; - } - - public String getComments() { - return comments; - } - - public void setComments(String comments) { - this.comments = comments; - } - - public String getAttrName() { - return attrName; - } - - public void setAttrName(String attrName) { - this.attrName = attrName; - } - - public String getAttrname() { - return attrname; - } - - public void setAttrname(String attrname) { - this.attrname = attrname; - } - - public String getAttrType() { - return attrType; - } - - public void setAttrType(String attrType) { - this.attrType = attrType; - } - - public String getExtra() { - return extra; - } - - public void setExtra(String extra) { - this.extra = extra; - } -} diff --git a/zlt-business/code-generator/src/main/java/com/central/generator/model/TableEntity.java b/zlt-business/code-generator/src/main/java/com/central/generator/model/TableEntity.java deleted file mode 100644 index d94898dc204ad27b9bd6eab774f7a5a90b7b38ac..0000000000000000000000000000000000000000 --- a/zlt-business/code-generator/src/main/java/com/central/generator/model/TableEntity.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.central.generator.model; - -import java.util.List; - -/** - * @Author: zlt - */ -public class TableEntity { - /** - * 表的名称 - */ - private String tableName; - /** - * 表的备注 - */ - private String comments; - /** - * 表的主键 - */ - private ColumnEntity pk; - /** - * 表的列名(不包含主键) - */ - private List columns; - /** - * 类名(第一个字母大写),如:sys_user => SysUser - */ - private String className; - /** - * 类名(第一个字母小写),如:sys_user => sysUser - */ - private String classname; - - public String getTableName() { - return tableName; - } - - public void setTableName(String tableName) { - this.tableName = tableName; - } - - public String getComments() { - return comments; - } - - public void setComments(String comments) { - this.comments = comments; - } - - public ColumnEntity getPk() { - return pk; - } - - public void setPk(ColumnEntity pk) { - this.pk = pk; - } - - public List getColumns() { - return columns; - } - - public void setColumns(List columns) { - this.columns = columns; - } - - public String getClassName() { - return className; - } - - public void setClassName(String className) { - this.className = className; - } - - public String getClassname() { - return classname; - } - - public void setClassname(String classname) { - this.classname = classname; - } -} diff --git a/zlt-business/code-generator/src/main/java/com/central/generator/service/SysGeneratorService.java b/zlt-business/code-generator/src/main/java/com/central/generator/service/SysGeneratorService.java deleted file mode 100644 index ad7a73914e28f7336474e2fcc08b60464d200f99..0000000000000000000000000000000000000000 --- a/zlt-business/code-generator/src/main/java/com/central/generator/service/SysGeneratorService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.central.generator.service; - -import java.util.List; -import java.util.Map; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.central.common.model.PageResult; -import org.springframework.stereotype.Service; - -/** - * @Author zlt - */ -@Service -public interface SysGeneratorService extends IService { - PageResult queryList(Map map); - - Map queryTable(String tableName); - - List> queryColumns(String tableName); - - byte[] generatorCode(String[] tableNames); -} diff --git a/zlt-business/code-generator/src/main/java/com/central/generator/service/impl/SysGeneratorServiceImpl.java b/zlt-business/code-generator/src/main/java/com/central/generator/service/impl/SysGeneratorServiceImpl.java deleted file mode 100644 index c194703df27bf5f0ce7bb0695c7f594d15b3a0d7..0000000000000000000000000000000000000000 --- a/zlt-business/code-generator/src/main/java/com/central/generator/service/impl/SysGeneratorServiceImpl.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.central.generator.service.impl; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.util.List; -import java.util.Map; -import java.util.zip.ZipOutputStream; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.central.common.model.PageResult; -import com.central.generator.mapper.SysGeneratorMapper; -import com.central.generator.service.SysGeneratorService; -import com.central.generator.utils.GenUtils; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.MapUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -/** - * @Author zlt - */ -@Slf4j -@Service -public class SysGeneratorServiceImpl extends ServiceImpl implements SysGeneratorService { - @Autowired - private SysGeneratorMapper sysGeneratorMapper; - - @Override - public PageResult> queryList(Map map) { - Page> page = new Page<>(MapUtils.getInteger(map, "page"), MapUtils.getInteger(map, "limit")); - - List> list = sysGeneratorMapper.queryList(page, map); - return PageResult.>builder().data(list).code(0).count(page.getTotal()).build(); - } - - @Override - public Map queryTable(String tableName) { - return sysGeneratorMapper.queryTable(tableName); - } - - @Override - public List> queryColumns(String tableName) { - return sysGeneratorMapper.queryColumns(tableName); - } - - @Override - public byte[] generatorCode(String[] tableNames) { - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - try ( - ZipOutputStream zip = new ZipOutputStream(outputStream) - ) { - for (String tableName : tableNames) { - //查询表信息 - Map table = queryTable(tableName); - //查询列信息 - List> columns = queryColumns(tableName); - //生成代码 - GenUtils.generatorCode(table, columns, zip); - } - } catch (IOException e) { - log.error("generatorCode-error: ", e); - } - return outputStream.toByteArray(); - } -} diff --git a/zlt-business/code-generator/src/main/java/com/central/generator/utils/GenUtils.java b/zlt-business/code-generator/src/main/java/com/central/generator/utils/GenUtils.java deleted file mode 100644 index a0468409aac936d8f13c3d795c65acfe5367ee78..0000000000000000000000000000000000000000 --- a/zlt-business/code-generator/src/main/java/com/central/generator/utils/GenUtils.java +++ /dev/null @@ -1,231 +0,0 @@ -package com.central.generator.utils; - -import java.io.File; -import java.io.IOException; -import java.io.StringWriter; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.zip.ZipEntry; -import java.util.zip.ZipOutputStream; - -import cn.hutool.core.date.DateUtil; -import com.central.common.constant.CommonConstant; -import com.central.generator.model.ColumnEntity; -import com.central.generator.model.TableEntity; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.configuration.ConfigurationException; -import org.apache.commons.configuration.PropertiesConfiguration; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.WordUtils; -import org.apache.commons.io.IOUtils; -import org.apache.velocity.Template; -import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.Velocity; - -/** - * 代码生成器工具类 - * - * @author zlt - */ -@Slf4j -public class GenUtils { - private GenUtils() { - throw new IllegalStateException("Utility class"); - } - - private final static String FILE_NAME_MODEL = "Model.java.vm"; - private final static String FILE_NAME_MAPPER = "Mapper.java.vm"; - private final static String FILE_NAME_MAPPERXML = "Mapper.xml.vm"; - private final static String FILE_NAME_SERVICE = "Service.java.vm"; - private final static String FILE_NAME_SERVICEIMPL = "ServiceImpl.java.vm"; - private final static String FILE_NAME_CONTROLLER = "Controller.java.vm"; - private final static String FILE_NAME_PAGE = "index.html.vm"; - private final static String TEMPLATE_PATH = "template/"; - private final static String PACKAGE = "package"; - private final static String MODULE_NAME = "moduleName"; - - public static List getTemplates() { - List templates = new ArrayList<>(); - templates.add(TEMPLATE_PATH+FILE_NAME_MODEL); - templates.add(TEMPLATE_PATH+FILE_NAME_MAPPER); - templates.add(TEMPLATE_PATH+FILE_NAME_MAPPERXML); - templates.add(TEMPLATE_PATH+FILE_NAME_SERVICE); - templates.add(TEMPLATE_PATH+FILE_NAME_SERVICEIMPL); - templates.add(TEMPLATE_PATH+FILE_NAME_CONTROLLER); - - templates.add(TEMPLATE_PATH+FILE_NAME_PAGE); - - return templates; - } - - /** - * 生成代码 - */ - public static void generatorCode(Map table, - List> columns, ZipOutputStream zip) { - //配置信息 - Configuration config = getConfig(); - boolean hasBigDecimal = false; - //表信息 - TableEntity tableEntity = new TableEntity(); - tableEntity.setTableName(table.get("tableName")); - tableEntity.setComments(table.get("tableComment")); - //表名转换成Java类名 - String className = tableToJava(tableEntity.getTableName(), config.getString("tablePrefix")); - tableEntity.setClassName(className); - tableEntity.setClassname(StringUtils.uncapitalize(className)); - - //列信息 - List columsList = new ArrayList<>(); - for (Map column : columns) { - ColumnEntity columnEntity = new ColumnEntity(); - columnEntity.setColumnName(column.get("columnName")); - columnEntity.setDataType(column.get("dataType")); - columnEntity.setComments(column.get("columnComment")); - columnEntity.setExtra(column.get("extra")); - - //列名转换成Java属性名 - String attrName = columnToJava(columnEntity.getColumnName()); - columnEntity.setAttrName(attrName); - columnEntity.setAttrname(StringUtils.uncapitalize(attrName)); - - //列的数据类型,转换成Java类型 - String attrType = config.getString(columnEntity.getDataType(), "unknowType"); - columnEntity.setAttrType(attrType); - if (!hasBigDecimal && "BigDecimal".equals(attrType)) { - hasBigDecimal = true; - } - //是否主键 - if ("PRI".equalsIgnoreCase(column.get("columnKey")) && tableEntity.getPk() == null) { - tableEntity.setPk(columnEntity); - } - - columsList.add(columnEntity); - } - tableEntity.setColumns(columsList); - - //没主键,则第一个字段为主键 - if (tableEntity.getPk() == null) { - tableEntity.setPk(tableEntity.getColumns().get(0)); - } - - //设置velocity资源加载器 - Properties prop = new Properties(); - prop.put("file.resource.loader.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader"); - Velocity.init(prop); - String mainPath = config.getString("mainPath"); - mainPath = StringUtils.isBlank(mainPath) ? "io.renren" : mainPath; - //封装模板数据 - Map map = new HashMap<>(); - map.put("tableName", tableEntity.getTableName()); - map.put("comments", tableEntity.getComments()); - map.put("pk", tableEntity.getPk()); - map.put("className", tableEntity.getClassName()); - map.put("classname", tableEntity.getClassname()); - map.put("pathName", tableEntity.getClassname().toLowerCase()); - map.put("columns", tableEntity.getColumns()); - map.put("hasBigDecimal", hasBigDecimal); - map.put("mainPath", mainPath); - map.put(PACKAGE, config.getString(PACKAGE)); - map.put(MODULE_NAME, config.getString(MODULE_NAME)); - map.put("author", config.getString("author")); - map.put("email", config.getString("email")); - map.put("datetime", DateUtil.format(new Date(), CommonConstant.DATETIME_FORMAT)); - VelocityContext context = new VelocityContext(map); - - //获取模板列表 - List templates = getTemplates(); - for (String template : templates) { - //渲染模板 - try ( - StringWriter sw = new StringWriter() - ) { - Template tpl = Velocity.getTemplate(template, "UTF-8"); - tpl.merge(context, sw); - - //添加到zip - zip.putNextEntry(new ZipEntry(getFileName(template, tableEntity.getClassName(), config.getString(PACKAGE), config.getString(MODULE_NAME)))); - IOUtils.write(sw.toString(), zip, StandardCharsets.UTF_8); - zip.closeEntry(); - } catch (IOException e) { - log.error("generatorCode-error", e); - } - } - } - - - /** - * 列名转换成Java属性名 - */ - public static String columnToJava(String columnName) { - return WordUtils.capitalizeFully(columnName, new char[]{'_'}).replace("_", ""); - } - - /** - * 表名转换成Java类名 - */ - public static String tableToJava(String tableName, String tablePrefix) { - if (StringUtils.isNotBlank(tablePrefix)) { - tableName = tableName.substring(tablePrefix.length()); - } - return columnToJava(tableName); - } - - /** - * 获取配置信息 - */ - public static Configuration getConfig() { - try { - return new PropertiesConfiguration("generator.properties"); - } catch (ConfigurationException e) { - throw new RuntimeException("获取配置文件失败,", e); - } - } - - /** - * 获取文件名 - */ - public static String getFileName(String template, String className, String packageName, String moduleName) { - String packagePath = "main" + File.separator + "java" + File.separator; - if (StringUtils.isNotBlank(packageName)) { - packagePath += packageName.replace(".", File.separator) + File.separator + moduleName + File.separator; - } - - if (template.contains(FILE_NAME_MODEL)) { - return packagePath + "model" + File.separator + className + ".java"; - } - - if (template.contains(FILE_NAME_MAPPER)) { - return packagePath + "mapper" + File.separator + className + "Mapper.java"; - } - - if (template.contains(FILE_NAME_SERVICE)) { - return packagePath + "service" + File.separator + "I" + className + "Service.java"; - } - - if (template.contains(FILE_NAME_SERVICEIMPL)) { - return packagePath + "service" + File.separator + "impl" + File.separator + className + "ServiceImpl.java"; - } - - if (template.contains(FILE_NAME_CONTROLLER)) { - return packagePath + "controller" + File.separator + className + "Controller.java"; - } - - if (template.contains(FILE_NAME_MAPPERXML)) { - return "main" + File.separator + "resources" + File.separator + "mapper" + File.separator + className + "Mapper.xml"; - } - - if (template.contains(FILE_NAME_PAGE)) { - return "main" + File.separator + "view" + File.separator + "pages" + - File.separator + moduleName + File.separator + "index.html"; - } - - return null; - } -} diff --git a/zlt-business/code-generator/src/main/resources/application.yml b/zlt-business/code-generator/src/main/resources/application.yml deleted file mode 100644 index 3f985645e673af9d4adfea838c1ba9c5c016e583..0000000000000000000000000000000000000000 --- a/zlt-business/code-generator/src/main/resources/application.yml +++ /dev/null @@ -1,22 +0,0 @@ -spring: - datasource: - url: jdbc:mysql://${zlt.datasource.ip}:3306/user-center?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai - username: ${zlt.datasource.username} - password: ${zlt.datasource.password} - driver-class-name: com.mysql.cj.jdbc.Driver - -mybatis-plus: - mapper-locations: classpath:/mapper/*Mapper.xml - #实体扫描,多个package用逗号或者分号分隔 - typeAliasesPackage: com.central.generator.model - -springdoc: - group-configs: - - group: 'code' - paths-to-match: '/**' - packages-to-scan: com.central.generator.controller - -knife4j: - enable: true - setting: - swagger-model-name: 代码生成器接口文档 \ No newline at end of file diff --git a/zlt-business/code-generator/src/main/resources/bootstrap.yml b/zlt-business/code-generator/src/main/resources/bootstrap.yml deleted file mode 100644 index bffb899c141f8a8ae33d78ba7076785dcc6317f9..0000000000000000000000000000000000000000 --- a/zlt-business/code-generator/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,6 +0,0 @@ -server: - port: 7300 - -spring: - application: - name: code-generator \ No newline at end of file diff --git a/zlt-business/code-generator/src/main/resources/generator.properties b/zlt-business/code-generator/src/main/resources/generator.properties deleted file mode 100644 index 2bf5e52513b3a34dc2bda724ee0fc77bfe4d247c..0000000000000000000000000000000000000000 --- a/zlt-business/code-generator/src/main/resources/generator.properties +++ /dev/null @@ -1,33 +0,0 @@ -#包前缀 -package=com.central -#模块名,生成的类的package为:com.central.generator -moduleName=generator -#作者名 -author=zlt -#Email -email= -#表前缀,如表tb_sys_user 生成类 sys_user -tablePrefix=tb_ - -#数据转换类型 -tinyint=Integer -smallint=Integer -mediumint=Integer -int=Integer -integer=Integer -bigint=Long -float=Float -double=Double -decimal=BigDecimal -bit=Boolean - -char=String -varchar=String -tinytext=String -text=String -mediumtext=String -longtext=String - -date=Date -datetime=Date -timestamp=Date \ No newline at end of file diff --git a/zlt-business/code-generator/src/main/resources/mapper/SysGeneratorMapper.xml b/zlt-business/code-generator/src/main/resources/mapper/SysGeneratorMapper.xml deleted file mode 100644 index 30d36489321825ef58a6a9062a1bc9e9ccae96dc..0000000000000000000000000000000000000000 --- a/zlt-business/code-generator/src/main/resources/mapper/SysGeneratorMapper.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/zlt-business/code-generator/src/main/resources/template/Controller.java.vm b/zlt-business/code-generator/src/main/resources/template/Controller.java.vm deleted file mode 100644 index 76554431c5a05922fa065772d67624c908f41805..0000000000000000000000000000000000000000 --- a/zlt-business/code-generator/src/main/resources/template/Controller.java.vm +++ /dev/null @@ -1,76 +0,0 @@ -package ${package}.${moduleName}.controller; - -import java.util.Map; - -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.enums.ParameterIn; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import lombok.extern.slf4j.Slf4j; - -import ${package}.${moduleName}.model.${className}; -import ${package}.${moduleName}.service.I${className}Service; -import com.central.common.model.PageResult; -import com.central.common.model.Result; - -/** - * ${comments} - * - * @author ${author} - * @date ${datetime} - */ -@Slf4j -@RestController -@RequestMapping("/${pathName}") -@Tag(name = "${comments}") -@RequiredArgsConstructor -public class ${className}Controller { - private final I${className}Service ${classname}Service; - - /** - * 列表 - */ - @Operation(summary = "查询列表") - @Parameters({ - @Parameter(name = "page",description = "分页起始位置",required = true,in=ParameterIn.QUERY), - @Parameter(name = "limit",description = "分页结束位置",required = true,in=ParameterIn.QUERY) - }) - @GetMapping - public PageResult list(@RequestParam Map params) { - return ${classname}Service.findList(params); - } - - /** - * 查询 - */ - @Operation(summary = "查询") - @GetMapping("/{${pk.attrname}}") - public Result findUserById(@PathVariable Long ${pk.attrname}) { - ${className} model = ${classname}Service.getById(${pk.attrname}); - return Result.succeed(model, "查询成功"); - } - - /** - * 新增or更新 - */ - @Operation(summary = "保存") - @PostMapping - public Result save(@RequestBody ${className} ${classname}) { - ${classname}Service.saveOrUpdate(${classname}); - return Result.succeed("保存成功"); - } - - /** - * 删除 - */ - @Operation(summary = "删除") - @Parameter(name = "id", description = "id", in = ParameterIn.PATH, required = true) - @DeleteMapping("/{id}") - public Result delete(@PathVariable Long ${pk.attrname}) { - ${classname}Service.removeById(${pk.attrname}); - return Result.succeed("删除成功"); - } -} diff --git a/zlt-business/code-generator/src/main/resources/template/Mapper.java.vm b/zlt-business/code-generator/src/main/resources/template/Mapper.java.vm deleted file mode 100644 index 23b7c320bd218a825271b99789005129c250ab13..0000000000000000000000000000000000000000 --- a/zlt-business/code-generator/src/main/resources/template/Mapper.java.vm +++ /dev/null @@ -1,27 +0,0 @@ -package ${package}.${moduleName}.mapper; - -import ${package}.${moduleName}.model.${className}; -import com.central.db.mapper.SuperMapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; -import java.util.Map; - -/** - * ${comments} - * - * @author ${author} - * @date ${datetime} - */ -@Mapper -public interface ${className}Mapper extends SuperMapper<${className}> { - /** - * 分页查询用户列表 - * @param page - * @param params - * @return - */ - List<${className}> findList(Page<${className}> page, @Param("p") Map params); -} diff --git a/zlt-business/code-generator/src/main/resources/template/Mapper.xml.vm b/zlt-business/code-generator/src/main/resources/template/Mapper.xml.vm deleted file mode 100644 index bc5b620bbf298514eb91b963ae843eb1553b5068..0000000000000000000000000000000000000000 --- a/zlt-business/code-generator/src/main/resources/template/Mapper.xml.vm +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/zlt-business/code-generator/src/main/resources/template/Model.java.vm b/zlt-business/code-generator/src/main/resources/template/Model.java.vm deleted file mode 100644 index cb57c394e06c37f66e4d49a9159d41a4d59197cf..0000000000000000000000000000000000000000 --- a/zlt-business/code-generator/src/main/resources/template/Model.java.vm +++ /dev/null @@ -1,31 +0,0 @@ -package ${package}.${moduleName}.model; - -import ${package}.common.model.SuperEntity; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Getter; -import lombok.Setter; -import lombok.EqualsAndHashCode; -#if(${hasBigDecimal}) -import java.math.BigDecimal; -#end -import java.util.Date; - -/** - * ${comments} - * - * @author ${author} - * @date ${datetime} - */ -@Getter -@Setter -@EqualsAndHashCode(callSuper = false) -@TableName("${tableName}") -public class ${className} extends SuperEntity { - private static final long serialVersionUID=1L; - -#foreach ($column in $columns) - #if($column.columnName != $pk.columnName && $column.columnName != "createTime" && $column.columnName != "updateTime") -private $column.attrType $column.attrname; - #end -#end -} diff --git a/zlt-business/code-generator/src/main/resources/template/Service.java.vm b/zlt-business/code-generator/src/main/resources/template/Service.java.vm deleted file mode 100644 index 40d7011bca17d9deca2a66414e40aa725629ccc7..0000000000000000000000000000000000000000 --- a/zlt-business/code-generator/src/main/resources/template/Service.java.vm +++ /dev/null @@ -1,23 +0,0 @@ -package ${package}.${moduleName}.service; - -import ${package}.${moduleName}.model.${className}; -import com.central.common.model.PageResult; -import ${package}.common.service.ISuperService; - -import java.util.Map; - -/** - * ${comments} - * - * @author ${author} - * @date ${datetime} - */ -public interface I${className}Service extends ISuperService<${className}> { - /** - * 列表 - * @param params - * @return - */ - PageResult<${className}> findList(Map params); -} - diff --git a/zlt-business/code-generator/src/main/resources/template/ServiceImpl.java.vm b/zlt-business/code-generator/src/main/resources/template/ServiceImpl.java.vm deleted file mode 100644 index 58bf2f6d932c707bb5890f029065dbd1ea685df3..0000000000000000000000000000000000000000 --- a/zlt-business/code-generator/src/main/resources/template/ServiceImpl.java.vm +++ /dev/null @@ -1,37 +0,0 @@ -package ${package}.${moduleName}.service.impl; - -import org.springframework.stereotype.Service; -import com.central.common.model.PageResult; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import ${package}.common.service.impl.SuperServiceImpl; - -import java.util.List; -import java.util.Map; -import org.apache.commons.collections4.MapUtils; -import lombok.extern.slf4j.Slf4j; - -import ${package}.${moduleName}.model.${className}; -import ${package}.${moduleName}.mapper.${className}Mapper; -import ${package}.${moduleName}.service.I${className}Service; - -/** - * ${comments} - * - * @author ${author} - * @date ${datetime} - */ -@Slf4j -@Service -public class ${className}ServiceImpl extends SuperServiceImpl<${className}Mapper, ${className}> implements I${className}Service { - /** - * 列表 - * @param params - * @return - */ - @Override - public PageResult<${className}> findList(Map params){ - Page<${className}> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit")); - List<${className}> list = baseMapper.findList(page, params); - return PageResult.<${className}>builder().data(list).code(0).count(page.getTotal()).build(); - } -} diff --git a/zlt-business/code-generator/src/main/resources/template/index.html.vm b/zlt-business/code-generator/src/main/resources/template/index.html.vm deleted file mode 100644 index 8792acdd8956fbb80ec9c5933595f52b9eff1b39..0000000000000000000000000000000000000000 --- a/zlt-business/code-generator/src/main/resources/template/index.html.vm +++ /dev/null @@ -1,52 +0,0 @@ -
-
-

${comments}

- - 首页 - ${comments} - -
- - -
-
- 搜索: -   - - -
- - -
-
-
- - - \ No newline at end of file diff --git a/zlt-business/code-generator/src/main/test/java/com/central/generator/utils/GenUtilsTest.java b/zlt-business/code-generator/src/main/test/java/com/central/generator/utils/GenUtilsTest.java deleted file mode 100644 index b3c7adf027fb7bf77499a3dcf7115d8171e7cab6..0000000000000000000000000000000000000000 --- a/zlt-business/code-generator/src/main/test/java/com/central/generator/utils/GenUtilsTest.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.central.generator.utils; - -import org.assertj.core.api.Assertions; -import org.junit.Test; -import org.springframework.boot.test.context.SpringBootTest; - -/** - * GenUtils测试用例 - * - * @author zlt - * @date 2019/5/10 - */ -@SpringBootTest -public class GenUtilsTest { - @Test - public void testTableToJava() { - String javaName = GenUtils.tableToJava("t_event_message", "t_"); - Assertions.assertThat(javaName).isEqualTo("EventMessage"); - } -} diff --git a/zlt-business/pom.xml b/zlt-business/pom.xml index 6dfdc8c67f33c66377c6e7320a051c611abf419f..b456d8c43b8ddbd744ae34dc5f5b45c14b7f1d81 100644 --- a/zlt-business/pom.xml +++ b/zlt-business/pom.xml @@ -14,8 +14,6 @@ user-center file-center - - code-generator search-center diff --git a/zlt-commons/zlt-auth-client-spring-boot-starter/src/main/java/com/central/oauth2/common/service/impl/RedisOAuth2AuthorizationService.java b/zlt-commons/zlt-auth-client-spring-boot-starter/src/main/java/com/central/oauth2/common/service/impl/RedisOAuth2AuthorizationService.java index 509dd632cf9af3f2aba1422dcd1985903b1335f7..fe7782715644f06354f049dbbb93bddb49695ba4 100644 --- a/zlt-commons/zlt-auth-client-spring-boot-starter/src/main/java/com/central/oauth2/common/service/impl/RedisOAuth2AuthorizationService.java +++ b/zlt-commons/zlt-auth-client-spring-boot-starter/src/main/java/com/central/oauth2/common/service/impl/RedisOAuth2AuthorizationService.java @@ -177,7 +177,9 @@ public class RedisOAuth2AuthorizationService implements OAuth2AuthorizationServi public void remove(String accessToken) { OAuth2Authorization oAuth2Authorization = this.findById(accessToken); - this.remove(oAuth2Authorization); + if (oAuth2Authorization != null) { + this.remove(oAuth2Authorization); + } } public List findTokensByClientId(String clientId) { diff --git a/zlt-commons/zlt-common-core/src/main/java/com/central/common/feign/UserService.java b/zlt-commons/zlt-common-core/src/main/java/com/central/common/feign/UserService.java index fbef509d1301c84e93d4876a78dfac170a77740b..7e391979580332c93c2175699ca7ea3d82074024 100644 --- a/zlt-commons/zlt-common-core/src/main/java/com/central/common/feign/UserService.java +++ b/zlt-commons/zlt-common-core/src/main/java/com/central/common/feign/UserService.java @@ -2,12 +2,11 @@ package com.central.common.feign; import com.central.common.constant.ServiceNameConstants; import com.central.common.feign.fallback.UserServiceFallbackFactory; +import com.central.common.model.Result; import com.central.common.model.SysRole; import com.central.common.model.SysUser; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -58,7 +57,7 @@ public interface UserService { * @return */ @GetMapping(value = "/users/roleUser/{username}") - public SysUser selectRoleUser(@PathVariable("username") String username); + SysUser selectRoleUser(@PathVariable("username") String username); /** * 获取用户的角色 @@ -67,5 +66,11 @@ public interface UserService { * @return */ @GetMapping("/users/{id}/roles") - public List findRolesByUserId(@PathVariable("id") Long id); + List findRolesByUserId(@PathVariable("id") Long id); + + /** + * 保存用户 + */ + @PostMapping("/users/saveOrUpdate") + Result saveOrUpdate(@RequestBody SysUser sysUser); } diff --git a/zlt-commons/zlt-common-core/src/main/java/com/central/common/feign/fallback/UserServiceFallbackFactory.java b/zlt-commons/zlt-common-core/src/main/java/com/central/common/feign/fallback/UserServiceFallbackFactory.java index eb83c6555ddc33913c55b13a66bef0d97363c122..42669c3a2395e4a4e7597e73dd95e920d11b8f61 100644 --- a/zlt-commons/zlt-common-core/src/main/java/com/central/common/feign/fallback/UserServiceFallbackFactory.java +++ b/zlt-commons/zlt-common-core/src/main/java/com/central/common/feign/fallback/UserServiceFallbackFactory.java @@ -1,10 +1,13 @@ package com.central.common.feign.fallback; import com.central.common.feign.UserService; +import com.central.common.model.Result; import com.central.common.model.SysRole; import com.central.common.model.SysUser; import org.springframework.cloud.openfeign.FallbackFactory; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import java.util.Collections; import java.util.List; @@ -66,6 +69,15 @@ public class UserServiceFallbackFactory implements FallbackFactory log.error("通过用户id查询角色列表异常:{}", id, throwable); return Collections.emptyList(); } + + /** + * 保存用户 + */ + @PostMapping("/users/saveOrUpdate") + public Result saveOrUpdate(@RequestBody SysUser sysUser) { + log.error("保存用户异常", throwable); + return Result.failed(throwable.getMessage()); + } }; } } diff --git a/zlt-uaa/src/main/java/com/central/oauth/service/impl/UserDetailServiceFactory.java b/zlt-uaa/src/main/java/com/central/oauth/service/impl/UserDetailServiceFactory.java index bc1bb2b5cef6bd09b36483d8d2c0c3a597f35240..1bc3820d7a1169791b35cc3deed7c66421c9e89e 100644 --- a/zlt-uaa/src/main/java/com/central/oauth/service/impl/UserDetailServiceFactory.java +++ b/zlt-uaa/src/main/java/com/central/oauth/service/impl/UserDetailServiceFactory.java @@ -36,6 +36,10 @@ public class UserDetailServiceFactory { return this.getService(accountType); } + public ZltUserDetailsService getService() { + return this.getService(SecurityConstants.DEF_ACCOUNT_TYPE); + } + public ZltUserDetailsService getService(String accountType) { if (StrUtil.isEmpty(accountType)) { accountType = SecurityConstants.DEF_ACCOUNT_TYPE;