[commit] you can close something by jar args

Author: magiclu550

JPLS/src/main/java/cn/jsmod2/ServerStarter.java

@@ -6,30 +6,47 @@
 import cn.jsmod2.core.plugin.SpringContextUtil;
 import cn.jsmod2.core.utils.Utils;
 
+import java.util.Arrays;
 import java.util.concurrent.CountDownLatch;
 
+import static cn.jsmod2.core.utils.Utils.contains;
+
+/**
+ * -w -u -lr -lm -github
+ * -w 关闭web
+ * -u 关闭ui
+ * -lr 关闭round的log监听
+ * -lm 关闭multiAdmin和游戏的log监听
+ * -github 关闭和Github连接
+ */
 @ServerApplication(DefaultServer.class)
 public class ServerStarter {
 
     public void start(String[] args){
         Utils.TryCatch(()->{
             CountDownLatch latch = new CountDownLatch(1);
-            new Thread(()->{
-                SpringContextUtil.setApplicationContext(Starter.run(args));
-                latch.countDown();
-            }).start();
-            latch.await();
-            CountDownLatch latch1 = new CountDownLatch(1);
-            new Thread(()->{
-                latch1.countDown();
-                try {
-                    UIStarter.run(args);
-                }catch (Exception e){
-                    Utils.printException(e);
-                }
-            }).start();
-            latch1.await();
+            if(!contains(args,"-w")) {
+                new Thread(() -> {
+                    SpringContextUtil.setApplicationContext(Starter.run(args));
+                    latch.countDown();
+                }).start();
+                latch.await();
+            }
+            if(!contains(args,"-u")) {
+                CountDownLatch latch1 = new CountDownLatch(1);
+                new Thread(() -> {
+                    latch1.countDown();
+                    try {
+                        UIStarter.run(args);
+                    } catch (Exception e) {
+                        Utils.printException(e);
+                    }
+                }).start();
+                latch1.await();
+            }
             Application.run(this.getClass(),args);
         });
     }
+
+
 }

JPLS/src/main/java/cn/jsmod2/core/Server.java

@@ -44,8 +44,7 @@
 import java.util.stream.Collectors;
 
 import static cn.jsmod2.core.FileSystem.*;
-import static cn.jsmod2.core.utils.Utils.getFullBytes;
-import static cn.jsmod2.core.utils.Utils.getLen;
+import static cn.jsmod2.core.utils.Utils.*;
 
 /**
  * jsmod2 cn.jsmod2.server class
@@ -204,30 +203,34 @@ public void startWatch(Class<?> main,String[] args) {
         Utils.TryCatch(()-> {
             this.log.multiInfo(this.getClass(),main.getSimpleName() + "::start::" + main.getName(),"","");
             this.executeEmerald(args, true);
-            this.start();
+            this.start(args);
             this.successTime();
         });
     }
-    public void start(){
+    public void start(String[] args){
         if(useUDP) {
             this.pool.execute(new ListenerThread());
         }else{
             this.pool.execute(new ListenerThreadTCP());
         }
-        String log = logListener("yyyy-MM-dd HH.mm.ss",this::getMax,SMOD2_LOG_FILE);
-        if(log != null) {
-            this.pool.execute(new LogListener(log, Integer.parseInt(serverProp.getProperty(SMOD2_LOG_INTERVAL,"2000")),"yyyy-MM-dd HH.mm.ss",this::getMax,SMOD2_LOG_FILE));
+        if(!contains(args,"-lr")) {
+            String log = logListener("yyyy-MM-dd HH.mm.ss", this::getMax, SMOD2_LOG_FILE);
+            if (log != null) {
+                this.pool.execute(new LogListener(log, Integer.parseInt(serverProp.getProperty(SMOD2_LOG_INTERVAL, "2000")), "yyyy-MM-dd HH.mm.ss", this::getMax, SMOD2_LOG_FILE));
+            }
         }
-        String log1 = logListener("yyyy-MM-dd_HH_mm",(format, x1, x2) -> getMultiSCPMax(format,x1,x2,"MA"), Register.CONSOLE_LOG);
-        if(log1 != null){
-            this.pool.execute(new LogListener(log1,Integer.parseInt(serverProp.getProperty(SMOD2_LOG_INTERVAL,"2000")),"yyyy-MM-dd_HH_mm",(format, x1, x2) -> getMultiSCPMax(format,x1,x2,"MA"),Register.CONSOLE_LOG));
-            this.pool.execute(new LogListener(log1,Integer.parseInt(serverProp.getProperty(SMOD2_LOG_INTERVAL,"2000")),"yyyy-MM-dd_HH_mm",(format, x1, x2) -> getMultiSCPMax(format,x1,x2,"SCP"),Register.CONSOLE_LOG));
+        if(!contains(args,"-lm")) {
+            String log1 = logListener("yyyy-MM-dd_HH_mm", (format, x1, x2) -> getMultiSCPMax(format, x1, x2, "MA"), Register.CONSOLE_LOG);
+            if (log1 != null) {
+                this.pool.execute(new LogListener(log1, Integer.parseInt(serverProp.getProperty(SMOD2_LOG_INTERVAL, "2000")), "yyyy-MM-dd_HH_mm", (format, x1, x2) -> getMultiSCPMax(format, x1, x2, "MA"), Register.CONSOLE_LOG));
+                this.pool.execute(new LogListener(log1, Integer.parseInt(serverProp.getProperty(SMOD2_LOG_INTERVAL, "2000")), "yyyy-MM-dd_HH_mm", (format, x1, x2) -> getMultiSCPMax(format, x1, x2, "SCP"), Register.CONSOLE_LOG));
+            }
         }
 
-
-
-        if(Boolean.parseBoolean(serverProp.getProperty(GITHUB))) {
-            this.pool.execute(new GithubConnectThread());
+        if(!contains(args,"-github")) {
+            if (Boolean.parseBoolean(serverProp.getProperty(GITHUB))) {
+                this.pool.execute(new GithubConnectThread());
+            }
         }
         //this.pool.execute(new ServerThread());
 

JPLS/src/main/java/cn/jsmod2/core/utils/Utils.java

@@ -34,6 +34,11 @@ public class Utils {
         messageSender = new Message();
     }
 
+    public static boolean contains(String[] args,String value){
+        if(Arrays.toString(args).contains(value))return true;
+        return false;
+    }
+
     public static Method getServerMethod(String methodName) throws NoSuchMethodException{
         Method method = Server.class.getDeclaredMethod(methodName);
         method.setAccessible(true);