Merge branch 'feature/delCode' into 'master'

undertow



See merge request !18

pom.xml

@@ -86,6 +86,16 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-undertow</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

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

@@ -134,7 +134,7 @@ public class HttpConfig {
         connectionManager.setDefaultMaxPerRoute(2000);
 
         // retry handler
-        HttpRequestRetryHandler retryHandler = new StandardHttpRequestRetryHandler(3, false);
+        HttpRequestRetryHandler retryHandler = new StandardHttpRequestRetryHandler();
 
         // keep alive strategy
         ConnectionKeepAliveStrategy keepAliveStrategy = new DefaultConnectionKeepAliveStrategy();

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

@@ -32,32 +32,11 @@ public class UserApiController {
     @Resource
     private IUserService userService;
     @Resource
-    private IUserApiService userApiService;
-    @Resource
     private ISessionService sessionService;
     @Resource
     @Qualifier("stringRedisTemplate")
     private RedisTemplate<String, String> stringRedisTemplate;
 
-    @RequestMapping("/user/check")
-    public JsonResult userImportCheck(String phoneNo, String registerFrom) {
-        if ("244".equals(registerFrom)) {
-            log.info("[user_import_check]用户导入检查拒绝。phoneNo=[{}], registerFrom=[{}]", phoneNo, registerFrom);
-            return JsonResult.buildErrorStateResult("用户导入检查拒绝", false);
-        }
-        if (StringUtils.isEmpty(phoneNo) || StringUtils.isEmpty(registerFrom)) {
-            log.error("[user_import_check]检查传入的参数，参数不全。phoneNo=[{}], registerFrom=[{}]", phoneNo, registerFrom);
-            return JsonResult.buildErrorStateResult("检查传入的参数，参数不全。", null);
-        }
-        boolean checkPassed = userApiService.userImportCheck(phoneNo);
-        if (checkPassed) {
-            log.info("[user_import_check]用户可以导入。phoneNo=[{}], registerFrom=[{}]", phoneNo, registerFrom);
-            return JsonResult.buildSuccessResult("用户可以导入", checkPassed);
-        }
-        log.info("[user_import_check]用户导入检查拒绝。phoneNo=[{}], registerFrom=[{}]", phoneNo, registerFrom);
-        return JsonResult.buildErrorStateResult("用户导入检查拒绝", checkPassed);
-    }
-
     @RequestMapping("/user/is_passwd_set")
     public JsonResult isPasswordSet(String key, String phoneNo) {
         if (!"abc1234".equals(key) || StringUtils.isEmpty(phoneNo)) {

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

-package cn.quantgroup.xyqb.exception;
-
-/**
- * Created by Miraculous on 15/7/29.
- */
-public class ResubmissionException extends RuntimeException {
-    private static final long serialVersionUID = -1L;
-
-    public ResubmissionException() {
-        super("不能重复提交表单");
-    }
-}

src/main/java/cn/quantgroup/xyqb/service/api/IUserApiService.java

@@ -9,8 +9,6 @@ import java.util.Optional;
  */
 public interface IUserApiService {
 
-    boolean userImportCheck(String phoneNo);
-
     /**
      * 根据uuid查询用户完整信息
      *

src/main/java/cn/quantgroup/xyqb/service/api/impl/UserApiServiceImpl.java

@@ -3,9 +3,7 @@ package cn.quantgroup.xyqb.service.api.impl;
 import cn.quantgroup.xyqb.entity.User;
 import cn.quantgroup.xyqb.entity.UserDetail;
 import cn.quantgroup.xyqb.model.UserFullInfo;
-import cn.quantgroup.xyqb.model.model.BlacklistMatchResult;
 import cn.quantgroup.xyqb.service.api.IUserApiService;
-import cn.quantgroup.xyqb.service.model.IModelService;
 import cn.quantgroup.xyqb.service.user.IUserDetailService;
 import cn.quantgroup.xyqb.service.user.IUserService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,29 +17,11 @@ import java.util.Optional;
 @Service
 public class UserApiServiceImpl implements IUserApiService {
 
-    @Autowired
-    private IModelService modelService;
     @Autowired
     private IUserService userService;
     @Autowired
     private IUserDetailService userDetailService;
 
-
-    @Override
-    public boolean userImportCheck(String phoneNo) {
-        User user = userService.findByPhoneWithCache(phoneNo);
-
-        if (user != null) {
-            return false;
-        }
-
-        BlacklistMatchResult blacklistMatchResult = modelService.getBlacklistMatchResult(phoneNo);
-        if (blacklistMatchResult == null) {
-            return true;
-        }
-        return !blacklistMatchResult.getFlag();
-    }
-
     @Override
     public Optional<UserFullInfo> getUserFullInfoByUuid(String uuid) {
         User user = userService.findByUuidWithCache(uuid);

src/main/java/cn/quantgroup/xyqb/service/model/IModelService.java

-package cn.quantgroup.xyqb.service.model;
-
-import cn.quantgroup.xyqb.model.model.BlacklistMatchResult;
-
-/**
- * Created by FrankChow on 15/12/16.
- */
-public interface IModelService {
-
-    /**
-     * 验证用户是否在黑名单里
-     *
-     * @param phoneNo
-     * @return
-     */
-    BlacklistMatchResult getBlacklistMatchResult(String phoneNo);
-}

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

-package cn.quantgroup.xyqb.service.model.impl;
-
-import cn.quantgroup.xyqb.model.model.BlacklistMatchResult;
-import cn.quantgroup.xyqb.service.http.IHttpService;
-import cn.quantgroup.xyqb.service.model.IModelService;
-import cn.quantgroup.xyqb.util.PasswordUtil;
-import com.alibaba.fastjson.JSONObject;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-/**
- * Created by FrankChow on 15/12/16.
- */
-@Service
-public class ModelServiceImpl implements IModelService {
-
-    private static final String BLACKLIST_URL_PATTERN =
-            "%s/Model/openapi/checkBlack.json?appId=0001&userId=0001_001&timeunit=%s&token=%s&phone=%s";
-    String TOKEN_PATTERN = "timeunit=%sappkey=wer123!@";
-    @Value("${model.quantgroup.url}")
-    private String modelUrlPrefix;
-    @Autowired
-    private IHttpService httpService;
-
-    @Override
-    public BlacklistMatchResult getBlacklistMatchResult(String phoneNo) {
-        if (StringUtils.isEmpty(phoneNo)) {
-            return null;
-        }
-        String url = buildBlacklistMatchUrl(phoneNo);
-        String result = httpService.get(url);
-        try {
-            return JSONObject.parseObject(result, BlacklistMatchResult.class);
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
-    private String buildBlacklistMatchUrl(String phoneNo) {
-        Long timeUnit = System.currentTimeMillis();
-        String token = PasswordUtil.MD5(String.format(TOKEN_PATTERN, String.valueOf(timeUnit)));
-        String url = String.format(BLACKLIST_URL_PATTERN, modelUrlPrefix, timeUnit, token, phoneNo);
-        return url;
-    }
-}

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

@@ -6,23 +6,6 @@ package cn.quantgroup.xyqb.service.user;
  */
 public interface ILkbUserService {
 
-    /**
-     * App用户注册
-     *
-     * @param phoneNo
-     * @param password
-     * @return
-     */
-    String registerApp(String phoneNo, String password);
-
-    /**
-     * 同步用户信息
-     *
-     * @param uuid
-     * @param name
-     * @param idNo
-     */
-    void userUpdate(String uuid, String name, String idNo);
 
     /**
      * 同步用戶信息

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

@@ -5,8 +5,6 @@ import cn.quantgroup.xyqb.service.http.IHttpService;
 import cn.quantgroup.xyqb.service.user.ILkbUserService;
 import cn.quantgroup.xyqb.util.JsonUtil;
 import cn.quantgroup.xyqb.util.PasswordUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -14,7 +12,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import java.util.Map;
@@ -39,54 +36,6 @@ public class LkbUserviceImpl implements ILkbUserService {
     @Value("${lkb.client.url}")
     private String clientUrl;
 
-    @Value("${lkb.client.user.register.app}")
-    private String registerApp;
-
-    @Value("${lkb.client.user.update}")
-    private String userUpdate;
-
-    @Value("${lkb.client.user.push}")
-    private String userPushPath;
-
-    @Override
-    public String registerApp(String phoneNo, String password) {
-        String timeunit = System.currentTimeMillis() + "";
-        String token = PasswordUtil.MD5(String.format(TOKEN_PATTERN, timeunit));
-
-        Map<String, String> parameters = ImmutableMap.<String, String>builder()
-                .put("appId", Constants.Channel.LKB_CODE)
-                .put("timeunit", timeunit)
-                .put("token", token)
-                .put("userName", phoneNo)
-                .put("password", password)
-                .build();
-
-        String response = httpService.get(clientUrl + registerApp, parameters);
-        Map<String, String> result = JSONObject.parseObject(response, Map.class);
-        if (result == null || "0".equals(result.get("flag"))) {
-            LOGGER.warn("向LKB注册用户失败, phoneNo:{}, password:{}", phoneNo, password);
-            return "";
-        }
-        return result.get("uid");
-    }
-
-    @Override
-    @Async
-    public void userUpdate(String uuid, String name, String idNo) {
-        Map<String, String> parameters = ImmutableMap.<String, String>builder()
-                .put("userId", uuid)
-                .put("realName", name)
-                .put("idcard", idNo)
-                .build();
-
-        String response = httpService.get(clientUrl + userUpdate, parameters);
-        //Map<String, String> result = GSON.fromJson(response, Map.class);
-        Map<String, String> result = JSONObject.parseObject(response, Map.class);
-        if (result == null || "false".equals(result.get("flag"))) {
-            LOGGER.warn("向LKB-Client同步用户信息失败, result: {}", result);
-        }
-    }
-
     @Override
     public boolean pushUser(String uuid, String phoneNo, String name, String idNo) {
         String timeunit = System.currentTimeMillis() + "";
@@ -103,7 +52,7 @@ public class LkbUserviceImpl implements ILkbUserService {
         if (StringUtils.isNotBlank(idNo)) {
             parameters.put("idCardNo", idNo);
         }
-        String response = httpService.post(clientUrl + userPushPath, parameters);
+        String response = httpService.post(clientUrl + "/user/push.json", parameters);
         Optional<Map> resultOptional = JsonUtil.fromJson(response, Map.class);
         if (!resultOptional.isPresent() || !"0000".equals(resultOptional.get().get("code"))) {
             LOGGER.error("[lkb_user_push]向LKB同步用户失败,phoneNo:{},response={}", phoneNo, response);