初始化

generated/com/miniframe/generate/comm/system/A_A00003.java

@@ -35,18 +35,18 @@ public class A_A00003 extends BaseMapModel implements Serializable {
 	public String getPassword() {
 		return this.password;
 	}
-	String mail;//邮箱
+	String mailOrPhone;//邮箱或手机
 	/**
-	 *邮箱
+	 *邮箱或手机
 	 */
-	public void setMail(String mail) {
-		this.mail=mail;
+	public void setMailOrPhone(String mailOrPhone) {
+		this.mailOrPhone=mailOrPhone;
 	}
 	/**
-	 *邮箱
+	 *邮箱或手机
 	 */
-	public String getMail() {
-		return this.mail;
+	public String getMailOrPhone() {
+		return this.mailOrPhone;
 	}
 	String verificationCode;//验证码
 	/**
@@ -61,4 +61,17 @@ public class A_A00003 extends BaseMapModel implements Serializable {
 	public String getVerificationCode() {
 		return this.verificationCode;
 	}
+	String channel;//消息通道(1-手机 2-邮箱)
+	/**
+	 *消息通道(1-手机 2-邮箱)
+	 */
+	public void setChannel(String channel) {
+		this.channel=channel;
+	}
+	/**
+	 *消息通道(1-手机 2-邮箱)
+	 */
+	public String getChannel() {
+		return this.channel;
+	}
 }

generated/validateform/a_a00003Form.xml

@@ -30,8 +30,8 @@
       <var-value>256</var-value>
     </var>
 </field>
-<field property="mail" depends="required,minlength,maxlength">
-    <arg0 key="a_a00003.mail"/>
+<field property="mailOrPhone" depends="required,minlength,maxlength">
+    <arg0 key="a_a00003.mailOrPhone"/>
     <arg1 name="minlength" key="${var:minlength}"/>
     <var>
       <var-name>minlength</var-name>
@@ -56,6 +56,19 @@
       <var-value>32</var-value>
     </var>
 </field>
+<field property="channel" depends="required,minlength,maxlength">
+    <arg0 key="a_a00003.channel"/>
+    <arg1 name="minlength" key="${var:minlength}"/>
+    <var>
+      <var-name>minlength</var-name>
+      <var-value>1</var-value>
+    </var>
+    <arg1 name="maxlength" key="${var:maxlength}"/>
+    <var>
+      <var-name>maxlength</var-name>
+      <var-value>16</var-value>
+    </var>
+</field>
 </form>
 </formset>
 </form-validation>

generated/validator/resources_a_a00003Form_validator.properties

@@ -1,5 +1,6 @@
 a_a00003.userName = \u7528\u6237\u540D
 a_a00003.password = \u5BC6\u7801
-a_a00003.mail = \u90AE\u7BB1
+a_a00003.mailOrPhone = \u90AE\u7BB1\u6216\u624B\u673A
 a_a00003.verificationCode = \u9A8C\u8BC1\u7801
+a_a00003.channel = \u6D88\u606F\u901A\u9053(1-\u624B\u673A2-\u90AE\u7BB1)
 a_a00003Form = true

generated/validator/resources_a_a00003Form_validator_zh_CN.properties

@@ -1,5 +1,6 @@
 a_a00003.userName = \u7528\u6237\u540D
 a_a00003.password = \u5BC6\u7801
-a_a00003.mail = \u90AE\u7BB1
+a_a00003.mailOrPhone = \u90AE\u7BB1\u6216\u624B\u673A
 a_a00003.verificationCode = \u9A8C\u8BC1\u7801
+a_a00003.channel = \u6D88\u606F\u901A\u9053(1-\u624B\u673A2-\u90AE\u7BB1)
 a_a00003Form = true

src/main/java/com/miniframe/bisiness/system/A00003Service.java

@@ -3,12 +3,7 @@ package com.miniframe.bisiness.system;
 import com.miniframe.core.ExecProcessFlow;
 import com.miniframe.core.exception.BusinessException;
 import com.miniframe.core.ext.UtilTools;
-import com.miniframe.generate.appcode.LoginMedia;
-import com.miniframe.generate.appcode.RoleType;
 import com.miniframe.generate.appcode.SexType;
-import com.miniframe.generate.appcode.UserDnType;
-import com.miniframe.generate.appcode.UserState;
-import com.miniframe.generate.appcode.UserType;
 import com.miniframe.generate.business.system.model.A00003BaseModel;
 import com.miniframe.model.system.SysUser;
 import com.miniframe.model.system.SysUserSQLBuilder;
@@ -22,15 +17,13 @@ import org.springframework.util.CollectionUtils;
 import java.util.List;
 import java.util.Map;
 
-import static com.miniframe.constant.XIConstant.VERIFYTOKEN_PRE;
-import static com.miniframe.tools.XIFileUtils.initHeadFile;
-
 /**
- * 基础系统,“注册”逻辑处理（重新生成不覆盖）。
+ * 基础系统,“手机注册”逻辑处理（重新生成不覆盖）。
  */
 public class A00003Service extends A00003BaseModel implements ExecProcessFlow {
 
     private static final long serialVersionUID = -7051358269847459502L;
+    private static String verifyTokenKeyPre = "VERIFYTOKEN_";
 
 
     /**
@@ -38,49 +31,51 @@ public class A00003Service extends A00003BaseModel implements ExecProcessFlow {
      */
     public void transExecute() throws Exception {
 
-        String verifyTokenKey = VERIFYTOKEN_PRE + this.getA_systemhead().getClientToken() + this.getA_a00003().getMail(); // 唯一标识
-        String isVerify = (String) UtilTools.getUserCache(verifyTokenKey);
-        boolean verification;
-        if (UtilTools.isNotNullAndBlank(isVerify) && isVerify.equals("1")) {
-            verification = true;
-        } else {
-            verification = IdentifyingCodeUtil.verification(this.getA_a00003().getMail(), this.getA_a00003().getVerificationCode());
-
+        //本地是否存在
+        SysUserSQLBuilder sysUserSQLBuilder = new SysUserSQLBuilder();
+        String verifyTokenKey = verifyTokenKeyPre
+                + this.getA_systemhead().getClientToken()
+                + this.getA_a00003().getMailOrPhone(); // 唯一标识
+        String isVerify=(String) UtilTools.getUserCache(verifyTokenKey);
+        boolean verification=false;
+        if(UtilTools.isNotNullAndBlank(isVerify) && isVerify.equals("1")){
+            verification=true;
+        }else{
+            verification = IdentifyingCodeUtil.verification(this.getA_a00003().getMailOrPhone(),
+                    this.getA_a00003().getVerificationCode());
         }
-
-        if (verification) {
-            UtilTools.putUserCache(verifyTokenKey, "1");
-
+        if(verification) {
+            UtilTools.putUserCache(verifyTokenKey,"1");
             //本地是否存在
             SysUserMapper sysUserDAO = UtilTools.getBean(SysUserMapper.class);
             SysUserSQLBuilder sb = new SysUserSQLBuilder();
             sb.createCriteria().andUsernameEqualTo(this.getA_a00003().getUserName().trim());
-            sb.or(sb.createCriteria().andUseremailEqualTo(this.getA_a00003().getMail()));
+            sb.or(sb.createCriteria().andUseremailEqualTo(this.getA_a00003().getMailOrPhone()));
+            sb.or(sb.createCriteria().andUsermobnubEqualTo(this.getA_a00003().getMailOrPhone()));
             List<SysUser> userInfoList = sysUserDAO.selectByExample(sb);
-            if (!CollectionUtils.isEmpty(userInfoList)) {
+            if(!CollectionUtils.isEmpty(userInfoList)) {
                 //已经注册
                 throw new BusinessException("EB8000020");
             }
-
             SysUser sysUser = new SysUser();
             sysUser.setId(UtilTools.getUUid());
-            sysUser.setUserstate(UserState.normal.getIndex());
-            sysUser.setUseremail(this.getA_a00003().getMail());
+            //sysUser.setUsertype(CertificationType.person.getIndex());
+            //sysUser.setAuthenticationState(CertificationState.noCertificate.getIndex());
+            sysUser.setUserstate("1");
+            if(this.getA_a00003().getChannel().equals("2")) {//邮箱
+                sysUser.setUseremail(this.getA_a00003().getMailOrPhone());
+            }else if(this.getA_a00003().getChannel().equals("1")){//手机
+                sysUser.setUsermobnub(this.getA_a00003().getMailOrPhone());
+            }
+
             sysUser.setCreateTime(XIDateTimeUtils.getNowDate());
             sysUser.setUpdateTime(sysUser.getCreateTime());
 
-            sysUser.setUserType(UserType.main.getIndex());
-            sysUser.setRoleids(RoleType.normal.getIndex());
-
-            sysUser.setFuncids(LoginMedia.DATAWEB.getDesc());
-
-            sysUser.setUsername(getA_a00003().getUserName());
             sysUser.setNickname(getA_a00003().getUserName());//默认
+            sysUser.setUsername(getA_a00003().getUserName());
 
-            sysUser.setHeadPortait("head");
-
-            sysUser.setUserdnflag(Integer.parseInt(UserDnType.normal.getIndex()));
-            sysUser.setUsersex(Short.parseShort(SexType.man.getIndex()));//默认为男
+            sysUser.setUserdnflag(0);//不需要证书
+            sysUser.setUsersex((short) Integer.parseInt(SexType.man.getIndex()));//默认为男
             sysUser.setScore(0);
 
             //3DES解密密码
@@ -89,32 +84,34 @@ public class A00003Service extends A00003BaseModel implements ExecProcessFlow {
             String passwordCrypted = LoginService.encodePassword(sysUser.getId(), passwordDecrypted);
             sysUser.setUserpwd(passwordCrypted);
 
+
+         //   sysUser.setUserRole(UserRole.visitor.getIndex());
+
             sysUserDAO.insertSelective(sysUser);
 
             UtilTools.removeUserCache(verifyTokenKey);
-
-        } else {
+        }else{
             throw new BusinessException("EB8000021");
         }
 
     }
 
     /**
-     * 基础系统,“注册”业务前处理
+     * 基础系统,“手机注册”业务前处理
      */
     public void preTransFlow() throws Exception {
         this.validater();
     }
 
     /**
-     * 基础系统,“注册”业务后处理
+     * 基础系统,“手机注册”业务后处理
      */
-    public void afterTransFlow() throws Exception {
+    public void afterTransFolw() throws Exception {
 
     }
 
     /**
-     * 基础系统,“注册”逻辑入口处理方法
+     * 基础系统,“手机注册”逻辑入口处理方法
      */
     @SuppressWarnings("rawtypes")
     @Override
@@ -122,7 +119,7 @@ public class A00003Service extends A00003BaseModel implements ExecProcessFlow {
         this.setTransMap(vars);
         preTransFlow();// 执行业务开始的规则检查和校验
         transExecute();// 执行核心业务段
-        afterTransFlow();// 执行核心逻辑完成后的收尾逻辑
+        afterTransFolw();// 执行核心逻辑完成后的收尾逻辑
         return this.getTransMap();
     }
 

系统设计/通信设计/通讯报文/system(系统服务)/报文体/A00003_A(注册).csv

@@ -1,5 +1,6 @@
 序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA
 1,userName,用户名,string,,,是,0,256,,,,,,
 2,password,密码,string,,,是,1,256,,,,,,
-3,mail,邮箱,string,,,是,1,512,,,,,,
-4,verificationCode,验证码,string,,,是,1,32,,,,,,
+3,mailOrPhone,邮箱或手机,string,,,是,1,512,,,,,,
+4,verificationCode,验证码,string,,,是,1,32,,,,,,
+5,channel,消息通道(1-手机 2-邮箱),string,,,是,1,16,,,,,,