更新丢失的文件

README.md

@@ -66,9 +66,9 @@
 ----------
 
 ## 目前运维的规模
-1. 服务器：20台+
-2. 集群：4个+
-3. topic：250个+
+1. 服务器：40台+
+2. 集群：5个+
+3. topic：370个+
 4. 生产消费消息量/日：10亿条+
 5. 生产消费消息大小/日：1T+
 ----------

mq-cloud/src/main/java/com/sohu/tv/mq/cloud/service/MQDeployer.java

@@ -284,11 +284,11 @@ public SSHResult call(SSHSession session) {
             return Result.getOKResult();
         }
         // 获取master地址
-        Result<String> masterAddressResult = fetchMasterAddress(cluster);
+        Result<String> masterAddressResult = fetchMasterAddress(cluster);
         // 集群中无节点时，不进行后续配置
         if(Status.NO_RESULT.getKey() == masterAddressResult.getStatus()) {
             return Result.getOKResult();
-        }
+        }
         if(!masterAddressResult.isOK()) {
             return masterAddressResult;
         }

mq-cloud/src/main/java/com/sohu/tv/mq/cloud/web/controller/param/BrokerParam.java

@@ -101,9 +101,9 @@ public String toConfig(String nameServerDomain, Cluster cluster) {
                 + "\nrmqAddressServerDomain=" + nameServerDomain
                 + "\nrmqAddressServerSubGroup=" + String.format(MQDeployer.NS_SUB_GROUP, cluster.getId())
                 + "\nfetchNamesrvAddrByAddressServer=true"
-                + "\nautoCreateTopicEnable=true"
+                + "\nautoCreateTopicEnable=false"
                 + "\nclusterTopicEnable=false"
-                + "\nautoCreateSubscriptionGroup=false"
+                + "\nautoCreateSubscriptionGroup=true"
                 + "\nstorePathRootDir=" + MQDeployer.MQ_CLOUD_DIR + getDir() + "/data"
                 + "\nstorePathCommitLog=" + MQDeployer.MQ_CLOUD_DIR + getDir() + "/data/commitlog"
                 + "\nstorePathIndex=" + MQDeployer.MQ_CLOUD_DIR + getDir() + "/data/index"

mq-cloud/src/main/java/com/sohu/tv/mq/cloud/web/vo/ConsumerProgressVO.java

@@ -115,8 +115,8 @@ public void setTopic(String topic) {
 
     public long getDiff() {
         return diffTotal;
-    }
-
+    }
+
     public long computeTotalDiff() {
         diffTotal = computeTotalDiff(offsetMap, false);
         diffTotal += computeTotalDiff(retryOffsetMap, true);

mq-cloud/src/main/resources/templates/msg/index.html

@@ -36,7 +36,7 @@
 	    	    <input type="text" class="form-control" id="offsetKey" name="offsetKey" value="${response.result.key!}" placeholder="关键字，支持模糊匹配">
 	  	    </div>
 			<!-- 时间段查询 -->
-			<div class="form-group time" style="display:none;">
+			<div class="form-group time" style="display:none;">
 				<label for="timeStartTimePicker"> 开始时间: </label>
 				<input id="timeStartTimePicker" type="text" class="Wdate form-control" onclick="WdatePicker({ dateFmt: 'yyyy-MM-dd HH:mm:ss',maxDate:'%y-%M-%d',minDate:'%y-%M-{%d-5}',onpicked:function(){timeChange('timeStartTime')}})" style="width:180px;height:34px;cursor:pointer;" readonly="readonly"
 	  								value="${response.result.start?number_to_datetime?string("yyyy-MM-dd HH:mm:ss")}">
@@ -413,7 +413,7 @@ <h4 class="modal-title">消息重发</h4>
  	$(".selectpicker").selectpicker({
 		width : 120
  	});
- 	$("#queueSearchSelect").selectpicker('refresh');
+ 	$("#queueSearchSelect").selectpicker('refresh');
  	// search type tooltip
  	$("#searchCondition").selectpicker({
 		width : 120
@@ -749,7 +749,7 @@ <h4 class="modal-title">消息重发</h4>
 	}
 	$("#offsetStart").val(min);
 	$("#offsetEnd").val(max);
-}
+}
 
 function trace(msgId){
 	var searchType = $('#searchCondition option:selected').val();
@@ -768,5 +768,5 @@ <h4 class="modal-title">消息重发</h4>
 	$("#traceKey").val(msgId);
 	// 查询trace
 	searchTraceMessage();
-}
+}
 </script>