From ae87bf3f523904220bf8361dd196ee06dfb5395b Mon Sep 17 00:00:00 2001 From: wmltogether Date: Sun, 29 Jan 2023 13:42:46 +0800 Subject: [PATCH] =?UTF-8?q?[change]=20=E4=BD=BF=E7=94=A8int64=E5=AD=98?= =?UTF-8?q?=E5=82=A8datetime=E7=B1=BB=E5=9E=8B=EF=BC=8C=E9=81=BF=E5=85=8D?= =?UTF-8?q?=E8=AF=BB=E5=8F=96=E6=97=A5=E6=9C=9F=E8=B6=85=E8=BF=872038?= =?UTF-8?q?=E5=B9=B4=E5=87=BA=E7=8E=B0=E9=97=AE=E9=A2=98=20(#38)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Source/DataExporters/BinaryExportor.cs | 2 +- .../Source/DataExporters/ProtobufBinExportor.cs | 2 +- src/Luban.Job.Cfg/Source/Datas/DDateTime.cs | 10 +++++----- .../TypeVisitors/CppUnderingDeserializeVisitor.cs | 2 +- .../Source/TypeVisitors/CsJsonDeserialize.cs | 2 +- .../Source/TypeVisitors/JavaJsonDeserialize.cs | 2 +- .../TypeVisitors/JavaUnderingDeserializeVisitor.cs | 2 +- .../TypeVisitors/RustJsonUnderingConstructorVisitor.cs | 2 +- .../Source/TypeVisitors/UeBpCppDefineTypeVisitor.cs | 2 +- .../Source/TypeVisitors/CsUnderingDefineTypeName.cs | 2 +- .../TypeVisitors/CsUnderingDeserializeVisitor.cs | 2 +- .../Source/TypeVisitors/CsUnderingSerializeVisitor.cs | 2 +- .../Source/TypeVisitors/FlatBuffersTypeNameVisitor.cs | 2 +- .../TypeVisitors/GoDeserializeUnderingVisitor.cs | 2 +- .../Source/TypeVisitors/GoSerializeUnderingVisitor.cs | 2 +- .../Source/TypeVisitors/GoTypeUnderingNameVisitor.cs | 2 +- .../Source/TypeVisitors/JavaBoxDefineTypeName.cs | 2 +- .../Source/TypeVisitors/JavaDefineTypeName.cs | 2 +- .../TypeVisitors/JavaUnderingDeserializeVisitor.cs | 2 +- .../TypeVisitors/JavaUnderingSerializeVisitor.cs | 2 +- .../TypeVisitors/LuaDeserializeMethodNameVisitor.cs | 2 +- .../TypeVisitors/LuaSerializeMethodNameVisitor.cs | 2 +- .../Source/TypeVisitors/ProtobufTypeNameVisitor.cs | 2 +- .../TypeVisitors/RustTypeUnderlyingNameVisitor.cs | 2 +- .../Source/TypeVisitors/TagNameVisitor.cs | 2 +- .../TypescriptBinUnderingDeserializeVisitorBase.cs | 2 +- .../TypescriptBinUnderingSerializeVisitor.cs | 2 +- .../TypeVisitors/DbCsCompatibleDeserializeVisitor.cs | 2 +- .../TypeVisitors/DbCsCompatibleSerializeVisitor.cs | 4 ++-- .../Source/TypeVisitors/DbCsDeserializeFuncVisitor.cs | 2 +- .../Source/TypeVisitors/DbCsInitFieldVisitor.cs | 2 +- .../Source/TypeVisitors/DbCsSerializeFuncVisitor.cs | 2 +- .../TypeVisitors/DbTypescriptDeserializeFuncVisitor.cs | 2 +- .../TypeVisitors/DbTypescriptInitFieldVisitor.cs | 5 +++-- .../TypeVisitors/DbTypescriptSerializeFuncVisitor.cs | 2 +- 35 files changed, 42 insertions(+), 41 deletions(-) diff --git a/src/Luban.Job.Cfg/Source/DataExporters/BinaryExportor.cs b/src/Luban.Job.Cfg/Source/DataExporters/BinaryExportor.cs index 139da83..db8e120 100644 --- a/src/Luban.Job.Cfg/Source/DataExporters/BinaryExportor.cs +++ b/src/Luban.Job.Cfg/Source/DataExporters/BinaryExportor.cs @@ -179,7 +179,7 @@ namespace Luban.Job.Cfg.DataExporters public void Accept(DDateTime type, ByteBuf x) { - x.WriteInt(type.UnixTimeOfCurrentAssembly); + x.WriteLong(type.UnixTimeOfCurrentAssembly); } } } diff --git a/src/Luban.Job.Cfg/Source/DataExporters/ProtobufBinExportor.cs b/src/Luban.Job.Cfg/Source/DataExporters/ProtobufBinExportor.cs index 58b6f0e..1d14c67 100644 --- a/src/Luban.Job.Cfg/Source/DataExporters/ProtobufBinExportor.cs +++ b/src/Luban.Job.Cfg/Source/DataExporters/ProtobufBinExportor.cs @@ -87,7 +87,7 @@ namespace Luban.Job.Cfg.DataExporters public void Accept(DDateTime type, CodedOutputStream x) { - x.WriteInt32(type.UnixTimeOfCurrentAssembly); + x.WriteInt64(type.UnixTimeOfCurrentAssembly); } public void Accept(DString type, CodedOutputStream x) diff --git a/src/Luban.Job.Cfg/Source/Datas/DDateTime.cs b/src/Luban.Job.Cfg/Source/Datas/DDateTime.cs index ecddf6e..9808d3e 100644 --- a/src/Luban.Job.Cfg/Source/Datas/DDateTime.cs +++ b/src/Luban.Job.Cfg/Source/Datas/DDateTime.cs @@ -11,7 +11,7 @@ namespace Luban.Job.Cfg.Datas public DateTime Time { get; } //public int UnixTime { get; } - private readonly int _localTime; + private readonly long _localTime; public override string TypeName => "datetime"; @@ -21,7 +21,7 @@ namespace Luban.Job.Cfg.Datas this.Time = time; // time.Kind == DateTimeKind.Unspecified // DateTimeOffset把它当作Local处理 - this._localTime = (int)new DateTimeOffset(TimeZoneInfo.ConvertTime(time, TimeZoneUtil.DefaultTimeZone, TimeZoneInfo.Utc)).ToUnixTimeSeconds(); + this._localTime = (long)new DateTimeOffset(TimeZoneInfo.ConvertTime(time, TimeZoneUtil.DefaultTimeZone, TimeZoneInfo.Utc)).ToUnixTimeSeconds(); } public override bool Equals(object obj) @@ -48,7 +48,7 @@ namespace Luban.Job.Cfg.Datas return DataUtil.FormatDateTime(Time); } - public int GetUnixTime(TimeZoneInfo asTimeZone) + public long GetUnixTime(TimeZoneInfo asTimeZone) { if (asTimeZone == null || asTimeZone == TimeZoneInfo.Local) { @@ -57,11 +57,11 @@ namespace Luban.Job.Cfg.Datas else { var destDateTime = TimeZoneInfo.ConvertTime(Time, asTimeZone, TimeZoneInfo.Utc); - return (int)new DateTimeOffset(destDateTime).ToUnixTimeSeconds(); + return (long)new DateTimeOffset(destDateTime).ToUnixTimeSeconds(); } } - public int UnixTimeOfCurrentAssembly => GetUnixTime(DefAssembly.LocalAssebmly.TimeZone); + public long UnixTimeOfCurrentAssembly => GetUnixTime(DefAssembly.LocalAssebmly.TimeZone); public override void Apply(IDataActionVisitor visitor, T x) { diff --git a/src/Luban.Job.Cfg/Source/TypeVisitors/CppUnderingDeserializeVisitor.cs b/src/Luban.Job.Cfg/Source/TypeVisitors/CppUnderingDeserializeVisitor.cs index dbb2e0a..48e4a10 100644 --- a/src/Luban.Job.Cfg/Source/TypeVisitors/CppUnderingDeserializeVisitor.cs +++ b/src/Luban.Job.Cfg/Source/TypeVisitors/CppUnderingDeserializeVisitor.cs @@ -120,7 +120,7 @@ namespace Luban.Job.Cfg.TypeVisitors public string Accept(TDateTime type, string bufName, string fieldName) { - return $"if(!{bufName}.readInt({fieldName})) return false;"; + return $"if(!{bufName}.readLong({fieldName})) return false;"; } } } diff --git a/src/Luban.Job.Cfg/Source/TypeVisitors/CsJsonDeserialize.cs b/src/Luban.Job.Cfg/Source/TypeVisitors/CsJsonDeserialize.cs index 5b308ab..df948a5 100644 --- a/src/Luban.Job.Cfg/Source/TypeVisitors/CsJsonDeserialize.cs +++ b/src/Luban.Job.Cfg/Source/TypeVisitors/CsJsonDeserialize.cs @@ -150,7 +150,7 @@ namespace Luban.Job.Cfg.TypeVisitors public string Accept(TDateTime type, string json, string x, int depth) { - return $"{x} = {json}.GetInt32();"; + return $"{x} = {json}.GetInt64();"; } } } diff --git a/src/Luban.Job.Cfg/Source/TypeVisitors/JavaJsonDeserialize.cs b/src/Luban.Job.Cfg/Source/TypeVisitors/JavaJsonDeserialize.cs index 977135e..5100659 100644 --- a/src/Luban.Job.Cfg/Source/TypeVisitors/JavaJsonDeserialize.cs +++ b/src/Luban.Job.Cfg/Source/TypeVisitors/JavaJsonDeserialize.cs @@ -152,7 +152,7 @@ namespace Luban.Job.Cfg.TypeVisitors public string Accept(TDateTime type, string json, string x, int depth) { - return $"{x} = {json}.getAsInt();"; + return $"{x} = {json}.getAsLong();"; } } } diff --git a/src/Luban.Job.Cfg/Source/TypeVisitors/JavaUnderingDeserializeVisitor.cs b/src/Luban.Job.Cfg/Source/TypeVisitors/JavaUnderingDeserializeVisitor.cs index 22e8c75..52e4649 100644 --- a/src/Luban.Job.Cfg/Source/TypeVisitors/JavaUnderingDeserializeVisitor.cs +++ b/src/Luban.Job.Cfg/Source/TypeVisitors/JavaUnderingDeserializeVisitor.cs @@ -127,7 +127,7 @@ namespace Luban.Job.Cfg.TypeVisitors public string Accept(TDateTime type, string bufName, string fieldName) { - return $"{fieldName} = {bufName}.readInt();"; + return $"{fieldName} = {bufName}.readLong();"; } } } diff --git a/src/Luban.Job.Cfg/Source/TypeVisitors/RustJsonUnderingConstructorVisitor.cs b/src/Luban.Job.Cfg/Source/TypeVisitors/RustJsonUnderingConstructorVisitor.cs index 20bfbb1..dc0ad46 100644 --- a/src/Luban.Job.Cfg/Source/TypeVisitors/RustJsonUnderingConstructorVisitor.cs +++ b/src/Luban.Job.Cfg/Source/TypeVisitors/RustJsonUnderingConstructorVisitor.cs @@ -125,7 +125,7 @@ namespace Luban.Job.Cfg.TypeVisitors public string Accept(TDateTime type, string jsonVarName) { - return AsType(jsonVarName, "i32"); + return AsType(jsonVarName, "i64"); } } } diff --git a/src/Luban.Job.Cfg/Source/TypeVisitors/UeBpCppDefineTypeVisitor.cs b/src/Luban.Job.Cfg/Source/TypeVisitors/UeBpCppDefineTypeVisitor.cs index 5dd94bb..85e9f7e 100644 --- a/src/Luban.Job.Cfg/Source/TypeVisitors/UeBpCppDefineTypeVisitor.cs +++ b/src/Luban.Job.Cfg/Source/TypeVisitors/UeBpCppDefineTypeVisitor.cs @@ -122,7 +122,7 @@ namespace Luban.Job.Cfg.TypeVisitors public string Accept(TDateTime type) { - return "int32"; + return "int64"; } } } diff --git a/src/Luban.Job.Common/Source/TypeVisitors/CsUnderingDefineTypeName.cs b/src/Luban.Job.Common/Source/TypeVisitors/CsUnderingDefineTypeName.cs index 47bbc25..5d409ad 100644 --- a/src/Luban.Job.Common/Source/TypeVisitors/CsUnderingDefineTypeName.cs +++ b/src/Luban.Job.Common/Source/TypeVisitors/CsUnderingDefineTypeName.cs @@ -152,7 +152,7 @@ namespace Luban.Job.Common.TypeVisitors { return mapper.TargetTypeName; } - return "int"; + return "long"; } } } diff --git a/src/Luban.Job.Common/Source/TypeVisitors/CsUnderingDeserializeVisitor.cs b/src/Luban.Job.Common/Source/TypeVisitors/CsUnderingDeserializeVisitor.cs index 8cc229a..e16a34c 100644 --- a/src/Luban.Job.Common/Source/TypeVisitors/CsUnderingDeserializeVisitor.cs +++ b/src/Luban.Job.Common/Source/TypeVisitors/CsUnderingDeserializeVisitor.cs @@ -152,7 +152,7 @@ namespace Luban.Job.Common.TypeVisitors public string Accept(TDateTime type, string bufName, string fieldName, int depth) { - string src = $"{bufName}.ReadInt()"; + string src = $"{bufName}.ReadLong()"; return $"{fieldName} = {ExternalTypeUtil.CsCloneToExternal("datetime", src)};"; } } diff --git a/src/Luban.Job.Common/Source/TypeVisitors/CsUnderingSerializeVisitor.cs b/src/Luban.Job.Common/Source/TypeVisitors/CsUnderingSerializeVisitor.cs index 540e11b..9eb3a2a 100644 --- a/src/Luban.Job.Common/Source/TypeVisitors/CsUnderingSerializeVisitor.cs +++ b/src/Luban.Job.Common/Source/TypeVisitors/CsUnderingSerializeVisitor.cs @@ -122,7 +122,7 @@ namespace Luban.Job.Common.TypeVisitors public string Accept(TDateTime type, string bufName, string fieldName) { - return $"{bufName}.WriteInt({fieldName});"; + return $"{bufName}.WriteLong({fieldName});"; } } } diff --git a/src/Luban.Job.Common/Source/TypeVisitors/FlatBuffersTypeNameVisitor.cs b/src/Luban.Job.Common/Source/TypeVisitors/FlatBuffersTypeNameVisitor.cs index d9df4ca..46b05fc 100644 --- a/src/Luban.Job.Common/Source/TypeVisitors/FlatBuffersTypeNameVisitor.cs +++ b/src/Luban.Job.Common/Source/TypeVisitors/FlatBuffersTypeNameVisitor.cs @@ -98,7 +98,7 @@ namespace Luban.Job.Common.TypeVisitors public string Accept(TDateTime type) { - return "int32"; + return "int64"; } public string Accept(TBean type) diff --git a/src/Luban.Job.Common/Source/TypeVisitors/GoDeserializeUnderingVisitor.cs b/src/Luban.Job.Common/Source/TypeVisitors/GoDeserializeUnderingVisitor.cs index 6f3cb7c..26cd116 100644 --- a/src/Luban.Job.Common/Source/TypeVisitors/GoDeserializeUnderingVisitor.cs +++ b/src/Luban.Job.Common/Source/TypeVisitors/GoDeserializeUnderingVisitor.cs @@ -94,7 +94,7 @@ namespace Luban.Job.Common.TypeVisitors public string Accept(TDateTime type, string fieldName, string bufName, string err) { - return $"{{ if {fieldName}, {err} = {bufName}.ReadInt(); {err} != nil {{ {err} = errors.New(\"{fieldName} error\"); return }} }}"; + return $"{{ if {fieldName}, {err} = {bufName}.ReadLong(); {err} != nil {{ {err} = errors.New(\"{fieldName} error\"); return }} }}"; } public string Accept(TBean type, string fieldName, string bufName, string err) diff --git a/src/Luban.Job.Common/Source/TypeVisitors/GoSerializeUnderingVisitor.cs b/src/Luban.Job.Common/Source/TypeVisitors/GoSerializeUnderingVisitor.cs index 78c5f19..0ed717f 100644 --- a/src/Luban.Job.Common/Source/TypeVisitors/GoSerializeUnderingVisitor.cs +++ b/src/Luban.Job.Common/Source/TypeVisitors/GoSerializeUnderingVisitor.cs @@ -94,7 +94,7 @@ namespace Luban.Job.Common.TypeVisitors public string Accept(TDateTime type, string fieldName, string bufName) { - return $"{bufName}.WriteInt({fieldName})"; + return $"{bufName}.WriteLong({fieldName})"; } public string Accept(TBean type, string fieldName, string bufName) diff --git a/src/Luban.Job.Common/Source/TypeVisitors/GoTypeUnderingNameVisitor.cs b/src/Luban.Job.Common/Source/TypeVisitors/GoTypeUnderingNameVisitor.cs index be16e1f..0951438 100644 --- a/src/Luban.Job.Common/Source/TypeVisitors/GoTypeUnderingNameVisitor.cs +++ b/src/Luban.Job.Common/Source/TypeVisitors/GoTypeUnderingNameVisitor.cs @@ -119,7 +119,7 @@ namespace Luban.Job.Common.TypeVisitors public string Accept(TDateTime type) { - return "int32"; + return "int64"; } } } diff --git a/src/Luban.Job.Common/Source/TypeVisitors/JavaBoxDefineTypeName.cs b/src/Luban.Job.Common/Source/TypeVisitors/JavaBoxDefineTypeName.cs index b63e443..32b9894 100644 --- a/src/Luban.Job.Common/Source/TypeVisitors/JavaBoxDefineTypeName.cs +++ b/src/Luban.Job.Common/Source/TypeVisitors/JavaBoxDefineTypeName.cs @@ -58,7 +58,7 @@ namespace Luban.Job.Common.TypeVisitors public override string Accept(TDateTime type) { - return "Integer"; + return "Long"; } public override string Accept(TEnum type) diff --git a/src/Luban.Job.Common/Source/TypeVisitors/JavaDefineTypeName.cs b/src/Luban.Job.Common/Source/TypeVisitors/JavaDefineTypeName.cs index 0ad40cb..575e338 100644 --- a/src/Luban.Job.Common/Source/TypeVisitors/JavaDefineTypeName.cs +++ b/src/Luban.Job.Common/Source/TypeVisitors/JavaDefineTypeName.cs @@ -119,7 +119,7 @@ namespace Luban.Job.Common.TypeVisitors public virtual string Accept(TDateTime type) { - return type.IsNullable ? "Integer" : "int"; + return type.IsNullable ? "Long" : "long"; } } } diff --git a/src/Luban.Job.Common/Source/TypeVisitors/JavaUnderingDeserializeVisitor.cs b/src/Luban.Job.Common/Source/TypeVisitors/JavaUnderingDeserializeVisitor.cs index 2938c20..4bede4f 100644 --- a/src/Luban.Job.Common/Source/TypeVisitors/JavaUnderingDeserializeVisitor.cs +++ b/src/Luban.Job.Common/Source/TypeVisitors/JavaUnderingDeserializeVisitor.cs @@ -149,7 +149,7 @@ namespace Luban.Job.Common.TypeVisitors public string Accept(TDateTime type, string bufName, string fieldName, int depth) { - return $"{fieldName} = {bufName}.readInt();"; + return $"{fieldName} = {bufName}.readLong();"; } } } diff --git a/src/Luban.Job.Common/Source/TypeVisitors/JavaUnderingSerializeVisitor.cs b/src/Luban.Job.Common/Source/TypeVisitors/JavaUnderingSerializeVisitor.cs index 5d15a40..82ed620 100644 --- a/src/Luban.Job.Common/Source/TypeVisitors/JavaUnderingSerializeVisitor.cs +++ b/src/Luban.Job.Common/Source/TypeVisitors/JavaUnderingSerializeVisitor.cs @@ -122,7 +122,7 @@ namespace Luban.Job.Common.TypeVisitors public string Accept(TDateTime type, string bufName, string fieldName) { - return $"{bufName}.writeInt({fieldName});"; + return $"{bufName}.writeLong({fieldName});"; } } } diff --git a/src/Luban.Job.Common/Source/TypeVisitors/LuaDeserializeMethodNameVisitor.cs b/src/Luban.Job.Common/Source/TypeVisitors/LuaDeserializeMethodNameVisitor.cs index 1c818a6..ff44e65 100644 --- a/src/Luban.Job.Common/Source/TypeVisitors/LuaDeserializeMethodNameVisitor.cs +++ b/src/Luban.Job.Common/Source/TypeVisitors/LuaDeserializeMethodNameVisitor.cs @@ -118,7 +118,7 @@ namespace Luban.Job.Common.TypeVisitors public string Accept(TDateTime type) { - return "readInt"; + return "readLong"; } } } diff --git a/src/Luban.Job.Common/Source/TypeVisitors/LuaSerializeMethodNameVisitor.cs b/src/Luban.Job.Common/Source/TypeVisitors/LuaSerializeMethodNameVisitor.cs index 1629323..28edb9b 100644 --- a/src/Luban.Job.Common/Source/TypeVisitors/LuaSerializeMethodNameVisitor.cs +++ b/src/Luban.Job.Common/Source/TypeVisitors/LuaSerializeMethodNameVisitor.cs @@ -118,7 +118,7 @@ namespace Luban.Job.Common.TypeVisitors public string Accept(TDateTime type) { - return "writeInt"; + return "writeLong"; } } } diff --git a/src/Luban.Job.Common/Source/TypeVisitors/ProtobufTypeNameVisitor.cs b/src/Luban.Job.Common/Source/TypeVisitors/ProtobufTypeNameVisitor.cs index d46c1ea..fe07676 100644 --- a/src/Luban.Job.Common/Source/TypeVisitors/ProtobufTypeNameVisitor.cs +++ b/src/Luban.Job.Common/Source/TypeVisitors/ProtobufTypeNameVisitor.cs @@ -98,7 +98,7 @@ namespace Luban.Job.Common.TypeVisitors public string Accept(TDateTime type) { - return "int32"; + return "int64"; } public string Accept(TBean type) diff --git a/src/Luban.Job.Common/Source/TypeVisitors/RustTypeUnderlyingNameVisitor.cs b/src/Luban.Job.Common/Source/TypeVisitors/RustTypeUnderlyingNameVisitor.cs index f30c60c..640ed8f 100644 --- a/src/Luban.Job.Common/Source/TypeVisitors/RustTypeUnderlyingNameVisitor.cs +++ b/src/Luban.Job.Common/Source/TypeVisitors/RustTypeUnderlyingNameVisitor.cs @@ -118,7 +118,7 @@ namespace Luban.Job.Common.TypeVisitors public string Accept(TDateTime type) { - return "i32"; + return "i64"; } } } diff --git a/src/Luban.Job.Common/Source/TypeVisitors/TagNameVisitor.cs b/src/Luban.Job.Common/Source/TypeVisitors/TagNameVisitor.cs index f5ef1ca..a813248 100644 --- a/src/Luban.Job.Common/Source/TypeVisitors/TagNameVisitor.cs +++ b/src/Luban.Job.Common/Source/TypeVisitors/TagNameVisitor.cs @@ -118,7 +118,7 @@ namespace Luban.Job.Common.TypeVisitors public string Accept(TDateTime type) { - return "INT"; + return "LONG"; } } } diff --git a/src/Luban.Job.Common/Source/TypeVisitors/TypescriptBinUnderingDeserializeVisitorBase.cs b/src/Luban.Job.Common/Source/TypeVisitors/TypescriptBinUnderingDeserializeVisitorBase.cs index fd6597f..a3d055b 100644 --- a/src/Luban.Job.Common/Source/TypeVisitors/TypescriptBinUnderingDeserializeVisitorBase.cs +++ b/src/Luban.Job.Common/Source/TypeVisitors/TypescriptBinUnderingDeserializeVisitorBase.cs @@ -166,7 +166,7 @@ namespace Luban.Job.Common.TypeVisitors public string Accept(TDateTime type, string bufVarName, string fieldName) { - return $"{fieldName} = {bufVarName}.ReadInt()"; + return $"{fieldName} = {bufVarName}.ReadLong()"; } } } diff --git a/src/Luban.Job.Common/Source/TypeVisitors/TypescriptBinUnderingSerializeVisitor.cs b/src/Luban.Job.Common/Source/TypeVisitors/TypescriptBinUnderingSerializeVisitor.cs index 230f850..9ee6139 100644 --- a/src/Luban.Job.Common/Source/TypeVisitors/TypescriptBinUnderingSerializeVisitor.cs +++ b/src/Luban.Job.Common/Source/TypeVisitors/TypescriptBinUnderingSerializeVisitor.cs @@ -93,7 +93,7 @@ namespace Luban.Job.Common.TypeVisitors public string Accept(TDateTime type, string bufVarName, string fieldName) { - return $"{bufVarName}.WriteInt({fieldName})"; + return $"{bufVarName}.WriteLong({fieldName})"; } public virtual string Accept(TBean type, string bufVarName, string fieldName) diff --git a/src/Luban.Job.Db/Source/TypeVisitors/DbCsCompatibleDeserializeVisitor.cs b/src/Luban.Job.Db/Source/TypeVisitors/DbCsCompatibleDeserializeVisitor.cs index 58f417d..52e206b 100644 --- a/src/Luban.Job.Db/Source/TypeVisitors/DbCsCompatibleDeserializeVisitor.cs +++ b/src/Luban.Job.Db/Source/TypeVisitors/DbCsCompatibleDeserializeVisitor.cs @@ -151,7 +151,7 @@ namespace Luban.Job.Db.TypeVisitors public string Accept(TDateTime type, string bufName, string fieldName) { - return $"{fieldName} = {bufName}.ReadInt();"; + return $"{fieldName} = {bufName}.ReadLong();"; } } } diff --git a/src/Luban.Job.Db/Source/TypeVisitors/DbCsCompatibleSerializeVisitor.cs b/src/Luban.Job.Db/Source/TypeVisitors/DbCsCompatibleSerializeVisitor.cs index f875026..f603b5c 100644 --- a/src/Luban.Job.Db/Source/TypeVisitors/DbCsCompatibleSerializeVisitor.cs +++ b/src/Luban.Job.Db/Source/TypeVisitors/DbCsCompatibleSerializeVisitor.cs @@ -150,9 +150,9 @@ namespace Luban.Job.Db.TypeVisitors return $"{bufName}.WriteVector4({fieldName});"; } - public string Accept(TDateTime type, string x, string y) + public string Accept(TDateTime type, string bufName, string fieldName) { - throw new NotImplementedException(); + return $"{bufName}.WriteLong({fieldName});"; } } } diff --git a/src/Luban.Job.Db/Source/TypeVisitors/DbCsDeserializeFuncVisitor.cs b/src/Luban.Job.Db/Source/TypeVisitors/DbCsDeserializeFuncVisitor.cs index d6af626..105ae53 100644 --- a/src/Luban.Job.Db/Source/TypeVisitors/DbCsDeserializeFuncVisitor.cs +++ b/src/Luban.Job.Db/Source/TypeVisitors/DbCsDeserializeFuncVisitor.cs @@ -128,7 +128,7 @@ namespace Luban.Job.Db.TypeVisitors public string Accept(TDateTime type) { - return "Bright.Common.SerializationUtil.DeserializeInt"; + return "Bright.Common.SerializationUtil.DeserializeLong"; } } } diff --git a/src/Luban.Job.Db/Source/TypeVisitors/DbCsInitFieldVisitor.cs b/src/Luban.Job.Db/Source/TypeVisitors/DbCsInitFieldVisitor.cs index fb952ed..7a2749e 100644 --- a/src/Luban.Job.Db/Source/TypeVisitors/DbCsInitFieldVisitor.cs +++ b/src/Luban.Job.Db/Source/TypeVisitors/DbCsInitFieldVisitor.cs @@ -131,7 +131,7 @@ namespace Luban.Job.Db.TypeVisitors public string Accept(TDateTime type, string fieldName) { - throw new NotSupportedException(); + return $"{fieldName} = default;"; } } } diff --git a/src/Luban.Job.Db/Source/TypeVisitors/DbCsSerializeFuncVisitor.cs b/src/Luban.Job.Db/Source/TypeVisitors/DbCsSerializeFuncVisitor.cs index ac26930..f0a3251 100644 --- a/src/Luban.Job.Db/Source/TypeVisitors/DbCsSerializeFuncVisitor.cs +++ b/src/Luban.Job.Db/Source/TypeVisitors/DbCsSerializeFuncVisitor.cs @@ -128,7 +128,7 @@ namespace Luban.Job.Db.TypeVisitors public string Accept(TDateTime type) { - return "Bright.Common.SerializationUtil.SerializeInt"; + return "Bright.Common.SerializationUtil.SerializeLong"; } } } diff --git a/src/Luban.Job.Db/Source/TypeVisitors/DbTypescriptDeserializeFuncVisitor.cs b/src/Luban.Job.Db/Source/TypeVisitors/DbTypescriptDeserializeFuncVisitor.cs index bd69ab2..0849fbd 100644 --- a/src/Luban.Job.Db/Source/TypeVisitors/DbTypescriptDeserializeFuncVisitor.cs +++ b/src/Luban.Job.Db/Source/TypeVisitors/DbTypescriptDeserializeFuncVisitor.cs @@ -128,7 +128,7 @@ namespace Luban.Job.Db.TypeVisitors public string Accept(TDateTime type) { - return "SerializeFactory.deserializeInt"; + return "SerializeFactory.deserializeLong"; } } } diff --git a/src/Luban.Job.Db/Source/TypeVisitors/DbTypescriptInitFieldVisitor.cs b/src/Luban.Job.Db/Source/TypeVisitors/DbTypescriptInitFieldVisitor.cs index 2e793b1..ab9f163 100644 --- a/src/Luban.Job.Db/Source/TypeVisitors/DbTypescriptInitFieldVisitor.cs +++ b/src/Luban.Job.Db/Source/TypeVisitors/DbTypescriptInitFieldVisitor.cs @@ -130,9 +130,10 @@ namespace Luban.Job.Db.TypeVisitors return $"{fieldName} = new Vector4()"; } - public string Accept(TDateTime type, string x, string y) + public string Accept(TDateTime type, string fieldName, string logType + ) { - throw new NotSupportedException(); + return $"{fieldName} = 0"; } } } diff --git a/src/Luban.Job.Db/Source/TypeVisitors/DbTypescriptSerializeFuncVisitor.cs b/src/Luban.Job.Db/Source/TypeVisitors/DbTypescriptSerializeFuncVisitor.cs index 5e5101c..239a7bd 100644 --- a/src/Luban.Job.Db/Source/TypeVisitors/DbTypescriptSerializeFuncVisitor.cs +++ b/src/Luban.Job.Db/Source/TypeVisitors/DbTypescriptSerializeFuncVisitor.cs @@ -128,7 +128,7 @@ namespace Luban.Job.Db.TypeVisitors public string Accept(TDateTime type) { - return "SerializeFactory.serializeInt"; + return "SerializeFactory.serializeLong"; } } }