账号注册及代码整理

src/dsb/com/cnd3b/common/parameter/parameter.java

@@ -40,13 +40,13 @@ public class parameter {
     public static HashMap<String, Date> changephonenumber_date = new HashMap<>(16);
 
     /**
-     * 忘记密码-账号、验证码
+     * 账号注册验证码
      */
-    public static HashMap<String, String> forgetpassword_passwordmap = new HashMap<>(16);
+    public static HashMap<String, String> register_passwordmap = new HashMap<>(16);
     /**
-     * 忘记密码-验证码、有效期
+     *账号注册验证码、有效期
      */
-    public static HashMap<String, Date> forgetpassword_date = new HashMap<>(16);
+    public static HashMap<String, Date> registerpassword_date = new HashMap<>(16);
 
 
     /**

src/dsb/com/cnd3b/restcontroller/publicmethod/users/Users.java

@@ -21,159 +21,87 @@ public class Users extends Controller {
     }
 
     /**
-     * 二级推广人角色创建
+     * 个人账号注册
      *
      * @return
      */
-    public String register_promoters() throws D3bException, P2Exception {
-        String fphonenumber = content.getString("fphonenumber", "tenterprise_users.fphonenumber", "手机号");
-        String fname = "匿名";
-        if (content.containsKey(fname)) {
-            fname = content.getString("fname", "tenterprise_users.fname", "姓名");
-        }
-        PaoSetRemote tenterprise_users = getP2ServerSystemPaoSet("tenterprise_users", "fphonenumber='" + fphonenumber + "' and siteid='PROMOTERS'");
-        if (tenterprise_users.isEmpty()) {
-            PaoRemote pao = tenterprise_users.addAtEnd();
-            pao.setValue("siteid", "PROMOTERS", 11L);
-            pao.setValue("fphonenumber", fphonenumber, 11L);
-            pao.setValue("fname", fname, 11L);
-            pao.setValue("fusertype", "推广人", 11L);
-            tenterprise_users.save();
-        } else {
-            return getErrReturnObject().setErrMsg("该手机号已注册").toString();
-        }
-        WebClientRest rest = new WebClientRest();
-        String password = rest.createPassWord();
-        parameter.phonenumber_password.put(fphonenumber, password);
-        Calendar calendar = Calendar.getInstance();
-        calendar.add(Calendar.MINUTE, 30000000);
-        parameter.phonenumber_date.put(fphonenumber, calendar.getTime());
-
-        JSONObject object = new JSONObject();
-        object.put("phonenumber", fphonenumber);
-        object.put("password", new Encryption().Encode_MD5(password));
-
-        return rest.login(object.toJSONString());
-    }
-
-    /**
-     * 独立经销商角色创建
-     *
-     * @return
-     */
-    public String register_agents() throws D3bException, P2Exception {
-        String fagentname = content.getString("fagentname", "tagents.fagentname", "店铺名称");//店铺名、公司名
-        String fname = content.getString("fname", "tagents.fname", "姓名");//姓名
+    public String register_users() throws D3bException, P2Exception {
+        String fpassword = content.getString("fpassword");//验证码
         String fphonenumber = content.getString("fphonenumber", "tagents.fphonenumber", "手机号");//手机号
-        String fprovince = content.getString("fprovince");//省
-        String fcity = content.getString("fcity");//市
-        String fcounty = content.getString("fcounty");//县
-        String faddress = content.getString("faddress", "tagents.faddress", "店铺地址");//地址
-        //String fsex = content.getString("fsex");
-        //String fbirthdate = content.getString("fbirthdate");
-        //String femail = content.getString("femail");
-        //String fwechatno = content.getString("fwechatno");
 
-        PaoSetRemote tagentsSet = getP2ServerSystemPaoSet("tagents", "fphonenumber='" + fphonenumber + "' and siteid='AGENTS' and fagentname='" + fagentname + "'");
-        if (!tagentsSet.isEmpty()) {
-            return getErrReturnObject().setErrMsg("商家名称不能重复").toString();
+        int resultcode;
+        if (!parameter.register_passwordmap.containsKey(fphonenumber)) {
+            resultcode = 1;//没有获取验证码
+        } else if (parameter.registerpassword_date.get(fphonenumber).before(Calendar.getInstance().getTime())) {
+            resultcode = 2;//验证码已失效
+        } else {
+            //系统验证码
+            String syspassword = parameter.register_passwordmap.get(fphonenumber);
+            if (fpassword.equals(new Encryption().Encode_MD5(syspassword))) {
+                resultcode = 0;//验证码正确
+            } else {
+                resultcode = 3;//验证码错误
+            }
         }
-        PaoRemote tagents = tagentsSet.addAtEnd();
-        tagents.setValue("siteid", "AGENTS", 11L);//企业ID
-        tagents.setValue("createdate", getDateTime(), 11L);//录入时间
-        tagents.setValue("fagentname", fagentname, 11L);
-        tagents.setValue("fagentshortname", fagentname, 11L);
-        tagents.setValue("faddress", faddress, 11L);
-        tagents.setValue("fcontact", fname, 11L);
-        tagents.setValue("fphonenumber", fphonenumber, 11L);
-        tagents.setValue("fprovince", fprovince, 11L);
-        tagents.setValue("fcity", fcity, 11L);
-        tagents.setValue("fcounty", fcounty, 11L);
-        tagents.setValue("fjoindate", getDateTime(), 11L);
-
-        PaoSetRemote tenterprise_users = tagents.getPaoSet("tenterprise_users");
-        PaoRemote tenterprise_user = tenterprise_users.addAtEnd();
-        tenterprise_user.setValue("fisadministrator", true, 11L);
-        tenterprise_user.setValue("frole", "管理员", 11L);
-        tenterprise_user.setValue("fname", fname, 11L);
-        tenterprise_user.setValue("fphonenumber", fphonenumber, 11L);
-        //tenterprise_user.setValue("fbirthdate", fbirthdate, 11L);
-        //tenterprise_user.setValue("femail", femail, 11L);
-        //tenterprise_user.setValue("fwechatno", fwechatno, 11L);
-        //tenterprise_user.setValue("fsex", fsex, 11L);
-        tagentsSet.save();
-
-        WebClientRest rest = new WebClientRest();
-        String password = rest.createPassWord();
-        parameter.phonenumber_password.put(fphonenumber, password);
-        Calendar calendar = Calendar.getInstance();
-        calendar.add(Calendar.MINUTE, 30000000);
-        parameter.phonenumber_date.put(fphonenumber, calendar.getTime());
-
-        JSONObject object = new JSONObject();
-        object.put("phonenumber", fphonenumber);
-        object.put("password", new Encryption().Encode_MD5(password));
+        if (resultcode == 0) {
+            PaoSetRemote tagentsSet = getP2ServerSystemPaoSet("tagents");
+            PaoRemote tagents = tagentsSet.addAtEnd();
+            tagents.setValue("siteid", "BWJ", 11L);//企业ID
+            tagents.setValue("createdate", getDateTime(), 11L);//录入时间
+            tagents.setValue("fphonenumber", fphonenumber, 11L);
+            tagents.setValue("fjoindate", getDateTime(), 11L);
+            tagents.setValue("ftype","个人", 11L);
+            tagentsSet.save();
+
+            WebClientRest rest = new WebClientRest();
+            String password = rest.createPassWord();
+            parameter.phonenumber_password.put(fphonenumber, password);
+            Calendar calendar = Calendar.getInstance();
+            calendar.add(Calendar.MINUTE, 30000000);
+            parameter.phonenumber_date.put(fphonenumber, calendar.getTime());
 
-        return rest.login(object.toJSONString());
-    }
+            JSONObject object = new JSONObject();
+            object.put("phonenumber", fphonenumber);
+            object.put("password", new Encryption().Encode_MD5(password));
 
-    /**
-     * @return
-     */
-    public String getUserMsgByShortCode() {
-        String fshortcode = content.getString("fshortcode");
-        Rows rows = dbConnect.runSqlQuery("select t1.tenterprise_userid,t1.fname,t2.tagentsid,t2.fagentname from tenterprise_users t1 inner join tagents t2 on t1.siteid=t2.siteid and t1.tagentsid=t2.tagentsid where t1.fshortcode='" + fshortcode + "'");
-        if (!rows.isEmpty()) {
-            return getSucReturnObject().setData(rows).toString();
+            parameter.register_passwordmap.remove(fphonenumber);
+            parameter.registerpassword_date.remove(fphonenumber);
+            return rest.login(object.toJSONString());
         } else {
-            return getErrReturnObject().setErrMsg("找不到唯一的邀请人信息").toString();
+            String msg = "";
+            if (resultcode == 1) {
+                msg = "请先获取验证码！";
+            } else if (resultcode == 2) {
+                msg = "验证码已失效，请重新获取！";
+            } else if (resultcode == 3) {
+                msg = "无效的验证码！";
+            }
+            return getErrReturnObject().setErrMsg(msg).toString();
         }
     }
 
     /**
-     * 忘记密码验证码获取
+     * 注册验证码获取
      *
      * @return
      */
-    public String getForgetPassword() {
-        String faccountno = content.getString("faccountno");//登录账号
-        if (faccountno.length() > 9) {
-            JSONObject object = new JSONObject();
-            object.put("code", 1);
-            object.put("msg", "请输入正确的账号信息");
-            return object.toString();
-        }
-        Rows rows = dbConnect.runSqlQuery("select isnull(fphonenumber,'') as fphonenumber from tenterprise_users where faccountno='" + faccountno + "'");
-        if (rows.size() != 1) {
-            JSONObject object = new JSONObject();
-            object.put("code", 1);
-            object.put("msg", "不存在当前账号信息");
-            return object.toString();
-        }
-        String phonenumber = rows.get(0).getString("fphonenumber");
-        if ("".equals(phonenumber)) {
-            JSONObject object = new JSONObject();
-            object.put("code", 1);
-            object.put("msg", "当前账号没有绑定手机号，无法进行密码重置");
-            return object.toString();
+    public String getPassword() throws D3bException, P2Exception {
+        String fphonenumber = content.getString("fphonenumber");//注册手机号
+        PaoSetRemote tagentsSet = getP2ServerSystemPaoSet("tagents", "fphonenumber='" + fphonenumber + "' and siteid='BWJ'");
+        if (!tagentsSet.isEmpty()) {
+            return getErrReturnObject().setErrMsg("该手机号已注册！").toString();
         }
         String password = createPassWord();
-        parameter.forgetpassword_passwordmap.put(faccountno, password);
+        parameter.register_passwordmap.put(fphonenumber, password);
         Calendar calendar = Calendar.getInstance();
         calendar.add(Calendar.MINUTE, 5);
-        parameter.forgetpassword_date.put(faccountno, calendar.getTime());
+        parameter.registerpassword_date.put(fphonenumber, calendar.getTime());
         if (parameter.isdebug()) {
-            JSONObject object = new JSONObject();
-            object.put("code", 1);
-            object.put("msg", "验证码：" + password);
-            return object.toString();
+            return getSucReturnObject().setData("验证码：" + password).toString();
         } else {
-            JSONObject object = new JSONObject();
             Sms sms = new Sms();
-            sms.sendOutMsg(phonenumber, password);
-            object.put("code", 1);
-            object.put("msg", "验证码已发送，请注意查收！");
-            return object.toString();
+            sms.sendOutMsg(fphonenumber, password);
+            return getSucReturnObject().setData("验证码已发送，请注意查收！").toString();
         }
     }
 
@@ -184,59 +112,10 @@ public class Users extends Controller {
         for (int i = 0; i < 6; i++) {
             sb.append(allChar.charAt(random.nextInt(allChar.length())));
         }
-        if (parameter.forgetpassword_passwordmap.containsValue(sb.toString())) {
+        if (parameter.register_passwordmap.containsValue(sb.toString())) {
             return createPassWord();
         } else {
             return sb.toString();
         }
     }
-
-    /**
-     * 忘记密码修改验证码
-     *
-     * @return
-     */
-    public String changePassWord() throws P2Exception {
-        String password = content.getString("password");//手机短信验证码，md5加密
-        String newpassword = content.getString("newpassword");//账号新密码，md5加密
-        String faccountno = content.getString("faccountno");//登录账号
-
-        int resultcode;
-        if (!parameter.forgetpassword_passwordmap.containsKey(faccountno)) {
-            resultcode = 1;//没有获取验证码
-        } else if (parameter.forgetpassword_date.get(faccountno).before(Calendar.getInstance().getTime())) {
-            resultcode = 2;//验证码已失效
-        } else {
-            //系统验证码
-            String syspassword = parameter.forgetpassword_passwordmap.get(faccountno);
-            if (password.equals(new Encryption().Encode_MD5(syspassword))) {
-                resultcode = 0;//验证码正确
-            } else {
-                resultcode = 3;//验证码错误
-            }
-        }
-        if (resultcode == 0) {
-            PaoSetRemote tenterprise_usersSet = getP2ServerSystemPaoSet("tenterprise_users", "faccountno='" + faccountno + "'");
-            if (!tenterprise_usersSet.isEmpty()) {
-                tenterprise_usersSet.getPao(0).setValue("fpassword", newpassword, 11L);
-                tenterprise_usersSet.save();
-            } else {
-                return getErrReturnObject().setErrMsg("找不到当前账号信息").toString();
-            }
-            return getSucReturnObject().toString();
-        } else {
-            String msg = "";
-            if (resultcode == 1) {
-                msg = "请先获取验证码！";
-            } else if (resultcode == 2) {
-                msg = "验证码已失效，请重新获取！";
-            } else if (resultcode == 3) {
-                msg = "无效的验证码！";
-            }
-            JSONObject object = new JSONObject();
-            object.put("code", 0);
-            object.put("msg", msg);
-            return object.toString();
-        }
-    }
 }

src/dsb/com/cnd3b/restcontroller/system/users/Users.java

@@ -22,22 +22,6 @@ public class Users extends Controller {
         super(content);
     }
 
-    public String changePassWord() throws P2Exception {
-        String password = content.getString("password");//前端进行md5加密
-        String newpassword = content.getString("newpassword");//前端进行md5加密
-        if (password.equals(newpassword)) {
-            return getErrReturnObject().setErrMsg("新密码和原密码不可相同").toString();
-        }
-
-        PaoSetRemote tenterprise_usersSet = getP2ServerSystemPaoSet("tenterprise_users", "tenterprise_userid='" + userid + "' and siteid='" + siteid + "' and fpassword='" + password + "'");
-        if (!tenterprise_usersSet.isEmpty()) {
-            tenterprise_usersSet.getPao(0).setValue("fpassword", newpassword, 11L);
-            tenterprise_usersSet.save();
-        } else {
-            return getErrReturnObject().setErrMsg("用户名密码错误").toString();
-        }
-        return getSucReturnObject().toString();
-    }
 
     public String getChangePhonenumberPassword() {
         String phonenumber = content.getString("newphonenumber");
@@ -102,11 +86,13 @@ public class Users extends Controller {
         if (resultcode == 0) {
             PaoSetRemote tenterprise_usersSet = getP2ServerSystemPaoSet("tenterprise_users", "tenterprise_userid='" + userid + "' and siteid='" + siteid + "'");
             if (!tenterprise_usersSet.isEmpty()) {
-                tenterprise_usersSet.getPao(0).setValue("fphonenumber", fphonenumber, 11L);
+                tenterprise_usersSet.getPao(0).setValue("fphonenumber", phonenumber, 11L);
                 tenterprise_usersSet.save();
             } else {
                 return getErrReturnObject().setErrMsg("找不到当前账号信息").toString();
             }
+            parameter.changephonenumber_passwordmap.remove(phonenumber);
+            parameter.changephonenumber_date.remove(phonenumber);
             return getSucReturnObject().toString();
         } else {
             String msg = "";
@@ -124,7 +110,6 @@ public class Users extends Controller {
         }
     }
 
-
     /**
      * 下级用户查询，只返回下属一级
      *
@@ -137,5 +122,4 @@ public class Users extends Controller {
         Rows rows = getSubUserRows();
         return getSucReturnObject().setDataByPaging(rows).setFinalDo(DataPool.defaultdatalife, 1);
     }
-
 }

src/p2apps/p2/application/tagents/tagents.java

@@ -1,7 +1,9 @@
 package p2.application.tagents;
 
 import baseclass.PaoCust;
+import p2.pao.PaoRemote;
 import p2.pao.PaoSet;
+import p2.pao.PaoSetRemote;
 import p2.util.P2Exception;
 
 public class tagents extends PaoCust {
@@ -17,5 +19,16 @@ public class tagents extends PaoCust {
     @Override
     protected void save() throws P2Exception {
         super.save();
+        PaoSetRemote tenterprise_users = getPaoSet("tenterprise_users");
+        if (tenterprise_users.isEmpty()) {
+            PaoRemote tenterprise_user = tenterprise_users.addAtEnd();
+            tenterprise_user.setValue("fisadministrator", true, 11L);
+            tenterprise_user.setValue("frole", "¹ÜÀíÔ±", 11L);
+            tenterprise_user.setValue("fname", getString("fcontact"), 11L);
+            tenterprise_user.setValue("fphonenumber", getString("fphonenumber"), 11L);
+            tenterprise_user.setValue("fbirthdate", getString("fbirthdate"), 11L);
+            tenterprise_user.setValue("femail", getString("femail"), 11L);
+            tenterprise_user.setValue("fwechatno", getString("fwechatno"), 11L);
+        }
     }
 }

src/p2apps/p2/application/tenterprise_users/tenterprise_users.java

@@ -24,14 +24,9 @@ public class tenterprise_users extends PaoCust {
             setValue("tagentsid", getOwner().getUniqueIDValue(), 11L);
             setValue("fusertype", "经销商", 11L);
         } else if (getOwner() instanceof tenterprise) {
-            if ("PROMOTERS".equals(getString("siteid"))) {
-                setValue("fusertype", "推广人", 11L);
-            } else {
-                setValue("fusertype", "企业", 11L);
-            }
+            setValue("fusertype", "企业", 11L);
         }
         setValue("faccountno", createAccount());
-        //setValue("fshortcode", createShortCode());//简码（邀请码）
     }
 
     @Override
@@ -45,7 +40,7 @@ public class tenterprise_users extends PaoCust {
     private long createAccount() {
         if (maxAccount == 0) {
             DBConnect dbConnect = new DBConnect();
-            Row rows = dbConnect.runSqlQuery(0,"select convert(bigint,isnull(max(faccountno),100001)) as faccountno from tenterprise_users");
+            Row rows = dbConnect.runSqlQuery(0, "select convert(bigint,isnull(max(faccountno),100001)) as faccountno from tenterprise_users");
 
             maxAccount = rows.getLong("faccountno");