diff --git a/src/main/java/com/easydatabaseexport/EasyDataBaseExportMain.java b/src/main/java/com/easydatabaseexport/EasyDataBaseExportMain.java index ce660ae814ca79ef05dcfe6714bc1cfdd53831bb..67e80d245e23a50a4749b007dac5d634d402bb13 100644 --- a/src/main/java/com/easydatabaseexport/EasyDataBaseExportMain.java +++ b/src/main/java/com/easydatabaseexport/EasyDataBaseExportMain.java @@ -29,8 +29,6 @@ public class EasyDataBaseExportMain { CommonConstant.checkConfigIniFile(); //生成模板文件 CommonConstant.copyTemplateFile(); - //安装主题 - //UIManager.setInstalledLookAndFeels(CommonConstant.THEMES); } catch (Exception e) { LogManager.writeLogFile(e, log); } diff --git a/src/main/java/com/easydatabaseexport/common/CommonConstant.java b/src/main/java/com/easydatabaseexport/common/CommonConstant.java index e24eab4ce97b181b52d6e593885ba4a346fd21fa..4c0351942905f4b3e9f7461d670a3025db2a0260 100644 --- a/src/main/java/com/easydatabaseexport/common/CommonConstant.java +++ b/src/main/java/com/easydatabaseexport/common/CommonConstant.java @@ -182,7 +182,7 @@ public class CommonConstant { @SneakyThrows public static void initByReboot() { if (index < 0) { - //UIManager.setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName()); + UIManager.setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName()); } else if (index < THEMES.length) { try { UIManager.setLookAndFeel(THEMES[index]); diff --git a/src/main/java/com/easydatabaseexport/common/EnvironmentConstant.java b/src/main/java/com/easydatabaseexport/common/EnvironmentConstant.java index 2ddb978736d29a3275eb017fb3ec0ca925b632b5..d431aed7e667fe8fb7175710bdf87920e261c032 100644 --- a/src/main/java/com/easydatabaseexport/common/EnvironmentConstant.java +++ b/src/main/java/com/easydatabaseexport/common/EnvironmentConstant.java @@ -1,5 +1,7 @@ package com.easydatabaseexport.common; +import com.easydatabaseexport.enums.LevelEnum; + import java.util.Arrays; import java.util.List; @@ -13,11 +15,11 @@ public class EnvironmentConstant { /** * 本版本专属MD5码 **/ - public static final String FILE_MD5_VALUE = "f1abda441b476213d1fda2d0f4c2acba"; + public static final String FILE_MD5_VALUE = "17735ee05f26de8be10c5b69e54fbe37"; /** * 运行等级 **/ - public static final String RUN_LEVEL = "dev"; + public static final String RUN_LEVEL = LevelEnum.PROD.getLevel(); /** * 模板文件 **/ diff --git a/src/main/java/com/easydatabaseexport/ui/ConnectJavaFrame.java b/src/main/java/com/easydatabaseexport/ui/ConnectJavaFrame.java index 606f6655543f382277f57afb99d4756ef6ee9fa2..0b8ef48d48490e800f258373b8fc212bb8eb5771 100644 --- a/src/main/java/com/easydatabaseexport/ui/ConnectJavaFrame.java +++ b/src/main/java/com/easydatabaseexport/ui/ConnectJavaFrame.java @@ -111,7 +111,7 @@ public class ConnectJavaFrame { rootNode.add(dataBaseNode); } CommonConstant.root = new JCheckBoxTree(rootNode); - //添加监听事件 + //添加监听事件 CommonConstant.root.addMouseListener(new MouseAdapter() { @SneakyThrows @@ -230,9 +230,7 @@ public class ConnectJavaFrame { jFrame.setLocationRelativeTo(null); jFrame.setVisible(true); //当所有元素加载完成后,需要再进行主题渲染 - if (CommonConstant.index >= 0) { - SwingUtilities.updateComponentTreeUI(jFrame); - } + SwingUtilities.updateComponentTreeUI(jFrame); //添加导出excel按钮监听 menuBar.getMenu(2).getItem(0).addActionListener(new ExcelActionListener(rootNode)); //添加导出word按钮监听 diff --git a/src/main/java/com/easydatabaseexport/util/CheckUpdateUtil.java b/src/main/java/com/easydatabaseexport/util/CheckUpdateUtil.java index 1461b07d59f570a23fa895d8062f8d02d72e3e0a..bb219dc5b87cec367f5b79c05ff0c2b6fcdaef29 100644 --- a/src/main/java/com/easydatabaseexport/util/CheckUpdateUtil.java +++ b/src/main/java/com/easydatabaseexport/util/CheckUpdateUtil.java @@ -5,6 +5,7 @@ import com.easydatabaseexport.common.EnvironmentConstant; import com.easydatabaseexport.enums.UpdateEnum; import com.easydatabaseexport.enums.YesNoEnum; import com.easydatabaseexport.ui.UpdateVersionFrame; +import com.microsoft.sqlserver.jdbc.StringUtils; import javax.swing.ImageIcon; import javax.swing.JOptionPane; @@ -24,7 +25,11 @@ public class CheckUpdateUtil { **/ public static void check() { //判断软件更新逻辑 - if (!EnvironmentConstant.FILE_MD5_VALUE.equals(FileOperateUtil.getRemoteFileMD5())) { + String result = FileOperateUtil.getRemoteFileMD5(); + if (StringUtils.isEmpty(result)) { + return; + } + if (!EnvironmentConstant.FILE_MD5_VALUE.equals(result)) { if (!CommonConstant.configMap.containsKey(UpdateEnum.UPDATE_VERSION.getKey())) { UpdateVersionFrame updateVersion = new UpdateVersionFrame(); updateVersion.updateVersionFrame(); @@ -42,7 +47,11 @@ public class CheckUpdateUtil { **/ public static void checkByClick() { //判断软件更新逻辑 - if (!EnvironmentConstant.FILE_MD5_VALUE.equals(FileOperateUtil.getRemoteFileMD5())) { + String result = FileOperateUtil.getRemoteFileMD5(); + if (StringUtils.isEmpty(result)) { + return; + } + if (!EnvironmentConstant.FILE_MD5_VALUE.equals(result)) { UpdateVersionFrame updateVersion = new UpdateVersionFrame(); updateVersion.updateVersionFrame(); } else { diff --git a/src/main/java/com/easydatabaseexport/util/FileOperateUtil.java b/src/main/java/com/easydatabaseexport/util/FileOperateUtil.java index c0802241ff2ba1318f2e125bbee4cafc0c0e4b18..100faef8a872ee085a4c3cb0e2c80f42faed1120 100644 --- a/src/main/java/com/easydatabaseexport/util/FileOperateUtil.java +++ b/src/main/java/com/easydatabaseexport/util/FileOperateUtil.java @@ -274,7 +274,7 @@ public class FileOperateUtil { log.info("请求失败!"); } } catch (Exception e) { - e.printStackTrace(); + LogManager.writeLogFile(e, log); } return retStr.toString(); } diff --git a/src/main/java/com/easydatabaseexport/util/SwingUtils.java b/src/main/java/com/easydatabaseexport/util/SwingUtils.java index fe2f83ef0ece3929d92b7c3e22de725a024e7379..e0ebad7e8448700af916d3761955c1bf6cd9a933 100644 --- a/src/main/java/com/easydatabaseexport/util/SwingUtils.java +++ b/src/main/java/com/easydatabaseexport/util/SwingUtils.java @@ -39,7 +39,6 @@ public class SwingUtils { @SneakyThrows @Override public void actionPerformed(ActionEvent event) { - J_LABEL.setText(""); J_LABEL.setText("正在重启中,倒计时 " + SECONDS.getAndDecrement() + " s......"); if (SECONDS.get() == -2) { TIMER_FRAME.dispose(); @@ -50,7 +49,6 @@ public class SwingUtils { try { CommonConstant.initByReboot(); SECONDS.set(2); - TIMER_FRAME.setTitle("正在重启中,倒计时 " + SECONDS.getAndDecrement() + " s......"); IndexJavaFrame.connectFrame(); } catch (Exception e) { LogManager.writeLogFile(e, log);