一些基础api

danbai225 · Jan 22, 2024 · 584ca90 · 584ca90
1 parent db0ac72
commit 584ca90
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/build_mac.sh b/build_mac.sh
@@ -0,0 +1,10 @@
+git pull
+tag=$(git describe --abbrev=0 --tags)
+if [[ $tag == "" ]]
+then
+    tag="build"
+fi
+docker buildx build -t danbai225/go-rustdesk-server:"$tag" --platform=linux/amd64 .
+docker buildx build -t danbai225/go-rustdesk-server:latest --platform=linux/amd64 .
+docker push danbai225/go-rustdesk-server:"$tag"
+docker push danbai225/go-rustdesk-server:latest
diff --git a/data_server/impl/clover_impl.go b/data_server/impl/clover_impl.go
@@ -309,12 +309,12 @@ func (c *CloverDataSever) CheckToken(token string) (*model.User, error) {
 	return user, nil
 }
 func (c *CloverDataSever) GenToken(name string) (string, error) {
-	defer c.userLock.Unlock()
-	c.userLock.Unlock()
 	user, err := c.GetUserByName(name)
 	if err != nil {
 		return "", err
 	}
+	defer c.userLock.Unlock()
+	c.userLock.Lock()
 	if user == nil {
 		return "", errors.New("user not exist")
 	}

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -10,6 +10,7 @@ services:
       - ./clover-db/:/app/clover-db
       - ./key/:/app/key
     ports:
+      - "21114:21114"
       - "21115:21115"
       - "21116:21116/tcp"
       - "21116:21116/udp"