ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-09-10 20:57:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: top.charles7c.continew => top.continew

Browse Source 
1.groupId 及基础包名调整，更短的包名，优化品牌形象
2.全局代码格式化
This commit is contained in:
Charles7c
2024-04-22 20:29:17 +08:00
parent da3a4e0756
commit 08eeabc47d
238 changed files with 1121 additions and 1154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
continew-admin-generator/pom.xml
View File

@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>top.charles7c.continew</groupId>
<groupId>top.continew</groupId>
<artifactId>continew-admin</artifactId>
<version>${revision}</version>
</parent>
@@ -15,7 +15,7 @@
<dependencies>
<!-- 公共模块（存放公共工具类，公共配置等） -->
<dependency>
<groupId>top.charles7c.continew</groupId>
<groupId>top.continew</groupId>
<artifactId>continew-admin-common</artifactId>
</dependency>
</dependencies>

2
continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/config/properties/GeneratorProperties.java → continew-admin-generator/src/main/java/top/continew/admin/generator/config/properties/GeneratorProperties.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.continew.admin.generator.config.properties;
package top.continew.admin.generator.config.properties;
import cn.hutool.core.io.file.FileNameUtil;
import cn.hutool.core.map.MapUtil;

2
continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/enums/FormTypeEnum.java → continew-admin-generator/src/main/java/top/continew/admin/generator/enums/FormTypeEnum.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.continew.admin.generator.enums;
package top.continew.admin.generator.enums;
import lombok.Getter;
import lombok.RequiredArgsConstructor;

2
continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/enums/QueryTypeEnum.java → continew-admin-generator/src/main/java/top/continew/admin/generator/enums/QueryTypeEnum.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.continew.admin.generator.enums;
package top.continew.admin.generator.enums;
import lombok.Getter;
import lombok.RequiredArgsConstructor;

6
continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/mapper/FieldConfigMapper.java → continew-admin-generator/src/main/java/top/continew/admin/generator/mapper/FieldConfigMapper.java
View File

@@ -14,11 +14,11 @@
* limitations under the License.
*/
package top.charles7c.continew.admin.generator.mapper;
package top.continew.admin.generator.mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import top.charles7c.continew.admin.generator.model.entity.FieldConfigDO;
import top.continew.admin.generator.model.entity.FieldConfigDO;
import top.continew.starter.data.mybatis.plus.base.BaseMapper;
import java.util.List;
@@ -33,7 +33,7 @@ public interface FieldConfigMapper extends BaseMapper<FieldConfigDO> {
/**
* 根据表名称查询
*
*
* @param tableName 表名称
* @return 字段配置信息
*/

7
continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/mapper/GenConfigMapper.java → continew-admin-generator/src/main/java/top/continew/admin/generator/mapper/GenConfigMapper.java
View File

@@ -14,9 +14,9 @@
* limitations under the License.
*/
package top.charles7c.continew.admin.generator.mapper;
package top.continew.admin.generator.mapper;
import top.charles7c.continew.admin.generator.model.entity.GenConfigDO;
import top.continew.admin.generator.model.entity.GenConfigDO;
import top.continew.starter.data.mybatis.plus.base.BaseMapper;
/**
@@ -25,4 +25,5 @@ import top.continew.starter.data.mybatis.plus.base.BaseMapper;
* @author Charles7c
* @since 2023/4/12 23:56
*/
public interface GenConfigMapper extends BaseMapper<GenConfigDO> {}
public interface GenConfigMapper extends BaseMapper<GenConfigDO> {
}

6
continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/entity/FieldConfigDO.java → continew-admin-generator/src/main/java/top/continew/admin/generator/model/entity/FieldConfigDO.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.continew.admin.generator.model.entity;
package top.continew.admin.generator.model.entity;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.StrUtil;
@@ -28,8 +28,8 @@ import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.NonNull;
import top.charles7c.continew.admin.generator.enums.FormTypeEnum;
import top.charles7c.continew.admin.generator.enums.QueryTypeEnum;
import top.continew.admin.generator.enums.FormTypeEnum;
import top.continew.admin.generator.enums.QueryTypeEnum;
import top.continew.starter.core.constant.StringConstants;
import java.io.Serial;

6
continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/entity/GenConfigDO.java → continew-admin-generator/src/main/java/top/continew/admin/generator/model/entity/GenConfigDO.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.continew.admin.generator.model.entity;
package top.continew.admin.generator.model.entity;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.annotation.*;
@@ -28,7 +28,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.Setter;
import org.hibernate.validator.constraints.Length;
import top.charles7c.continew.admin.common.constant.RegexConstants;
import top.continew.admin.common.constant.RegexConstants;
import java.io.Serial;
import java.io.Serializable;
@@ -68,7 +68,7 @@ public class GenConfigDO implements Serializable {
/**
* 包名称
*/
@Schema(description = "包名称", example = "top.charles7c.continew.admin.system")
@Schema(description = "包名称", example = "top.continew.admin.system")
@NotBlank(message = "包名称不能为空")
@Pattern(regexp = RegexConstants.PACKAGE_NAME, message = "包名称格式错误")
@Length(max = 60, message = "包名称不能超过 {max} 个字符")

2
continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/query/TableQuery.java → continew-admin-generator/src/main/java/top/continew/admin/generator/model/query/TableQuery.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.continew.admin.generator.model.query;
package top.continew.admin.generator.model.query;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

6
continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/req/GenConfigReq.java → continew-admin-generator/src/main/java/top/continew/admin/generator/model/req/GenConfigReq.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.continew.admin.generator.model.req;
package top.continew.admin.generator.model.req;
import java.io.Serial;
import java.io.Serializable;
@@ -29,8 +29,8 @@ import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
import top.charles7c.continew.admin.generator.model.entity.FieldConfigDO;
import top.charles7c.continew.admin.generator.model.entity.GenConfigDO;
import top.continew.admin.generator.model.entity.FieldConfigDO;
import top.continew.admin.generator.model.entity.GenConfigDO;
/**
* 代码生成配置信息

2
continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/resp/GeneratePreviewResp.java → continew-admin-generator/src/main/java/top/continew/admin/generator/model/resp/GeneratePreviewResp.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.continew.admin.generator.model.resp;
package top.continew.admin.generator.model.resp;
import java.io.Serial;
import java.io.Serializable;

2
continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/resp/TableResp.java → continew-admin-generator/src/main/java/top/continew/admin/generator/model/resp/TableResp.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.continew.admin.generator.model.resp;
package top.continew.admin.generator.model.resp;
import java.io.Serial;
import java.io.Serializable;

14
continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/service/GeneratorService.java → continew-admin-generator/src/main/java/top/continew/admin/generator/service/GeneratorService.java
View File

@@ -14,16 +14,16 @@
* limitations under the License.
*/
package top.charles7c.continew.admin.generator.service;
package top.continew.admin.generator.service;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import top.charles7c.continew.admin.generator.model.entity.FieldConfigDO;
import top.charles7c.continew.admin.generator.model.entity.GenConfigDO;
import top.charles7c.continew.admin.generator.model.query.TableQuery;
import top.charles7c.continew.admin.generator.model.req.GenConfigReq;
import top.charles7c.continew.admin.generator.model.resp.GeneratePreviewResp;
import top.charles7c.continew.admin.generator.model.resp.TableResp;
import top.continew.admin.generator.model.entity.FieldConfigDO;
import top.continew.admin.generator.model.entity.GenConfigDO;
import top.continew.admin.generator.model.query.TableQuery;
import top.continew.admin.generator.model.req.GenConfigReq;
import top.continew.admin.generator.model.resp.GeneratePreviewResp;
import top.continew.admin.generator.model.resp.TableResp;
import top.continew.starter.extension.crud.model.query.PageQuery;
import top.continew.starter.extension.crud.model.resp.PageResp;

41
continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/service/impl/GeneratorServiceImpl.java → continew-admin-generator/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.continew.admin.generator.service.impl;
package top.continew.admin.generator.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
@@ -33,18 +33,17 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import top.charles7c.continew.admin.generator.config.properties.GeneratorProperties;
import top.charles7c.continew.admin.generator.config.properties.GeneratorProperties.TemplateConfig;
import top.charles7c.continew.admin.generator.enums.QueryTypeEnum;
import top.charles7c.continew.admin.generator.mapper.FieldConfigMapper;
import top.charles7c.continew.admin.generator.mapper.GenConfigMapper;
import top.charles7c.continew.admin.generator.model.entity.FieldConfigDO;
import top.charles7c.continew.admin.generator.model.entity.GenConfigDO;
import top.charles7c.continew.admin.generator.model.query.TableQuery;
import top.charles7c.continew.admin.generator.model.req.GenConfigReq;
import top.charles7c.continew.admin.generator.model.resp.GeneratePreviewResp;
import top.charles7c.continew.admin.generator.model.resp.TableResp;
import top.charles7c.continew.admin.generator.service.GeneratorService;
import top.continew.admin.generator.config.properties.GeneratorProperties;
import top.continew.admin.generator.enums.QueryTypeEnum;
import top.continew.admin.generator.mapper.FieldConfigMapper;
import top.continew.admin.generator.mapper.GenConfigMapper;
import top.continew.admin.generator.model.entity.FieldConfigDO;
import top.continew.admin.generator.model.entity.GenConfigDO;
import top.continew.admin.generator.model.query.TableQuery;
import top.continew.admin.generator.model.req.GenConfigReq;
import top.continew.admin.generator.model.resp.GeneratePreviewResp;
import top.continew.admin.generator.model.resp.TableResp;
import top.continew.admin.generator.service.GeneratorService;
import top.continew.starter.core.autoconfigure.project.ProjectProperties;
import top.continew.starter.core.constant.StringConstants;
import top.continew.starter.core.exception.BusinessException;
@@ -228,12 +227,12 @@ public class GeneratorServiceImpl implements GeneratorService {
genConfigMap.put("apiName", StrUtil.lowerFirst(genConfig.getClassNamePrefix()));
// 渲染代码
String classNamePrefix = genConfig.getClassNamePrefix();
Map<String, TemplateConfig> templateConfigMap = generatorProperties.getTemplateConfigs();
for (Map.Entry<String, TemplateConfig> templateConfigEntry : templateConfigMap.entrySet()) {
Map<String, GeneratorProperties.TemplateConfig> templateConfigMap = generatorProperties.getTemplateConfigs();
for (Map.Entry<String, GeneratorProperties.TemplateConfig> templateConfigEntry : templateConfigMap.entrySet()) {
this.pretreatment(genConfigMap, fieldConfigList, templateConfigEntry);
String className = classNamePrefix + StrUtil.nullToEmpty(templateConfigEntry.getKey());
genConfigMap.put("className", className);
TemplateConfig templateConfig = templateConfigEntry.getValue();
GeneratorProperties.TemplateConfig templateConfig = templateConfigEntry.getValue();
boolean isBackend = templateConfig.isBackend();
String extension = templateConfig.getExtension();
GeneratePreviewResp generatePreview = new GeneratePreviewResp();
@@ -291,11 +290,11 @@ public class GeneratorServiceImpl implements GeneratorService {
String moduleName = StrUtil.subSuf(packageName, StrUtil
.lastIndexOfIgnoreCase(packageName, StringConstants.DOT) + 1);
// 生成代码
Map<String, TemplateConfig> templateConfigMap = generatorProperties.getTemplateConfigs();
Map<String, GeneratorProperties.TemplateConfig> templateConfigMap = generatorProperties.getTemplateConfigs();
for (GeneratePreviewResp generatePreview : generatePreviewList) {
// 获取对应模板配置
TemplateConfig templateConfig = templateConfigMap.getOrDefault(StrUtil.subBefore(generatePreview
.getFileName(), StringConstants.DOT, true)
GeneratorProperties.TemplateConfig templateConfig = templateConfigMap.getOrDefault(StrUtil
.subBefore(generatePreview.getFileName(), StringConstants.DOT, true)
.replace(genConfig.getClassNamePrefix(), StringConstants.EMPTY), templateConfigMap.get("api"));
String packagePath;
if (generatePreview.isBackend()) {
@@ -356,8 +355,8 @@ public class GeneratorServiceImpl implements GeneratorService {
*/
private void pretreatment(Map<String, Object> genConfigMap,
List<FieldConfigDO> originFieldConfigList,
Map.Entry<String, TemplateConfig> templateConfigEntry) {
TemplateConfig templateConfig = templateConfigEntry.getValue();
Map.Entry<String, GeneratorProperties.TemplateConfig> templateConfigEntry) {
GeneratorProperties.TemplateConfig templateConfig = templateConfigEntry.getValue();
// 移除需要忽略的字段
List<FieldConfigDO> fieldConfigList = originFieldConfigList.stream()
.filter(fieldConfig -> !StrUtil.equalsAny(fieldConfig.getFieldName(), templateConfig.getExcludeFields()))