解决冲突

common/assets/confs/agent.config.json

@@ -20,7 +20,11 @@
         "address": "127.0.0.1:5672",
         "account": "cloudream",
         "password": "123456",
-        "vhost": "/"
+        "vhost": "/",
+        "param": {
+            "retryNum": 5,
+            "retryInterval": 5000
+        }
     },
     "ipfs": {
         "address": "127.0.0.1:5001"

common/assets/confs/client.config.json

@@ -15,7 +15,11 @@
         "address": "127.0.0.1:5672",
         "account": "cloudream",
         "password": "123456",
-        "vhost": "/"
+        "vhost": "/",
+        "param": {
+            "retryNum": 5,
+            "retryInterval": 5000
+        }
     },
     "ipfs": null,
     "distlock": {

common/assets/confs/coordinator.config.json

@@ -15,6 +15,10 @@
         "address": "127.0.0.1:5672",
         "account": "cloudream",
         "password": "123456",
-        "vhost": "/"
+        "vhost": "/",
+        "param": {
+            "retryNum": 5,
+            "retryInterval": 5000
+        }
     }
 }

common/assets/confs/scanner.config.json

@@ -18,7 +18,11 @@
         "address": "106.75.6.194:5672",
         "account": "cloudream",
         "password": "cloudream123456",
-        "vhost": "/"
+        "vhost": "/",
+        "param": {
+            "retryNum": 5,
+            "retryInterval": 5000
+        }
     },
     "distlock": {
         "etcdAddress": "106.75.6.194:2379",

common/pkgs/storage/shard/storages/local/writer.go

@@ -1,6 +1,6 @@
 package local
 
-import "gitlink.org.cn/cloudream/storage/common/pkgs/shardstore/types"
+import "gitlink.org.cn/cloudream/storage/common/pkgs/storage/shard/types"
 
 type Writer struct {
 }

common/pkgs/storage/temp/temp_store.go

@@ -1,4 +1,7 @@
 package tempstore
 
 type TempStore interface {
+	CreateTemp()
+	Commited(objectName string)
+	Drop(objectName string)
 }