From c51ab886ca899243f36cffe6c1a86d19057d44f5 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:18:38 +0800
Subject: [PATCH] 合并代码，解决冲突
---
src/main/java/com/zy/Boot.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/Boot.java b/src/main/java/com/zy/Boot.java
index aeacc4f..c2e5b78 100644
--- a/src/main/java/com/zy/Boot.java
+++ b/src/main/java/com/zy/Boot.java
@@ -1,19 +1,24 @@
package com.zy;
+import com.zy.common.utils.RandomValidateCodeUtil;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+import org.springframework.scheduling.annotation.EnableScheduling;
+@EnableScheduling
@SpringBootApplication
public class Boot extends SpringBootServletInitializer {
public static void main(String[] args) {
+ RandomValidateCodeUtil.init();
SpringApplication.run(Boot.class, args);
}
@Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
+ RandomValidateCodeUtil.init();
return builder.sources(Boot.class);
}
--
Gitblit v1.9.1