tiennm99/zfoo
1
0
Fork 0
mirror of https://github.com/tiennm99/zfoo.git synced 2026-08-06 00:24:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
sun
2023-08-24 12:54:21 +08:00
parent 06573892fb adba146780
commit 67220ca576
28 changed files with 273 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boot/pom.xml
+1
View File
@@ -36,6 +36,7 @@
<netty.version>4.1.84.Final</netty.version>
<jprotobuf.version>2.4.17</jprotobuf.version>
<kryo.version>5.3.0</kryo.version>
<reflections.version>0.10.2</reflections.version>
<!-- zookeeper -->
<curator.version>5.3.0</curator.version>
event/pom.xml
+1
View File
@@ -36,6 +36,7 @@
<netty.version>4.1.84.Final</netty.version>
<jprotobuf.version>2.4.17</jprotobuf.version>
<kryo.version>5.3.0</kryo.version>
<reflections.version>0.10.2</reflections.version>
<!-- zookeeper -->
<curator.version>5.3.0</curator.version>
hotswap/pom.xml
+1
View File
@@ -36,6 +36,7 @@
<netty.version>4.1.84.Final</netty.version>
<jprotobuf.version>2.4.17</jprotobuf.version>
<kryo.version>5.3.0</kryo.version>
<reflections.version>0.10.2</reflections.version>
<!-- zookeeper -->
<curator.version>5.3.0</curator.version>
monitor/pom.xml
+1
View File
@@ -36,6 +36,7 @@
<netty.version>4.1.84.Final</netty.version>
<jprotobuf.version>2.4.17</jprotobuf.version>
<kryo.version>5.3.0</kryo.version>
<reflections.version>0.10.2</reflections.version>
<!-- zookeeper -->
<curator.version>5.3.0</curator.version>
net/pom.xml
+1
View File
@@ -36,6 +36,7 @@
<netty.version>4.1.84.Final</netty.version>
<jprotobuf.version>2.4.17</jprotobuf.version>
<kryo.version>5.3.0</kryo.version>
<reflections.version>0.10.2</reflections.version>
<!-- zookeeper -->
<curator.version>5.3.0</curator.version>
net/src/main/java/com/zfoo/net/config/model/NetConfig.java
+6 -69
View File
@@ -34,16 +34,9 @@ public class NetConfig {
private String protocolParam;
/**
* 是否生成对应语言的协议
* 生成协议列表
*/
private boolean javascriptProtocol;
private boolean typescriptProtocol;
private boolean csharpProtocol;
private boolean luaProtocol;
private boolean gdscriptProtocol;
private boolean cppProtocol;
private boolean goProtocol;
private boolean protobufProtocol;
private String protocolList;
/**
* 注册中心
@@ -110,30 +103,6 @@ public class NetConfig {
this.protocolParam = protocolParam;
}
public boolean isJavascriptProtocol() {
return javascriptProtocol;
}
public void setJavascriptProtocol(boolean javascriptProtocol) {
this.javascriptProtocol = javascriptProtocol;
}
public boolean isCsharpProtocol() {
return csharpProtocol;
}
public void setCsharpProtocol(boolean csharpProtocol) {
this.csharpProtocol = csharpProtocol;
}
public boolean isLuaProtocol() {
return luaProtocol;
}
public void setLuaProtocol(boolean luaProtocol) {
this.luaProtocol = luaProtocol;
}
public RegistryConfig getRegistry() {
return registry;
}
@@ -166,44 +135,12 @@ public class NetConfig {
this.consumer = consumer;
}
public boolean isGdscriptProtocol() {
return gdscriptProtocol;
public String getProtocolList() {
return protocolList;
}
public void setGdscriptProtocol(boolean gdscriptProtocol) {
this.gdscriptProtocol = gdscriptProtocol;
}
public boolean isProtobufProtocol() {
return protobufProtocol;
}
public void setProtobufProtocol(boolean protobufProtocol) {
this.protobufProtocol = protobufProtocol;
}
public boolean isCppProtocol() {
return cppProtocol;
}
public void setCppProtocol(boolean cppProtocol) {
this.cppProtocol = cppProtocol;
}
public boolean isTypescriptProtocol() {
return typescriptProtocol;
}
public void setTypescriptProtocol(boolean typescriptProtocol) {
this.typescriptProtocol = typescriptProtocol;
}
public boolean isGoProtocol() {
return goProtocol;
}
public void setGoProtocol(boolean goProtocol) {
this.goProtocol = goProtocol;
public void setProtocolList(String protocolList) {
this.protocolList = protocolList;
}
@Override
net/src/main/java/com/zfoo/net/packet/PacketService.java
+41 -25
View File
@@ -18,20 +18,25 @@ import com.zfoo.net.router.route.PacketBus;
import com.zfoo.protocol.IPacket;
import com.zfoo.protocol.ProtocolManager;
import com.zfoo.protocol.buffer.ByteBufUtils;
import com.zfoo.protocol.collection.CollectionUtils;
import com.zfoo.protocol.exception.ExceptionUtils;
import com.zfoo.protocol.generate.GenerateOperation;
import com.zfoo.protocol.generate.GenerateProtocolFile;
import com.zfoo.protocol.registration.IProtocolRegistration;
import com.zfoo.protocol.serializer.CodeLanguage;
import com.zfoo.protocol.util.DomUtils;
import com.zfoo.protocol.util.StringUtils;
import com.zfoo.protocol.xml.XmlProtocols;
import io.netty.buffer.ByteBuf;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import org.springframework.util.ResourceUtils;
import java.io.IOException;
import java.util.HashSet;
import java.util.Set;
import java.util.function.Predicate;
/**
@@ -53,6 +58,7 @@ public class PacketService implements IPacketService {
* 2. 服务器内部请求约定以Ask结尾，服务器内部的响应约定以Answer结尾
* 3. 服务器主动通知客户端以Notice结尾
* 4. 公共的协议放在common模块
* 5. 内部协议范围不允许使用
*/
public static final String NET_REQUEST_SUFFIX = "Request";
public static final String NET_RESPONSE_SUFFIX = "Response";
@@ -64,12 +70,15 @@ public class PacketService implements IPacketService {
public static final String NET_COMMON_MODULE = "common";
/** 内网协议最大id */
public static final short MAN_NATIVE_PROTOCOL_ID = 100;
private final Predicate<IProtocolRegistration> netGenerateProtocolFilter = registration
-> ProtocolManager.moduleByModuleId(registration.module()).getName().matches(NET_COMMON_MODULE)
|| registration.protocolConstructor().getDeclaringClass().getSimpleName().endsWith(NET_REQUEST_SUFFIX)
|| registration.protocolConstructor().getDeclaringClass().getSimpleName().endsWith(NET_RESPONSE_SUFFIX)
|| registration.protocolConstructor().getDeclaringClass().getSimpleName().endsWith(NET_NOTICE_SUFFIX);
|| registration.protocolConstructor().getDeclaringClass().getSimpleName().endsWith(NET_NOTICE_SUFFIX)
|| registration.protocolId() > MAN_NATIVE_PROTOCOL_ID;
public PacketService() {
@@ -86,31 +95,16 @@ public class PacketService implements IPacketService {
generateOperation.setFoldProtocol(netConfig.isFoldProtocol());
generateOperation.setProtocolPath(netConfig.getProtocolPath());
generateOperation.setProtocolParam(netConfig.getProtocolParam());
if (netConfig.isJavascriptProtocol()) {
generateOperation.getGenerateLanguages().add(CodeLanguage.JavaScript);
}
if (netConfig.isTypescriptProtocol()) {
generateOperation.getGenerateLanguages().add(CodeLanguage.TypeScript);
}
if (netConfig.isCsharpProtocol()) {
generateOperation.getGenerateLanguages().add(CodeLanguage.CSharp);
}
if (netConfig.isLuaProtocol()) {
generateOperation.getGenerateLanguages().add(CodeLanguage.Lua);
}
if (netConfig.isGdscriptProtocol()) {
generateOperation.getGenerateLanguages().add(CodeLanguage.GdScript);
}
if (netConfig.isCppProtocol()) {
generateOperation.getGenerateLanguages().add(CodeLanguage.Cpp);
}
if (netConfig.isGoProtocol()) {
generateOperation.getGenerateLanguages().add(CodeLanguage.Go);
}
if (netConfig.isProtobufProtocol()) {
generateOperation.getGenerateLanguages().add(CodeLanguage.Protobuf);
}
var protocolArr = StringUtils.tokenize(netConfig.getProtocolList(), StringUtils.SEMICOLON_COMMA);
for (var protocolCode : protocolArr) {
protocolCode = protocolCode.replaceAll(StringUtils.SPACE_REGEX, "");
var codeLanguage = getProtocolList(protocolCode);
if (CollectionUtils.isEmpty(codeLanguage)) {
continue;
}
generateOperation.getGenerateLanguages().addAll(codeLanguage);
}
// 设置生成协议的过滤器
GenerateProtocolFile.generateProtocolFilter = netGenerateProtocolFilter;
@@ -131,6 +125,28 @@ public class PacketService implements IPacketService {
}
}
/**
* 获取要生成协议列表
* @param protocolCode
* @return
*/
private Set<CodeLanguage> getProtocolList(String protocolCode) {
var languageSet = new HashSet<CodeLanguage>();
boolean isNumeric = StringUtils.isNumeric(protocolCode);
for (var codeLanguage : CodeLanguage.values()) {
if (isNumeric) {
var protocolBit = Integer.valueOf(protocolCode);
if ((protocolBit & codeLanguage.id) != 0) {
languageSet.add(codeLanguage);
}
} else if (codeLanguage.name().equalsIgnoreCase(protocolCode)) {
languageSet.add(codeLanguage);
break;
}
}
return languageSet;
}
@Override
public DecodedPacketInfo read(ByteBuf buffer) {
// 包的长度在上一层已经解析过
net/src/main/java/com/zfoo/net/packet/common/Error.java
+4 -2
View File
@@ -14,6 +14,7 @@
package com.zfoo.net.packet.common;
import com.baidu.bjf.remoting.protobuf.annotation.Ignore;
import com.baidu.bjf.remoting.protobuf.annotation.Protobuf;
import com.baidu.bjf.remoting.protobuf.annotation.ProtobufClass;
import com.zfoo.protocol.IPacket;
import com.zfoo.protocol.ProtocolManager;
@@ -29,10 +30,11 @@ public class Error implements IPacket {
@Ignore
public static final short PROTOCOL_ID = 101;
@Protobuf(order = 1)
private int module;
@Protobuf(order = 2)
private int errorCode;
@Protobuf(order = 3)
private String errorMessage;
@Override
net/src/main/java/com/zfoo/net/schema/NetDefinitionParser.java
+2 -10
View File
@@ -102,18 +102,10 @@ public class NetDefinitionParser implements BeanDefinitionParser {
// 协议protocol.xml文件的位置。 注意：直接写protocol.xml 则是从resources目录下读
resolvePlaceholder("protocol-location", "protocolLocation", builder, element, parserContext);
// 各种语言的文件是否生成
resolvePlaceholder("javascript-protocol", "javascriptProtocol", builder, element, parserContext);
resolvePlaceholder("typescript-protocol", "typescriptProtocol", builder, element, parserContext);
resolvePlaceholder("csharp-protocol", "csharpProtocol", builder, element, parserContext);
resolvePlaceholder("lua-protocol", "luaProtocol", builder, element, parserContext);
resolvePlaceholder("gdscript-protocol", "gdscriptProtocol", builder, element, parserContext);
resolvePlaceholder("cpp-protocol", "cppProtocol", builder, element, parserContext);
resolvePlaceholder("go-protocol", "goProtocol", builder, element, parserContext);
resolvePlaceholder("protobuf-protocol", "protobufProtocol", builder, element, parserContext);
// 文件是否折叠
resolvePlaceholder("fold-protocol", "foldProtocol", builder, element, parserContext);
// 生成各种语言的协议列表
resolvePlaceholder("protocol-list", "protocolList", builder, element, parserContext);
resolvePlaceholder("protocol-path", "protocolPath", builder, element, parserContext);
net/src/main/resources/net-1.0.xsd
+1 -8
View File
@@ -65,15 +65,8 @@
</xsd:sequence>
<xsd:attribute name="id" type="xsd:string" use="required"/>
<xsd:attribute name="protocol-location" type="xsd:string" use="required"/>
<xsd:attribute name="javascript-protocol" type="xsd:string" default="false"/>
<xsd:attribute name="typescript-protocol" type="xsd:string" default="false"/>
<xsd:attribute name="csharp-protocol" type="xsd:string" default="false"/>
<xsd:attribute name="lua-protocol" type="xsd:string" default="false"/>
<xsd:attribute name="gdscript-protocol" type="xsd:string" default="false"/>
<xsd:attribute name="cpp-protocol" type="xsd:string" default="false"/>
<xsd:attribute name="go-protocol" type="xsd:string" default="false"/>
<xsd:attribute name="protobuf-protocol" type="xsd:string" default="false"/>
<xsd:attribute name="fold-protocol" type="xsd:string" default="false"/>
<xsd:attribute name="protocol-list" type="xsd:string" default="0"/>
<xsd:attribute name="protocol-path" type="xsd:string"/>
<xsd:attribute name="protocol-param" type="xsd:string"/>
</xsd:complexType>
orm/pom.xml
+1
View File
@@ -36,6 +36,7 @@
<netty.version>4.1.84.Final</netty.version>
<jprotobuf.version>2.4.17</jprotobuf.version>
<kryo.version>5.3.0</kryo.version>
<reflections.version>0.10.2</reflections.version>
<!-- zookeeper -->
<curator.version>5.3.0</curator.version>
orm/src/test/java/com/zfoo/orm/entity/MailEntity.java
+2
View File
@@ -36,6 +36,8 @@ public class MailEntity implements IEntity<String> {
private String content;
// @Index(ascending = true, unique = false, ttlExpireAfterSeconds = 10)
// private Date createDate;
@Index(ascending = true, unique = false, ttlExpireAfterSeconds = 10)
private Date createDate;
orm/src/test/resources/deploy-dev.properties
+1 -1
View File
@@ -2,5 +2,5 @@ mongodb.database=test
mongodb.user=
mongodb.password=
mongodb.address.name=master
mongodb.address.url=127.0.0.1:27017
mongodb.address.url=192.168.2.36:27017
# mongodb.address.url=127.0.0.1:27017, 127.0.0.1:27018
protocol/pom.xml
+7
View File
@@ -36,6 +36,7 @@
<netty.version>4.1.84.Final</netty.version>
<jprotobuf.version>2.4.17</jprotobuf.version>
<kryo.version>5.3.0</kryo.version>
<reflections.version>0.10.2</reflections.version>
<!-- zookeeper -->
<curator.version>5.3.0</curator.version>
@@ -156,6 +157,12 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
<version>${reflections.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
protocol/src/main/java/com/zfoo/protocol/generate/GenerateProtocolFile.java
+2 -2
View File
@@ -175,8 +175,8 @@ public abstract class GenerateProtocolFile {
// 生成Protobuf协议
if (generateLanguages.contains(CodeLanguage.Protobuf)) {
GenerateProtobufUtils.init(generateOperation);
GenerateProtobufUtils.createProtocolManager();
GenerateProtobufUtils.createProtocols();
GenerateProtobufUtils.createProtocolManager(allSortedGenerateProtocols);
GenerateProtobufUtils.createProtocols(allSortedGenerateProtocols);
}
// 预留参数，以后可能会用，比如给Lua修改一个后缀名称
protocol/src/main/java/com/zfoo/protocol/registration/ProtocolAnalysis.java
+61 -1
View File
@@ -23,6 +23,7 @@ import com.zfoo.protocol.generate.GenerateProtocolFile;
import com.zfoo.protocol.generate.GenerateProtocolNote;
import com.zfoo.protocol.generate.GenerateProtocolPath;
import com.zfoo.protocol.registration.anno.Compatible;
import com.zfoo.protocol.registration.anno.NotEnhance;
import com.zfoo.protocol.registration.anno.Protocol;
import com.zfoo.protocol.registration.field.*;
import com.zfoo.protocol.serializer.cpp.GenerateCppUtils;
@@ -41,6 +42,7 @@ import com.zfoo.protocol.util.StringUtils;
import com.zfoo.protocol.xml.XmlProtocols;
import javassist.CannotCompileException;
import javassist.NotFoundException;
import org.reflections.Reflections;
import java.io.IOException;
import java.lang.reflect.*;
@@ -165,6 +167,10 @@ public class ProtocolAnalysis {
}
public static synchronized void analyze(XmlProtocols xmlProtocols, GenerateOperation generateOperation) {
if (xmlProtocols.isPackages()) {
analyzePackage(xmlProtocols, generateOperation);
return;
}
AssertionUtils.notNull(subProtocolIdMap, "[{}]已经初始完成，请不要重复初始化", ProtocolManager.class.getSimpleName());
try {
var enhanceList = new ArrayList<IProtocolRegistration>();
@@ -207,7 +213,7 @@ public class ProtocolAnalysis {
var clazz = Class.forName(location);
var protocolId = ProtocolManager.protocolId(clazz);
var registration = parseProtocolRegistration(clazz, module);
if (protocolDefinition.isEnhance()) {
if (!clazz.isAnnotationPresent(NotEnhance.class)) {
enhanceList.add(registration);
}
// 注册协议
@@ -220,6 +226,60 @@ public class ProtocolAnalysis {
}
}
public static void analyzePackage(XmlProtocols xmlProtocols, GenerateOperation generateOperation) {
AssertionUtils.notNull(subProtocolIdMap, "[{}]已经初始完成，请不要重复初始化", ProtocolManager.class.getSimpleName());
try {
var packageList = new HashSet<String>();
for (var moduleDefinition : xmlProtocols.getModules()) {
var module = new ProtocolModule(moduleDefinition.getId(), moduleDefinition.getName());
AssertionUtils.isTrue(module.getId() > 0, "[module:{}] [id:{}] 模块必须大于等于1", module.getName(), module.getId());
AssertionUtils.isNull(modules[module.getId()], "duplicate [module:{}] [id:{}] Exception!", module.getName(), module.getId());
AssertionUtils.notNull(moduleDefinition.getProtocols(), "[module:{}] does not have any protocols", module.getName());
modules[module.getId()] = module;
for (var protocolDefinition : moduleDefinition.getProtocols()) {
packageList.add(protocolDefinition.getLocation());
}
}
// 获取所有IPack子类
var packetClazzList = scanClassList(packageList);
for (Class<?> clazz : packetClazzList) {
var protocolId = getProtocolIdAndCheckClass(clazz);
initProtocolClass(protocolId, clazz);
}
var enhanceList = new ArrayList<IProtocolRegistration>();
for (var moduleDefinition : xmlProtocols.getModules()) {
var module = modules[moduleDefinition.getId()];
for (Class<?> clazz : packetClazzList) {
var protocolId = ProtocolManager.protocolId(clazz);
if (protocolId < moduleDefinition.getMinId() || protocolId >= moduleDefinition.getMaxId()) {
continue;
}
var registration = parseProtocolRegistration(clazz, module);
if (!clazz.isAnnotationPresent(NotEnhance.class)) {
enhanceList.add(registration);
}
// 注册协议
protocols[protocolId] = registration;
}
}
enhance(generateOperation, enhanceList);
} catch (Exception e) {
throw new UnknownException(e);
}
}
public static Set<Class<? extends IPacket>> scanClassList(Set<String> packageList) {
//获取该路径下所有类
Reflections reflections = new Reflections(packageList);
//获取继承了IPacket的所有类
Set<Class<? extends IPacket>> classSet = reflections.getSubTypesOf(IPacket.class);
return classSet.stream().filter(k -> !k.isInterface()).collect(Collectors.toSet());
}
private static void enhance(GenerateOperation generateOperation, List<IProtocolRegistration> enhanceList) throws IOException, ClassNotFoundException, NotFoundException, CannotCompileException, NoSuchFieldException, InvocationTargetException, NoSuchMethodException, IllegalAccessException, InstantiationException {
enhanceProtocolBefore(generateOperation);
enhanceProtocolRegistration(enhanceList);
protocol/src/main/java/com/zfoo/protocol/registration/anno/NotEnhance.java
+27
View File
@@ -0,0 +1,27 @@
/*
* 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.registration.anno;
import java.lang.annotation.*;
/**
* @author meiw
* @version 3.0
*/
@Documented
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.TYPE})
public @interface NotEnhance {
}
protocol/src/main/java/com/zfoo/protocol/registration/anno/Protocol.java
+1 -1
View File
@@ -14,5 +14,5 @@ public @interface Protocol {
short id() default 0;
String note() default "";
}
protocol/src/main/java/com/zfoo/protocol/serializer/CodeLanguage.java
+16 -9
View File
@@ -21,22 +21,29 @@ public enum CodeLanguage {
/**
* Javassist字节码增强
*/
Enhance,
Enhance(1),
Cpp,
Cpp(2),
Go,
Go(4),
JavaScript,
JavaScript(8),
TypeScript,
TypeScript(16),
Lua,
Lua(32),
CSharp,
CSharp(64),
GdScript,
GdScript(128),
Protobuf
Protobuf(256)
;
public final int id;
private CodeLanguage(int id) {
this.id = id;
}
}
protocol/src/main/java/com/zfoo/protocol/serializer/protobuf/GenerateProtobufUtils.java
+57 -74
View File
@@ -14,8 +14,10 @@
package com.zfoo.protocol.serializer.protobuf;
import com.baidu.bjf.remoting.protobuf.annotation.Protobuf;
import com.baidu.bjf.remoting.protobuf.annotation.ProtobufClass;
import com.zfoo.protocol.ProtocolManager;
import com.zfoo.protocol.collection.ArrayUtils;
import com.zfoo.protocol.collection.CollectionUtils;
import com.zfoo.protocol.exception.RunException;
import com.zfoo.protocol.generate.GenerateOperation;
import com.zfoo.protocol.generate.GenerateProtocolNote;
@@ -32,10 +34,7 @@ import com.zfoo.protocol.util.StringUtils;
import java.io.File;
import java.io.IOException;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Map;
import java.util.TreeMap;
import java.util.*;
import java.util.stream.Collectors;
import static com.zfoo.protocol.util.FileUtils.LS;
@@ -49,11 +48,12 @@ public abstract class GenerateProtobufUtils {
private static String protocolOutputRootPath = "protos/";
private static String protocolManagerName = "protocols";
public static final String NET_COMMON_MODULE = "common";
private static XmlProtobuf xmlProtobuf = null;
private static String protocolParam = null;
public static String syntax() {
return StringUtils.format("syntax = {}{}{};", StringUtils.QUOTATION_MARK, xmlProtobuf.getSyntax(), StringUtils.QUOTATION_MARK);
return StringUtils.format("syntax = {}{}{};", StringUtils.QUOTATION_MARK, "proto3", StringUtils.QUOTATION_MARK);
}
public static String option(String optionKey, String optionValue) {
@@ -65,6 +65,9 @@ public abstract class GenerateProtobufUtils {
}
public static Map<String, String> parseParam(String param) {
if (StringUtils.isEmpty(param)) {
return Map.of();
}
var params = param.trim().split(StringUtils.SEMICOLON_REGEX);
if (ArrayUtils.isEmpty(params)) {
@@ -83,63 +86,22 @@ public abstract class GenerateProtobufUtils {
protocolOutputRootPath = FileUtils.joinPath(generateOperation.getProtocolPath(), protocolOutputRootPath);
var protocolParam = generateOperation.getProtocolParam();
if (StringUtils.isEmpty(protocolParam)) {
throw new RunException("生成protobuf协议的protocolParam参数不能为空");
}
var map = parseParam(protocolParam);
var protobufXmlPath = map.get("protobuf");
GenerateProtobufUtils.protocolParam = protocolParam;
FileUtils.deleteFile(new File(protocolOutputRootPath));
FileUtils.createDirectory(protocolOutputRootPath);
var inputStream = ClassUtils.getFileFromClassPath(protobufXmlPath);
var xmlProtobufObj = DomUtils.inputStream2Object(inputStream, XmlProtobuf.class);
if (!xmlProtobufObj.getSyntax().equals("proto3")) {
throw new RunException("生成protobuf协议只支持proto3");
}
var protoSet = new HashSet<String>();
for (var protos : xmlProtobufObj.getProtos()) {
if (protos.getName().equals(protocolManagerName)) {
throw new RunException("protobuf的协议文件名称不能用保留名称[{}]", protocolManagerName);
}
if (protoSet.contains(protos.getName())) {
throw new RunException("protobuf的协议文件名称重复定义[{}]", protos.getName());
}
protoSet.add(protos.getName());
}
xmlProtobuf = xmlProtobufObj;
}
public static void createProtocolManager() throws ClassNotFoundException {
var allGenerateProtocols = new HashSet<IProtocolRegistration>();
for (var protos : xmlProtobuf.getProtos()) {
for (var protocol : protos.getProtocols()) {
var protocolClass = Class.forName(protocol.getLocation());
var protocolId = ProtocolManager.protocolId(protocolClass);
var protocolRegistration = ProtocolManager.getProtocol(protocolId);
if (allGenerateProtocols.contains(protocolRegistration)) {
throw new RunException("protobuf的xml协议文件中重复定义了协议[{}]", protocolClass.getSimpleName());
}
allGenerateProtocols.add(protocolRegistration);
}
}
public static void createProtocolManager(List<IProtocolRegistration> allGenerateProtocols) {
var builder = new StringBuilder();
builder.append(syntax());
builder.append(LS).append(LS);
if (StringUtils.isNotEmpty(xmlProtobuf.getOption())) {
var optionMap = parseParam(xmlProtobuf.getOption());
var protocolParam = GenerateProtobufUtils.protocolParam;
var optionMap = parseParam(protocolParam);
if (CollectionUtils.isNotEmpty(optionMap)) {
for (var option : optionMap.entrySet()) {
builder.append(option(option.getKey(), option.getValue())).append(LS);
}
@@ -162,36 +124,37 @@ public abstract class GenerateProtobufUtils {
FileUtils.writeStringToFile(new File(protocolOutputPath), builder.toString(), true);
}
public static void createProtocols() throws ClassNotFoundException {
for (var protos : xmlProtobuf.getProtos()) {
public static void createProtocols(List<IProtocolRegistration> allGenerateProtocols) {
var packageMap = new HashMap<String, List<IProtocolRegistration>>();
for (var protocolRegistration : allGenerateProtocols) {
var clazz = protocolRegistration.protocolConstructor().getDeclaringClass();
String packageName = clazz.getPackageName();
var packagList = packageMap.computeIfAbsent(packageName, k -> new ArrayList<>());
packagList.add(protocolRegistration);
}
for (var protos : packageMap.entrySet()) {
var builder = new StringBuilder();
builder.append(syntax());
builder.append(LS).append(LS);
if (StringUtils.isNotEmpty(protos.getImportProto())) {
var params = protos.getImportProto().trim().split(StringUtils.SEMICOLON_REGEX);
for (var importProto : params) {
if (StringUtils.isBlank(importProto)) {
continue;
}
builder.append(importProto(importProto.trim())).append(LS);
}
builder.append(LS);
}
if (StringUtils.isNotEmpty(protos.getOption())) {
var optionMap = parseParam(protos.getOption());
var protocolParam = GenerateProtobufUtils.protocolParam;
var optionMap = parseParam(protocolParam);
if (CollectionUtils.isNotEmpty(optionMap)) {
for (var option : optionMap.entrySet()) {
builder.append(option(option.getKey(), option.getValue())).append(LS);
}
builder.append(LS);
}
builder.append(importProto(NET_COMMON_MODULE)).append(LS);
builder.append(LS);
for (var protocol : protos.getProtocols()) {
var protocolClass = Class.forName(protocol.getLocation());
var protocolId = ProtocolManager.protocolId(protocolClass);
var protocolRegistration = ProtocolManager.getProtocol(protocolId);
for (var protocolRegistration : protos.getValue()) {
var protocolClass = protocolRegistration.protocolConstructor().getDeclaringClass();
var protocolId = protocolRegistration.protocolId();
if (!isProtobufProtocol((ProtocolRegistration) protocolRegistration)) {
continue;
}
builder.append("// id = ").append(protocolId).append(LS);
@@ -205,11 +168,31 @@ public abstract class GenerateProtobufUtils {
builder.append("}").append(LS).append(LS);
}
var protocolOutputPath = StringUtils.format("{}/{}.proto", protocolOutputRootPath, protos.getName());
String protoName = StringUtils.substringAfterLast(protos.getKey(), StringUtils.PERIOD);
var protocolOutputPath = StringUtils.format("{}/{}.proto", protocolOutputRootPath, protoName);
FileUtils.writeStringToFile(new File(protocolOutputPath), builder.toString(), true);
}
}
/**
* 判断是否是protobuf协议
* @param registration
* @return
*/
private static boolean isProtobufProtocol(ProtocolRegistration registration) {
var protocolClass = registration.protocolConstructor().getDeclaringClass();
if (protocolClass.isAnnotationPresent(ProtobufClass.class)) {
return true;
}
var fields = registration.getFields();
for (var field : fields) {
if (!field.isAnnotationPresent(Protobuf.class)) {
return false;
}
}
return true;
}
/**
* 优化一下生成协议顺序
*
@@ -317,7 +300,7 @@ public abstract class GenerateProtobufUtils {
public static void clear() {
protocolOutputRootPath = null;
protocolManagerName = null;
xmlProtobuf = null;
protocolParam = null;
}
}
protocol/src/main/java/com/zfoo/protocol/util/StringUtils.java
+19
View File
@@ -79,6 +79,8 @@ public abstract class StringUtils {
public static final String EMPTY_JSON = "{}";
public static final String SEMICOLON_COMMA = ";|,"; //分号或者逗号
public static final String MULTIPLE_HYPHENS = "-----------------------------------------------------------------------";
@@ -482,5 +484,22 @@ public abstract class StringUtils {
return Character.isWhitespace(ch) || STOP_WORD.contains(ch);
}
/**
* 判断是否是数字
* @param str
* @return
*/
public static boolean isNumeric(String str) {
if(str == null) {
return false;
}
int sz = str.length();
for(int i = 0; i < sz; i++) {
if (!Character.isDigit(str.charAt(i))) {
return false;
}
}
return true;
}
}
protocol/src/main/java/com/zfoo/protocol/xml/XmlProtocolDefinition.java
+1 -9
View File
@@ -16,7 +16,7 @@ package com.zfoo.protocol.xml;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
@JsonPropertyOrder({"id", "location", "enhance"})
@JsonPropertyOrder({"id", "location"})
public class XmlProtocolDefinition {
@JacksonXmlProperty(isAttribute = true, localName = "id")
@@ -25,10 +25,6 @@ public class XmlProtocolDefinition {
@JacksonXmlProperty(isAttribute = true, localName = "location")
private String location;
@JacksonXmlProperty(isAttribute = true, localName = "enhance")
private boolean enhance = true;
public short getId() {
return id;
}
@@ -37,8 +33,4 @@ public class XmlProtocolDefinition {
return location;
}
public boolean isEnhance() {
return enhance;
}
}
protocol/src/main/java/com/zfoo/protocol/xml/XmlProtocols.java
+8 -1
View File
@@ -20,13 +20,16 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
import java.util.List;
@JsonPropertyOrder({"author", "modules"})
@JsonPropertyOrder({"author", "packages", "modules"})
@JacksonXmlRootElement(localName = "protocols")
public class XmlProtocols {
@JacksonXmlProperty(isAttribute = true, localName = "author")
private String author;
@JacksonXmlProperty(isAttribute = true, localName = "packages")
private boolean packages;
@JacksonXmlProperty(localName = "module")
@JacksonXmlElementWrapper(useWrapping = false)
private List<XmlModuleDefinition> modules;
@@ -35,6 +38,10 @@ public class XmlProtocols {
return author;
}
public boolean isPackages() {
return packages;
}
public List<XmlModuleDefinition> getModules() {
return modules;
}
protocol/src/test/java/com/zfoo/protocol/jprotobuf/JProtobufTest.java
+1 -1
View File
@@ -76,7 +76,7 @@ public class JProtobufTest {
var op = GenerateOperation.NO_OPERATION;
op.getGenerateLanguages().add(CodeLanguage.Protobuf);
op.setFoldProtocol(true);
op.setProtocolParam("protobuf=protobuf.xml");
// op.setProtocolParam("protobuf=protobuf.xml");
ProtocolManager.initProtocol(Set.of(ObjectA.class, ObjectB.class, ObjectC.class), op);
}
scheduler/pom.xml
+1
View File
@@ -36,6 +36,7 @@
<netty.version>4.1.84.Final</netty.version>
<jprotobuf.version>2.4.17</jprotobuf.version>
<kryo.version>5.3.0</kryo.version>
<reflections.version>0.10.2</reflections.version>
<!-- zookeeper -->
<curator.version>5.3.0</curator.version>
scheduler/src/main/java/com/zfoo/scheduler/manager/SchedulerBus.java
+7 -6
View File
@@ -36,6 +36,7 @@ import java.util.concurrent.atomic.AtomicInteger;
*/
public abstract class SchedulerBus {
private static final Logger logger = LoggerFactory.getLogger(SchedulerBus.class);
private static final List<SchedulerDefinition> schedulerDefList = new CopyOnWriteArrayList<>();
@@ -165,24 +166,24 @@ public abstract class SchedulerBus {
/**
* 不断执行的周期循环任务
*/
public static void scheduleAtFixedRate(Runnable runnable, long period, TimeUnit unit) {
public static ScheduledFuture<?> scheduleAtFixedRate(Runnable runnable, long period, TimeUnit unit) {
if (SchedulerContext.isStop()) {
return;
return null;
}
executor.scheduleAtFixedRate(SafeRunnable.valueOf(runnable), 0, period, unit);
return executor.scheduleAtFixedRate(SafeRunnable.valueOf(runnable), 0, period, unit);
}
/**
* 固定延迟执行的任务
*/
public static void schedule(Runnable runnable, long delay, TimeUnit unit) {
public static ScheduledFuture<?> schedule(Runnable runnable, long delay, TimeUnit unit) {
if (SchedulerContext.isStop()) {
return;
return null;
}
executor.schedule(SafeRunnable.valueOf(runnable), delay, unit);
return executor.schedule(SafeRunnable.valueOf(runnable), delay, unit);
}
/**
storage/pom.xml
+1
View File
@@ -36,6 +36,7 @@
<netty.version>4.1.84.Final</netty.version>
<jprotobuf.version>2.4.17</jprotobuf.version>
<kryo.version>5.3.0</kryo.version>
<reflections.version>0.10.2</reflections.version>
<!-- zookeeper -->
<curator.version>5.3.0</curator.version>
util/pom.xml
+1
View File
@@ -36,6 +36,7 @@
<netty.version>4.1.84.Final</netty.version>
<jprotobuf.version>2.4.17</jprotobuf.version>
<kryo.version>5.3.0</kryo.version>
<reflections.version>0.10.2</reflections.version>
<!-- zookeeper -->
<curator.version>5.3.0</curator.version>