diff --git a/Dockerfile_business b/Dockerfile_business index a30fd45..e3233b9 100644 --- a/Dockerfile_business +++ b/Dockerfile_business @@ -12,8 +12,8 @@ WORKDIR /go/release # 把全部文件添加到/go/release目录 ADD . . -# 编译:把main.go编译成可执行的二进制文件,命名为zyos -RUN GOOS=linux CGO_ENABLED=0 GOARCH=amd64 go build -o zyos cmd/business/main.go +# 编译:把main.go编译成可执行的二进制文件,命名为egg_im +RUN GOOS=linux CGO_ENABLED=0 GOARCH=amd64 go build -o egg_im cmd/business/main.go FROM ubuntu:xenial as prod LABEL maintainer="dengbiao" @@ -25,7 +25,7 @@ RUN rm -f /etc/localtime \ && echo $TZ > /etc/timezone # 在build阶段复制可执行的go二进制文件app -COPY --from=build /go/release/zyos ./zyos +COPY --from=build /go/release/egg_im ./egg_im # 启动服务 # 优化内核参数 @@ -33,5 +33,5 @@ COPY --from=build /go/release/zyos ./zyos #RUN sysctl -w net.ipv4.tcp_tw_recycle=1 #RUN sysctl -w net.ipv4.ip_local_port_range=1024 65535 #RUN sysctl -p -#CMD ["bash","-c","sysctl -w net.ipv4.tcp_timestamps=1 && sysctl -w net.ipv4.tcp_tw_reuse=1 && sysctl -w net.ipv4.tcp_tw_timeout=10 && sysctl -w net.ipv4.tcp_fin_timeout=10 && sysctl -w net.ipv4.ip_local_port_range='1024 65535' && ./zyos"] -CMD ["./zyos"] \ No newline at end of file +#CMD ["bash","-c","sysctl -w net.ipv4.tcp_timestamps=1 && sysctl -w net.ipv4.tcp_tw_reuse=1 && sysctl -w net.ipv4.tcp_tw_timeout=10 && sysctl -w net.ipv4.tcp_fin_timeout=10 && sysctl -w net.ipv4.ip_local_port_range='1024 65535' && ./egg_im"] +CMD ["./egg_im"] \ No newline at end of file diff --git a/Dockerfile_connect b/Dockerfile_connect index fec87b6..d638c69 100644 --- a/Dockerfile_connect +++ b/Dockerfile_connect @@ -12,8 +12,8 @@ WORKDIR /go/release # 把全部文件添加到/go/release目录 ADD . . -# 编译:把main.go编译成可执行的二进制文件,命名为zyos -RUN GOOS=linux CGO_ENABLED=0 GOARCH=amd64 go build -o zyos cmd/connect/main.go +# 编译:把main.go编译成可执行的二进制文件,命名为egg_im +RUN GOOS=linux CGO_ENABLED=0 GOARCH=amd64 go build -o egg_im cmd/connect/main.go FROM ubuntu:xenial as prod LABEL maintainer="dengbiao" @@ -25,7 +25,7 @@ RUN rm -f /etc/localtime \ && echo $TZ > /etc/timezone # 在build阶段复制可执行的go二进制文件app -COPY --from=build /go/release/zyos ./zyos +COPY --from=build /go/release/egg_im ./egg_im # 启动服务 # 优化内核参数 @@ -33,5 +33,5 @@ COPY --from=build /go/release/zyos ./zyos #RUN sysctl -w net.ipv4.tcp_tw_recycle=1 #RUN sysctl -w net.ipv4.ip_local_port_range=1024 65535 #RUN sysctl -p -#CMD ["bash","-c","sysctl -w net.ipv4.tcp_timestamps=1 && sysctl -w net.ipv4.tcp_tw_reuse=1 && sysctl -w net.ipv4.tcp_tw_timeout=10 && sysctl -w net.ipv4.tcp_fin_timeout=10 && sysctl -w net.ipv4.ip_local_port_range='1024 65535' && ./zyos"] -CMD ["./zyos"] \ No newline at end of file +#CMD ["bash","-c","sysctl -w net.ipv4.tcp_timestamps=1 && sysctl -w net.ipv4.tcp_tw_reuse=1 && sysctl -w net.ipv4.tcp_tw_timeout=10 && sysctl -w net.ipv4.tcp_fin_timeout=10 && sysctl -w net.ipv4.ip_local_port_range='1024 65535' && ./egg_im"] +CMD ["./egg_im"] \ No newline at end of file diff --git a/Dockerfile_logic b/Dockerfile_logic index 484c360..2a8d35e 100644 --- a/Dockerfile_logic +++ b/Dockerfile_logic @@ -12,8 +12,8 @@ WORKDIR /go/release # 把全部文件添加到/go/release目录 ADD . . -# 编译:把main.go编译成可执行的二进制文件,命名为zyos -RUN GOOS=linux CGO_ENABLED=0 GOARCH=amd64 go build -o zyos cmd/logic/main.go +# 编译:把main.go编译成可执行的二进制文件,命名为egg_im +RUN GOOS=linux CGO_ENABLED=0 GOARCH=amd64 go build -o egg_im cmd/logic/main.go FROM ubuntu:xenial as prod LABEL maintainer="dengbiao" @@ -25,7 +25,7 @@ RUN rm -f /etc/localtime \ && echo $TZ > /etc/timezone # 在build阶段复制可执行的go二进制文件app -COPY --from=build /go/release/zyos ./zyos +COPY --from=build /go/release/egg_im ./egg_im # 启动服务 # 优化内核参数 @@ -33,5 +33,5 @@ COPY --from=build /go/release/zyos ./zyos #RUN sysctl -w net.ipv4.tcp_tw_recycle=1 #RUN sysctl -w net.ipv4.ip_local_port_range=1024 65535 #RUN sysctl -p -#CMD ["bash","-c","sysctl -w net.ipv4.tcp_timestamps=1 && sysctl -w net.ipv4.tcp_tw_reuse=1 && sysctl -w net.ipv4.tcp_tw_timeout=10 && sysctl -w net.ipv4.tcp_fin_timeout=10 && sysctl -w net.ipv4.ip_local_port_range='1024 65535' && ./zyos"] -CMD ["./zyos"] \ No newline at end of file +#CMD ["bash","-c","sysctl -w net.ipv4.tcp_timestamps=1 && sysctl -w net.ipv4.tcp_tw_reuse=1 && sysctl -w net.ipv4.tcp_tw_timeout=10 && sysctl -w net.ipv4.tcp_fin_timeout=10 && sysctl -w net.ipv4.ip_local_port_range='1024 65535' && ./egg_im"] +CMD ["./egg_im"] \ No newline at end of file diff --git a/internal/business/api/business_ext_test.go b/internal/business/api/business_ext_test.go index 01a37a9..9ac2cac 100644 --- a/internal/business/api/business_ext_test.go +++ b/internal/business/api/business_ext_test.go @@ -34,7 +34,6 @@ func TestUserExtServer_SignIn(t *testing.T) { resp, err := getBusinessExtClient().SignIn(getCtx(), &pb.SignInReq{ PhoneNumber: "18229775311", DeviceId: 1, - MasterId: 123456, }) if err != nil { fmt.Println(err)