Merge remote-tracking branch 'origin/main'

ageer

2025-03-25 d3ce05d7589203887fe312b95343638328dc01af

Merge remote-tracking branch 'origin/main'

 ruoyi-admin/src/main/java/org/ruoyi/controller/IndexController.java

@@ -2,8 +2,8 @@

import cn.dev33.satoken.annotation.SaIgnore;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * é¦–页
@@ -12,7 +12,7 @@
 */
@SaIgnore
@RequiredArgsConstructor
@Controller
@RestController
public class IndexController {

    /**
@@ -20,17 +20,7 @@
     */
    @GetMapping("/")
    public String index() {
        return "index.html";
    }

    @GetMapping("/success")
    public String success(){
        return "paySuccess.html";
    }

    @GetMapping("/cancel")
    public String cancel(){
        return "cancel";
        return "RuoYi-AI å¯åŠ¨æˆåŠŸ";
    }

}

 ruoyi-admin/src/main/java/org/ruoyi/controller/KnowledgeController.java

@@ -1,7 +1,6 @@
package org.ruoyi.controller;

import cn.dev33.satoken.stp.StpUtil;
import com.theokanning.openai.completion.chat.ChatMessageRole;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotEmpty;
@@ -39,7 +38,6 @@
import org.ruoyi.knowledge.chain.vectorstore.VectorStore;
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;

import java.util.ArrayList;
import java.util.List;



 ruoyi-admin/src/main/java/org/ruoyi/controller/OllamaController.java

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/application-dev.yml

@@ -27,7 +27,8 @@
          driverClassName: com.mysql.cj.jdbc.Driver
          url: jdbc:mysql://43.139.70.230:3306/ruoyi-ai?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
          username: ruoyi-ai
          password: xx
          password: ruoyi-ai


      hikari:
        # æœ€å¤§è¿žæŽ¥æ± æ•°é‡

 ruoyi-admin/src/main/resources/static/.gitignore

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/.nojekyll

 ruoyi-admin/src/main/resources/static/CNAME

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/README.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/_coverpage.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/_footer.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/_navbar.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/_sidebar.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/common/add_group.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/common/blacklist.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/common/column.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/common/contribution.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/common/demo_system.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/common/pr.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/common/user_register.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/common/video.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/index.html

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/plus-ui/_sidebar.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/plus-ui/devdoc/common_func.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/plus-ui/devdoc/component_use.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/plus-ui/devdoc/content_copy.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/plus-ui/devdoc/dev_norm.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/plus-ui/devdoc/dict_use.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/plus-ui/devdoc/exception_handling.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/plus-ui/devdoc/icon_use.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/plus-ui/devdoc/page_cache.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/plus-ui/devdoc/param_use.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/plus-ui/devdoc/permissions_use.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/plus-ui/devdoc/request_process.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/plus-ui/devdoc/router_use.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/plus-ui/home.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/questions/_sidebar.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/questions/api_encrypt.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/questions/bean_null.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/questions/deploy_vue.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/questions/domestic_databases.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/questions/dubbo_ip.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/questions/https_config.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/questions/identify_fail.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/questions/import_excel.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/questions/jar_run_fail.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/questions/jce_cannot.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/questions/kinfe4j.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/questions/login_step.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/questions/lombok.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/questions/nacos_naming_instance_metadata.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/questions/nacos_read_fail.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/questions/only_one_subscriber.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/questions/parse_exception.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/questions/permission_denied.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/questions/read_metadata.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/questions/sentinel_404.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/questions/st_not_support.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/questions/swagger.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/questions/synchronous_update.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/questions/use_druid.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/questions/use_tomcat.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/_sidebar.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/changlog.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/extend-function/elk.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/extend-function/es.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/extend-function/kafka.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/extend-function/maxkey.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/extend-function/nacos.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/extend-function/prometheus_grafana.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/extend-function/rabbitmq.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/extend-function/rocketmq.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/extend-function/shardingproxy.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/extend-function/skywalking.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/framework/architecture_diagram.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/framework/association/collaboration.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/framework/association/doc.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/framework/association/i18n.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/framework/association/inner_authentication.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/framework/association/new_module.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/framework/association/update_package_name.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/framework/association/update_url.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/framework/basic/client.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/framework/basic/code_generate.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/framework/basic/export.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/framework/basic/import.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/framework/basic/oss.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/framework/basic/page.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/framework/basic/param_check.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/framework/basic/permissions.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/framework/basic/permissions_control.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/framework/basic/router_release.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/framework/basic/social.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/framework/basic/tenant.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/framework/basic/user.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/framework/explain/about_join.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/framework/explain/key.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/framework/explain/test.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/framework/explain/transaction.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/framework/extend/api_encrypt.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/framework/extend/dynamic_datasource.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/framework/extend/encrypt.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/framework/extend/idempotent.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/framework/extend/mail.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/framework/extend/sensitive.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/framework/extend/sms.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/framework/extend/sse.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/framework/extend/translation.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/framework/extend/websocket.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/framework/tree.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/home.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/quickstart/1.Xinit.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/quickstart/deploy.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/quickstart/extend_project.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/quickstart/idea_environment.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/quickstart/init.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/quickstart/power_job_init.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/quickstart/snail_job_init.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-cloud-plus/quickstart/worker_init.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/_sidebar.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/changlog.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/framework/architecture_diagram.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/framework/association/doc.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/framework/association/i18n.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/framework/association/new_module.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/framework/association/update_package_name.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/framework/association/update_url.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/framework/basic/client.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/framework/basic/code_generate.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/framework/basic/export.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/framework/basic/import.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/framework/basic/interface_release.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/framework/basic/oss.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/framework/basic/page.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/framework/basic/param_check.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/framework/basic/permissions.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/framework/basic/permissions_control.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/framework/basic/social.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/framework/basic/tenant.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/framework/basic/user.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/framework/explain/about_join.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/framework/explain/key.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/framework/explain/test.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/framework/explain/transaction.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/framework/extend/api_encrypt.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/framework/extend/dynamic_datasource.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/framework/extend/encrypt.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/framework/extend/idempotent.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/framework/extend/mail.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/framework/extend/maxkey.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/framework/extend/sensitive.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/framework/extend/skywalking.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/framework/extend/sms.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/framework/extend/sse.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/framework/extend/topiam.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/framework/extend/translation.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/framework/extend/websocket.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/framework/tree.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/home.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/quickstart/4.Xinit.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/quickstart/5.Xnew.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/quickstart/admin_init.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/quickstart/deploy.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/quickstart/extend_project.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/quickstart/idea_environment.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/quickstart/init.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/quickstart/power_job_init.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/quickstart/snail_job_init.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/quickstart/worker_init.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/ruoyi-vue-plus/quickstart/xxl_job_init.md

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/static/css/vue.css

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/static/image/favicon.ico

Binary files differ

 ruoyi-admin/src/main/resources/static/static/image/logo.png

Binary files differ

 ruoyi-admin/src/main/resources/static/static/image/ruoyicloudplus.png

Binary files differ

 ruoyi-admin/src/main/resources/static/static/image/ruoyivueplus.png

Binary files differ

 ruoyi-admin/src/main/resources/static/static/js/docsify-copy-code.min.js

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/static/js/docsify-footer.min.js

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/static/js/docsify-pagination.min.js

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/static/js/docsify-scroll-to-top.min.js

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/static/js/docsify.min.js

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/static/js/emoji.min.js

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/static/js/prism-bash.min.js

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/static/js/prism-typescript.min.js

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/static/js/search.min.js

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/static/static/js/zoom-image.min.js

ÎļþÒÑɾ³ý

 ruoyi-modules/ruoyi-knowledge/src/main/java/org/ruoyi/knowledge/chain/vectorstore/MilvusVectorStore.java

@@ -239,7 +239,7 @@
        List<List<Float>> vectorFloatList = new ArrayList<>();
        List<String> kidList = new ArrayList<>();
        List<String> docIdList = new ArrayList<>();
        for (int i = 0; i < chunkList.size(); i++) {
        for (int i = 0; i < Math.min(chunkList.size(), vectorList.size()); i++) {
            List<Double> vector = vectorList.get(i);
            List<Float> vfList = new ArrayList<>();
            for (int j = 0; j < vector.size(); j++) {

 ruoyi-modules/ruoyi-knowledge/src/main/java/org/ruoyi/knowledge/chain/vectorstore/WeaviateVectorStore.java

@@ -148,33 +148,54 @@
            .vectorIndexConfig(vectorIndexConfig)
            .replicationConfig(replicationConfig)
            .moduleConfig(classModuleConfig)
            .properties(new ArrayList() {{
                .properties(new ArrayList() {
                    {
                add(Property.builder()
                        .dataType(new ArrayList(){ { add(DataType.TEXT); } })
                                .dataType(new ArrayList() {
                                    {
                                        add(DataType.TEXT);
                                    }
                                })
                        .name("content")
                        .description("The content of the local knowledge,for search")
                        .moduleConfig(propertyModuleConfigSkipFalse)
                        .build());
                add(Property.builder()
                        .dataType(new ArrayList(){ { add(DataType.TEXT); } })
                                .dataType(new ArrayList() {
                                    {
                                        add(DataType.TEXT);
                                    }
                                })
                        .name("kid")
                        .description("The knowledge id of the local knowledge,for search")
                        .moduleConfig(propertyModuleConfigSkipTrue)
                        .build());
                add(Property.builder()
                        .dataType(new ArrayList(){ { add(DataType.TEXT); } })
                                .dataType(new ArrayList() {
                                    {
                                        add(DataType.TEXT);
                                    }
                                })
                        .name("docId")
                        .description("The doc id of the local knowledge,for search")
                        .moduleConfig(propertyModuleConfigSkipTrue)
                        .build());
                add(Property.builder()
                        .dataType(new ArrayList(){ { add(DataType.TEXT); } })
                                .dataType(new ArrayList() {
                                    {
                                        add(DataType.TEXT);
                                    }
                                })
                        .name("fid")
                        .description("The fragment id of the local knowledge,for search")
                        .moduleConfig(propertyModuleConfigSkipTrue)
                        .build());
                add(Property.builder()
                        .dataType(new ArrayList(){ { add(DataType.TEXT); } })
                                .dataType(new ArrayList() {
                                    {
                                        add(DataType.TEXT);
                                    }
                                })
                        .name("uuid")
                        .description("The uuid id of the local knowledge fragment(same with id properties),for search")
                        .moduleConfig(propertyModuleConfigSkipTrue)
@@ -229,7 +250,7 @@
    @Override
    public void storeEmbeddings(List<String> chunkList, List<List<Double>> vectorList,String kid, String docId,List<String> fidList) {
        WeaviateClient client = getClient();
        if (vectorList != null) {

            for (int i = 0; i < Math.min(chunkList.size(), vectorList.size()); i++) {
                List<Double> vector = vectorList.get(i);
                Float[] vf = vector.stream().map(Double::floatValue).toArray(Float[]::new);
@@ -249,7 +270,7 @@
                        .withProperties(dataSchema)
                        .run();
            }
        }

    }

    @Override

 ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysMenuController.java

@@ -3,7 +3,6 @@
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.annotation.SaCheckRole;
import cn.dev33.satoken.annotation.SaMode;
import cn.hutool.core.lang.tree.Tree;
import lombok.RequiredArgsConstructor;
import org.ruoyi.common.core.constant.TenantConstants;
import org.ruoyi.common.core.constant.UserConstants;
@@ -86,9 +85,11 @@
    }, mode = SaMode.OR)
    @SaCheckPermission("system:menu:query")
    @GetMapping("/treeselect")
    public R<List<Tree<Long>>> treeselect(SysMenuBo menu) {
    public R<MenuTreeSelectVo> treeselect(SysMenuBo menu) {
        List<SysMenuVo> menus = menuService.selectMenuList(menu, LoginHelper.getUserId());
        return R.ok(menuService.buildMenuTreeSelect(menus));
        MenuTreeSelectVo selectVo = new MenuTreeSelectVo();
        selectVo.setMenus(menuService.buildMenuTreeSelect(menus));
        return R.ok(selectVo);
    }

    /**