From f9d2c4dddf9e6d8d8f6eb843fd83c8e580a3e863 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 26 四月 2021 15:56:43 +0800
Subject: [PATCH] 修复bug
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java | 12 ++++++------
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 4 ++--
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/RealNameUtil.java | 9 ++-------
3 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java
index 573df52..76553c8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java
@@ -90,8 +90,8 @@
ComMngPopulationServeExcelVO vo = new ComMngPopulationServeExcelVO();
if(oneData.get(0) == null){
ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
- importErrorVO.setErrorPosition("第" + index + "行,第1列");
- importErrorVO.setErrorMsg("名字不可为空,请填写姓名");
+ importErrorVO.setErrorPosition("第" + index + "行，第1列");
+ importErrorVO.setErrorMsg("名字不可为空，请填写姓名");
populationImportErrorVOList.add(importErrorVO);
index++;
continue;
@@ -99,8 +99,8 @@
vo.setName(oneData.get(0));
if(StringUtils.isEmpty(oneData.get(1))){
ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
- importErrorVO.setErrorPosition("第" + index + "行,第2列");
- importErrorVO.setErrorMsg("身份证号不可为空,请填写身份证号");
+ importErrorVO.setErrorPosition("第" + index + "行，第2列");
+ importErrorVO.setErrorMsg("身份证号不可为空，请填写身份证号");
populationImportErrorVOList.add(importErrorVO);
index++;
continue;
@@ -111,8 +111,8 @@
//判断身份证号码位数
if(oneData.get(1).length() != 18){
ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
- importErrorVO.setErrorPosition("第" + index + "行,第2列");
- importErrorVO.setErrorMsg("身份证号位数有误,请检查身份证号码是否正确");
+ importErrorVO.setErrorPosition("第" + index + "行，第2列");
+ importErrorVO.setErrorMsg("身份证号位数有误，请检查身份证号码是否正确");
populationImportErrorVOList.add(importErrorVO);
index++;
continue;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/RealNameUtil.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/RealNameUtil.java
index 0e9d3e4..81c0a7d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/RealNameUtil.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/RealNameUtil.java
@@ -4,7 +4,6 @@
import lombok.extern.slf4j.Slf4j;
import java.util.Base64;
-import java.util.Date;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -29,11 +28,7 @@
boolean result=false;
String headerkey="Authorization";
String headervalue="Basic ";
- Long time = new Date().getTime();
- //1619420449081
- //1619420637940
- String basicStr = CLIENT_ID + ":" + SECRET + ":" + time;
- log.info("请求时间戳：" + time);
+ String basicStr = CLIENT_ID + ":" + SECRET + ":" + System.currentTimeMillis();
String encodeToString = Base64.getEncoder().encodeToString(basicStr.getBytes());
JSONObject jsonObject=new JSONObject();
jsonObject.put("idNumber",idcard);
@@ -42,7 +37,7 @@
log.info("请求公安实名认证接口，请求地址：" + URL);
log.info("请求公安实名认证接口，请求参数：" + param);
log.info("请求公安实名认证接口，请求头参数：" + headervalue + encodeToString);
- String postByJson = HttpClientUtil.sendPostByJson(URL, param, 0, headerkey, headervalue + encodeToString);
+ String postByJson = HttpClientUtil.sendPostByJson(URL, param, 0, headerkey, "Basic MjA5MjI2MTkzNDY1MTkzMjY3MjpkZTFjMGRiYi05MTk3LTQ3MjQtOWNjMi1hYTk0ZTMwYTA3MmY6MTYxOTQyMTMyMzgxMg==");
log.info("请求公安实名认证接口，返回参数：" + postByJson);
int code = JSONObject.parseObject(postByJson).getIntValue("code");
if (0==code) {
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
index ed3ef97..68e235c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -209,7 +209,7 @@
if (result) {
ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
importErrorVO.setErrorMsg("导入实有人口已存在(" + vo.getCardNo() + ")");
- importErrorVO.setErrorPosition("第" + index + "行,第2列");
+ importErrorVO.setErrorPosition("第" + index + "行，第2列");
populationImportErrorVOList.add(importErrorVO);
index++;
continue;
@@ -224,7 +224,7 @@
if (comMngVillageDO == null) {
ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
importErrorVO.setErrorMsg("查无:" + vo.getRoad() + "小区/房租地址，请先新建地址");
- importErrorVO.setErrorPosition("第" + index + "行,第7,8列");
+ importErrorVO.setErrorPosition("第" + index + "行，第7、8列");
populationImportErrorVOList.add(importErrorVO);
index++;
continue;
--
Gitblit v1.7.1