update

Author: jaysunxiao

cache/src/main/java/com/zfoo/tank/cache/controller/BattleController.java

@@ -21,10 +21,10 @@
 import com.zfoo.net.router.attachment.GatewayAttachment;
 import com.zfoo.net.anno.PacketReceiver;
 import com.zfoo.net.session.Session;
-import com.zfoo.net.util.SingleCache;
 import com.zfoo.orm.OrmContext;
 import com.zfoo.orm.util.MongoIdUtils;
 import com.zfoo.protocol.collection.CollectionUtils;
+import com.zfoo.scheduler.util.SingleCache;
 import com.zfoo.scheduler.util.TimeUtils;
 import com.zfoo.tank.common.entity.PlayerEntity;
 import com.zfoo.tank.common.entity.ScoreRankEntity;

single-boot/src/main/java/com/zfoo/tank/single/boot/controller/BattleController.java

@@ -17,12 +17,12 @@
 import com.zfoo.net.NetContext;
 import com.zfoo.net.anno.PacketReceiver;
 import com.zfoo.net.session.Session;
-import com.zfoo.net.util.SingleCache;
 import com.zfoo.orm.OrmContext;
 import com.zfoo.orm.anno.EntityCacheAutowired;
 import com.zfoo.orm.cache.IEntityCache;
 import com.zfoo.orm.util.MongoIdUtils;
 import com.zfoo.protocol.collection.CollectionUtils;
+import com.zfoo.scheduler.util.SingleCache;
 import com.zfoo.scheduler.util.TimeUtils;
 import com.zfoo.storage.anno.StorageAutowired;
 import com.zfoo.storage.model.IStorage;

single-boot/src/main/java/com/zfoo/tank/single/boot/controller/LoginController.java

@@ -92,7 +92,7 @@ public void atLoginRequest(Session session, LoginRequest request) {
 
         var sid = session.getSid();
 
-        EventBus.execute(HashUtils.fnvHash(account), new Runnable() {
+        EventBus.asyncExecute(HashUtils.fnvHash(account), new Runnable() {
             @Override
             public void run() {
                 var accountEntity = OrmContext.getAccessor().load(account, AccountEntity.class);

single/src/main/java/com/zfoo/tank/single/controller/BattleController.java

@@ -17,12 +17,12 @@
 import com.zfoo.net.NetContext;
 import com.zfoo.net.anno.PacketReceiver;
 import com.zfoo.net.session.Session;
-import com.zfoo.net.util.SingleCache;
 import com.zfoo.orm.OrmContext;
 import com.zfoo.orm.anno.EntityCacheAutowired;
 import com.zfoo.orm.cache.IEntityCache;
 import com.zfoo.orm.util.MongoIdUtils;
 import com.zfoo.protocol.collection.CollectionUtils;
+import com.zfoo.scheduler.util.SingleCache;
 import com.zfoo.scheduler.util.TimeUtils;
 import com.zfoo.storage.anno.StorageAutowired;
 import com.zfoo.storage.model.IStorage;

single/src/main/java/com/zfoo/tank/single/controller/LoginController.java

@@ -85,7 +85,7 @@ public void atLoginRequest(Session session, LoginRequest request) {
         var sid = session.getSid();
 
         // 由于uid还没确定下来，现在只能用account线程去处理
-        EventBus.execute(HashUtils.fnvHash(account), new Runnable() {
+        EventBus.asyncExecute(HashUtils.fnvHash(account), new Runnable() {
             @Override
             public void run() {
                 var accountEntity = OrmContext.getAccessor().load(account, AccountEntity.class);

zfoo-branch-for-tank/monitor/src/main/java/com/zfoo/monitor/util/MonitorUtils.java

@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2020 The zfoo Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and limitations under the License.
+ */
+
+package com.zfoo.monitor.util;
+
+import com.zfoo.monitor.*;
+import com.zfoo.net.util.NetUtils;
+import com.zfoo.protocol.exception.RunException;
+import com.zfoo.protocol.util.FileUtils;
+import com.zfoo.protocol.util.IOUtils;
+import com.zfoo.protocol.util.StringUtils;
+import com.zfoo.protocol.util.UuidUtils;
+import com.zfoo.scheduler.util.TimeUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import oshi.hardware.HWDiskStore;
+import oshi.hardware.HardwareAbstractionLayer;
+import oshi.hardware.NetworkIF;
+import oshi.software.os.OperatingSystem;
+
+import java.io.File;
+import java.io.InputStream;
+import java.text.NumberFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+
+/**
+ * 监控工具类
+ *
+ * @author godotg
+ */
+public abstract class MonitorUtils {
+
+    private static final Logger logger = LoggerFactory.getLogger(MonitorUtils.class);
+
+    private static Uptime maxUptime;
+    private static Map<String, DiskFileSystem> maxDfMap;
+    private static Memory maxFree;
+    private static Map<String, Sar> maxSarMap;
+
+    static {
+        initMonitor();
+    }
+
+    public static void initMonitor() {
+        maxUptime = OSUtils.uptime();
+        maxDfMap = new ConcurrentHashMap<>(OSUtils.df().stream().collect(Collectors.toMap(key -> key.getName(), value -> value)));
+        maxFree = OSUtils.free();
+        maxSarMap = new ConcurrentHashMap<>(OSUtils.sar().stream().collect(Collectors.toMap(key -> key.getName(), value -> value)));
+    }
+
+    public static Monitor maxMonitor() {
+        var uuid = UuidUtils.getUUID();
+        var monitor = Monitor.valueOf(uuid, maxUptime, new ArrayList<>(maxDfMap.values()), maxFree, new ArrayList<>(maxSarMap.values()));
+
+        initMonitor();
+        return monitor;
+    }
+
+    public static Monitor monitor() {
+        var uuid = UuidUtils.getUUID();
+        var uptime = OSUtils.uptime();
+        var df = OSUtils.df();
+        var free = OSUtils.free();
+        var sar = OSUtils.sar();
+
+        if (uptime.compareTo(maxUptime) > 0) {
+            maxUptime = uptime;
+        }
+
+        for (var fileSystem : df) {
+            var maxFileSystem = maxDfMap.get(fileSystem.getName());
+            if (maxFileSystem != null && fileSystem.compareTo(maxFileSystem) > 0) {
+                maxDfMap.put(fileSystem.getName(), fileSystem);
+            }
+        }
+
+        if (free.compareTo(maxFree) > 0) {
+            maxFree = free;
+        }
+
+        for (var networkIF : sar) {
+            var maxNetworkIF = maxSarMap.get(networkIF.getName());
+            if (maxNetworkIF != null && networkIF.compareTo(maxNetworkIF) > 0) {
+                maxSarMap.put(maxNetworkIF.getName(), networkIF);
+            }
+        }
+
+        return Monitor.valueOf(uuid, uptime, df, free, sar);
+    }
+
+}

zfoo-branch-for-tank/protocol/src/main/java/com/zfoo/protocol/model/PairLong.java

@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2020 The zfoo Authors
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and limitations under the License.
+ */
+
+package com.zfoo.protocol.model;
+
+
+import java.util.Objects;
+
+/**
+ * 键值对对象，只能在构造时传入键值
+ *
+ * @param <V> 值类型
+ * @author godotg
+ */
+public class PairLong<V> {
+
+    private long key;
+    private V value;
+
+    public PairLong() {
+
+    }
+
+    /**
+     * 构造
+     *
+     * @param key   键
+     * @param value 值
+     */
+    public PairLong(long key, V value) {
+        this.key = key;
+        this.value = value;
+    }
+
+    /**
+     * 获取键
+     *
+     * @return 键
+     */
+    public long getKey() {
+        return this.key;
+    }
+
+    /**
+     * 获取值
+     *
+     * @return 值
+     */
+    public V getValue() {
+        return this.value;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        PairLong<?> pairLong = (PairLong<?>) o;
+        return key == pairLong.key && Objects.equals(value, pairLong.value);
+    }
+
+    @Override
+    public int hashCode() {
+        return Long.hashCode(key);
+    }
+
+    @Override
+    public String toString() {
+        return "Pair [key=" + key + ", value=" + value + "]";
+    }
+}

zfoo-branch-for-tank/protocol/src/main/java/com/zfoo/protocol/serializer/CodeTemplatePlaceholder.java

@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2020 The zfoo Authors
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and limitations under the License.
+ */
+
+package com.zfoo.protocol.serializer;
+
+import com.zfoo.protocol.util.FileUtils;
+import com.zfoo.protocol.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Map;
+
+/**
+ * @author godotg
+ */
+public enum CodeTemplatePlaceholder {
+
+    protocol_root_path("${protocol_root_path}"),
+    protocol_imports("${protocol_imports}"),
+
+    protocol_class("${protocol_class}"),
+
+    protocol_registration("${protocol_registration}"),
+
+    protocol_manager_registrations("${protocol_manager_registrations}"),
+
+    protocol_note("${protocol_note}"),
+
+    protocol_name("${protocol_name}"),
+
+    protocol_id("${protocol_id}"),
+
+    protocol_field_definition("${protocol_field_definition}"),
+
+    protocol_write_serialization("${protocol_write_serialization}"),
+
+    protocol_read_deserialization("${protocol_read_deserialization}"),
+
+    ;
+    public final String placeholder;
+
+    private CodeTemplatePlaceholder(String placeholder) {
+        this.placeholder = placeholder;
+    }
+
+
+    public static String formatTemplate(String template, Map<CodeTemplatePlaceholder, String> placeholderMap) {
+        var lines = template.split(FileUtils.LS_REGEX);
+        var formatLines = new ArrayList<String>();
+        for (var line : lines) {
+            var lineTrim = StringUtils.trim(line);
+            var startPlaceholderOptional = Arrays.stream(CodeTemplatePlaceholder.values())
+                    .filter(it -> lineTrim.startsWith(it.placeholder))
+                    .findAny();
+            var formatLine = line;
+            if (startPlaceholderOptional.isPresent()) {
+                var startPlaceholder = startPlaceholderOptional.get();
+                // calculate the tab length
+                var startSpace = StringUtils.substringBeforeFirst(line, startPlaceholder.placeholder);
+                var startPlaceholderValue = placeholderMap.get(startPlaceholder);
+                var startPlaceholderValueLines = Arrays.stream(startPlaceholderValue.split(FileUtils.LS_REGEX)).map(it -> startSpace + it).toList();
+
+                // add tab length to start placeholder
+                var newStartPlaceholderValue = StringUtils.joinWith(FileUtils.LS, startPlaceholderValueLines.toArray());
+
+                formatLine = newStartPlaceholderValue + StringUtils.substringAfterFirst(line, startPlaceholder.placeholder);
+            }
+
+            for (var codeTemplatePlaceholder : CodeTemplatePlaceholder.values()) {
+                if (formatLine.contains(codeTemplatePlaceholder.placeholder)) {
+                     formatLine = formatLine.replace(codeTemplatePlaceholder.placeholder, placeholderMap.get(codeTemplatePlaceholder));
+                }
+            }
+
+            formatLines.add(formatLine);
+        }
+        return StringUtils.joinWith(FileUtils.LS, formatLines.toArray());
+    }
+
+}

zfoo-branch-for-tank/protocol/src/main/java/com/zfoo/protocol/serializer/ICodeGenerate.java

@@ -0,0 +1,45 @@
+package com.zfoo.protocol.serializer;
+
+import com.zfoo.protocol.generate.GenerateOperation;
+import com.zfoo.protocol.registration.ProtocolRegistration;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * 协议修改过后的测试流程：
+ * 1.测试Java的老协议和新协议的兼容性，NormalObject/ObjectA/ObjectB有几个兼容字段
+ * 2.测试Java在字节码增强，CutDown，反射三种情况下的代码下的协议解析的准确性
+ * 3.测试resource/compatible中有5种协议兼容情况需要测试
+ * 4.1/2/3总共有2*3*5=30种情况
+ * <p>
+ * 协议生成修改后的测试流程：
+ * 1.测试老协议和新协议的兼容性，NormalObject/ObjectA/ObjectB有几个兼容字段
+ * 2.测试普通生成，CutDown两种种情况下的代码下的协议解析的准确性
+ * 3.测试merge，fold，default三种种生成方式
+ * 4.测试resource/compatible中有5种协议兼容情况需要测试
+ * 5.1/2/3/4总共2*2*3*5=60种情况
+ * 6.简单的测试流程，NormalObject/ObjectA打开兼容字段，因为生成都是走的同一个方法直接测试非CutDown的fold
+ *
+ * @author godotg
+ */
+public interface ICodeGenerate {
+
+    void init(GenerateOperation generateOperation);
+
+    /**
+     * 将一个包下的协议文件生成在一个协议文件里
+     */
+    void mergerProtocol(List<ProtocolRegistration> registrations) throws IOException;
+
+    /**
+     * 折叠协议，生成协议文件会和Java源文件保持相同的目录结构
+     */
+    void foldProtocol(List<ProtocolRegistration> registrations) throws IOException;
+
+    /**
+     * 默认把所有的协议文件放在同一个更目录下，不做任何操作
+     */
+    void defaultProtocol(List<ProtocolRegistration> registrations) throws IOException;
+
+}