From a8327f7f1a6a3d930ac2385cc6698cd4526e4881 Mon Sep 17 00:00:00 2001
From: dushixiang <helloworld1024@foxmail.com>
Date: Wed, 17 Nov 2021 17:47:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=8D=E5=90=AF=E6=97=B6?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E8=B5=84=E4=BA=A7=E7=8A=B6=E6=80=81=E6=A3=80?=
 =?UTF-8?q?=E6=B5=8B=E7=A9=BA=E6=8C=87=E9=92=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile           |  4 +++-
 get_arch.sh          | 15 +++++++++++++++
 server/api/routes.go |  7 ++++---
 3 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 get_arch.sh

diff --git a/Dockerfile b/Dockerfile
index ef34bb6..1cc493a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,9 @@ COPY . .
 RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories
 RUN apk add gcc g++
 RUN go mod tidy
-RUN go env;ARCH="$(arch)";case "$ARCH" in 'x86_64') export ARCH='amd64';echo $ARCH;; 'aarch64') export ARCH='arm64';echo $ARCH;; 'i386') export ARCH='i386';echo $ARCH;; esac;CGO_ENABLED=1 GOOS=linux GOARCH=$ARCH go build -a -ldflags '-linkmode external -extldflags "-static"' -o next-terminal main.go
+RUN sh get_arch.sh
+RUN echo "Hello, my CPU architecture is $(uname -m)"
+RUN go env;CGO_ENABLED=1 GOOS=linux GOARCH=$ARCH go build -ldflags '-s -w' -o next-terminal main.go
 
 FROM alpine:latest
 
diff --git a/get_arch.sh b/get_arch.sh
new file mode 100644
index 0000000..d41d052
--- /dev/null
+++ b/get_arch.sh
@@ -0,0 +1,15 @@
+ARCH="$(arch)"
+case "$ARCH" in
+'x86_64')
+	export ARCH='amd64'
+	echo $ARCH
+	;;
+'aarch64')
+	export ARCH='arm64'
+	echo $ARCH
+	;;
+*)
+	export ARCH=$ARCH
+	echo $ARCH
+	;;
+esac
diff --git a/server/api/routes.go b/server/api/routes.go
index 6645c9b..f6ecfdd 100644
--- a/server/api/routes.go
+++ b/server/api/routes.go
@@ -327,6 +327,9 @@ func InitDBData() (err error) {
 	if err := propertyService.DeleteDeprecatedProperty(); err != nil {
 		return err
 	}
+	if err := accessGatewayService.ReConnectAll(); err != nil {
+		return err
+	}
 	if err := propertyService.InitProperties(); err != nil {
 		return err
 	}
@@ -354,9 +357,7 @@ func InitDBData() (err error) {
 	if err := storageService.InitStorages(); err != nil {
 		return err
 	}
-	if err := accessGatewayService.ReConnectAll(); err != nil {
-		return err
-	}
+
 	return nil
 }