diff --git a/src/main/java/cn/celess/blog/controller/ArticleController.java b/src/main/java/cn/celess/blog/controller/ArticleController.java index f11835e..e611d94 100644 --- a/src/main/java/cn/celess/blog/controller/ArticleController.java +++ b/src/main/java/cn/celess/blog/controller/ArticleController.java @@ -3,7 +3,6 @@ package cn.celess.blog.controller; import cn.celess.blog.enmu.ResponseEnum; import cn.celess.blog.entity.Response; import cn.celess.blog.entity.model.ArticleModel; -import cn.celess.blog.entity.model.PageData; import cn.celess.blog.entity.request.ArticleReq; import cn.celess.blog.service.ArticleService; import cn.celess.blog.util.RedisUserUtil; @@ -13,8 +12,6 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; -import java.util.List; -import java.util.stream.Collectors; /** * @author : xiaohai diff --git a/src/main/java/cn/celess/blog/controller/LinksController.java b/src/main/java/cn/celess/blog/controller/LinksController.java index fb5b599..1375acc 100644 --- a/src/main/java/cn/celess/blog/controller/LinksController.java +++ b/src/main/java/cn/celess/blog/controller/LinksController.java @@ -1,24 +1,18 @@ package cn.celess.blog.controller; -import cn.celess.blog.enmu.ResponseEnum; import cn.celess.blog.entity.PartnerSite; import cn.celess.blog.entity.Response; import cn.celess.blog.entity.request.LinkApplyReq; import cn.celess.blog.entity.request.LinkReq; -import cn.celess.blog.exception.MyException; import cn.celess.blog.service.MailService; import cn.celess.blog.service.PartnerSiteService; -import cn.celess.blog.util.DateFormatUtil; import cn.celess.blog.util.RedisUtil; -import cn.celess.blog.util.RegexUtil; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.mail.SimpleMailMessage; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; -import java.util.concurrent.TimeUnit; /** * @author : xiaohai diff --git a/src/main/java/cn/celess/blog/service/serviceimpl/ArticleServiceImpl.java b/src/main/java/cn/celess/blog/service/serviceimpl/ArticleServiceImpl.java index b5e9c9a..ed7d788 100644 --- a/src/main/java/cn/celess/blog/service/serviceimpl/ArticleServiceImpl.java +++ b/src/main/java/cn/celess/blog/service/serviceimpl/ArticleServiceImpl.java @@ -22,7 +22,6 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import sun.security.krb5.internal.PAData; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; diff --git a/src/main/java/cn/celess/blog/service/serviceimpl/PartnerSiteServiceImpl.java b/src/main/java/cn/celess/blog/service/serviceimpl/PartnerSiteServiceImpl.java index af49b48..398cba5 100644 --- a/src/main/java/cn/celess/blog/service/serviceimpl/PartnerSiteServiceImpl.java +++ b/src/main/java/cn/celess/blog/service/serviceimpl/PartnerSiteServiceImpl.java @@ -10,7 +10,6 @@ import cn.celess.blog.mapper.PartnerMapper; import cn.celess.blog.service.MailService; import cn.celess.blog.service.PartnerSiteService; import cn.celess.blog.util.HttpUtil; -import cn.celess.blog.util.JwtUtil; import cn.celess.blog.util.RedisUtil; import cn.celess.blog.util.RegexUtil; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/src/test/java/cn/celess/blog/BaseTest.java b/src/test/java/cn/celess/blog/BaseTest.java index 2a8e4e2..fa740f6 100644 --- a/src/test/java/cn/celess/blog/BaseTest.java +++ b/src/test/java/cn/celess/blog/BaseTest.java @@ -33,7 +33,6 @@ import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilde import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; - import java.io.IOException; import java.io.InputStream; import java.io.UnsupportedEncodingException; @@ -64,6 +63,8 @@ public class BaseTest { protected MockMvc mockMvc; protected final static String Code = "code"; protected final static String Result = "result"; + protected final static String USERE_MAIL = "zh56462271@qq.com"; + protected final static String ADMIN_EMAIL = "a@celess.cn"; /** * jackson 序列化/反序列化Json diff --git a/src/test/java/cn/celess/blog/RedisServerMock.java b/src/test/java/cn/celess/blog/RedisServerMock.java index ec1df6f..009afa1 100644 --- a/src/test/java/cn/celess/blog/RedisServerMock.java +++ b/src/test/java/cn/celess/blog/RedisServerMock.java @@ -1,7 +1,7 @@ package cn.celess.blog; -import redis.embedded.RedisServer; import org.springframework.stereotype.Component; +import redis.embedded.RedisServer; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; diff --git a/src/test/java/cn/celess/blog/controller/ArticleControllerTest.java b/src/test/java/cn/celess/blog/controller/ArticleControllerTest.java index 40d7aca..d63d8a7 100644 --- a/src/test/java/cn/celess/blog/controller/ArticleControllerTest.java +++ b/src/test/java/cn/celess/blog/controller/ArticleControllerTest.java @@ -14,12 +14,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; +import java.util.List; -import java.util.*; - +import static cn.celess.blog.enmu.ResponseEnum.*; import static org.junit.Assert.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; -import static cn.celess.blog.enmu.ResponseEnum.*; public class ArticleControllerTest extends BaseTest { @Autowired diff --git a/src/test/java/cn/celess/blog/controller/CategoryControllerTest.java b/src/test/java/cn/celess/blog/controller/CategoryControllerTest.java index 45317e5..cb5e78c 100644 --- a/src/test/java/cn/celess/blog/controller/CategoryControllerTest.java +++ b/src/test/java/cn/celess/blog/controller/CategoryControllerTest.java @@ -10,9 +10,9 @@ import com.fasterxml.jackson.core.type.TypeReference; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; +import static cn.celess.blog.enmu.ResponseEnum.SUCCESS; import static org.junit.Assert.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; -import static cn.celess.blog.enmu.ResponseEnum.*; public class CategoryControllerTest extends BaseTest { diff --git a/src/test/java/cn/celess/blog/controller/LinksControllerTest.java b/src/test/java/cn/celess/blog/controller/LinksControllerTest.java index 3fb914c..646ef85 100644 --- a/src/test/java/cn/celess/blog/controller/LinksControllerTest.java +++ b/src/test/java/cn/celess/blog/controller/LinksControllerTest.java @@ -8,24 +8,13 @@ import cn.celess.blog.entity.request.LinkApplyReq; import cn.celess.blog.entity.request.LinkReq; import cn.celess.blog.exception.MyException; import cn.celess.blog.mapper.PartnerMapper; +import cn.celess.blog.service.PartnerSiteService; import com.fasterxml.jackson.core.type.TypeReference; +import lombok.extern.slf4j.Slf4j; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import java.util.List; -import cn.celess.blog.service.MailService; -import cn.celess.blog.service.PartnerSiteService; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import lombok.extern.slf4j.Slf4j; -import net.sf.json.JSONObject; -import org.junit.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.MediaType; -import org.springframework.mail.SimpleMailMessage; - -import java.lang.reflect.Field; -import java.util.UUID; import static cn.celess.blog.enmu.ResponseEnum.*; import static org.junit.Assert.*; @@ -228,7 +217,7 @@ public class LinksControllerTest extends BaseTest { req.setEmail(randomStr(4) + "@celess.cn"); req.setLinkUrl("https://bing.com"); req.setUrl(req.getLinkUrl()); - String uuid = null; + String uuid; try { partnerSiteService.apply(req); // err here diff --git a/src/test/java/cn/celess/blog/controller/TagControllerTest.java b/src/test/java/cn/celess/blog/controller/TagControllerTest.java index dd5abf6..dd3811f 100644 --- a/src/test/java/cn/celess/blog/controller/TagControllerTest.java +++ b/src/test/java/cn/celess/blog/controller/TagControllerTest.java @@ -13,9 +13,9 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.List; import java.util.Map; +import static cn.celess.blog.enmu.ResponseEnum.*; import static org.junit.Assert.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; -import static cn.celess.blog.enmu.ResponseEnum.*; public class TagControllerTest extends BaseTest { @Autowired diff --git a/src/test/java/cn/celess/blog/controller/UserControllerTest.java b/src/test/java/cn/celess/blog/controller/UserControllerTest.java index f142ed6..1ea75af 100644 --- a/src/test/java/cn/celess/blog/controller/UserControllerTest.java +++ b/src/test/java/cn/celess/blog/controller/UserControllerTest.java @@ -23,14 +23,16 @@ import org.springframework.util.MultiValueMap; import java.io.InputStream; import java.net.HttpURLConnection; import java.net.URL; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Random; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import static cn.celess.blog.enmu.ResponseEnum.*; import static org.junit.Assert.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; -import static cn.celess.blog.enmu.ResponseEnum.*; public class UserControllerTest extends BaseTest { diff --git a/src/test/java/cn/celess/blog/controller/WebUpdateInfoControllerTest.java b/src/test/java/cn/celess/blog/controller/WebUpdateInfoControllerTest.java index 367dc34..648a41a 100644 --- a/src/test/java/cn/celess/blog/controller/WebUpdateInfoControllerTest.java +++ b/src/test/java/cn/celess/blog/controller/WebUpdateInfoControllerTest.java @@ -14,7 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.Date; import java.util.List; -import static cn.celess.blog.enmu.ResponseEnum.*; +import static cn.celess.blog.enmu.ResponseEnum.DATA_NOT_EXIST; +import static cn.celess.blog.enmu.ResponseEnum.SUCCESS; import static org.junit.Assert.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; diff --git a/src/test/java/cn/celess/blog/mapper/ArticleTagMapperTest.java b/src/test/java/cn/celess/blog/mapper/ArticleTagMapperTest.java index a6ee615..6941f2d 100644 --- a/src/test/java/cn/celess/blog/mapper/ArticleTagMapperTest.java +++ b/src/test/java/cn/celess/blog/mapper/ArticleTagMapperTest.java @@ -5,7 +5,6 @@ import cn.celess.blog.entity.*; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; - import java.util.List; import static org.junit.Assert.*; diff --git a/src/test/java/cn/celess/blog/mapper/VisitorMapperTest.java b/src/test/java/cn/celess/blog/mapper/VisitorMapperTest.java index d782c94..1e2c78d 100644 --- a/src/test/java/cn/celess/blog/mapper/VisitorMapperTest.java +++ b/src/test/java/cn/celess/blog/mapper/VisitorMapperTest.java @@ -7,7 +7,8 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.Date; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; public class VisitorMapperTest extends BaseTest { diff --git a/src/test/java/cn/celess/blog/util/DateFormatUtilTest.java b/src/test/java/cn/celess/blog/util/DateFormatUtilTest.java index f0b1b90..c1a8b8e 100644 --- a/src/test/java/cn/celess/blog/util/DateFormatUtilTest.java +++ b/src/test/java/cn/celess/blog/util/DateFormatUtilTest.java @@ -5,7 +5,7 @@ import org.junit.Test; import java.util.Date; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; public class DateFormatUtilTest extends BaseTest { diff --git a/src/test/java/cn/celess/blog/util/HttpUtilTest.java b/src/test/java/cn/celess/blog/util/HttpUtilTest.java index 77dc9e0..544d0ab 100644 --- a/src/test/java/cn/celess/blog/util/HttpUtilTest.java +++ b/src/test/java/cn/celess/blog/util/HttpUtilTest.java @@ -1,13 +1,9 @@ package cn.celess.blog.util; import cn.celess.blog.BaseTest; -import cn.celess.blog.enmu.ResponseEnum; -import cn.celess.blog.entity.Response; import org.junit.Test; -import java.util.Map; - -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; public class HttpUtilTest extends BaseTest { diff --git a/src/test/java/cn/celess/blog/util/MD5UtilTest.java b/src/test/java/cn/celess/blog/util/MD5UtilTest.java index f9010c4..b8604a0 100644 --- a/src/test/java/cn/celess/blog/util/MD5UtilTest.java +++ b/src/test/java/cn/celess/blog/util/MD5UtilTest.java @@ -3,7 +3,7 @@ package cn.celess.blog.util; import cn.celess.blog.BaseTest; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class MD5UtilTest extends BaseTest {