diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/APIController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/APIController.java index 13accba72..6eb52a0ff 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/APIController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/APIController.java @@ -89,7 +89,8 @@ public class APIController { result.setResult(object.get("result")); result.setSuccess(true); } else { - result.error500(object.getStr("error_msg")); + //异常情况:需要https://support.huaweicloud.com/api-ocr/ocr_03_0028.html查看具体原因 + result.error500(MessageUtil.get("systemErr")); } } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemUser.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemUser.java index e1b5162cc..c6bfb2023 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemUser.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemUser.java @@ -84,10 +84,10 @@ public class SystemUser implements Serializable { @ApiModelProperty(value = "企业或项目sn") private java.lang.String sn; /** - * 账号类型,1系统管理员,2企业管理员账号,3企业区账号,4企业市账号,5项目账号,6项目子账号 + * 账号类型,1系统管理员,2企业管理员账号,3企业区账号,4企业市账号,5项目账号,7项目人员账号 */ - @Excel(name = "账号类型,1系统管理员,2企业总部管理员账号,3区域账号,4城市账号,5项目账号,6项目子账号,7项目部账号", width = 15) - @ApiModelProperty(value = "账号类型,1系统管理员,2企业管理员账号,3企业区账号,4企业市账号,5项目账号,6项目子账号,7项目部账号") + @Excel(name = "账号类型,1系统管理员,2企业总部管理员账号,3区域账号,4城市账号,5项目账号,6项目子账号,7项目人员账号", width = 15) + @ApiModelProperty(value = "账号类型,1系统管理员,2企业管理员账号,3企业区账号,4企业市账号,5项目账号,6项目子账号,7项目人员账号") private java.lang.Integer accountType; @ApiModelProperty(value = "项目子账号绑定的劳务人员") diff --git a/src/main/java/com/zhgd/xmgl/util/IdCardUtils.java b/src/main/java/com/zhgd/xmgl/util/IdCardUtils.java index 1bb4613d4..a21ea154c 100644 --- a/src/main/java/com/zhgd/xmgl/util/IdCardUtils.java +++ b/src/main/java/com/zhgd/xmgl/util/IdCardUtils.java @@ -74,13 +74,22 @@ public class IdCardUtils { // String tokenurl = "https://iam.cn-east-3.myhuaweicloud.com/v3/auth/tokens"; // String JSONSTR = "{ \n \"auth\": { \n \"identity\": { \n \"methods\": [ \n \"password\" \n ], \n \"password\": { \n \"user\": { \n\"name\": \"" + username + "\", \n \"password\": \"" + password + "\", \n \"domain\": { \n \"name\": \"" + username + "\" \n } \n } \n} \n}, \n\"scope\": { \n \"project\": { \n\"name\": \"cn-east-3\" \n} \n} \n} \n}"; + //获取token + String tokenUrl = "https://iam." + endpoint + ".myhuaweicloud.com/v3/auth/tokens"; String JSONSTR = getTokenStr(domainname, username, password, endpoint); - String token = HttpRequest.post("https://iam." + endpoint + ".myhuaweicloud.com/v3/auth/tokens").body(JSONUtil.toJsonStr(JSONSTR)).execute().header("x-subject-token"); - String url = "https://ocr." + endpoint + ".myhuaweicloud.com/v2/" + projectid + "/ocr/id-card"; + String tokenBody = JSONUtil.toJsonStr(JSONSTR); + log.info("token_url:{},body:{}", tokenUrl, tokenBody); + String token = HttpRequest.post(tokenUrl).body(tokenBody).execute().header("x-subject-token"); + log.info("response-token:{}", token); + + //获取身份证信息 + String cardUrl = "https://ocr." + endpoint + ".myhuaweicloud.com/v2/" + projectid + "/ocr/id-card"; Map param = new HashMap<>(); param.put("url", imageurl); param.put("side", side ? "front" : "back"); - String result = HttpRequest.post(url).header("x-auth-token", token).body(JSONUtil.toJsonStr(param)).execute().body(); + String cardBoday = JSONUtil.toJsonStr(param); + log.info("token_url:{},body:{}", cardUrl, cardBoday); + String result = HttpRequest.post(cardUrl).header("x-auth-token", token).body(cardBoday).execute().body(); log.info(result); return result; }