From a3346bd39ee72d323c90d122cb924219c1f1e646 Mon Sep 17 00:00:00 2001
From: kane <kane@qq.com>
Date: Wed, 20 Sep 2023 18:48:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=87=AA=E4=B8=BB=E6=8E=88=E6=9D=83?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AutonomousSqServiceImpl.java | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/AutonomousSqServiceImpl.java b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/AutonomousSqServiceImpl.java
index 3ae3d9c..3a8aa8a 100644
--- a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/AutonomousSqServiceImpl.java
+++ b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/AutonomousSqServiceImpl.java
@@ -96,12 +96,13 @@ public class AutonomousSqServiceImpl implements AutonomousSqService {
             return AjaxResult.success("未查询到该流水号相关信息，请确认后输入");
         }
         if ("F000".equals(invoiceAllLoginResult.getCode())) {
-            String[] splitResult = invoiceAllLoginResult.getMsg().split("：");
-            if (StringUtils.isNotBlank(splitResult[1])){
-                return AjaxResult.error(splitResult[1]);
-            }else {
-                return AjaxResult.error(splitResult[0]);
-            }
+//            String[] splitResult = invoiceAllLoginResult.getMsg().split("：");
+//            if (StringUtils.isNotBlank(splitResult[1])){
+//                return AjaxResult.error(splitResult[1]);
+//            }else {
+//                return AjaxResult.error(splitResult[0]);
+//            }
+            return AjaxResult.error(invoiceAllLoginResult.getMsg());
         } else if ("S000".equals(invoiceAllLoginResult.getCode())) {
             return AjaxResult.success("10012");
         } else if ("SMS".equals(invoiceAllLoginResult.getCode())){
@@ -219,9 +220,9 @@ public class AutonomousSqServiceImpl implements AutonomousSqService {
             // 回调地址
             inoviceAllQdLoginDTO.setLoginType("1");
             inoviceAllQdLoginDTO.setCallback("http://dev.goldentaxcloud.com:8081/api/invoice_all/v1/autonomousAuthorization");
-            log.info("全电登录接口，请求上游，地址：{},参数：{}", "http://221.222.184.98:8880/login/getLogin2", JSONUtil.toJsonStr(inoviceAllQdLoginDTO));
+            log.info("全电登录接口，请求上游，地址：{},参数：{}", "http://zzsq.jcsk100.com/login/getLogin2", JSONUtil.toJsonStr(inoviceAllQdLoginDTO));
             Thread requestThread = new Thread(() -> {
-                HttpUtils.sendJsonPost("http://221.222.184.98:8880/login/getLogin2", inoviceAllQdLoginDTO);
+                HttpUtils.sendJsonPost("http://zzsq.jcsk100.com/login/getLogin2", inoviceAllQdLoginDTO);
             });
             requestThread.start();
             // 用户信息封装
@@ -239,7 +240,7 @@ public class AutonomousSqServiceImpl implements AutonomousSqService {
             invoiceAllApiLog.setCreateTime(new Date());
             invoiceAllApiLog.setCompany(companyservice.getSellertax());
             invoiceAllApiLog.setIdentityId(companyservice.getIdentity());
-            invoiceAllApiLog.setUrl("http://221.222.184.98:8880/login/getLogin2");
+            invoiceAllApiLog.setUrl("http://zzsq.jcsk100.com/login/getLogin2");
             invoiceAllApiLog.setSendMsg(JSONUtil.toJsonStr(inoviceAllQdLoginDTO));
             invoiceAllApiLog.setRequestId(qqlsh);
             allApiLogMapper.insert(invoiceAllApiLog);

From a969b81bccc08fe400b7465b2d821c82d5bfaf4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Wed, 20 Sep 2023 18:49:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8C=89=E7=85=A7=E9=82=A2=E6=B3=BD?=
 =?UTF-8?q?=E8=AF=B4=E7=9A=84=E8=B0=83=E7=94=A8=E5=9B=9E=E8=B0=83=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3500=E8=BF=94=E5=9B=9E=E7=AC=AC=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jianshui-ui/src/views/freedom/login.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jianshui-ui/src/views/freedom/login.vue b/jianshui-ui/src/views/freedom/login.vue
index f785915..a2d2898 100644
--- a/jianshui-ui/src/views/freedom/login.vue
+++ b/jianshui-ui/src/views/freedom/login.vue
@@ -260,8 +260,8 @@ export default {
               clearInterval(timer)
             }
           }).catch(()=>{
-          this.ruleForm.showone = false;
-          this.ruleForm.showtwo = true;
+          this.ruleForm.showone = true;
+          this.ruleForm.showtwo = false;
           this.ruleForm.showthree = false;
           this.loading = false;
           this.loadingone = false;