更新！11

FullCardClient/src/main/java/com/zhongshu/card/client/model/forgotPassword/ValidateUserModel.java

@@ -14,6 +14,6 @@ public class ValidateUserModel {
     @Schema(description = "数据id")
     private String id;
 
-    @Schema(description = "")
+    @Schema(description = "用户名称")
     private String userName;
 }

FullCardClient/src/main/java/com/zhongshu/card/client/model/forgotPassword/ValidateUserParam.java

@@ -17,6 +17,6 @@ public class ValidateUserParam {
     @Schema(description = "身份证号码")
     private String cardNumber;
 
-    @Schema(description = "")
+    @Schema(description = "人脸url")
     private String faceUrl;
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/user/ForgotPassWordController.java

@@ -39,13 +39,6 @@ public class ForgotPassWordController {
         return forgotPassWordService.verifyUserExitByPhone(param);
     }
 
-    @ResourceAuth(value = "user", type = AuthType.User)
-    @Operation(summary = "验证用户（通过人脸验证）", description = "验证用户")
-    @RequestMapping(value = {"verifyUserExitByFace"}, method = {RequestMethod.POST})
-    public ResultContent<ValidateUserModel> verifyUserExitByFace(@RequestBody ValidateUserParam param) {
-        return forgotPassWordService.verifyUserExitByFace(param);
-    }
-
     @ResourceAuth(value = "user", type = AuthType.User)
     @RequestMapping(value = "verifyUserExitByImage", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, method = RequestMethod.POST)
     @Operation(summary = "用人脸图片判断用户是否存在", description = "用人脸图片判断用户是否存在")

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/org/UserCountDao.java

@@ -19,8 +19,6 @@ public interface UserCountDao extends MongoDao<UserAccount>, UserCountDaoExtend
 
     List<UserAccount> findByUserIdIn(List<String> userIds);
 
-    UserAccount findTopByPhone(String phone);
-
     UserAccount findTopByPhoneAndCardNumber(String phone, String cardNumber);
 
     UserAccount findTopByLoginName(String loginName);

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/devices/thing/IotThing.java

@@ -37,9 +37,6 @@ public class IotThing extends SuperMain {
     @Schema(description = "设备数量")
     private Long deviceCount = 0L;
 
-    @Schema(description = "所属分组")
-    private String projectCode;
-
     //-----------------所属产品 start-----------
     @Schema(description = "所属产品数据id")
     private String iotTemplateId;

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/paySetting/PayShareList.java

@@ -33,9 +33,6 @@ public class PayShareList extends SuperMain {
     @Schema(description = "项目名称")
     private String projectName;
 
-    @Schema(description = "项目编码")
-    private String projectCode;
-
     @Schema(description = "关联数据ID")
     private String aboutDataId;
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/paySetting/ProjectOrgPaySettingInfo.java

@@ -28,9 +28,6 @@ public class ProjectOrgPaySettingInfo extends SuperMain {
     @Schema(description = "项目名称")
     private String projectName;
 
-    @Schema(description = "项目编码")
-    private String projectCode;
-
     @Schema(description = "所属机构oid")
     private String belongOig;
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/paySetting/ProjectPaySetting.java

@@ -33,9 +33,6 @@ public class ProjectPaySetting extends SuperMain {
     @Schema(description = "项目名称")
     private String projectName;
 
-    @Schema(description = "项目编码")
-    private String projectCode;
-
     //----------------------------------业务数据 -------------------
     @Schema(description = "项目的支付渠道设置：微信支付、银联支付")
     private PaymentType channelType;

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/projectAbout/ProjectCommonConfig.java

@@ -40,9 +40,6 @@ public class ProjectCommonConfig extends SuperMain {
     @Schema(description = "项目名称")
     private String projectName;
 
-    @Schema(description = "项目编码")
-    private String projectCode;
-
     //----------------------------业务信息 start-----------------
 
     //-------------------协议信息 start ------------------

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/projectAbout/ProjectExcelTemplate.java

@@ -30,9 +30,6 @@ public class ProjectExcelTemplate extends SuperMain {
     @Schema(description = "项目名称")
     private String projectName;
 
-    @Schema(description = "项目编码")
-    private String projectCode;
-
     //----------------------------业务信息 start-----------------
 
     @Schema(description = "类型")

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/projectAbout/ProjectIotInfo.java

@@ -30,9 +30,6 @@ public class ProjectIotInfo extends SuperMain {
     @Schema(description = "项目名称")
     private String projectName;
 
-    @Schema(description = "项目编码")
-    private String projectCode;
-
     //----------------------------业务信息 start-----------------
     @Schema(description = "ak")
     private String ak;

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/projectAbout/ProjectWeChatInfo.java

@@ -30,9 +30,6 @@ public class ProjectWeChatInfo extends SuperMain {
     @Schema(description = "项目名称")
     private String projectName;
 
-    @Schema(description = "项目编码")
-    private String projectCode;
-
     @Schema(description = "小程序名称")
     private String appName;
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/user/ForgotPassWordService.java

@@ -60,6 +60,11 @@ public class ForgotPassWordService extends SuperService {
     // 随机key存储的时间 10 分钟
     private final Long keyTime = 60 * 10L;
 
+    /**
+     * 通过手机号码和身份证验证用户是否存在
+     * @param param
+     * @return
+     */
     public ResultContent<ValidateUserModel> verifyUserExitByPhone(ValidateUserParam param) {
         ValidateUserModel model = new ValidateUserModel();
         if (StringUtils.isEmpty(param.getPhone())) {
@@ -83,23 +88,14 @@ public class ForgotPassWordService extends SuperService {
         return ResultContent.buildSuccess(model);
     }
 
-    public ResultContent<ValidateUserModel> verifyUserExitByFace(ValidateUserParam param) {
-        ValidateUserModel model = new ValidateUserModel();
-        if (StringUtils.isEmpty(param.getFaceUrl())) {
-            return ResultContent.buildFail("faceUrl is empty");
-        }
-        String faceBase64 = commonService.getUrlFileBase64(param.getFaceUrl());
-        return ResultContent.buildSuccess(model);
-    }
-
     public ResultContent<ValidateUserModel> verifyUserExitByImage(MultipartFile file) {
         ValidateUserModel model = new ValidateUserModel();
-        com.github.microservice.auth.client.content.ResultContent<Object> resultContent = userFaceService.matches(file);
+        com.github.microservice.auth.client.content.ResultContent<String> resultContent = userFaceService.getMatchesKey(file);
         if (resultContent.isFailed()) {
             return ResultContent.buildFail(resultContent.getMsg());
         }
 
-        String userId = "";
+        String userId = resultContent.getContent();
         UserAccount userAccount = userCountDao.findTopByUserId(userId);
         if (ObjectUtils.isEmpty(userAccount)) {
             return ResultContent.buildFail("用户不存在");