作者 李宇航

合并分支 'lyh-server' 到 'master'

Lyh server



查看合并请求 !2307
@@ -51,7 +51,6 @@ class AuthorityScore extends Command @@ -51,7 +51,6 @@ class AuthorityScore extends Command
51 $urls = $url.$domainInfo['domain']; 51 $urls = $url.$domainInfo['domain'];
52 echo $urls.PHP_EOL; 52 echo $urls.PHP_EOL;
53 $data = http_get($urls); 53 $data = http_get($urls);
54 - echo json_encode($data).PHP_EOL;  
55 if(!empty($data) && !empty($data['data'])){ 54 if(!empty($data) && !empty($data['data'])){
56 echo json_encode($data).PHP_EOL; 55 echo json_encode($data).PHP_EOL;
57 $data = $data['data']; 56 $data = $data['data'];
@@ -70,6 +70,9 @@ class ComController extends BaseController @@ -70,6 +70,9 @@ class ComController extends BaseController
70 if($this->user['login_source'] == User::LOGIN_PASSWORD_SOURCE){ 70 if($this->user['login_source'] == User::LOGIN_PASSWORD_SOURCE){
71 $data[] = 19; 71 $data[] = 19;
72 } 72 }
  73 + if($this->user['login_source'] != User::LOGIN_AUTO_SOURCE){
  74 + $data[] = 76;
  75 + }
73 if(!empty($data)){ 76 if(!empty($data)){
74 $this->map['id'] = ['not in',$data]; 77 $this->map['id'] = ['not in',$data];
75 } 78 }