From e72d36e0496c7361a0f8f1992680a789fe726de3 Mon Sep 17 00:00:00 2001 From: vertoryao Date: Thu, 12 Jun 2025 17:18:49 +0800 Subject: [PATCH] =?UTF-8?q?refactor(dify):=20=E5=8D=87=E7=BA=A7=20dify-spr?= =?UTF-8?q?ing-boot-starter=E7=89=88=E6=9C=AC=E5=B9=B6=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 dify-spring-boot-starter 版本从 0.11.0 升级到 1.0.3 --- pom.xml | 2 +- .../zsc/edu/dify/framework/json/JsonConfig.java | 2 ++ .../dify/controller/V1ServerController.java | 16 ++++++++-------- .../edu/dify/modules/dify/entity/AppEntity.java | 4 ++-- .../modules/dify/mapper/AppEntityMapper.java | 4 ++-- .../dify/service/Impl/AppEntityServiceImpl.java | 14 +++++++------- .../dify/modules/system/entity/BaseEntity.java | 4 ++++ 7 files changed, 26 insertions(+), 20 deletions(-) diff --git a/pom.xml b/pom.xml index 707d6a6..9a0498c 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ io.github.guoshiqiufeng.dify dify-spring-boot-starter - 0.11.0 + 1.0.3 diff --git a/src/main/java/com/zsc/edu/dify/framework/json/JsonConfig.java b/src/main/java/com/zsc/edu/dify/framework/json/JsonConfig.java index f912a19..a27a341 100644 --- a/src/main/java/com/zsc/edu/dify/framework/json/JsonConfig.java +++ b/src/main/java/com/zsc/edu/dify/framework/json/JsonConfig.java @@ -1,6 +1,7 @@ package com.zsc.edu.dify.framework.json; import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; import org.springframework.context.annotation.Bean; @@ -15,6 +16,7 @@ public class JsonConfig { @Bean public Jackson2ObjectMapperBuilderCustomizer customizer() { return builder -> builder + .modules(new JavaTimeModule()) .serializationInclusion(JsonInclude.Include.NON_NULL) .serializationInclusion(JsonInclude.Include.NON_EMPTY); } diff --git a/src/main/java/com/zsc/edu/dify/modules/dify/controller/V1ServerController.java b/src/main/java/com/zsc/edu/dify/modules/dify/controller/V1ServerController.java index bf144c4..58a5088 100644 --- a/src/main/java/com/zsc/edu/dify/modules/dify/controller/V1ServerController.java +++ b/src/main/java/com/zsc/edu/dify/modules/dify/controller/V1ServerController.java @@ -9,9 +9,9 @@ import com.zsc.edu.dify.modules.dify.service.AppEntityService; import com.zsc.edu.dify.modules.dify.service.WorkflowDeptService; import com.zsc.edu.dify.modules.operationLog.entity.OperationLogAnnotation; import io.github.guoshiqiufeng.dify.server.DifyServer; -import io.github.guoshiqiufeng.dify.server.dto.response.ApiKeyResponseVO; -import io.github.guoshiqiufeng.dify.server.dto.response.AppsResponseVO; -import io.github.guoshiqiufeng.dify.server.dto.response.DatasetApiKeyResponseVO; +import io.github.guoshiqiufeng.dify.server.dto.response.ApiKeyResponse; +import io.github.guoshiqiufeng.dify.server.dto.response.AppsResponse; +import io.github.guoshiqiufeng.dify.server.dto.response.DatasetApiKeyResponse; import jakarta.annotation.Resource; import lombok.AllArgsConstructor; import org.springframework.http.HttpStatus; @@ -50,7 +50,7 @@ public class V1ServerController { * @return */ @GetMapping("/{id}") - public AppsResponseVO getApp(@PathVariable("id") String id) { + public AppsResponse getApp(@PathVariable("id") String id) { return difyServer.app(id); } @@ -60,7 +60,7 @@ public class V1ServerController { * @return */ @GetMapping("/api-key/{id}") - public List getAppApiKey(@PathVariable("id") String id) { + public List getAppApiKey(@PathVariable("id") String id) { return difyServer.getAppApiKey(id); } @@ -70,7 +70,7 @@ public class V1ServerController { * @return */ @PostMapping("/api-key/init/{id}") - public List initAppApiKey(@PathVariable("id") String id) { + public List initAppApiKey(@PathVariable("id") String id) { return difyServer.initAppApiKey(id); } @@ -79,7 +79,7 @@ public class V1ServerController { * @return */ @GetMapping("/api-key/dataset") - public List getDatasetApiKey() { + public List getDatasetApiKey() { return difyServer.getDatasetApiKey(); } @@ -88,7 +88,7 @@ public class V1ServerController { * @return */ @PostMapping("/api-key/dataset/init") - public List initDatasetApiKey() { + public List initDatasetApiKey() { return difyServer.initDatasetApiKey(); } diff --git a/src/main/java/com/zsc/edu/dify/modules/dify/entity/AppEntity.java b/src/main/java/com/zsc/edu/dify/modules/dify/entity/AppEntity.java index 1229426..268bda3 100644 --- a/src/main/java/com/zsc/edu/dify/modules/dify/entity/AppEntity.java +++ b/src/main/java/com/zsc/edu/dify/modules/dify/entity/AppEntity.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.IEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.zsc.edu.dify.framework.json.JsonbTypeHandler; -import io.github.guoshiqiufeng.dify.server.dto.response.AppsResponseVO; +import io.github.guoshiqiufeng.dify.server.dto.response.AppsResponse; import lombok.*; import java.util.List; @@ -20,7 +20,7 @@ import java.util.Map; @Getter @Setter @TableName("apps_entity") -public class AppEntity extends AppsResponseVO { +public class AppEntity extends AppsResponse { @TableField(typeHandler = JsonbTypeHandler.class) private Map modelConfig; diff --git a/src/main/java/com/zsc/edu/dify/modules/dify/mapper/AppEntityMapper.java b/src/main/java/com/zsc/edu/dify/modules/dify/mapper/AppEntityMapper.java index 5ee8024..bc98a05 100644 --- a/src/main/java/com/zsc/edu/dify/modules/dify/mapper/AppEntityMapper.java +++ b/src/main/java/com/zsc/edu/dify/modules/dify/mapper/AppEntityMapper.java @@ -2,10 +2,10 @@ package com.zsc.edu.dify.modules.dify.mapper; import com.zsc.edu.dify.common.mapstruct.BaseMapper; import com.zsc.edu.dify.modules.dify.entity.AppEntity; -import io.github.guoshiqiufeng.dify.server.dto.response.AppsResponseVO; +import io.github.guoshiqiufeng.dify.server.dto.response.AppsResponse; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; @Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface AppEntityMapper extends BaseMapper { +public interface AppEntityMapper extends BaseMapper { } diff --git a/src/main/java/com/zsc/edu/dify/modules/dify/service/Impl/AppEntityServiceImpl.java b/src/main/java/com/zsc/edu/dify/modules/dify/service/Impl/AppEntityServiceImpl.java index de99b4c..431f69d 100644 --- a/src/main/java/com/zsc/edu/dify/modules/dify/service/Impl/AppEntityServiceImpl.java +++ b/src/main/java/com/zsc/edu/dify/modules/dify/service/Impl/AppEntityServiceImpl.java @@ -11,8 +11,8 @@ import com.zsc.edu.dify.modules.dify.repo.AppEntityRepository; import com.zsc.edu.dify.modules.dify.repo.WorkflowDeptRepository; import com.zsc.edu.dify.modules.dify.service.AppEntityService; import io.github.guoshiqiufeng.dify.server.DifyServer; -import io.github.guoshiqiufeng.dify.server.dto.response.ApiKeyResponseVO; -import io.github.guoshiqiufeng.dify.server.dto.response.AppsResponseVO; +import io.github.guoshiqiufeng.dify.server.dto.response.ApiKeyResponse; +import io.github.guoshiqiufeng.dify.server.dto.response.AppsResponse; import jakarta.annotation.Resource; import lombok.AllArgsConstructor; import org.springframework.cache.annotation.Cacheable; @@ -51,19 +51,19 @@ public class AppEntityServiceImpl extends ServiceImpl addApps(List appsResponseList) { - for(AppsResponseVO appsResponse : appsResponseList){ + public List addApps(List appsResponseList) { + for(AppsResponse appsResponse : appsResponseList){ boolean isHave = baseMapper.exists(new QueryWrapper().eq("id", appsResponse.getId())); if(!isHave){ AppEntity appEntity = appEntityMapper.toEntity(appsResponse); baseMapper.insert(appEntity); - List apiKeyList =difyServer.getAppApiKey(appsResponse.getId()); + List apiKeyList =difyServer.getAppApiKey(appsResponse.getId()); if (apiKeyList != null) { difyServer.initAppApiKey(appsResponse.getId()); - Optional apiKeyResponseVO = apiKeyList.stream() + Optional ApiKeyResponse = apiKeyList.stream() .filter(apiKey -> apiKey.getToken() != null) .findFirst(); - apiKeyResponseVO.ifPresent(apiKey -> appEntity.setApiKey(apiKey.getToken())); + ApiKeyResponse.ifPresent(apiKey -> appEntity.setApiKey(apiKey.getToken())); } baseMapper.updateById(appEntity); }else{ diff --git a/src/main/java/com/zsc/edu/dify/modules/system/entity/BaseEntity.java b/src/main/java/com/zsc/edu/dify/modules/system/entity/BaseEntity.java index e14da6e..58d80d1 100644 --- a/src/main/java/com/zsc/edu/dify/modules/system/entity/BaseEntity.java +++ b/src/main/java/com/zsc/edu/dify/modules/system/entity/BaseEntity.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Getter; import lombok.Setter; @@ -38,6 +40,7 @@ public class BaseEntity implements Serializable { * 创建时间 */ @TableField(value = "create_time", fill = FieldFill.INSERT) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") public LocalDateTime createTime; /* * 创建人 @@ -49,6 +52,7 @@ public class BaseEntity implements Serializable { * 更新时间 */ @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") public LocalDateTime updateTime; /* * 更新人