删除无用判断

src/main/java/org/holer/server/container/ServerContainer.java

@@ -62,10 +62,8 @@ public class ServerContainer
 
 
   public void listenPort(HolerPort hp) {
-    if (!hp.getEnabled().booleanValue() || hp.getExpireAt().longValue() <= System.currentTimeMillis()) {
-      
-      ServerMgr.unbind(hp.getPortNum());
-      
+    if (!hp.getEnabled() || hp.getExpireAt() <= System.currentTimeMillis()) {
+      ServerMgr.unbind(hp.getPortNum()); //如果端口已经过期，则取消端口绑定
       return;
     } 
     ServerBootstrap strap = getBootstrap();
@@ -78,49 +76,28 @@ public class ServerContainer
     if (CollectionUtils.isEmpty(channels)) {
       return;
     }
-
-    
     HolerResult<?> result = ServerUtil.totalNum();
-    long total = result.getTotal().longValue();
     result.setCode(1000);
-    if (HolerCode.OK.value() != result.getCode().intValue())
-    {
-      System.err.println("執行了");
+    if (HolerCode.OK.value() != result.getCode()) {
       log.warn(result.getMsg());
     }
     
     ServerBootstrap strap = getBootstrap();
     for (HolerChannel hc : channels) {
-      
       if (null == hc.getClient() || MapUtils.isEmpty(hc.getPorts())) {
         continue;
       }
-
-
-      
-      if (!hc.getClient().getEnabled().booleanValue()) {
+      if (!hc.getClient().getEnabled()) {
         continue;
       }
-
-      
       for (HolerPort hp : hc.getPorts().values()) {
-        
-        if (total <= 0L) {
-          break;
-        }
-        
-        total--;
-
-        
-        if (!hp.getEnabled().booleanValue() || hp.getExpireAt().longValue() <= System.currentTimeMillis()) {
+        if (!hp.getEnabled() || hp.getExpireAt() <= System.currentTimeMillis()) {
           continue;
         }
-
-        
         ServerMgr.bind(strap, hp.getPortNum());
-        log.info("Bind public port " + hp.getPortNum());
+        log.info("绑定公共端口：" + hp.getPortNum());
       } 
-    } 
+    }
   }
 
 
@@ -152,9 +129,7 @@ public class ServerContainer
       String servHost = ServerMgr.getServerHost();
       ServerBootstrap server = newServer(false);
       server.bind(servHost, servPort).get(); //绑定端口
-      
       log.info("Holer服务器在主机上启动 [{}:{}]", servHost, servPort);
-      
       if (ServerMgr.isSslServerEnable()) { //判断是否启动SSL服务器
         ServerBootstrap sslServer = newServer(true);
         ChannelFuture cf = sslServer.bind(ServerMgr.getSslServerHost(), ServerMgr.getSslServerPort());

src/main/java/org/holer/server/init/ServerInitializer.java

@@ -20,7 +20,7 @@ public class ServerInitializer extends ChannelInitializer<SocketChannel> {
     public ServerInitializer(boolean enabled) {
         this.sslEnabled = enabled;
     }
-    
+
     protected void initChannel(SocketChannel sc) throws Exception {
         if (this.sslEnabled) {
             SSLContext sslCtx = SSLCreator.getCreator("conf/holer.jks").getSSLContext();

src/main/java/org/holer/server/util/ServerUtil.java

@@ -27,10 +27,7 @@ import org.holer.server.constant.HolerCode;
 import org.holer.server.db.DBClientService;
 import org.holer.server.db.DBPortService;
 import org.holer.server.db.DBUserService;
-import org.holer.server.model.HolerLicense;
-import org.holer.server.model.HolerResult;
-import org.holer.server.model.HolerStatus;
-import org.holer.server.model.HolerUser;
+import org.holer.server.model.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -337,7 +334,7 @@ public class ServerUtil {
 //            result.setTotal(1L);
 //            return result;
 //        }
-        result.setTotal(1L);
+        result.setTotal(100L);
         return result;
     }
 }