Merge remote-tracking branch 'origin/main' into main

18586361686

2025-05-12 11eb05162044a0828384024e4835d0863d62d2c7

Merge remote-tracking branch 'origin/main' into main

 aiflowy-modules/aiflowy-module-ai/src/main/java/tech/aiflowy/ai/controller/AiWorkflowController.java

@@ -1,20 +1,22 @@
package tech.aiflowy.ai.controller;

import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.core.io.IoUtil;
import com.agentsflex.core.chain.*;
import dev.tinyflow.core.Tinyflow;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import tech.aiflowy.ai.entity.AiWorkflow;
import tech.aiflowy.ai.service.AiKnowledgeService;
import tech.aiflowy.ai.service.AiLlmService;
import tech.aiflowy.ai.service.AiWorkflowService;
import tech.aiflowy.ai.utils.TinyFlowConfigService;
import tech.aiflowy.common.domain.Result;
import tech.aiflowy.common.web.controller.BaseCurdController;
import tech.aiflowy.common.web.jsonbody.JsonBody;
import com.agentsflex.core.chain.*;
import org.springframework.web.bind.annotation.*;
import tech.aiflowy.system.service.SysApiKeyService;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.io.InputStream;
import java.math.BigInteger;
import java.nio.charset.StandardCharsets;
@@ -33,9 +35,7 @@
    private final AiLlmService aiLlmService;

    @Resource
    private AiKnowledgeService aiKnowledgeService;
    @Resource
    private TinyFlowConfigService tinyFlowConfigService;
    private SysApiKeyService apiKeyService;

    public AiWorkflowController(AiWorkflowService service, AiLlmService aiLlmService) {
        super(service);
@@ -70,8 +70,8 @@
        }
        List<Parameter> chainParameters = chain.getParameters();
        return Result.success("parameters", chainParameters)
                .set("title",  workflow.getTitle())
                .set("description",  workflow.getDescription())
                .set("title", workflow.getTitle())
                .set("description", workflow.getDescription())
                .set("icon", workflow.getIcon());
    }

@@ -103,4 +103,25 @@

        return Result.success("result", result).set("message", chain.getMessage());
    }

    @SaIgnore
    @GetMapping(value = "/external/getRunningParams", produces = MediaType.APPLICATION_JSON_VALUE)
    @ResponseBody
    public Result externalGetRunningParameters(HttpServletRequest request,
                                               @RequestParam BigInteger id) {
        String apiKey = request.getHeader("Authorization");
        apiKeyService.checkApiKey(apiKey);
        return getRunningParameters(id);
    }

    @SaIgnore
    @PostMapping(value = "/external/run", produces = MediaType.APPLICATION_JSON_VALUE)
    @ResponseBody
    public Result externalRun(HttpServletRequest request,
                              @JsonBody(value = "id", required = true) BigInteger id,
                              @JsonBody("variables") Map<String, Object> variables) {
        String apiKey = request.getHeader("Authorization");
        apiKeyService.checkApiKey(apiKey);
        return tryRunning(id, variables);
    }
}

 aiflowy-modules/aiflowy-module-system/src/main/java/tech/aiflowy/system/service/SysApiKeyService.java

@@ -11,4 +11,5 @@
 */
public interface SysApiKeyService extends IService<SysApiKey> {

    void checkApiKey(String apiKey);
}

 aiflowy-modules/aiflowy-module-system/src/main/java/tech/aiflowy/system/service/impl/SysApiKeyServiceImpl.java

@@ -1,10 +1,15 @@
package tech.aiflowy.system.service.impl;

import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.spring.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import tech.aiflowy.common.domain.Result;
import tech.aiflowy.common.web.exceptions.BusinessException;
import tech.aiflowy.system.entity.SysApiKey;
import tech.aiflowy.system.mapper.SysApiKeyMapper;
import tech.aiflowy.system.service.SysApiKeyService;

import java.util.Date;

/**
 *  服务层实现。
@@ -15,4 +20,21 @@
@Service
public class SysApiKeyServiceImpl extends ServiceImpl<SysApiKeyMapper, SysApiKey>  implements SysApiKeyService {

    @Override
    public void checkApiKey(String apiKey) {
        QueryWrapper queryWrapper = QueryWrapper.create()
                .select("api_key", "status", "expired_at")
                .from("tb_sys_api_key")
                .where("api_key = ? ", apiKey);
        SysApiKey aiBotApiKey =  getOne(queryWrapper);
        if (aiBotApiKey == null ){
            throw new BusinessException("该apiKey不存在");
        }
        if (aiBotApiKey.getStatus() == 0 ){
            throw new BusinessException("该apiKey未启用");
        }
        if (aiBotApiKey.getExpiredAt().getTime() < new Date().getTime()){
            throw new BusinessException("该apiKey已失效");
        }
    }
}