[commit] #1061 rpc zombie thread is killed and the command bug is fixed

Author: magiclu550

.idea/artifacts/jsmod2.xml

@@ -79,9 +79,18 @@ public String start(String sw){
                         Thread.sleep(1000);
                     }
                 }catch (Exception e){
-                    e.printStackTrace();
+                    Utils.printException(e);
                 }
             }).start();
+            new Thread(()->{
+               while (Server.getSender()!=null&&!Server.getSender().getServer().isConnected);
+               try{
+                   if(!Server.getSender().getServer().isConnected)ServerStarter.getInstance().getWebServer().shutdown();
+               }catch (Exception e){
+                   Utils.printException(e);
+               }
+
+            });
         }
 
         return "server has started";

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

@@ -49,13 +49,17 @@ public class ServerStarter {
      */
     public static final String P_KEY = "jsmod";
 
+
+    private WebServer webServer;
     /**
      * 通过此方法来判断是开启rpc模式还是直接启动，通过args里的-rpc是否存在来
      * 知晓，如果有-rpc参数，后面必须空格带着端口号，并且不得有其他的参数
      * @param args 启动参数
      */
     public void start(String[] args){
 
+
+
         //java -jar jsmod2.jar -rpc 20021
         //有-rpc就不允许其他命令
 
@@ -65,7 +69,7 @@ public void start(String[] args){
                 instance = this;
                 int port = Integer.parseInt(args[1]);
                 ServerLogger.getLogger().multiInfo(getClass(),"xmlrpc is started...","","");
-                WebServer webServer = new WebServer(port);
+                webServer = new WebServer(port);
                 PropertyHandlerMapping mapping = new PropertyHandlerMapping();
                 mapping.addHandler(P_KEY, RPCHandler.class);
                 webServer.getXmlRpcServer().setHandlerMapping(mapping);
@@ -139,4 +143,8 @@ void startNow(String[] args){
     public static ServerStarter getInstance() {
         return instance;
     }
+
+    public WebServer getWebServer() {
+        return webServer;
+    }
 }

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

@@ -197,10 +197,11 @@ public boolean runConsoleCommand(String commandName,String[] args){
          * 允许普通玩家使用的指令权限
          * cn.jsmod2.player all
          */
+
         for(INativeCommand cmd:commands){
             if(commandName.equals(cmd.getCommandName())){
                 //如果含有这个权限
-                if(getPowers().contains(cmd.getPower())){
+                if(getPowers().contains(cmd.getPower().replace("cn.jsmod2.",""))){
                     cmd.execute(this,args);
                 }else{
                     Utils.getMessageSender().error("you do not have this power");