Merge pull request #6 from storage-lock/dev

feat: 删除错误的更新条件
storage-lock · Sep 10, 2023 · fd42135 · fd42135
2 parents 324ece0 + e064ba4
commit fd42135
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/mongodb_storage.go b/mongodb_storage.go
@@ -84,10 +84,8 @@ func (x *MongoStorage) UpdateWithVersion(ctx context.Context, lockId string, exc
 		"_id": bson.M{
 			"$eq": lockId,
 		},
-		"owner_id": bson.M{
-			"$eq": lockInformation.OwnerId,
-		},
 		"version": bson.M{
+			//"$eq": json.Number(strconv.FormatUint(uint64(exceptedVersion), 10)),
 			"$eq": exceptedVersion,
 		},
 	}
@@ -185,7 +183,9 @@ func (x *MongoStorage) Get(ctx context.Context, lockId string) (string, error) {
 
 func (x *MongoStorage) GetTime(ctx context.Context) (time.Time, error) {
 	// MongoDB没找到好的办法拿数据库实例的时间，这里就使用一个公共的NTP作为时间源吧
+	// TODO
 	return x.timeProvider.GetTime(ctx)
+	//return time.Now(), nil
 }
 
 func (x *MongoStorage) Close(ctx context.Context) error {

diff --git a/mongodb_storage_test.go b/mongodb_storage_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 )
 
-func TestNewMongoStorage(t *testing.T) {
+func TestMongoStorage(t *testing.T) {
 	envName := "STORAGE_LOCK_MONGO_URI"
 	uri := os.Getenv(envName)
 	assert.NotEmpty(t, uri)

diff --git a/scripts/mongodb.sh b/scripts/mongodb.sh
@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+# 删除之前已经启动过的容器
+docker rm -f storage-lock-mongodb
+
 # 启动Docker容器
 docker run -d -p 27017:27017 --name storage-lock-mongodb -e MONGO_INITDB_ROOT_USERNAME=root -e MONGO_INITDB_ROOT_PASSWORD=UeGqAm8CxYGldMDLoNNt mongo