apikey更新

leutu

2024-06-24 3f1ea1e3240f045412189619d7e4021d5f26a4f2

apikey更新

 pom.xml

@@ -66,6 +66,24 @@
            <artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
            <version>2.1.0</version>
        </dependency>
        <dependency>
            <groupId>org.projectlombok</groupId>
            <artifactId>lombok</artifactId>
            <version>1.18.26</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>org.projectlombok</groupId>
            <artifactId>lombok</artifactId>
            <version>1.18.26</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>org.projectlombok</groupId>
            <artifactId>lombok</artifactId>
            <version>1.18.26</version>
            <scope>provided</scope>
        </dependency>


    </dependencies>

 src/main/java/com/yb/controller/AiController.java

@@ -3,6 +3,7 @@

import com.alibaba.fastjson.JSON;
import com.yb.util.OkHttpUtil;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;

@@ -38,11 +39,13 @@


    @GetMapping("/chat")
    @Operation(summary = "大模型对话")
    public String chat(@RequestParam(value = "message",defaultValue = "Hi") String message){
        return chatModel.call("请用中文回答如下问题,如果有地名出现，回到内容包括经纬度并使用json返回,"+message);
    }

    @GetMapping("/intent")
    @Operation(summary = "意图请求")
    public String intent(@RequestParam(value = "message",defaultValue = "Hi") String message){
        String json = okHttpUtil.getMessage(intent+"="+message);
        Map<String,String> hashMap = new HashMap<>() ;
@@ -67,6 +70,7 @@
    }

    @GetMapping("/mix")
    @Operation(summary = "意图与大模型请求")
    public String mix(@RequestParam(value = "message",defaultValue = "Hi") String message){
        String json = okHttpUtil.postFastgpt(message);
        System.out.println(message);
@@ -91,7 +95,8 @@
    }

    @GetMapping("/fastgpt")
    public String fastgpt(@RequestParam(value = "message",defaultValue = "Hi") String message){
    @Operation(summary = "知识库查询")
    public String fastgpt(@RequestParam(value = "message",defaultValue = "三维实景") String message){

        okHttpUtil.requesFast(message);
        String json = okHttpUtil.requesFast(message);
@@ -100,10 +105,11 @@
    }

    @GetMapping("/fastgpt_list")
    public String fastgpt_list(String parentId){
    @Operation(summary = "知识库列表")
    public String fastgpt_list(){


        String json = okHttpUtil.requesFast_kl(parentId);
        String json = okHttpUtil.requesFast_kl();

        return  json ;
    }

 src/main/java/com/yb/entity/ResponseEntity.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
package com.yb.entity;

import lombok.Data;

@Data
public class ResponseEntity {
    private String[] eveent;
    private String[] data ;
}

 src/main/java/com/yb/util/OkHttpUtil.java

@@ -1,6 +1,8 @@
package com.yb.util;

import com.alibaba.fastjson.JSON;
import com.google.gson.Gson;
import com.yb.entity.ResponseEntity;
import okhttp3.*;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
@@ -79,11 +81,12 @@
    }

    public String requesFast(String message){
        OkHttpClient client = new OkHttpClient();
        System.out.println("fastgpt:"+message) ;
       OkHttpClient client = new OkHttpClient();
        Response response = null ;
        // åˆ›å»ºè¯·æ±‚头（Headers）
        okhttp3.Headers headers = new okhttp3.Headers.Builder()
                .add("Authorization", "Bearer fastgpt-rML09d7nyx8Bn2Al3UipZia3Q8FNuXdekU1nyMlgCfHNwS8NN1giSPNZ1y6Wmt")
                .add("Authorization", "Bearer "+apikey)
                .build();

        /*
@@ -105,7 +108,7 @@
        // æž„建请求体（RequestBody），这里使用的是字符串类型的请求数据

        HashMap<String,Object> hashMap = new HashMap<>() ;
        hashMap.put("chatId",""+Math.random()*100000);
        hashMap.put("chatId","1111");
        hashMap.put("stream","false");
        hashMap.put("detail","false");
        List<HashMap<String,String>> list = new ArrayList<>();
@@ -130,7 +133,15 @@
            if (response.isSuccessful()) {
                //System.out.println("Success: " + response.body().string());
                String rep = response.body().string();
                return rep ;
                if( rep.indexOf("flowResponses") > 0) {
                    int index = rep.indexOf("flowResponses");
                    int index_s = rep.indexOf("data", index);
                    String data = rep.substring(index_s + 5);
                    System.out.println(data);
                    return data;
                }else{
                    return rep ;
                }
            } else {
                System.out.println("Error: " + response.code() + " " + response.message());
            }
@@ -139,15 +150,15 @@
        }


         return response != null?response.body().toString():"null" ;
         return null ;
    }

    public String requesFast_kl(String parentId){
    public String requesFast_kl(){
        OkHttpClient client = new OkHttpClient();
        Response response = null ;
        // åˆ›å»ºè¯·æ±‚头（Headers）
        okhttp3.Headers headers = new okhttp3.Headers.Builder()
                .add("Authorization", "Bearer fastgpt-rML09d7nyx8Bn2Al3UipZia3Q8FNuXdekU1nyMlgCfHNwS8NN1giSPNZ1y6Wmt")
                .add("Authorization", "Bearer "+apikey)
                .build();

        /*
@@ -159,7 +170,7 @@


        // åˆ›å»ºè¯·æ±‚（Request）
        if( parentId != null ) fastgpt_kl = fastgpt_kl+"？parentId="+parentId;

        okhttp3.Request.Builder builder = new okhttp3.Request.Builder()
                .url(fastgpt_kl)
                .headers(headers) ;
@@ -171,7 +182,8 @@
            response = client.newCall(request).execute();
            if (response.isSuccessful()) {
                //System.out.println("Success: " + response.body().string());
                String rep = response.body().string();
                String rep = response.body().toString();

                return rep ;
            } else {
                System.out.println("Error: " + response.code() + " " + response.message());

 src/main/resources/application.yml

@@ -13,7 +13,8 @@
        model: qwen:1.8b
  intent: http://106.120.22.26:5367/intention?message
  fastgpt:
    apikey: fastgpt-rML09d7nyx8Bn2Al3UipZia3Q8FNuXdekU1nyMlgCfHNwS8NN1giSPNZ1y6Wmt
    appid:  6673bfa1d14da0cede023f28
    apikey: fastgpt-dPcuRIABVdEdnQ5cGI1iL5uIIClxMZ4SYO79hrqs2OKXlh3IUU7jFF
    url: http://192.168.11.28/api/v1/chat/completions
    kc: http://192.168.11.28/api/core/dataset/create
    kl: http://192.168.11.28/api/core/dataset/list