diff --git a/pom.xml b/pom.xml index f7a26f106e08a0a4cff29cd3addbabfe6ed9a5b5..119a0841f4e38eb4002cd9f8338c0867f55b4a8b 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.noear solon-parent - 1.9.4 + 2.2.7 @@ -26,11 +26,11 @@ org.noear - logback-solon-plugin + solon.logging.logback org.noear - solon.schedule + solon.scheduling.simple @@ -132,6 +132,7 @@ org.apache.maven.plugins maven-surefire-plugin + 2.22.2 true diff --git a/src/main/java/com/cym/NginxWebUI.java b/src/main/java/com/cym/NginxWebUI.java index d70b98749ac306a08c2e5ab392545efa42bf5d43..c4a7d6f791a6d011c41a383f3c3403ee7086de7d 100644 --- a/src/main/java/com/cym/NginxWebUI.java +++ b/src/main/java/com/cym/NginxWebUI.java @@ -4,12 +4,12 @@ import java.io.File; import java.lang.management.ManagementFactory; import java.lang.management.RuntimeMXBean; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; -import java.util.Set; import org.noear.solon.Solon; -import org.noear.solon.schedule.annotation.EnableScheduling; +import org.noear.solon.core.util.LogUtil; +import org.noear.solon.logging.utils.LogUtilToSlf4j; +import org.noear.solon.scheduling.annotation.EnableScheduling; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,6 +35,8 @@ public class NginxWebUI { } Solon.start(NginxWebUI.class, args, app -> { + LogUtil.globalSet(new LogUtilToSlf4j()); + app.onError(e -> logger.error(e.getMessage(), e)); app.before(c -> { diff --git a/src/main/java/com/cym/config/AppFilter.java b/src/main/java/com/cym/config/AppFilter.java index 69b5afdcbef9c960a1a3c0fd9b7af12d69c35c0e..0f4c3ebeb00b0d3f8f53dd8036c22ea415b61b52 100644 --- a/src/main/java/com/cym/config/AppFilter.java +++ b/src/main/java/com/cym/config/AppFilter.java @@ -4,7 +4,6 @@ import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; import java.io.File; import java.io.OutputStream; -import java.io.PrintWriter; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.nio.charset.Charset; @@ -163,7 +162,7 @@ public class AppFilter implements Filter { UploadedFile uploadedFile = ctx.file("file"); - File temp = new File(FileUtil.getTmpDir() + "/" + uploadedFile.name); + File temp = new File(FileUtil.getTmpDir() + "/" + uploadedFile.getName()); uploadedFile.transferTo(temp); map.put("file", temp); diff --git a/src/main/java/com/cym/config/HomeConfig.java b/src/main/java/com/cym/config/HomeConfig.java index 3652904432675472591551057e5cff958d93e859..0a50f3e40f51f942ae57cc4aab934e7d9d4a21e5 100644 --- a/src/main/java/com/cym/config/HomeConfig.java +++ b/src/main/java/com/cym/config/HomeConfig.java @@ -3,8 +3,8 @@ package com.cym.config; import java.io.File; import org.noear.solon.annotation.Component; -import org.noear.solon.annotation.Init; import org.noear.solon.annotation.Inject; +import org.noear.solon.core.bean.InitializingBean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -15,19 +15,18 @@ import com.cym.utils.ToolUtils; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.StrUtil; -import cn.hutool.system.SystemUtil; @Component -public class HomeConfig { +public class HomeConfig implements InitializingBean { @Inject("${project.home}") public String home; public String acmeShDir; public String acmeSh; Logger logger = LoggerFactory.getLogger(this.getClass()); - - @Init - public void init() { + + @Override + public void afterInjection() throws Throwable { if (StrUtil.isEmpty(home)) { // 获取jar位置 File file = new File(JarUtil.getCurrentFilePath()); diff --git a/src/main/java/com/cym/config/InitConfig.java b/src/main/java/com/cym/config/InitConfig.java index d4b47dfe5c91f1c50eba7249229adaf66f7f36c2..9efb2db77ae1d21afc950acf5a6c21b61715de65 100644 --- a/src/main/java/com/cym/config/InitConfig.java +++ b/src/main/java/com/cym/config/InitConfig.java @@ -8,8 +8,8 @@ import java.util.ArrayList; import java.util.List; import org.noear.solon.annotation.Component; -import org.noear.solon.annotation.Init; import org.noear.solon.annotation.Inject; +import org.noear.solon.core.bean.LifecycleBean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -17,7 +17,6 @@ import com.cym.model.Admin; import com.cym.model.Basic; import com.cym.model.Cert; import com.cym.model.Http; -import com.cym.model.Password; import com.cym.service.BasicService; import com.cym.service.ConfService; import com.cym.service.SettingService; @@ -38,7 +37,7 @@ import cn.hutool.core.util.ZipUtil; import cn.hutool.crypto.SecureUtil; @Component -public class InitConfig { +public class InitConfig implements LifecycleBean { Logger logger = LoggerFactory.getLogger(this.getClass()); @Inject MessageUtils m; @@ -63,9 +62,8 @@ public class InitConfig { @Inject("${project.findPass}") Boolean findPass; - @Init - public void init() throws IOException { - + @Override + public void start() throws Throwable { // 找回密码 if (findPass) { List admins = sqlHelper.findAll(Admin.class); diff --git a/src/main/java/com/cym/config/VersionConfig.java b/src/main/java/com/cym/config/VersionConfig.java index 3929752c644caf0d93979946ac55079a32b4046c..51e3fde1c6ad80e817cf4812f3840a9ec12ab445 100644 --- a/src/main/java/com/cym/config/VersionConfig.java +++ b/src/main/java/com/cym/config/VersionConfig.java @@ -11,8 +11,8 @@ import java.util.Properties; import org.apache.maven.model.Model; import org.apache.maven.model.io.xpp3.MavenXpp3Reader; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; -import org.noear.solon.annotation.Configuration; -import org.noear.solon.annotation.Init; +import org.noear.solon.annotation.Component; +import org.noear.solon.core.bean.InitializingBean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -23,16 +23,20 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONUtil; -@Configuration -public class VersionConfig { +@Component +public class VersionConfig implements InitializingBean { Logger logger = LoggerFactory.getLogger(VersionConfig.class); public Version newVersion; public String currentVersion; - @Init - public void checkVersion() { + @Override + public void afterInjection() throws Throwable { + checkVersion(); + } + + public void checkVersion(){ // 获取版本号 try { currentVersion = getFromPom(); @@ -50,7 +54,6 @@ public class VersionConfig { logger.error("更新服务器不可访问"); } - } public String getFromPom() throws FileNotFoundException, IOException, XmlPullParserException { diff --git a/src/main/java/com/cym/controller/adminPage/ExportController.java b/src/main/java/com/cym/controller/adminPage/ExportController.java index 8165badf75c66eb10aeb31cca1f906ce25ed0da8..c2ffa77fb91be47587c1d0fff7eecb9783e6fb7b 100644 --- a/src/main/java/com/cym/controller/adminPage/ExportController.java +++ b/src/main/java/com/cym/controller/adminPage/ExportController.java @@ -65,7 +65,7 @@ public class ExportController extends BaseController { @Mapping(value = "dataImport") public void dataImport(UploadedFile file, Context context) throws IOException { if (file != null) { - File tempFile = new File(homeConfig.home + "temp" + File.separator + file.name); + File tempFile = new File(homeConfig.home + "temp" + File.separator + file.getName()); FileUtil.mkdir(tempFile.getParentFile()); file.transferTo(tempFile); String json = FileUtil.readString(tempFile, Charset.forName("UTF-8")); diff --git a/src/main/java/com/cym/controller/adminPage/MainController.java b/src/main/java/com/cym/controller/adminPage/MainController.java index b927da15725e5db69f76e676a34465d384860be9..091463e18f4434768205542473c977446f3ae6bf 100644 --- a/src/main/java/com/cym/controller/adminPage/MainController.java +++ b/src/main/java/com/cym/controller/adminPage/MainController.java @@ -53,7 +53,7 @@ public class MainController extends BaseController { @Mapping("/adminPage/main/upload") public JsonResult upload(Context context, UploadedFile file) { try { - File temp = new File(FileUtil.getTmpDir() + "/" + file.name); + File temp = new File(FileUtil.getTmpDir() + "/" + file.getName()); file.transferTo(temp); // // 移动文件 diff --git a/src/main/java/com/cym/controller/adminPage/ServerController.java b/src/main/java/com/cym/controller/adminPage/ServerController.java index 74dee9f4d140012bda43286a52b53f924424b3eb..9676905573b73a5919585f7c861db678718fb6da 100644 --- a/src/main/java/com/cym/controller/adminPage/ServerController.java +++ b/src/main/java/com/cym/controller/adminPage/ServerController.java @@ -342,11 +342,11 @@ public class ServerController extends BaseController { @Mapping("upload") public JsonResult upload(Context context, UploadedFile file) { try { - File temp = new File(FileUtil.getTmpDir() + "/" + file.name); + File temp = new File(FileUtil.getTmpDir() + "/" + file.getName()); file.transferTo(temp); // 移动文件 - File dest = new File(homeConfig.home + "cert/" + file.name); + File dest = new File(homeConfig.home + "cert/" + file.getName()); while(FileUtil.exist(dest)) { dest = new File(dest.getPath() + "_1"); } diff --git a/src/main/java/com/cym/service/MonitorService.java b/src/main/java/com/cym/service/MonitorService.java index 2a69f0bbbd9ff71cafe70017abbb415aecf61bfc..1dd850919ba6dd3ae4321003ddd8034790041156 100644 --- a/src/main/java/com/cym/service/MonitorService.java +++ b/src/main/java/com/cym/service/MonitorService.java @@ -4,8 +4,7 @@ import java.lang.management.ManagementFactory; import java.util.ArrayList; import java.util.List; -import org.noear.solon.annotation.Init; -import org.noear.solon.aspect.annotation.Service; +import org.noear.solon.annotation.Component; import com.cym.ext.DiskInfo; import com.cym.ext.MonitorInfo; @@ -13,6 +12,7 @@ import com.sun.management.OperatingSystemMXBean; import cn.hutool.core.util.NumberUtil; import cn.hutool.system.oshi.OshiUtil; +import org.noear.solon.core.bean.InitializingBean; import oshi.software.os.OSFileStore; import oshi.util.FormatUtil; @@ -21,13 +21,13 @@ import oshi.util.FormatUtil; * * @author amg * @version 1.0 Creation date: 2008-3-11 - 上午10:06:06 */ -@Service -public class MonitorService { +@Component +public class MonitorService implements InitializingBean { OperatingSystemMXBean osmxb; - @Init - private void init() { + @Override + public void afterInjection() throws Throwable { osmxb = (OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean(); } diff --git a/src/main/java/com/cym/sqlhelper/config/DataSourceEmbed.java b/src/main/java/com/cym/sqlhelper/config/DataSourceEmbed.java index 2e7bdddf33e354fbd01e61b09df0220730c81f18..49751ccd74020da18462ca35e3a8c95972055303 100644 --- a/src/main/java/com/cym/sqlhelper/config/DataSourceEmbed.java +++ b/src/main/java/com/cym/sqlhelper/config/DataSourceEmbed.java @@ -3,15 +3,15 @@ package com.cym.sqlhelper.config; import javax.sql.DataSource; import org.noear.solon.annotation.Component; -import org.noear.solon.annotation.Init; import org.noear.solon.annotation.Inject; import com.cym.config.HomeConfig; import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; +import org.noear.solon.core.bean.InitializingBean; @Component -public class DataSourceEmbed { +public class DataSourceEmbed implements InitializingBean { @Inject HomeConfig homeConfig; @Inject("${spring.database.type}") @@ -25,8 +25,8 @@ public class DataSourceEmbed { DataSource dataSource; - @Init - public void init() { + @Override + public void afterInjection() throws Throwable { // 创建dataSource if (databaseType.equalsIgnoreCase("sqlite") || databaseType.equalsIgnoreCase("h2")) { HikariConfig dbConfig = new HikariConfig(); diff --git a/src/main/java/com/cym/sqlhelper/utils/SqlHelper.java b/src/main/java/com/cym/sqlhelper/utils/SqlHelper.java index 7599cbb9bf8d188f81bd547d14b5029c475566ef..029017702ed45760ce1d78e9aa76f483fa825d1c 100644 --- a/src/main/java/com/cym/sqlhelper/utils/SqlHelper.java +++ b/src/main/java/com/cym/sqlhelper/utils/SqlHelper.java @@ -1,7 +1,6 @@ package com.cym.sqlhelper.utils; import java.lang.reflect.Field; -import java.sql.SQLException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -13,9 +12,8 @@ import java.util.Map.Entry; import java.util.Set; import org.noear.solon.annotation.Component; -import org.noear.solon.annotation.Configuration; -import org.noear.solon.annotation.Init; import org.noear.solon.annotation.Inject; +import org.noear.solon.core.bean.LifecycleBean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,7 +33,7 @@ import cn.hutool.core.util.StrUtil; * */ @Component -public class SqlHelper extends SqlUtils { +public class SqlHelper extends SqlUtils implements LifecycleBean { @Inject("${project.beanPackage}") String packageName; @Inject @@ -45,9 +43,9 @@ public class SqlHelper extends SqlUtils { static Logger logger = LoggerFactory.getLogger(SqlHelper.class); SnowFlake snowFlake = new SnowFlake(1, 1); - - @Init - public void init() throws SQLException { + + @Override + public void start() throws Throwable { Set> set = ClassUtil.scanPackage(packageName); for (Class clazz : set) { tableUtils.initTable(clazz); diff --git a/src/main/java/com/cym/task/ScheduleTask.java b/src/main/java/com/cym/task/ScheduleTask.java index 322aa76dcb9b7a71b398dacb422c0ff3197490e7..038c192257610fa2d93f8f35de30db3246fbd552 100644 --- a/src/main/java/com/cym/task/ScheduleTask.java +++ b/src/main/java/com/cym/task/ScheduleTask.java @@ -12,7 +12,7 @@ import java.util.concurrent.TimeUnit; import org.noear.solon.annotation.Component; import org.noear.solon.annotation.Inject; -import org.noear.solon.schedule.annotation.Scheduled; +import org.noear.solon.scheduling.annotation.Scheduled; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/cym/utils/AuthUtils.java b/src/main/java/com/cym/utils/AuthUtils.java index 690d600aa9212d88d3ec81f62e54db8187005437..c2ed745d5d2478e00ed373f7a8df98eb6e02529b 100644 --- a/src/main/java/com/cym/utils/AuthUtils.java +++ b/src/main/java/com/cym/utils/AuthUtils.java @@ -1,7 +1,6 @@ package com.cym.utils; import org.noear.solon.annotation.Component; -import org.noear.solon.annotation.Init; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -13,8 +12,7 @@ public class AuthUtils { Logger logger = LoggerFactory.getLogger(this.getClass()); GoogleAuthenticator gAuth; - @Init - public void init() { + public AuthUtils() { gAuth = new GoogleAuthenticator(); } diff --git a/src/main/java/com/cym/utils/MessageUtils.java b/src/main/java/com/cym/utils/MessageUtils.java index a8ae1171e402fb410fd028d81a288fd0607d70cd..efd1e4fb0f8901fd8ed64cf03491b0a3a2241299 100644 --- a/src/main/java/com/cym/utils/MessageUtils.java +++ b/src/main/java/com/cym/utils/MessageUtils.java @@ -3,25 +3,25 @@ package com.cym.utils; import java.util.Properties; import org.noear.solon.annotation.Component; -import org.noear.solon.annotation.Init; import org.noear.solon.annotation.Inject; import com.cym.service.SettingService; +import org.noear.solon.core.bean.InitializingBean; /** * 国际化工具类 */ @Component -public class MessageUtils { +public class MessageUtils implements InitializingBean { @Inject PropertiesUtils propertiesUtils; Properties properties = null; Properties propertiesEN = null; - - @Init - private void ini() { + + @Override + public void afterInjection() throws Throwable { propertiesEN = propertiesUtils.getPropertis("messages_en_US.properties"); properties = propertiesUtils.getPropertis("messages.properties"); }