From 7a8937ddf474692ee6eabf12ecfdfbd4d162a7e6 Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Mon, 25 Dec 2017 16:00:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8Bpackage?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/XXL-JOB官方文档.md | 3 +- .../job/admin/core/util/PropertiesUtil.java | 5 +- .../controller/AbstractSpringMvcTest.java | 2 + .../admin/controller/IndexControllerTest.java | 22 --- .../controller/JobInfoControllerTest.java | 39 ++--- .../dao}/XxlJobGroupDaoTest.java | 2 +- .../dao/XxlJobInfoDaoTest.java} | 156 +++++++++--------- .../impl => admin/dao}/XxlJobLogDaoTest.java | 2 +- .../dao}/XxlJobLogGlueDaoTest.java | 2 +- .../dao}/XxlJobRegistryDaoTest.java | 2 +- .../impl => admin/util}/MailUtilTest.java | 2 +- .../job/admin/util/PropertiesUtilTest.java | 18 ++ .../{dao/impl => adminbiz}/AdminBizTest.java | 2 +- 13 files changed, 124 insertions(+), 133 deletions(-) delete mode 100644 xxl-job-admin/src/test/java/com/xxl/job/admin/controller/IndexControllerTest.java rename xxl-job-admin/src/test/java/com/xxl/job/{dao/impl => admin/dao}/XxlJobGroupDaoTest.java (97%) rename xxl-job-admin/src/test/java/com/xxl/job/{dao/impl/XxlJobInfoTest.java => admin/dao/XxlJobInfoDaoTest.java} (94%) rename xxl-job-admin/src/test/java/com/xxl/job/{dao/impl => admin/dao}/XxlJobLogDaoTest.java (98%) rename xxl-job-admin/src/test/java/com/xxl/job/{dao/impl => admin/dao}/XxlJobLogGlueDaoTest.java (97%) rename xxl-job-admin/src/test/java/com/xxl/job/{dao/impl => admin/dao}/XxlJobRegistryDaoTest.java (96%) rename xxl-job-admin/src/test/java/com/xxl/job/{dao/impl => admin/util}/MailUtilTest.java (97%) create mode 100644 xxl-job-admin/src/test/java/com/xxl/job/admin/util/PropertiesUtilTest.java rename xxl-job-admin/src/test/java/com/xxl/job/{dao/impl => adminbiz}/AdminBizTest.java (98%) diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md index 7e7a505d..b9fa7b7d 100644 --- a/doc/XXL-JOB官方文档.md +++ b/doc/XXL-JOB官方文档.md @@ -834,7 +834,7 @@ echo "分片总数 total = $3" 调度中心API服务位置：com.xxl.job.core.biz.AdminBiz.java -调度中心API服务请求参考代码：com.xxl.job.dao.impl.AdminBizTest.java +调度中心API服务请求参考代码：com.xxl.job.adminbiz.AdminBizTest.java ### 5.12 执行器API服务 执行器提供了API服务，供调度中心选择使用，目前提供的API服务有： @@ -1097,6 +1097,7 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段 - 22、调度中心项目日志配置改为xml文件格式； - 23、Log地址格式兼容，支持非"/"结尾路径配置； - 24、底层系统日志级别规范调整，清理遗留代码； +- 25、建表SQL优化，支持同步创建制定编码的库和表； ### TODO LIST diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/PropertiesUtil.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/PropertiesUtil.java index ed80e708..a3c60077 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/PropertiesUtil.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/PropertiesUtil.java @@ -12,6 +12,7 @@ import java.util.Properties; /** * properties util + * * @author xuxueli 2015-8-28 10:35:53 */ public class PropertiesUtil { @@ -33,9 +34,5 @@ public class PropertiesUtil { } return null; } - - public static void main(String[] args) { - System.out.println(getString("xxl.job.login.username")); - } } diff --git a/xxl-job-admin/src/test/java/com/xxl/job/admin/controller/AbstractSpringMvcTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/controller/AbstractSpringMvcTest.java index 3aab69dd..bb156206 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/admin/controller/AbstractSpringMvcTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/controller/AbstractSpringMvcTest.java @@ -14,6 +14,7 @@ import org.springframework.web.context.WebApplicationContext; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = {"classpath*:spring/*.xml"}) public class AbstractSpringMvcTest { + @Autowired private WebApplicationContext applicationContext; protected MockMvc mockMvc; @@ -22,4 +23,5 @@ public class AbstractSpringMvcTest { public void setup() { this.mockMvc = MockMvcBuilders.webAppContextSetup(this.applicationContext).build(); } + } diff --git a/xxl-job-admin/src/test/java/com/xxl/job/admin/controller/IndexControllerTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/controller/IndexControllerTest.java deleted file mode 100644 index 1eb76743..00000000 --- a/xxl-job-admin/src/test/java/com/xxl/job/admin/controller/IndexControllerTest.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.xxl.job.admin.controller; - -import org.junit.Test; -import org.springframework.http.MediaType; -import org.springframework.test.web.servlet.MvcResult; - -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; - -public class IndexControllerTest extends AbstractSpringMvcTest { - - @Test - public void testLogin() throws Exception { - MvcResult ret = mockMvc.perform( - post("/login") - .contentType(MediaType.APPLICATION_FORM_URLENCODED) - .param("userName", "admin") - .param("password", "123456") - ).andReturn(); - - System.out.println(ret.getResponse().getContentAsString()); - } -} diff --git a/xxl-job-admin/src/test/java/com/xxl/job/admin/controller/JobInfoControllerTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/controller/JobInfoControllerTest.java index 33df92e9..8da5fda3 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/admin/controller/JobInfoControllerTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/controller/JobInfoControllerTest.java @@ -1,52 +1,47 @@ package com.xxl.job.admin.controller; -import com.xxl.job.admin.core.model.XxlJobInfo; -import org.codehaus.jackson.map.ObjectMapper; +import com.xxl.job.admin.controller.interceptor.PermissionInterceptor; +import com.xxl.job.admin.core.util.PropertiesUtil; import org.junit.Before; import org.junit.Test; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MvcResult; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; import javax.servlet.http.Cookie; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; public class JobInfoControllerTest extends AbstractSpringMvcTest { - Cookie cookie; + + private Cookie cookie; @Before public void login() throws Exception { MvcResult ret = mockMvc.perform( post("/login") .contentType(MediaType.APPLICATION_FORM_URLENCODED) - .param("userName", "admin") - .param("password", "123456") + .param("userName", PropertiesUtil.getString("xxl.job.login.username")) + .param("password", PropertiesUtil.getString("xxl.job.login.password")) ).andReturn(); - cookie = ret.getResponse().getCookie("LOGIN_IDENTITY"); + cookie = ret.getResponse().getCookie(PermissionInterceptor.LOGIN_IDENTITY_KEY); } @Test public void testAdd() throws Exception { - XxlJobInfo jobInfo = new XxlJobInfo(); - jobInfo.setJobGroup(1); - jobInfo.setJobDesc("autoEnquiryStatisPerWeek"); - jobInfo.setExecutorRouteStrategy("FIRST"); - jobInfo.setJobCron("0 0 1 ? * MON"); - jobInfo.setGlueType("BEAN"); - jobInfo.setExecutorHandler("AutoEnquriy"); - jobInfo.setExecutorBlockStrategy("SERIAL_EXECUTION"); - jobInfo.setExecutorFailStrategy("FAIL_ALARM"); - jobInfo.setAuthor("listening"); - - ObjectMapper mapper = new ObjectMapper(); - String jobInfoStr = mapper.writeValueAsString(jobInfo); + MultiValueMap parameters = new LinkedMultiValueMap(); + parameters.add("jobGroup", "1"); + MvcResult ret = mockMvc.perform( - post("/jobinfo/add") + post("/jobinfo/pageList") .contentType(MediaType.APPLICATION_FORM_URLENCODED) - .content(jobInfoStr) + //.content(paramsJson) + .params(parameters) .cookie(cookie) ).andReturn(); System.out.println(ret.getResponse().getContentAsString()); } + } diff --git a/xxl-job-admin/src/test/java/com/xxl/job/dao/impl/XxlJobGroupDaoTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobGroupDaoTest.java similarity index 97% rename from xxl-job-admin/src/test/java/com/xxl/job/dao/impl/XxlJobGroupDaoTest.java rename to xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobGroupDaoTest.java index 122d4780..5b99178f 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/dao/impl/XxlJobGroupDaoTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobGroupDaoTest.java @@ -1,4 +1,4 @@ -package com.xxl.job.dao.impl; +package com.xxl.job.admin.dao; import com.xxl.job.admin.core.model.XxlJobGroup; import com.xxl.job.admin.dao.XxlJobGroupDao; diff --git a/xxl-job-admin/src/test/java/com/xxl/job/dao/impl/XxlJobInfoTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobInfoDaoTest.java similarity index 94% rename from xxl-job-admin/src/test/java/com/xxl/job/dao/impl/XxlJobInfoTest.java rename to xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobInfoDaoTest.java index d7d17d2d..5da58a1e 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/dao/impl/XxlJobInfoTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobInfoDaoTest.java @@ -1,78 +1,78 @@ -package com.xxl.job.dao.impl; - -import com.xxl.job.admin.core.model.XxlJobInfo; -import com.xxl.job.admin.dao.XxlJobInfoDao; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -import javax.annotation.Resource; -import java.util.Date; -import java.util.List; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = "classpath*:spring/applicationcontext-*.xml") -public class XxlJobInfoTest { - - @Resource - private XxlJobInfoDao xxlJobInfoDao; - - @Test - public void pageList(){ - List list = xxlJobInfoDao.pageList(0, 20, 0, null); - int list_count = xxlJobInfoDao.pageListCount(0, 20, 0, null); - - System.out.println(list); - System.out.println(list_count); - - List list2 = xxlJobInfoDao.getJobsByGroup(1); - } - - @Test - public void save_load(){ - XxlJobInfo info = new XxlJobInfo(); - info.setJobGroup(1); - info.setJobCron("jobCron"); - info.setJobDesc("desc"); - info.setAuthor("setAuthor"); - info.setAlarmEmail("setAlarmEmail"); - info.setExecutorRouteStrategy("setExecutorRouteStrategy"); - info.setExecutorHandler("setExecutorHandler"); - info.setExecutorParam("setExecutorParam"); - info.setExecutorBlockStrategy("setExecutorBlockStrategy"); - info.setExecutorFailStrategy("setExecutorFailStrategy"); - info.setGlueType("setGlueType"); - info.setGlueSource("setGlueSource"); - info.setGlueRemark("setGlueRemark"); - info.setChildJobKey("setChildJobKey"); - - int count = xxlJobInfoDao.save(info); - - XxlJobInfo info2 = xxlJobInfoDao.loadById(info.getId()); - info2.setJobCron("jobCron2"); - info2.setJobDesc("desc2"); - info2.setAuthor("setAuthor2"); - info2.setAlarmEmail("setAlarmEmail2"); - info2.setExecutorRouteStrategy("setExecutorRouteStrategy2"); - info2.setExecutorHandler("setExecutorHandler2"); - info2.setExecutorParam("setExecutorParam2"); - info2.setExecutorBlockStrategy("setExecutorBlockStrategy2"); - info2.setExecutorFailStrategy("setExecutorFailStrategy2"); - info2.setGlueType("setGlueType2"); - info2.setGlueSource("setGlueSource2"); - info2.setGlueRemark("setGlueRemark2"); - info2.setGlueUpdatetime(new Date()); - info2.setChildJobKey("setChildJobKey2"); - - int item2 = xxlJobInfoDao.update(info2); - - xxlJobInfoDao.delete(info2.getId()); - - List list2 = xxlJobInfoDao.getJobsByGroup(1); - - int ret3 = xxlJobInfoDao.findAllCount(); - - } - -} +package com.xxl.job.admin.dao; + +import com.xxl.job.admin.core.model.XxlJobInfo; +import com.xxl.job.admin.dao.XxlJobInfoDao; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; + +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(locations = "classpath*:spring/applicationcontext-*.xml") +public class XxlJobInfoDaoTest { + + @Resource + private XxlJobInfoDao xxlJobInfoDao; + + @Test + public void pageList(){ + List list = xxlJobInfoDao.pageList(0, 20, 0, null); + int list_count = xxlJobInfoDao.pageListCount(0, 20, 0, null); + + System.out.println(list); + System.out.println(list_count); + + List list2 = xxlJobInfoDao.getJobsByGroup(1); + } + + @Test + public void save_load(){ + XxlJobInfo info = new XxlJobInfo(); + info.setJobGroup(1); + info.setJobCron("jobCron"); + info.setJobDesc("desc"); + info.setAuthor("setAuthor"); + info.setAlarmEmail("setAlarmEmail"); + info.setExecutorRouteStrategy("setExecutorRouteStrategy"); + info.setExecutorHandler("setExecutorHandler"); + info.setExecutorParam("setExecutorParam"); + info.setExecutorBlockStrategy("setExecutorBlockStrategy"); + info.setExecutorFailStrategy("setExecutorFailStrategy"); + info.setGlueType("setGlueType"); + info.setGlueSource("setGlueSource"); + info.setGlueRemark("setGlueRemark"); + info.setChildJobKey("setChildJobKey"); + + int count = xxlJobInfoDao.save(info); + + XxlJobInfo info2 = xxlJobInfoDao.loadById(info.getId()); + info2.setJobCron("jobCron2"); + info2.setJobDesc("desc2"); + info2.setAuthor("setAuthor2"); + info2.setAlarmEmail("setAlarmEmail2"); + info2.setExecutorRouteStrategy("setExecutorRouteStrategy2"); + info2.setExecutorHandler("setExecutorHandler2"); + info2.setExecutorParam("setExecutorParam2"); + info2.setExecutorBlockStrategy("setExecutorBlockStrategy2"); + info2.setExecutorFailStrategy("setExecutorFailStrategy2"); + info2.setGlueType("setGlueType2"); + info2.setGlueSource("setGlueSource2"); + info2.setGlueRemark("setGlueRemark2"); + info2.setGlueUpdatetime(new Date()); + info2.setChildJobKey("setChildJobKey2"); + + int item2 = xxlJobInfoDao.update(info2); + + xxlJobInfoDao.delete(info2.getId()); + + List list2 = xxlJobInfoDao.getJobsByGroup(1); + + int ret3 = xxlJobInfoDao.findAllCount(); + + } + +} diff --git a/xxl-job-admin/src/test/java/com/xxl/job/dao/impl/XxlJobLogDaoTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobLogDaoTest.java similarity index 98% rename from xxl-job-admin/src/test/java/com/xxl/job/dao/impl/XxlJobLogDaoTest.java rename to xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobLogDaoTest.java index eb659848..02652bbc 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/dao/impl/XxlJobLogDaoTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobLogDaoTest.java @@ -1,4 +1,4 @@ -package com.xxl.job.dao.impl; +package com.xxl.job.admin.dao; import com.xxl.job.admin.core.model.XxlJobLog; import com.xxl.job.admin.dao.XxlJobLogDao; diff --git a/xxl-job-admin/src/test/java/com/xxl/job/dao/impl/XxlJobLogGlueDaoTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobLogGlueDaoTest.java similarity index 97% rename from xxl-job-admin/src/test/java/com/xxl/job/dao/impl/XxlJobLogGlueDaoTest.java rename to xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobLogGlueDaoTest.java index fe8ebc8a..a4adc444 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/dao/impl/XxlJobLogGlueDaoTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobLogGlueDaoTest.java @@ -1,4 +1,4 @@ -package com.xxl.job.dao.impl; +package com.xxl.job.admin.dao; import com.xxl.job.admin.core.model.XxlJobLogGlue; import com.xxl.job.admin.dao.XxlJobLogGlueDao; diff --git a/xxl-job-admin/src/test/java/com/xxl/job/dao/impl/XxlJobRegistryDaoTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobRegistryDaoTest.java similarity index 96% rename from xxl-job-admin/src/test/java/com/xxl/job/dao/impl/XxlJobRegistryDaoTest.java rename to xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobRegistryDaoTest.java index 349ef4b0..69448727 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/dao/impl/XxlJobRegistryDaoTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobRegistryDaoTest.java @@ -1,4 +1,4 @@ -package com.xxl.job.dao.impl; +package com.xxl.job.admin.dao; import com.xxl.job.admin.core.model.XxlJobRegistry; import com.xxl.job.admin.dao.XxlJobRegistryDao; diff --git a/xxl-job-admin/src/test/java/com/xxl/job/dao/impl/MailUtilTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/util/MailUtilTest.java similarity index 97% rename from xxl-job-admin/src/test/java/com/xxl/job/dao/impl/MailUtilTest.java rename to xxl-job-admin/src/test/java/com/xxl/job/admin/util/MailUtilTest.java index 7f96673f..a55c75f8 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/dao/impl/MailUtilTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/util/MailUtilTest.java @@ -1,4 +1,4 @@ -package com.xxl.job.dao.impl; +package com.xxl.job.admin.util; import com.xxl.job.admin.core.util.MailUtil; import org.junit.Test; diff --git a/xxl-job-admin/src/test/java/com/xxl/job/admin/util/PropertiesUtilTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/util/PropertiesUtilTest.java new file mode 100644 index 00000000..5c8b7f04 --- /dev/null +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/util/PropertiesUtilTest.java @@ -0,0 +1,18 @@ +package com.xxl.job.admin.util; + +import com.xxl.job.admin.core.util.PropertiesUtil; +import org.junit.Test; + +/** + * prop util test + * + * @author xuxueli 2017-12-25 15:17:36 + */ +public class PropertiesUtilTest { + + @Test + public void registryTest() throws Exception { + System.out.println(PropertiesUtil.getString("xxl.job.login.username")); + } + +} diff --git a/xxl-job-admin/src/test/java/com/xxl/job/dao/impl/AdminBizTest.java b/xxl-job-admin/src/test/java/com/xxl/job/adminbiz/AdminBizTest.java similarity index 98% rename from xxl-job-admin/src/test/java/com/xxl/job/dao/impl/AdminBizTest.java rename to xxl-job-admin/src/test/java/com/xxl/job/adminbiz/AdminBizTest.java index 6ccea517..ae2f559d 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/dao/impl/AdminBizTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/adminbiz/AdminBizTest.java @@ -1,4 +1,4 @@ -package com.xxl.job.dao.impl; +package com.xxl.job.adminbiz; import com.xxl.job.core.biz.AdminBiz; import com.xxl.job.core.biz.model.RegistryParam;