Optimize WeChat login interface

chat2db-jerry · chat2db-jerry · commit 46e2d5279e24 · 2023-07-09T20:36:19.000+08:00
diff --git a/chat2db-server/chat2db-server-start/src/main/resources/application-dev.yml b/chat2db-server/chat2db-server-start/src/main/resources/application-dev.yml
@@ -16,4 +16,4 @@ server:
 
 chat2db:
   gateway:
-    base-url: http://test.sqlgpt.cn/gateway
+    base-url:  http://yfqwxv.natappfree.cc
diff --git a/chat2db-server/chat2db-server-start/src/main/resources/application.yml b/chat2db-server/chat2db-server-start/src/main/resources/application.yml
@@ -73,4 +73,5 @@ logbook:
 
 # Http Client
 forest:
-  connect-timeout: 3000
+  connect-timeout: 3000
+  log-response-content: true
diff --git a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/ai/AiConfigController.java b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/ai/AiConfigController.java
@@ -40,15 +40,26 @@ public class AiConfigController {
     @Resource
     private Chat2dbProperties chat2dbProperties;
 
+
     /**
      * AI configuration information interface
      *
+     * @return
+     */
+    @GetMapping("/getLoginQrCode")
+    public DataResult<QrCodeResponse> getLoginQrCode() {
+        return gatewayClientService.getLoginQrCode();
+    }
+
+    /**
+     * Query login status
+     *
      * @param token
      * @return
      */
-    @GetMapping("/getQrCode")
-    public DataResult<QrCodeResponse> getQrCode(@RequestParam(required = false) String token) {
-        DataResult<QrCodeResponse> dataResult = gatewayClientService.getQrCode(token);
+    @GetMapping("/getLoginStatus")
+    public DataResult<QrCodeResponse> getLoginStatus(@RequestParam(required = false) String token) {
+        DataResult<QrCodeResponse> dataResult = gatewayClientService.getLoginStatus(token);
         QrCodeResponse qrCodeResponse = dataResult.getData();
         // Representative successfully logged in
         if (StringUtils.isNotBlank(qrCodeResponse.getApiKey())) {
diff --git a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/http/GatewayClientServiceV2.java b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/http/GatewayClientServiceV2.java
@@ -25,16 +25,29 @@ public class GatewayClientServiceV2 {
     /**
      * 获取公众号的二维码
      *
+     * @return
+     */
+    @Get("/api/client/getLoginQrCode")
+    public DataResult<QrCodeResponse> getLoginQrCode() {
+        return Forest.get(chat2dbProperties.getGateway().getBaseUrl() + "/api/client/getLoginQrCode")
+            .execute(new TypeReference<>() {});
+    }
+
+
+    /**
+     * Query login status
+     *
      * @param token
      * @return
      */
-    @Get("/api/client/getQrCode")
-    public DataResult<QrCodeResponse> getQrCode(@Query("token") String token) {
-        return Forest.get(chat2dbProperties.getGateway().getBaseUrl() + "/api/client/getQrCode")
+    @Get("/api/client/getLoginStatus")
+    public DataResult<QrCodeResponse> getLoginStatus(@Query("token") String token) {
+        return Forest.get(chat2dbProperties.getGateway().getBaseUrl() + "/api/client/getLoginStatus")
             .addQuery("token", token)
             .execute(new TypeReference<>() {});
     }
 
+
     /**
      * 返回剩余次数
      *
