*）*）小程序登录增加手机号和验证码字段

amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-api/src/main/java/com/yeejoin/amos/boot/module/app/api/common/MobileLoginParam.java

@@ -44,4 +44,12 @@ public class MobileLoginParam {
      *  密码
      */
     private String verifyCode;
+    /**
+     * 手机号
+     */
+    private String phone;
+    /**
+     * 验证码
+     */
+    private String phoneCode;
 }
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-biz/src/main/java/com/yeejoin/amos/boot/module/app/biz/service/impl/TzsAppService.java

@@ -28,6 +28,7 @@ import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.IdPasswordAuthModel;
+import com.yeejoin.amos.feign.privilege.model.IdPasswordMobileVerifyAuthModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import io.swagger.annotations.ApiModel;
@@ -593,15 +594,24 @@ public class TzsAppService {
 
     public Map<String, Object> login(MobileLoginParam param) {
         Map<String, Object> result = new LinkedHashMap<>();
-        IdPasswordAuthModel idPasswordAuthModel = new IdPasswordAuthModel();
-        idPasswordAuthModel.setLoginId(param.getPhoneNo());
-        idPasswordAuthModel.setPassword(param.getVerifyCode());
         FeignClientResult<Map<String, String>> idpassword = new FeignClientResult<>();
         RequestContext.setToken("");
         RequestContext.setProduct(product);
         RequestContext.setAppKey(appKey);
         try {
-            idpassword = Privilege.authClient.idpassword(idPasswordAuthModel);
+            if (!ValidationUtil.isEmpty(param.getPhone()) && !ValidationUtil.isEmpty(param.getPhoneCode())){
+                IdPasswordMobileVerifyAuthModel idPasswordMobileVerifyAuthModel = new IdPasswordMobileVerifyAuthModel();
+                idPasswordMobileVerifyAuthModel.setLoginId(param.getPhoneNo());
+                idPasswordMobileVerifyAuthModel.setPassword(param.getVerifyCode());
+                idPasswordMobileVerifyAuthModel.setPhone(param.getPhone());
+                idPasswordMobileVerifyAuthModel.setPhoneCode(param.getPhoneCode());
+                idpassword = Privilege.authClient.dualIdpasswordMobile(idPasswordMobileVerifyAuthModel);
+            } else {
+                IdPasswordAuthModel idPasswordAuthModel = new IdPasswordAuthModel();
+                idPasswordAuthModel.setLoginId(param.getPhoneNo());
+                idPasswordAuthModel.setPassword(param.getVerifyCode());
+                idpassword = Privilege.authClient.idpassword(idPasswordAuthModel);
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }