From 616abf302ac45ebee72a76a150981a15cdbdd431 Mon Sep 17 00:00:00 2001 From: liuguijing <123456> Date: Wed, 31 May 2023 21:02:01 +0800 Subject: [PATCH] =?UTF-8?q?war=E5=8C=85=E4=BF=AE=E6=94=B9=20=20=20?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=A1=A8=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=20=20=20=E6=97=B6=E9=97=B4=E8=A1=A8=E4=B8=8B=E5=8F=91=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=81=8F=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 31 +++++++++----- xymanager_admin/pom.xml | 23 ++++++----- .../SpringBootStartApplication.java | 24 +++++------ .../XymanagerAdminApplication.java | 7 +++- .../main/resources/META-INF/spring.factories | 2 +- .../entity/TerminalSchedule.java | 2 + .../resources/mappers/TerminalScheduleDao.xml | 3 +- xymanager_framework/pom.xml | 41 ++++++++++++------- .../interaction/JwtInterceptor.java | 8 ---- .../impl/TerminalScheduleRuleServiceImpl.java | 19 +++++++-- 10 files changed, 96 insertions(+), 64 deletions(-) diff --git a/pom.xml b/pom.xml index ed9c4e3..c316737 100644 --- a/pom.xml +++ b/pom.xml @@ -75,11 +75,11 @@ ${swagger.version} - - - - - + + + + + @@ -124,12 +124,12 @@ 5.7.20 - - - - - - + + + + + + @@ -139,6 +139,15 @@ 5.9.0 + + + + + + + + + org.springframework.boot spring-boot-starter-test diff --git a/xymanager_admin/pom.xml b/xymanager_admin/pom.xml index c43a7ec..f059729 100644 --- a/xymanager_admin/pom.xml +++ b/xymanager_admin/pom.xml @@ -13,7 +13,7 @@ xymanager_admin Demo project for Spring Boot - + war 1.8 @@ -39,6 +39,7 @@ test 2.5.6 + com.shxy xymanager_framework @@ -84,17 +85,17 @@ - - - - - - - + + + src/main/resources + + + **/*.properties + **/*.yml - - - + + + xymanager-admin diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/SpringBootStartApplication.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/SpringBootStartApplication.java index 902266b..64e64e2 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/SpringBootStartApplication.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/SpringBootStartApplication.java @@ -1,12 +1,12 @@ -package com.shxy.xymanager_admin; - -import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; - -public class SpringBootStartApplication extends SpringBootServletInitializer { - @Override - protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { - // 注意这里要指向原先用main方法执行的Application启动类 - return builder.sources(XymanagerAdminApplication.class); - } -} +//package com.shxy.xymanager_admin; +// +//import org.springframework.boot.builder.SpringApplicationBuilder; +//import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; +// +//public class SpringBootStartApplication extends SpringBootServletInitializer { +// @Override +// protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { +// // 注意这里要指向原先用main方法执行的Application启动类 +// return builder.sources(XymanagerAdminApplication.class); +// } +//} diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/XymanagerAdminApplication.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/XymanagerAdminApplication.java index 4f6145c..fd01e85 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/XymanagerAdminApplication.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/XymanagerAdminApplication.java @@ -19,7 +19,7 @@ import org.springframework.core.env.Environment; @Slf4j @EnableConfigurationProperties @ComponentScan(basePackages = {"com.shxy"}) -public class XymanagerAdminApplication { +public class XymanagerAdminApplication extends SpringBootServletInitializer{ public static void main(String[] args) { try { @@ -34,5 +34,8 @@ public class XymanagerAdminApplication { log.error("error>>>>>>>>>>>>>>>>>>>>>>>>>>>", e); } } - + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder application){ + return application.sources(XymanagerAdminApplication.class); + } } diff --git a/xymanager_admin/src/main/resources/META-INF/spring.factories b/xymanager_admin/src/main/resources/META-INF/spring.factories index 8e7c358..5e2059b 100644 --- a/xymanager_admin/src/main/resources/META-INF/spring.factories +++ b/xymanager_admin/src/main/resources/META-INF/spring.factories @@ -1 +1 @@ -#org.springframework.boot.env.EnvironmentPostProcessor=com.shxy.xymanager_framework.config.MyEnvironmentPostProcessor +org.springframework.boot.env.EnvironmentPostProcessor=com.shxy.xymanager_framework.config.MyEnvironmentPostProcessor diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalSchedule.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalSchedule.java index 845dc84..d3342a8 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalSchedule.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalSchedule.java @@ -15,6 +15,8 @@ public class TerminalSchedule implements Serializable { private Integer scheduleId; + private Integer offset; + private Date createTime; private Date updateTime; diff --git a/xymanager_dao/src/main/resources/mappers/TerminalScheduleDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalScheduleDao.xml index f57ebae..7506257 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalScheduleDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalScheduleDao.xml @@ -6,11 +6,12 @@ + - id, term_id, channel_id, schedule_id, create_time, update_time + id, term_id, channel_id, schedule_id, `offset`,create_time, update_time