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

@@ -5,6 +5,7 @@ namespace App\Console\Commands;
 
 
 use App\Models\Devops\DevopsTaskLog;
 use App\Models\Devops\DevopsTaskLog;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
+use App\Utils\EncryptUtils;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
 use App\Models\Devops\DevopsTask as DevopsTaskModel;
 use App\Models\Devops\DevopsTask as DevopsTaskModel;
 
 
@@ -73,13 +74,22 @@ class DevopsTask extends Command
                 continue;
                 continue;
             }
             }
             //DB类是单例模式，生命周期内修改配置不会生效
             //DB类是单例模式，生命周期内修改配置不会生效
+            $encrypt = new EncryptUtils();
+            try {
                 $conn = new \mysqli(
                 $conn = new \mysqli(
                     $project->mysqlConfig->host,
                     $project->mysqlConfig->host,
-                $project->mysqlConfig->user,
-                $project->mysqlConfig->password,
+                    $encrypt->unlock_url($project->mysqlConfig->user),
+                    $encrypt->unlock_url($project->mysqlConfig->password),
                     $project->databaseName(),
                     $project->databaseName(),
-                $project->mysqlConfig->port,
+                    $encrypt->unlock_url($project->mysqlConfig->port),
                 );
                 );
+            }catch (\Exception $e){
+                $log->remark = mb_substr('数据库连接失败:' . $e->getMessage(), 500);
+                $log->status = DevopsTaskLog::STATUS_ERROR;
+                $log->save();
+                echo '-->' . $log->remark . PHP_EOL;
+                continue;
+            }
             $res = $conn->query($task->sql);
             $res = $conn->query($task->sql);
 
 
             $log->status = $res ? DevopsTaskLog::STATUS_ACTIVE : DevopsTaskLog::STATUS_ERROR;
             $log->status = $res ? DevopsTaskLog::STATUS_ACTIVE : DevopsTaskLog::STATUS_ERROR;

@@ -125,6 +125,7 @@ class ProjectController extends BaseController
             'gl_project.company AS company',
             'gl_project.company AS company',
             'gl_project.type AS type',
             'gl_project.type AS type',
             'gl_project.created_at AS created_at',
             'gl_project.created_at AS created_at',
+            'gl_project.cooperate_date AS cooperate_date',
             'gl_project_online_check.id AS online_check_id',
             'gl_project_online_check.id AS online_check_id',
             'gl_project_online_check.question AS question',
             'gl_project_online_check.question AS question',
             'gl_project_online_check.optimist_status AS optimist_status',
             'gl_project_online_check.optimist_status AS optimist_status',

@@ -127,7 +127,7 @@ class ProductLogic extends  BaseLogic
         DB::beginTransaction();
         DB::beginTransaction();
         try {
         try {
             foreach ($this->param['ids'] as $k => $id) {
             foreach ($this->param['ids'] as $k => $id) {
-                $info = $this->model->read(['id'=>$id]);
+                $info = $this->model->read(['id'=>$id],['id','status']);
                 if($info['status'] == Product::STATUS_RECYCLE){
                 if($info['status'] == Product::STATUS_RECYCLE){
                     $this->delRoute($id);
                     $this->delRoute($id);
                     //删除当前产品模版
                     //删除当前产品模版

@@ -51,10 +51,12 @@ class Product extends Base
     }
     }
 
 
     public function setGalleryAttribute($value){
     public function setGalleryAttribute($value){
+        if(!empty($value)){
             foreach ($value as $k => $v){
             foreach ($value as $k => $v){
                 $v['url'] = str_replace_url($v['url']);
                 $v['url'] = str_replace_url($v['url']);
                 $value[$k] = $v;
                 $value[$k] = $v;
             }
             }
+        }
         $this->attributes['gallery'] = Arr::a2s($value);
         $this->attributes['gallery'] = Arr::a2s($value);
     }
     }
 
 
@@ -91,10 +93,12 @@ class Product extends Base
      */
      */
     public function getIconAttribute($value){
     public function getIconAttribute($value){
         $value = Arr::s2a($value);
         $value = Arr::s2a($value);
+        if(!empty($value)){
             foreach ($value as $k => $v){
             foreach ($value as $k => $v){
                 $v = getImageUrl($v);
                 $v = getImageUrl($v);
                 $value[$k] = $v;
                 $value[$k] = $v;
             }
             }
+        }
         return $value;
         return $value;
     }
     }