110

Author: PlexPt

README.md

@@ -63,13 +63,13 @@ maven
 <dependency>
     <groupId>com.github.plexpt</groupId>
     <artifactId>chatgpt</artifactId>
-    <version>1.0.3</version>
+    <version>1.1.0</version>
 </dependency>
 ```
 
 gradle
 ```
-implementation group: 'com.github.plexpt', name: 'chatgpt', version: '1.0.3'
+implementation group: 'com.github.plexpt', name: 'chatgpt', version: '1.1.0'
 ```
 
 
@@ -87,7 +87,8 @@ https://github.com/acheong08/ChatGPT/wiki/Setup#token-authentication
 1. 通过 https://chat.openai.com/chat 注册并登录。
 2. 打开浏览器开发者工具，切换到 Application 标签页。
 3. 在左侧的 Storage - Cookies 中找到 __Secure-next-auth.session-token 一行并复制其值
-
+4. 找到 cf_clearance 复制
+5. 在network中获取 user-agent 复制
 
 ### 注册教程
 

README_en.md

@@ -26,13 +26,13 @@ maven
 <dependency>
     <groupId>com.github.plexpt</groupId>
     <artifactId>chatgpt</artifactId>
-    <version>1.0.3</version>
+    <version>1.1.0</version>
 </dependency>
 ```
 
 gradle
 ```
-implementation group: 'com.github.plexpt', name: 'chatgpt', version: '1.0.3'
+implementation group: 'com.github.plexpt', name: 'chatgpt', version: '1.1.0'
 ```
 
 

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.github.plexpt</groupId>
     <artifactId>chatgpt</artifactId>
-    <version>1.0.3</version>
+    <version>1.1.0</version>
     <name>chatgpt-java</name>
     <description>chatgpt-java</description>
 

src/main/java/com/github/plexpt/chatgpt/Chatbot.java

@@ -17,8 +17,11 @@
 
 @Data
 public class Chatbot {
+    private String cfClearance;
     private Map<String, String> config = new HashMap<>();
     private String conversationId;
+
+    private String userAgent;
     private String parentId;
     private Map<String, String> headers;
 
@@ -30,13 +33,21 @@ public Chatbot(Map<String, String> config, String conversationId) {
         this.config = config;
         this.conversationId = conversationId;
         this.parentId = UUID.randomUUID().toString();
-        if (config.containsKey("session_token") || (config.containsKey("email")
-                && config.containsKey("password"))) {
+        if (config.containsKey("session_token")) {
             refreshSession();
         }
     }
 
-    public Chatbot(String sessionToken) {
+    /**
+     * 初始化
+     *
+     * @param sessionToken
+     * @param cfClearance
+     * @param userAgent
+     */
+    public Chatbot(String sessionToken, String cfClearance, String userAgent) {
+        this.userAgent = userAgent;
+        this.cfClearance = cfClearance;
         config.put("session_token", sessionToken);
         this.parentId = UUID.randomUUID().toString();
         refreshSession();
@@ -61,9 +72,7 @@ public void refreshHeaders() {
             put("Accept", "text/event-stream");
             put("Authorization", "Bearer " + config.get("Authorization"));
             put("Content-Type", "application/json");
-            put("User-Agent", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1" +
-                    ".15 (KHTML, like Gecko) " +
-                    "Version/16.1 Safari/605.1.15");
+            put("User-Agent", userAgent);
             put("X-Openai-Assistant-App-Id", "");
             put("Connection", "close");
             put("Accept-Language", "en-US,en;q=0.9");
@@ -135,6 +144,7 @@ public Map<String, Object> getChatText(Map<String, Object> data) {
         // Set multiple cookies
         session.getCookies().put("__Secure-next-auth.session-token", config.get("session_token"));
         session.getCookies().put("__Secure-next-auth.callback-url", "https://chat.openai.com/");
+        session.getCookies().put("cf_clearance", cfClearance);
 
         // Set proxies
         setupProxy(session);
@@ -230,10 +240,9 @@ public Map<String, Object> getChatResponse(String prompt) {
 
     @SneakyThrows
     public void refreshSession() {
-        if (!config.containsKey("session_token") && (!config.containsKey("email") ||
-                !config.containsKey("password"))) {
+        if (!config.containsKey("session_token")) {
             throw new RuntimeException("No tokens provided");
-        } else if (config.containsKey("session_token")) {
+        } else {
             String sessionToken = config.get("session_token");
             if (sessionToken == null || sessionToken.equals("")) {
                 throw new RuntimeException("No tokens provided");
@@ -246,15 +255,11 @@ public void refreshSession() {
             // Set cookies
             session.getCookies().put("__Secure-next-auth.session-token", config.get(
                     "session_token"));
+            session.getCookies().put("cf_clearance", cfClearance);
 
             String urlSession = "https://chat.openai.com/api/auth/session";
             HttpResponse response = session.get2(urlSession,
-                    Collections.singletonMap(
-                            "User-Agent",
-                            "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15" +
-                                    " (KHTML," +
-                                    " like Gecko) Version/16.1 Safari/605.1.15 "
-                    ));
+                    Collections.singletonMap("User-Agent", userAgent));
 
             try {
                 String name = "__Secure-next-auth.session-token";
@@ -275,20 +280,11 @@ public void refreshSession() {
                 System.out.println("Error refreshing session");
                 throw new Exception("Error refreshing session", e);
             }
-        } else if (config.containsKey("email") && config.containsKey("password")) {
-            try {
-                this.login(config.get("email"), config.get("password"));
-            } catch (Exception e) {
-                System.out.println("Error refreshing session: ");
-                System.out.println(e);
-                throw e;
-            }
-        } else {
-            throw new RuntimeException("No tokens provided");
         }
     }
 
 
+    @Deprecated
     public void login(String email, String password) {
         System.out.println("Logging in...");
         boolean useProxy = false;

src/main/java/com/github/plexpt/chatgpt/Session.java

@@ -79,16 +79,6 @@ public HttpResponse get2(String url, Map<String, String> data) {
                 .execute();
     }
 
-    private String getCookiesString() {
-        String result = "";
-        for (Map.Entry<String, String> entry : cookies.entrySet()) {
-            String key = entry.getKey();
-            String value = entry.getValue();
-            result = result + key + "=" + value + "; ";
-        }
-        headers.put("cookie", result);
-        return result;
-    }
 
     public String getString(String url, Map<String, String> data) {
 
@@ -122,4 +112,16 @@ public Response post(String url, Map<String, String> headers, String payload) {
                 .execute()
                 .response();
     }
+
+
+    private String getCookiesString() {
+        String result = "";
+        for (Map.Entry<String, String> entry : cookies.entrySet()) {
+            String key = entry.getKey();
+            String value = entry.getValue();
+            result = result + key + "=" + value + "; ";
+        }
+        headers.put("cookie", result);
+        return result;
+    }
 }

src/main/resources/config.json

@@ -1,5 +1,5 @@
 {
-  "email":"xxx@gmail.com",
-  "password": "xxx",
+  "userAgent":"xxx",
+  "cfClearance": "xxx",
   "session_token" : ""
 }