admin

application/admin/controller/auth/Proxy.php

@@ -194,7 +194,7 @@ class Proxy extends Backend
                     //这里需要针对username和email做唯一验证
                     $adminValidate = \think\Loader::validate('Admin');
                     $adminValidate->rule([
-                        'username' => 'require|regex:\w{3,12}|unique:admin,username,' . $row->id,
+                        'username' => 'require|regex:\w{3,20}|unique:admin,username,' . $row->id,
                         'email'    => 'require|email|unique:admin,email,' . $row->id,
                         'password' => 'regex:\S{32}',
                     ]);

application/admin/controller/auth/Sub.php

@@ -130,7 +130,7 @@ class Sub extends Backend
                     $params['salt'] = Random::alnum();
                     $params['sub'] = 1;
                     $params['proxy'] = 0;
-                    $params['avatar'] = $params['avatar']?$params['avatar']:'/assets/img/avatar.png'; //设置新管理员默认头像。
+                    $params['avatar'] = isset($params['avatar'])?$params['avatar']:'/assets/img/avatar.png'; //设置新管理员默认头像。
 
                     $result = $this->model->validate('Admin.subAdd')->save($params);
                     if ($result === false) {
@@ -191,7 +191,7 @@ class Sub extends Backend
                     //这里需要针对username和email做唯一验证
                     $adminValidate = \think\Loader::validate('Admin');
                     $adminValidate->rule([
-                        'username' => 'require|regex:\w{3,12}|unique:admin,username,' . $row->id,
+                        'username' => 'require|regex:\w{3,20}|unique:admin,username,' . $row->id,
                         'email'    => 'require|email|unique:admin,email,' . $row->id,
                         'password' => 'regex:\S{32}',
                     ]);

application/admin/validate/Admin.php

@@ -11,7 +11,7 @@ class Admin extends Validate
      * 验证规则
      */
     protected $rule = [
-        'username' => 'require|regex:\w{3,12}|unique:admin',
+        'username' => 'require|regex:\w{3,20}|unique:admin',
         'nickname' => 'require',
         'password' => 'require|regex:\S{32}',
         //'com_mobile|联系人电话' => 'require|integer|unique:admin',

application/admin/view/auth/proxy/add.html

@@ -3,7 +3,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Group')}:</label>
         <div class="col-xs-12 col-sm-8">
-            {:build_select('group[]', $groupdata, null, ['class'=>'form-control selectpicker', 'multiple'=>'', 'data-rule'=>'required'])}
+            {:build_select('group[]', $groupdata, config('site.proxy_auth_group_id'), ['class'=>'form-control selectpicker', 'multiple'=>'', 'data-rule'=>'required'])}
         </div>
     </div>
     <input type="hidden" name="row[proxy]" value="1"/>

application/admin/view/auth/sub/add.html

@@ -3,7 +3,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Group')}:</label>
         <div class="col-xs-12 col-sm-8">
-            {:build_select('group[]', $groupdata, null, ['class'=>'form-control selectpicker', 'multiple'=>'', 'data-rule'=>'required'])}
+            {:build_select('group[]', $groupdata, config('site.sub_auth_group_id'), ['class'=>'form-control selectpicker', 'multiple'=>'', 'data-rule'=>'required'])}
         </div>
     </div>
     <div class="form-group">
@@ -37,9 +37,6 @@
         </div>
     </div>
     <div class="form-group">
-        {include file="layout/fu" name="avatar" label="头像" value="" rule="" remark=""/}
-    </div>
-    <div class="form-group">
         <label for="password" class="control-label col-xs-12 col-sm-2">{:__('Password')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input type="password" class="form-control" id="password" name="row[password]" autocomplete="new-password" value="" data-rule="required;password" />

public/assets/libs/nice-validator/dist/local/zh-CN.js

@@ -30,7 +30,7 @@
             ,mobile: [/^1[3-9]\d{9}$/, "请填写有效的手机号"]
             ,zipcode: [/^\d{6}$/, "请检查邮政编码格式"]
             ,chinese: [/^[\u0391-\uFFE5]+$/, "请填写中文字符"]
-            ,username: [/^\w{3,12}$/, "请填写3-12位数字、字母、下划线"]
+            ,username: [/^\w{3,20}$/, "请填写3-20位数字、字母、下划线"]
             ,password: [/^[\S]{6,16}$/, "请填写6-16位字符，不能包含空格"]
             ,accept: function (element, params){
                 if (!params) return true;