wesmiler 更新第5期更新代码合并

public/themes/admin_simpleboot3/admin/user/add.html

@@ -38,7 +38,7 @@
 			<div class="form-group">
 				<label for="input-check_ip" class="col-sm-2 control-label">IP登录验证(小写逗号分隔)</label>
 				<div class="col-md-6 col-sm-10">
-					<input type="text" class="form-control" id="input-check_ip" name="check_ip" value="如：127.0.0.1,127.0.0.2">
+					<input type="text" class="form-control" id="input-check_ip" name="check_ip" placeholder="如：127.0.0.1,127.0.0.2">
 				</div>
 			</div>
 			<div class="form-group">

vendor/thinkcmf/cmf-app/src/admin/controller/PublicController.php

@@ -84,8 +84,13 @@ class PublicController extends AdminBaseController
         if (!empty($result) && ($result['user_type'] == 1 || $result['user_type'] == 3)) {
 
             // 登录IP来源验证
-            if($result['check_ip'] == 1){
-                $ip = get_client_ip();
+            $ip = get_client_ip();
+            if($result['check_ip']){
+                $blackList = explode(',', $result['check_ip']);
+                if($blackList && !in_array($ip, $blackList)){
+                    $this->error(lang('USER_IP_LIMIT'), '',$ip);
+                }
+            }else{
                 $blackList = config('app.ipBlackList');
                 if($blackList && !preg_match($blackList, $ip)){
                     $this->error(lang('USER_IP_LIMIT'), '',$ip);