Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop

.gitignore

@@ -4,7 +4,7 @@
 *.dll
 *.so
 *.dylib
-
+bin/
 # Test binary, built with `go test -c`
 *.test
 

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

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

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"]

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"]

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"]

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"]

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"]

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"]

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"]

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"]

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"]

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"]

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"]

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"]

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"]

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"]

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"]

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"]

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"]

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"]

server/websocket/etc/websocket.yaml

@@ -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

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()
 }