作者 刘锟

Merge remote-tracking branch 'origin/master' into akun

@@ -40,7 +40,7 @@ class UpdateBuildConfiguration extends Command @@ -40,7 +40,7 @@ class UpdateBuildConfiguration extends Command
40 * @method :post 40 * @method :post
41 * @time :2024/12/11 11:49 41 * @time :2024/12/11 11:49
42 */ 42 */
43 - public function handle(){ 43 + public function handles(){
44 //查询当前的所有项目都开启可视化 44 //查询当前的所有项目都开启可视化
45 $buildModel = new DeployBuild(); 45 $buildModel = new DeployBuild();
46 $lists = $buildModel->list(); 46 $lists = $buildModel->list();
@@ -59,9 +59,9 @@ class UpdateBuildConfiguration extends Command @@ -59,9 +59,9 @@ class UpdateBuildConfiguration extends Command
59 * @method :post 59 * @method :post
60 * @time :2024/12/11 14:33 60 * @time :2024/12/11 14:33
61 */ 61 */
62 - public function handles(){ 62 + public function handle(){
63 $projectModel = new Project(); 63 $projectModel = new Project();
64 - $list = $projectModel->list(['delete_status'=>0]); 64 + $list = $projectModel->list(['delete_status'=>0,'id'=>['>',1718]],'id',['id'],'asc');
65 foreach ($list as $k => $v){ 65 foreach ($list as $k => $v){
66 echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL; 66 echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
67 ProjectServer::useProject($v['id']); 67 ProjectServer::useProject($v['id']);
@@ -79,21 +79,48 @@ class UpdateBuildConfiguration extends Command @@ -79,21 +79,48 @@ class UpdateBuildConfiguration extends Command
79 * @time :2024/12/11 14:40 79 * @time :2024/12/11 14:40
80 */ 80 */
81 public function getProduct(){ 81 public function getProduct(){
  82 + Detail::truncate();
82 $productModel = new Product(); 83 $productModel = new Product();
83 - $lists = $productModel->list();  
84 - $detailModel = new Detail();  
85 - foreach ($lists as $k => $v){  
86 - echo date('Y-m-d H:i:s') . '产品id:'.$v['id'] . PHP_EOL;  
87 - $data = [  
88 - 'product_id'=>$v['id'],  
89 - 'column_id'=>1,  
90 - 'text_type'=>1,  
91 - 'title'=>'',  
92 - 'sort'=>1,  
93 - 'content'=>$v['describe']  
94 - ];  
95 - $detailModel->add($data); 84 + $page = 1;
  85 + while (true){
  86 + $lists = $productModel->lists([],$page,50,['id','describe']);
  87 + $detailModel = new Detail();
  88 + if(!empty($lists['list'])){
  89 + foreach ($lists['list'] as $k => $v){
  90 + echo date('Y-m-d H:i:s') . '产品id:'.$v['id'] . PHP_EOL;
  91 + if(empty($v['describe'])){
  92 + continue;
  93 + }
  94 + foreach ($v['describe'] as $key => $value){
  95 + if(isset($value['title']) && ($value['title'] == null)){
  96 + $value['title'] = '';
  97 + }
  98 + if(isset($value['text']) && ($value['text'] == null)){
  99 + $value['text'] = '';
  100 + }
  101 + if(empty($value['text'])){
  102 + continue;
  103 + }
  104 + $data = [
  105 + 'product_id'=>$v['id'],
  106 + 'column_id'=>1,
  107 + 'text_type'=>1,
  108 + 'title'=>$value['title'] ?? '',
  109 + 'sort'=>1,
  110 + 'content'=>json_encode(['content'=>$value['text'] ?? ''],JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES),
  111 + 'created_at'=>date('Y-m-d H:i:s'),
  112 + 'updated_at'=>date('Y-m-d H:i:s')
  113 + ];
  114 + $detailModel->insert($data);
  115 + }
  116 + }
  117 + }else{
  118 + break;
  119 + return false;
  120 + }
  121 + $page++;
96 } 122 }
  123 + return true;
97 } 124 }
98 125
99 } 126 }
@@ -180,8 +180,8 @@ class RankDataLogic extends BaseLogic @@ -180,8 +180,8 @@ class RankDataLogic extends BaseLogic
180 180
181 //多个api_no项目 切换api_no查看数据 181 //多个api_no项目 切换api_no查看数据
182 if($project_id == 2104){ 182 if($project_id == 2104){
183 - $data['other_api_no'] = $api_no == 10690 ? 11201 : 10690;  
184 - $data['other_api_no_source'] = $api_no == 10690 ? 'Yandex' : 'Google'; 183 + $data['other_api_no'] = ($api_no == 10690) ? 11201 : 10690;
  184 + $data['other_api_no_source'] = ($data['other_api_no'] == 10690) ? 'Yandex' : 'Google';
185 } 185 }
186 186
187 return $data; 187 return $data;
@@ -267,7 +267,6 @@ class UserLoginLogic @@ -267,7 +267,6 @@ class UserLoginLogic
267 $info['uptime'] = $project['uptime']; 267 $info['uptime'] = $project['uptime'];
268 $info['is_update_language'] = $project['is_update_language']; 268 $info['is_update_language'] = $project['is_update_language'];
269 $info['is_watermark'] = $project['is_watermark']; 269 $info['is_watermark'] = $project['is_watermark'];
270 - $project['deploy_build']['configuration']['is_product'] = $project['deploy_build']['configuration']['is_news'] = $project['deploy_build']['configuration']['is_blogs'] = $project['deploy_build']['configuration']['is_module'] = "1";  
271 $info['configuration'] = $project['deploy_build']['configuration']; 270 $info['configuration'] = $project['deploy_build']['configuration'];
272 $info['project_type'] = $project['type']; 271 $info['project_type'] = $project['type'];
273 $info['storage_type'] = $project['storage_type']; 272 $info['storage_type'] = $project['storage_type'];