fix : 搞事情.... 根据IDEA处理了一些代码

pom.xml

@@ -49,11 +49,6 @@
             <artifactId>gson</artifactId>
             <version>2.3.1</version>
         </dependency>
-        <dependency>
-            <groupId>com.rabbitmq</groupId>
-            <artifactId>amqp-client</artifactId>
-            <version>3.6.2</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.amqp</groupId>
             <artifactId>spring-rabbit</artifactId>
@@ -93,11 +88,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <scope>runtime</scope>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

src/main/java/cn/quantgroup/user/enums/IncomeEnum.java

@@ -10,7 +10,7 @@ public enum IncomeEnum {
     CASH_AND_PAY_CARD("混合");
     private String desc;
 
-    private IncomeEnum(String desc) {
+    IncomeEnum(String desc) {
         this.desc = desc;
     }
 }
\ No newline at end of file

src/main/java/cn/quantgroup/user/enums/IncomeRangeEnum.java

@@ -16,7 +16,7 @@ public enum IncomeRangeEnum {
 
     private String desc;
 
-    private IncomeRangeEnum(String desc) {
+    IncomeRangeEnum(String desc) {
         this.desc = desc;
     }
 

src/main/java/cn/quantgroup/user/enums/MaritalStatus.java

@@ -29,7 +29,7 @@ public enum MaritalStatus {
 
     @Override
     public String toString() {
-        final StringBuffer sb = new StringBuffer("MaritalStatus{");
+        final StringBuilder sb = new StringBuilder("MaritalStatus{");
         sb.append("description='").append(description).append('\'');
         sb.append('}');
         return sb.toString();

src/main/java/cn/quantgroup/user/enums/Relation.java

@@ -31,7 +31,7 @@ public enum Relation {
 
     @Override
     public String toString() {
-        final StringBuffer sb = new StringBuffer("Relation{");
+        final StringBuilder sb = new StringBuilder("Relation{");
         sb.append("description='").append(description).append('\'');
         sb.append('}');
         return sb.toString();

src/main/java/cn/quantgroup/xyqb/Constants.java

@@ -87,19 +87,11 @@ public interface Constants {
     /**
      * 账密匹配成功 - 锁机制默认参数 - 计数周期
      */
-    Long IPV4_SUCCESS_COUNT_MINUTES = 1 * 60L;
+    Long IPV4_SUCCESS_COUNT_MINUTES = 60L;
     /**
      * 账密匹配成功 - 锁机制默认参数 - 锁开关阈值
      */
     Long IPV4_LOCK_ON_SUCCESS_COUNTS = 40L;
-    /**
-     * 危险期 - 起始时间（Hour）
-     */
-    int DANGEROUS_TIME_START = 22;
-    /**
-     * 危险期 - 结束时间（Hour）
-     */
-    int DANGEROUS_TIME_END = 6;
     /**
      * 安全策略参数设置 - 秘钥 - 口令
      */

src/main/java/cn/quantgroup/xyqb/aspect/captcha/CaptchaFiniteValidateAdvisor.java

@@ -44,14 +44,6 @@ public class CaptchaFiniteValidateAdvisor {
     private static final Logger LOGGER = LoggerFactory.getLogger(CaptchaFiniteValidateAdvisor.class);
     private static final String SUPER_CAPTCHA_ID = UUID.nameUUIDFromBytes("__QG_APPCLIENT_AGENT__".getBytes(Charset.forName("UTF-8"))).toString();
     private static final String SUPER_CAPTCHA = "__SUPERQG__";
-    /**
-     * 图形验证码错误计数器生命周期，与图形验证码生命周期保持一致
-     * 参照点：cn.quantgroup.xyqb.config.captcha.RedisCaptchaStore{
-     * DEFAULT_EXPIRED_IN = 120L;
-     * DEFAULT_EXPIRED_TIMEUNIT = TimeUnit.SECONDS;
-     * }
-     */
-    private static final Long SECONDS = 2 * 60L;
 
     @Autowired
     @Qualifier("stringRedisTemplate")
@@ -144,7 +136,7 @@ public class CaptchaFiniteValidateAdvisor {
         return Long.valueOf(countString);
     }
 
-    private final static String getKey(String phoneNo) {
+    private String getKey(String phoneNo) {
         if (StringUtils.isBlank(phoneNo)) {
             return null;
         }
@@ -182,7 +174,7 @@ public class CaptchaFiniteValidateAdvisor {
             return null;
         }
         LOGGER.info("账密登录, phoneNo:{}", phoneNo);
-        Map<String, String> phonePasswordMap = new HashMap<String, String>(2);
+        Map<String, String> phonePasswordMap = new HashMap<>(2);
         phonePasswordMap.put(Constants.PHONE_NO, phoneNo);
         phonePasswordMap.put("password", password);
         return phonePasswordMap;

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

@@ -8,7 +8,7 @@ import java.lang.annotation.*;
 @Documented
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface FPLock {
+@interface FPLock {
 
     String uniqueName();
 

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

@@ -127,8 +127,12 @@ public class FirstParamLockAspect {
     public void setLimitation(String key, Integer duration, Integer limit) {
         FPRestrictionWraper restriction = LOCK_PARAM.get(key);
         if (restriction != null) {
-            if (duration != null) restriction.duration(duration);
-            if (limit != null) restriction.limit(limit);
+            if (duration != null) {
+                restriction.duration(duration);
+            }
+            if (limit != null) {
+                restriction.limit(limit);
+            }
         }
 
     }

src/main/java/cn/quantgroup/xyqb/aspect/lock/PasswordErrorFiniteValidateAdvisor.java

@@ -85,7 +85,7 @@ public class PasswordErrorFiniteValidateAdvisor {
         return pjp.proceed();
     }
 
-    private final static String getLockIpv4Key(String ipv4) {
+    private static String getLockIpv4Key(String ipv4) {
         return Constants.IPV4_LOCK + ipv4;
     }
 

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

@@ -21,7 +21,6 @@ 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.HttpClients;
 import org.apache.http.impl.client.StandardHttpRequestRetryHandler;
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.apache.http.impl.cookie.BestMatchSpecFactory;
@@ -125,7 +124,7 @@ public class HttpConfig {
                 .register(CookieSpecs.BROWSER_COMPATIBILITY, new BrowserCompatSpecFactory())
                 .register("easy", httpContext -> new BrowserCompatSpec() {
                     @Override
-                    public void validate(Cookie cookie, CookieOrigin origin) throws MalformedCookieException {
+                    public void validate(Cookie cookie, CookieOrigin origin) {
                     }
                 }).build();
 

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

@@ -14,7 +14,7 @@ public class Timestamp2LongConverter implements ObjectSerializer {
     ;
 
     @Override
-    public void write(JSONSerializer serializer, Object object, Object fieldName, Type fieldType, int features) throws IOException {
+    public void write(JSONSerializer serializer, Object object, Object fieldName, Type fieldType, int features) {
         Timestamp time = (Timestamp) object;
         if (time == null) {
             serializer.write(String.valueOf(0L));

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

@@ -51,7 +51,7 @@ public class NewCaptchaController {
         String keyMd5 = PasswordUtil.MD5(key);
         log.info("获取验证码, phoneNo:{}, keyMd5:{}, clientType:{}, ip:{}, verifyType-qg:{}", phoneNo, keyMd5, clientType, remoteIp, geetestClose);
         // 数据容器
-        Map<String, String> data = new HashMap<String, String>();
+        Map<String, String> data = new HashMap<>();
         Map<String, String> imgMap = null;
         // 优先获取极验
         if (!Boolean.valueOf(geetestClose)) {

src/main/java/cn/quantgroup/xyqb/controller/external/index/HelloController.java

-package cn.quantgroup.xyqb.controller.external.index;
-
-import cn.quantgroup.xyqb.util.IPUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * Created by xuran on 2017/7/12.
- */
-@RestController
-@Slf4j
-@RequestMapping("/hello")
-public class HelloController {
-    @RequestMapping("/hello")
-    public String hello(HttpServletRequest request) {
-        String ip = IPUtil.getRemoteIP(request);
-        if (ip.startsWith("192.168.12.")) {
-            log.error("测试:", new Exception("Sentry捕获异常"));
-        }
-        return "ok";
-    }
-}

src/main/java/cn/quantgroup/xyqb/controller/external/lock/LockIpv4Controller.java

@@ -69,8 +69,8 @@ public class LockIpv4Controller implements IBaseController {
      * @return
      */
     @RequestMapping("/lock_ipv4")
-    public JsonResult lockIpv4(@RequestParam(required = true) String ip,
-                               @RequestParam(required = true) String key,
+    public JsonResult lockIpv4(@RequestParam() String ip,
+                               @RequestParam() String key,
                                @RequestParam(required = false) String act,
                                HttpServletRequest request) {
         if (!ValidationUtil.validateIpv4(ip) || StringUtils.isBlank(act) || StringUtils.isBlank(key)) {
@@ -131,8 +131,8 @@ public class LockIpv4Controller implements IBaseController {
      * @return
      */
     @RequestMapping("/configHitList")
-    public JsonResult configHitList(@RequestParam(required = true) String ip,
-                                    @RequestParam(required = true) String key,
+    public JsonResult configHitList(@RequestParam() String ip,
+                                    @RequestParam() String key,
                                     @RequestParam(required = false) String act,
                                     @RequestParam(required = false) String type,
                                     HttpServletRequest request) {
@@ -196,7 +196,7 @@ public class LockIpv4Controller implements IBaseController {
      * @return
      */
     @RequestMapping("/configNoun")
-    public JsonResult configNoun(@RequestParam(required = true) String key,
+    public JsonResult configNoun(@RequestParam() String key,
                                  @RequestParam(required = false) String act,
                                  @RequestParam(required = false) String counts,
                                  @RequestParam(required = false) String minutes,
@@ -230,7 +230,7 @@ public class LockIpv4Controller implements IBaseController {
      * @param minutes - 锁定时长(? > 0)
      * @param operate - 操作：true-添加，false-删除
      */
-    private final void configNoun(int counts, int minutes, boolean operate) {
+    private void configNoun(int counts, int minutes, boolean operate) {
         if (operate) {
             if (counts > 0) {
                 redisTemplate.opsForValue().set(Constants.IPV4_LOCK_ON_COUNTS_REDIS, String.valueOf(counts));
@@ -253,7 +253,7 @@ public class LockIpv4Controller implements IBaseController {
      * @param ipv4
      * @return Redis-key
      */
-    private final static String getLockIpv4Key(String ipv4) {
+    private static String getLockIpv4Key(String ipv4) {
         return Constants.IPV4_LOCK + ipv4;
     }
 

src/main/java/cn/quantgroup/xyqb/controller/external/motan/MotanUserServiceImpl.java

@@ -554,7 +554,7 @@ public class MotanUserServiceImpl implements UserMotanService {
         if (CollectionUtils.isEmpty(userDetails)) {
             return null;
         }
-        List<XUserDetail> xUserDetails = userDetails.stream().map(user -> fromUserDetailVO(user)).collect(Collectors.toList());
+        List<XUserDetail> xUserDetails = userDetails.stream().map(this::fromUserDetailVO).collect(Collectors.toList());
         return returnSuccessValue(xUserDetails);
     }
 

src/main/java/cn/quantgroup/xyqb/controller/external/queryLog/UserQueryLogController.java

@@ -79,14 +79,14 @@ public class UserQueryLogController {
         try {
             SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
             SimpleDateFormat sfs = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            Date date1 = null, date2 = null;
-            if (beginDate != null && StringUtils.hasLength(beginDate)) {
+            Date date1, date2;
+            if (StringUtils.hasLength(beginDate)) {
                 date1 = sfs.parse(beginDate + " 00:00:00");
             } else {
                 String nowStr = sf.format(new Date());
                 date1 = sfs.parse(nowStr + " 00:00:00");
             }
-            if (endDate != null && StringUtils.hasLength(endDate)) {
+            if (StringUtils.hasLength(endDate)) {
                 date2 = sfs.parse(endDate + " 23:59:59");
             } else {
                 String nowEndStr = sf.format(new Date());
@@ -95,7 +95,7 @@ public class UserQueryLogController {
             int startP = (pageId - 1) * pageSize;
             List<UserQueryLog> userQueryLogs = userQueryLogService.findByTimestamp(date1, date2, startP, pageSize);
             Long total = userQueryLogService.findByTimestampCount(date1, date2);
-            PageModel<UserQueryLog> uqp = new PageModel<UserQueryLog>();
+            PageModel<UserQueryLog> uqp = new PageModel<>();
             uqp.setTotal(total);
             if (pageSize == 0 || pageSize < 0) {
                 pageSize = 30;
@@ -150,11 +150,11 @@ public class UserQueryLogController {
         if (queryV != null && queryV.size() > 3000) {
             return JsonResult.buildErrorStateResult("查询记录数是" + queryV.size() + ",超过3000条限制", null);
         }
-        List<UserQueryInfo> userQueryInfos = new ArrayList<UserQueryInfo>();
-        List<UserDetail> userDetails = new ArrayList<UserDetail>();
+        List<UserQueryInfo> userQueryInfos = new ArrayList<>();
+        List<UserDetail> userDetails = new ArrayList<>();
         Page<UserDetail> userDetailPage = null;
-        List<Address> addresslist = new ArrayList<Address>();
-        HashMap<String, String> phonesCards = new HashMap<String, String>();
+        List<Address> addresslist = new ArrayList<>();
+        HashMap<String, String> phonesCards = new HashMap<>();
         if (pageSize == 0 || pageSize < 0) {
             pageSize = 30;
         } else if (pageSize > 200) {
@@ -165,7 +165,7 @@ public class UserQueryLogController {
             columns = columns + "," + key;
         }
         if (Objects.equals(key, "userId")) {
-            List<Long> userIds = new ArrayList<Long>();
+            List<Long> userIds = new ArrayList<>();
             try {
                 for (String s : queryV) {
                     if (s.length() > 8) {
@@ -204,7 +204,7 @@ public class UserQueryLogController {
                     return JsonResult.buildErrorStateResult(phonesCards.get("errorMsg"), null);
                 }
             } else {
-                List<String> phones = new ArrayList<String>();
+                List<String> phones = new ArrayList<>();
                 for (UserDetail uda : userDetails) {
                     phones.add(uda.getPhoneNo());
                 }
@@ -215,7 +215,7 @@ public class UserQueryLogController {
             }
         }
         if (columns.contains("address")) {
-            List<Long> uidss = new ArrayList<Long>();
+            List<Long> uidss = new ArrayList<>();
             //加地址信息
             for (UserDetail ud : userDetails) {
                 uidss.add(ud.getUserId());
@@ -252,13 +252,13 @@ public class UserQueryLogController {
         //保存记录
         UserQueryLog log = new UserQueryLog();
         log.setQueryItems(columns.replace("userId", "用户ID").replace(Constants.PHONE_NO, "手机号").replace("name", "姓名").replace("idNo", "身份证号").replace("bankCard", "银行卡号").replace("address", "地址"));
-        log.setResultAmount(Long.valueOf(userDetailPage.getTotalElements()));
+        log.setResultAmount(userDetailPage.getTotalElements());
         //转换存储
         log.setQueryCondition(key.replace("userId", "用户ID").replace(Constants.PHONE_NO, "手机号").replace("name", "姓名").replace("idNo", "身份证号"));
         log.setQueryDetail(keyValues.replace("\n", ";"));
         log.setLoginUserName(userName);
         userQueryLogService.save(log);
-        PageModel<UserQueryInfo> uqi = new PageModel<UserQueryInfo>();
+        PageModel<UserQueryInfo> uqi = new PageModel<>();
         uqi.setPageId(pageId);
         uqi.setPageList(userQueryInfos);
         uqi.setPageSize(pageSize);
@@ -268,14 +268,14 @@ public class UserQueryLogController {
     }
 
     private HashMap<String, String> getBankCardsByPhoneNos(List<String> phoneNos) {
-        HashMap<String, Object> ha = new HashMap<String, Object>();
+        HashMap<String, Object> ha = new HashMap<>();
         ha.put("type", "1");
         ha.put("phones", phoneNos);
         String phoneNoStr = new Gson().toJson(ha);
 
         String data = "";
         String sign = "";
-        HashMap<String, String> phonesMap = new HashMap<String, String>();
+        HashMap<String, String> phonesMap = new HashMap<>();
         try {
             data = RSA.encrypt(phoneNoStr, PUBLIC_KEY);
             sign = MD5Util.build(data);
@@ -306,9 +306,9 @@ public class UserQueryLogController {
                         JsonArray cardList = jo.get("cardList").getAsJsonArray();
 
                         String phone = jo.get("phone").getAsString();
-                        String cards = "";
+                        StringBuilder cards = new StringBuilder();
                         for (JsonElement element : cardList) {
-                            cards = cards + element.getAsString() + ";";
+                            cards.append(element.getAsString()).append(";");
                         }
                         if (cards.length() > 0) {
                             phonesMap.put(phone, cards.substring(0, cards.length() - 1));
@@ -351,7 +351,7 @@ public class UserQueryLogController {
             return JsonResult.buildErrorStateResult("请输入查询条件", null);
         }
 
-        List<UserQueryInfo> uqls = new ArrayList<UserQueryInfo>();
+        List<UserQueryInfo> uqls = new ArrayList<>();
 
         String[] values = keyValues.split(";");
 
@@ -367,12 +367,12 @@ public class UserQueryLogController {
             columns = columns + "," + key;
         }
 
-        List<UserQueryInfo> userQueryInfos = new ArrayList<UserQueryInfo>();
-        List<UserDetail> userDetails = new ArrayList<UserDetail>();
-        List<Address> addresslist = new ArrayList<Address>();
-        HashMap<String, String> phonesCards = new HashMap<String, String>();
+        List<UserQueryInfo> userQueryInfos = new ArrayList<>();
+        List<UserDetail> userDetails = new ArrayList<>();
+        List<Address> addresslist = new ArrayList<>();
+        HashMap<String, String> phonesCards = new HashMap<>();
         if (Objects.equals(key, "userId")) {
-            List<Long> userIds = new ArrayList<Long>();
+            List<Long> userIds = new ArrayList<>();
             try {
                 for (String s : queryV) {
                     if (s.length() > 8) {
@@ -410,7 +410,7 @@ public class UserQueryLogController {
             if (key.equals(Constants.PHONE_NO)) {
                 phonesCards = getBankCardsByPhoneNos(queryV);
             } else {
-                List<String> phones = new ArrayList<String>();
+                List<String> phones = new ArrayList<>();
                 for (UserDetail uda : userDetails) {
                     phones.add(uda.getPhoneNo());
                 }
@@ -419,7 +419,7 @@ public class UserQueryLogController {
         }
 
         if (columns.contains("address")) {
-            List<Long> uidss = new ArrayList<Long>();
+            List<Long> uidss = new ArrayList<>();
             //加地址信息
             for (UserDetail ud : userDetails) {
                 uidss.add(ud.getUserId());

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

@@ -730,7 +730,7 @@ public class InnerController implements IBaseController {
         }
         Address address = addressService.findByUserId(user.getId());
         if (!Objects.isNull(address)) {
-            bean.putAddressList(Arrays.asList(address));
+            bean.putAddressList(Collections.singletonList(address));
         }
         List<Contact> contacts = contactService.findByUserId(user.getId(), true);
         if (!Objects.isNull(address)) {
@@ -1113,7 +1113,7 @@ public class InnerController implements IBaseController {
         int i;
         // 生成的密码的长度
         int count = 0;
-        StringBuffer pwd = new StringBuffer();
+        StringBuilder pwd = new StringBuilder();
         Random r = new Random();
         while (count < 15) {
             // 生成的数最大为36-1

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

@@ -87,7 +87,7 @@ public class UserApiController {
     @IpValidator
     @RequestMapping(value = "/valid/{token}", method = RequestMethod.POST)
     public JsonResult checkToken(@ApiParam(value = "sid,session的id", required = true) @PathVariable("token") String token,
-                                 @ApiParam(value = "是否延续生命期，可选参数，默认为: false - 不延续", required = false) @RequestParam(name = "prolong", required = false, defaultValue = "false") Boolean prolong) {
+                                 @ApiParam(value = "是否延续生命期，可选参数，默认为: false - 不延续") @RequestParam(name = "prolong", required = false, defaultValue = "false") Boolean prolong) {
         if (Objects.isNull(token) || !ValidationUtil.validateToken(token)) {
             return JsonResult.buildErrorStateResult("token invalid", token);
         }

src/main/java/cn/quantgroup/xyqb/controller/external/user/center/UserCenterController.java

@@ -213,7 +213,7 @@ public class UserCenterController {
         List<Contact> contacts = contactService.findByUserId(userId, true);
         Map<String, Object> result = new HashMap<>();
         if (null != userExtInfo) {
-            result.put("contacts", null != contacts && contacts.size() > 0 ? true : false);
+            result.put("contacts", null != contacts && contacts.size() > 0);
             result.put("occupation", userExtInfo.getOccupationEnum() == null ? "" : userExtInfo.getOccupationEnum().ordinal());
             result.put("education", userExtInfo.getEducationEnum() == null ? "" : userExtInfo.getEducationEnum().ordinal());
             result.put("income", userExtInfo.getIncomeRangeEnum() == null ? "" : userExtInfo.getIncomeRangeEnum().ordinal());

src/main/java/cn/quantgroup/xyqb/controller/internal/sms/SmsController.java

@@ -370,7 +370,7 @@ public class SmsController implements IBaseController {
             //删除用户重置密码，多次错误逻辑
             deleteRetSendCode(phoneNo);
             if (isApp && needImageVlidate(clientIp, deviceId, phoneNo)) {
-                return JsonResult.buildSuccessResult("发送成功", uniqueId, 0003L);
+                return JsonResult.buildSuccessResult("发送成功", uniqueId, 3L);
             }
             LOGGER.info("sendVerificationCode2New获取短信成功:phone:{},deviceId:{},ip:{}", phoneNo, deviceId, clientIp);
             return JsonResult.buildSuccessResult("发送成功", uniqueId);
@@ -441,7 +441,7 @@ public class SmsController implements IBaseController {
             deleteRetSendCode(phoneNo);
             if (needImageVlidate(clientIp, deviceId, phoneNo)) {
 
-                return JsonResult.buildSuccessResult("发送成功", uniqueId, 0003L);
+                return JsonResult.buildSuccessResult("发送成功", uniqueId, 3L);
             }
             return JsonResult.buildSuccessResult("发送成功", uniqueId);
         } catch (Exception e) {

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

@@ -219,7 +219,7 @@ public class UserController implements IBaseController {
      * @return
      */
     private Map<String, JsonResult> getHeaderParam(HttpServletRequest request) {
-        Map<String, JsonResult> result = new HashMap<String, JsonResult>();
+        Map<String, JsonResult> result = new HashMap<>();
         String verificationHeader = "Verification ";
         String credential = request.getHeader("authorization");
         if (StringUtils.isBlank(credential)) {

src/main/java/cn/quantgroup/xyqb/entity/enumerate/EducationEnum.java

@@ -25,10 +25,6 @@ public enum EducationEnum {
         return name;
     }
 
-    public void setName(String name) {
-        this.name = name;
-    }
-
     @Override
     public String toString() {
         return name;

src/main/java/cn/quantgroup/xyqb/entity/enumerate/IncomeEnum.java

@@ -10,7 +10,7 @@ public enum IncomeEnum {
     CASH_AND_PAY_CARD("混合");
     private String desc;
 
-    private IncomeEnum(String desc) {
+    IncomeEnum(String desc) {
         this.desc = desc;
     }
 }
\ No newline at end of file

src/main/java/cn/quantgroup/xyqb/entity/enumerate/IncomeRangeEnum.java

@@ -16,7 +16,7 @@ public enum IncomeRangeEnum {
 
     private String desc;
 
-    private IncomeRangeEnum(String desc) {
+    IncomeRangeEnum(String desc) {
         this.desc = desc;
     }
 

src/main/java/cn/quantgroup/xyqb/entity/enumerate/MaritalStatus.java

@@ -29,7 +29,7 @@ public enum MaritalStatus {
 
     @Override
     public String toString() {
-        final StringBuffer sb = new StringBuffer("MaritalStatus{");
+        final StringBuilder sb = new StringBuilder("MaritalStatus{");
         sb.append("description='").append(description).append('\'');
         sb.append('}');
         return sb.toString();

src/main/java/cn/quantgroup/xyqb/entity/enumerate/Relation.java

@@ -31,7 +31,7 @@ public enum Relation {
 
     @Override
     public String toString() {
-        final StringBuffer sb = new StringBuffer("Relation{");
+        final StringBuilder sb = new StringBuilder("Relation{");
         sb.append("description='").append(description).append('\'');
         sb.append('}');
         return sb.toString();

src/main/java/cn/quantgroup/xyqb/filter/CrosFilter.java

@@ -36,7 +36,7 @@ public class CrosFilter implements Filter {
     private String allowedHeaders;
 
     @Override
-    public void init(FilterConfig filterConfig) throws ServletException {
+    public void init(FilterConfig filterConfig) {
 
     }
 

src/main/java/cn/quantgroup/xyqb/filter/RequestFilter.java

@@ -36,7 +36,7 @@ public class RequestFilter implements Filter {
     private AntPathMatcher matcher = new AntPathMatcher();
 
     @Override
-    public void init(FilterConfig filterConfig) throws ServletException {
+    public void init(FilterConfig filterConfig) {
     }
 
     @Override

src/main/java/cn/quantgroup/xyqb/model/ClientType.java

@@ -21,7 +21,7 @@ public enum ClientType {
         return this.alias;
     }
 
-    public final static ClientType valueByName(String name) {
+    public static ClientType valueByName(String name) {
         name = Optional.ofNullable(name).orElse("").toLowerCase();
         switch (name) {
             case "app":

src/main/java/cn/quantgroup/xyqb/model/ContactRet.java

@@ -26,7 +26,7 @@ public class ContactRet implements Serializable {
     private Long updateAt;
 
 
-    public static ContactRet contact2ContactRet(Contact c) {
+    private static ContactRet contact2ContactRet(Contact c) {
         if (c == null) {
             return null;
         }

src/main/java/cn/quantgroup/xyqb/model/UserAssociationModel.java

@@ -43,7 +43,7 @@ public class UserAssociationModel implements Serializable {
             return;
         }
         if (Objects.isNull(this.addressList)) {
-            this.addressList = new ArrayList<AddressModel>(entitylist.size());
+            this.addressList = new ArrayList<>(entitylist.size());
         }
         for (Address entity : entitylist) {
             this.addressList.add(AddressModel.entity2Model(entity));
@@ -60,7 +60,7 @@ public class UserAssociationModel implements Serializable {
             return;
         }
         if (Objects.isNull(this.contactList)) {
-            this.contactList = new ArrayList<ContactModel>(entitylist.size());
+            this.contactList = new ArrayList<>(entitylist.size());
         }
         for (Contact entity : entitylist) {
             this.contactList.add(ContactModel.entity2Model(entity));

src/main/java/cn/quantgroup/xyqb/model/model/BlacklistMatchResult.java

@@ -12,27 +12,8 @@ public class BlacklistMatchResult {
     private String status;
     private String errorMsg;
 
-    public String getErrorMsg() {
-        return errorMsg;
-    }
-
-    public void setErrorMsg(String errorMsg) {
-        this.errorMsg = errorMsg;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
     public boolean getFlag() {
         return flag;
     }
 
-    public void setFlag(boolean flag) {
-        this.flag = flag;
-    }
 }

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

@@ -15,22 +15,6 @@ public class LoginInfo {
     private UserRet user;
     private LoginContext loginContext;
 
-    public static XLoginInfo getXLoginInfo(LoginInfo loginInfo) {
-        if (null == loginInfo) {
-            return null;
-        }
-        String userJson = JSON.toJSONString(loginInfo);
-        return JSON.parseObject(userJson, XLoginInfo.class);
-    }
-
-    public XLoginInfo toXLoginInfo() {
-        XLoginInfo xLoginInfo = new XLoginInfo();
-
-        //  xLoginInfo.setUser();
-
-        return xLoginInfo;
-    }
-
     @Data
     public static class LoginContext {
 

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

@@ -33,7 +33,7 @@ public class SessionStruct implements Serializable {
         if (t == null) {
             t = new HashMap<>();
         }
-        return t.containsKey(key) ? t.get(key) : "";
+        return t.getOrDefault(key, "");
     }
 
 }

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

@@ -14,7 +14,6 @@ import java.util.List;
  * Created by 11 on 2016/12/30.
  */
 public interface IUserQueryLogRepository extends JpaRepository<UserQueryLog, Long> {
-    List<UserQueryLog> findByCreatedAt(Timestamp date);
 
     @Transactional
     @Modifying

src/main/java/cn/quantgroup/xyqb/service/captcha/GeetestLib.java

@@ -13,6 +13,7 @@ import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * Java SDK
@@ -94,7 +95,7 @@ public class GeetestLib {
      */
     private Map<String, String> getSuccessPreProcessRes(String challenge) {
         gtlog("challenge:" + challenge);
-        Map<String, String> data = new HashMap<String, String>(3);
+        Map<String, String> data = new HashMap<>(3);
         data.put("success", "1");
         data.put("gt", this.captchaId);
         data.put("challenge", challenge);
@@ -146,7 +147,7 @@ public class GeetestLib {
 
             gtlog("GET_URL:" + getUrl + param);
             String result_str = readContentFromGet(getUrl + param);
-            if (result_str == "fail") {
+            if (Objects.equals(result_str, "fail")) {
 
                 gtlog("gtServer register challenge failed");
                 return 0;
@@ -352,7 +353,7 @@ public class GeetestLib {
 
         if (connection.getResponseCode() == 200) {
             // 发送数据到服务器并使用Reader读取返回的数据
-            StringBuffer sBuffer = new StringBuffer();
+            StringBuilder sBuffer = new StringBuilder();
 
             InputStream inStream = null;
             byte[] buf = new byte[1024];
@@ -402,7 +403,7 @@ public class GeetestLib {
 
         if (connection.getResponseCode() == 200) {
             // 发送数据到服务器并使用Reader读取返回的数据
-            StringBuffer sBuffer = new StringBuffer();
+            StringBuilder sBuffer = new StringBuilder();
 
             InputStream inStream = null;
             byte[] buf = new byte[1024];
@@ -434,7 +435,7 @@ public class GeetestLib {
             md.update(plainText.getBytes());
             byte b[] = md.digest();
             int i;
-            StringBuffer buf = new StringBuffer("");
+            StringBuilder buf = new StringBuilder("");
             for (int offset = 0; offset < b.length; offset++) {
                 i = b[offset];
                 if (i < 0) {

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

@@ -22,9 +22,6 @@ import java.util.Objects;
 @Slf4j
 public class GeetestCaptchaServiceImpl implements IGeetestCaptchaService {
 
-    @Resource
-    @Qualifier("stringRedisTemplate")
-    private RedisTemplate<String, String> stringRedisTemplate;
 
     @Value("${geetest.captcha.id}")
     private String captchaId;

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

@@ -46,7 +46,7 @@ public class QuantgroupCaptchaServiceImpl implements IQuantgroupCaptchaService {
             return null;
         }
         String imageBase64 = Base64.encodeBase64String(jpegOutputStream.toByteArray());
-        Map<String, String> data = new HashMap<String, String>(2);
+        Map<String, String> data = new HashMap<>(2);
         data.put("imageId", imageId);
         data.put("image", String.format(IMG_BASE64_PATTREN, imageBase64));
         return data;

src/main/java/cn/quantgroup/xyqb/service/http/impl/HttpServiceImpl.java

@@ -32,7 +32,6 @@ 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.HttpClients;
 import org.apache.http.impl.client.StandardHttpRequestRetryHandler;
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.apache.http.impl.cookie.BestMatchSpecFactory;
@@ -179,7 +178,7 @@ public class HttpServiceImpl implements IHttpService {
                 .register(CookieSpecs.BROWSER_COMPATIBILITY, new BrowserCompatSpecFactory())
                 .register("easy", httpContext -> new BrowserCompatSpec() {
                     @Override
-                    public void validate(Cookie cookie, CookieOrigin origin) throws MalformedCookieException {
+                    public void validate(Cookie cookie, CookieOrigin origin) {
                     }
                 }).build();
 

src/main/java/cn/quantgroup/xyqb/service/merchant/impl/MerchantServiceImpl.java

@@ -44,12 +44,12 @@ public class MerchantServiceImpl implements IMerchantService {
     @Override
     public MerchantConfig findConfigByMerchantIdAndConfigName(Long merchantId, String configName) {
         String key = merchantId + "_" + configName;
-        return MERCHANT_ID_CONFIG_MAP.containsKey(key) ? MERCHANT_ID_CONFIG_MAP.get(key) : null;
+        return MERCHANT_ID_CONFIG_MAP.getOrDefault(key, null);
     }
 
     @Override
     public Merchant findMerchantById(Long merchantId) {
-        return MERCHANT_ID_MAP.containsKey(merchantId) ? MERCHANT_ID_MAP.get(merchantId) : null;
+        return MERCHANT_ID_MAP.getOrDefault(merchantId, null);
     }
 
     @Override
@@ -57,7 +57,7 @@ public class MerchantServiceImpl implements IMerchantService {
         if (StringUtils.isEmpty(name)) {
             return null;
         }
-        return MERCHANT_NAME_MAP.containsKey(name) ? MERCHANT_NAME_MAP.get(name) : null;
+        return MERCHANT_NAME_MAP.getOrDefault(name, null);
     }
 
 }

src/main/java/cn/quantgroup/xyqb/service/model/impl/ModelServiceImpl.java

@@ -32,9 +32,7 @@ public class ModelServiceImpl implements IModelService {
         String url = buildBlacklistMatchUrl(phoneNo);
         String result = httpService.get(url);
         try {
-            //BlacklistMatchResult blacklistMatchResult = Constants.GSON.fromJson(result, BlacklistMatchResult.class);
-            BlacklistMatchResult blacklistMatchResult = JSONObject.parseObject(result, BlacklistMatchResult.class);
-            return blacklistMatchResult;
+            return JSONObject.parseObject(result, BlacklistMatchResult.class);
         } catch (Exception e) {
             return null;
         }

src/main/java/cn/quantgroup/xyqb/service/mq/Impl/IRegisterMqServiceImpl.java → src/main/java/cn/quantgroup/xyqb/service/mq/impl/IRegisterMqServiceImpl.java

-package cn.quantgroup.xyqb.service.mq.Impl;
+package cn.quantgroup.xyqb.service.mq.impl;
 
 import cn.quantgroup.xyqb.service.mq.IRegisterMqService;
 import com.alibaba.fastjson.JSONObject;

src/main/java/cn/quantgroup/xyqb/service/mq/Impl/LoanVestMQServiceImpl.java → src/main/java/cn/quantgroup/xyqb/service/mq/impl/LoanVestMQServiceImpl.java

-package cn.quantgroup.xyqb.service.mq.Impl;
+package cn.quantgroup.xyqb.service.mq.impl;
 
 import cn.quantgroup.xyqb.model.UserStatistics;
 import cn.quantgroup.xyqb.service.mq.IVestService;

src/main/java/cn/quantgroup/xyqb/service/page/impl/PageServiceImpl.java

@@ -85,7 +85,7 @@ public class PageServiceImpl implements IPageService {
         if (user == null) {
             return new Tuple<>("", false);
         }
-        PageType[] processLists = routerDefinetion.containsKey(target) ? routerDefinetion.get(target) : null;
+        PageType[] processLists = routerDefinetion.getOrDefault(target, null);
         if (processLists == null) {
             return new Tuple<>("", false);
         }

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

@@ -70,7 +70,6 @@ public class SmsUserRegisterHandler extends AbstractUserRegisterHandler {
      */
     private void doHandleSendAppSms(UserRegisterParam userRegisterParam) {
         if (!userRegisterParam.isSendAppSms()) {
-            return;
         }
     }
 

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

@@ -33,12 +33,6 @@ public interface IUserDetailService {
 
                                         String sortType);
 
-    /**
-     * 修复线上身份性别问题
-     */
-
-    void fixedIdNoAndGender();
-
     /**
      * 更新用户的身份证号
      *

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

@@ -7,6 +7,4 @@ import cn.quantgroup.xyqb.entity.UuidPhoneMapping;
  */
 public interface IUuidPhoneMappingService {
 
-    UuidPhoneMapping findByUuid(String uuid);
-
 }

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

@@ -45,13 +45,7 @@ public class ContactServiceImpl implements IContactService {
         if (CollectionUtils.isEmpty(contacts)) {
             return;
         }
-        Iterator<Contact> iterator = contacts.iterator();
-        while (iterator.hasNext()) {
-            Contact contact = iterator.next();
-            if (!contact.valid()) {
-                iterator.remove();
-            }
-        }
+        contacts.removeIf(contact -> !contact.valid());
     }
 
     @Override

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

@@ -123,15 +123,15 @@ public class LockIpv4ServiceImpl implements ILockIpv4Service {
         LOGGER.info("Lock_ipv4: locked success ip access:{}, success overstep {} times in {} minutes, do lock {} minutes", ip, Constants.IPV4_LOCK_ON_SUCCESS_COUNTS, Constants.IPV4_SUCCESS_COUNT_MINUTES, Constants.IPV4_SUCCESS_LOCK_MINUTES);
     }
 
-    private final static String getErrorIpKey(String ipv4) {
+    private static String getErrorIpKey(String ipv4) {
         return Constants.REDIS_PASSWORD_ERROR_COUNT_FOR_IPV4 + ipv4;
     }
 
-    private final static String getSuccessIpKey(String ipv4) {
+    private static String getSuccessIpKey(String ipv4) {
         return Constants.REDIS_PASSWORD_SUCCESS_COUNT_FOR_IPV4 + ipv4;
     }
 
-    private final static String getLockIpv4Key(String ipv4) {
+    private static String getLockIpv4Key(String ipv4) {
         return Constants.IPV4_LOCK + ipv4;
     }
 }

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

@@ -78,7 +78,7 @@ public class UserDetailServiceImpl implements IUserDetailService {
         List<UserDetail> details = userDetailRepository.findAll(getSpecification(name, phoneNo, idNo));
         Map<Long, User> userMap = Maps.newHashMap();
         if (!CollectionUtils.isEmpty(details)) {
-            List<Long> userIds = details.stream().map(d -> d.getUserId()).collect(Collectors.toList());
+            List<Long> userIds = details.stream().map(UserDetail::getUserId).collect(Collectors.toList());
             List<User> users = userRepository.findAll((root, query, cb) -> {
                 query.where(root.get("id").in(userIds));
                 return query.getRestriction();
@@ -187,30 +187,6 @@ public class UserDetailServiceImpl implements IUserDetailService {
         return userDetailRepository.findAll(spec, pageRequest);
     }
 
-    @Override
-    public void fixedIdNoAndGender() {
-        List<UserDetail> details = userDetailRepository.selectUserDetailsBy();
-        if (!CollectionUtils.isEmpty(details)) {
-            for (UserDetail detail : details) {
-                try {
-                    if (!idCardService.isIdCardValid(detail.getIdNo())) {
-                        LOGGER.error("修复用户老数据身份证号错误", detail.getUserId());
-                        continue;
-                    }
-                    Gender gender = idCardService.getIdCardInfo(detail.getIdNo()).getGender();
-                    if (null != gender) {
-                        userDetailRepository.updateGender(gender.ordinal(), detail.getUserId());
-                    }
-
-                } catch (ParseException e) {
-                    LOGGER.error("修复用户老数据身份证号错误", detail.getUserId());
-                    continue;
-                }
-            }
-            LOGGER.info("修复用户老数据身份证号完成");
-        }
-    }
-
     @Override
     public int updateIdCard(String name, String idNo, String phoneNo) {
         UserDetail userDetail = userDetailRepository.findByPhoneNo(phoneNo);

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

@@ -49,9 +49,7 @@ public class UserServiceImpl implements IUserService {
         for (int i = 0; i < idSize; i += pageSize) {
             List<Long> subList = userIds.subList(i, Math.min(idSize, i + pageSize));
             List<User> users = userRepository.findByIdIn(subList);
-            users.stream().forEach(user -> {
-                userIdAndPhoneMap.put(user.getId(), user.getPhoneNo());
-            });
+            users.stream().forEach(user -> userIdAndPhoneMap.put(user.getId(), user.getPhoneNo()));
             if (i + pageSize < idSize) {
                 try {
                     Thread.sleep(1);
@@ -113,7 +111,7 @@ public class UserServiceImpl implements IUserService {
      * @date 2017-02-15 修改用户修改密码时，更新updatedAt时间
      */
     @Override
-    @CacheEvict(value = "usercache", key = "'xyqbuser' + #phone", cacheManager = "cacheManager")
+    @CacheEvict(value = "usercache", key = "'xyqbuser' + #phoneNo", cacheManager = "cacheManager")
     public boolean resetPassword(String phoneNo, String password) {
 
         User user = userRepository.findByPhoneNo(phoneNo);

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

 package cn.quantgroup.xyqb.service.user.impl;
 
-import cn.quantgroup.xyqb.entity.UuidPhoneMapping;
 import cn.quantgroup.xyqb.repository.IUuidPhoneMappingRepository;
 import cn.quantgroup.xyqb.service.user.IUuidPhoneMappingService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,10 +14,5 @@ public class UuidPhoneMappingServiceImpl implements IUuidPhoneMappingService {
     @Autowired
     private IUuidPhoneMappingRepository uuidPhoneMappingRepository;
 
-    @Override
-    public UuidPhoneMapping findByUuid(String uuid) {
-        return uuidPhoneMappingRepository.findByUuid(uuid);
-    }
-
 
 }

src/main/java/cn/quantgroup/xyqb/thirdparty/jcaptcha/AbstractManageableCaptchaService.java

@@ -158,7 +158,7 @@ public abstract class AbstractManageableCaptchaService extends AbstractCaptchaSe
         this.garbageCollectCaptchaStore(garbageCollectableCaptchaIds.iterator());
     }
 
-    protected void garbageCollectCaptchaStore(Iterator garbageCollectableCaptchaIds) {
+    private void garbageCollectCaptchaStore(Iterator garbageCollectableCaptchaIds) {
         long now = System.currentTimeMillis();
         long limit = now - (long) (1000 * this.minGuarantedStorageDelayInSeconds);
 
@@ -228,11 +228,11 @@ public abstract class AbstractManageableCaptchaService extends AbstractCaptchaSe
         return super.generateAndStoreCaptcha(locale, ID);
     }
 
-    protected boolean isCaptchaStoreFull() {
+    private boolean isCaptchaStoreFull() {
         return this.getCaptchaStoreMaxSize() != 0 && this.getCaptchaStoreSize() >= this.getCaptchaStoreMaxSize();
     }
 
-    protected boolean isCaptchaStoreQuotaReached() {
+    private boolean isCaptchaStoreQuotaReached() {
         return this.getCaptchaStoreSize() >= this.getCaptchaStoreSizeBeforeGarbageCollection();
     }
 
@@ -268,11 +268,11 @@ public abstract class AbstractManageableCaptchaService extends AbstractCaptchaSe
         this.numberOfGarbageCollectedCaptcha += num;
     }
 
-    public void addNumberOfUncorrectResponse(int num) {
+    protected void addNumberOfUncorrectResponse(int num) {
         this.numberOfUncorrectResponse += num;
     }
 
-    public void addNumberOfCorrectResponse(int num) {
+    protected void addNumberOfCorrectResponse(int num) {
         this.numberOfCorrectResponse += num;
     }
 

src/main/java/cn/quantgroup/xyqb/thirdparty/jcaptcha/SimpleCaptcha.java

@@ -29,8 +29,9 @@ public class SimpleCaptcha extends ImageCaptcha {
         this.response = response;
     }
 
+    @Override
     public final Boolean validateResponse(Object response) {
-        return null != response && response instanceof String ? this.validateResponse((String) response) : Boolean.FALSE;
+        return response instanceof String ? this.validateResponse((String) response) : Boolean.FALSE;
     }
 
     private Boolean validateResponse(String response) {

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

@@ -68,8 +68,7 @@ public class AESUtil {
             Cipher cipher = Cipher.getInstance(CIPHER_ALGORITHM);
             cipher.init(Cipher.DECRYPT_MODE, skeySpec);
             byte[] encrypted1 = new Base64().decode(data);
-            byte[] original = cipher.doFinal(encrypted1);
-            return original;
+            return cipher.doFinal(encrypted1);
         } catch (Exception e) {
             log.error("AES-解密出错:data:{},key:{}", data, key, e);
         }

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

@@ -19,9 +19,7 @@ public class DateUtils {
         endOfDay.set(Calendar.SECOND, 59);
         endOfDay.set(Calendar.MILLISECOND, 999);
         long timeStamp = endOfDay.getTimeInMillis();
-        Calendar current = Calendar.getInstance();
         long now = System.currentTimeMillis();
-        long during = (timeStamp - now) / 1000;
-        return during;
+        return (timeStamp - now) / 1000;
     }
 }

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

-package cn.quantgroup.xyqb.util;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
-
-/**
- * Created by BrightSun on 2016/8/24.
- */
-public class GZipUtil {
-
-    private static String encode = "utf-8";//"ISO-8859-1"
-
-    /**
-     * 字符串压缩为字节数组
-     */
-    public static byte[] compressToByte(String str) {
-        if (str == null || str.length() == 0) {
-            return null;
-        }
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        GZIPOutputStream gzip;
-        try {
-            gzip = new GZIPOutputStream(out);
-            gzip.write(str.getBytes(encode));
-            gzip.close();
-
-        } catch (IOException e) {
-            e.printStackTrace();
-
-        }
-        return out.toByteArray();
-
-    }
-
-    /**
-     * 字符串压缩为字节数组
-     */
-    public static byte[] compressToByte(String str, String encoding) {
-        if (str == null || str.length() == 0) {
-            return null;
-
-        }
-
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        GZIPOutputStream gzip;
-        try {
-            gzip = new GZIPOutputStream(out);
-            gzip.write(str.getBytes(encoding));
-            gzip.close();
-
-        } catch (IOException e) {
-            e.printStackTrace();
-
-        }
-        return out.toByteArray();
-
-    }
-
-    /**
-     * 字节数组解压缩后返回字符串
-     */
-    public static String uncompressToString(byte[] b) {
-        if (b == null || b.length == 0) {
-            return null;
-
-        }
-
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        ByteArrayInputStream in = new ByteArrayInputStream(b);
-        try {
-            GZIPInputStream gunzip = new GZIPInputStream(in);
-            byte[] buffer = new byte[256];
-            int n;
-            while ((n = gunzip.read(buffer)) >= 0) {
-                out.write(buffer, 0, n);
-
-            }
-
-        } catch (IOException e) {
-            e.printStackTrace();
-
-        }
-        return out.toString();
-
-    }
-
-    /**
-     * 字节数组解压缩后返回字符串
-     */
-    public static String uncompressToString(byte[] b, String encoding) {
-        if (b == null || b.length == 0) {
-            return null;
-
-        }
-
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        ByteArrayInputStream in = new ByteArrayInputStream(b);
-        try {
-            GZIPInputStream gunzip = new GZIPInputStream(in);
-            byte[] buffer = new byte[256];
-            int n;
-            while ((n = gunzip.read(buffer)) >= 0) {
-                out.write(buffer, 0, n);
-
-            }
-
-            return out.toString(encoding);
-        } catch (IOException e) {
-            e.printStackTrace();
-
-        }
-        return null;
-
-    }
-
-    public String getEncode() {
-        return encode;
-    }
-
-    /**
-     * 设置 编码，默认编码：UTF-8
-     */
-    public void setEncode(String encode) {
-        this.encode = encode;
-    }
-}

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

@@ -51,7 +51,7 @@ public class PasswordUtil {
         int pwdMax = PWD_BASE.length;
         int i; // 生成的随机数
         int count = 0; // 生成的密码的长度
-        StringBuffer pwd = new StringBuffer();
+        StringBuilder pwd = new StringBuilder();
         while (count < pwdLen) {
             i = ThreadLocalRandom.current().nextInt(pwdMax); // 生成的数最大为36-1
             if (i >= 0 && i < PWD_BASE.length) {

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

@@ -33,10 +33,13 @@ public class Utils {
     }
 
     public static String coverPhone(String str) {
-        if (str.length() <= 0)
+        if (str.length() <= 0) {
             return "";
+        }
         if (str.length() > 1024)  //长度超过1024的字符串不走正则匹配过滤手机号
+        {
             return "";
+        }
         Matcher matcher = pattern.matcher(str);
         Map<String, String> replaceMap = new HashMap<>();
         while (matcher.find()) {

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

@@ -28,39 +28,6 @@ public class XmlUtil {
     private XmlUtil() {
     }
 
-    /**
-     * XML => Object
-     *
-     * @param xml
-     * @param clazz
-     * @param <T>
-     * @return
-     */
-    public static <T> T obj(String xml, Class<T> clazz) {
-        if (StringUtils.isEmpty(xml)) {
-            return null;
-        }
-
-        Reader reader = null;
-        try {
-            JAXBContext context = JAXBContext.newInstance(clazz);
-            Unmarshaller unmarshaller = context.createUnmarshaller();
-            reader = new StringReader(xml);
-            return (T) unmarshaller.unmarshal(reader);
-        } catch (Exception e) {
-            LOGGER.error("Parse XML to Object error\nXML:{}\nClass<T>:{}", xml, clazz.getName(), e);
-            return null;
-        } finally {
-            if (reader != null) {
-                try {
-                    reader.close();
-                } catch (Exception e) {
-                    LOGGER.error("Close Reader error", e);
-                }
-            }
-        }
-    }
-
     /**
      * Object => XML
      *

src/main/java/cn/quantgroup/xyqb/util/encrypt/Base64.java

@@ -4,7 +4,7 @@ package cn.quantgroup.xyqb.util.encrypt;
  * Base64
  * Created by Rocky on 2016/10/10.
  */
-public class Base64 {
+class Base64 {
 
     /**
      * Chunk size per RFC 2045 section 6.8.
@@ -14,54 +14,54 @@ public class Base64 {
      *
      * @see <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045 section 6.8</a>
      */
-    static final int CHUNK_SIZE = 76;
+    private static final int CHUNK_SIZE = 76;
 
     /**
      * Chunk separator per RFC 2045 section 2.1.
      *
      * @see <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045 section 2.1</a>
      */
-    static final byte[] CHUNK_SEPARATOR = "\r\n".getBytes();
+    private static final byte[] CHUNK_SEPARATOR = "\r\n".getBytes();
 
     /**
      * The base length.
      */
-    static final int BASELENGTH = 255;
+    private static final int BASELENGTH = 255;
 
     /**
      * Lookup length.
      */
-    static final int LOOKUPLENGTH = 64;
+    private static final int LOOKUPLENGTH = 64;
 
     /**
      * Used to calculate the number of bits in a byte.
      */
-    static final int EIGHTBIT = 8;
+    private static final int EIGHTBIT = 8;
 
     /**
      * Used when encoding something which has fewer than 24 bits.
      */
-    static final int SIXTEENBIT = 16;
+    private static final int SIXTEENBIT = 16;
 
     /**
      * Used to determine how many bits data contains.
      */
-    static final int TWENTYFOURBITGROUP = 24;
+    private static final int TWENTYFOURBITGROUP = 24;
 
     /**
      * Used to get the number of Quadruples.
      */
-    static final int FOURBYTE = 4;
+    private static final int FOURBYTE = 4;
 
     /**
      * Used to test the sign of a byte.
      */
-    static final int SIGN = -128;
+    private static final int SIGN = -128;
 
     /**
      * Byte used to pad output.
      */
-    static final byte PAD = (byte) '=';
+    private static final byte PAD = (byte) '=';
 
     // Create arrays to hold the base64 characters and a
     // lookup for base64 chars
@@ -180,7 +180,7 @@ public class Base64 {
      *                   the base64 output into 76 character blocks
      * @return Base64-encoded data.
      */
-    public static byte[] encodeBase64(byte[] binaryData, boolean isChunked) {
+    private static byte[] encodeBase64(byte[] binaryData, boolean isChunked) {
         int lengthDataBits = binaryData.length * EIGHTBIT;
         int fewerThan24bits = lengthDataBits % TWENTYFOURBITGROUP;
         int numberTriplets = lengthDataBits / TWENTYFOURBITGROUP;
@@ -389,7 +389,7 @@ public class Base64 {
      *             from.
      * @return The data, less whitespace (see RFC 2045).
      */
-    static byte[] discardWhitespace(byte[] data) {
+    private static byte[] discardWhitespace(byte[] data) {
         byte groomedData[] = new byte[data.length];
         int bytesCopied = 0;
 
@@ -421,7 +421,7 @@ public class Base64 {
      * @param data The base-64 encoded data to groom
      * @return The data, less non-base64 characters (see RFC 2045).
      */
-    static byte[] discardNonBase64(byte[] data) {
+    private static byte[] discardNonBase64(byte[] data) {
         byte groomedData[] = new byte[data.length];
         int bytesCopied = 0;
 

src/main/java/cn/quantgroup/xyqb/util/encrypt/MD5Util.java

@@ -29,8 +29,9 @@ public final class MD5Util {
             if (Integer.toHexString(0xFF & domain[i]).length() == 1) {
                 md5StrBuff.append("0").append(
                         Integer.toHexString(0xFF & domain[i]));
-            } else
+            } else {
                 md5StrBuff.append(Integer.toHexString(0xFF & domain[i]));
+            }
         }
         return md5StrBuff.toString();
     }

src/main/java/cn/quantgroup/xyqb/util/encrypt/RSA.java

@@ -54,7 +54,7 @@ public class RSA {
         String pri = new String(Base64.encodeBase64(privateKeyBytes),
                 CHAR_ENCODING);
 
-        Map<String, String> map = new HashMap<String, String>();
+        Map<String, String> map = new HashMap<>();
         map.put("publicKey", pub);
         map.put("privateKey", pri);
         RSAPublicKey rsp = (RSAPublicKey) kp.getPublic();