Merge branch 'dev' of http://git.izouma.com/wangqifan/nanjing_nft into dev

pom.xml

@@ -9,10 +9,10 @@
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.izouma</groupId>
-    <artifactId>9th</artifactId>
+    <artifactId>adcs</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <name>9th</name>
-    <description>9th</description>
+    <name>adcs</name>
+    <description>adcs</description>
 
     <repositories>
         <repository>

src/main/java/com/izouma/nineth/service/IdentityAuthService.java

@@ -131,6 +131,29 @@ public class IdentityAuthService {
 //        }
 //    }
 
+    public static void validateV2(String name, String phone, String idno) {
+        String body = HttpRequest.post("https://zid.market.alicloudapi.com/idcheck/Post")
+                .header("Authorization", "APPCODE af29c2d37c4f415fac930d82f01fb559")
+                .contentType(HttpRequest.CONTENT_TYPE_FORM)
+                .form("cardNo", idno)
+                .form("realName", name)
+                .body();
+        JSONObject jsonObject = JSONObject.parseObject(body);
+        log.info("validate {} {} \n{}", name, idno, JSON.toJSONString(jsonObject, SerializerFeature.PrettyFormat));
+        if (jsonObject.getInteger("error_code") != 0) {
+            String msg = jsonObject.getString("reason");
+            throw new BusinessException(msg);
+        } else {
+            JSONObject data = jsonObject.getJSONObject("result");
+            boolean isOK = Optional.ofNullable(data.getBoolean("isok")).orElse(Boolean.FALSE);
+            if (!isOK) {
+                throw new BusinessException("不匹配");
+            } else {
+                log.info("{} {} {} 实名认证通过", name, phone, idno);
+            }
+        }
+    }
+
     public static void validate(String name, String phone, String idno) {
         HttpRequest request = HttpRequest.get("https://mobilecert.market.alicloudapi.com/mobile3MetaSimple?userName="
                         + URLEncoder.encode(name, StandardCharsets.UTF_8)
@@ -237,10 +260,9 @@ public class IdentityAuthService {
         User user = userRepo.findById(identityAuth.getUserId()).orElseThrow(new BusinessException("用户不存在"));
         if (user.getAuthStatus() == AuthStatus.SUCCESS) {
             result.put("status", AuthStatus.SUCCESS);
-        } else if (!Pattern
-                .matches("[1-9]{1}[0-9]{5}(19|20)[0-9]{2}((0[1-9]{1})|(1[0-2]{1}))((0[1-9]{1})|([1-2]{1}[0-9]{1}|(3[0-1]{1})))[0-9]{3}[0-9x]{1}", identityAuth
-                        .getIdNo()
-                        .toLowerCase())) {
+        } else if (identityAuth.getIdNo() == null ||
+                !Pattern.matches("[1-9]{1}[0-9]{5}(19|20)[0-9]{2}((0[1-9]{1})|(1[0-2]{1}))((0[1-9]{1})|([1-2]{1}[0-9]{1}|(3[0-1]{1})))[0-9]{3}[0-9x]{1}",
+                        identityAuth.getIdNo().toLowerCase())) {
             result.put("status", AuthStatus.FAIL);
             result.put("reason", "身份证格式错误");
         } else {
@@ -267,7 +289,7 @@ public class IdentityAuthService {
                     result.put("reason", "同一身份证注册超过3个");
                 } else {
                     try {
-                        validate(identityAuth.getRealName(), identityAuth.getPhone(), identityAuth.getIdNo());
+                        validateV2(identityAuth.getRealName(), identityAuth.getPhone(), identityAuth.getIdNo());
                         result.put("status", AuthStatus.SUCCESS);
                     } catch (Exception e) {
                         log.error("自动实名出错", e);

src/main/resources/application.yaml

@@ -16,7 +16,7 @@ spring:
   profiles:
     active: dev
   redis:
-    host: 47.99.216.95
+    host: 112.124.67.175
     database: 1
     password: jV%93RtjUx82Tp
     lettuce:
@@ -25,9 +25,9 @@ spring:
         max_idle: 50
         min_idle: 0
   datasource:
-    url: jdbc:mysql://rdsave1o67m1ido6gwp6public.mysql.rds.aliyuncs.com/nanjing_nft?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
-    username: nkcnft
-    password: Wilhelm98!
+    url: jdbc:mysql://rm-bp1k452l89i9e013hfo.mysql.rds.aliyuncs.com/adcs_dev?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
+    username: adcs
+    password: 2aXK7&bjQ@7%k2Y^FN
     hikari:
       minimum-idle: 20
       maximum-pool-size: 3000
@@ -232,7 +232,7 @@ spring:
     activate:
       on-profile: test
   datasource:
-    url: jdbc:mysql://rm-wz9sc79f5255780op.mysql.rds.aliyuncs.com/raex_test?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
+    url: jdbc:mysql://rm-bp1k452l89i9e013h.mysql.rds.aliyuncs.com/adcs_dev?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
     username: raex_server
     password: tetQsjw!u4!c5$URduo7BH
   redis:
@@ -266,9 +266,9 @@ spring:
     activate:
       on-profile: test1
   datasource:
-    url: jdbc:mysql://rdsave1o67m1ido6gwp6145.mysql.rds.aliyuncs.com/nanjing_nft?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
-    username: nkcnft
-    password: Wilhelm98!
+    url: jdbc:mysql://rm-bp1k452l89i9e013h.mysql.rds.aliyuncs.com/adcs_dev?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
+    username: adcs
+    password: 2aXK7&bjQ@7%k2Y^FN
   redis:
     host: 127.0.0.1
     database: 2
@@ -310,28 +310,14 @@ rocketmq:
     group: my-producer
 ---
 
-spring:
-  config:
-    activate:
-      on-profile: local
-  datasource:
-    url: jdbc:mysql://192.168.50.10/raex_test?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
-    username: root
-    password: 123456
-  redis:
-    host: 192.168.50.16
-    database: 0
-    password:
----
-
 spring:
   config:
     activate:
       on-profile: prod
   datasource:
-    url: jdbc:mysql://rdsave1o67m1ido6gwp6public.mysql.rds.aliyuncs.com/nanjing_nft?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
-    username: nkcnft
-    password: Wilhelm98!
+    url: jdbc:mysql://rm-bp1k452l89i9e013h.mysql.rds.aliyuncs.com/adcs?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
+    username: adcs
+    password: 2aXK7&bjQ@7%k2Y^FN
   redis:
     host: 127.0.0.1
     database: 1
@@ -380,9 +366,9 @@ spring:
     activate:
       on-profile: notify
   datasource:
-    url: jdbc:mysql://rdsave1o67m1ido6gwp6145.mysql.rds.aliyuncs.com/nanjing_nft?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
-    username: nkcnft
-    password: Wilhelm98!
+    url: jdbc:mysql://rm-bp1k452l89i9e013h.mysql.rds.aliyuncs.com/adcs?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
+    username: adcs
+    password: 2aXK7&bjQ@7%k2Y^FN
   redis:
     host: 172.31.215.239
     database: 1
@@ -428,9 +414,9 @@ spring:
     activate:
       on-profile: notifytest
   datasource:
-    url: jdbc:mysql://rdsave1o67m1ido6gwp6145.mysql.rds.aliyuncs.com/nanjing_nft?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
-    username: nkcnft
-    password: Wilhelm98!
+    url: jdbc:mysql://rm-bp1k452l89i9e013h.mysql.rds.aliyuncs.com/adcs_dev?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
+    username: adcs
+    password: 2aXK7&bjQ@7%k2Y^FN
   redis:
     host: 172.31.215.239
     database: 0