周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 2b1806158f20fccaa82991080f1efe2b39acc152 1 个父辈 3a593990

gx

内嵌 并排对比
正在显示 4 个修改的文件 包含 55 行增加 和 53 行删除
@@ -28,53 +28,7 @@ use Mrgoon\AliSms\AliSms; @@ -28,53 +28,7 @@ use Mrgoon\AliSms\AliSms;
28 */ 28 */
29 class RatingController extends BaseController 29 class RatingController extends BaseController
30 { 30 {
31 - /**  
32 - * @remark :获取问卷调查记录（阶段记录）  
33 - * @name :getHistory  
34 - * @author :lyh  
35 - * @method :post  
36 - * @time :2024/1/20 15:03  
37 - */  
38 - public function getHistory(ScoringSystem $scoringSystem){  
39 - $projectInfo = Cache::get('user-'.$this->user['project_id']);  
40 - if(!$projectInfo){  
41 - $this->response('success',Code::SUCCESS,['type'=>0]);  
42 - }  
43 - //建站中直接返回  
44 - if($projectInfo['type'] == 1){  
45 - $this->response('success',Code::SUCCESS,['type'=>0]);  
46 - }  
47 - //上线项目判断当前属于第几阶段  
48 - if(empty($projectInfo['uptime'])){  
49 - $this->response('success',Code::SUCCESS,['type'=>0]);  
50 - }  
51 - //获取上线时间30天后  
52 - $after30Days = date('Y-m-d H:i:s', strtotime($projectInfo['uptime'] . ' +30 days'));  
53 - $afterThreeMonths = date('Y-m-d H:i:s', strtotime($projectInfo['uptime'] . ' +3 months'));  
54 - $afterSixMonths = date('Y-m-d H:i:s', strtotime($projectInfo['uptime'] . ' +6 months'));  
55 - $afterOneYear = date('Y-m-d H:i:s', strtotime($projectInfo['uptime'] . ' +1 year'));  
56 - //获取当前时间  
57 - $date = date('Y-m-d H:i:s');  
58 - if($date <= $after30Days){  
59 - $info = $scoringSystem->read(['type'=>1]);//第一阶段是否有值  
60 - if($info === false){  
61 - $this->response('success',Code::SUCCESS,['type'=>1]);  
62 - }  
63 - }  
64 - if($date >= $afterThreeMonths && $date <= $afterSixMonths){  
65 - $info = $scoringSystem->read(['type'=>2]);//第一阶段是否有值  
66 - if($info === false){  
67 - $this->response('success',Code::SUCCESS,['type'=>2]);  
68 - }  
69 - }  
70 - if($date >= $afterOneYear){  
71 - $info = $scoringSystem->read(['type'=>3]);//第一阶段是否有值  
72 - if($info === false){  
73 - $this->response('success',Code::SUCCESS,['type'=>3]);  
74 - }  
75 - }  
76 - $this->response('success',Code::SUCCESS,['type'=>0]);  
77 - } 31 +
78 /** 32 /**
79 * @remark :问卷调查详情 33 * @remark :问卷调查详情
80 * @name :getProjectRead 34 * @name :getProjectRead
@@ -78,6 +78,7 @@ class RatingLogic extends BaseLogic @@ -78,6 +78,7 @@ class RatingLogic extends BaseLogic
78 $str = trim($str,'&'); 78 $str = trim($str,'&');
79 $url = "http://www.quanqiusou.cn/extend_api/api/service_score.php?postid=$postId&token=$token&ftype=$fType&$str"; 79 $url = "http://www.quanqiusou.cn/extend_api/api/service_score.php?postid=$postId&token=$token&ftype=$fType&$str";
80 @file_put_contents(storage_path('logs/lyh_error.log'), var_export($url, true) . PHP_EOL, FILE_APPEND); 80 @file_put_contents(storage_path('logs/lyh_error.log'), var_export($url, true) . PHP_EOL, FILE_APPEND);
81 - return http_get($url,['charset=utf-8']); 81 + dd();
  82 +// return http_get($url,['charset=utf-8']);
82 } 83 }
83 } 84 }
@@ -8,6 +8,7 @@ use App\Exceptions\BsideGlobalException; @@ -8,6 +8,7 @@ use App\Exceptions\BsideGlobalException;
8 use App\Helper\Common; 8 use App\Helper\Common;
9 use App\Models\Domain\DomainInfo; 9 use App\Models\Domain\DomainInfo;
10 use App\Models\Project\Project; 10 use App\Models\Project\Project;
  11 +use App\Models\Scoring\ScoringSystem;
11 use App\Models\Sms\SmsLog; 12 use App\Models\Sms\SmsLog;
12 use App\Models\User\ProjectRole as ProjectRoleModel; 13 use App\Models\User\ProjectRole as ProjectRoleModel;
13 use App\Models\User\User; 14 use App\Models\User\User;
@@ -170,7 +171,7 @@ class UserLoginLogic @@ -170,7 +171,7 @@ class UserLoginLogic
170 $info['upload_config'] = $project['upload_config']; 171 $info['upload_config'] = $project['upload_config'];
171 $info['main_lang_id'] = $project['main_lang_id']; 172 $info['main_lang_id'] = $project['main_lang_id'];
172 $info['image_max'] = $project['image_max']; 173 $info['image_max'] = $project['image_max'];
173 - $info['uptime'] = $project['uptime']; 174 + $info['uptime_type'] = $this->getHistory($project);
174 $info['storage_type'] = $project['storage_type']; 175 $info['storage_type'] = $project['storage_type'];
175 $info['project_location'] = $project['project_location']; 176 $info['project_location'] = $project['project_location'];
176 $info['is_update_language'] = $project['is_update_language']; 177 $info['is_update_language'] = $project['is_update_language'];
@@ -180,10 +181,57 @@ class UserLoginLogic @@ -180,10 +181,57 @@ class UserLoginLogic
180 $info['is_visualization'] = json_decode($project['is_visualization']); 181 $info['is_visualization'] = json_decode($project['is_visualization']);
181 } 182 }
182 //保存项目缓存 183 //保存项目缓存
183 - Cache::put('user-'.$info['project_id'],$project,$minutes = null); 184 + Cache::put('user-'.$info['project_id'],$project,12 * 3600);
184 return $this->success($info); 185 return $this->success($info);
185 } 186 }
186 187
  188 + /**
  189 + * @remark :获取问卷调查记录（阶段记录）
  190 + * @name :getHistory
  191 + * @author :lyh
  192 + * @method :post
  193 + * @time :2024/1/20 15:03
  194 + */
  195 + public function getHistory($projectInfo){
  196 + if(!$projectInfo){
  197 + return $this->success(0);
  198 + }
  199 + //建站中直接返回
  200 + if($projectInfo['type'] == 1){
  201 + return $this->success(0);
  202 + }
  203 + //上线项目判断当前属于第几阶段
  204 + if(empty($projectInfo['uptime'])){
  205 + return $this->success(0);
  206 + }
  207 + //获取上线时间30天后
  208 + $after30Days = date('Y-m-d H:i:s', strtotime($projectInfo['uptime'] . ' +30 days'));
  209 + $afterThreeMonths = date('Y-m-d H:i:s', strtotime($projectInfo['uptime'] . ' +3 months'));
  210 + $afterSixMonths = date('Y-m-d H:i:s', strtotime($projectInfo['uptime'] . ' +6 months'));
  211 + $afterOneYear = date('Y-m-d H:i:s', strtotime($projectInfo['uptime'] . ' +1 year'));
  212 + //获取当前时间
  213 + $date = date('Y-m-d H:i:s');
  214 + $scoringSystem = new ScoringSystem();
  215 + if($date <= $after30Days){
  216 + $info = $scoringSystem->read(['type'=>1]);//第一阶段是否有值
  217 + if($info === false){
  218 + return $this->success(1);
  219 + }
  220 + }
  221 + if($date >= $afterThreeMonths && $date <= $afterSixMonths){
  222 + $info = $scoringSystem->read(['type'=>2]);//第一阶段是否有值
  223 + if($info === false){
  224 + return $this->success(2);
  225 + }
  226 + }
  227 + if($date >= $afterOneYear){
  228 + $info = $scoringSystem->read(['type'=>3]);//第一阶段是否有值
  229 + if($info === false){
  230 + return $this->success(3);
  231 + }
  232 + }
  233 + return $this->success(0);
  234 + }
187 235
188 /** 236 /**
189 * @remark :组装返回数据 237 * @remark :组装返回数据
@@ -212,7 +260,7 @@ class UserLoginLogic @@ -212,7 +260,7 @@ class UserLoginLogic
212 $info['upload_config'] = $project['upload_config']; 260 $info['upload_config'] = $project['upload_config'];
213 $info['main_lang_id'] = $project['main_lang_id']; 261 $info['main_lang_id'] = $project['main_lang_id'];
214 $info['image_max'] = $project['image_max']; 262 $info['image_max'] = $project['image_max'];
215 - $info['uptime'] = $project['uptime']; 263 + $info['uptime_type'] = $this->getHistory($project);
216 $info['is_update_language'] = $project['is_update_language']; 264 $info['is_update_language'] = $project['is_update_language'];
217 $info['configuration'] = $project['deploy_build']['configuration']; 265 $info['configuration'] = $project['deploy_build']['configuration'];
218 $info['project_type'] = $project['type']; 266 $info['project_type'] = $project['type'];
@@ -222,7 +270,7 @@ class UserLoginLogic @@ -222,7 +270,7 @@ class UserLoginLogic
222 $info['is_visualization'] = json_decode($project['is_visualization']); 270 $info['is_visualization'] = json_decode($project['is_visualization']);
223 } 271 }
224 //保存项目缓存 272 //保存项目缓存
225 - Cache::put('user-'.$info['project_id'],$project,$minutes = null); 273 + Cache::put('user-'.$info['project_id'],$project,12 * 3600);
226 return $this->success($info); 274 return $this->success($info);
227 } 275 }
228 276
@@ -484,7 +484,6 @@ Route::middleware(['bloginauth'])->group(function () { @@ -484,7 +484,6 @@ Route::middleware(['bloginauth'])->group(function () {
484 Route::prefix('rating')->group(function () { 484 Route::prefix('rating')->group(function () {
485 Route::any('/read', [\App\Http\Controllers\Bside\Scoring\RatingController::class, 'getProjectRead'])->name('rating_getProjectRead'); 485 Route::any('/read', [\App\Http\Controllers\Bside\Scoring\RatingController::class, 'getProjectRead'])->name('rating_getProjectRead');
486 Route::any('/save', [\App\Http\Controllers\Bside\Scoring\RatingController::class, 'save'])->name('rating_save'); 486 Route::any('/save', [\App\Http\Controllers\Bside\Scoring\RatingController::class, 'save'])->name('rating_save');
487 - Route::any('/getHistory', [\App\Http\Controllers\Bside\Scoring\RatingController::class, 'getHistory'])->name('rating_getHistory');  
488 Route::any('/code', [\App\Http\Controllers\Bside\Scoring\RatingController::class, 'verificationCode'])->name('rating_code'); 487 Route::any('/code', [\App\Http\Controllers\Bside\Scoring\RatingController::class, 'verificationCode'])->name('rating_code');
489 }); 488 });
490 }); 489 });