diff --git a/buildpackage/pom.xml b/buildpackage/pom.xml index 98cdba92..47c6a81e 100644 --- a/buildpackage/pom.xml +++ b/buildpackage/pom.xml @@ -53,7 +53,7 @@ - kangarooDataCenter + kangarooDataCenterV3 diff --git a/buildpackage/src/main/resources/application-dev.yml b/buildpackage/src/main/resources/application-dev.yml index 216f4564..56af90a2 100644 --- a/buildpackage/src/main/resources/application-dev.yml +++ b/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 \ No newline at end of file + path: /home/webservice/zt/file \ No newline at end of file diff --git a/buildpackage/src/main/resources/application.yml b/buildpackage/src/main/resources/application.yml index 8ffd5576..0df10d87 100644 --- a/buildpackage/src/main/resources/application.yml +++ b/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 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 select - from v_view_message_manage_log + from sys_message_manage_log and id = #{id} and message_manage_id = #{messageManageId} @@ -616,6 +616,7 @@ where id = #{id} BOOLEAN MODE) + ORDER BY create_time DESC 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(); //校验当前登陆人是否有权限