娄梦宁
4 years ago
2 changed files with 103 additions and 98 deletions
Unified View
Diff Options
+ 7
- 2
application/admin/controller/user/User.php
View File
| @@ -97,15 +97,18 @@ class User extends Backend | |||||
| 'password', | 'password', | ||||
| 'email', | 'email', | ||||
| ]; | ]; | ||||
| $salt = \fast\Random::alnum(); | |||||
| for ($currentRow = 2; $currentRow <= $allRow; $currentRow++) { | for ($currentRow = 2; $currentRow <= $allRow; $currentRow++) { | ||||
| $values = []; | $values = []; | ||||
| $salt = \fast\Random::alnum(); | |||||
| for ($currentColumn = 1; $currentColumn <= 4; $currentColumn++) { | for ($currentColumn = 1; $currentColumn <= 4; $currentColumn++) { | ||||
| $val = $currentSheet->getCellByColumnAndRow($currentColumn, $currentRow)->getValue(); | $val = $currentSheet->getCellByColumnAndRow($currentColumn, $currentRow)->getValue(); | ||||
| if ($currentColumn==3){ | if ($currentColumn==3){ | ||||
| //修改的是密码 | //修改的是密码 | ||||
| $val= \app\common\library\Auth::instance()->getEncryptPassword($val, $salt); | $val= \app\common\library\Auth::instance()->getEncryptPassword($val, $salt); | ||||
| } | } | ||||
| if (!$val){ | |||||
| continue 2; | |||||
| } | |||||
| $values[] = is_null($val) ? '' : $val; | $values[] = is_null($val) ? '' : $val; | ||||
| } | } | ||||
| // $row = []; | // $row = []; | ||||
| @@ -118,7 +121,9 @@ class User extends Backend | |||||
| // print_r($temp); | // print_r($temp); | ||||
| // print_r($row); | // print_r($row); | ||||
| // if ($row) { | // if ($row) { | ||||
| $insert[] = $temp; | |||||
| $temp['status']="normal"; | |||||
| $temp['salt']=$salt; | |||||
| $insert[] = $temp; | |||||
| // } | // } | ||||
| } | } | ||||
| } catch (Exception $exception) { | } catch (Exception $exception) { | ||||
+ 96
- 96
application/admin/view/user/user/edit.html
View File
| @@ -1,11 +1,11 @@ | |||||
| <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action=""> | <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action=""> | ||||
| <div class="form-group"> | |||||
| <label for="c-group_id" class="control-label col-xs-12 col-sm-2">{:__('Group')}:</label> | |||||
| <div class="col-xs-12 col-sm-4"> | |||||
| {$groupList} | |||||
| </div> | |||||
| </div> | |||||
| <!-- <div class="form-group">--> | |||||
| <!-- <label for="c-group_id" class="control-label col-xs-12 col-sm-2">{:__('Group')}:</label>--> | |||||
| <!-- <div class="col-xs-12 col-sm-4">--> | |||||
| <!-- {$groupList}--> | |||||
| <!-- </div>--> | |||||
| <!-- </div>--> | |||||
| <div class="form-group"> | <div class="form-group"> | ||||
| <label for="c-username" class="control-label col-xs-12 col-sm-2">{:__('Username')}:</label> | <label for="c-username" class="control-label col-xs-12 col-sm-2">{:__('Username')}:</label> | ||||
| <div class="col-xs-12 col-sm-4"> | <div class="col-xs-12 col-sm-4"> | ||||
| @@ -30,12 +30,12 @@ | |||||
| <input id="c-email" data-rule="" class="form-control" name="row[email]" type="text" value="{$row.email|htmlentities}"> | <input id="c-email" data-rule="" class="form-control" name="row[email]" type="text" value="{$row.email|htmlentities}"> | ||||
| </div> | </div> | ||||
| </div> | </div> | ||||
| <div class="form-group"> | |||||
| <label for="c-mobile" class="control-label col-xs-12 col-sm-2">{:__('Mobile')}:</label> | |||||
| <div class="col-xs-12 col-sm-4"> | |||||
| <input id="c-mobile" data-rule="" class="form-control" name="row[mobile]" type="text" value="{$row.mobile|htmlentities}"> | |||||
| </div> | |||||
| </div> | |||||
| <!-- <div class="form-group">--> | |||||
| <!-- <label for="c-mobile" class="control-label col-xs-12 col-sm-2">{:__('Mobile')}:</label>--> | |||||
| <!-- <div class="col-xs-12 col-sm-4">--> | |||||
| <!-- <input id="c-mobile" data-rule="" class="form-control" name="row[mobile]" type="text" value="{$row.mobile|htmlentities}">--> | |||||
| <!-- </div>--> | |||||
| <!-- </div>--> | |||||
| <div class="form-group"> | <div class="form-group"> | ||||
| <label for="c-avatar" class="control-label col-xs-12 col-sm-2">{:__('Avatar')}:</label> | <label for="c-avatar" class="control-label col-xs-12 col-sm-2">{:__('Avatar')}:</label> | ||||
| <div class="col-xs-12 col-sm-8"> | <div class="col-xs-12 col-sm-8"> | ||||
| @@ -50,90 +50,90 @@ | |||||
| <ul class="row list-inline plupload-preview" id="p-avatar"></ul> | <ul class="row list-inline plupload-preview" id="p-avatar"></ul> | ||||
| </div> | </div> | ||||
| </div> | </div> | ||||
| <div class="form-group"> | |||||
| <label for="c-level" class="control-label col-xs-12 col-sm-2">{:__('Level')}:</label> | |||||
| <div class="col-xs-12 col-sm-4"> | |||||
| <input id="c-level" data-rule="required" class="form-control" name="row[level]" type="number" value="{$row.level}"> | |||||
| </div> | |||||
| </div> | |||||
| <div class="form-group"> | |||||
| <label for="c-gender" class="control-label col-xs-12 col-sm-2">{:__('Gender')}:</label> | |||||
| <div class="col-xs-12 col-sm-8"> | |||||
| {:build_radios('row[gender]', ['1'=>__('Male'), '0'=>__('Female')], $row['gender'])} | |||||
| </div> | |||||
| </div> | |||||
| <div class="form-group"> | |||||
| <label for="c-birthday" class="control-label col-xs-12 col-sm-2">{:__('Birthday')}:</label> | |||||
| <div class="col-xs-12 col-sm-4"> | |||||
| <input id="c-birthday" data-rule="" class="form-control datetimepicker" data-date-format="YYYY-MM-DD" data-use-current="true" name="row[birthday]" type="text" value="{$row.birthday}"> | |||||
| </div> | |||||
| </div> | |||||
| <div class="form-group"> | |||||
| <label for="c-bio" class="control-label col-xs-12 col-sm-2">{:__('Bio')}:</label> | |||||
| <div class="col-xs-12 col-sm-8"> | |||||
| <input id="c-bio" data-rule="" class="form-control" name="row[bio]" type="text" value="{$row.bio|htmlentities}"> | |||||
| </div> | |||||
| </div> | |||||
| <div class="form-group"> | |||||
| <label for="c-money" class="control-label col-xs-12 col-sm-2">{:__('Money')}:</label> | |||||
| <div class="col-xs-12 col-sm-4"> | |||||
| <input id="c-money" data-rule="required" class="form-control" name="row[money]" type="number" value="{$row.money}"> | |||||
| </div> | |||||
| </div> | |||||
| <div class="form-group"> | |||||
| <label for="c-score" class="control-label col-xs-12 col-sm-2">{:__('Score')}:</label> | |||||
| <div class="col-xs-12 col-sm-4"> | |||||
| <input id="c-score" data-rule="required" class="form-control" name="row[score]" type="number" value="{$row.score}"> | |||||
| </div> | |||||
| </div> | |||||
| <div class="form-group"> | |||||
| <label for="c-successions" class="control-label col-xs-12 col-sm-2">{:__('Successions')}:</label> | |||||
| <div class="col-xs-12 col-sm-4"> | |||||
| <input id="c-successions" data-rule="required" class="form-control" name="row[successions]" type="number" value="{$row.successions}"> | |||||
| </div> | |||||
| </div> | |||||
| <div class="form-group"> | |||||
| <label for="c-maxsuccessions" class="control-label col-xs-12 col-sm-2">{:__('Maxsuccessions')}:</label> | |||||
| <div class="col-xs-12 col-sm-4"> | |||||
| <input id="c-maxsuccessions" data-rule="required" class="form-control" name="row[maxsuccessions]" type="number" value="{$row.maxsuccessions}"> | |||||
| </div> | |||||
| </div> | |||||
| <div class="form-group"> | |||||
| <label for="c-prevtime" class="control-label col-xs-12 col-sm-2">{:__('Prevtime')}:</label> | |||||
| <div class="col-xs-12 col-sm-4"> | |||||
| <input id="c-prevtime" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[prevtime]" type="text" value="{$row.prevtime|datetime}"> | |||||
| </div> | |||||
| </div> | |||||
| <div class="form-group"> | |||||
| <label for="c-logintime" class="control-label col-xs-12 col-sm-2">{:__('Logintime')}:</label> | |||||
| <div class="col-xs-12 col-sm-4"> | |||||
| <input id="c-logintime" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[logintime]" type="text" value="{$row.logintime|datetime}"> | |||||
| </div> | |||||
| </div> | |||||
| <div class="form-group"> | |||||
| <label for="c-loginip" class="control-label col-xs-12 col-sm-2">{:__('Loginip')}:</label> | |||||
| <div class="col-xs-12 col-sm-4"> | |||||
| <input id="c-loginip" data-rule="required" class="form-control" name="row[loginip]" type="text" value="{$row.loginip}"> | |||||
| </div> | |||||
| </div> | |||||
| <div class="form-group"> | |||||
| <label for="c-loginfailure" class="control-label col-xs-12 col-sm-2">{:__('Loginfailure')}:</label> | |||||
| <div class="col-xs-12 col-sm-4"> | |||||
| <input id="c-loginfailure" data-rule="required" class="form-control" name="row[loginfailure]" type="number" value="{$row.loginfailure}"> | |||||
| </div> | |||||
| </div> | |||||
| <div class="form-group"> | |||||
| <label for="c-joinip" class="control-label col-xs-12 col-sm-2">{:__('Joinip')}:</label> | |||||
| <div class="col-xs-12 col-sm-4"> | |||||
| <input id="c-joinip" data-rule="required" class="form-control" name="row[joinip]" type="text" value="{$row.joinip}"> | |||||
| </div> | |||||
| </div> | |||||
| <div class="form-group"> | |||||
| <label for="c-jointime" class="control-label col-xs-12 col-sm-2">{:__('Jointime')}:</label> | |||||
| <div class="col-xs-12 col-sm-4"> | |||||
| <input id="c-jointime" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[jointime]" type="text" value="{$row.jointime|datetime}"> | |||||
| </div> | |||||
| </div> | |||||
| <!-- <div class="form-group">--> | |||||
| <!-- <label for="c-level" class="control-label col-xs-12 col-sm-2">{:__('Level')}:</label>--> | |||||
| <!-- <div class="col-xs-12 col-sm-4">--> | |||||
| <!-- <input id="c-level" data-rule="required" class="form-control" name="row[level]" type="number" value="{$row.level}">--> | |||||
| <!-- </div>--> | |||||
| <!-- </div>--> | |||||
| <!-- <div class="form-group">--> | |||||
| <!-- <label for="c-gender" class="control-label col-xs-12 col-sm-2">{:__('Gender')}:</label>--> | |||||
| <!-- <div class="col-xs-12 col-sm-8">--> | |||||
| <!-- {:build_radios('row[gender]', ['1'=>__('Male'), '0'=>__('Female')], $row['gender'])}--> | |||||
| <!-- </div>--> | |||||
| <!-- </div>--> | |||||
| <!-- <div class="form-group">--> | |||||
| <!-- <label for="c-birthday" class="control-label col-xs-12 col-sm-2">{:__('Birthday')}:</label>--> | |||||
| <!-- <div class="col-xs-12 col-sm-4">--> | |||||
| <!-- <input id="c-birthday" data-rule="" class="form-control datetimepicker" data-date-format="YYYY-MM-DD" data-use-current="true" name="row[birthday]" type="text" value="{$row.birthday}">--> | |||||
| <!-- </div>--> | |||||
| <!-- </div>--> | |||||
| <!-- <div class="form-group">--> | |||||
| <!-- <label for="c-bio" class="control-label col-xs-12 col-sm-2">{:__('Bio')}:</label>--> | |||||
| <!-- <div class="col-xs-12 col-sm-8">--> | |||||
| <!-- <input id="c-bio" data-rule="" class="form-control" name="row[bio]" type="text" value="{$row.bio|htmlentities}">--> | |||||
| <!-- </div>--> | |||||
| <!-- </div>--> | |||||
| <!-- <div class="form-group">--> | |||||
| <!-- <label for="c-money" class="control-label col-xs-12 col-sm-2">{:__('Money')}:</label>--> | |||||
| <!-- <div class="col-xs-12 col-sm-4">--> | |||||
| <!-- <input id="c-money" data-rule="required" class="form-control" name="row[money]" type="number" value="{$row.money}">--> | |||||
| <!-- </div>--> | |||||
| <!-- </div>--> | |||||
| <!-- <div class="form-group">--> | |||||
| <!-- <label for="c-score" class="control-label col-xs-12 col-sm-2">{:__('Score')}:</label>--> | |||||
| <!-- <div class="col-xs-12 col-sm-4">--> | |||||
| <!-- <input id="c-score" data-rule="required" class="form-control" name="row[score]" type="number" value="{$row.score}">--> | |||||
| <!-- </div>--> | |||||
| <!-- </div>--> | |||||
| <!-- <div class="form-group">--> | |||||
| <!-- <label for="c-successions" class="control-label col-xs-12 col-sm-2">{:__('Successions')}:</label>--> | |||||
| <!-- <div class="col-xs-12 col-sm-4">--> | |||||
| <!-- <input id="c-successions" data-rule="required" class="form-control" name="row[successions]" type="number" value="{$row.successions}">--> | |||||
| <!-- </div>--> | |||||
| <!-- </div>--> | |||||
| <!-- <div class="form-group">--> | |||||
| <!-- <label for="c-maxsuccessions" class="control-label col-xs-12 col-sm-2">{:__('Maxsuccessions')}:</label>--> | |||||
| <!-- <div class="col-xs-12 col-sm-4">--> | |||||
| <!-- <input id="c-maxsuccessions" data-rule="required" class="form-control" name="row[maxsuccessions]" type="number" value="{$row.maxsuccessions}">--> | |||||
| <!-- </div>--> | |||||
| <!-- </div>--> | |||||
| <!-- <div class="form-group">--> | |||||
| <!-- <label for="c-prevtime" class="control-label col-xs-12 col-sm-2">{:__('Prevtime')}:</label>--> | |||||
| <!-- <div class="col-xs-12 col-sm-4">--> | |||||
| <!-- <input id="c-prevtime" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[prevtime]" type="text" value="{$row.prevtime|datetime}">--> | |||||
| <!-- </div>--> | |||||
| <!-- </div>--> | |||||
| <!-- <div class="form-group">--> | |||||
| <!-- <label for="c-logintime" class="control-label col-xs-12 col-sm-2">{:__('Logintime')}:</label>--> | |||||
| <!-- <div class="col-xs-12 col-sm-4">--> | |||||
| <!-- <input id="c-logintime" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[logintime]" type="text" value="{$row.logintime|datetime}">--> | |||||
| <!-- </div>--> | |||||
| <!-- </div>--> | |||||
| <!-- <div class="form-group">--> | |||||
| <!-- <label for="c-loginip" class="control-label col-xs-12 col-sm-2">{:__('Loginip')}:</label>--> | |||||
| <!-- <div class="col-xs-12 col-sm-4">--> | |||||
| <!-- <input id="c-loginip" data-rule="required" class="form-control" name="row[loginip]" type="text" value="{$row.loginip}">--> | |||||
| <!-- </div>--> | |||||
| <!-- </div>--> | |||||
| <!-- <div class="form-group">--> | |||||
| <!-- <label for="c-loginfailure" class="control-label col-xs-12 col-sm-2">{:__('Loginfailure')}:</label>--> | |||||
| <!-- <div class="col-xs-12 col-sm-4">--> | |||||
| <!-- <input id="c-loginfailure" data-rule="required" class="form-control" name="row[loginfailure]" type="number" value="{$row.loginfailure}">--> | |||||
| <!-- </div>--> | |||||
| <!-- </div>--> | |||||
| <!-- <div class="form-group">--> | |||||
| <!-- <label for="c-joinip" class="control-label col-xs-12 col-sm-2">{:__('Joinip')}:</label>--> | |||||
| <!-- <div class="col-xs-12 col-sm-4">--> | |||||
| <!-- <input id="c-joinip" data-rule="required" class="form-control" name="row[joinip]" type="text" value="{$row.joinip}">--> | |||||
| <!-- </div>--> | |||||
| <!-- </div>--> | |||||
| <!-- <div class="form-group">--> | |||||
| <!-- <label for="c-jointime" class="control-label col-xs-12 col-sm-2">{:__('Jointime')}:</label>--> | |||||
| <!-- <div class="col-xs-12 col-sm-4">--> | |||||
| <!-- <input id="c-jointime" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[jointime]" type="text" value="{$row.jointime|datetime}">--> | |||||
| <!-- </div>--> | |||||
| <!-- </div>--> | |||||
| <div class="form-group"> | <div class="form-group"> | ||||
| <label for="content" class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label> | <label for="content" class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label> | ||||
| <div class="col-xs-12 col-sm-8"> | <div class="col-xs-12 col-sm-8"> | ||||