From bc758aa3ab827c1b11f014a40355beb67eb6c1cc Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 00:23:50 +0800
Subject: [PATCH] 优化页面
---
zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java | 2 +-
zq-erp/src/test/java/com/matrix/FenxiaoSoreInitTest.java | 12 ++++++++++++
2 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java b/zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java
index 18eb754..3ad4df2 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java
@@ -56,7 +56,7 @@
StatisticsBusinessDataJob sjobp;
@RequestMapping(value = "/job")
public @ResponseBody String job() {
- sjobp.executeExt2();
+ //sjobp.executeExt2();
return "1";
}
diff --git a/zq-erp/src/test/java/com/matrix/FenxiaoSoreInitTest.java b/zq-erp/src/test/java/com/matrix/FenxiaoSoreInitTest.java
index 5cd4a9d..b4ebcf4 100644
--- a/zq-erp/src/test/java/com/matrix/FenxiaoSoreInitTest.java
+++ b/zq-erp/src/test/java/com/matrix/FenxiaoSoreInitTest.java
@@ -13,10 +13,12 @@
import com.matrix.system.shopXcx.api.vo.SignBasicInfoVo;
import com.matrix.system.shopXcx.bean.ShopActivities;
import com.matrix.system.shopXcx.dao.ShopActivitiesDao;
+import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.test.context.junit4.SpringRunner;
import java.util.ArrayList;
@@ -33,6 +35,16 @@
@Autowired
private ActivitySignAwardSetDao activitySignAwardSetDao;
+ @Autowired
+ private TestRestTemplate restTemplate;
+
+
+ @Test
+ public void getName() {
+ String name = restTemplate.getForObject("/common/job", String.class);
+ System.out.println(name);
+ Assert.assertEquals("1", name);
+ }
@Test
public void getSignBasicInfo() {
--
Gitblit v1.9.1