fix消息重发bug;移除测试错误配置;

sohutv · Nov 11, 2020 · 1a134a3 · 1a134a3
1 parent 672673d
commit 1a134a3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/mq-cloud/src/main/resources/templates/admin/audit/resendMessage.html b/mq-cloud/src/main/resources/templates/admin/audit/resendMessage.html
@@ -71,8 +71,8 @@
 	</div>
 </div>
 <div class="modal-footer">
-	<button type="button" data-dismiss="modal" class="btn" >取消</button>
-	<button type="button" id="cancelBtn" class="btn btn-warning" onclick="cancelAudit(${response.result.aid?c})">撤销</button>
+	<button type="button" data-dismiss="modal" class="btn" >取消</button>
+	<button type="button" id="cancelBtn" class="btn btn-warning" onclick="cancelAudit(${RequestParameters.aid})">撤销</button>
 	<button type="button" class="btn btn-warning" id="disAgreeResendMessageBtn" onclick="disAgreeResendMessage()">拒绝</button>
 	<button type="button" class="btn btn-primary" data-toggle='tooltip' title="发送全部的消息(不包括已经已经发送成功的)" id="resendMessageBtn" onclick="resendMessage()">全部发送</button>
 	<button type="button" class="btn btn-primary" data-toggle='tooltip' title="全部发送成功才可以同意" id="agreeResendMessageBtn" onclick="agreeResendMessage()">同意</button>

diff --git a/mq-cloud/src/test/java/com/sohu/tv/mq/cloud/task/BrokerStoreStatTaskTest.java b/mq-cloud/src/test/java/com/sohu/tv/mq/cloud/task/BrokerStoreStatTaskTest.java
@@ -4,14 +4,12 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import com.sohu.tv.mq.cloud.Application;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = Application.class)
-@Configuration
 public class BrokerStoreStatTaskTest {
 
     @Autowired