Merge branch 'hotfix/optimizeImport' into 'master'

优化导包,删除无用的异常



See merge request !7

src/main/java/cn/quantgroup/xyqb/aspect/fplock/FPLock.java

-package cn.quantgroup.xyqb.aspect.fplock;
-
-import java.lang.annotation.*;
-
-/**
- * Created by Miraculous on 15/11/10.
- */
-@Documented
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-@interface FPLock {
-
-    String uniqueName();
-
-    FPRestriction[] restrictions() default {};
-}

src/main/java/cn/quantgroup/xyqb/aspect/fplock/FPRestriction.java

-package cn.quantgroup.xyqb.aspect.fplock;
-
-import java.lang.annotation.*;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Created by Miraculous on 15/11/10.
- */
-@Documented
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface FPRestriction {
-    // 持续时间
-    int duration() default 1;
-
-    // 持续时间单位
-    TimeUnit type() default TimeUnit.MINUTES;
-
-    // 限制值, -1表示不限制
-    int limit() default -1;
-
-    // 使用可覆盖
-    boolean override() default true;
-}

src/main/java/cn/quantgroup/xyqb/aspect/logcaller/LogHttpCaller.java

-package cn.quantgroup.xyqb.aspect.logcaller;
-
-import java.lang.annotation.*;
-
-/**
- * Created by Administrator on 2017/5/15.
- */
-@Documented
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface LogHttpCaller {
-}

src/main/java/cn/quantgroup/xyqb/config/http/HttpConfig.java

@@ -18,7 +18,6 @@ import org.apache.http.conn.ssl.SSLContextBuilder;
 import org.apache.http.cookie.Cookie;
 import org.apache.http.cookie.CookieOrigin;
 import org.apache.http.cookie.CookieSpecProvider;
-import org.apache.http.cookie.MalformedCookieException;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.DefaultConnectionKeepAliveStrategy;
 import org.apache.http.impl.client.StandardHttpRequestRetryHandler;

src/main/java/cn/quantgroup/xyqb/config/http/Timestamp2LongConverter.java

@@ -3,7 +3,6 @@ package cn.quantgroup.xyqb.config.http;
 import com.alibaba.fastjson.serializer.JSONSerializer;
 import com.alibaba.fastjson.serializer.ObjectSerializer;
 
-import java.io.IOException;
 import java.lang.reflect.Type;
 import java.sql.Timestamp;
 

src/main/java/cn/quantgroup/xyqb/controller/external/captcha/NewCaptchaController.java

 package cn.quantgroup.xyqb.controller.external.captcha;
 
 import cn.quantgroup.xyqb.Constants;
-import cn.quantgroup.xyqb.aspect.logcaller.LogHttpCaller;
 import cn.quantgroup.xyqb.model.ClientType;
 import cn.quantgroup.xyqb.model.JsonResult;
 import cn.quantgroup.xyqb.service.captcha.IGeetestCaptchaService;

src/main/java/cn/quantgroup/xyqb/controller/external/user/AppController.java

 package cn.quantgroup.xyqb.controller.external.user;
 
 import cn.quantgroup.xyqb.aspect.accessable.IpValidator;
-import cn.quantgroup.xyqb.aspect.logcaller.LogHttpCaller;
 import cn.quantgroup.xyqb.controller.IBaseController;
 import cn.quantgroup.xyqb.entity.Merchant;
 import cn.quantgroup.xyqb.entity.User;

src/main/java/cn/quantgroup/xyqb/controller/external/user/InnerController.java

@@ -2,7 +2,6 @@ package cn.quantgroup.xyqb.controller.external.user;
 
 import cn.quantgroup.user.enums.Relation;
 import cn.quantgroup.xyqb.Constants;
-import cn.quantgroup.xyqb.aspect.logcaller.LogHttpCaller;
 import cn.quantgroup.xyqb.controller.IBaseController;
 import cn.quantgroup.xyqb.entity.*;
 import cn.quantgroup.xyqb.entity.enumerate.*;

src/main/java/cn/quantgroup/xyqb/controller/external/user/UserApiController.java

@@ -2,7 +2,6 @@ package cn.quantgroup.xyqb.controller.external.user;
 
 import cn.quantgroup.xyqb.Constants;
 import cn.quantgroup.xyqb.aspect.accessable.IpValidator;
-import cn.quantgroup.xyqb.aspect.logcaller.LogHttpCaller;
 import cn.quantgroup.xyqb.entity.User;
 import cn.quantgroup.xyqb.model.JsonResult;
 import cn.quantgroup.xyqb.model.session.SessionStruct;

src/main/java/cn/quantgroup/xyqb/controller/internal/login/AuthInfoController.java

 package cn.quantgroup.xyqb.controller.internal.login;
 
-import cn.quantgroup.xyqb.aspect.logcaller.LogHttpCaller;
 import cn.quantgroup.xyqb.controller.IBaseController;
 import cn.quantgroup.xyqb.model.JsonResult;
 import cn.quantgroup.xyqb.model.UserRet;

src/main/java/cn/quantgroup/xyqb/controller/internal/user/UserAuthorizedController.java

 package cn.quantgroup.xyqb.controller.internal.user;
 
-import cn.quantgroup.xyqb.aspect.logcaller.LogHttpCaller;
 import cn.quantgroup.xyqb.entity.UserAuthorized;
 import cn.quantgroup.xyqb.model.JsonResult;
 import cn.quantgroup.xyqb.model.UserAuthorizedParam;

src/main/java/cn/quantgroup/xyqb/controller/internal/user/UserController.java

@@ -4,7 +4,6 @@ import cn.quantgroup.tech.util.TechEnvironment;
 import cn.quantgroup.xyqb.Constants;
 import cn.quantgroup.xyqb.aspect.captcha.CaptchaFiniteValidator;
 import cn.quantgroup.xyqb.aspect.lock.PasswordErrorFiniteValidator;
-import cn.quantgroup.xyqb.aspect.logcaller.LogHttpCaller;
 import cn.quantgroup.xyqb.controller.IBaseController;
 import cn.quantgroup.xyqb.entity.Merchant;
 import cn.quantgroup.xyqb.entity.User;

src/main/java/cn/quantgroup/xyqb/exception/ResponseException.java

-package cn.quantgroup.xyqb.exception;
-
-/**
- * @author mengfan.feng
- * @time 2015-11-16 11:10
- * @see cn.quantgroup.xyqb.model.JsonResult#msg
- */
-public class ResponseException extends RuntimeException {
-
-    private static final long serialVersionUID = -1L;
-
-    public ResponseException(String message) {
-        super(message);
-    }
-
-    public ResponseException(String message, Throwable cause) {
-        super(message, cause);
-    }
-}

src/main/java/cn/quantgroup/xyqb/model/session/LoginInfo.java

 package cn.quantgroup.xyqb.model.session;
 
-import cn.quantgroup.motan.retbean.XLoginInfo;
 import cn.quantgroup.xyqb.model.UserRet;
-import com.alibaba.fastjson.JSON;
 import lombok.Data;
 
 /**

src/main/java/cn/quantgroup/xyqb/repository/IUserQueryLogRepository.java

@@ -6,7 +6,6 @@ import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.sql.Timestamp;
 import java.util.Date;
 import java.util.List;
 

src/main/java/cn/quantgroup/xyqb/service/captcha/impl/GeetestCaptchaServiceImpl.java

@@ -5,12 +5,9 @@ import cn.quantgroup.xyqb.model.ClientType;
 import cn.quantgroup.xyqb.service.captcha.GeetestLib;
 import cn.quantgroup.xyqb.service.captcha.IGeetestCaptchaService;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;

src/main/java/cn/quantgroup/xyqb/service/register/handler/impl/BaseUserRegisterHandler.java

@@ -72,7 +72,8 @@ public class BaseUserRegisterHandler extends AbstractUserRegisterHandler {
             user.setRegisteredFrom(registerFrom);
         }
         String password = StringUtils.defaultString(userRegisterParam.getPassword(), "");
-        if (userRegisterParam.isGenerateRandomPwd()) { // 如果需要生成随机密码
+        // 如果需要生成随机密码
+        if (userRegisterParam.isGenerateRandomPwd()) {
             password = PasswordUtil.generateRandomPwd(Constants.RANDOM_PWD_LEN);
         }
         user.setPassword(PasswordUtil.MD5(password.toLowerCase() + Constants.PASSWORD_SALT));

src/main/java/cn/quantgroup/xyqb/service/user/IUuidPhoneMappingService.java

 package cn.quantgroup.xyqb.service.user;
 
-import cn.quantgroup.xyqb.entity.UuidPhoneMapping;
-
 /**
  * Created by Miraculous on 15/10/29.
  */

src/main/java/cn/quantgroup/xyqb/service/user/impl/ContactServiceImpl.java

@@ -14,7 +14,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.sql.Timestamp;
-import java.util.Iterator;
 import java.util.List;
 
 /**

src/main/java/cn/quantgroup/xyqb/service/user/impl/UserDetailServiceImpl.java

@@ -24,10 +24,7 @@ import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;

src/main/java/cn/quantgroup/xyqb/util/XmlUtil.java

 package cn.quantgroup.xyqb.util;
 
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
-import java.io.Reader;
-import java.io.StringReader;
 import java.io.StringWriter;
 
 /**

src/test/java/CaptchaVerifyTests.java

-import service.GeetestCaptchaServiceTest;
-import service.QuantgroupCaptchaServiceTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
+import service.GeetestCaptchaServiceTest;
+import service.QuantgroupCaptchaServiceTest;
 
 @RunWith(Suite.class)
 @Suite.SuiteClasses({GeetestCaptchaServiceTest.class, QuantgroupCaptchaServiceTest.class})

src/test/java/UserAuthorizedTests.java

+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 import repsitory.UserAuthorizedRepsitoryTests;
 import service.UserAuthorizedServiceTests;
 import web.UserAuthorizedControllerTests;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
 
 @RunWith(Suite.class)
 @Suite.SuiteClasses({UserAuthorizedRepsitoryTests.class, UserAuthorizedServiceTests.class, UserAuthorizedControllerTests.class})

src/test/java/login/TestUserLogin.java

@@ -15,7 +15,6 @@ import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
 import org.junit.Test;
@@ -24,7 +23,6 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-
 import javax.annotation.Resource;
 import java.io.IOException;
 import java.util.ArrayList;

src/test/java/service/GeetestCaptchaServiceTest.java

 package service;
 
 import cn.quantgroup.xyqb.Bootstrap;
-import cn.quantgroup.xyqb.Constants;
 import cn.quantgroup.xyqb.model.ClientType;
 import cn.quantgroup.xyqb.service.captcha.IGeetestCaptchaService;
 import cn.quantgroup.xyqb.util.PasswordUtil;