From 58e5fc3343c48b2bddc3fa796fe98ca042228460 Mon Sep 17 00:00:00 2001 From: gitee Date: Fri, 11 Apr 2025 17:12:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=A1=A8=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + pom.xml | 15 +++ .../service/hub/config/MinioClientConfig.java | 75 +++++++++++++++ .../hub/controller/SysUserController.java | 3 +- .../ai/service/hub/domain/AuditLog.java | 36 ++++---- .../ai/service/hub/domain/ComfyuiPrompt.java | 21 +++-- .../hub/domain/ComfyuiPromptParam.java | 45 +++++++-- .../ai/service/hub/domain/ComfyuiTask.java | 82 +++++++++++++++++ .../service/hub/domain/ComfyuiTaskParam.java | 91 +++++++++++++++++++ .../service/hub/domain/ComfyuiTaskResult.java | 56 ++++++++++++ .../ai/service/hub/domain/SysApp.java | 64 ++++++++++--- .../ai/service/hub/domain/SysFile.java | 61 +++++++++++++ .../ai/service/hub/domain/SysRole.java | 60 ++++++++++++ .../ai/service/hub/domain/SysUser.java | 66 ++++++++++++++ .../ai/service/hub/domain/SysUserRole.java | 50 ++++++++++ .../hub/filter/JwtAuthenticationFilter.java | 4 +- .../ai/service/hub/mapper/AuditLogMapper.java | 2 +- .../hub/mapper/ComfyuiPromptMapper.java | 4 +- .../hub/mapper/ComfyuiPromptParamMapper.java | 4 +- .../service/hub/mapper/ComfyuiTaskMapper.java | 18 ++++ .../hub/mapper/ComfyuiTaskParamMapper.java | 18 ++++ .../hub/mapper/ComfyuiTaskResultMapper.java | 18 ++++ .../ai/service/hub/mapper/SysAppMapper.java | 18 ++++ .../ai/service/hub/mapper/SysFileMapper.java | 18 ++++ .../ai/service/hub/mapper/SysRoleMapper.java | 18 ++++ .../ai/service/hub/mapper/SysUserMapper.java | 20 ++-- .../service/hub/mapper/SysUserRoleMapper.java | 18 ++++ .../service/hub/service/AuditLogService.java | 2 +- .../hub/service/ComfyUIPromptService.java | 4 +- .../hub/service/ComfyuiTaskParamService.java | 13 +++ .../hub/service/ComfyuiTaskResultService.java | 13 +++ .../hub/service/ComfyuiTaskService.java | 13 +++ .../ai/service/hub/service/SysAppService.java | 13 +++ .../service/hub/service/SysFileService.java | 13 +++ .../service/hub/service/SysRoleService.java | 13 +++ .../hub/service/SysUserRoleService.java | 13 +++ .../service/hub/service/SysUserService.java | 13 +++ .../hub/service/impl/AuditLogServiceImpl.java | 2 +- .../impl/ComfyuiTaskParamServiceImpl.java | 22 +++++ .../impl/ComfyuiTaskResultServiceImpl.java | 22 +++++ .../service/impl/ComfyuiTaskServiceImpl.java | 22 +++++ .../hub/service/impl/SysAppServiceImpl.java | 22 +++++ .../hub/service/impl/SysFileServiceImpl.java | 22 +++++ .../hub/service/impl/SysRoleServiceImpl.java | 22 +++++ .../service/impl/SysUserRoleServiceImpl.java | 22 +++++ .../hub/service/impl/SysUserService.java | 7 +- .../hub/service/impl/SysUserServiceImpl.java | 22 +++++ .../ai/service/hub/util/JwtUtils.java | 13 +-- src/main/resources/application.yml | 14 ++- src/main/resources/logback-spring.xml | 75 +++++++++++++++ src/main/resources/mapper/AuditLogMapper.xml | 7 +- .../resources/mapper/ComfyuiPromptMapper.xml | 5 +- .../mapper/ComfyuiPromptParamMapper.xml | 12 ++- .../resources/mapper/ComfyuiTaskMapper.xml | 28 ++++++ .../mapper/ComfyuiTaskParamMapper.xml | 31 +++++++ .../mapper/ComfyuiTaskResultMapper.xml | 22 +++++ src/main/resources/mapper/SysAppMapper.xml | 23 +++++ src/main/resources/mapper/SysFileMapper.xml | 23 +++++ src/main/resources/mapper/SysRoleMapper.xml | 23 +++++ src/main/resources/mapper/SysUserMapper.xml | 24 +++++ .../resources/mapper/SysUserRoleMapper.xml | 20 ++++ .../hub/AiServiceHubApplicationTests.java | 17 +++- 62 files changed, 1429 insertions(+), 89 deletions(-) create mode 100644 src/main/java/com/supervision/ai/service/hub/config/MinioClientConfig.java create mode 100644 src/main/java/com/supervision/ai/service/hub/domain/ComfyuiTask.java create mode 100644 src/main/java/com/supervision/ai/service/hub/domain/ComfyuiTaskParam.java create mode 100644 src/main/java/com/supervision/ai/service/hub/domain/ComfyuiTaskResult.java create mode 100644 src/main/java/com/supervision/ai/service/hub/domain/SysFile.java create mode 100644 src/main/java/com/supervision/ai/service/hub/domain/SysRole.java create mode 100644 src/main/java/com/supervision/ai/service/hub/domain/SysUser.java create mode 100644 src/main/java/com/supervision/ai/service/hub/domain/SysUserRole.java create mode 100644 src/main/java/com/supervision/ai/service/hub/mapper/ComfyuiTaskMapper.java create mode 100644 src/main/java/com/supervision/ai/service/hub/mapper/ComfyuiTaskParamMapper.java create mode 100644 src/main/java/com/supervision/ai/service/hub/mapper/ComfyuiTaskResultMapper.java create mode 100644 src/main/java/com/supervision/ai/service/hub/mapper/SysAppMapper.java create mode 100644 src/main/java/com/supervision/ai/service/hub/mapper/SysFileMapper.java create mode 100644 src/main/java/com/supervision/ai/service/hub/mapper/SysRoleMapper.java create mode 100644 src/main/java/com/supervision/ai/service/hub/mapper/SysUserRoleMapper.java create mode 100644 src/main/java/com/supervision/ai/service/hub/service/ComfyuiTaskParamService.java create mode 100644 src/main/java/com/supervision/ai/service/hub/service/ComfyuiTaskResultService.java create mode 100644 src/main/java/com/supervision/ai/service/hub/service/ComfyuiTaskService.java create mode 100644 src/main/java/com/supervision/ai/service/hub/service/SysAppService.java create mode 100644 src/main/java/com/supervision/ai/service/hub/service/SysFileService.java create mode 100644 src/main/java/com/supervision/ai/service/hub/service/SysRoleService.java create mode 100644 src/main/java/com/supervision/ai/service/hub/service/SysUserRoleService.java create mode 100644 src/main/java/com/supervision/ai/service/hub/service/SysUserService.java create mode 100644 src/main/java/com/supervision/ai/service/hub/service/impl/ComfyuiTaskParamServiceImpl.java create mode 100644 src/main/java/com/supervision/ai/service/hub/service/impl/ComfyuiTaskResultServiceImpl.java create mode 100644 src/main/java/com/supervision/ai/service/hub/service/impl/ComfyuiTaskServiceImpl.java create mode 100644 src/main/java/com/supervision/ai/service/hub/service/impl/SysAppServiceImpl.java create mode 100644 src/main/java/com/supervision/ai/service/hub/service/impl/SysFileServiceImpl.java create mode 100644 src/main/java/com/supervision/ai/service/hub/service/impl/SysRoleServiceImpl.java create mode 100644 src/main/java/com/supervision/ai/service/hub/service/impl/SysUserRoleServiceImpl.java create mode 100644 src/main/java/com/supervision/ai/service/hub/service/impl/SysUserServiceImpl.java create mode 100644 src/main/resources/logback-spring.xml create mode 100644 src/main/resources/mapper/ComfyuiTaskMapper.xml create mode 100644 src/main/resources/mapper/ComfyuiTaskParamMapper.xml create mode 100644 src/main/resources/mapper/ComfyuiTaskResultMapper.xml create mode 100644 src/main/resources/mapper/SysAppMapper.xml create mode 100644 src/main/resources/mapper/SysFileMapper.xml create mode 100644 src/main/resources/mapper/SysRoleMapper.xml create mode 100644 src/main/resources/mapper/SysUserMapper.xml create mode 100644 src/main/resources/mapper/SysUserRoleMapper.xml diff --git a/.gitignore b/.gitignore index 549e00a..f2d67c3 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ build/ ### VS Code ### .vscode/ +/logs/ diff --git a/pom.xml b/pom.xml index 4aaf963..f70afde 100644 --- a/pom.xml +++ b/pom.xml @@ -46,6 +46,11 @@ 0.12.5 runtime + + com.alibaba + druid-spring-boot-3-starter + 1.2.21 + org.postgresql postgresql @@ -91,5 +96,15 @@ jackson-databind 2.15.3 + + io.minio + minio + 8.2.2 + + + + org.apache.httpcomponents.client5 + httpclient5 + diff --git a/src/main/java/com/supervision/ai/service/hub/config/MinioClientConfig.java b/src/main/java/com/supervision/ai/service/hub/config/MinioClientConfig.java new file mode 100644 index 0000000..dd4c7aa --- /dev/null +++ b/src/main/java/com/supervision/ai/service/hub/config/MinioClientConfig.java @@ -0,0 +1,75 @@ +package com.supervision.ai.service.hub.config; + +import io.minio.MinioClient; +import io.minio.SetBucketLifecycleArgs; +import io.minio.errors.*; +import io.minio.messages.*; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; + +import java.io.IOException; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.util.List; + +/** + * Endpoint 对象存储服务的URL + * Access Key Access key就像用户ID，可以唯一标识你的账户。 + * Secret Key Secret key是你账户的密码。 + * + * @author qmy + * @since 1.0.0 + */ +@Configuration +public class MinioClientConfig { + + @Value("${minio.endpoint}") + private String endpoint; + + @Value("${minio.accessKey}") + private String accessKey; + + @Value("${minio.secretKey}") + private String secretKey; + + @Value("${minio.bucketName}") + private String bucketName; + + @Bean + @Primary + public MinioClient minioClient() { + MinioClient client = MinioClient.builder() + .endpoint(endpoint) + .credentials(accessKey, secretKey) + .build(); + try { + client.setBucketLifecycle( + SetBucketLifecycleArgs + .builder() + .config(new LifecycleConfiguration( + List.of( + new LifecycleRule(Status.ENABLED, + null, + new Expiration((ResponseDate) null, 1, null), + new RuleFilter("temp-"), + "TempFileDeleteRule", + null, + null, + null) + ) + )) + .bucket(bucketName) + .build() + ); + } catch (ErrorResponseException | InsufficientDataException | InternalException | InvalidKeyException | + InvalidResponseException | IOException | NoSuchAlgorithmException | ServerException | + XmlParserException e) { + throw new RuntimeException(e); + } + return client; + } + +} + diff --git a/src/main/java/com/supervision/ai/service/hub/controller/SysUserController.java b/src/main/java/com/supervision/ai/service/hub/controller/SysUserController.java index 0a7a78f..113856a 100644 --- a/src/main/java/com/supervision/ai/service/hub/controller/SysUserController.java +++ b/src/main/java/com/supervision/ai/service/hub/controller/SysUserController.java @@ -2,6 +2,7 @@ package com.supervision.ai.service.hub.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.supervision.ai.service.hub.domain.SysApp; +import com.supervision.ai.service.hub.domain.SysUser; import com.supervision.ai.service.hub.service.impl.SysUserService; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; @@ -30,7 +31,7 @@ public class SysUserController { public ResponseEntity getCurrentUserDetails() { Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); String username = authentication.getName(); - SysApp user = sysUserService.getOne(new LambdaQueryWrapper().eq(SysApp::getAppName, username)); + SysUser user = sysUserService.getOne(new LambdaQueryWrapper().eq(SysUser::getUserName, username)); if (user == null) { return ResponseEntity.status(404).body("用户不存在"); } diff --git a/src/main/java/com/supervision/ai/service/hub/domain/AuditLog.java b/src/main/java/com/supervision/ai/service/hub/domain/AuditLog.java index 93624e1..000f306 100644 --- a/src/main/java/com/supervision/ai/service/hub/domain/AuditLog.java +++ b/src/main/java/com/supervision/ai/service/hub/domain/AuditLog.java @@ -15,7 +15,7 @@ import lombok.Data; @Data public class AuditLog implements Serializable { /** - * 主键id + * 主键 */ @TableId private String id; @@ -26,68 +26,72 @@ public class AuditLog implements Serializable { private String recordType; /** - * 应用名称 + * */ private String appName; /** - * 用户id + * */ private String userId; + /** + * + */ + private String appId; /** - * 操作人ip地址 + * */ private String ip; /** - * 请求类型 GET POST PUT DELETE + * */ private String method; /** - * url地址 + * */ private String url; /** - * 请求参数 + * */ private String requestParams; /** - * 操作耗时 单位ms + * */ private Integer costTime; /** - * 响应结果 + * */ private String response; /** - * 异常描述 + * */ private String exceptionDesc; /** - * 创建时间 + * */ - private LocalDateTime createTime; + private String createUserId; /** - * 创建人 + * */ - private String createUserId; + private LocalDateTime createTime; /** - * 更新时间 + * */ private LocalDateTime updateTime; /** - * 更新用户id + * */ private String updateUserId; diff --git a/src/main/java/com/supervision/ai/service/hub/domain/ComfyuiPrompt.java b/src/main/java/com/supervision/ai/service/hub/domain/ComfyuiPrompt.java index d3de8fb..78ebfbb 100644 --- a/src/main/java/com/supervision/ai/service/hub/domain/ComfyuiPrompt.java +++ b/src/main/java/com/supervision/ai/service/hub/domain/ComfyuiPrompt.java @@ -1,10 +1,8 @@ package com.supervision.ai.service.hub.domain; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; + import java.io.Serializable; import java.time.LocalDateTime; @@ -12,11 +10,11 @@ import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler; import lombok.Data; /** - * comfyui提示词表 + * * @TableName comfyui_prompt */ +@TableName(value ="comfyui_prompt") @Data -@TableName(value ="comfyui_prompt",autoResultMap = true) public class ComfyuiPrompt implements Serializable { /** * 主键 @@ -40,6 +38,11 @@ public class ComfyuiPrompt implements Serializable { @TableField(typeHandler = FastjsonTypeHandler.class) private JSONObject prompt; + /** + * 创建人id + */ + private String createUserId; + /** * 创建时间 */ @@ -52,7 +55,11 @@ public class ComfyuiPrompt implements Serializable { @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updateTime; + /** + * 更新人id + */ + private String updateUserId; + @TableField(exist = false) private static final long serialVersionUID = 1L; - } \ No newline at end of file diff --git a/src/main/java/com/supervision/ai/service/hub/domain/ComfyuiPromptParam.java b/src/main/java/com/supervision/ai/service/hub/domain/ComfyuiPromptParam.java index 13f5df6..bd0bd71 100644 --- a/src/main/java/com/supervision/ai/service/hub/domain/ComfyuiPromptParam.java +++ b/src/main/java/com/supervision/ai/service/hub/domain/ComfyuiPromptParam.java @@ -1,28 +1,26 @@ package com.supervision.ai.service.hub.domain; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; + import java.io.Serializable; import java.time.LocalDateTime; import lombok.Data; /** - * + * comfyui提示词参数表 * @TableName comfyui_prompt_param */ @TableName(value ="comfyui_prompt_param") @Data public class ComfyuiPromptParam implements Serializable { /** - * 主键 + * */ @TableId private String id; /** - * varchar(64) + * 提示词id */ private String promptId; @@ -31,16 +29,41 @@ public class ComfyuiPromptParam implements Serializable { */ private String paramKey; + /** + * 参数json路径，用户后端设置模板中的值 + */ + private String paramPath; + /** * 参数类型 0：整数 1：浮点型 2：字符串 3：布尔值 */ private Integer paramType; /** - * 是否必填 true：必填 false:非必填 + * 组件类型，用于前端展示 + */ + private String componentType; + + /** + * 标签，用于前端展示 + */ + private String label; + + /** + * 是否必填 */ private Boolean required; + /** + * 默认值，用于前端展示 + */ + private String defaultValue; + + /** + * 创建人id + */ + private String createUserId; + /** * 创建时间 */ @@ -53,7 +76,11 @@ public class ComfyuiPromptParam implements Serializable { @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updateTime; + /** + * 更新人id + */ + private String updateUserId; + @TableField(exist = false) private static final long serialVersionUID = 1L; - } \ No newline at end of file diff --git a/src/main/java/com/supervision/ai/service/hub/domain/ComfyuiTask.java b/src/main/java/com/supervision/ai/service/hub/domain/ComfyuiTask.java new file mode 100644 index 0000000..0f3305b --- /dev/null +++ b/src/main/java/com/supervision/ai/service/hub/domain/ComfyuiTask.java @@ -0,0 +1,82 @@ +package com.supervision.ai.service.hub.domain; + +import com.baomidou.mybatisplus.annotation.*; + +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; +import lombok.Data; + +/** + * comfyui任务表 + * @TableName comfyui_task + */ +@TableName(value ="comfyui_task") +@Data +public class ComfyuiTask implements Serializable { + /** + * 主键 + */ + @TableId + private String id; + + /** + * 提示词id + */ + private String promptId; + + /** + * 创建人id + */ + private String userId; + + /** + * 应用id + */ + private String appId; + + /** + * 运行状态 0未开始、1进行中、2成功、3失败 + */ + private String runStatus; + + /** + * 开始运行时间 + */ + private LocalDate runStartTime; + + /** + * 运行结束时间 + */ + private LocalDate runEndTime; + + /** + * webhook url + */ + private String webHook; + + /** + * 创建人id + */ + private String createUserId; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime updateTime; + + /** + * 更新人id + */ + private String updateUserId; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/src/main/java/com/supervision/ai/service/hub/domain/ComfyuiTaskParam.java b/src/main/java/com/supervision/ai/service/hub/domain/ComfyuiTaskParam.java new file mode 100644 index 0000000..d2c6ec7 --- /dev/null +++ b/src/main/java/com/supervision/ai/service/hub/domain/ComfyuiTaskParam.java @@ -0,0 +1,91 @@ +package com.supervision.ai.service.hub.domain; + +import com.baomidou.mybatisplus.annotation.*; + +import java.io.Serializable; +import java.time.LocalDateTime; +import lombok.Data; + +/** + * comfyui任务参数表 + * @TableName comfyui_task_param + */ +@TableName(value ="comfyui_task_param") +@Data +public class ComfyuiTaskParam implements Serializable { + /** + * 主键 + */ + @TableId + private String id; + + /** + * 提示词id + */ + private String promptId; + + /** + * 任务id + */ + private String taskId; + + /** + * 参数key + */ + private String paramKey; + + /** + * 参数路径 + */ + private String paramPath; + + /** + * 参数值 + */ + private String value; + + /** + * 标签 + */ + private String label; + + /** + * 是否必填 + */ + private Boolean required; + + /** + * 参数类型 + */ + private String paramType; + + /** + * 组件类型 + */ + private String componentType; + + /** + * 创建人id + */ + private String createUserId; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** + *更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime updateTime; + + /** + * 更新人id + */ + private String updateUserId; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/src/main/java/com/supervision/ai/service/hub/domain/ComfyuiTaskResult.java b/src/main/java/com/supervision/ai/service/hub/domain/ComfyuiTaskResult.java new file mode 100644 index 0000000..960d33d --- /dev/null +++ b/src/main/java/com/supervision/ai/service/hub/domain/ComfyuiTaskResult.java @@ -0,0 +1,56 @@ +package com.supervision.ai.service.hub.domain; + +import com.baomidou.mybatisplus.annotation.*; + +import java.io.Serializable; +import java.time.LocalDateTime; +import lombok.Data; + +/** + * + * @TableName comfyui_task_result + */ +@TableName(value ="comfyui_task_result") +@Data +public class ComfyuiTaskResult implements Serializable { + /** + * 主键id + */ + @TableId + private String id; + + /** + * 任务id + */ + private String taskId; + + /** + * 结果id + */ + private String resultFileId; + + /** + * 创建人id + */ + private String createUserId; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime updateTime; + + /** + * 更新人id + */ + private String updateUserId; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/src/main/java/com/supervision/ai/service/hub/domain/SysApp.java b/src/main/java/com/supervision/ai/service/hub/domain/SysApp.java index 55b61a5..d01ee72 100644 --- a/src/main/java/com/supervision/ai/service/hub/domain/SysApp.java +++ b/src/main/java/com/supervision/ai/service/hub/domain/SysApp.java @@ -1,22 +1,60 @@ package com.supervision.ai.service.hub.domain; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.IdType; -import com.fasterxml.jackson.annotation.JsonIgnore; +import com.baomidou.mybatisplus.annotation.*; + +import java.io.Serializable; +import java.time.LocalDateTime; import lombok.Data; +/** + * + * @TableName sys_app + */ +@TableName(value ="sys_app") @Data -@TableName("sys_app") -public class SysApp { +public class SysApp implements Serializable { + /** + * 主键 + */ + private String id; + + /** + * 应用名 + */ + private String appName; + + /** + * 密码 + */ + private String password; + + /** + * 状态 0:禁用 1:启用 + */ + private Integer status; + + /** + * 创建人id + */ + private String createUserId; - @TableId(type = IdType.AUTO) - private Long id; // 主键ID + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; - private String appName; // 应用名称 + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime updateTime; - @JsonIgnore - private String password; // 密码 (加密存储) + /** + * 更新人id + */ + private String updateUserId; - private String status; // 状态 (1表示正常，0表示禁用) -} + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/src/main/java/com/supervision/ai/service/hub/domain/SysFile.java b/src/main/java/com/supervision/ai/service/hub/domain/SysFile.java new file mode 100644 index 0000000..e8ab146 --- /dev/null +++ b/src/main/java/com/supervision/ai/service/hub/domain/SysFile.java @@ -0,0 +1,61 @@ +package com.supervision.ai.service.hub.domain; + +import com.baomidou.mybatisplus.annotation.*; + +import java.io.Serializable; +import java.time.LocalDateTime; +import lombok.Data; + +/** + * 系统文件表 + * @TableName sys_file + */ +@TableName(value ="sys_file") +@Data +public class SysFile implements Serializable { + /** + * 主键id + */ + @TableId + private String id; + + /** + * 文件名 + */ + private String fileName; + + /** + * 文件大小 + */ + private String fileSize; + + /** + * 文件类型 + */ + private String fileType; + + /** + * 创建人id + */ + private String createUserId; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime updateTime; + + /** + * 更新人id + */ + private String updateUserId; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/src/main/java/com/supervision/ai/service/hub/domain/SysRole.java b/src/main/java/com/supervision/ai/service/hub/domain/SysRole.java new file mode 100644 index 0000000..0ac93a0 --- /dev/null +++ b/src/main/java/com/supervision/ai/service/hub/domain/SysRole.java @@ -0,0 +1,60 @@ +package com.supervision.ai.service.hub.domain; + +import com.baomidou.mybatisplus.annotation.*; + +import java.io.Serializable; +import java.time.LocalDateTime; +import lombok.Data; + +/** + * + * @TableName sys_role + */ +@TableName(value ="sys_role") +@Data +public class SysRole implements Serializable { + /** + * + */ + private String id; + + /** + * + */ + private String roleName; + + /** + * + */ + private String roleDesc; + + /** + * + */ + private String roleCode; + + /** + * + */ + private String createUserId; + + /** + * + */ + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** + * + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime updateTime; + + /** + * + */ + private String updateUserId; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/src/main/java/com/supervision/ai/service/hub/domain/SysUser.java b/src/main/java/com/supervision/ai/service/hub/domain/SysUser.java new file mode 100644 index 0000000..0c82bcf --- /dev/null +++ b/src/main/java/com/supervision/ai/service/hub/domain/SysUser.java @@ -0,0 +1,66 @@ +package com.supervision.ai.service.hub.domain; + +import com.baomidou.mybatisplus.annotation.*; + +import java.io.Serializable; +import java.time.LocalDateTime; +import lombok.Data; + +/** + * + * @TableName sys_user + */ +@TableName(value ="sys_user") +@Data +public class SysUser implements Serializable { + /** + * 主键 + */ + @TableId + private String id; + + /** + * + */ + private String appId; + + /** + * 用户名 + */ + private String userName; + + /** + * 密码 + */ + private String password; + + /** + * 状态 0:禁用 1:启用 + */ + private String status; + + /** + * + */ + private String createUserId; + + /** + * + */ + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime updateTime; + + /** + * + */ + private String updateUserId; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/src/main/java/com/supervision/ai/service/hub/domain/SysUserRole.java b/src/main/java/com/supervision/ai/service/hub/domain/SysUserRole.java new file mode 100644 index 0000000..46d561a --- /dev/null +++ b/src/main/java/com/supervision/ai/service/hub/domain/SysUserRole.java @@ -0,0 +1,50 @@ +package com.supervision.ai.service.hub.domain; + +import com.baomidou.mybatisplus.annotation.*; + +import java.io.Serializable; +import java.time.LocalDateTime; +import lombok.Data; + +/** + * + * @TableName sys_user_role + */ +@TableName(value ="sys_user_role") +@Data +public class SysUserRole implements Serializable { + /** + * + */ + private String uid; + + /** + * + */ + private String rid; + + /** + * + */ + private String createUserId; + + /** + * + */ + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** + * + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime updateTime; + + /** + * + */ + private String updateUserId; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/src/main/java/com/supervision/ai/service/hub/filter/JwtAuthenticationFilter.java b/src/main/java/com/supervision/ai/service/hub/filter/JwtAuthenticationFilter.java index e2c6fa9..af77fcd 100644 --- a/src/main/java/com/supervision/ai/service/hub/filter/JwtAuthenticationFilter.java +++ b/src/main/java/com/supervision/ai/service/hub/filter/JwtAuthenticationFilter.java @@ -45,8 +45,8 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter { if (username != null && SecurityContextHolder.getContext().getAuthentication() == null) { // 根据用户名从数据库加载用户信息 UserDetails userDetails = sysUserService.loadUserByUsername(username); - // 验证Token的有效性（是否未过期，用户名是否匹配） - if (jwtUtils.validateToken(token, userDetails)) { + // 验证Token的有效性（是否未过期） + if (jwtUtils.isTokenExpired(token)) { // 将用户信息封装到Authentication对象中，标记为已认证 UsernamePasswordAuthenticationToken authToken = new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities()); diff --git a/src/main/java/com/supervision/ai/service/hub/mapper/AuditLogMapper.java b/src/main/java/com/supervision/ai/service/hub/mapper/AuditLogMapper.java index 97bdbdf..8124aa1 100644 --- a/src/main/java/com/supervision/ai/service/hub/mapper/AuditLogMapper.java +++ b/src/main/java/com/supervision/ai/service/hub/mapper/AuditLogMapper.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @author Administrator * @description 针对表【audit_log(日志审计表)】的数据库操作Mapper -* @createDate 2025-04-08 13:21:37 +* @createDate 2025-04-11 15:51:10 * @Entity com.supervision.ai.service.hub.domain.AuditLog */ public interface AuditLogMapper extends BaseMapper { diff --git a/src/main/java/com/supervision/ai/service/hub/mapper/ComfyuiPromptMapper.java b/src/main/java/com/supervision/ai/service/hub/mapper/ComfyuiPromptMapper.java index 4efe384..1b5d4f2 100644 --- a/src/main/java/com/supervision/ai/service/hub/mapper/ComfyuiPromptMapper.java +++ b/src/main/java/com/supervision/ai/service/hub/mapper/ComfyuiPromptMapper.java @@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @author Administrator -* @description 针对表【comfyui_prompt(comfyui提示词表)】的数据库操作Mapper -* @createDate 2025-03-31 17:49:56 +* @description 针对表【comfyui_prompt】的数据库操作Mapper +* @createDate 2025-04-11 15:51:10 * @Entity com.supervision.ai.service.hub.domain.ComfyuiPrompt */ public interface ComfyuiPromptMapper extends BaseMapper { diff --git a/src/main/java/com/supervision/ai/service/hub/mapper/ComfyuiPromptParamMapper.java b/src/main/java/com/supervision/ai/service/hub/mapper/ComfyuiPromptParamMapper.java index 9e81416..aa4f01a 100644 --- a/src/main/java/com/supervision/ai/service/hub/mapper/ComfyuiPromptParamMapper.java +++ b/src/main/java/com/supervision/ai/service/hub/mapper/ComfyuiPromptParamMapper.java @@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @author Administrator -* @description 针对表【comfyui_prompt_param】的数据库操作Mapper -* @createDate 2025-03-31 17:49:56 +* @description 针对表【comfyui_prompt_param(comfyui提示词参数表)】的数据库操作Mapper +* @createDate 2025-04-11 15:51:10 * @Entity com.supervision.ai.service.hub.domain.ComfyuiPromptParam */ public interface ComfyuiPromptParamMapper extends BaseMapper { diff --git a/src/main/java/com/supervision/ai/service/hub/mapper/ComfyuiTaskMapper.java b/src/main/java/com/supervision/ai/service/hub/mapper/ComfyuiTaskMapper.java new file mode 100644 index 0000000..baaace8 --- /dev/null +++ b/src/main/java/com/supervision/ai/service/hub/mapper/ComfyuiTaskMapper.java @@ -0,0 +1,18 @@ +package com.supervision.ai.service.hub.mapper; + +import com.supervision.ai.service.hub.domain.ComfyuiTask; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author Administrator +* @description 针对表【comfyui_task(comfyui任务表)】的数据库操作Mapper +* @createDate 2025-04-11 15:51:10 +* @Entity com.supervision.ai.service.hub.domain.ComfyuiTask +*/ +public interface ComfyuiTaskMapper extends BaseMapper { + +} + + + + diff --git a/src/main/java/com/supervision/ai/service/hub/mapper/ComfyuiTaskParamMapper.java b/src/main/java/com/supervision/ai/service/hub/mapper/ComfyuiTaskParamMapper.java new file mode 100644 index 0000000..e744ff3 --- /dev/null +++ b/src/main/java/com/supervision/ai/service/hub/mapper/ComfyuiTaskParamMapper.java @@ -0,0 +1,18 @@ +package com.supervision.ai.service.hub.mapper; + +import com.supervision.ai.service.hub.domain.ComfyuiTaskParam; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author Administrator +* @description 针对表【comfyui_task_param(comfyui任务参数表)】的数据库操作Mapper +* @createDate 2025-04-11 15:51:10 +* @Entity com.supervision.ai.service.hub.domain.ComfyuiTaskParam +*/ +public interface ComfyuiTaskParamMapper extends BaseMapper { + +} + + + + diff --git a/src/main/java/com/supervision/ai/service/hub/mapper/ComfyuiTaskResultMapper.java b/src/main/java/com/supervision/ai/service/hub/mapper/ComfyuiTaskResultMapper.java new file mode 100644 index 0000000..9b5706b --- /dev/null +++ b/src/main/java/com/supervision/ai/service/hub/mapper/ComfyuiTaskResultMapper.java @@ -0,0 +1,18 @@ +package com.supervision.ai.service.hub.mapper; + +import com.supervision.ai.service.hub.domain.ComfyuiTaskResult; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author Administrator +* @description 针对表【comfyui_task_result】的数据库操作Mapper +* @createDate 2025-04-11 15:51:10 +* @Entity com.supervision.ai.service.hub.domain.ComfyuiTaskResult +*/ +public interface ComfyuiTaskResultMapper extends BaseMapper { + +} + + + + diff --git a/src/main/java/com/supervision/ai/service/hub/mapper/SysAppMapper.java b/src/main/java/com/supervision/ai/service/hub/mapper/SysAppMapper.java new file mode 100644 index 0000000..4900503 --- /dev/null +++ b/src/main/java/com/supervision/ai/service/hub/mapper/SysAppMapper.java @@ -0,0 +1,18 @@ +package com.supervision.ai.service.hub.mapper; + +import com.supervision.ai.service.hub.domain.SysApp; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author Administrator +* @description 针对表【sys_app】的数据库操作Mapper +* @createDate 2025-04-11 15:51:10 +* @Entity com.supervision.ai.service.hub.domain.SysApp +*/ +public interface SysAppMapper extends BaseMapper { + +} + + + + diff --git a/src/main/java/com/supervision/ai/service/hub/mapper/SysFileMapper.java b/src/main/java/com/supervision/ai/service/hub/mapper/SysFileMapper.java new file mode 100644 index 0000000..70f5697 --- /dev/null +++ b/src/main/java/com/supervision/ai/service/hub/mapper/SysFileMapper.java @@ -0,0 +1,18 @@ +package com.supervision.ai.service.hub.mapper; + +import com.supervision.ai.service.hub.domain.SysFile; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author Administrator +* @description 针对表【sys_file(系统文件表)】的数据库操作Mapper +* @createDate 2025-04-11 15:51:10 +* @Entity com.supervision.ai.service.hub.domain.SysFile +*/ +public interface SysFileMapper extends BaseMapper { + +} + + + + diff --git a/src/main/java/com/supervision/ai/service/hub/mapper/SysRoleMapper.java b/src/main/java/com/supervision/ai/service/hub/mapper/SysRoleMapper.java new file mode 100644 index 0000000..8b59121 --- /dev/null +++ b/src/main/java/com/supervision/ai/service/hub/mapper/SysRoleMapper.java @@ -0,0 +1,18 @@ +package com.supervision.ai.service.hub.mapper; + +import com.supervision.ai.service.hub.domain.SysRole; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author Administrator +* @description 针对表【sys_role】的数据库操作Mapper +* @createDate 2025-04-11 15:51:10 +* @Entity com.supervision.ai.service.hub.domain.SysRole +*/ +public interface SysRoleMapper extends BaseMapper { + +} + + + + diff --git a/src/main/java/com/supervision/ai/service/hub/mapper/SysUserMapper.java b/src/main/java/com/supervision/ai/service/hub/mapper/SysUserMapper.java index 0b483f1..23438b7 100644 --- a/src/main/java/com/supervision/ai/service/hub/mapper/SysUserMapper.java +++ b/src/main/java/com/supervision/ai/service/hub/mapper/SysUserMapper.java @@ -1,10 +1,18 @@ package com.supervision.ai.service.hub.mapper; -import com.supervision.ai.service.hub.domain.SysApp; -import org.apache.ibatis.annotations.Mapper; +import com.supervision.ai.service.hub.domain.SysUser; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -@Mapper -public interface SysUserMapper extends BaseMapper { - // 继承BaseMapper后，CRUD方法可直接使用，无需额外定义 -} \ No newline at end of file +/** +* @author Administrator +* @description 针对表【sys_user】的数据库操作Mapper +* @createDate 2025-04-11 15:51:10 +* @Entity com.supervision.ai.service.hub.domain.SysUser +*/ +public interface SysUserMapper extends BaseMapper { + +} + + + + diff --git a/src/main/java/com/supervision/ai/service/hub/mapper/SysUserRoleMapper.java b/src/main/java/com/supervision/ai/service/hub/mapper/SysUserRoleMapper.java new file mode 100644 index 0000000..6db183d --- /dev/null +++ b/src/main/java/com/supervision/ai/service/hub/mapper/SysUserRoleMapper.java @@ -0,0 +1,18 @@ +package com.supervision.ai.service.hub.mapper; + +import com.supervision.ai.service.hub.domain.SysUserRole; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author Administrator +* @description 针对表【sys_user_role】的数据库操作Mapper +* @createDate 2025-04-11 15:51:10 +* @Entity com.supervision.ai.service.hub.domain.SysUserRole +*/ +public interface SysUserRoleMapper extends BaseMapper { + +} + + + + diff --git a/src/main/java/com/supervision/ai/service/hub/service/AuditLogService.java b/src/main/java/com/supervision/ai/service/hub/service/AuditLogService.java index 14429f9..3264236 100644 --- a/src/main/java/com/supervision/ai/service/hub/service/AuditLogService.java +++ b/src/main/java/com/supervision/ai/service/hub/service/AuditLogService.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @author Administrator * @description 针对表【audit_log(日志审计表)】的数据库操作Service -* @createDate 2025-04-08 13:21:37 +* @createDate 2025-04-11 15:51:10 */ public interface AuditLogService extends IService { diff --git a/src/main/java/com/supervision/ai/service/hub/service/ComfyUIPromptService.java b/src/main/java/com/supervision/ai/service/hub/service/ComfyUIPromptService.java index 384a657..4cc41c7 100644 --- a/src/main/java/com/supervision/ai/service/hub/service/ComfyUIPromptService.java +++ b/src/main/java/com/supervision/ai/service/hub/service/ComfyUIPromptService.java @@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @author Administrator -* @description 针对表【comfyui_prompt(comfyui提示词表)】的数据库操作Service -* @createDate 2025-03-31 17:49:56 +* @description 针对表【comfyui_prompt】的数据库操作Service +* @createDate 2025-04-11 15:51:10 */ public interface ComfyUIPromptService extends IService { diff --git a/src/main/java/com/supervision/ai/service/hub/service/ComfyuiTaskParamService.java b/src/main/java/com/supervision/ai/service/hub/service/ComfyuiTaskParamService.java new file mode 100644 index 0000000..33a5c7e --- /dev/null +++ b/src/main/java/com/supervision/ai/service/hub/service/ComfyuiTaskParamService.java @@ -0,0 +1,13 @@ +package com.supervision.ai.service.hub.service; + +import com.supervision.ai.service.hub.domain.ComfyuiTaskParam; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author Administrator +* @description 针对表【comfyui_task_param(comfyui任务参数表)】的数据库操作Service +* @createDate 2025-04-11 15:51:10 +*/ +public interface ComfyuiTaskParamService extends IService { + +} diff --git a/src/main/java/com/supervision/ai/service/hub/service/ComfyuiTaskResultService.java b/src/main/java/com/supervision/ai/service/hub/service/ComfyuiTaskResultService.java new file mode 100644 index 0000000..b8adb5d --- /dev/null +++ b/src/main/java/com/supervision/ai/service/hub/service/ComfyuiTaskResultService.java @@ -0,0 +1,13 @@ +package com.supervision.ai.service.hub.service; + +import com.supervision.ai.service.hub.domain.ComfyuiTaskResult; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author Administrator +* @description 针对表【comfyui_task_result】的数据库操作Service +* @createDate 2025-04-11 15:51:10 +*/ +public interface ComfyuiTaskResultService extends IService { + +} diff --git a/src/main/java/com/supervision/ai/service/hub/service/ComfyuiTaskService.java b/src/main/java/com/supervision/ai/service/hub/service/ComfyuiTaskService.java new file mode 100644 index 0000000..f8986ea --- /dev/null +++ b/src/main/java/com/supervision/ai/service/hub/service/ComfyuiTaskService.java @@ -0,0 +1,13 @@ +package com.supervision.ai.service.hub.service; + +import com.supervision.ai.service.hub.domain.ComfyuiTask; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author Administrator +* @description 针对表【comfyui_task(comfyui任务表)】的数据库操作Service +* @createDate 2025-04-11 15:51:10 +*/ +public interface ComfyuiTaskService extends IService { + +} diff --git a/src/main/java/com/supervision/ai/service/hub/service/SysAppService.java b/src/main/java/com/supervision/ai/service/hub/service/SysAppService.java new file mode 100644 index 0000000..2f68b85 --- /dev/null +++ b/src/main/java/com/supervision/ai/service/hub/service/SysAppService.java @@ -0,0 +1,13 @@ +package com.supervision.ai.service.hub.service; + +import com.supervision.ai.service.hub.domain.SysApp; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author Administrator +* @description 针对表【sys_app】的数据库操作Service +* @createDate 2025-04-11 15:51:10 +*/ +public interface SysAppService extends IService { + +} diff --git a/src/main/java/com/supervision/ai/service/hub/service/SysFileService.java b/src/main/java/com/supervision/ai/service/hub/service/SysFileService.java new file mode 100644 index 0000000..f0c5928 --- /dev/null +++ b/src/main/java/com/supervision/ai/service/hub/service/SysFileService.java @@ -0,0 +1,13 @@ +package com.supervision.ai.service.hub.service; + +import com.supervision.ai.service.hub.domain.SysFile; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author Administrator +* @description 针对表【sys_file(系统文件表)】的数据库操作Service +* @createDate 2025-04-11 15:51:10 +*/ +public interface SysFileService extends IService { + +} diff --git a/src/main/java/com/supervision/ai/service/hub/service/SysRoleService.java b/src/main/java/com/supervision/ai/service/hub/service/SysRoleService.java new file mode 100644 index 0000000..e5e20b5 --- /dev/null +++ b/src/main/java/com/supervision/ai/service/hub/service/SysRoleService.java @@ -0,0 +1,13 @@ +package com.supervision.ai.service.hub.service; + +import com.supervision.ai.service.hub.domain.SysRole; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author Administrator +* @description 针对表【sys_role】的数据库操作Service +* @createDate 2025-04-11 15:51:10 +*/ +public interface SysRoleService extends IService { + +} diff --git a/src/main/java/com/supervision/ai/service/hub/service/SysUserRoleService.java b/src/main/java/com/supervision/ai/service/hub/service/SysUserRoleService.java new file mode 100644 index 0000000..da957a1 --- /dev/null +++ b/src/main/java/com/supervision/ai/service/hub/service/SysUserRoleService.java @@ -0,0 +1,13 @@ +package com.supervision.ai.service.hub.service; + +import com.supervision.ai.service.hub.domain.SysUserRole; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author Administrator +* @description 针对表【sys_user_role】的数据库操作Service +* @createDate 2025-04-11 15:51:10 +*/ +public interface SysUserRoleService extends IService { + +} diff --git a/src/main/java/com/supervision/ai/service/hub/service/SysUserService.java b/src/main/java/com/supervision/ai/service/hub/service/SysUserService.java new file mode 100644 index 0000000..df870b3 --- /dev/null +++ b/src/main/java/com/supervision/ai/service/hub/service/SysUserService.java @@ -0,0 +1,13 @@ +package com.supervision.ai.service.hub.service; + +import com.supervision.ai.service.hub.domain.SysUser; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author Administrator +* @description 针对表【sys_user】的数据库操作Service +* @createDate 2025-04-11 15:51:10 +*/ +public interface SysUserService extends IService { + +} diff --git a/src/main/java/com/supervision/ai/service/hub/service/impl/AuditLogServiceImpl.java b/src/main/java/com/supervision/ai/service/hub/service/impl/AuditLogServiceImpl.java index 5c3f5f0..24c614b 100644 --- a/src/main/java/com/supervision/ai/service/hub/service/impl/AuditLogServiceImpl.java +++ b/src/main/java/com/supervision/ai/service/hub/service/impl/AuditLogServiceImpl.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Service; /** * @author Administrator * @description 针对表【audit_log(日志审计表)】的数据库操作Service实现 -* @createDate 2025-04-08 13:21:37 +* @createDate 2025-04-11 15:51:10 */ @Service public class AuditLogServiceImpl extends ServiceImpl diff --git a/src/main/java/com/supervision/ai/service/hub/service/impl/ComfyuiTaskParamServiceImpl.java b/src/main/java/com/supervision/ai/service/hub/service/impl/ComfyuiTaskParamServiceImpl.java new file mode 100644 index 0000000..11df76c --- /dev/null +++ b/src/main/java/com/supervision/ai/service/hub/service/impl/ComfyuiTaskParamServiceImpl.java @@ -0,0 +1,22 @@ +package com.supervision.ai.service.hub.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.supervision.ai.service.hub.domain.ComfyuiTaskParam; +import com.supervision.ai.service.hub.service.ComfyuiTaskParamService; +import com.supervision.ai.service.hub.mapper.ComfyuiTaskParamMapper; +import org.springframework.stereotype.Service; + +/** +* @author Administrator +* @description 针对表【comfyui_task_param(comfyui任务参数表)】的数据库操作Service实现 +* @createDate 2025-04-11 15:51:10 +*/ +@Service +public class ComfyuiTaskParamServiceImpl extends ServiceImpl + implements ComfyuiTaskParamService{ + +} + + + + diff --git a/src/main/java/com/supervision/ai/service/hub/service/impl/ComfyuiTaskResultServiceImpl.java b/src/main/java/com/supervision/ai/service/hub/service/impl/ComfyuiTaskResultServiceImpl.java new file mode 100644 index 0000000..d90edb2 --- /dev/null +++ b/src/main/java/com/supervision/ai/service/hub/service/impl/ComfyuiTaskResultServiceImpl.java @@ -0,0 +1,22 @@ +package com.supervision.ai.service.hub.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.supervision.ai.service.hub.domain.ComfyuiTaskResult; +import com.supervision.ai.service.hub.service.ComfyuiTaskResultService; +import com.supervision.ai.service.hub.mapper.ComfyuiTaskResultMapper; +import org.springframework.stereotype.Service; + +/** +* @author Administrator +* @description 针对表【comfyui_task_result】的数据库操作Service实现 +* @createDate 2025-04-11 15:51:10 +*/ +@Service +public class ComfyuiTaskResultServiceImpl extends ServiceImpl + implements ComfyuiTaskResultService{ + +} + + + + diff --git a/src/main/java/com/supervision/ai/service/hub/service/impl/ComfyuiTaskServiceImpl.java b/src/main/java/com/supervision/ai/service/hub/service/impl/ComfyuiTaskServiceImpl.java new file mode 100644 index 0000000..8c5c17a --- /dev/null +++ b/src/main/java/com/supervision/ai/service/hub/service/impl/ComfyuiTaskServiceImpl.java @@ -0,0 +1,22 @@ +package com.supervision.ai.service.hub.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.supervision.ai.service.hub.domain.ComfyuiTask; +import com.supervision.ai.service.hub.service.ComfyuiTaskService; +import com.supervision.ai.service.hub.mapper.ComfyuiTaskMapper; +import org.springframework.stereotype.Service; + +/** +* @author Administrator +* @description 针对表【comfyui_task(comfyui任务表)】的数据库操作Service实现 +* @createDate 2025-04-11 15:51:10 +*/ +@Service +public class ComfyuiTaskServiceImpl extends ServiceImpl + implements ComfyuiTaskService{ + +} + + + + diff --git a/src/main/java/com/supervision/ai/service/hub/service/impl/SysAppServiceImpl.java b/src/main/java/com/supervision/ai/service/hub/service/impl/SysAppServiceImpl.java new file mode 100644 index 0000000..da03148 --- /dev/null +++ b/src/main/java/com/supervision/ai/service/hub/service/impl/SysAppServiceImpl.java @@ -0,0 +1,22 @@ +package com.supervision.ai.service.hub.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.supervision.ai.service.hub.domain.SysApp; +import com.supervision.ai.service.hub.service.SysAppService; +import com.supervision.ai.service.hub.mapper.SysAppMapper; +import org.springframework.stereotype.Service; + +/** +* @author Administrator +* @description 针对表【sys_app】的数据库操作Service实现 +* @createDate 2025-04-11 15:51:10 +*/ +@Service +public class SysAppServiceImpl extends ServiceImpl + implements SysAppService{ + +} + + + + diff --git a/src/main/java/com/supervision/ai/service/hub/service/impl/SysFileServiceImpl.java b/src/main/java/com/supervision/ai/service/hub/service/impl/SysFileServiceImpl.java new file mode 100644 index 0000000..decf5c3 --- /dev/null +++ b/src/main/java/com/supervision/ai/service/hub/service/impl/SysFileServiceImpl.java @@ -0,0 +1,22 @@ +package com.supervision.ai.service.hub.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.supervision.ai.service.hub.domain.SysFile; +import com.supervision.ai.service.hub.service.SysFileService; +import com.supervision.ai.service.hub.mapper.SysFileMapper; +import org.springframework.stereotype.Service; + +/** +* @author Administrator +* @description 针对表【sys_file(系统文件表)】的数据库操作Service实现 +* @createDate 2025-04-11 15:51:10 +*/ +@Service +public class SysFileServiceImpl extends ServiceImpl + implements SysFileService{ + +} + + + + diff --git a/src/main/java/com/supervision/ai/service/hub/service/impl/SysRoleServiceImpl.java b/src/main/java/com/supervision/ai/service/hub/service/impl/SysRoleServiceImpl.java new file mode 100644 index 0000000..4548afc --- /dev/null +++ b/src/main/java/com/supervision/ai/service/hub/service/impl/SysRoleServiceImpl.java @@ -0,0 +1,22 @@ +package com.supervision.ai.service.hub.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.supervision.ai.service.hub.domain.SysRole; +import com.supervision.ai.service.hub.service.SysRoleService; +import com.supervision.ai.service.hub.mapper.SysRoleMapper; +import org.springframework.stereotype.Service; + +/** +* @author Administrator +* @description 针对表【sys_role】的数据库操作Service实现 +* @createDate 2025-04-11 15:51:10 +*/ +@Service +public class SysRoleServiceImpl extends ServiceImpl + implements SysRoleService{ + +} + + + + diff --git a/src/main/java/com/supervision/ai/service/hub/service/impl/SysUserRoleServiceImpl.java b/src/main/java/com/supervision/ai/service/hub/service/impl/SysUserRoleServiceImpl.java new file mode 100644 index 0000000..1705315 --- /dev/null +++ b/src/main/java/com/supervision/ai/service/hub/service/impl/SysUserRoleServiceImpl.java @@ -0,0 +1,22 @@ +package com.supervision.ai.service.hub.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.supervision.ai.service.hub.domain.SysUserRole; +import com.supervision.ai.service.hub.service.SysUserRoleService; +import com.supervision.ai.service.hub.mapper.SysUserRoleMapper; +import org.springframework.stereotype.Service; + +/** +* @author Administrator +* @description 针对表【sys_user_role】的数据库操作Service实现 +* @createDate 2025-04-11 15:51:10 +*/ +@Service +public class SysUserRoleServiceImpl extends ServiceImpl + implements SysUserRoleService{ + +} + + + + diff --git a/src/main/java/com/supervision/ai/service/hub/service/impl/SysUserService.java b/src/main/java/com/supervision/ai/service/hub/service/impl/SysUserService.java index 4800030..8b995ec 100644 --- a/src/main/java/com/supervision/ai/service/hub/service/impl/SysUserService.java +++ b/src/main/java/com/supervision/ai/service/hub/service/impl/SysUserService.java @@ -3,6 +3,7 @@ package com.supervision.ai.service.hub.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.supervision.ai.service.hub.domain.SysApp; +import com.supervision.ai.service.hub.domain.SysUser; import com.supervision.ai.service.hub.mapper.SysUserMapper; import org.springframework.security.authentication.DisabledException; import org.springframework.security.core.GrantedAuthority; @@ -18,7 +19,7 @@ import java.util.List; import static com.supervision.ai.service.hub.constant.UserConstant.USER_STATUS_DISABLED; @Service -public class SysUserService extends ServiceImpl implements UserDetailsService { +public class SysUserService extends ServiceImpl implements UserDetailsService { /** * 根据用户名加载用户信息 @@ -30,7 +31,7 @@ public class SysUserService extends ServiceImpl implement */ @Override public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { - SysApp user = this.getOne(new LambdaQueryWrapper().eq(SysApp::getAppName, username)); + SysUser user = this.getOne(new LambdaQueryWrapper().eq(SysUser::getUserName, username)); if (user == null) { throw new UsernameNotFoundException("用户不存在: " + username); } @@ -41,7 +42,7 @@ public class SysUserService extends ServiceImpl implement // **扩展点**：如需加载用户角色权限，可在此处查询 sys_user_role 表关联的角色，并将角色加入 authorities 列表 List authorities = Collections.emptyList(); // 使用Spring Security提供的User对象作为UserDetails返回 - return new User(user.getAppName(), user.getPassword(), authorities); + return new User(user.getUserName(), user.getPassword(), authorities); } } diff --git a/src/main/java/com/supervision/ai/service/hub/service/impl/SysUserServiceImpl.java b/src/main/java/com/supervision/ai/service/hub/service/impl/SysUserServiceImpl.java new file mode 100644 index 0000000..6369535 --- /dev/null +++ b/src/main/java/com/supervision/ai/service/hub/service/impl/SysUserServiceImpl.java @@ -0,0 +1,22 @@ +package com.supervision.ai.service.hub.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.supervision.ai.service.hub.domain.SysUser; +import com.supervision.ai.service.hub.service.SysUserService; +import com.supervision.ai.service.hub.mapper.SysUserMapper; +import org.springframework.stereotype.Service; + +/** +* @author Administrator +* @description 针对表【sys_user】的数据库操作Service实现 +* @createDate 2025-04-11 15:51:10 +*/ +@Service +public class SysUserServiceImpl extends ServiceImpl + implements SysUserService{ + +} + + + + diff --git a/src/main/java/com/supervision/ai/service/hub/util/JwtUtils.java b/src/main/java/com/supervision/ai/service/hub/util/JwtUtils.java index d0814af..23d50ea 100644 --- a/src/main/java/com/supervision/ai/service/hub/util/JwtUtils.java +++ b/src/main/java/com/supervision/ai/service/hub/util/JwtUtils.java @@ -49,19 +49,8 @@ public class JwtUtils { return jws.getPayload().getSubject(); } - - // 校验Token是否有效 - public boolean validateToken(String token, UserDetails userDetails) { - try { - String username = getUsernameFromToken(token); - return username.equals(userDetails.getUsername()) && !isTokenExpired(token); - } catch (Exception e) { - return false; - } - } - // 判断是否过期 - private boolean isTokenExpired(String token) { + public boolean isTokenExpired(String token) { Jws jws = Jwts.parser() .verifyWith(secretKey) .build() diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index ed32ff9..ee61af7 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -2,10 +2,11 @@ spring: application: name: ai-service-hub datasource: - url: jdbc:postgresql://192.168.10.137:54321/ai-service-hub - username: postgres - password: 123456 - driver-class-name: org.postgresql.Driver + druid: + url: jdbc:postgresql://192.168.10.137:54321/ai-service-hub + username: postgres + password: 123456 + driver-class-name: org.postgresql.Driver servlet: multipart: max-file-size: 10MB @@ -35,3 +36,8 @@ comfyUI: server: ip: 192.168.10.113 port: 8188 +minio: + endpoint: http:192.168.10.137:9002 + accessKey: admin + secretKey: 12345678 + bucketName: nxfuhsi \ No newline at end of file diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml new file mode 100644 index 0000000..08b6667 --- /dev/null +++ b/src/main/resources/logback-spring.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %highlight(%-5level) %cyan(%logger{36}) - %msg%n + UTF-8 + + + + + + ${LOG_FILE} + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + UTF-8 + + + ${LOG_PATH}/application/application.%d{yyyy-MM-dd}.log + 30 + 100MB + + + + + + ${LOG_PATH}/error/error.log + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + UTF-8 + + + ${LOG_PATH}/error/error.%d{yyyy-MM-dd}.log + 30 + 100MB + + + ERROR + + + + + + + ${LOG_PATH}/AOP_LOG/AOP_LOG.log + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + UTF-8 + + + ${LOG_PATH}/AOP_LOG/AOP_LOG.%d{yyyy-MM-dd}.log + 30 + 100MB + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mapper/AuditLogMapper.xml b/src/main/resources/mapper/AuditLogMapper.xml index 65dc6d6..c7f55be 100644 --- a/src/main/resources/mapper/AuditLogMapper.xml +++ b/src/main/resources/mapper/AuditLogMapper.xml @@ -9,6 +9,7 @@ + @@ -16,18 +17,18 @@ - + id,record_type,app_name, - user_id,ip, + user_id,app_id,ip, method,url,request_params, cost_time,response,exception_desc, - create_time,create_user_id,update_time, + create_user_id,create_time,update_time, update_user_id diff --git a/src/main/resources/mapper/ComfyuiPromptMapper.xml b/src/main/resources/mapper/ComfyuiPromptMapper.xml index 2a44ee4..1e1bb5a 100644 --- a/src/main/resources/mapper/ComfyuiPromptMapper.xml +++ b/src/main/resources/mapper/ComfyuiPromptMapper.xml @@ -9,12 +9,15 @@ + + id,prompt_name,prompt_type, - prompt,create_time,update_time + prompt,create_user_id,create_time, + update_time,update_user_id diff --git a/src/main/resources/mapper/ComfyuiPromptParamMapper.xml b/src/main/resources/mapper/ComfyuiPromptParamMapper.xml index 0a54a5c..682b5ce 100644 --- a/src/main/resources/mapper/ComfyuiPromptParamMapper.xml +++ b/src/main/resources/mapper/ComfyuiPromptParamMapper.xml @@ -8,15 +8,23 @@ + + + + + + id,prompt_id,param_key, - param_type,required,create_time, - update_time + param_path,param_type,component_type, + label,required,default_value, + create_user_id,create_time,update_time, + update_user_id diff --git a/src/main/resources/mapper/ComfyuiTaskMapper.xml b/src/main/resources/mapper/ComfyuiTaskMapper.xml new file mode 100644 index 0000000..b519ec3 --- /dev/null +++ b/src/main/resources/mapper/ComfyuiTaskMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + id,prompt_id,user_id, + app_id,run_status,run_start_time, + run_end_time,web_hook,create_user_id, + create_time,update_time,update_user_id + + diff --git a/src/main/resources/mapper/ComfyuiTaskParamMapper.xml b/src/main/resources/mapper/ComfyuiTaskParamMapper.xml new file mode 100644 index 0000000..9cd5a86 --- /dev/null +++ b/src/main/resources/mapper/ComfyuiTaskParamMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + id,prompt_id,task_id, + param_key,param_path,value, + label,required,param_type, + component_type,create_user_id,create_time, + update_time,update_user_id + + diff --git a/src/main/resources/mapper/ComfyuiTaskResultMapper.xml b/src/main/resources/mapper/ComfyuiTaskResultMapper.xml new file mode 100644 index 0000000..005be2a --- /dev/null +++ b/src/main/resources/mapper/ComfyuiTaskResultMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + id,task_id,result_file_id, + create_user_id,create_time,update_time, + update_user_id + + diff --git a/src/main/resources/mapper/SysAppMapper.xml b/src/main/resources/mapper/SysAppMapper.xml new file mode 100644 index 0000000..0083d24 --- /dev/null +++ b/src/main/resources/mapper/SysAppMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + id,app_name,password, + status,create_user_id,create_time, + update_time,update_user_id + + diff --git a/src/main/resources/mapper/SysFileMapper.xml b/src/main/resources/mapper/SysFileMapper.xml new file mode 100644 index 0000000..51ac200 --- /dev/null +++ b/src/main/resources/mapper/SysFileMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + id,file_name,file_size, + file_type,create_user_id,create_time, + update_time,update_user_id + + diff --git a/src/main/resources/mapper/SysRoleMapper.xml b/src/main/resources/mapper/SysRoleMapper.xml new file mode 100644 index 0000000..0999e18 --- /dev/null +++ b/src/main/resources/mapper/SysRoleMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + id,role_name,role_desc, + role_code,create_user_id,create_time, + update_time,update_user_id + + diff --git a/src/main/resources/mapper/SysUserMapper.xml b/src/main/resources/mapper/SysUserMapper.xml new file mode 100644 index 0000000..2874fde --- /dev/null +++ b/src/main/resources/mapper/SysUserMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + id,app_id,user_name, + password,status,create_user_id, + create_time,update_time,update_user_id + + diff --git a/src/main/resources/mapper/SysUserRoleMapper.xml b/src/main/resources/mapper/SysUserRoleMapper.xml new file mode 100644 index 0000000..37a522f --- /dev/null +++ b/src/main/resources/mapper/SysUserRoleMapper.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + uid,rid,create_user_id, + create_time,update_time,update_user_id + + diff --git a/src/test/java/com/supervision/ai/service/hub/AiServiceHubApplicationTests.java b/src/test/java/com/supervision/ai/service/hub/AiServiceHubApplicationTests.java index eb05f7f..0b45057 100644 --- a/src/test/java/com/supervision/ai/service/hub/AiServiceHubApplicationTests.java +++ b/src/test/java/com/supervision/ai/service/hub/AiServiceHubApplicationTests.java @@ -1,13 +1,28 @@ package com.supervision.ai.service.hub; +import io.minio.MinioClient; +import io.minio.errors.*; +import io.minio.messages.Bucket; +import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import java.io.IOException; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.util.List; + +@Slf4j @SpringBootTest class AiServiceHubApplicationTests { + @Autowired + private MinioClient minioClient; @Test - void contextLoads() { + void minioTest() throws ServerException, InsufficientDataException, ErrorResponseException, IOException, NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException, XmlParserException, InternalException { + List buckets = minioClient.listBuckets(); + log.info("buckets size :{}", buckets.size()); } }