huangxingxing 1 gadu atpakaļ
vecāks
revīzija
8136a01554

+ 16 - 3
generated/com/miniframe/generate/comm/system/A_A00002.java

@@ -61,15 +61,15 @@ public class A_A00002 extends BaseMapModel implements Serializable {
 	public String getVerifyAuthCode() {
 		return this.verifyAuthCode;
 	}
-	String type;//登录类型(0或不填-密码登录,1-验证码登录 )
+	String type;//登录类型(0手机登录)
 	/**
-	 *登录类型(0或不填-密码登录,1-验证码登录 )
+	 *登录类型(0手机登录)
 	 */
 	public void setType(String type) {
 		this.type=type;
 	}
 	/**
-	 *登录类型(0或不填-密码登录,1-验证码登录 )
+	 *登录类型(0手机登录)
 	 */
 	public String getType() {
 		return this.type;
@@ -113,4 +113,17 @@ public class A_A00002 extends BaseMapModel implements Serializable {
 	public String getLoginWay() {
 		return this.loginWay;
 	}
+	String phoneNo;//手机号码
+	/**
+	 *手机号码
+	 */
+	public void setPhoneNo(String phoneNo) {
+		this.phoneNo=phoneNo;
+	}
+	/**
+	 *手机号码
+	 */
+	public String getPhoneNo() {
+		return this.phoneNo;
+	}
 }

+ 8 - 0
generated/validateform/a_a00002Form.xml

@@ -108,6 +108,14 @@
       <var-value>8</var-value>
     </var>
 </field>
+<field property="phoneNo" depends="maxlength">
+    <arg0 key="a_a00002.phoneNo"/>
+    <arg1 name="maxlength" key="${var:maxlength}"/>
+    <var>
+      <var-name>maxlength</var-name>
+      <var-value>256</var-value>
+    </var>
+</field>
 </form>
 </formset>
 </form-validation>

+ 2 - 1
generated/validator/resources_a_a00002Form_validator.properties

@@ -2,8 +2,9 @@ a_a00002.loginName = \u767B\u5F55\u540D
 a_a00002.authCode = \u9A8C\u8BC1\u7801
 a_a00002.password = \u5BC6\u7801
 a_a00002.verifyAuthCode = \u624B\u673A\u6216\u90AE\u7BB1\u9A8C\u8BC1\u7801
-a_a00002.type = \u767B\u5F55\u7C7B\u578B(0\u6216\u4E0D\u586B-\u5BC6\u7801\u767B\u5F55\uFF0C1-\u9A8C\u8BC1\u7801\u767B\u5F55)
+a_a00002.type = \u767B\u5F55\u7C7B\u578B(0\u624B\u673A\u767B\u5F55)
 a_a00002.loginMedia = \u767B\u5F55\u6E20\u9053\uFF080\u6216\u4E0D\u586B-APP1-WEB2-MANAGEWEB3-DATAWEB)
 a_a00002.isLoginAuto = \u662F\u5426\u9700\u8981\u81EA\u52A8\uFF081-\u81EA\u52A8\u53EA\u5BF9APP\u6709\u7528\uFF09
 a_a00002.loginWay = \u767B\u5F55\u65B9\u5F0F(0\u6216\u4E0D\u586B-\u624B\u52A8\u767B\u5F55\uFF0C1-\u81EA\u52A8\u767B\u5F55)
+a_a00002.phoneNo = \u624B\u673A\u53F7\u7801
 a_a00002Form = true

+ 2 - 1
generated/validator/resources_a_a00002Form_validator_zh_CN.properties

@@ -2,8 +2,9 @@ a_a00002.loginName = \u767B\u5F55\u540D
 a_a00002.authCode = \u9A8C\u8BC1\u7801
 a_a00002.password = \u5BC6\u7801
 a_a00002.verifyAuthCode = \u624B\u673A\u6216\u90AE\u7BB1\u9A8C\u8BC1\u7801
-a_a00002.type = \u767B\u5F55\u7C7B\u578B(0\u6216\u4E0D\u586B-\u5BC6\u7801\u767B\u5F55\uFF0C1-\u9A8C\u8BC1\u7801\u767B\u5F55)
+a_a00002.type = \u767B\u5F55\u7C7B\u578B(0\u624B\u673A\u767B\u5F55)
 a_a00002.loginMedia = \u767B\u5F55\u6E20\u9053\uFF080\u6216\u4E0D\u586B-APP1-WEB2-MANAGEWEB3-DATAWEB)
 a_a00002.isLoginAuto = \u662F\u5426\u9700\u8981\u81EA\u52A8\uFF081-\u81EA\u52A8\u53EA\u5BF9APP\u6709\u7528\uFF09
 a_a00002.loginWay = \u767B\u5F55\u65B9\u5F0F(0\u6216\u4E0D\u586B-\u624B\u52A8\u767B\u5F55\uFF0C1-\u81EA\u52A8\u767B\u5F55)
+a_a00002.phoneNo = \u624B\u673A\u53F7\u7801
 a_a00002Form = true

+ 10 - 1
src/main/java/com/miniframe/bisiness/system/A00002Service.java

@@ -22,6 +22,7 @@ import com.miniframe.tools.encode.XIDESedeCoderUtils;
 import com.miniframe.tools.XIDateTimeUtils;
 import com.miniframe.tools.XIUtils;
 import com.miniframe.tools.jwt.JwtManageUtil;
+import com.miniframe.tools.msg.IdentifyingCodeUtil;
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
@@ -115,6 +116,8 @@ public class A00002Service extends A00002BaseModel implements ExecProcessFlow {
         userLogin.setLoginCode(XIUtils.getNormalReturnCode());
         userLogin.setLoginMsg(Loginflag.sucess.getDesc());
 
+
+        // 如果存在
         if (loginWay.equals(LoginWay.MANUAL.getIndex())) { //手动登录
             if (LoginType.PASSWD.getIndex().equals(loginType)) {// 密码登录
 
@@ -135,7 +138,13 @@ public class A00002Service extends A00002BaseModel implements ExecProcessFlow {
 //				throw new BusinessException("EB8000021");
 //			}
             }
-        } else { //自动登录,验证clientToken
+        }else  if ("0".equals(this.getA_a00002().getType())) {// 如果是短信登录
+                // 验证短信验证码
+                if (!IdentifyingCodeUtil.verification(this.getA_a00002().getPhoneNo(), this.getA_a00002().getAuthCode())) {
+                    // 验证码校验失败!
+                    throw new BusinessException("EB8000021");
+                }
+            } else { //自动登录,验证clientToken
             boolean isCheckJwtToken=false;
             try {
                 isCheckJwtToken=LoginService.checkJwtTokenForUser(this.getA_systemhead().getUserId(), this.getA_systemhead().getClientToken());

+ 1 - 0
src/main/java/com/miniframe/bisiness/system/C00005Service.java

@@ -93,6 +93,7 @@ public class C00005Service extends C00005BaseModel implements ExecProcessFlow {
 		}
 
 
+
 	}
 	/**
 	 * 执行前 删除上次创建的索引日志数据

+ 3 - 2
系统设计/通信设计/通讯报文/system(系统服务)/报文体/A00002_A(登录).csv

@@ -3,7 +3,8 @@
 2,authCode,验证码,string,,,否,1,6,,,,,,
 3,password,密码,string,,,否,1,128,,,,,,
 4,verifyAuthCode,手机或邮箱验证码,string,,,否,1,6,,,,,,
-5,type,登录类型(0或不填-密码登录,1-验证码登录 ),string,,,,1,8,,,,,,
+5,type,登录类型(0手机登录),string,,,,1,8,,,,,,
 6,loginMedia,登录渠道(0或不填-APP 1-WEB 2-MANAGEWEB 3-DATAWEB),string,,,否,1,8,,,,,,
 7,isLoginAuto,是否需要自动(1-自动只对APP有用),string,,,否,1,8,,,,,,
-8,loginWay,登录方式(0或不填-手动登录,1-自动登录),string,,,否,1,8,,,,,,
+8,loginWay,登录方式(0或不填-手动登录,1-自动登录),string,,,否,1,8,,,,,,
+9,phoneNo,手机号码,string,,,,,256,,,,,,