diff --git a/.gitignore b/.gitignore index 9a4b0c48..2b19cbb7 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,7 @@ *.dll *.so *.dylib - +bin/ # Test binary, built with `go test -c` *.test diff --git a/fs_package_docker_image.sh b/fs_package_docker_image.sh new file mode 100755 index 00000000..0210110a --- /dev/null +++ b/fs_package_docker_image.sh @@ -0,0 +1,14 @@ +#!/bin/bash +name=${1%%\\*} +#进入对应服务目录 +cd server/$name +#构建二进制文件 +CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -o ./bin/api-$name-srv ./$name.go +#删除之前旧的镜像 +docker rmi -f api-$name-srv:latest +#打包docker镜像 +docker build -t api-$name-srv:latest . +#把本地镜像load到k8s中(这个适用于无dockerhub镜像仓库情况,需要对应的deployment中的 imagePullPolicy 参数从 Always 变成None) +minikube image load api-$name-srv:latest +#上传镜像到dockerhub(有dockerhub镜像仓库后打开,且把上面的load image去掉,对应的deployment中的 imagePullPolicy 参数从 None Always) +#docker push api-$name-srv:latest \ No newline at end of file diff --git a/goctl_template/api/etc.tpl b/goctl_template/api/etc.tpl index a39c0af4..a813c4d3 100644 --- a/goctl_template/api/etc.tpl +++ b/goctl_template/api/etc.tpl @@ -1,6 +1,7 @@ Name: {{.serviceName}} Host: {{.host}} Port: {{.port}} +Timeout: 15000 #服务超时时间(毫秒) SourceMysql: fusentest:XErSYmLELKMnf3Dh@tcp(110.41.19.98:3306)/fusentest Auth: AccessSecret: fusen2023 diff --git a/server/assistant/Dockerfile b/server/assistant/Dockerfile new file mode 100755 index 00000000..55d617cc --- /dev/null +++ b/server/assistant/Dockerfile @@ -0,0 +1,6 @@ +FROM alpine + +WORKDIR /www/fusenapi/ +COPY ./bin/api-assistant-srv /www/fusenapi/ +COPY ./etc /www/fusenapi/etc +CMD ["/www/fusenapi/api-assistant-srv"] diff --git a/server/backend/Dockerfile b/server/backend/Dockerfile new file mode 100755 index 00000000..e30c6bed --- /dev/null +++ b/server/backend/Dockerfile @@ -0,0 +1,6 @@ +FROM alpine + +WORKDIR /www/fusenapi/ +COPY ./bin/api-backend-srv /www/fusenapi/ +COPY ./etc /www/fusenapi/etc +CMD ["/www/fusenapi/api-backend-srv"] diff --git a/server/canteen/Dockerfile b/server/canteen/Dockerfile new file mode 100755 index 00000000..a268222d --- /dev/null +++ b/server/canteen/Dockerfile @@ -0,0 +1,6 @@ +FROM alpine + +WORKDIR /www/fusenapi/ +COPY ./bin/api-canteen-srv /www/fusenapi/ +COPY ./etc /www/fusenapi/etc +CMD ["/www/fusenapi/api-canteen-srv"] diff --git a/server/data-transfer/Dockerfile b/server/data-transfer/Dockerfile new file mode 100755 index 00000000..82090c4b --- /dev/null +++ b/server/data-transfer/Dockerfile @@ -0,0 +1,6 @@ +FROM alpine + +WORKDIR /www/fusenapi/ +COPY ./bin/api-data-transfer-srv /www/fusenapi/ +COPY ./etc /www/fusenapi/etc +CMD ["/www/fusenapi/api-data-transfer-srv"] diff --git a/server/home-user-auth/Dockerfile b/server/home-user-auth/Dockerfile new file mode 100755 index 00000000..3c7a0da5 --- /dev/null +++ b/server/home-user-auth/Dockerfile @@ -0,0 +1,6 @@ +FROM alpine + +WORKDIR /www/fusenapi/ +COPY ./bin/api-home-user-auth-srv /www/fusenapi/ +COPY ./etc /www/fusenapi/etc +CMD ["/www/fusenapi/api-home-user-auth-srv"] diff --git a/server/inventory/Dockerfile b/server/inventory/Dockerfile new file mode 100755 index 00000000..4fa34360 --- /dev/null +++ b/server/inventory/Dockerfile @@ -0,0 +1,6 @@ +FROM alpine + +WORKDIR /www/fusenapi/ +COPY ./bin/api-inventory-srv /www/fusenapi/ +COPY ./etc /www/fusenapi/etc +CMD ["/www/fusenapi/api-inventory-srv"] diff --git a/server/map-library/Dockerfile b/server/map-library/Dockerfile new file mode 100755 index 00000000..460cbfd5 --- /dev/null +++ b/server/map-library/Dockerfile @@ -0,0 +1,6 @@ +FROM alpine + +WORKDIR /www/fusenapi/ +COPY ./bin/api-map-library-srv /www/fusenapi/ +COPY ./etc /www/fusenapi/etc +CMD ["/www/fusenapi/api-map-library-srv"] diff --git a/server/orders/Dockerfile b/server/orders/Dockerfile new file mode 100755 index 00000000..2a5043d6 --- /dev/null +++ b/server/orders/Dockerfile @@ -0,0 +1,6 @@ +FROM alpine + +WORKDIR /www/fusenapi/ +COPY ./bin/api-order-srv /www/fusenapi/ +COPY ./etc /www/fusenapi/etc +CMD ["/www/fusenapi/api-order-srv"] diff --git a/server/pay/Dockerfile b/server/pay/Dockerfile new file mode 100755 index 00000000..df5dab5b --- /dev/null +++ b/server/pay/Dockerfile @@ -0,0 +1,6 @@ +FROM alpine + +WORKDIR /www/fusenapi/ +COPY ./bin/api-pay-srv /www/fusenapi/ +COPY ./etc /www/fusenapi/etc +CMD ["/www/fusenapi/api-pay-srv"] diff --git a/server/product-model/Dockerfile b/server/product-model/Dockerfile new file mode 100755 index 00000000..e207b762 --- /dev/null +++ b/server/product-model/Dockerfile @@ -0,0 +1,6 @@ +FROM alpine + +WORKDIR /www/fusenapi/ +COPY ./bin/api-product-model-srv /www/fusenapi/ +COPY ./etc /www/fusenapi/etc +CMD ["/www/fusenapi/api-product-model-srv"] diff --git a/server/product-template-tag/Dockerfile b/server/product-template-tag/Dockerfile new file mode 100755 index 00000000..abc15189 --- /dev/null +++ b/server/product-template-tag/Dockerfile @@ -0,0 +1,6 @@ +FROM alpine + +WORKDIR /www/fusenapi/ +COPY ./bin/api-product-template-tag-srv /www/fusenapi/ +COPY ./etc /www/fusenapi/etc +CMD ["/www/fusenapi/api-product-template-tag-srv"] diff --git a/server/product-template/Dockerfile b/server/product-template/Dockerfile new file mode 100755 index 00000000..2012a6d9 --- /dev/null +++ b/server/product-template/Dockerfile @@ -0,0 +1,6 @@ +FROM alpine + +WORKDIR /www/fusenapi/ +COPY ./bin/api-product-template-srv /www/fusenapi/ +COPY ./etc /www/fusenapi/etc +CMD ["/www/fusenapi/api-product-template-srv"] diff --git a/server/product/Dockerfile b/server/product/Dockerfile new file mode 100755 index 00000000..4ec40fcf --- /dev/null +++ b/server/product/Dockerfile @@ -0,0 +1,6 @@ +FROM alpine + +WORKDIR /www/fusenapi/ +COPY ./bin/api-product-srv /www/fusenapi/ +COPY ./etc /www/fusenapi/etc +CMD ["/www/fusenapi/api-product-srv"] diff --git a/server/render/Dockerfile b/server/render/Dockerfile new file mode 100755 index 00000000..b9722b92 --- /dev/null +++ b/server/render/Dockerfile @@ -0,0 +1,6 @@ +FROM alpine + +WORKDIR /www/fusenapi/ +COPY ./bin/api-render-srv /www/fusenapi/ +COPY ./etc /www/fusenapi/etc +CMD ["/www/fusenapi/api-render-srv"] diff --git a/server/shopping-cart-confirmation/Dockerfile b/server/shopping-cart-confirmation/Dockerfile new file mode 100755 index 00000000..5aa4c0d5 --- /dev/null +++ b/server/shopping-cart-confirmation/Dockerfile @@ -0,0 +1,6 @@ +FROM alpine + +WORKDIR /www/fusenapi/ +COPY ./bin/api-shopping-cart-confirmation-srv /www/fusenapi/ +COPY ./etc /www/fusenapi/etc +CMD ["/www/fusenapi/api-shopping-cart-confirmation-srv"] diff --git a/server/upload/Dockerfile b/server/upload/Dockerfile new file mode 100755 index 00000000..b3ee358e --- /dev/null +++ b/server/upload/Dockerfile @@ -0,0 +1,6 @@ +FROM alpine + +WORKDIR /www/fusenapi/ +COPY ./bin/api-upload-srv /www/fusenapi/ +COPY ./etc /www/fusenapi/etc +CMD ["/www/fusenapi/api-upload-srv"] diff --git a/server/webset/Dockerfile b/server/webset/Dockerfile new file mode 100755 index 00000000..7cbcc7eb --- /dev/null +++ b/server/webset/Dockerfile @@ -0,0 +1,6 @@ +FROM alpine + +WORKDIR /www/fusenapi/ +COPY ./bin/api-webset-srv /www/fusenapi/ +COPY ./etc /www/fusenapi/etc +CMD ["/www/fusenapi/api-webset-srv"] diff --git a/server/websocket/Dockerfile b/server/websocket/Dockerfile new file mode 100755 index 00000000..e183ac2b --- /dev/null +++ b/server/websocket/Dockerfile @@ -0,0 +1,6 @@ +FROM alpine + +WORKDIR /www/fusenapi/ +COPY ./bin/api-websocket-srv /www/fusenapi/ +COPY ./etc /www/fusenapi/etc +CMD ["/www/fusenapi/api-websocket-srv"] diff --git a/server/websocket/etc/websocket.yaml b/server/websocket/etc/websocket.yaml deleted file mode 100644 index 5f58765d..00000000 --- a/server/websocket/etc/websocket.yaml +++ /dev/null @@ -1,9 +0,0 @@ -Name: websocket -Host: 0.0.0.0 -Port: 9914 -SourceMysql: fusentest:XErSYmLELKMnf3Dh@tcp(110.41.19.98:3306)/fusentest -Auth: - AccessSecret: fusen2023 - AccessExpire: 2592000 - RefreshAfter: 1592000 -SourceRabbitMq: amqp://rabbit001:rabbit001129@110.41.19.98:5672 \ No newline at end of file diff --git a/server/websocket/websocket.go b/server/websocket/websocket.go index c5e7bdd0..b6c469b6 100644 --- a/server/websocket/websocket.go +++ b/server/websocket/websocket.go @@ -4,7 +4,6 @@ import ( "flag" "fmt" "net/http" - "time" "fusenapi/utils/auth" @@ -23,14 +22,12 @@ func main() { var c config.Config conf.MustLoad(*configFile, &c) - c.Timeout = int64(time.Second * 15) server := rest.MustNewServer(c.RestConf, rest.WithCustomCors(auth.FsCors, func(w http.ResponseWriter) { })) defer server.Stop() ctx := svc.NewServiceContext(c) handler.RegisterHandlers(server, ctx) - fmt.Printf("Starting server at %s:%d...\n", c.Host, c.Port) server.Start() }