diff --git a/acs/nladmin-system/nlsso-server/src/main/resources/config/application.yml b/acs/nladmin-system/nlsso-server/src/main/resources/config/application.yml index 2d1a89c..bc92901 100644 --- a/acs/nladmin-system/nlsso-server/src/main/resources/config/application.yml +++ b/acs/nladmin-system/nlsso-server/src/main/resources/config/application.yml @@ -91,3 +91,5 @@ mybatis-plus: lucene: index: path: D:\lucene\index +tlog: + enable-invoke-time-print: true \ No newline at end of file diff --git a/acs/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml b/acs/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml index 5f7a50d..6eda7ef 100644 --- a/acs/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml +++ b/acs/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml @@ -30,9 +30,10 @@ https://juejin.cn/post/6844903775631572999 - + + true + ${log.pattern} - ${log.charset} @@ -44,7 +45,7 @@ https://juejin.cn/post/6844903775631572999 15 - 100MB + 50MB 20GB @@ -55,7 +56,7 @@ https://juejin.cn/post/6844903775631572999 - + 0 200 diff --git a/acs/nladmin-ui/src/assets/images/avatar1.png b/acs/nladmin-ui/src/assets/images/avatar1.png deleted file mode 100644 index 997732a..0000000 Binary files a/acs/nladmin-ui/src/assets/images/avatar1.png and /dev/null differ diff --git a/acs/nladmin-ui/src/assets/images/background11.jpg b/acs/nladmin-ui/src/assets/images/background11.jpg deleted file mode 100644 index 471a65c..0000000 Binary files a/acs/nladmin-ui/src/assets/images/background11.jpg and /dev/null differ diff --git a/acs/nladmin-ui/src/assets/images/background111.jpg b/acs/nladmin-ui/src/assets/images/background111.jpg deleted file mode 100644 index 529b89a..0000000 Binary files a/acs/nladmin-ui/src/assets/images/background111.jpg and /dev/null differ diff --git a/acs/nladmin-ui/src/assets/images/background1111.jpg b/acs/nladmin-ui/src/assets/images/background1111.jpg deleted file mode 100644 index 62d024d..0000000 Binary files a/acs/nladmin-ui/src/assets/images/background1111.jpg and /dev/null differ diff --git a/acs/nladmin-ui/src/assets/images/background2.jpg b/acs/nladmin-ui/src/assets/images/background2.jpg deleted file mode 100644 index 69e6348..0000000 Binary files a/acs/nladmin-ui/src/assets/images/background2.jpg and /dev/null differ diff --git a/acs/nladmin-ui/src/assets/images/background222.jpg b/acs/nladmin-ui/src/assets/images/background222.jpg deleted file mode 100644 index e3a2c71..0000000 Binary files a/acs/nladmin-ui/src/assets/images/background222.jpg and /dev/null differ diff --git a/acs/nladmin-ui/src/assets/images/background3.jpg b/acs/nladmin-ui/src/assets/images/background3.jpg deleted file mode 100644 index 5424ccd..0000000 Binary files a/acs/nladmin-ui/src/assets/images/background3.jpg and /dev/null differ diff --git a/acs/nladmin-ui/src/assets/images/login-background.jpg b/acs/nladmin-ui/src/assets/images/login-background.jpg deleted file mode 100644 index 8a89eb8..0000000 Binary files a/acs/nladmin-ui/src/assets/images/login-background.jpg and /dev/null differ diff --git a/acs/nladmin-ui/src/assets/images/profile.jpg b/acs/nladmin-ui/src/assets/images/profile.jpg deleted file mode 100644 index b3a940b..0000000 Binary files a/acs/nladmin-ui/src/assets/images/profile.jpg and /dev/null differ diff --git a/acs/nladmin-ui/src/assets/styles/eladmin.scss b/acs/nladmin-ui/src/assets/styles/eladmin.scss index 57a62e5..4ed6f28 100644 --- a/acs/nladmin-ui/src/assets/styles/eladmin.scss +++ b/acs/nladmin-ui/src/assets/styles/eladmin.scss @@ -1,5 +1,8 @@ .head-container { - padding-bottom: 10px; + padding-top: 8px; + padding-bottom: 6px; + background-color: #ffffff; + border-radius: 4px; .filter-item { display: inline-block; @@ -188,7 +191,7 @@ input[type="number"]::-webkit-outer-spin-button { .el-table__fixed-header-wrapper { th { word-break: break-word; - background-color: #f8f8f9; + background-color: #f5f5f5; color: #515a6e; height: 35px; font-size: 13px; diff --git a/acs/nladmin-ui/src/assets/styles/index.scss b/acs/nladmin-ui/src/assets/styles/index.scss index 21fbda1..120ea8d 100644 --- a/acs/nladmin-ui/src/assets/styles/index.scss +++ b/acs/nladmin-ui/src/assets/styles/index.scss @@ -21,6 +21,7 @@ label { html { height: 100%; box-sizing: border-box; + //background-color: #eeeeee; } #app { @@ -98,7 +99,7 @@ div:focus { } aside { - background: #eef1f6; + background: #d40c70; padding: 8px 24px; margin-bottom: 20px; border-radius: 2px; @@ -122,7 +123,7 @@ aside { //main-container全局样式 .app-container { - padding: 20px 20px 45px 20px; + padding: 10px 10px 45px 10px; } .components-container { diff --git a/acs/nladmin-ui/src/assets/styles/variables.scss b/acs/nladmin-ui/src/assets/styles/variables.scss index 384517b..1d1c7bf 100644 --- a/acs/nladmin-ui/src/assets/styles/variables.scss +++ b/acs/nladmin-ui/src/assets/styles/variables.scss @@ -13,17 +13,17 @@ $base-logo-light-title-color: #001529; $base-menu-light-background:#ffffff; // sidebar -$menuText:#bfcbd9; +$menuText: #ffffff; $menuActiveText:#409EFF; -$subMenuActiveText:#f4f4f5; // https://github.com/ElemeFE/element/issues/12951 +$subMenuActiveText: #ffffff; // https://github.com/ElemeFE/element/issues/12951 -$menuBg:#304156; //https://cloud.tencent.com/developer/article/1753773 -$menuHover:#263445; +$menuBg: #001529; //https://cloud.tencent.com/developer/article/1753773 +$menuHover:#4e5465; $base-menu-light-color:rgba(0,0,0,.70); -$subMenuBg:#1f2d3d; -$subMenuHover:#001528; +$subMenuBg:#000c17; +$subMenuHover:#4e5465; $sideBarWidth: 205px; @@ -45,4 +45,4 @@ $sideBarWidth: 205px; logoLightTitleColor: $base-logo-light-title-color } -$base-sidebar-width: 200px; +$base-sidebar-width: 2010px; diff --git a/lms/nladmin-system/nlsso-server/pom.xml b/lms/nladmin-system/nlsso-server/pom.xml index bf00f6a..32853f1 100644 --- a/lms/nladmin-system/nlsso-server/pom.xml +++ b/lms/nladmin-system/nlsso-server/pom.xml @@ -48,10 +48,16 @@ ${hutool.version} + + + com.yomahub + tlog-all-spring-boot-starter + 1.5.0 + org.dromara.dynamictp dynamic-tp-spring-boot-starter-adapter-webserver - 1.1.6.1 + 1.1.7 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java index 1b7e989..655cfb5 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java @@ -4,6 +4,7 @@ import cn.dev33.satoken.annotation.SaIgnore; import com.alicp.jetcache.anno.config.EnableCreateCacheAnnotation; import com.alicp.jetcache.anno.config.EnableMethodCache; import io.swagger.annotations.Api; +import org.dromara.dynamictp.core.spring.EnableDynamicTp; import org.mybatis.spring.annotation.MapperScan; import org.nl.config.SpringContextHolder; import org.nl.config.thread.ThreadPoolExecutorUtil; @@ -36,6 +37,7 @@ import org.springframework.web.bind.annotation.RestController; @EnableMethodCache(basePackages = "org.nl") @EnableCreateCacheAnnotation @MapperScan("org.nl.**.mapper") +@EnableDynamicTp public class AppRun { public static void main(String[] args) { @@ -48,14 +50,6 @@ public class AppRun { return new SpringContextHolder(); } - @Bean - public ServletWebServerFactory webServerFactory() { - TomcatServletWebServerFactory fa = new TomcatServletWebServerFactory(); - fa.addConnectorCustomizers(connector -> connector.setProperty("relaxedQueryChars", "[]{}")); - return fa; - } - - /** * 访问首页提示 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/utils/ExecutionJob.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/utils/ExecutionJob.java index 9c4f777..ca4fbcf 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/utils/ExecutionJob.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/utils/ExecutionJob.java @@ -2,8 +2,8 @@ package org.nl.system.service.quartz.utils; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; +import com.yomahub.tlog.task.quartz.TLogQuartzJobBean; import lombok.extern.slf4j.Slf4j; -import org.nl.config.thread.ThreadPoolExecutorUtil; import org.nl.common.utils.RedisUtils; import org.nl.common.utils.ThrowableUtil; import org.nl.config.SpringContextHolder; @@ -18,7 +18,6 @@ import org.quartz.JobExecutionException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.scheduling.annotation.Async; -import org.springframework.scheduling.quartz.QuartzJobBean; import java.util.concurrent.Future; import java.util.concurrent.ThreadPoolExecutor; @@ -32,7 +31,7 @@ import java.util.concurrent.ThreadPoolExecutor; @SuppressWarnings({"unchecked", "all"}) @Slf4j @DisallowConcurrentExecution -public class ExecutionJob extends QuartzJobBean { +public class ExecutionJob extends TLogQuartzJobBean { /** * 该处仅供参考 @@ -41,8 +40,9 @@ public class ExecutionJob extends QuartzJobBean { @Qualifier("threadPoolExecutor") private ThreadPoolExecutor EXECUTOR; + @Override - protected void executeInternal(JobExecutionContext context) throws JobExecutionException { + public void executeTask(JobExecutionContext context) throws JobExecutionException { SysQuartzJob quartzJob = (SysQuartzJob) context.getMergedJobDataMap().get(SysQuartzJob.JOB_KEY); // 获取spring bean ISysQuartzJobService quartzJobService = SpringContextHolder.getBean(SysQuartzJobServiceImpl.class); @@ -52,7 +52,7 @@ public class ExecutionJob extends QuartzJobBean { String uuid = quartzJob.getUuid(); SysQuartzLog logDto = new SysQuartzLog(); - logDto.setLog_id(IdUtil.getSnowflake(1,1).nextIdStr()); + logDto.setLog_id(IdUtil.getSnowflake(1, 1).nextIdStr()); logDto.setJob_name(quartzJob.getJob_name()); logDto.setBean_name(quartzJob.getBean_name()); logDto.setMethod_name(quartzJob.getMethod_name()); @@ -61,8 +61,8 @@ public class ExecutionJob extends QuartzJobBean { logDto.setCron_expression(quartzJob.getCron_expression()); try { // 执行任务 - System.out.println("--------------------------------------------------------------"); - System.out.println("任务开始执行，任务名称：" + quartzJob.getJob_name()); + //System.out.println("--------------------------------------------------------------"); + //System.out.println("任务开始执行，任务名称：" + quartzJob.getJob_name()); QuartzRunnable task = new QuartzRunnable(quartzJob.getBean_name(), quartzJob.getMethod_name(), quartzJob.getParams()); Future future = EXECUTOR.submit(task); @@ -74,8 +74,8 @@ public class ExecutionJob extends QuartzJobBean { } // 任务状态 logDto.setIs_success(true); - System.out.println("任务执行完毕，任务名称：" + quartzJob.getJob_name() + ", 执行时间：" + times + "毫秒"); - System.out.println("--------------------------------------------------------------"); + // System.out.println("任务执行完毕，任务名称：" + quartzJob.getJob_name() + ", 执行时间：" + times + "毫秒"); + //System.out.println("--------------------------------------------------------------"); // 判断是否存在子任务 if (StrUtil.isNotEmpty(quartzJob.getSub_task())) { String[] tasks = quartzJob.getSub_task().split("[,，]"); @@ -86,8 +86,8 @@ public class ExecutionJob extends QuartzJobBean { if (StrUtil.isNotEmpty(uuid)) { redisUtils.set(uuid, false); } - System.out.println("任务执行失败，任务名称：" + quartzJob.getJob_name()); - System.out.println("--------------------------------------------------------------"); + //System.out.println("任务执行失败，任务名称：" + quartzJob.getJob_name()); + // System.out.println("--------------------------------------------------------------"); long times = System.currentTimeMillis() - startTime; logDto.setTime(times); // 任务状态 0：成功 1：失败 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/utils/QuartzRunnable.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/utils/QuartzRunnable.java index 4198696..cb7c5c8 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/utils/QuartzRunnable.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/utils/QuartzRunnable.java @@ -1,19 +1,21 @@ package org.nl.system.service.quartz.utils; import cn.hutool.core.util.StrUtil; +import com.yomahub.tlog.core.thread.TLogInheritableTask; +import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.nl.config.SpringContextHolder; import org.springframework.util.ReflectionUtils; import java.lang.reflect.Method; -import java.util.concurrent.Callable; /** * 执行定时任务 + * * @author / */ @Slf4j -public class QuartzRunnable implements Callable { +public class QuartzRunnable extends TLogInheritableTask { private final Object target; private final Method method; @@ -31,14 +33,15 @@ public class QuartzRunnable implements Callable { } } + + @SneakyThrows @Override - public Object call() throws Exception { + public void runTask() { ReflectionUtils.makeAccessible(method); if (StrUtil.isNotEmpty(params)) { method.invoke(target, params); } else { method.invoke(target); } - return null; } } diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml b/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml index e6955d8..cef7513 100644 --- a/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml +++ b/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml @@ -1,14 +1,34 @@ +server: + tomcat: + relaxed-query-chars: [ '|','{','}','[',']' ] #字符问题：https://blog.csdn.net/CanYue_Yi/article/details/109182577 + relaxed-path-chars: [ '|','{','}','[',']' ] #字符问题： https://blog.csdn.net/weixin_41996632/article/details/90715118 spring: freemarker: check-template-location: false profiles: - active: prod + active: dev jackson: time-zone: GMT+8 data: redis: repositories: enabled: false + dynamic: + tp: + enabled: true # 是否启用 dynamictp，默认true + enabledBanner: false # 是否启用 控制台banner，默认true + enabledCollect: true # 是否开启监控指标采集，默认true + collectorTypes: logging # 监控数据采集器类型（logging | micrometer | internal_logging），默认micrometer + logPath: d:\log\lms # 监控日志数据路径，默认 ${user.home}/logs，采集类型非logging不用配置 + monitorInterval: 8 + tomcatTp: # tomcat webserver 线程池配置 + threadPoolAliasName: tomcat 线程池 # 线程池别名，可选 + corePoolSize: 12 + tryInterrupt: true + maximumPoolSize: 50 + keepAliveTime: 60 + runTimeout: 10000 + queueTimeout: 100 #配置 Jpa jpa: @@ -93,3 +113,5 @@ mybatis-plus: lucene: index: path: D:\lucene\index +tlog: + enable-invoke-time-print: true \ No newline at end of file diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml b/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml index 8e1da9c..1691377 100644 --- a/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml +++ b/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml @@ -21,9 +21,10 @@ https://juejin.cn/post/6844903775631572999 - + + true + ${log.pattern} - ${log.charset} @@ -49,7 +50,7 @@ https://juejin.cn/post/6844903775631572999 - + 0 500 @@ -57,7 +58,7 @@ https://juejin.cn/post/6844903775631572999 - + diff --git a/lms/nladmin-ui/src/assets/images/avatar1.png b/lms/nladmin-ui/src/assets/images/avatar1.png deleted file mode 100644 index 997732a..0000000 Binary files a/lms/nladmin-ui/src/assets/images/avatar1.png and /dev/null differ diff --git a/lms/nladmin-ui/src/assets/images/background11.jpg b/lms/nladmin-ui/src/assets/images/background11.jpg deleted file mode 100644 index 471a65c..0000000 Binary files a/lms/nladmin-ui/src/assets/images/background11.jpg and /dev/null differ diff --git a/lms/nladmin-ui/src/assets/images/background111.jpg b/lms/nladmin-ui/src/assets/images/background111.jpg deleted file mode 100644 index 529b89a..0000000 Binary files a/lms/nladmin-ui/src/assets/images/background111.jpg and /dev/null differ diff --git a/lms/nladmin-ui/src/assets/images/background1111.jpg b/lms/nladmin-ui/src/assets/images/background1111.jpg deleted file mode 100644 index 62d024d..0000000 Binary files a/lms/nladmin-ui/src/assets/images/background1111.jpg and /dev/null differ diff --git a/lms/nladmin-ui/src/assets/images/background222.jpg b/lms/nladmin-ui/src/assets/images/background222.jpg deleted file mode 100644 index e3a2c71..0000000 Binary files a/lms/nladmin-ui/src/assets/images/background222.jpg and /dev/null differ diff --git a/lms/nladmin-ui/src/assets/images/background3.jpg b/lms/nladmin-ui/src/assets/images/background3.jpg deleted file mode 100644 index 5424ccd..0000000 Binary files a/lms/nladmin-ui/src/assets/images/background3.jpg and /dev/null differ diff --git a/lms/nladmin-ui/src/assets/images/login-background.jpg b/lms/nladmin-ui/src/assets/images/login-background.jpg deleted file mode 100644 index 8a89eb8..0000000 Binary files a/lms/nladmin-ui/src/assets/images/login-background.jpg and /dev/null differ diff --git a/lms/nladmin-ui/src/assets/images/logo.png b/lms/nladmin-ui/src/assets/images/logo.png index fbfa3c9..a1ca19b 100644 Binary files a/lms/nladmin-ui/src/assets/images/logo.png and b/lms/nladmin-ui/src/assets/images/logo.png differ diff --git a/lms/nladmin-ui/src/assets/images/open5.png b/lms/nladmin-ui/src/assets/images/open5.png deleted file mode 100644 index a1ca19b..0000000 Binary files a/lms/nladmin-ui/src/assets/images/open5.png and /dev/null differ diff --git a/lms/nladmin-ui/src/assets/images/profile.jpg b/lms/nladmin-ui/src/assets/images/profile.jpg deleted file mode 100644 index b3a940b..0000000 Binary files a/lms/nladmin-ui/src/assets/images/profile.jpg and /dev/null differ diff --git a/lms/nladmin-ui/src/assets/styles/eladmin.scss b/lms/nladmin-ui/src/assets/styles/eladmin.scss index 57a62e5..4ed6f28 100644 --- a/lms/nladmin-ui/src/assets/styles/eladmin.scss +++ b/lms/nladmin-ui/src/assets/styles/eladmin.scss @@ -1,5 +1,8 @@ .head-container { - padding-bottom: 10px; + padding-top: 8px; + padding-bottom: 6px; + background-color: #ffffff; + border-radius: 4px; .filter-item { display: inline-block; @@ -188,7 +191,7 @@ input[type="number"]::-webkit-outer-spin-button { .el-table__fixed-header-wrapper { th { word-break: break-word; - background-color: #f8f8f9; + background-color: #f5f5f5; color: #515a6e; height: 35px; font-size: 13px; diff --git a/lms/nladmin-ui/src/assets/styles/index.scss b/lms/nladmin-ui/src/assets/styles/index.scss index 21fbda1..120ea8d 100644 --- a/lms/nladmin-ui/src/assets/styles/index.scss +++ b/lms/nladmin-ui/src/assets/styles/index.scss @@ -21,6 +21,7 @@ label { html { height: 100%; box-sizing: border-box; + //background-color: #eeeeee; } #app { @@ -98,7 +99,7 @@ div:focus { } aside { - background: #eef1f6; + background: #d40c70; padding: 8px 24px; margin-bottom: 20px; border-radius: 2px; @@ -122,7 +123,7 @@ aside { //main-container全局样式 .app-container { - padding: 20px 20px 45px 20px; + padding: 10px 10px 45px 10px; } .components-container { diff --git a/lms/nladmin-ui/src/assets/styles/variables.scss b/lms/nladmin-ui/src/assets/styles/variables.scss index 384517b..1d1c7bf 100644 --- a/lms/nladmin-ui/src/assets/styles/variables.scss +++ b/lms/nladmin-ui/src/assets/styles/variables.scss @@ -13,17 +13,17 @@ $base-logo-light-title-color: #001529; $base-menu-light-background:#ffffff; // sidebar -$menuText:#bfcbd9; +$menuText: #ffffff; $menuActiveText:#409EFF; -$subMenuActiveText:#f4f4f5; // https://github.com/ElemeFE/element/issues/12951 +$subMenuActiveText: #ffffff; // https://github.com/ElemeFE/element/issues/12951 -$menuBg:#304156; //https://cloud.tencent.com/developer/article/1753773 -$menuHover:#263445; +$menuBg: #001529; //https://cloud.tencent.com/developer/article/1753773 +$menuHover:#4e5465; $base-menu-light-color:rgba(0,0,0,.70); -$subMenuBg:#1f2d3d; -$subMenuHover:#001528; +$subMenuBg:#000c17; +$subMenuHover:#4e5465; $sideBarWidth: 205px; @@ -45,4 +45,4 @@ $sideBarWidth: 205px; logoLightTitleColor: $base-logo-light-title-color } -$base-sidebar-width: 200px; +$base-sidebar-width: 2010px; diff --git a/lms/nladmin-ui/src/layout/components/Sidebar/Logo.vue b/lms/nladmin-ui/src/layout/components/Sidebar/Logo.vue index a6d1404..cda9341 100644 --- a/lms/nladmin-ui/src/layout/components/Sidebar/Logo.vue +++ b/lms/nladmin-ui/src/layout/components/Sidebar/Logo.vue @@ -14,7 +14,7 @@