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

1.groupId 及基础包名调整，更短的包名，优化品牌形象 2.全局代码格式化
continew-org · Apr 22, 2024 · 08eeabc · 08eeabc
1 parent da3a4e0
commit 08eeabc
Show file tree

Hide file tree

Showing 238 changed files with 1,107 additions and 1,140 deletions.
diff --git a/continew-admin-common/pom.xml b/continew-admin-common/pom.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http:https://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http:https://maven.apache.org/POM/4.0.0"
  xsi:schemaLocation="http:https://maven.apache.org/POM/4.0.0 http:https://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>

diff --git a/...in/common/config/WebMvcConfiguration.java → ...in/common/config/WebMvcConfiguration.java b/...in/common/config/WebMvcConfiguration.java → ...in/common/config/WebMvcConfiguration.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package top.charles7c.continew.admin.common.config;
+package top.continew.admin.common.config;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Configuration;

diff --git a/.../config/jackson/BaseEnumDeserializer.java → .../config/jackson/BaseEnumDeserializer.java b/.../config/jackson/BaseEnumDeserializer.java → .../config/jackson/BaseEnumDeserializer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package top.charles7c.continew.admin.common.config.jackson;
+package top.continew.admin.common.config.jackson;
 
 import cn.hutool.core.util.ClassUtil;
 import cn.hutool.core.util.ReflectUtil;
@@ -30,14 +30,16 @@
 /**
  * 通用枚举接口 IBaseEnum 反序列化器
  *
- * @see IBaseEnum
  * @author Charles7c
+ * @see IBaseEnum
  * @since 2023/1/8 13:56
  */
 @JacksonStdImpl
 public class BaseEnumDeserializer extends JsonDeserializer<IBaseEnum> {
 
- /** 静态实例 */
+ /**
+ * 静态实例
+ */
  public static final BaseEnumDeserializer SERIALIZER_INSTANCE = new BaseEnumDeserializer();
 
  @Override

diff --git a/...on/config/jackson/BaseEnumSerializer.java → ...on/config/jackson/BaseEnumSerializer.java b/...on/config/jackson/BaseEnumSerializer.java → ...on/config/jackson/BaseEnumSerializer.java
@@ -14,28 +14,29 @@
  * limitations under the License.
  */
 
-package top.charles7c.continew.admin.common.config.jackson;
-
-import java.io.IOException;
+package top.continew.admin.common.config.jackson;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-
 import top.continew.starter.data.mybatis.plus.base.IBaseEnum;
 
+import java.io.IOException;
+
 /**
  * 通用枚举接口 IBaseEnum 序列化器
  *
- * @see IBaseEnum
  * @author Charles7c
+ * @see IBaseEnum
  * @since 2023/1/8 13:56
  */
 @JacksonStdImpl
 public class BaseEnumSerializer extends JsonSerializer<IBaseEnum> {
 
- /** 静态实例 */
+ /**
+ * 静态实例
+ */
  public static final BaseEnumSerializer SERIALIZER_INSTANCE = new BaseEnumSerializer();
 
  @Override

diff --git a/.../config/jackson/JacksonConfiguration.java → .../config/jackson/JacksonConfiguration.java b/.../config/jackson/JacksonConfiguration.java → .../config/jackson/JacksonConfiguration.java
@@ -14,24 +14,21 @@
  * limitations under the License.
  */
 
-package top.charles7c.continew.admin.common.config.jackson;
+package top.continew.admin.common.config.jackson;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
 import lombok.extern.slf4j.Slf4j;
-
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-
 import top.continew.starter.data.mybatis.plus.base.IBaseEnum;
 
 /**
  * Jackson 配置
  *
- * @see IBaseEnum
  * @author Charles7c
+ * @see IBaseEnum
  * @since 2022/12/11 13:23
  */
 @Slf4j

diff --git a/...g/jackson/SimpleDeserializersWrapper.java → ...g/jackson/SimpleDeserializersWrapper.java b/...g/jackson/SimpleDeserializersWrapper.java → ...g/jackson/SimpleDeserializersWrapper.java
@@ -14,16 +14,15 @@
  * limitations under the License.
  */
 
-package top.charles7c.continew.admin.common.config.jackson;
-
-import lombok.extern.slf4j.Slf4j;
+package top.continew.admin.common.config.jackson;
 
 import com.fasterxml.jackson.databind.BeanDescription;
 import com.fasterxml.jackson.databind.DeserializationConfig;
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.module.SimpleDeserializers;
 import com.fasterxml.jackson.databind.type.ClassKey;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * 反序列化器包装类（重写 Jackson 反序列化枚举方法，参阅：FasterXML/jackson-databind#2842）

diff --git a/...ommon/config/mybatis/BCryptEncryptor.java → ...ommon/config/mybatis/BCryptEncryptor.java b/...ommon/config/mybatis/BCryptEncryptor.java → ...ommon/config/mybatis/BCryptEncryptor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package top.charles7c.continew.admin.common.config.mybatis;
+package top.continew.admin.common.config.mybatis;
 
 import org.springframework.security.crypto.password.PasswordEncoder;
 import top.continew.starter.security.crypto.encryptor.IEncryptor;

diff --git a/...fig/mybatis/DataPermissionFilterImpl.java → ...fig/mybatis/DataPermissionFilterImpl.java b/...fig/mybatis/DataPermissionFilterImpl.java → ...fig/mybatis/DataPermissionFilterImpl.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package top.charles7c.continew.admin.common.config.mybatis;
+package top.continew.admin.common.config.mybatis;
 
 import cn.hutool.core.convert.Convert;
-import top.charles7c.continew.admin.common.model.dto.LoginUser;
-import top.charles7c.continew.admin.common.util.helper.LoginHelper;
+import top.continew.admin.common.model.dto.LoginUser;
+import top.continew.admin.common.util.helper.LoginHelper;
 import top.continew.starter.data.mybatis.plus.datapermission.DataPermissionCurrentUser;
 import top.continew.starter.data.mybatis.plus.datapermission.DataPermissionFilter;
 import top.continew.starter.data.mybatis.plus.datapermission.DataScope;

diff --git a/.../config/mybatis/DataPermissionMapper.java → .../config/mybatis/DataPermissionMapper.java b/.../config/mybatis/DataPermissionMapper.java → .../config/mybatis/DataPermissionMapper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package top.charles7c.continew.admin.common.config.mybatis;
+package top.continew.admin.common.config.mybatis;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -28,8 +28,7 @@
 /**
  * 数据权限 Mapper 基类
  *
- * @param <T>
- * 实体类
+ * @param <T> 实体类
  * @author Charles7c
  * @since 2023/9/3 21:50
  */
@@ -47,7 +46,7 @@ public interface DataPermissionMapper<T> extends BaseMapper<T> {
 
  /**
  * 根据 entity 条件，查询全部记录（并翻页）
- * 
+ *
  * @param page 分页查询条件
  * @param queryWrapper 实体对象封装操作类（可以为 null）
  * @return 全部记录（并翻页）

diff --git a/...mybatis/MyBatisPlusMetaObjectHandler.java → ...mybatis/MyBatisPlusMetaObjectHandler.java b/...mybatis/MyBatisPlusMetaObjectHandler.java → ...mybatis/MyBatisPlusMetaObjectHandler.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package top.charles7c.continew.admin.common.config.mybatis;
+package top.continew.admin.common.config.mybatis;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import org.apache.ibatis.reflection.MetaObject;
-import top.charles7c.continew.admin.common.util.helper.LoginHelper;
+import top.continew.admin.common.util.helper.LoginHelper;
 import top.continew.starter.core.exception.BusinessException;
 import top.continew.starter.extension.crud.model.entity.BaseDO;
 
@@ -33,13 +33,21 @@
  */
 public class MyBatisPlusMetaObjectHandler implements MetaObjectHandler {
 
- /** 创建人 */
+ /**
+ * 创建人
+ */
  private static final String CREATE_USER = "createUser";
- /** 创建时间 */
+ /**
+ * 创建时间
+ */
  private static final String CREATE_TIME = "createTime";
- /** 修改人 */
+ /**
+ * 修改人
+ */
  private static final String UPDATE_USER = "updateUser";
- /** 修改时间 */
+ /**
+ * 修改时间
+ */
  private static final String UPDATE_TIME = "updateTime";
 
  /**

diff --git a/...fig/mybatis/MybatisPlusConfiguration.java → ...fig/mybatis/MybatisPlusConfiguration.java b/...fig/mybatis/MybatisPlusConfiguration.java → ...fig/mybatis/MybatisPlusConfiguration.java
@@ -14,13 +14,11 @@
  * limitations under the License.
  */
 
-package top.charles7c.continew.admin.common.config.mybatis;
+package top.continew.admin.common.config.mybatis;
 
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-
-import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
-
 import org.springframework.security.crypto.password.PasswordEncoder;
 import top.continew.starter.data.mybatis.plus.datapermission.DataPermissionFilter;
 

diff --git a/.../config/properties/CaptchaProperties.java → .../config/properties/CaptchaProperties.java b/.../config/properties/CaptchaProperties.java → .../config/properties/CaptchaProperties.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package top.charles7c.continew.admin.common.config.properties;
+package top.continew.admin.common.config.properties;
 
 import lombok.Data;
 import org.springframework.beans.factory.annotation.Value;

diff --git a/...mmon/config/properties/RsaProperties.java → ...mmon/config/properties/RsaProperties.java b/...mmon/config/properties/RsaProperties.java → ...mmon/config/properties/RsaProperties.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package top.charles7c.continew.admin.common.config.properties;
+package top.continew.admin.common.config.properties;
 
 import cn.hutool.extra.spring.SpringUtil;
 
@@ -27,7 +27,9 @@
  */
 public class RsaProperties {
 
- /** 私钥 */
+ /**
+ * 私钥
+ */
  public static final String PRIVATE_KEY;
 
  static {

diff --git a/...admin/common/constant/CacheConstants.java → ...admin/common/constant/CacheConstants.java b/...admin/common/constant/CacheConstants.java → ...admin/common/constant/CacheConstants.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package top.charles7c.continew.admin.common.constant;
+package top.continew.admin.common.constant;
 
 import top.continew.starter.core.constant.StringConstants;
 

diff --git a/...n/common/constant/ContainerConstants.java → ...n/common/constant/ContainerConstants.java b/...n/common/constant/ContainerConstants.java → ...n/common/constant/ContainerConstants.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package top.charles7c.continew.admin.common.constant;
+package top.continew.admin.common.constant;
 
 import top.continew.starter.extension.crud.constant.ContainerPool;
 

diff --git a/...admin/common/constant/RegexConstants.java → ...admin/common/constant/RegexConstants.java b/...admin/common/constant/RegexConstants.java → ...admin/common/constant/RegexConstants.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package top.charles7c.continew.admin.common.constant;
+package top.continew.admin.common.constant;
 
 /**
  * 正则相关常量

diff --git a/...w/admin/common/constant/SysConstants.java → ...w/admin/common/constant/SysConstants.java b/...w/admin/common/constant/SysConstants.java → ...w/admin/common/constant/SysConstants.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package top.charles7c.continew.admin.common.constant;
+package top.continew.admin.common.constant;
 
 /**
  * 系统相关常量

diff --git a/...ew/admin/common/constant/UiConstants.java → ...ew/admin/common/constant/UiConstants.java b/...ew/admin/common/constant/UiConstants.java → ...ew/admin/common/constant/UiConstants.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package top.charles7c.continew.admin.common.constant;
+package top.continew.admin.common.constant;
 
 /**
  * UI 相关常量

diff --git a/...new/admin/common/enums/DataScopeEnum.java → ...new/admin/common/enums/DataScopeEnum.java b/...new/admin/common/enums/DataScopeEnum.java → ...new/admin/common/enums/DataScopeEnum.java
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package top.charles7c.continew.admin.common.enums;
+package top.continew.admin.common.enums;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-
 import top.continew.starter.data.mybatis.plus.base.IBaseEnum;
 
 /**
@@ -31,19 +30,29 @@
 @RequiredArgsConstructor
 public enum DataScopeEnum implements IBaseEnum<Integer> {
 
- /** 全部数据权限 */
+ /**
+ * 全部数据权限
+ */
  ALL(1, "全部数据权限"),
 
- /** 本部门及以下数据权限 */
+ /**
+ * 本部门及以下数据权限
+ */
  DEPT_AND_CHILD(2, "本部门及以下数据权限"),
 
- /** 本部门数据权限 */
+ /**
+ * 本部门数据权限
+ */
  DEPT(3, "本部门数据权限"),
 
- /** 仅本人数据权限 */
+ /**
+ * 仅本人数据权限
+ */
  SELF(4, "仅本人数据权限"),
 
- /** 自定义数据权限 */
+ /**
+ * 自定义数据权限
+ */
  CUSTOM(5, "自定义数据权限"),;
 
  private final Integer value;

diff --git a/...min/common/enums/DisEnableStatusEnum.java → ...min/common/enums/DisEnableStatusEnum.java b/...min/common/enums/DisEnableStatusEnum.java → ...min/common/enums/DisEnableStatusEnum.java
@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-package top.charles7c.continew.admin.common.enums;
+package top.continew.admin.common.enums;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-
-import top.charles7c.continew.admin.common.constant.UiConstants;
+import top.continew.admin.common.constant.UiConstants;
 import top.continew.starter.data.mybatis.plus.base.IBaseEnum;
 
 /**
@@ -32,10 +31,14 @@
 @RequiredArgsConstructor
 public enum DisEnableStatusEnum implements IBaseEnum<Integer> {
 
- /** 启用 */
+ /**
+ * 启用
+ */
  ENABLE(1, "启用", UiConstants.COLOR_SUCCESS),
 
- /** 禁用 */
+ /**
+ * 禁用
+ */
  DISABLE(2, "禁用", UiConstants.COLOR_ERROR),;
 
  private final Integer value;