From cc565109bf764abd1007a3a1c8e1fc48cb0be63b Mon Sep 17 00:00:00 2001 From: Administrator <1923636941@qq.com> Date: Sat, 1 Apr 2023 23:10:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BA=BA=E6=95=B0bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicdata/controller/APIController.java | 3 ++ .../mapper/xml/EnvironmentDevMapper.xml | 2 +- .../impl/EnvironmentDevServiceImpl.java | 2 +- .../java/com/zhgd/xmgl/util/IdCardUtils.java | 48 ++++++++++++------- .../resources/application-zjsj-gsx.properties | 9 ++-- src/main/resources/application.properties | 1 + 6 files changed, 40 insertions(+), 25 deletions(-) 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 6eb52a0ff..a0f8cf443 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 @@ -84,6 +84,9 @@ public class APIController { side = false; } String data = IdCardUtils.getIdCardInfo(MapUtils.getString(map, "imageUrl"), side); + if (data == null) { + return Result.ok(); + } JSONObject object = JSONUtil.parseObj(data); if (object.containsKey("result")) { result.setResult(object.get("result")); diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/EnvironmentDevMapper.xml b/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/EnvironmentDevMapper.xml index a919e2b0d..43aee02d5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/EnvironmentDevMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/EnvironmentDevMapper.xml @@ -13,7 +13,7 @@ diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentDevServiceImpl.java index 0eed1eba1..e24a142e7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentDevServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentDevServiceImpl.java @@ -207,7 +207,7 @@ public class EnvironmentDevServiceImpl extends ServiceImpl> alarmList=environmentAlarmMapper.selectEnvironmentDevTodayAlarmCount(map); for(EntityMap dev:devList){ - if("1".equals(MapUtils.getString(dev,"devOnline"))){ + if("1".equals(MapUtils.getString(dev,"devonline"))){ totalDevOnlineNum++; } //取出报警次数 diff --git a/src/main/java/com/zhgd/xmgl/util/IdCardUtils.java b/src/main/java/com/zhgd/xmgl/util/IdCardUtils.java index a21ea154c..dcf54d4d3 100644 --- a/src/main/java/com/zhgd/xmgl/util/IdCardUtils.java +++ b/src/main/java/com/zhgd/xmgl/util/IdCardUtils.java @@ -25,6 +25,15 @@ public class IdCardUtils { private static String password; private static String projectid; private static String endpoint; + /** + * 是否启用华为云账号功能 + */ + private static Boolean enable; + + @Value("${hw-ocr-enable}") + public void setEnable(Boolean enable) { + IdCardUtils.enable = enable; + } @Value("${hw-ocr-username}") public void setUsername(String hwusername) { @@ -51,6 +60,7 @@ public class IdCardUtils { endpoint = hwendpoint; } + /** * 识别身份证信息 * @@ -60,7 +70,7 @@ public class IdCardUtils { * 注意事项：此处申请华为云必须在华为云上海一区开通身份证识别功能，然后拷贝项目ID到此处进行识别 */ public static String getIdCardInfo(String imageurl, boolean side) { - + if (enable) { // 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\": \"" + domainname + "\" \n } \n } \n} \n}, \n\"scope\": { \n \"project\": { \n\"name\": \"cn-east-3\" \n} \n} \n} \n}"; // String token = HttpRequest.post(tokenurl).body(String.valueOf(JSONUtil.parse(JSONSTR))).execute().header("X-Subject-Token"); // String url = "https://ocr.cn-east-3.myhuaweicloud.com/v2/" + projectid + "/ocr/id-card"; @@ -74,24 +84,26 @@ 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 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); + //获取token + String tokenUrl = "https://iam." + endpoint + ".myhuaweicloud.com/v3/auth/tokens"; + String JSONSTR = getTokenStr(domainname, username, password, endpoint); + 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 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; + //获取身份证信息 + 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 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; + } + return null; } public static String getTokenStr(String domainname, String username, String passwrd, String endpoint) { diff --git a/src/main/resources/application-zjsj-gsx.properties b/src/main/resources/application-zjsj-gsx.properties index c4b5df95a..d5053c423 100644 --- a/src/main/resources/application-zjsj-gsx.properties +++ b/src/main/resources/application-zjsj-gsx.properties @@ -1,16 +1,15 @@ #http.port=30250 -http.port=18070 +http.port=21323 #spring.datasource.url=jdbc:mysql://124.71.178.44:3306/wisdomsite_lgdc?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true #spring.datasource.url=jdbc:mysql://183.60.227.61:20246/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&serverTimezone=UTC #spring.datasource.url=jdbc:mysql://36.137.53.203:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true #spring.datasource.url=jdbc:mysql://139.9.66.234:3386/wisdomsite_ty?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true #spring.datasource.url=jdbc:mysql://182.90.224.237:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false #spring.datasource.url=jdbc:mysql://139.9.66.234:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true -spring.datasource.url=jdbc:mysql://124.71.67.160:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false +spring.datasource.url=jdbc:mysql://localhost:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false spring.datasource.username=ENC(XR4C/hvTYCUqudS49Wh/jA==) -#spring.datasource.password=ENC(hHkiHEc6vSWjqfOtg2/2Uiihs0vX3l7V) -spring.datasource.password=ENC(hHkiHEc6vSWjqfOtg2/2Uiihs0vX3l7V) -server.port=8070 +spring.datasource.password=ENC(LsKaVL2ycDu+uUNoPndYLA==) +server.port=8188 #server.port=30246 basePath=C:/jxj/prod/backEnd/itbgpImage/ server.tomcat.basedir=C:/jxj/prod/backEnd/tempImage/ diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 59629b5b8..3d8832fae 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -86,6 +86,7 @@ hw-ocr-password=jxj27696951 hw-ocr-domainname=szjxjzh hw-ocr-projectid=0633b705cc000f3e2f55c010af021eec hw-ocr-endpoint=cn-east-3 +hw-ocr-enable=false # \u8679\u8F6F\u914D\u7F6E arcsoft.appId=4F9jmKsCYKsQskYBTXK7sQZLH8dFdT7LK5Yjx5XA8gkB arcsoft.sdkKey=FUPhPPfPXrAmFrecmCSiG5BjmHSwp86QogvdCM7g8B5k