From 2bc4eaf2b5b5ebf8a19b0ab61bb59d4edefe78be Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Wed, 24 Apr 2024 17:52:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=B7=E6=B1=82=E6=89=93?=
 =?UTF-8?q?=E5=8C=85=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SysApplicationServiceImpl.java           | 8 +++++++-
 .../webapp/entrance/service/impl/EntranceServiceImpl.java | 4 +++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java
index 628b9957..d8fbccec 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java
@@ -2,6 +2,7 @@ package com.hzya.frame.sysnew.application.service.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.extra.servlet.ServletUtil;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.github.pagehelper.PageHelper;
@@ -1805,7 +1806,12 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
             saveLog(sendApp, receiveApp, receiveApi, bodys, headerMap, headers, querys, body.toString(), jrff, fsqsj, fshsj);
             logger.info("保存日志结束");
             if (flag) {
-                return BaseResult.getSuccessMessageEntity("转发成功", body);
+                if(JSONUtil.isTypeJSON(body.toString())){
+                    JSONObject jsonObject = JSONObject.parseObject(body.toString());
+                    return BaseResult.getSuccessMessageEntity("转发成功", jsonObject);
+                }else {
+                    return BaseResult.getSuccessMessageEntity("转发成功", body);
+                }
             } else {
                 return BaseResult.getFailureMessageEntity("转发失败", body);
             }
diff --git a/webapp/src/main/java/com/hzya/frame/webapp/entrance/service/impl/EntranceServiceImpl.java b/webapp/src/main/java/com/hzya/frame/webapp/entrance/service/impl/EntranceServiceImpl.java
index 1fe2bf2c..5530be35 100644
--- a/webapp/src/main/java/com/hzya/frame/webapp/entrance/service/impl/EntranceServiceImpl.java
+++ b/webapp/src/main/java/com/hzya/frame/webapp/entrance/service/impl/EntranceServiceImpl.java
@@ -86,7 +86,9 @@ public class EntranceServiceImpl implements IEntranceService {
             logger.info("当前mnAME:" + m.getName() + "   :serviceMethod = " + serviceMethod.trim());
             if (null != m) {
                 if (m.getName().equals(serviceMethod.trim())) {
-                    if (!"doLogin".equals(m.getName())) {
+                    if (m.getName().startsWith("thirdInterface")) {//TODO 后续可能要加强校验规则
+                        logger.info("第三方接口，不校验是否登陆");
+                    }else if (!"doLogin".equals(m.getName())) {
                         try {
                             StpUtil.checkLogin();
                             //校验当前登陆人是否有权限