l

application/Admin/command/Test.php

@@ -35,7 +35,7 @@ class Test extends Command
 //        }
 
         while ($username<=1745219999){
-            Db::startTrans();
+          //  Db::startTrans();
             $pasword = randomkeys(2).rand(1000,9999);
               $salt = makeSalt();
                 $pas = sha1($pasword.$salt);
@@ -52,31 +52,32 @@ class Test extends Command
                     "updatetime"=>date("Y-m-d H:i:s")
                 ];
                 $acccount = Db::name("account")->insert($data,false,true);
-                if($acccount>0){
-                    $user=[
-                        "nickname"=>$username,
-                        "mobile"=>"",
-                        "avatar"=>"",
-                        "remark"=>"",
-                        "sex"=>"",
-                        "addtime"=>date("Y-m-d H:i:s"),
-                        "updatetime"=>date("Y-m-d H:i:s")
-                    ];
-                    $info = Db::name("account_info")->insert($user,false,true);
-                    if($info>0){
-                        $rela=["accountid"=>$acccount,"account_info"=>$info];
-                        $rela_acc=Db::name("rela_account")->insert($rela);
-                        if($rela_acc){
-                            write_log("账户{$username}新建成功","","account","add");
-                            Db::commit();
-                            $username++;
-                            continue;
-                        }
-
-                    }
-                }
-                Db::rollback();
-                break;
+            $username++;
+//                if($acccount>0){
+//                    $user=[
+//                        "nickname"=>$username,
+//                        "mobile"=>"",
+//                        "avatar"=>"",
+//                        "remark"=>"",
+//                        "sex"=>"",
+//                        "addtime"=>date("Y-m-d H:i:s"),
+//                        "updatetime"=>date("Y-m-d H:i:s")
+//                    ];
+//                    $info = Db::name("account_info")->insert($user,false,true);
+//                    if($info>0){
+//                        $rela=["accountid"=>$acccount,"account_info"=>$info];
+//                        $rela_acc=Db::name("rela_account")->insert($rela);
+//                        if($rela_acc){
+//                            write_log("账户{$username}新建成功","","account","add");
+//                            Db::commit();
+//                            $username++;
+//                            continue;
+//                        }
+//
+//                    }
+//                }
+//                Db::rollback();
+//                break;
         }
 
     }

application/Admin/controller/Account.php

@@ -272,13 +272,14 @@ class Account extends Base
             }
             $info['username'] = $username;
         }
+//
+//       $pasword = isset($this->post['password']) && $this->post['password'] !== "" ? trim($this->post['password']) : "";
+//        if ($pasword != "" && $info['password'] != sha1($pasword.$info['salt'])) {
+//            $salt = makeSalt();
+//            $info['password'] = sha1($pasword . $salt);
+//            $info['pwd'] = $pasword;
+//        }
 
-        $pasword =  isset($this->post['password'])&&$this->post['password']!=="" ? trim($this->post['password']) :"";
-        if($pasword!="" && $info['password']!=sha1($pasword.$info['salt'])){
-           $salt=makeSalt();
-           $info['password']=sha1($pasword.$salt);
-           $info['pwd']=$pasword;
-        }
         $starttime = isset($this->post['starttime']) && $this->post['starttime'] !== "" ? $this->post['starttime'] : "";
         if ($starttime != "") {
             $info['starttime'] = $starttime;
@@ -297,7 +298,11 @@ class Account extends Base
 
         $rela = Db::name("account_info")->alias("a")->Join("fc_rela_account b", "b.account_info=a.id", "left")->where(["b.accountid" => $id])->field("a.*")->find();
         $nickname = isset($this->post['nickname']) && $this->post['nickname'] !== "" ? trim($this->post['nickname']) : "";
+<<<<<<< HEAD
          $rela['nickname'] = $nickname;
+=======
+        $rela['nickname'] = $nickname;
+>>>>>>> 6e4f0daf9ece1b32b9964d393229cc15f335dfaa
         $mobile = isset($this->post['mobile']) && $this->post['mobile'] !== "" ? trim($this->post['mobile']) : "";
         if ($mobile != "") {
             $rela['mobile'] = $mobile;

application/common.php

@@ -87,7 +87,7 @@ function makeNo($str){
 }
 function randomkeys($length) {
     $returnStr='';
-    $pattern = '1234567890abcdefghijklmnopqrstuvwxyz';//ABCDEFGHIJKLOMNOPQRSTUVWXYZ
+    $pattern = 'abcdefghijklmnopqrstuvwxyz';//ABCDEFGHIJKLOMNOPQRSTUVWXYZ
 
     for($i = 0; $i < $length; $i ++) {
         $returnStr .= $pattern[mt_rand ( 0, strlen($pattern)-1 )]; //生成php随机数