merge from dev/origin

hawk9821 · Aug 23, 2024 · af59dce · af59dce
1 parent 07554b1
commit af59dce
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 18 deletions.
diff --git a/...-common/src/main/java/com/datasophon/common/command/InstallServiceRoleCommandConfirm.java b/...-common/src/main/java/com/datasophon/common/command/InstallServiceRoleCommandConfirm.java
@@ -17,10 +17,10 @@
 
 package com.datasophon.common.command;
 
-import java.io.Serializable;
-
 import lombok.Data;
 
+import java.io.Serializable;
+
 @Data
 public class InstallServiceRoleCommandConfirm implements Serializable {
 

diff --git a/datasophon-worker/src/main/java/com/datasophon/worker/WorkerApplicationServer.java b/datasophon-worker/src/main/java/com/datasophon/worker/WorkerApplicationServer.java
@@ -19,6 +19,15 @@
 
 package com.datasophon.worker;
 
+import akka.actor.ActorRef;
+import akka.actor.ActorSelection;
+import akka.actor.ActorSystem;
+import akka.actor.Props;
+import akka.event.EventStream;
+import akka.remote.AssociatedEvent;
+import akka.remote.AssociationErrorEvent;
+import akka.remote.DisassociatedEvent;
+import com.alibaba.fastjson.JSONObject;
 import com.datasophon.common.Constants;
 import com.datasophon.common.cache.CacheUtils;
 import com.datasophon.common.lifecycle.ServerLifeCycleManager;
@@ -30,29 +39,17 @@
 import com.datasophon.worker.actor.WorkerActor;
 import com.datasophon.worker.utils.ActorUtils;
 import com.datasophon.worker.utils.UnixUtils;
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.alibaba.fastjson.JSONObject;
-import com.typesafe.config.Config;
-import com.typesafe.config.ConfigFactory;
-
-import akka.actor.ActorRef;
-import akka.actor.ActorSelection;
-import akka.actor.ActorSystem;
-import akka.actor.Props;
-import akka.event.EventStream;
-import akka.remote.AssociatedEvent;
-import akka.remote.AssociationErrorEvent;
-import akka.remote.DisassociatedEvent;
-
 public class WorkerApplicationServer {
 
     private static final Logger logger = LoggerFactory.getLogger(WorkerApplicationServer.class);