192.168.9.165 hai 3 semanas
pai
achega
8e0305884a

+ 11 - 14
src/main/java/com/fdkankan/scene/schedule/AppListener.java

@@ -1,36 +1,33 @@
-package com.fdkankan.scene.schedule;
+package com.fdkankan.scene;
 
 
 
 
-import cn.hutool.core.date.DateUnit;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.system.SystemUtil;
 import cn.hutool.system.SystemUtil;
 import com.fdkankan.scene.config.FdkkLaserConfig;
 import com.fdkankan.scene.config.FdkkLaserConfig;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.SpringApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
+import org.springframework.web.context.WebApplicationContext;
 
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
 import java.io.BufferedReader;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.io.InputStreamReader;
 
 
 @Component
 @Component
 @Slf4j
 @Slf4j
-public class AppListener {
+public class AppListener implements ApplicationRunner {
 
 
     @Autowired
     @Autowired
     FdkkLaserConfig fdkkLaserConfig;
     FdkkLaserConfig fdkkLaserConfig;
+    @Resource
+    private WebApplicationContext applicationContext;
 
 
-    private final ConfigurableApplicationContext context;
-
-    public AppListener(ConfigurableApplicationContext context) {
-        this.context = context;
-    }
-
-    @PostConstruct
-    public void init() {
+    @Override
+    public void run(ApplicationArguments args) {
         if (fdkkLaserConfig.getPid() <= 0) {
         if (fdkkLaserConfig.getPid() <= 0) {
            log.info("未配置 app.monitorPid,跳过 PID 监听。");
            log.info("未配置 app.monitorPid,跳过 PID 监听。");
             return;
             return;
@@ -90,7 +87,7 @@ public class AppListener {
      */
      */
     private void shutdownApplication() {
     private void shutdownApplication() {
         try {
         try {
-            SpringApplication.exit(context, () -> 0);
+            SpringApplication.exit(applicationContext, () -> 0);
         } finally {
         } finally {
             System.exit(0);
             System.exit(0);
         }
         }

+ 2 - 1
src/main/java/com/fdkankan/scene/SceneApplication.java

@@ -47,11 +47,12 @@ public class SceneApplication {
             FileWriter writer = new FileWriter(FileUtil.file(stateConfigOne));
             FileWriter writer = new FileWriter(FileUtil.file(stateConfigOne));
             writer.write("1");
             writer.write("1");
             writer.flush();
             writer.flush();
+            writer.close();
         }
         }
         String setting = fdkkLaserConfig.getSettingJson();
         String setting = fdkkLaserConfig.getSettingJson();
         String data = FileUtil.readString(setting, "UTF-8");
         String data = FileUtil.readString(setting, "UTF-8");
         JSONObject config = JSONObject.parseObject(data);
         JSONObject config = JSONObject.parseObject(data);
-        Integer javaPort = config.getInteger("javaPort");
+        Integer javaPort = config.getInteger("laserPort");
         fdkkLaserConfig.setLaserPort(javaPort);
         fdkkLaserConfig.setLaserPort(javaPort);
 
 
 
 

+ 1 - 1
src/main/java/com/fdkankan/scene/service/impl/LaserServiceImpl.java

@@ -58,7 +58,7 @@ public class LaserServiceImpl implements ILaserService {
         String setting = fdkkLaserConfig.getSettingJson();
         String setting = fdkkLaserConfig.getSettingJson();
         String data = FileUtil.readUtf8String(setting);
         String data = FileUtil.readUtf8String(setting);
         JSONObject config = JSONObject.parseObject(data);
         JSONObject config = JSONObject.parseObject(data);
-        this.port = config.getIntValue("javaPort");
+        this.port = config.getIntValue("laserPort");
     }
     }
 
 
 
 

+ 2 - 2
src/main/resources/application-standAloneProd.yml

@@ -42,7 +42,7 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
     druid:
       druid:
       druid:
-      url: jdbc:mysql://127.0.0.1:3307/laser?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
+      url: jdbc:mysql://127.0.0.1:${MYSQLP}/laser?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=GMT%2B8
       username: root
       username: root
       password: laser
       password: laser
       driver-class-name: com.mysql.cj.jdbc.Driver
       driver-class-name: com.mysql.cj.jdbc.Driver
@@ -62,7 +62,7 @@ spring:
       max-pool-prepared-statement-per-connection-size: 20
       max-pool-prepared-statement-per-connection-size: 20
   redis:
   redis:
     host: 127.0.0.1
     host: 127.0.0.1
-    port: 16379
+    port: ${REDISP}
     timeout: 6000ms
     timeout: 6000ms
     password:
     password:
     jedis:
     jedis: