Merge pull request #678 from linthan/fixconfigurationupdate

fix: 防止修改锁状态同时修改了其他的数据
douyu · Aug 15, 2024 · 5bfe804 · 5bfe804
2 parents 7f67919 + efbe566
commit 5bfe804
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 41 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -18,7 +18,7 @@ jobs:
           go-version: 1.19
 
       - name: docker-compose
-        run: docker-compose -f tests/docker-compose.yaml up -d
+        run: docker compose -f tests/docker-compose.yaml up -d
 
       - uses: actions/cache@v3
         with:

diff --git a/internal/pkg/service/codeplatform/codeplatform_test.go b/internal/pkg/service/codeplatform/codeplatform_test.go
diff --git a/internal/pkg/service/confgov2/lock.go b/internal/pkg/service/confgov2/lock.go
@@ -32,7 +32,8 @@ func TryLock(uid, configId uint) (err error) {
 		config.LockUid = uid
 		now := time.Now()
 		config.LockAt = &now
-		err = tx.Save(&config).Error
+		err = tx.Table("configuration").Where("id = ?", config.ID).Updates(map[string]interface{}{"lock_uid": config.LockUid,
+			"lock_at": config.LockAt}).Error
 		if err != nil {
 			tx.Rollback()
 			return errors.Wrap(err, "获取编辑锁失败")
@@ -59,7 +60,8 @@ func Unlock(uid, configId uint) (err error) {
 
 		config.LockUid = 0
 		config.LockAt = nil
-		err = tx.Save(&config).Error
+		err = tx.Table("configuration").Where("id = ?", config.ID).Updates(map[string]interface{}{"lock_uid": config.LockUid,
+			"lock_at": config.LockAt}).Error
 		if err != nil {
 			tx.Rollback()
 			return errors.Wrap(err, "释放编辑锁失败")
@@ -68,7 +70,7 @@ func Unlock(uid, configId uint) (err error) {
 	return tx.Commit().Error
 }
 
-//clearLockPeriodically 定期清除编辑锁
+// clearLockPeriodically 定期清除编辑锁
 func clearLockPeriodically() {
 	var configs []db.Configuration
 
@@ -88,7 +90,8 @@ func clearLockPeriodically() {
 			for _, config := range configs {
 				config.LockAt = nil
 				config.LockUid = 0
-				tx.Save(&config)
+				tx.Table("configuration").Where("id = ?", config.ID).Updates(map[string]interface{}{"lock_uid": config.LockUid,
+					"lock_at": config.LockAt})
 			}
 		}
 		tx.Commit()

diff --git a/tests/docker-compose.yaml b/tests/docker-compose.yaml
@@ -24,7 +24,7 @@ services:
     ports:
       - 8080:8080
   etcd:
-    image: "quay.io/coreos/etcd:v3.3"
+    image: "quay.io/coreos/etcd:v3.5.15"
     environment:
       ETCD_ADVERTISE_CLIENT_URLS: "http://0.0.0.0:2379"
       ETCD_LISTEN_CLIENT_URLS: "http://0.0.0.0:2379"