Merge remote-tracking branch 'origin/master'

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 = "人脸url")
+    @Schema(description = "人脸url", hidden = true)
     private String faceUrl;
 }

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

@@ -1,7 +1,5 @@
 package com.zhongshu.card.server.core.controller.user;
 
-import com.github.microservice.auth.security.annotations.ResourceAuth;
-import com.github.microservice.auth.security.type.AuthType;
 import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.client.model.base.ProjectOidParam;
 import com.zhongshu.card.client.model.forgotPassword.ForgotPasswordParam;
@@ -32,14 +30,12 @@ public class ForgotPassWordController {
     @Autowired
     private ForgotPassWordService forgotPassWordService;
 
-    @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "验证用户（通过电话号码和身份证）", description = "验证用户")
     @RequestMapping(value = {"verifyUserExitByPhone"}, method = {RequestMethod.POST})
     public ResultContent<ValidateUserModel> verifyUserExitByPhone(@RequestBody ValidateUserParam param) {
         return forgotPassWordService.verifyUserExitByPhone(param);
     }
 
-    @ResourceAuth(value = "user", type = AuthType.User)
     @RequestMapping(value = "verifyUserExitByImage", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, method = RequestMethod.POST)
     @Operation(summary = "用人脸图片判断用户是否存在", description = "用人脸图片判断用户是否存在")
     public ResultContent verifyUserExitByImage(
@@ -51,7 +47,6 @@ public class ForgotPassWordController {
         return forgotPassWordService.verifyUserExitByImage(file);
     }
 
-    @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "重置密码", description = "验证用户")
     @RequestMapping(value = {"resetPassword"}, method = {RequestMethod.POST})
     public ResultContent resetPassword(@RequestBody ForgotPasswordParam param) {

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/projectAbout/extend/ProjectOrgPaySettingInfoDaoExtend.java

@@ -1,8 +1,6 @@
 package com.zhongshu.card.server.core.dao.projectAbout.extend;
 
 import com.zhongshu.card.client.model.paySetting.paySetting.ProjectPaySettingInfoSearch;
-import com.zhongshu.card.client.model.projectAbout.PayChannelConfigSearch;
-import com.zhongshu.card.server.core.domain.paySetting.PayChannelConfig;
 import com.zhongshu.card.server.core.domain.paySetting.ProjectOrgPaySettingInfo;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

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

@@ -79,8 +79,7 @@ public class ForgotPassWordService extends SuperService {
         }
         String uuid = CommonUtil.UUID();
         String userId = userAccount.getUserId();
-        String name = userAccount.getName();
-        name = CommonUtil.turnNameDesen(name);
+        String name = CommonUtil.turnNameDesen(userAccount.getName());
 
         model.setId(uuid);
         model.setUserName(name);