This commit is contained in:
zc
2026-02-27 10:50:07 +08:00
parent 0ee56404c2
commit 86527b9c21
611 changed files with 2741 additions and 2752 deletions

View File

@@ -3,11 +3,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>top.ysoft</groupId>
<artifactId>ysoft-admin</artifactId>
<groupId>top.wms</groupId>
<artifactId>wms-admin</artifactId>
<version>3.6.0-SNAPSHOT</version>
</parent>
<artifactId>ysoft-plugin</artifactId>
<artifactId>wms-plugin</artifactId>
<version>3.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<description>插件模块(存放代码生成、任务调度等扩展模块)</description>
@@ -18,14 +18,14 @@
</license>
</licenses>
<modules>
<module>ysoft-plugin-schedule</module>
<module>ysoft-plugin-open</module>
<module>ysoft-plugin-generator</module>
<module>wms-plugin-schedule</module>
<module>wms-plugin-open</module>
<module>wms-plugin-generator</module>
</modules>
<dependencies>
<dependency>
<groupId>top.ysoft</groupId>
<artifactId>ysoft-common</artifactId>
<groupId>top.wms</groupId>
<artifactId>wms-common</artifactId>
</dependency>
</dependencies>
</project>

View File

@@ -4,26 +4,26 @@
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.ysoft</groupId>
<artifactId>ysoft-admin</artifactId>
<groupId>top.wms</groupId>
<artifactId>wms-admin</artifactId>
<version>${revision}</version>
</parent>
<artifactId>ysoft-plugin</artifactId>
<artifactId>wms-plugin</artifactId>
<packaging>pom</packaging>
<description>插件模块(存放代码生成、任务调度等扩展模块)</description>
<modules>
<module>ysoft-plugin-schedule</module>
<module>ysoft-plugin-open</module>
<module>ysoft-plugin-generator</module>
<module>wms-plugin-schedule</module>
<module>wms-plugin-open</module>
<module>wms-plugin-generator</module>
</modules>
<dependencies>
<!-- 公共模块(存放公共工具类,公共配置等) -->
<dependency>
<groupId>top.ysoft</groupId>
<artifactId>ysoft-common</artifactId>
<groupId>top.wms</groupId>
<artifactId>wms-common</artifactId>
</dependency>
</dependencies>
</project>

View File

@@ -3,11 +3,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>top.ysoft</groupId>
<artifactId>ysoft-plugin</artifactId>
<groupId>top.wms</groupId>
<artifactId>wms-plugin</artifactId>
<version>3.6.0-SNAPSHOT</version>
</parent>
<artifactId>ysoft-plugin-generator</artifactId>
<artifactId>wms-plugin-generator</artifactId>
<version>3.6.0-SNAPSHOT</version>
<description>代码生成器插件</description>
<licenses>

View File

@@ -4,11 +4,11 @@
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.ysoft</groupId>
<artifactId>ysoft-plugin</artifactId>
<groupId>top.wms</groupId>
<artifactId>wms-plugin</artifactId>
<version>${revision}</version>
</parent>
<artifactId>ysoft-plugin-generator</artifactId>
<artifactId>wms-plugin-generator</artifactId>
<description>代码生成器插件</description>
</project>

View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.generator.config.properties;
package top.wms.admin.generator.config.properties;
import cn.hutool.core.io.file.FileNameUtil;
import cn.hutool.core.map.MapUtil;

View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.generator.enums;
package top.wms.admin.generator.enums;
import lombok.Getter;
import lombok.RequiredArgsConstructor;

View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.generator.enums;
package top.wms.admin.generator.enums;
import lombok.Getter;
import lombok.RequiredArgsConstructor;

View File

@@ -1,8 +1,8 @@
package top.ysoft.admin.generator.mapper;
package top.wms.admin.generator.mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import top.ysoft.admin.generator.model.entity.FieldConfigDO;
import top.wms.admin.generator.model.entity.FieldConfigDO;
import top.continew.starter.data.mp.base.BaseMapper;
import java.util.List;

View File

@@ -1,6 +1,6 @@
package top.ysoft.admin.generator.mapper;
package top.wms.admin.generator.mapper;
import top.ysoft.admin.generator.model.entity.GenConfigDO;
import top.wms.admin.generator.model.entity.GenConfigDO;
import top.continew.starter.data.mp.base.BaseMapper;
/**

View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.generator.model.entity;
package top.wms.admin.generator.model.entity;
import cn.hutool.core.util.StrUtil;
import cn.hutool.db.meta.Column;
@@ -12,8 +12,8 @@ import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.NonNull;
import top.ysoft.admin.generator.enums.FormTypeEnum;
import top.ysoft.admin.generator.enums.QueryTypeEnum;
import top.wms.admin.generator.enums.FormTypeEnum;
import top.wms.admin.generator.enums.QueryTypeEnum;
import top.continew.starter.core.constant.StringConstants;
import java.io.Serial;

View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.generator.model.entity;
package top.wms.admin.generator.model.entity;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.annotation.*;
@@ -9,7 +9,7 @@ import jakarta.validation.constraints.Pattern;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.hibernate.validator.constraints.Length;
import top.ysoft.admin.common.constant.RegexConstants;
import top.wms.admin.common.constant.RegexConstants;
import top.continew.starter.core.constant.CharConstants;
import top.continew.starter.core.util.StrUtils;
@@ -50,7 +50,7 @@ public class GenConfigDO implements Serializable {
/**
* 模块名称
*/
@Schema(description = "模块名称", example = "ysoft-admin-system")
@Schema(description = "模块名称", example = "wms-admin-system")
@NotBlank(message = "模块名称不能为空")
@Length(max = 60, message = "模块名称不能超过 {max} 个字符")
private String moduleName;
@@ -58,7 +58,7 @@ public class GenConfigDO implements Serializable {
/**
* 包名称
*/
@Schema(description = "包名称", example = "top.ysoft.admin.system")
@Schema(description = "包名称", example = "top.wms.admin.system")
@NotBlank(message = "包名称不能为空")
@Pattern(regexp = RegexConstants.PACKAGE_NAME, message = "包名称格式错误")
@Length(max = 60, message = "包名称不能超过 {max} 个字符")

View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.generator.model.entity;
package top.wms.admin.generator.model.entity;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;

View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.generator.model.query;
package top.wms.admin.generator.model.query;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

View File

@@ -1,12 +1,12 @@
package top.ysoft.admin.generator.model.req;
package top.wms.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.ysoft.admin.generator.model.entity.FieldConfigDO;
import top.ysoft.admin.generator.model.entity.GenConfigDO;
import top.wms.admin.generator.model.entity.FieldConfigDO;
import top.wms.admin.generator.model.entity.GenConfigDO;
import java.io.Serial;
import java.io.Serializable;

View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.generator.model.resp;
package top.wms.admin.generator.model.resp;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -20,7 +20,7 @@ public class GeneratePreviewResp implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
@Schema(description = "生成的文件路径", example = "ysoft-admin\\ysoft-admin\\ysoft-admin-generator\\src\\main\\java\\top\\ysoft\\admin\\generator\\service")
@Schema(description = "生成的文件路径", example = "wms-admin\\wms-admin\\wms-admin-generator\\src\\main\\java\\top\\wms\\admin\\generator\\service")
private String path;
/**

View File

@@ -1,11 +1,11 @@
package top.ysoft.admin.generator.service;
package top.wms.admin.generator.service;
import jakarta.servlet.http.HttpServletResponse;
import top.ysoft.admin.generator.model.entity.FieldConfigDO;
import top.ysoft.admin.generator.model.entity.GenConfigDO;
import top.ysoft.admin.generator.model.query.GenConfigQuery;
import top.ysoft.admin.generator.model.req.GenConfigReq;
import top.ysoft.admin.generator.model.resp.GeneratePreviewResp;
import top.wms.admin.generator.model.entity.FieldConfigDO;
import top.wms.admin.generator.model.entity.GenConfigDO;
import top.wms.admin.generator.model.query.GenConfigQuery;
import top.wms.admin.generator.model.req.GenConfigReq;
import top.wms.admin.generator.model.resp.GeneratePreviewResp;
import top.continew.starter.extension.crud.model.query.PageQuery;
import top.continew.starter.extension.crud.model.resp.PageResp;

View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.generator.service.impl;
package top.wms.admin.generator.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
@@ -24,18 +24,18 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import top.ysoft.admin.generator.config.properties.GeneratorProperties;
import top.ysoft.admin.generator.enums.FormTypeEnum;
import top.ysoft.admin.generator.enums.QueryTypeEnum;
import top.ysoft.admin.generator.mapper.FieldConfigMapper;
import top.ysoft.admin.generator.mapper.GenConfigMapper;
import top.ysoft.admin.generator.model.entity.FieldConfigDO;
import top.ysoft.admin.generator.model.entity.GenConfigDO;
import top.ysoft.admin.generator.model.entity.InnerGenConfigDO;
import top.ysoft.admin.generator.model.query.GenConfigQuery;
import top.ysoft.admin.generator.model.req.GenConfigReq;
import top.ysoft.admin.generator.model.resp.GeneratePreviewResp;
import top.ysoft.admin.generator.service.GeneratorService;
import top.wms.admin.generator.config.properties.GeneratorProperties;
import top.wms.admin.generator.enums.FormTypeEnum;
import top.wms.admin.generator.enums.QueryTypeEnum;
import top.wms.admin.generator.mapper.FieldConfigMapper;
import top.wms.admin.generator.mapper.GenConfigMapper;
import top.wms.admin.generator.model.entity.FieldConfigDO;
import top.wms.admin.generator.model.entity.GenConfigDO;
import top.wms.admin.generator.model.entity.InnerGenConfigDO;
import top.wms.admin.generator.model.query.GenConfigQuery;
import top.wms.admin.generator.model.req.GenConfigReq;
import top.wms.admin.generator.model.resp.GeneratePreviewResp;
import top.wms.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;
@@ -105,8 +105,8 @@ public class GeneratorServiceImpl implements GeneratorService {
genConfig = new GenConfigDO(tableName);
// 默认包名(当前包名)
String packageName = ClassUtil.getPackage(GeneratorService.class);
genConfig.setPackageName(StrUtil.subBefore("top.ysoft.admin.", StringConstants.DOT, true));
genConfig.setModuleName("ysoft-module-system");
genConfig.setPackageName(StrUtil.subBefore("top.wms.admin.", StringConstants.DOT, true));
genConfig.setModuleName("wms-module-system");
// 默认业务名(表注释)
List<Table> tableList = MetaUtils.getTables(dataSource, tableName);
if (CollUtil.isNotEmpty(tableList)) {
@@ -245,10 +245,10 @@ public class GeneratorServiceImpl implements GeneratorService {
List<GeneratePreviewResp> generatePreviewList = this.preview(tableName);
// 生成代码
for (GeneratePreviewResp generatePreview : generatePreviewList) {
// 后端:ysoft-admin/ysoft-system/src/main/java/top/ysoft/admin/system/service/impl/XxxServiceImpl.java
// 前端:ysoft-admin/ysoft-admin-ui/src/views/system/user/index.vue
// 后端:wms-admin/wms-system/src/main/java/top/wms/admin/system/service/impl/XxxServiceImpl.java
// 前端:wms-admin/wms-admin-ui/src/views/system/user/index.vue
File file = new File(projectPath + generatePreview.getPath()
.replace("ysoft-admin\\ysoft-admin", ""), generatePreview.getFileName());
.replace("wms-admin\\wms-admin", ""), generatePreview.getFileName());
// 如果已经存在,且不允许覆盖,则跳过
if (!file.exists() || Boolean.TRUE.equals(genConfigMapper.selectById(tableName).getIsOverride())) {
FileUtil.writeUtf8String(generatePreview.getContent(), file);
@@ -335,14 +335,14 @@ public class GeneratorServiceImpl implements GeneratorService {
.getAppName() + "-ui");
String packagePath;
if (generatePreview.isBackend()) {
// 例如:ysoft-admin/ysoft-system/src/main/java/top/ysoft/admin/system/service/impl
// 例如:wms-admin/wms-system/src/main/java/top/wms/admin/system/service/impl
packagePath = String.join(File.separator, backendBasicPackagePath, templateConfig.getPackageName()
.replace(StringConstants.DOT, File.separator));
} else {
// 例如:ysoft-admin/ysoft-admin-ui/src/views/system
// 例如:wms-admin/wms-admin-ui/src/views/system
packagePath = String.join(File.separator, frontendBasicPackagePath, templateConfig.getPackageName()
.replace(StringConstants.SLASH, File.separator), genConfig.getApiModuleName());
// 例如:ysoft-admin/ysoft-admin-ui/src/views/system/user
// 例如:wms-admin/wms-admin-ui/src/views/system/user
packagePath = ".vue".equals(templateConfig.getExtension())
? packagePath + File.separator + StrUtil.lowerFirst(genConfig.getClassNamePrefix())
: packagePath;
@@ -358,8 +358,8 @@ public class GeneratorServiceImpl implements GeneratorService {
*/
private void generateCode(List<GeneratePreviewResp> generatePreviewList, GenConfigDO genConfig) {
for (GeneratePreviewResp generatePreview : generatePreviewList) {
// 后端:ysoft-admin/ysoft-system/src/main/java/top/ysoft/admin/system/service/impl/XxxServiceImpl.java
// 前端:ysoft-admin/ysoft-admin-ui/src/views/system/user/index.vue
// 后端:wms-admin/wms-system/src/main/java/top/wms/admin/system/service/impl/XxxServiceImpl.java
// 前端:wms-admin/wms-admin-ui/src/views/system/user/index.vue
File file = new File(SystemUtil.getUserInfo().getTempDir() + generatePreview.getPath(), generatePreview
.getFileName());
// 如果已经存在,且不允许覆盖,则跳过
@@ -379,7 +379,7 @@ public class GeneratorServiceImpl implements GeneratorService {
private String buildBackendBasicPackagePath(GenConfigDO genConfig,
GeneratorProperties.TemplateConfig templateConfig) {
String extension = templateConfig.getExtension();
// 例如:ysoft-admin/ysoft-system/src/main/java/top/ysoft/admin/system
// 例如:wms-admin/wms-system/src/main/java/top/wms/admin/system
return String.join(File.separator, projectProperties.getAppName(), projectProperties.getAppName(), genConfig
.getModuleName(), "src", "main", FileNameUtil.EXT_JAVA.equals(extension)
? "java"

View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.controller.${subPackageName};
package top.wms.admin.controller.${subPackageName};
import top.continew.starter.extension.crud.enums.Api;
@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.*;
import lombok.RequiredArgsConstructor;
import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
import top.ysoft.admin.common.controller.BaseController;
import top.wms.admin.common.controller.BaseController;
import ${packageName}.model.query.${classNamePrefix}Query;
import ${packageName}.model.req.${classNamePrefix}Req;
import ${packageName}.model.resp.${classNamePrefix}DetailResp;

View File

@@ -7,7 +7,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import top.ysoft.admin.common.model.resp.BaseDetailResp;
import top.wms.admin.common.model.resp.BaseDetailResp;
import java.io.Serial;
<#if hasTimeField>

View File

@@ -4,7 +4,7 @@ import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableName;
import top.ysoft.admin.common.model.entity.BaseDO;
import top.wms.admin.common.model.entity.BaseDO;
import java.io.Serial;
<#if hasTimeField>

View File

@@ -4,7 +4,7 @@ import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
import top.ysoft.admin.common.model.resp.BaseDetailResp;
import top.wms.admin.common.model.resp.BaseDetailResp;
import java.io.Serial;
<#if hasTimeField>

View File

@@ -3,11 +3,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>top.ysoft</groupId>
<artifactId>ysoft-plugin</artifactId>
<groupId>top.wms</groupId>
<artifactId>wms-plugin</artifactId>
<version>3.6.0-SNAPSHOT</version>
</parent>
<artifactId>ysoft-plugin-open</artifactId>
<artifactId>wms-plugin-open</artifactId>
<version>3.6.0-SNAPSHOT</version>
<description>能力开放插件包括应用管理、API开放授权、API开发等</description>
<licenses>

View File

@@ -4,11 +4,11 @@
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.ysoft</groupId>
<artifactId>ysoft-plugin</artifactId>
<groupId>top.wms</groupId>
<artifactId>wms-plugin</artifactId>
<version>${revision}</version>
</parent>
<artifactId>ysoft-plugin-open</artifactId>
<artifactId>wms-plugin-open</artifactId>
<description>能力开放插件包括应用管理、API开放授权、API开发等</description>
</project>

View File

@@ -1,9 +1,9 @@
package top.ysoft.admin.open.handler;
package top.wms.admin.open.handler;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.annotation.handler.SaAnnotationHandlerInterface;
import org.springframework.stereotype.Component;
import top.ysoft.admin.open.util.OpenApiUtils;
import top.wms.admin.open.util.OpenApiUtils;
import java.lang.reflect.Method;

View File

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

View File

@@ -1,9 +1,9 @@
package top.ysoft.admin.open.model.entity;
package top.wms.admin.open.model.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import top.ysoft.admin.common.enums.DisEnableStatusEnum;
import top.ysoft.admin.common.model.entity.BaseDO;
import top.wms.admin.common.enums.DisEnableStatusEnum;
import top.wms.admin.common.model.entity.BaseDO;
import top.continew.starter.security.crypto.annotation.FieldEncrypt;
import java.io.Serial;

View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.open.model.query;
package top.wms.admin.open.model.query;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

View File

@@ -1,11 +1,11 @@
package top.ysoft.admin.open.model.req;
package top.wms.admin.open.model.req;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.Future;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import top.ysoft.admin.common.enums.DisEnableStatusEnum;
import top.wms.admin.common.enums.DisEnableStatusEnum;
import java.io.Serial;
import java.io.Serializable;

View File

@@ -1,11 +1,11 @@
package top.ysoft.admin.open.model.resp;
package top.wms.admin.open.model.resp;
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.ysoft.admin.common.model.resp.BaseDetailResp;
import top.ysoft.admin.common.enums.DisEnableStatusEnum;
import top.wms.admin.common.model.resp.BaseDetailResp;
import top.wms.admin.common.enums.DisEnableStatusEnum;
import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter;
import java.io.Serial;

View File

@@ -1,9 +1,9 @@
package top.ysoft.admin.open.model.resp;
package top.wms.admin.open.model.resp;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import top.ysoft.admin.common.model.resp.BaseDetailResp;
import top.ysoft.admin.common.enums.DisEnableStatusEnum;
import top.wms.admin.common.model.resp.BaseDetailResp;
import top.wms.admin.common.enums.DisEnableStatusEnum;
import java.io.Serial;
import java.time.LocalDateTime;

View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.open.model.resp;
package top.wms.admin.open.model.resp;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

View File

@@ -1,11 +1,11 @@
package top.ysoft.admin.open.service;
package top.wms.admin.open.service;
import top.ysoft.admin.open.model.entity.AppDO;
import top.ysoft.admin.open.model.query.AppQuery;
import top.ysoft.admin.open.model.req.AppReq;
import top.ysoft.admin.open.model.resp.AppDetailResp;
import top.ysoft.admin.open.model.resp.AppResp;
import top.ysoft.admin.open.model.resp.AppSecretResp;
import top.wms.admin.open.model.entity.AppDO;
import top.wms.admin.open.model.query.AppQuery;
import top.wms.admin.open.model.req.AppReq;
import top.wms.admin.open.model.resp.AppDetailResp;
import top.wms.admin.open.model.resp.AppResp;
import top.wms.admin.open.model.resp.AppSecretResp;
import top.continew.starter.extension.crud.service.BaseService;
/**

View File

@@ -1,18 +1,18 @@
package top.ysoft.admin.open.service.impl;
package top.wms.admin.open.service.impl;
import cn.hutool.core.codec.Base64;
import cn.hutool.core.util.IdUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import top.ysoft.admin.open.mapper.AppMapper;
import top.ysoft.admin.open.model.entity.AppDO;
import top.ysoft.admin.open.model.query.AppQuery;
import top.ysoft.admin.open.model.req.AppReq;
import top.ysoft.admin.open.model.resp.AppDetailResp;
import top.ysoft.admin.open.model.resp.AppResp;
import top.ysoft.admin.open.model.resp.AppSecretResp;
import top.ysoft.admin.open.service.AppService;
import top.wms.admin.open.mapper.AppMapper;
import top.wms.admin.open.model.entity.AppDO;
import top.wms.admin.open.model.query.AppQuery;
import top.wms.admin.open.model.req.AppReq;
import top.wms.admin.open.model.resp.AppDetailResp;
import top.wms.admin.open.model.resp.AppResp;
import top.wms.admin.open.model.resp.AppSecretResp;
import top.wms.admin.open.service.AppService;
import top.continew.starter.core.constant.StringConstants;
import top.continew.starter.extension.crud.service.BaseServiceImpl;

View File

@@ -1,11 +1,11 @@
package top.ysoft.admin.open.sign;
package top.wms.admin.open.sign;
import cn.dev33.satoken.sign.SaSignTemplate;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;
import top.ysoft.admin.common.enums.DisEnableStatusEnum;
import top.ysoft.admin.open.model.entity.AppDO;
import top.ysoft.admin.open.service.AppService;
import top.wms.admin.common.enums.DisEnableStatusEnum;
import top.wms.admin.open.model.entity.AppDO;
import top.wms.admin.open.service.AppService;
import top.continew.starter.core.validation.ValidationUtils;
import java.util.Map;

View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.open.util;
package top.wms.admin.open.util;
import cn.dev33.satoken.context.SaHolder;
import cn.dev33.satoken.context.model.SaRequest;

View File

@@ -3,11 +3,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>top.ysoft</groupId>
<artifactId>ysoft-plugin</artifactId>
<groupId>top.wms</groupId>
<artifactId>wms-plugin</artifactId>
<version>3.6.0-SNAPSHOT</version>
</parent>
<artifactId>ysoft-plugin-schedule</artifactId>
<artifactId>wms-plugin-schedule</artifactId>
<version>3.6.0-SNAPSHOT</version>
<description>任务调度插件</description>
<licenses>

View File

@@ -2,13 +2,13 @@
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.ysoft</groupId>
<artifactId>ysoft-plugin</artifactId>
<groupId>top.wms</groupId>
<artifactId>wms-plugin</artifactId>
<version>${revision}</version>
</parent>
<artifactId>ysoft-plugin-schedule</artifactId>
<artifactId>wms-plugin-schedule</artifactId>
<description>任务调度插件</description>
<dependencies>

View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.schedule.api;
package top.wms.admin.schedule.api;
import com.aizuda.snailjob.common.core.model.Result;
import org.springframework.http.MediaType;
@@ -7,10 +7,10 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.service.annotation.*;
import top.ysoft.admin.schedule.model.JobPageResult;
import top.ysoft.admin.schedule.model.req.JobReq;
import top.ysoft.admin.schedule.model.req.JobStatusReq;
import top.ysoft.admin.schedule.model.resp.JobResp;
import top.wms.admin.schedule.model.JobPageResult;
import top.wms.admin.schedule.model.req.JobReq;
import top.wms.admin.schedule.model.req.JobStatusReq;
import top.wms.admin.schedule.model.resp.JobResp;
import java.util.List;
import java.util.Set;

View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.schedule.api;
package top.wms.admin.schedule.api;
import com.aizuda.snailjob.common.core.model.Result;
import org.springframework.http.MediaType;
@@ -8,10 +8,10 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.service.annotation.GetExchange;
import org.springframework.web.service.annotation.HttpExchange;
import org.springframework.web.service.annotation.PostExchange;
import top.ysoft.admin.schedule.model.JobInstanceLogPageResult;
import top.ysoft.admin.schedule.model.JobPageResult;
import top.ysoft.admin.schedule.model.resp.JobInstanceResp;
import top.ysoft.admin.schedule.model.resp.JobLogResp;
import top.wms.admin.schedule.model.JobInstanceLogPageResult;
import top.wms.admin.schedule.model.JobPageResult;
import top.wms.admin.schedule.model.resp.JobInstanceResp;
import top.wms.admin.schedule.model.resp.JobLogResp;
import java.util.List;

View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.schedule.api;
package top.wms.admin.schedule.api;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.date.DateUtil;
@@ -16,8 +16,8 @@ import com.aizuda.snailjob.common.core.model.Result;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.ResponseEntity;
import top.ysoft.admin.schedule.constant.JobConstants;
import top.ysoft.admin.schedule.model.JobPageResult;
import top.wms.admin.schedule.constant.JobConstants;
import top.wms.admin.schedule.model.JobPageResult;
import top.continew.starter.cache.redisson.util.RedisUtils;
import top.continew.starter.extension.crud.model.resp.PageResp;

View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.schedule.config;
package top.wms.admin.schedule.config;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.netty.channel.ChannelOption;
@@ -20,10 +20,10 @@ import org.springframework.web.reactive.function.client.support.WebClientAdapter
import org.springframework.web.service.invoker.HttpServiceProxyFactory;
import reactor.core.publisher.Mono;
import reactor.netty.http.client.HttpClient;
import top.ysoft.admin.schedule.api.JobApi;
import top.ysoft.admin.schedule.api.JobBatchApi;
import top.ysoft.admin.schedule.api.JobClient;
import top.ysoft.admin.schedule.constant.JobConstants;
import top.wms.admin.schedule.api.JobApi;
import top.wms.admin.schedule.api.JobBatchApi;
import top.wms.admin.schedule.api.JobClient;
import top.wms.admin.schedule.constant.JobConstants;
/**
* HTTP Exchange 配置

View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.schedule.config;
package top.wms.admin.schedule.config;
import ch.qos.logback.classic.Logger;
import ch.qos.logback.classic.LoggerContext;

View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.schedule.constant;
package top.wms.admin.schedule.constant;
/**
* 任务调度常量

View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.schedule.enums;
package top.wms.admin.schedule.enums;
import lombok.Getter;
import lombok.RequiredArgsConstructor;

View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.schedule.enums;
package top.wms.admin.schedule.enums;
import lombok.Getter;
import lombok.RequiredArgsConstructor;

View File

@@ -1,8 +1,8 @@
package top.ysoft.admin.schedule.enums;
package top.wms.admin.schedule.enums;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import top.ysoft.admin.common.constant.UiConstants;
import top.wms.admin.common.constant.UiConstants;
import top.continew.starter.core.enums.BaseEnum;
/**

View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.schedule.enums;
package top.wms.admin.schedule.enums;
import lombok.Getter;
import lombok.RequiredArgsConstructor;

View File

@@ -1,8 +1,8 @@
package top.ysoft.admin.schedule.enums;
package top.wms.admin.schedule.enums;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import top.ysoft.admin.common.constant.UiConstants;
import top.wms.admin.common.constant.UiConstants;
import top.continew.starter.core.enums.BaseEnum;
/**

View File

@@ -1,8 +1,8 @@
package top.ysoft.admin.schedule.enums;
package top.wms.admin.schedule.enums;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import top.ysoft.admin.common.constant.UiConstants;
import top.wms.admin.common.constant.UiConstants;
import top.continew.starter.core.enums.BaseEnum;
/**

View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.schedule.enums;
package top.wms.admin.schedule.enums;
import lombok.Getter;
import lombok.RequiredArgsConstructor;

View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.schedule.model;
package top.wms.admin.schedule.model;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.schedule.model;
package top.wms.admin.schedule.model;
import com.aizuda.snailjob.common.core.model.Result;
import lombok.Data;

View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.schedule.model.query;
package top.wms.admin.schedule.model.query;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.Min;

View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.schedule.model.query;
package top.wms.admin.schedule.model.query;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.schedule.model.query;
package top.wms.admin.schedule.model.query;
import cn.hutool.core.date.DatePattern;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -7,7 +7,7 @@ import jakarta.validation.constraints.Size;
import lombok.Data;
import org.hibernate.validator.constraints.Range;
import org.springframework.format.annotation.DateTimeFormat;
import top.ysoft.admin.schedule.enums.JobExecuteStatusEnum;
import top.wms.admin.schedule.enums.JobExecuteStatusEnum;
import java.io.Serial;
import java.io.Serializable;
@@ -35,7 +35,7 @@ public class JobLogQuery implements Serializable {
/**
* 任务组
*/
@Schema(description = "任务组", example = "ysoft-admin")
@Schema(description = "任务组", example = "wms-admin")
private String groupName;
/**

View File

@@ -1,10 +1,10 @@
package top.ysoft.admin.schedule.model.query;
package top.wms.admin.schedule.model.query;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.Min;
import lombok.Data;
import org.hibernate.validator.constraints.Range;
import top.ysoft.admin.schedule.enums.JobStatusEnum;
import top.wms.admin.schedule.enums.JobStatusEnum;
import java.io.Serial;
import java.io.Serializable;
@@ -25,7 +25,7 @@ public class JobQuery implements Serializable {
/**
* 任务组
*/
@Schema(description = "任务组", example = "ysoft-admin")
@Schema(description = "任务组", example = "wms-admin")
private String groupName;
/**

View File

@@ -1,11 +1,11 @@
package top.ysoft.admin.schedule.model.req;
package top.wms.admin.schedule.model.req;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import top.ysoft.admin.schedule.enums.*;
import top.wms.admin.schedule.enums.*;
import java.io.Serial;
import java.io.Serializable;
@@ -27,7 +27,7 @@ public class JobReq implements Serializable {
/**
* 任务组
*/
@Schema(description = "任务组", example = "ysoft-admin")
@Schema(description = "任务组", example = "wms-admin")
@NotBlank(message = "任务组不能为空")
private String groupName;

View File

@@ -1,9 +1,9 @@
package top.ysoft.admin.schedule.model.req;
package top.wms.admin.schedule.model.req;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import top.ysoft.admin.schedule.enums.JobStatusEnum;
import top.wms.admin.schedule.enums.JobStatusEnum;
import java.io.Serial;
import java.io.Serializable;

View File

@@ -1,4 +1,4 @@
package top.ysoft.admin.schedule.model.resp;
package top.wms.admin.schedule.model.resp;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -29,7 +29,7 @@ public class JobInstanceResp implements Serializable {
/**
* 任务组
*/
@Schema(description = "任务组", example = "ysoft-admin")
@Schema(description = "任务组", example = "wms-admin")
private String groupName;
/**

View File

@@ -1,9 +1,9 @@
package top.ysoft.admin.schedule.model.resp;
package top.wms.admin.schedule.model.resp;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import top.ysoft.admin.schedule.enums.JobExecuteReasonEnum;
import top.ysoft.admin.schedule.enums.JobExecuteStatusEnum;
import top.wms.admin.schedule.enums.JobExecuteReasonEnum;
import top.wms.admin.schedule.enums.JobExecuteStatusEnum;
import java.io.Serial;
import java.io.Serializable;
@@ -32,7 +32,7 @@ public class JobLogResp implements Serializable {
/**
* 任务组
*/
@Schema(description = "任务组", example = "ysoft-admin")
@Schema(description = "任务组", example = "wms-admin")
private String groupName;
/**

View File

@@ -1,8 +1,8 @@
package top.ysoft.admin.schedule.model.resp;
package top.wms.admin.schedule.model.resp;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import top.ysoft.admin.schedule.enums.*;
import top.wms.admin.schedule.enums.*;
import java.io.Serial;
import java.io.Serializable;
@@ -31,7 +31,7 @@ public class JobResp implements Serializable {
/**
* 任务组
*/
@Schema(description = "任务组", example = "ysoft-admin")
@Schema(description = "任务组", example = "wms-admin")
private String groupName;
/**

View File

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

View File

@@ -1,9 +1,9 @@
package top.ysoft.admin.schedule.service;
package top.wms.admin.schedule.service;
import top.ysoft.admin.schedule.model.query.JobQuery;
import top.ysoft.admin.schedule.model.req.JobReq;
import top.ysoft.admin.schedule.model.req.JobStatusReq;
import top.ysoft.admin.schedule.model.resp.JobResp;
import top.wms.admin.schedule.model.query.JobQuery;
import top.wms.admin.schedule.model.req.JobReq;
import top.wms.admin.schedule.model.req.JobStatusReq;
import top.wms.admin.schedule.model.resp.JobResp;
import top.continew.starter.extension.crud.model.resp.PageResp;
import java.util.List;

View File

@@ -1,18 +1,18 @@
package top.ysoft.admin.schedule.service.impl;
package top.wms.admin.schedule.service.impl;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import top.ysoft.admin.schedule.api.JobBatchApi;
import top.ysoft.admin.schedule.api.JobClient;
import top.ysoft.admin.schedule.model.JobInstanceLogPageResult;
import top.ysoft.admin.schedule.model.query.JobInstanceLogQuery;
import top.ysoft.admin.schedule.model.query.JobInstanceQuery;
import top.ysoft.admin.schedule.model.query.JobLogQuery;
import top.ysoft.admin.schedule.model.resp.JobInstanceResp;
import top.ysoft.admin.schedule.model.resp.JobLogResp;
import top.ysoft.admin.schedule.service.JobLogService;
import top.wms.admin.schedule.api.JobBatchApi;
import top.wms.admin.schedule.api.JobClient;
import top.wms.admin.schedule.model.JobInstanceLogPageResult;
import top.wms.admin.schedule.model.query.JobInstanceLogQuery;
import top.wms.admin.schedule.model.query.JobInstanceQuery;
import top.wms.admin.schedule.model.query.JobLogQuery;
import top.wms.admin.schedule.model.resp.JobInstanceResp;
import top.wms.admin.schedule.model.resp.JobLogResp;
import top.wms.admin.schedule.service.JobLogService;
import top.continew.starter.extension.crud.model.resp.PageResp;
import java.time.LocalDateTime;

View File

@@ -1,14 +1,14 @@
package top.ysoft.admin.schedule.service.impl;
package top.wms.admin.schedule.service.impl;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import top.ysoft.admin.schedule.api.JobApi;
import top.ysoft.admin.schedule.api.JobClient;
import top.ysoft.admin.schedule.model.query.JobQuery;
import top.ysoft.admin.schedule.model.req.JobReq;
import top.ysoft.admin.schedule.model.req.JobStatusReq;
import top.ysoft.admin.schedule.model.resp.JobResp;
import top.ysoft.admin.schedule.service.JobService;
import top.wms.admin.schedule.api.JobApi;
import top.wms.admin.schedule.api.JobClient;
import top.wms.admin.schedule.model.query.JobQuery;
import top.wms.admin.schedule.model.req.JobReq;
import top.wms.admin.schedule.model.req.JobStatusReq;
import top.wms.admin.schedule.model.resp.JobResp;
import top.wms.admin.schedule.service.JobService;
import top.continew.starter.extension.crud.model.resp.PageResp;
import java.util.Collections;