refactor: 调整 starter 内的 BaseResp、BaseDetailResp 到 admin 项目

continew-common/src/main/java/top/continew/admin/common/base/BaseDetailResp.java

@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package top.continew.admin.common.base;
+
+import cn.crane4j.annotation.Assemble;
+import cn.crane4j.annotation.Mapping;
+import cn.crane4j.annotation.condition.ConditionOnPropertyNotNull;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import top.continew.starter.extension.crud.constant.ContainerPool;
+
+import java.io.Serial;
+import java.time.LocalDateTime;
+
+/**
+ * 详情响应基类
+ *
+ * @author Charles7c
+ * @since 2024/12/27 20:32
+ */
+@Data
+public class BaseDetailResp extends BaseResp {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 修改人
+     */
+    @JsonIgnore
+    @ConditionOnPropertyNotNull
+    @Assemble(container = ContainerPool.USER_NICKNAME, props = @Mapping(ref = "updateUserString"))
+    private Long updateUser;
+
+    /**
+     * 修改人
+     */
+    @Schema(description = "修改人", example = "李四")
+    @ExcelProperty(value = "修改人", order = Integer.MAX_VALUE - 2)
+    private String updateUserString;
+
+    /**
+     * 修改时间
+     */
+    @Schema(description = "修改时间", example = "2023-08-08 08:08:08", type = "string")
+    @ExcelProperty(value = "修改时间", order = Integer.MAX_VALUE - 1)
+    private LocalDateTime updateTime;
+}

continew-common/src/main/java/top/continew/admin/common/base/BaseResp.java

@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package top.continew.admin.common.base;
+
+import cn.crane4j.annotation.Assemble;
+import cn.crane4j.annotation.Mapping;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import top.continew.starter.extension.crud.constant.ContainerPool;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 响应参数基类
+ *
+ * @author Charles7c
+ * @since 2024/12/27 20:32
+ */
+@Data
+public class BaseResp implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @Schema(description = "ID", example = "1")
+    @ExcelProperty(value = "ID", order = 1)
+    private Long id;
+
+    /**
+     * 创建人
+     */
+    @JsonIgnore
+    @Assemble(container = ContainerPool.USER_NICKNAME, props = @Mapping(ref = "createUserString"))
+    private Long createUser;
+
+    /**
+     * 创建人
+     */
+    @Schema(description = "创建人", example = "超级管理员")
+    @ExcelProperty(value = "创建人", order = Integer.MAX_VALUE - 4)
+    private String createUserString;
+
+    /**
+     * 创建时间
+     */
+    @Schema(description = "创建时间", example = "2023-08-08 08:08:08", type = "string")
+    @ExcelProperty(value = "创建时间", order = Integer.MAX_VALUE - 3)
+    private LocalDateTime createTime;
+
+    /**
+     * 是否禁用修改
+     */
+    @Schema(description = "是否禁用修改", example = "true")
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Boolean disabled;
+}

continew-module-system/src/main/java/top/continew/admin/auth/LoginHandler.java

@@ -44,7 +44,6 @@ public interface LoginHandler<T extends LoginReq> {
     /**
      * 登录前置处理
      *
-     *
      * @param req     登录请求参数
      * @param client  客户端信息
      * @param request 请求对象
@@ -54,7 +53,6 @@ public interface LoginHandler<T extends LoginReq> {
     /**
      * 登录后置处理
      *
-     *
      * @param req     登录请求参数
      * @param client  客户端信息
      * @param request 请求对象

continew-module-system/src/main/java/top/continew/admin/auth/model/resp/OnlineUserResp.java

@@ -16,7 +16,10 @@
 
 package top.continew.admin.auth.model.resp;
 
-import cn.crane4j.annotation.*;
+import cn.crane4j.annotation.Assemble;
+import cn.crane4j.annotation.AssembleMethod;
+import cn.crane4j.annotation.ContainerMethod;
+import cn.crane4j.annotation.MappingType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import top.continew.admin.auth.service.OnlineUserService;

continew-module-system/src/main/java/top/continew/admin/system/mapper/ClientMapper.java

@@ -16,8 +16,8 @@
 
 package top.continew.admin.system.mapper;
 
-import top.continew.starter.data.mp.base.BaseMapper;
 import top.continew.admin.system.model.entity.ClientDO;
+import top.continew.starter.data.mp.base.BaseMapper;
 
 /**
  * 客户端 Mapper
@@ -25,4 +25,5 @@ import top.continew.admin.system.model.entity.ClientDO;
  * @author KAI
  * @since 2024/12/03 16:04
  */
-public interface ClientMapper extends BaseMapper<ClientDO> {}
+public interface ClientMapper extends BaseMapper<ClientDO> {
+}

continew-module-system/src/main/java/top/continew/admin/system/mapper/UserPasswordHistoryMapper.java

@@ -17,8 +17,8 @@
 package top.continew.admin.system.mapper;
 
 import org.apache.ibatis.annotations.Param;
-import top.continew.starter.data.mp.base.BaseMapper;
 import top.continew.admin.system.model.entity.UserPasswordHistoryDO;
+import top.continew.starter.data.mp.base.BaseMapper;
 
 /**
  * 用户历史密码 Mapper

continew-module-system/src/main/java/top/continew/admin/system/model/resp/ClientDetailResp.java

@@ -18,8 +18,8 @@ package top.continew.admin.system.model.resp;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import top.continew.admin.common.base.BaseDetailResp;
 import top.continew.admin.common.enums.DisEnableStatusEnum;
-import top.continew.starter.extension.crud.model.resp.BaseDetailResp;
 
 import java.io.Serial;
 import java.util.List;

continew-module-system/src/main/java/top/continew/admin/system/model/resp/ClientResp.java

@@ -18,8 +18,8 @@ package top.continew.admin.system.model.resp;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import top.continew.admin.common.base.BaseDetailResp;
 import top.continew.admin.common.enums.DisEnableStatusEnum;
-import top.continew.starter.extension.crud.model.resp.BaseResp;
 
 import java.io.Serial;
 import java.util.List;
@@ -33,7 +33,7 @@ import java.util.List;
  */
 @Data
 @Schema(description = "客户端信息")
-public class ClientResp extends BaseResp {
+public class ClientResp extends BaseDetailResp {
 
     @Serial
     private static final long serialVersionUID = 1L;

continew-module-system/src/main/java/top/continew/admin/system/model/resp/DeptResp.java

@@ -20,10 +20,10 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import top.continew.admin.common.base.BaseDetailResp;
 import top.continew.admin.common.enums.DisEnableStatusEnum;
 import top.continew.starter.extension.crud.annotation.TreeField;
 import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter;
-import top.continew.starter.extension.crud.model.resp.BaseDetailResp;
 
 import java.io.Serial;
 

continew-module-system/src/main/java/top/continew/admin/system/model/resp/DictItemResp.java

@@ -19,9 +19,9 @@ package top.continew.admin.system.model.resp;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import top.continew.admin.common.base.BaseDetailResp;
 import top.continew.admin.common.enums.DisEnableStatusEnum;
 import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter;
-import top.continew.starter.extension.crud.model.resp.BaseDetailResp;
 
 import java.io.Serial;
 

continew-module-system/src/main/java/top/continew/admin/system/model/resp/DictResp.java

@@ -18,7 +18,7 @@ package top.continew.admin.system.model.resp;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import top.continew.starter.extension.crud.model.resp.BaseDetailResp;
+import top.continew.admin.common.base.BaseDetailResp;
 
 import java.io.Serial;
 

continew-module-system/src/main/java/top/continew/admin/system/model/resp/FileResp.java

@@ -19,8 +19,8 @@ package top.continew.admin.system.model.resp;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import top.continew.admin.common.base.BaseDetailResp;
 import top.continew.admin.system.enums.FileTypeEnum;
-import top.continew.starter.extension.crud.model.resp.BaseDetailResp;
 
 import java.io.Serial;
 

continew-module-system/src/main/java/top/continew/admin/system/model/resp/MenuResp.java

@@ -18,10 +18,10 @@ package top.continew.admin.system.model.resp;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import top.continew.admin.common.base.BaseResp;
 import top.continew.admin.common.enums.DisEnableStatusEnum;
 import top.continew.admin.system.enums.MenuTypeEnum;
 import top.continew.starter.extension.crud.annotation.TreeField;
-import top.continew.starter.extension.crud.model.resp.BaseResp;
 
 import java.io.Serial;
 

continew-module-system/src/main/java/top/continew/admin/system/model/resp/NoticeDetailResp.java

@@ -20,8 +20,8 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import top.continew.admin.common.base.BaseDetailResp;
 import top.continew.admin.system.enums.NoticeScopeEnum;
-import top.continew.starter.extension.crud.model.resp.BaseDetailResp;
 
 import java.io.Serial;
 import java.time.LocalDateTime;

continew-module-system/src/main/java/top/continew/admin/system/model/resp/NoticeResp.java

@@ -18,9 +18,9 @@ package top.continew.admin.system.model.resp;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import top.continew.admin.common.base.BaseResp;
 import top.continew.admin.system.enums.NoticeScopeEnum;
 import top.continew.admin.system.enums.NoticeStatusEnum;
-import top.continew.starter.extension.crud.model.resp.BaseResp;
 
 import java.io.Serial;
 import java.time.LocalDateTime;

continew-module-system/src/main/java/top/continew/admin/system/model/resp/RoleDetailResp.java

@@ -23,10 +23,10 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import top.continew.admin.common.base.BaseDetailResp;
 import top.continew.admin.common.enums.DataScopeEnum;
 import top.continew.admin.system.service.RoleDeptService;
 import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter;
-import top.continew.starter.extension.crud.model.resp.BaseDetailResp;
 
 import java.io.Serial;
 import java.util.List;

continew-module-system/src/main/java/top/continew/admin/system/model/resp/RoleResp.java

@@ -18,8 +18,8 @@ package top.continew.admin.system.model.resp;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import top.continew.admin.common.base.BaseDetailResp;
 import top.continew.admin.common.enums.DataScopeEnum;
-import top.continew.starter.extension.crud.model.resp.BaseDetailResp;
 
 import java.io.Serial;
 

continew-module-system/src/main/java/top/continew/admin/system/model/resp/StorageResp.java

@@ -18,9 +18,9 @@ package top.continew.admin.system.model.resp;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import top.continew.admin.common.base.BaseDetailResp;
 import top.continew.admin.common.enums.DisEnableStatusEnum;
 import top.continew.admin.system.enums.StorageTypeEnum;
-import top.continew.starter.extension.crud.model.resp.BaseDetailResp;
 import top.continew.starter.security.mask.annotation.JsonMask;
 
 import java.io.Serial;

continew-module-system/src/main/java/top/continew/admin/system/model/resp/user/UserDetailResp.java

@@ -26,13 +26,13 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import top.continew.admin.common.base.BaseDetailResp;
 import top.continew.admin.common.constant.ContainerConstants;
 import top.continew.admin.common.context.UserContextHolder;
 import top.continew.admin.common.enums.DisEnableStatusEnum;
 import top.continew.admin.common.enums.GenderEnum;
 import top.continew.admin.system.model.resp.DeptResp;
 import top.continew.admin.system.service.DeptService;
-import top.continew.starter.extension.crud.model.resp.BaseDetailResp;
 import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter;
 import top.continew.starter.file.excel.converter.ExcelListConverter;
 import top.continew.starter.security.crypto.annotation.FieldEncrypt;

continew-module-system/src/main/java/top/continew/admin/system/model/resp/user/UserResp.java

@@ -20,11 +20,11 @@ import cn.crane4j.annotation.Assemble;
 import cn.crane4j.core.executor.handler.ManyToManyAssembleOperationHandler;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import top.continew.admin.common.base.BaseDetailResp;
 import top.continew.admin.common.constant.ContainerConstants;
 import top.continew.admin.common.context.UserContextHolder;
 import top.continew.admin.common.enums.DisEnableStatusEnum;
 import top.continew.admin.common.enums.GenderEnum;
-import top.continew.starter.extension.crud.model.resp.BaseDetailResp;
 import top.continew.starter.security.mask.annotation.JsonMask;
 import top.continew.starter.security.mask.enums.MaskType;
 

continew-module-system/src/main/java/top/continew/admin/system/service/ClientService.java

@@ -18,7 +18,6 @@ package top.continew.admin.system.service;
 
 import top.continew.admin.system.model.query.ClientQuery;
 import top.continew.admin.system.model.req.ClientReq;
-import top.continew.admin.system.model.resp.ClientDetailResp;
 import top.continew.admin.system.model.resp.ClientResp;
 import top.continew.starter.extension.crud.service.BaseService;
 
@@ -29,7 +28,7 @@ import top.continew.starter.extension.crud.service.BaseService;
  * @author Charles7c
  * @since 2024/12/03 16:04
  */
-public interface ClientService extends BaseService<ClientResp, ClientDetailResp, ClientQuery, ClientReq> {
+public interface ClientService extends BaseService<ClientResp, ClientResp, ClientQuery, ClientReq> {
 
     /**
      * 根据客户端 ID 查詢

continew-module-system/src/main/java/top/continew/admin/system/service/MenuService.java

@@ -20,8 +20,8 @@ import top.continew.admin.system.model.entity.MenuDO;
 import top.continew.admin.system.model.query.MenuQuery;
 import top.continew.admin.system.model.req.MenuReq;
 import top.continew.admin.system.model.resp.MenuResp;
-import top.continew.starter.extension.crud.service.BaseService;
 import top.continew.starter.data.mp.service.IService;
+import top.continew.starter.extension.crud.service.BaseService;
 
 import java.util.List;
 import java.util.Set;

continew-module-system/src/main/java/top/continew/admin/system/service/MessageService.java

@@ -16,14 +16,14 @@
 
 package top.continew.admin.system.service;
 
-import java.util.List;
-
 import top.continew.admin.system.model.query.MessageQuery;
 import top.continew.admin.system.model.req.MessageReq;
 import top.continew.admin.system.model.resp.MessageResp;
 import top.continew.starter.extension.crud.model.query.PageQuery;
 import top.continew.starter.extension.crud.model.resp.PageResp;
 
+import java.util.List;
+
 /**
  * 消息业务接口
  *

continew-module-system/src/main/java/top/continew/admin/system/service/MessageUserService.java

@@ -16,10 +16,10 @@
 
 package top.continew.admin.system.service;
 
-import java.util.List;
-
 import top.continew.admin.system.model.resp.MessageUnreadResp;
 
+import java.util.List;
+
 /**
  * 消息和用户关联业务接口
  *

continew-module-system/src/main/java/top/continew/admin/system/service/NoticeService.java

@@ -22,8 +22,8 @@ import top.continew.admin.system.model.req.NoticeReq;
 import top.continew.admin.system.model.resp.NoticeDetailResp;
 import top.continew.admin.system.model.resp.NoticeResp;
 import top.continew.admin.system.model.resp.dashboard.DashboardNoticeResp;
-import top.continew.starter.extension.crud.service.BaseService;
 import top.continew.starter.data.mp.service.IService;
+import top.continew.starter.extension.crud.service.BaseService;
 
 import java.util.List;
 

continew-module-system/src/main/java/top/continew/admin/system/service/UserSocialService.java

@@ -16,11 +16,10 @@
 
 package top.continew.admin.system.service;
 
-import java.util.List;
+import me.zhyd.oauth.model.AuthUser;
-
 import top.continew.admin.system.model.entity.UserSocialDO;
 
-import me.zhyd.oauth.model.AuthUser;
+import java.util.List;
 
 /**
  * 用户社会化关联业务接口

continew-module-system/src/main/java/top/continew/admin/system/service/impl/ClientServiceImpl.java

@@ -24,7 +24,6 @@ import top.continew.admin.system.mapper.ClientMapper;
 import top.continew.admin.system.model.entity.ClientDO;
 import top.continew.admin.system.model.query.ClientQuery;
 import top.continew.admin.system.model.req.ClientReq;
-import top.continew.admin.system.model.resp.ClientDetailResp;
 import top.continew.admin.system.model.resp.ClientResp;
 import top.continew.admin.system.service.ClientService;
 import top.continew.starter.core.constant.StringConstants;
@@ -41,7 +40,7 @@ import java.util.List;
  * @since 2024/12/03 16:04
  */
 @Service
-public class ClientServiceImpl extends BaseServiceImpl<ClientMapper, ClientDO, ClientResp, ClientDetailResp, ClientQuery, ClientReq> implements ClientService {
+public class ClientServiceImpl extends BaseServiceImpl<ClientMapper, ClientDO, ClientResp, ClientResp, ClientQuery, ClientReq> implements ClientService {
 
     @Override
     public void beforeAdd(ClientReq req) {

continew-module-system/src/main/java/top/continew/admin/system/service/impl/NoticeServiceImpl.java

@@ -23,9 +23,9 @@ import top.continew.admin.system.mapper.NoticeMapper;
 import top.continew.admin.system.model.entity.NoticeDO;
 import top.continew.admin.system.model.query.NoticeQuery;
 import top.continew.admin.system.model.req.NoticeReq;
-import top.continew.admin.system.model.resp.dashboard.DashboardNoticeResp;
 import top.continew.admin.system.model.resp.NoticeDetailResp;
 import top.continew.admin.system.model.resp.NoticeResp;
+import top.continew.admin.system.model.resp.dashboard.DashboardNoticeResp;
 import top.continew.admin.system.service.NoticeService;
 import top.continew.starter.extension.crud.service.BaseServiceImpl;
 

continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java

@@ -81,8 +81,8 @@ import top.continew.starter.core.validation.CheckUtils;
 import top.continew.starter.extension.crud.model.query.PageQuery;
 import top.continew.starter.extension.crud.model.query.SortQuery;
 import top.continew.starter.extension.crud.model.resp.PageResp;
-import top.continew.starter.extension.crud.service.CommonUserService;
 import top.continew.starter.extension.crud.service.BaseServiceImpl;
+import top.continew.starter.extension.crud.service.CommonUserService;
 import top.continew.starter.web.util.FileUploadUtils;
 
 import java.io.IOException;

continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserSocialServiceImpl.java

@@ -16,24 +16,20 @@
 
 package top.continew.admin.system.service.impl;
 
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import lombok.RequiredArgsConstructor;
-
-import org.springframework.stereotype.Service;
-
 import cn.hutool.json.JSONUtil;
-
+import lombok.RequiredArgsConstructor;
+import me.zhyd.oauth.model.AuthUser;
+import org.springframework.stereotype.Service;
 import top.continew.admin.system.enums.SocialSourceEnum;
 import top.continew.admin.system.mapper.UserSocialMapper;
 import top.continew.admin.system.model.entity.UserSocialDO;
 import top.continew.admin.system.service.UserSocialService;
 import top.continew.starter.core.validation.CheckUtils;
 
-import me.zhyd.oauth.model.AuthUser;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * 用户社会化关联业务实现

continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/enums/QueryTypeEnum.java

@@ -18,7 +18,6 @@ package top.continew.admin.generator.enums;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-
 import top.continew.starter.core.enums.BaseEnum;
 
 /**

continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/model/req/GenConfigReq.java

@@ -16,22 +16,19 @@
 
 package top.continew.admin.generator.model.req;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import top.continew.admin.generator.model.entity.FieldConfigDO;
+import top.continew.admin.generator.model.entity.GenConfigDO;
+
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
-
-import lombok.Data;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import top.continew.admin.generator.model.entity.FieldConfigDO;
-import top.continew.admin.generator.model.entity.GenConfigDO;
-
 /**
  * 代码生成配置信息
  *

continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/DetailResp.ftl

@@ -15,7 +15,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 
-import top.continew.starter.extension.crud.model.resp.BaseDetailResp;
+import top.continew.admin.common.base.BaseDetailResp;
 
 /**
  * ${businessName}详情信息

continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Resp.ftl

@@ -12,7 +12,7 @@ import lombok.Data;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 
-import top.continew.starter.extension.crud.model.resp.BaseResp;
+import top.continew.admin.common.base.BaseResp;
 
 /**
  * ${businessName}信息

continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/AddModal.ftl

@@ -4,8 +4,8 @@
     :title="title"
     :mask-closable="false"
     :esc-to-close="false"
-    draggable
     :width="width >= 600 ? 600 : '100%'"
+    draggable
     @before-ok="save"
     @close="reset"
   >

continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/index.ftl

@@ -51,9 +51,7 @@
         />
         </#if>
 	  <#else>
-	    <a-input v-model="queryForm.${fieldConfig.fieldName}" placeholder="请输入${fieldConfig.comment}" allow-clear @change="search">
+	    <a-input-search v-model="queryForm.${fieldConfig.fieldName}" placeholder="请输入${fieldConfig.comment}" allow-clear @search="search" />
-	      <template #prefix><icon-search /></template>
-	    </a-input>
       </#if>
       </#if>
       </#list>

continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/mapper/AppMapper.java

@@ -18,8 +18,8 @@ package top.continew.admin.open.mapper;
 
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
-import top.continew.starter.data.mp.base.BaseMapper;
 import top.continew.admin.open.model.entity.AppDO;
+import top.continew.starter.data.mp.base.BaseMapper;
 import top.continew.starter.security.crypto.annotation.FieldEncrypt;
 
 /**

continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/model/resp/AppDetailResp.java

@@ -20,8 +20,8 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import top.continew.admin.common.base.BaseDetailResp;
 import top.continew.admin.common.enums.DisEnableStatusEnum;
-import top.continew.starter.extension.crud.model.resp.BaseDetailResp;
 import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter;
 
 import java.io.Serial;

continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/model/resp/AppResp.java

@@ -18,8 +18,8 @@ package top.continew.admin.open.model.resp;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import top.continew.admin.common.base.BaseDetailResp;
 import top.continew.admin.common.enums.DisEnableStatusEnum;
-import top.continew.starter.extension.crud.model.resp.BaseDetailResp;
 
 import java.io.Serial;
 import java.time.LocalDateTime;

continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/JobInstanceLogPageResult.java

@@ -18,10 +18,10 @@ package top.continew.admin.schedule.model;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import java.util.List;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 任务实例日志分页信息

continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/service/JobLogService.java

@@ -18,10 +18,10 @@ package top.continew.admin.schedule.service;
 
 import top.continew.admin.schedule.model.JobInstanceLogPageResult;
 import top.continew.admin.schedule.model.query.JobInstanceLogQuery;
-import top.continew.admin.schedule.model.query.JobLogQuery;
 import top.continew.admin.schedule.model.query.JobInstanceQuery;
-import top.continew.admin.schedule.model.resp.JobLogResp;
+import top.continew.admin.schedule.model.query.JobLogQuery;
 import top.continew.admin.schedule.model.resp.JobInstanceResp;
+import top.continew.admin.schedule.model.resp.JobLogResp;
 import top.continew.starter.extension.crud.model.resp.PageResp;
 
 import java.util.List;

continew-webapi/src/main/java/top/continew/admin/controller/monitor/OnlineUserController.java

@@ -16,19 +16,15 @@
 
 package top.continew.admin.controller.monitor;
 
-import lombok.RequiredArgsConstructor;
+import cn.dev33.satoken.annotation.SaCheckPermission;
-
+import cn.dev33.satoken.stp.StpUtil;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.enums.ParameterIn;
 import io.swagger.v3.oas.annotations.tags.Tag;
-
+import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import cn.dev33.satoken.stp.StpUtil;
-
 import top.continew.admin.auth.model.query.OnlineUserQuery;
 import top.continew.admin.auth.model.resp.OnlineUserResp;
 import top.continew.admin.auth.service.OnlineUserService;

continew-webapi/src/main/java/top/continew/admin/controller/open/AppController.java

@@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
+import top.continew.admin.common.base.BaseController;
 import top.continew.admin.open.model.query.AppQuery;
 import top.continew.admin.open.model.req.AppReq;
 import top.continew.admin.open.model.resp.AppDetailResp;
@@ -33,7 +34,6 @@ import top.continew.admin.open.model.resp.AppResp;
 import top.continew.admin.open.model.resp.AppSecretResp;
 import top.continew.admin.open.service.AppService;
 import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
-import top.continew.admin.common.base.BaseController;
 import top.continew.starter.extension.crud.enums.Api;
 
 /**

continew-webapi/src/main/java/top/continew/admin/controller/schedule/JobLogController.java

@@ -26,10 +26,10 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import top.continew.admin.schedule.model.JobInstanceLogPageResult;
 import top.continew.admin.schedule.model.query.JobInstanceLogQuery;
-import top.continew.admin.schedule.model.query.JobLogQuery;
 import top.continew.admin.schedule.model.query.JobInstanceQuery;
-import top.continew.admin.schedule.model.resp.JobLogResp;
+import top.continew.admin.schedule.model.query.JobLogQuery;
 import top.continew.admin.schedule.model.resp.JobInstanceResp;
+import top.continew.admin.schedule.model.resp.JobLogResp;
 import top.continew.admin.schedule.service.JobLogService;
 import top.continew.starter.extension.crud.model.resp.PageResp;
 

continew-webapi/src/main/java/top/continew/admin/controller/system/ClientController.java

@@ -21,7 +21,6 @@ import org.springframework.web.bind.annotation.RestController;
 import top.continew.admin.common.base.BaseController;
 import top.continew.admin.system.model.query.ClientQuery;
 import top.continew.admin.system.model.req.ClientReq;
-import top.continew.admin.system.model.resp.ClientDetailResp;
 import top.continew.admin.system.model.resp.ClientResp;
 import top.continew.admin.system.service.ClientService;
 import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
@@ -36,5 +35,5 @@ import top.continew.starter.extension.crud.enums.Api;
 @Tag(name = "客户端管理 API")
 @RestController
 @CrudRequestMapping(value = "/system/client", api = {Api.PAGE, Api.DETAIL, Api.ADD, Api.UPDATE, Api.DELETE})
-public class ClientController extends BaseController<ClientService, ClientResp, ClientDetailResp, ClientQuery, ClientReq> {
+public class ClientController extends BaseController<ClientService, ClientResp, ClientResp, ClientQuery, ClientReq> {
 }

continew-webapi/src/main/java/top/continew/admin/controller/system/DictController.java

@@ -18,12 +18,12 @@ package top.continew.admin.controller.system;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.RestController;
+import top.continew.admin.common.base.BaseController;
 import top.continew.admin.system.model.query.DictQuery;
 import top.continew.admin.system.model.req.DictReq;
 import top.continew.admin.system.model.resp.DictResp;
 import top.continew.admin.system.service.DictService;
 import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
-import top.continew.admin.common.base.BaseController;
 import top.continew.starter.extension.crud.enums.Api;
 
 /**

continew-webapi/src/main/java/top/continew/admin/controller/system/DictItemController.java

@@ -18,12 +18,12 @@ package top.continew.admin.controller.system;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.RestController;
+import top.continew.admin.common.base.BaseController;
 import top.continew.admin.system.model.query.DictItemQuery;
 import top.continew.admin.system.model.req.DictItemReq;
 import top.continew.admin.system.model.resp.DictItemResp;
 import top.continew.admin.system.service.DictItemService;
 import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
-import top.continew.admin.common.base.BaseController;
 import top.continew.starter.extension.crud.enums.Api;
 import top.continew.starter.log.annotation.Log;
 

continew-webapi/src/main/java/top/continew/admin/controller/system/FileController.java

@@ -20,14 +20,15 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import top.continew.admin.common.base.BaseController;
 import top.continew.admin.system.model.query.FileQuery;
 import top.continew.admin.system.model.req.FileReq;
 import top.continew.admin.system.model.resp.FileResp;
 import top.continew.admin.system.model.resp.FileStatisticsResp;
 import top.continew.admin.system.service.FileService;
 import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
-import top.continew.admin.common.base.BaseController;
 import top.continew.starter.extension.crud.enums.Api;
 import top.continew.starter.log.annotation.Log;
 

continew-webapi/src/main/java/top/continew/admin/controller/system/RoleController.java

@@ -21,12 +21,11 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.enums.ParameterIn;
 import io.swagger.v3.oas.annotations.tags.Tag;
-
 import jakarta.validation.constraints.NotEmpty;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-
+import top.continew.admin.common.base.BaseController;
 import top.continew.admin.system.model.query.RoleQuery;
 import top.continew.admin.system.model.req.RoleReq;
 import top.continew.admin.system.model.resp.RoleDetailResp;
@@ -34,7 +33,6 @@ import top.continew.admin.system.model.resp.RoleResp;
 import top.continew.admin.system.service.RoleService;
 import top.continew.admin.system.service.UserRoleService;
 import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
-import top.continew.admin.common.base.BaseController;
 import top.continew.starter.extension.crud.enums.Api;
 
 import java.util.List;

continew-webapi/src/main/java/top/continew/admin/controller/system/StorageController.java

@@ -18,12 +18,12 @@ package top.continew.admin.controller.system;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.RestController;
+import top.continew.admin.common.base.BaseController;
 import top.continew.admin.system.model.query.StorageQuery;
 import top.continew.admin.system.model.req.StorageReq;
 import top.continew.admin.system.model.resp.StorageResp;
 import top.continew.admin.system.service.StorageService;
 import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
-import top.continew.admin.common.base.BaseController;
 import top.continew.starter.extension.crud.enums.Api;
 
 /**

continew-webapi/src/main/java/top/continew/admin/controller/system/UserController.java

@@ -29,6 +29,7 @@ import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import top.continew.admin.common.base.BaseController;
 import top.continew.admin.common.constant.RegexConstants;
 import top.continew.admin.common.util.SecureUtils;
 import top.continew.admin.system.model.query.UserQuery;
@@ -44,7 +45,6 @@ import top.continew.admin.system.service.UserService;
 import top.continew.starter.core.util.ExceptionUtils;
 import top.continew.starter.core.validation.ValidationUtils;
 import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
-import top.continew.admin.common.base.BaseController;
 import top.continew.starter.extension.crud.enums.Api;
 import top.continew.starter.extension.crud.model.resp.BaseIdResp;
 import top.continew.starter.extension.crud.validation.CrudValidationGroup;