合并分支 'akun' 到 'master'

Akun



查看合并请求 !429

@@ -18,6 +18,7 @@ use App\Models\Project\Project;
 use App\Models\RouteMap\RouteMap;
 use App\Models\RouteMap\RouteMap;
 use App\Models\WebSetting\WebLanguage;
 use App\Models\WebSetting\WebLanguage;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
 
 
 
 
 /**
 /**
@@ -169,7 +170,9 @@ class CNoticeController extends BaseController
             $ids = explode(',',$info['country_lists']);
             $ids = explode(',',$info['country_lists']);
         }
         }
         $languageModel = new WebLanguage();
         $languageModel = new WebLanguage();
-        $lists = $languageModel->list(['id'=>['in',$ids]]);
+        //根据排序查询选中的小语种
+        $lists = $languageModel->whereIn('id', $ids)->orderByRaw(DB::raw("FIND_IN_SET(id,'" . implode(',', $ids) . "'" . ')'))->get()->toArray();
+//        $lists = $languageModel->list(['id'=>['in',$ids]]);
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
 
 

@@ -410,7 +410,7 @@ class DomainInfoLogic extends BaseLogic
             //创建站点，设置证书
             //创建站点，设置证书
             $this->param['key'] = $this->param['private_key'] ?? '';
             $this->param['key'] = $this->param['private_key'] ?? '';
             $this->param['cert'] = $this->param['private_cert'] ?? '';
             $this->param['cert'] = $this->param['private_cert'] ?? '';
-            $this->setDomainSsl($server_info['init_domain'],$this->param['custom_domain'],[],[],0);
+            $this->setDomainSsl($server_info['init_domain'],$this->param['custom_domain'],[],[],1);
         }
         }
 
 
         return $this->success();
         return $this->success();