Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

Your Name
app/Console/Commands/Test/UpdateRoute.php
app/Http/Logic/Bside/User/UserLoginLogic.php
app/Services/SyncSubmitTaskService.php
routes/bside.php
--- a/app/Console/Commands/Test/UpdateRoute.php
查看文件 @8d905ac
+++ b/app/Console/Commands/Test/UpdateRoute.php
查看文件 @8d905ac
@@ -60,28 +60,30 @@ class UpdateRoute extends Command
         foreach ($list as $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             ProjectServer::useProject($v['id']);
-            $this->getProduct();
+//            $this->getProduct();
 //            $this->setProductKeyword();
 //            $this->getBlog();
+            $this->setCustomRoute($v['id']);
             DB::disconnect('custom_mysql');
         }
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
     }
     public function setCustomRoute($project_id){
-//        $customModel = new CustomModuleContent();
-//        $list = $customModel->list();
-//        foreach ($list as $v){
-//                $route = RouteMap::setRoute($v['name'], RouteMap::SOURCE_MODULE, $v['id'], $project_id);
-//                $customModel->edit(['route'=>$route],['id'=>$v['id']]);
+        $customModel = new CustomModuleContent();
+        $list = $customModel->list();
+        foreach ($list as $v){
+            echo date('Y-m-d H:i:s') . '扩展模块id:'.$v['id'] . PHP_EOL;
+            $route = RouteMap::setRoute($v['name'], RouteMap::SOURCE_MODULE, $v['id'], $project_id);
+            $customModel->edit(['route'=>$route],['id'=>$v['id']]);
+        }
+//        $cateModel = new CustomModuleCategory();
+//        $lists = $cateModel->list();
+//        foreach ($lists as $v1){
+//                $route = RouteMap::setRoute($v1['name'], RouteMap::SOURCE_MODULE_CATE, $v1['id'], $project_id);
+//                $cateModel->edit(['route'=>$route],['id'=>$v1['id']]);
+//
 //        }
-        $cateModel = new CustomModuleCategory();
-        $lists = $cateModel->list();
-        foreach ($lists as $v1){
-                $route = RouteMap::setRoute($v1['name'], RouteMap::SOURCE_MODULE_CATE, $v1['id'], $project_id);
-                $cateModel->edit(['route'=>$route],['id'=>$v1['id']]);
-
-        }
     }
     public function delProductKeyword(){
--- a/app/Http/Logic/Bside/User/UserLoginLogic.php
查看文件 @8d905ac
+++ b/app/Http/Logic/Bside/User/UserLoginLogic.php
查看文件 @8d905ac
@@ -189,6 +189,7 @@ class UserLoginLogic
         if($info['is_customized'] == 1){
             $info['is_visualization'] = json_decode($project['is_visualization']);
         }
+        $info['is_comment'] = $project['deploy_build']['is_comment'] ?? 0;
         $info['is_visualization_authority'] = $project['deploy_build']['is_visualization_authority'];
         $info['is_inquiry_country'] = $project['is_inquiry_country'];
         $info['is_subscribe'] = $project['is_subscribe'];
@@ -294,6 +295,7 @@ class UserLoginLogic
         $info['project_location'] = $project['project_location'];
         $info['file_cdn'] = $project['deploy_build']['file_cdn'];
         $info['service_duration'] = $project['deploy_build']['service_duration'] ?? 0;
+        $info['is_comment'] = $project['deploy_build']['is_comment'] ?? 0;
         $info['remain_day'] = $project['remain_day'] ?? 0;
         if($info['is_customized'] == 1){
             $info['is_visualization'] = json_decode($project['is_visualization']);
@@ -308,7 +310,6 @@ class UserLoginLogic
             $is_amp = $amp_info ? $amp_info['amp_status'] : 0;
         }
         $info['is_amp'] = $is_amp;
-
         //保存项目缓存
         Cache::put('user-'.$info['project_id'],$project,12 * 3600);
         return $this->success($info);
--- a/app/Services/SyncSubmitTaskService.php
查看文件 @8d905ac
+++ b/app/Services/SyncSubmitTaskService.php
查看文件 @8d905ac
@@ -60,7 +60,7 @@ class SyncSubmitTaskService
         if($action == 'inquiry' && !empty($project['is_subscribe'])){
             //是否只有email字段
             $filed = '';
-            foreach ($data['data']['data'] as $k => $v){
+            foreach ($data['data'] as $k => $v){
                 if(Str::startsWith(strtolower($k),'globalso-')){
                     continue;
                 }
--- a/routes/bside.php
查看文件 @8d905ac
+++ b/routes/bside.php
查看文件 @8d905ac
@@ -621,6 +621,13 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::any('/set_smtp', [\App\Http\Controllers\Bside\Subscribe\EmailController::class, 'set_smtp'])->name('subscribe_email_set_smtp');
         Route::any('/group_send', [\App\Http\Controllers\Bside\Subscribe\EmailController::class, 'group_send'])->name('subscribe_email_group_send');
     });
+
+    //网站评论
+    Route::prefix('comment')->group(function () {
+        Route::any('/', [\App\Http\Controllers\Bside\Comment\CommentController::class, 'lists'])->name('comment_lists');
+        Route::any('/info', [\App\Http\Controllers\Bside\Comment\CommentController::class, 'info'])->name('comment_info');
+        Route::any('/status', [\App\Http\Controllers\Bside\Comment\CommentController::class, 'status'])->name('comment_status');
+    });
 });
 //无需登录验证的路由组
 Route::group([], function () {