AE86 3 ani în urmă
părinte
comite
24b15f9d27

+ 6 - 2
dbsyncer-manager/src/main/java/org/dbsyncer/manager/ManagerFactory.java

@@ -18,6 +18,7 @@ import org.dbsyncer.manager.template.impl.OperationTemplate;
 import org.dbsyncer.parser.Parser;
 import org.dbsyncer.parser.Parser;
 import org.dbsyncer.parser.enums.ConvertEnum;
 import org.dbsyncer.parser.enums.ConvertEnum;
 import org.dbsyncer.parser.enums.MetaEnum;
 import org.dbsyncer.parser.enums.MetaEnum;
+import org.dbsyncer.parser.enums.ModelEnum;
 import org.dbsyncer.parser.logger.LogService;
 import org.dbsyncer.parser.logger.LogService;
 import org.dbsyncer.parser.logger.LogType;
 import org.dbsyncer.parser.logger.LogType;
 import org.dbsyncer.parser.model.*;
 import org.dbsyncer.parser.model.*;
@@ -251,8 +252,11 @@ public class ManagerFactory implements Manager, ApplicationListener<ClosedEvent>
 
 
     @Override
     @Override
     public void clearData(String collectionId) {
     public void clearData(String collectionId) {
-        LogType.MappingLog clearData = LogType.MappingLog.CLEAR_DATA;
-        logService.log(clearData, "驱动%s,%s", collectionId, clearData.getMessage());
+        Meta meta = getMeta(collectionId);
+        Mapping mapping = getMapping(meta.getMappingId());
+        String model = ModelEnum.getModelEnum(mapping.getModel()).getName();
+        LogType.MappingLog log = LogType.MappingLog.CLEAR_DATA;
+        logService.log(log, "%s:%s(%s)", log.getMessage(), mapping.getName(), model);
         storageService.clear(StorageEnum.DATA, collectionId);
         storageService.clear(StorageEnum.DATA, collectionId);
     }
     }
 
 

+ 1 - 1
dbsyncer-web/src/main/resources/public/monitor/monitor.html

@@ -164,7 +164,7 @@
                                 <u data-toggle="collapse" class="dbsyncer_pointer" href="#queryLogPanel">查询日志</u>
                                 <u data-toggle="collapse" class="dbsyncer_pointer" href="#queryLogPanel">查询日志</u>
                             </h4>
                             </h4>
                         </div>
                         </div>
-                        <div id="queryLogPanel" class="panel-body panel-collapse collapse">
+                        <div id="queryLogPanel" class="panel-body panel-collapse collapse in">
                             <div class="form-group">
                             <div class="form-group">
                                 <div class="col-sm-4">
                                 <div class="col-sm-4">
                                     <input id="searchLogKeyword" class="form-control" type="text" maxlength="32" placeholder="请输入内容关键字(最多32个字)." />
                                     <input id="searchLogKeyword" class="form-control" type="text" maxlength="32" placeholder="请输入内容关键字(最多32个字)." />

+ 5 - 5
dbsyncer-web/src/main/resources/static/plugins/js/loading-plus/loading-plus.js

@@ -1,8 +1,8 @@
 /***************************************************** 
 /***************************************************** 
  *                                                 *#*
  *                                                 *#*
- * @项目:loadingT                                 *#*
- * @作者:AE86                                     *#*
- * @Date:2016-11-21 23:46:56                     *#*
+ * @项目:loadingT                                   *#*
+ * @作者:AE86                                       *#*
+ * @Date:2016-11-21 23:46:56                       *#*
  *****************************************************
  *****************************************************
  *###################################################*/
  *###################################################*/
 
 
@@ -17,7 +17,7 @@ $.loadingT = {
 		$loadingT.html("<div class='loading-indicator' unselectable='on' onselectstart='return false;'>"+title+content+"</div>");
 		$loadingT.html("<div class='loading-indicator' unselectable='on' onselectstart='return false;'>"+title+content+"</div>");
 		$loadingT.css({ "height":$(document.body).height()+'px' });
 		$loadingT.css({ "height":$(document.body).height()+'px' });
 		var $indicato = $(".loading-indicator");
 		var $indicato = $(".loading-indicator");
-		$indicato.css({ "margin-top":(document.body.clientHeight / 2) -($indicato.height() / 2) });
+		$indicato.css({ "margin-top":($(window).height() / 2) -($indicato.height() / 2) });
 	}
 	}
 }
 }
 //创建遮罩层
 //创建遮罩层
@@ -30,7 +30,7 @@ jQuery.extend({
 	resetIndicato:function(){
 	resetIndicato:function(){
 		$(".loadingT").css({ "height":$(document.body).height()+'px' });
 		$(".loadingT").css({ "height":$(document.body).height()+'px' });
 		var $indicato = $(".loading-indicator");
 		var $indicato = $(".loading-indicator");
-		$indicato.css({ "margin-top":(document.body.clientHeight / 2) -($indicato.height() / 2) });
+		$indicato.css({ "margin-top":($(window).height() / 2) -($indicato.height() / 2) });
 	}
 	}
 });
 });
 //兼容浏览器缩放
 //兼容浏览器缩放