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