Merge pull request 'lvleigang' (#11) from lvleigang into dev

Reviewed-on: http://192.168.2.237:3000/root/kangarooDataCenterV3/pulls/11

buildpackage/pom.xml

@@ -53,7 +53,7 @@
         </profile>
     </profiles>
     <build>
-        <finalName>kangarooDataCenter</finalName>
+        <finalName>kangarooDataCenterV3</finalName>
     </build>
 
 </project>

buildpackage/src/main/resources/application-dev.yml

@@ -2,9 +2,9 @@
 logging:
   #日志级别 指定目录级别
   level:
-    root: error
+    root: info
   file:
-    path: /Users/apple/Desktop/log/dev
+    path: /home/webservice/zt/log
 spring:
   datasource:
     dynamic:
@@ -15,4 +15,4 @@ spring:
           password: bd993088e8a7c3dc5f44441617f9b4bf
           driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
 savefile:
-  path: /Users/apple/Desktop/log/dev
+  path: /home/webservice/zt/file

buildpackage/src/main/resources/application.yml

@@ -1,7 +1,7 @@
 server:
   port: 9999
   servlet:
-    context-path: /kangarooDataCenter
+    context-path: /kangarooDataCenterV3
   localIP: 127.0.0.1
   tomcat:
     uri-encoding: utf-8

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);
             }

service/src/main/java/com/hzya/frame/sysnew/messageManageLog/entity/SysMessageManageLogEntity.xml

@@ -59,7 +59,7 @@
             parameterType="com.hzya.frame.sysnew.messageManageLog.entity.SysMessageManageLogEntity">
         select
         <include refid="SysMessageManageLogEntity_Base_Column_List"/>
-        from v_view_message_manage_log
+        from sys_message_manage_log
         <trim prefix="where" prefixOverrides="and">
             <if test="id != null and id != ''">and id = #{id}</if>
             <if test="messageManageId != null and messageManageId != ''">and message_manage_id = #{messageManageId}</if>
@@ -616,6 +616,7 @@ where id = #{id}
                 BOOLEAN MODE)
             </if>
         </trim>
+        ORDER BY create_time DESC
     </select>
 
 </mapper>

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();
                             //校验当前登陆人是否有权限