合并分支 'master-server' 到 'master'

更新修改



查看合并请求 !884

@@ -199,6 +199,7 @@ class CountAllProject extends Command
                     'plan'=>Project::planMap()[$v['plan']],
                     'plan'=>Project::planMap()[$v['plan']],
                     'status'=>$type,
                     'status'=>$type,
                     'category'=>$category,
                     'category'=>$category,
+                    'is_admin5' => 6,
                     'test_domain'=>$v['test_domain'],
                     'test_domain'=>$v['test_domain'],
                     'product_domain'=>!empty($v['domain']) ?  (new DomainInfo())->getDomain($v['domain']) : '',
                     'product_domain'=>!empty($v['domain']) ?  (new DomainInfo())->getDomain($v['domain']) : '',
                     'project_manager'=>$manageModel->getName($v['manager_mid'] ?? ''),
                     'project_manager'=>$manageModel->getName($v['manager_mid'] ?? ''),

@@ -17,8 +17,8 @@ class Translate
 {
 {
     //接口地址
     //接口地址
 //    public static $url = 'https://translate.hbb618.cn/translates';
 //    public static $url = 'https://translate.hbb618.cn/translates';
-//    public static $url = 'https://api.cmer.com/';
-    public static $url = ' https://apius.ai.cc/';
+    public static $url = 'https://api.cmer.com/';
+//    public static $url = ' https://apius.ai.cc/';
     public static $header = array(
     public static $header = array(
         'accept: application/json',
         'accept: application/json',
         'Content-Type: application/json',
         'Content-Type: application/json',