修改合服代码

script/merge/MergeServerDefine.lua

@@ -19,7 +19,7 @@
 --[=[
     备份
     mongodump --db 要备份的数据库名字 --out 备份文件存放目录
-    如:  mongodump --db ckwy_fy_S350078 --out /server/dumpDB/
+    如:  mongodump --db ckwy_fy_S350002 --out /server/dumpDB/
 
     将备份文件恢复
     mongorestore --db 数据库存放目录  备份文件目录

script/merge/MergeServerLogic.lua

@@ -177,8 +177,14 @@ local function insertTargetMoZhuDB(targetDb)
     LuaMongo.find(targetCollection, nil, MozhuQueryFiles)
     local data = {}
     if not LuaMongo.next(data) then
-		initMoZhuDB(data)
+        return
 	end
+    
+
+    if not data.ciyuanMoZhu then
+        data.ciyuanMoZhu = {}
+        initMoZhuDB(data.ciyuanMoZhu)
+    end
 
     local targetMoZhuData = data.ciyuanMoZhu
     local roleRankLen = #targetMoZhuData.roleRank
@@ -517,7 +523,7 @@ local function startMergeServer(dbList)
         for _, coll in ipairs(MergeServerDefine.COLLECTIONS) do
             if not MergeServerDefine.NO_INSERT_COLLECTIONS[coll] then
 
-                print(string.format("========================开始处理集合: %s\n", coll))
+                print(string.format("========================开始处理集合: %s, %s\n", sourceDb, coll))
                 if coll == MergeServerDefine.COLLECTIONS[1] then
                     processCharColl(sourceDb, targetDb, coll)
                 elseif coll == MergeServerDefine.COLLECTIONS[3] then