Merge branch 'feature_yelz'

qnfhq-api/src/main/java/com/qnfhq/modules/user/service/AppUserService.java

@@ -19,8 +19,6 @@ public interface AppUserService extends IService<AppUserEntity> {
 
     AppUserEntity getUserByMobile(String mobile,String zone);
 
-    AppUserEntity getUserByUserId(Long userId);
-
     AppUserEntity getUserByActiveCode(String activeCode);
 
 
@@ -58,7 +56,7 @@ public interface AppUserService extends IService<AppUserEntity> {
      * @param email 邮箱
      * @return
      */
-    public Result sendEmailCode(String codeType, String email);
+    public Result sendEmailCode(String uuid,String codeType, String email);
 
     /**
      * 手机发送验证码
@@ -67,15 +65,17 @@ public interface AppUserService extends IService<AppUserEntity> {
      * @param zone 区号
      * @return
      */
-    public Result sendMobileCode(String codeType,String phone,String zone);
-
-    AppUserDetailEntity selectUserDetailByUserId(Long userId);
-
-    Result checkCaptcha(CheckCaptchaDTO dto, HttpServletRequest request);
+    public Result sendMobileCode(String uuid,String codeType,String phone,String zone);
 
     Result checkPhoneCode(String codeType,String zone,String phone,String code);
 
     Result checkEmailCode(String codeType,String email,String code);
     Result resetPwdByEmail(String email,String pwd);
     Result resetPwdByPhone(String zone,String phone,String pwd);
+
+    /**
+     * 阿里智能验证码
+     * @return
+     */
+    Result verifyIntelligentCaptcha(String verifyParam);
 }