feat: 兼容验证码获取

guanchengliu17 · Aug 15, 2023 · 838a70f · 838a70f
1 parent 8489f0d
commit 838a70f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/paicoding-ui/src/main/resources/templates/components/layout/navbar.html b/paicoding-ui/src/main/resources/templates/components/layout/navbar.html
@@ -508,6 +508,12 @@ <h2 class="title">添加二哥微信备注星球，审核更快</h2>
         $.ajax({
           url: "/login/fetch?deviceId=" + deviceId, type: "get", dataType: "text", success: function (data) {
             console.log("data>>>>>>>>: ", data);
+            if (data != 'fail') {
+              codeTag.text(code);
+              try {
+                window.clearInterval(intHook);
+              } catch (e) {}
+            }
           },
           error: function (e) {
             console.log("some error! ", e);

diff --git a/...web/src/main/java/com/github/paicoding/forum/web/front/login/wx/helper/WxLoginHelper.java b/...web/src/main/java/com/github/paicoding/forum/web/front/login/wx/helper/WxLoginHelper.java
@@ -106,7 +106,7 @@ public String resend() throws IOException {
         if (lastSse != null) {
             lastSse.send("resend!");
             lastSse.send("init#" + oldCode);
-            return "ok";
+            return oldCode;
         }
         return "fail";
     }