From 8988f5703568da0c47ab8f2e03d75495e879e72a Mon Sep 17 00:00:00 2001 From: walon Date: Mon, 14 Dec 2020 12:34:38 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=20lua=20proto=20=E5=AF=B9=E4=BA=8Ebytes=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=EF=BC=8C=E7=94=9F=E6=88=90writeString=E5=92=8CreadStr?= =?UTF-8?q?ing=E7=9A=84bug=20=E3=80=90=E8=B0=83=E6=95=B4=E3=80=91=E5=B0=86?= =?UTF-8?q?Gen.Client=E8=BF=9E=E6=8E=A5=E8=B6=85=E6=97=B6=E7=94=B1100ms?= =?UTF-8?q?=E5=BB=B6=E9=95=BF=E5=88=B03s,=E7=94=9F=E6=88=90=E8=B6=85?= =?UTF-8?q?=E6=97=B6=E7=94=B130s=E5=BB=B6=E9=95=BF=E5=88=B0120s=20?= =?UTF-8?q?=E3=80=90=E8=B0=83=E6=95=B4=E3=80=91=E7=94=9F=E6=88=90=E7=9A=84?= =?UTF-8?q?docker=E6=98=A0=E8=B1=A1=E7=94=B1=20luban.server=20=E6=94=B9?= =?UTF-8?q?=E6=88=90=20luban-server=20=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=20tag=5Fand=5Fpush.bat=20=E5=8F=91=E5=B8=83l?= =?UTF-8?q?uban-server=E5=88=B0=20docker=20hub?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Luban.Client/Source/Net/GenClient.cs | 2 +- src/Luban.Client/Source/Program.cs | 2 +- .../Source/TypeVisitors/LuaDeserializeMethodNameVisitor.cs | 2 +- .../Source/TypeVisitors/LuaSerializeMethodNameVisitor.cs | 2 +- src/Luban.Job.Proto/Luban.Job.Proto.csproj | 6 ++++-- src/Luban.Server/Scripts/build_docker.bat | 2 +- src/Luban.Server/Scripts/tag_and_push.bat | 3 +++ 7 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 src/Luban.Server/Scripts/tag_and_push.bat diff --git a/src/Luban.Client/Source/Net/GenClient.cs b/src/Luban.Client/Source/Net/GenClient.cs index c54292b..80fa487 100644 --- a/src/Luban.Client/Source/Net/GenClient.cs +++ b/src/Luban.Client/Source/Net/GenClient.cs @@ -39,7 +39,7 @@ namespace Luban.Client.Common.Net var c = new TcpClientBootstrap { RemoteAddress = new IPEndPoint(IPAddress.Parse(host), port), - ConnectTimeoutMills = 100, + ConnectTimeoutMills = 3000, EventLoop = new EventLoop(null), InitHandler = ch => { diff --git a/src/Luban.Client/Source/Program.cs b/src/Luban.Client/Source/Program.cs index f2a5575..b3c5ea7 100644 --- a/src/Luban.Client/Source/Program.cs +++ b/src/Luban.Client/Source/Program.cs @@ -177,7 +177,7 @@ Options: Environment.Exit(exitCode); } - const int GEN_JOB_TIMEOUT = 30; + const int GEN_JOB_TIMEOUT = 120; private static int SubmitGenJob(CommandLineOptions options) { diff --git a/src/Luban.Job.Common/Source/TypeVisitors/LuaDeserializeMethodNameVisitor.cs b/src/Luban.Job.Common/Source/TypeVisitors/LuaDeserializeMethodNameVisitor.cs index 72ef28b..1c818a6 100644 --- a/src/Luban.Job.Common/Source/TypeVisitors/LuaDeserializeMethodNameVisitor.cs +++ b/src/Luban.Job.Common/Source/TypeVisitors/LuaDeserializeMethodNameVisitor.cs @@ -68,7 +68,7 @@ namespace Luban.Job.Common.TypeVisitors public string Accept(TBytes type) { - return "readString"; + return "readBytes"; } public string Accept(TText type) diff --git a/src/Luban.Job.Common/Source/TypeVisitors/LuaSerializeMethodNameVisitor.cs b/src/Luban.Job.Common/Source/TypeVisitors/LuaSerializeMethodNameVisitor.cs index 3180ab4..1629323 100644 --- a/src/Luban.Job.Common/Source/TypeVisitors/LuaSerializeMethodNameVisitor.cs +++ b/src/Luban.Job.Common/Source/TypeVisitors/LuaSerializeMethodNameVisitor.cs @@ -68,7 +68,7 @@ namespace Luban.Job.Common.TypeVisitors public string Accept(TBytes type) { - return "writeString"; + return "writeBytes"; } public string Accept(TText type) diff --git a/src/Luban.Job.Proto/Luban.Job.Proto.csproj b/src/Luban.Job.Proto/Luban.Job.Proto.csproj index c69ba47..c23729e 100644 --- a/src/Luban.Job.Proto/Luban.Job.Proto.csproj +++ b/src/Luban.Job.Proto/Luban.Job.Proto.csproj @@ -6,11 +6,13 @@ - + + + - + diff --git a/src/Luban.Server/Scripts/build_docker.bat b/src/Luban.Server/Scripts/build_docker.bat index 08fe29a..53e88d9 100644 --- a/src/Luban.Server/Scripts/build_docker.bat +++ b/src/Luban.Server/Scripts/build_docker.bat @@ -1,2 +1,2 @@ -docker build -t luban.server:latest -f Dockerfile ../.. +docker build -t luban-server:latest -f Dockerfile ../.. pause \ No newline at end of file diff --git a/src/Luban.Server/Scripts/tag_and_push.bat b/src/Luban.Server/Scripts/tag_and_push.bat new file mode 100644 index 0000000..f1fb3d8 --- /dev/null +++ b/src/Luban.Server/Scripts/tag_and_push.bat @@ -0,0 +1,3 @@ +docker tag luban-server:latest focuscreativegames/luban-server:latest +docker push focuscreativegames/luban-server:latest +pause \ No newline at end of file