切换hbase

pom.xml

@@ -29,6 +29,7 @@
 		<maven.test.skip>true</maven.test.skip>
 		<qiniu-java-sdk.version>7.1.1</qiniu-java-sdk.version>
 		<mysql.version>5.1.44</mysql.version>
+        <amazonaws.version>1.11.917</amazonaws.version>
 	</properties>
 	
 	<build>
@@ -318,16 +319,85 @@
 		    <artifactId>druid</artifactId>
 		    <version>1.1.10</version>
 		</dependency>
-        <!-- ocr hbase -->
+        <!-- OCR Hbase 依赖 -->
+         <dependency>
+            <groupId>cn.ec.qg.ocr</groupId>
+            <artifactId>ocr-op-sdk</artifactId>
+            <version>1.0.1-RELEASE</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>servlet-api-2.5</artifactId>
+                    <groupId>org.mortbay.jetty</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>servlet-api</artifactId>
+                    <groupId>javax.servlet</groupId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.amazonaws</groupId>
+                    <artifactId>aws-java-sdk-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.amazonaws</groupId>
+                    <artifactId>aws-java-sdk-kms</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.amazonaws</groupId>
+                    <artifactId>aws-java-sdk-s3</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-core</artifactId>
+            <version>${amazonaws.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-kms</artifactId>
+            <version>${amazonaws.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-s3</artifactId>
+            <version>${amazonaws.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>com.lkb.data</groupId>
-            <artifactId>lkb-data-service</artifactId>
-            <version>1.7.8.4-3c-SNAPSHOT</version>
+            <artifactId>lkb-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>cn.quantgroup.data</groupId>
+            <artifactId>spider-web-page-store</artifactId>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>hadoop-hdfs</artifactId>
+                    <groupId>org.apache.hadoop</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>hadoop-common</artifactId>
+                    <groupId>org.apache.hadoop</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>hadoop-auth</artifactId>
+                    <groupId>org.apache.hadoop</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>hbase-client</artifactId>
+                    <groupId>org.apache.hbase</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
     </dependencies>

src/main/java/com/quantgroup/asset/distribution/service/funding/impl/AidAssetCommonServiceImpl.java

 package com.quantgroup.asset.distribution.service.funding.impl;
 
+import cn.qg.ec.hbase.ocr.OCRIdCardDataService;
 import cn.quantgroup.motan.bean.UserInfo;
-import cn.quantgroup.motan.vo.UserSysResult;
-import cn.quantgroup.user.IUserSdkService;
-import cn.quantgroup.user.UserSdkServiceFactory;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.lkb.data.hbase.dataservice.verify.OCRIdCardDataService;
 import com.lkb.data.hbase.row.verify.OCRIdCardRow;
 import com.quantgroup.asset.distribution.constant.CodeConstants;
 import com.quantgroup.asset.distribution.constant.aid.AidRiskInfoConstants;
 import com.quantgroup.asset.distribution.constant.aid.PreAuditTypeConstants;
-import com.quantgroup.asset.distribution.enums.user.EducationEnum;
-import com.quantgroup.asset.distribution.enums.user.IncomeRangeEnum;
-import com.quantgroup.asset.distribution.enums.user.MaritalStatusEnum;
-import com.quantgroup.asset.distribution.enums.user.OccupationEnum;
 import com.quantgroup.asset.distribution.exception.QGException;
 import com.quantgroup.asset.distribution.exception.QGExceptionType;
 import com.quantgroup.asset.distribution.exception.QGPreconditions;
@@ -33,23 +26,17 @@ import com.quantgroup.asset.distribution.service.funding.IAidAssetCommonService;
 import com.quantgroup.asset.distribution.service.httpclient.IHttpService;
 import com.quantgroup.asset.distribution.service.jpa.entity.AidFundInfoConfig;
 import com.quantgroup.asset.distribution.service.jpa.entity.Asset;
-import com.quantgroup.asset.distribution.service.niwodai.vo.IdCardA;
-import com.quantgroup.asset.distribution.service.niwodai.vo.IdCardB;
 import com.quantgroup.asset.distribution.service.user.IUserCenterService;
 import com.quantgroup.asset.distribution.util.MD5Util;
 import com.quantgroup.asset.distribution.util.OcrUtils;
 import com.quantgroup.asset.distribution.util.RsaUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.http.impl.client.CloseableHttpClient;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.PostConstruct;
-import java.math.BigDecimal;
 import java.util.*;
 
 /**

src/main/java/com/quantgroup/asset/distribution/service/funding/impl/AidFundRouteServiceImpl.java

 package com.quantgroup.asset.distribution.service.funding.impl;
 
+import cn.qg.ec.hbase.ocr.OCRIdCardDataService;
 import cn.quantgroup.motan.bean.UserInfo;
 import com.alibaba.fastjson.JSON;
 import com.google.common.base.Stopwatch;
-import com.lkb.data.hbase.dataservice.verify.OCRIdCardDataService;
 import com.lkb.data.hbase.row.verify.OCRIdCardRow;
 import com.quantgroup.asset.distribution.constant.AidFundStatus;
 import com.quantgroup.asset.distribution.constant.aid.AidRiskInfoConstants;
@@ -13,15 +13,12 @@ import com.quantgroup.asset.distribution.exception.QGPreconditions;
 import com.quantgroup.asset.distribution.model.entity.OcrIdCardEntity;
 import com.quantgroup.asset.distribution.model.entity.user.SDKUserInfo;
 import com.quantgroup.asset.distribution.model.form.AssetForm;
-import com.quantgroup.asset.distribution.model.response.GlobalResponse;
 import com.quantgroup.asset.distribution.service.feature.IFeatureService;
 import com.quantgroup.asset.distribution.service.funding.*;
 import com.quantgroup.asset.distribution.service.jpa.entity.AidLoanFundAuditOrder;
 import com.quantgroup.asset.distribution.service.jpa.entity.AidLoanFundConfig;
 import com.quantgroup.asset.distribution.service.jpa.entity.AidLoanFundRouteRecord;
 import com.quantgroup.asset.distribution.service.jpa.entity.Asset;
-import com.quantgroup.asset.distribution.service.jpa.repository.ICustomerTypeRuleConfigRepository;
-import com.quantgroup.asset.distribution.service.niwodai.INiwodaiAssetService;
 import com.quantgroup.asset.distribution.service.redis.IRedisService;
 import com.quantgroup.asset.distribution.service.rule.IRuleService;
 import com.quantgroup.asset.distribution.service.user.IUserCenterService;
@@ -33,12 +30,11 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
-import static com.quantgroup.asset.distribution.constant.RedisKeyConstants.*;
+import static com.quantgroup.asset.distribution.constant.RedisKeyConstants.AID_FUND_PUSH_ORDER_DAY_LIMIT_KEY;
 
 /**
  * Created by renfeng on 2019/7/19.

src/main/java/com/quantgroup/asset/distribution/service/niwodai/impl/NiwodaiAssetServiceImpl.java

 package com.quantgroup.asset.distribution.service.niwodai.impl;
 
+import cn.qg.ec.hbase.ocr.OCRIdCardDataService;
 import cn.quantgroup.motan.bean.UserInfo;
 import cn.quantgroup.motan.vo.UserSysResult;
 import cn.quantgroup.user.IUserSdkService;
@@ -9,7 +10,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.google.common.base.Stopwatch;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
-import com.lkb.data.hbase.dataservice.verify.OCRIdCardDataService;
 import com.lkb.data.hbase.row.verify.OCRIdCardRow;
 import com.quantgroup.asset.distribution.constant.AidFundConstants;
 import com.quantgroup.asset.distribution.enums.UserLoanType;