周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 e6c57f4be3bd0a8dc3de55561801a4c0564a7bd6 1 个父辈 16ee43e9

gx

内嵌 并排对比
正在显示 6 个修改的文件 包含 7 行增加 和 40 行删除
@@ -2,21 +2,10 @@ @@ -2,21 +2,10 @@
2 2
3 namespace App\Console\Commands; 3 namespace App\Console\Commands;
4 4
5 -use App\Helper\Arr;  
6 -use App\Helper\Common;  
7 -use App\Helper\Gpt;  
8 -use App\Helper\Translate;  
9 -use App\Http\Logic\Aside\Project\ProjectLogic;  
10 -use App\Models\Ai\AiCommand;  
11 -use App\Models\Mail\Mail;  
12 -use App\Models\Project\DeployOptimize;  
13 -use App\Models\Project\ProjectUpdateTdk;  
14 -use App\Models\User\User; 5 +
15 use App\Services\ProjectServer; 6 use App\Services\ProjectServer;
16 use Illuminate\Console\Command; 7 use Illuminate\Console\Command;
17 -use Illuminate\Support\Facades\Cache;  
18 use Illuminate\Support\Facades\DB; 8 use Illuminate\Support\Facades\DB;
19 -use Illuminate\Support\Facades\Redis;  
20 9
21 /** 10 /**
22 * 清除项目sdk 11 * 清除项目sdk
@@ -30,7 +30,7 @@ class SyncMobile extends Command @@ -30,7 +30,7 @@ class SyncMobile extends Command
30 protected $description = '同步手机号码库'; 30 protected $description = '同步手机号码库';
31 31
32 /** 32 /**
33 - * @remark :统一更新路由 33 + * @remark :统一更新
34 * @name :handle 34 * @name :handle
35 * @author :lyh 35 * @author :lyh
36 * @method :post 36 * @method :post
@@ -2,21 +2,10 @@ @@ -2,21 +2,10 @@
2 2
3 namespace App\Console\Commands; 3 namespace App\Console\Commands;
4 4
5 -use App\Helper\Arr;  
6 -use App\Helper\Common;  
7 -use App\Helper\Gpt;  
8 -use App\Helper\Translate;  
9 -use App\Models\Ai\AiCommand;  
10 -use App\Models\Mail\Mail;  
11 -use App\Models\Project\DeployOptimize;  
12 use App\Models\Project\Project; 5 use App\Models\Project\Project;
13 -use App\Models\Project\ProjectUpdateTdk;  
14 -use App\Models\User\User;  
15 use App\Services\ProjectServer; 6 use App\Services\ProjectServer;
16 use Illuminate\Console\Command; 7 use Illuminate\Console\Command;
17 -use Illuminate\Support\Facades\Cache;  
18 use Illuminate\Support\Facades\DB; 8 use Illuminate\Support\Facades\DB;
19 -use Illuminate\Support\Facades\Redis;  
20 9
21 /** 10 /**
22 * 初始化项目 11 * 初始化项目
@@ -2,21 +2,9 @@ @@ -2,21 +2,9 @@
2 2
3 namespace App\Console\Commands; 3 namespace App\Console\Commands;
4 4
5 -use App\Helper\Arr;  
6 -use App\Helper\Common;  
7 -use App\Helper\Gpt;  
8 -use App\Helper\Translate;  
9 -use App\Models\Ai\AiCommand;  
10 -use App\Models\Mail\Mail;  
11 -use App\Models\Project\DeployOptimize;  
12 use App\Models\Project\Project; 5 use App\Models\Project\Project;
13 use App\Models\Project\ProjectUpdateTdk; 6 use App\Models\Project\ProjectUpdateTdk;
14 -use App\Models\User\User;  
15 -use App\Services\ProjectServer;  
16 use Illuminate\Console\Command; 7 use Illuminate\Console\Command;
17 -use Illuminate\Support\Facades\Cache;  
18 -use Illuminate\Support\Facades\DB;  
19 -use Illuminate\Support\Facades\Redis;  
20 8
21 /** 9 /**
22 * 初始化项目 10 * 初始化项目
@@ -142,7 +142,11 @@ class BTemplateLogic extends BaseLogic @@ -142,7 +142,11 @@ class BTemplateLogic extends BaseLogic
142 $this->fail('当前扩展模块不存在或已被删除'); 142 $this->fail('当前扩展模块不存在或已被删除');
143 } 143 }
144 //扩展模块定制 144 //扩展模块定制
145 - if($info['list_customized'] == BTemplate::IS_VISUALIZATION || $info['detail_customized'] == BTemplate::IS_VISUALIZATION){ 145 + if($is_list == BTemplate::IS_LIST && $info['list_customized'] == BTemplate::IS_VISUALIZATION){
  146 + $html = $this->customModuleCustomizeHtml($source,$is_list,$is_custom);
  147 + return $this->success(['html'=>$html,'template_id'=>$template_id]);
  148 + }
  149 + if($is_list == BTemplate::IS_DETAIL || $info['detail_customized'] == BTemplate::IS_VISUALIZATION){
146 $html = $this->customModuleCustomizeHtml($source,$is_list,$is_custom); 150 $html = $this->customModuleCustomizeHtml($source,$is_list,$is_custom);
147 return $this->success(['html'=>$html,'template_id'=>$template_id]); 151 return $this->success(['html'=>$html,'template_id'=>$template_id]);
148 } 152 }
@@ -2,14 +2,11 @@ @@ -2,14 +2,11 @@
2 2
3 namespace App\Models\User; 3 namespace App\Models\User;
4 4
5 -//use Illuminate\Contracts\Auth\MustVerifyEmail;  
6 use App\Models\Base; 5 use App\Models\Base;
7 6
8 -//use Illuminate\Foundation\Auth\User as Authenticatable;  
9 7
10 class User extends Base 8 class User extends Base
11 { 9 {
12 -// use HasApiTokens, HasFactory, Notifiable;  
13 const ROLE_MANAGER = 0;//超级管理员 10 const ROLE_MANAGER = 0;//超级管理员
14 const TYPE_ONE = 1; 11 const TYPE_ONE = 1;
15 12