|
|
@@ -1,6 +1,7 @@
|
|
|
package com.its.dsrc;
|
|
|
|
|
|
import com.its.app.AppUtils;
|
|
|
+import com.its.app.utils.OS;
|
|
|
import com.its.app.utils.SysUtils;
|
|
|
import com.its.dsrc.config.ProcessConfig;
|
|
|
import com.its.dsrc.process.DbmsDataProcess;
|
|
|
@@ -13,11 +14,11 @@ import com.its.dsrc.ui.MainUI;
|
|
|
import com.its.dsrc.xnettcp.dsrc.DsrcTcpCommServerService;
|
|
|
import com.its.dsrc.xnettcp.dsrc.process.TcpServerDataProcess;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
-import org.apache.catalina.connector.Connector;
|
|
|
import org.springframework.beans.factory.DisposableBean;
|
|
|
import org.springframework.beans.factory.InitializingBean;
|
|
|
import org.springframework.boot.Banner;
|
|
|
import org.springframework.boot.CommandLineRunner;
|
|
|
+import org.springframework.boot.SpringApplication;
|
|
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
|
|
import org.springframework.boot.builder.SpringApplicationBuilder;
|
|
|
import org.springframework.boot.context.ApplicationPidFileWriter;
|
|
|
@@ -60,30 +61,30 @@ import java.net.URL;
|
|
|
//public class DsrcCommServerApplication implements CommandLineRunner, ApplicationListener<ContextClosedEvent>, InitializingBean, DisposableBean {
|
|
|
public class DsrcCommServerApplication implements CommandLineRunner, ApplicationListener<ContextClosedEvent>, InitializingBean, DisposableBean {
|
|
|
|
|
|
- private Connector connector;
|
|
|
+ private static String applicationName = "dsrc-comm-server";
|
|
|
|
|
|
public static void main(String[] args) {
|
|
|
- File file1 = new File("./conf/dsrc-comm-server.pid");
|
|
|
+ File file1 = new File("./conf/" + applicationName + ".pid");
|
|
|
if (file1.exists()) {
|
|
|
System.out.println(System.getProperty("Program Already Running....."));
|
|
|
log.error("Program Already Running.....");
|
|
|
- //return;
|
|
|
}
|
|
|
|
|
|
- ApplicationContext context = new SpringApplicationBuilder(DsrcCommServerApplication.class)
|
|
|
- //.web(WebApplicationType.NONE)
|
|
|
- .listeners(new ApplicationPidFileWriter("./conf/dsrc-comm-server.pid"))
|
|
|
- .headless(false)
|
|
|
- .bannerMode(Banner.Mode.OFF)
|
|
|
- .run(args);
|
|
|
-
|
|
|
-// SpringApplication application = new SpringApplicationBuilder()
|
|
|
-// .sources(DsrcCommServerApplication.class)
|
|
|
-// .listeners(new ApplicationPidFileWriter("./conf/dsrc-comm-server.pid"))
|
|
|
-// //.headless(false)
|
|
|
-// //.web(WebApplicationType.NONE)
|
|
|
-// .build();
|
|
|
-// application.run(args);
|
|
|
+ if (!OS.isWindows()) {
|
|
|
+ ApplicationContext context = new SpringApplicationBuilder(DsrcCommServerApplication.class)
|
|
|
+ //.web(WebApplicationType.NONE)
|
|
|
+ .listeners(new ApplicationPidFileWriter("./conf/" + applicationName + ".pid"))
|
|
|
+ .headless(false)
|
|
|
+ .bannerMode(Banner.Mode.OFF)
|
|
|
+ .run(args);
|
|
|
+ } else {
|
|
|
+ SpringApplication application = new SpringApplicationBuilder()
|
|
|
+ .sources(DsrcCommServerApplication.class)
|
|
|
+ .listeners(new ApplicationPidFileWriter("./conf/" + applicationName + ".pid"))
|
|
|
+ .build();
|
|
|
+ application.setBannerMode(Banner.Mode.OFF);
|
|
|
+ application.run(args);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -132,43 +133,45 @@ public class DsrcCommServerApplication implements CommandLineRunner, Application
|
|
|
// schedule enable
|
|
|
processConfig.setStartSchedule(true);
|
|
|
|
|
|
- SwingUtilities.invokeLater(() -> {
|
|
|
- String sysTime = SysUtils.getSysTimeStr();
|
|
|
- //JFrame.setDefaultLookAndFeelDecorated(true);
|
|
|
- JFrame frame = new JFrame("DSRC 통신 서버 - [" + sysTime + "]");
|
|
|
- MainUI UI = new MainUI(frame);
|
|
|
- try {
|
|
|
- ClassPathResource file = new ClassPathResource("static/image/application.png");
|
|
|
- URL imgURL = file.getURL();
|
|
|
- frame.setIconImage(new ImageIcon(imgURL).getImage());
|
|
|
- } catch (IOException e) {
|
|
|
- log.error("Not found application icon image");
|
|
|
- }
|
|
|
- frame.setModalExclusionType(Dialog.ModalExclusionType.APPLICATION_EXCLUDE);
|
|
|
- frame.setContentPane(UI.getRootPanel());
|
|
|
- frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
|
|
|
- frame.addWindowListener(new WindowAdapter() {
|
|
|
- @Override
|
|
|
- public void windowClosing(WindowEvent e) {
|
|
|
- if (JOptionPane.showConfirmDialog(UI.getRootPanel(), "시스템을 종료 하시겠습니까?", "시스템 종료", 0) == 0) {
|
|
|
- System.exit(0);
|
|
|
- } else {
|
|
|
- frame.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
|
|
|
- }
|
|
|
+ if (!OS.isWindows()) {
|
|
|
+ SwingUtilities.invokeLater(() -> {
|
|
|
+ String sysTime = SysUtils.getSysTimeStr();
|
|
|
+ //JFrame.setDefaultLookAndFeelDecorated(true);
|
|
|
+ JFrame frame = new JFrame("DSRC 통신 서버 - [" + sysTime + "]");
|
|
|
+ MainUI UI = new MainUI(frame);
|
|
|
+ try {
|
|
|
+ ClassPathResource file = new ClassPathResource("static/image/application.png");
|
|
|
+ URL imgURL = file.getURL();
|
|
|
+ frame.setIconImage(new ImageIcon(imgURL).getImage());
|
|
|
+ } catch (IOException e) {
|
|
|
+ log.error("Not found application icon image");
|
|
|
}
|
|
|
+ frame.setModalExclusionType(Dialog.ModalExclusionType.APPLICATION_EXCLUDE);
|
|
|
+ frame.setContentPane(UI.getRootPanel());
|
|
|
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
|
|
|
+ frame.addWindowListener(new WindowAdapter() {
|
|
|
+ @Override
|
|
|
+ public void windowClosing(WindowEvent e) {
|
|
|
+ if (JOptionPane.showConfirmDialog(UI.getRootPanel(), "시스템을 종료 하시겠습니까?", "시스템 종료", 0) == 0) {
|
|
|
+ System.exit(0);
|
|
|
+ } else {
|
|
|
+ frame.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
+ frame.pack();
|
|
|
+ frame.setBounds(100, 100, 1000, 800);
|
|
|
+ frame.setLocationRelativeTo(null);
|
|
|
+ frame.setVisible(true);
|
|
|
+
|
|
|
+ JTextArea logArea = UI.getTaLog();
|
|
|
+ logArea.setText(null);
|
|
|
+ JTextAreaOutputStream out = new JTextAreaOutputStream(logArea);
|
|
|
+ System.setOut(new PrintStream(out));
|
|
|
+
|
|
|
+ UI.LoadControllerInfo();
|
|
|
});
|
|
|
- frame.pack();
|
|
|
- frame.setBounds(100, 100, 1000, 800);
|
|
|
- frame.setLocationRelativeTo(null);
|
|
|
- frame.setVisible(true);
|
|
|
-
|
|
|
- JTextArea logArea = UI.getTaLog();
|
|
|
- logArea.setText(null);
|
|
|
- JTextAreaOutputStream out = new JTextAreaOutputStream(logArea);
|
|
|
- System.setOut(new PrintStream(out));
|
|
|
-
|
|
|
- UI.LoadControllerInfo();
|
|
|
- });
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
public void terminateApplication() {
|
