合并分支 'develop' 到 'master'

Develop



查看合并请求 !466

@@ -16,6 +16,7 @@ use App\Models\Project\OnlineCheck;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use App\Models\RouteMap\RouteMap;
 use App\Models\RouteMap\RouteMap;
 use App\Models\User\User;
 use App\Models\User\User;
+use App\Models\WebSetting\WebLanguage;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Cache;
@@ -164,7 +165,9 @@ class PrivateController extends BaseController
         //存储缓存
         //存储缓存
         $info['token'] = $token;
         $info['token'] = $token;
         Cache::add($token,$info,3600);
         Cache::add($token,$info,3600);
-        $data = ['token'=>$token,'main_lang_id'=>$info['main_lang_id']];
+        $languageModel = new WebLanguage();
+        $languageInfo = $languageModel->read(['id'=>$info['main_lang_id']],['short','english','chinese']);
+        $data = ['token'=>$token,'main_lang_id'=>$info['main_lang_id'],'language_info'=>$languageInfo];
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }
 }
 }