diff --git a/YouerLiveVideo/YouerLiveVideo/util/network.swift b/YouerLiveVideo/YouerLiveVideo/util/network.swift
index 9ace16c..49d348c 100644
--- a/YouerLiveVideo/YouerLiveVideo/util/network.swift
+++ b/YouerLiveVideo/YouerLiveVideo/util/network.swift
@@ -108,9 +108,18 @@ final class HTTPServer{
     static let URL_COMMONGETGRADES=HOST+"/api/Common/GetGrades"                             //根据学段获取年级
     static let URL_COMMONGETCOURSEWAVES=HOST+"/api/Common/GetCourseWaves"                   //获取教材
     static let URL_UPLOAD_FILE=HOST+"/api/Common/UploadFile"                //文件上传接口，接受图片(gif,jpg,jpeg,png,bmp)、视频(flv,mp4)、音频(mp3,aac)
-    static let PLAYHISTORY=HOST+"/appfake_war_exploded/playhistory"         //直播历史
-    static let LIVEHISTORY=HOST+"/appfake_war_exploded/livehistory"         //观看历史
     
+    static let URL_COURSEGETHOTRESCOURSE=HOST+"/api/Course/GetHotRescourse"                 //获取热门微课/课件/电视台节目
+    static let URL_COMMONGETSUBJECTS=HOST+"/api/Course/GetResourceCount"                         //获取微课/课件/电视台节目的总数量
+    static let URL_COMMONGETSCHOOLTYPES=HOST+"/api/Course/GetTopTenSchool"                   //获取十佳校园电视台
+    static let URL_COMMONGETLUNBOLIST=HOST+"/api/Course/GetExcellentSchool"                       //获取优秀电视台
+    static let URL_COMMONGETGRADES=HOST+"/api/Course/GetExcellentProgram"                             //获取校园电视节目
+    static let URL_COMMONGETCOURSEWAVES=HOST+"/api/Course/GetResourceModel"                   //获取单个课程
+    static let URL_UPLOAD_FILE=HOST+"/api/Course/GetResourceList"                //根据知识点/教材等各种条件来分页获取资源/课件
+    static let URL_COMMONGETLUNBOLIST=HOST+"/api/Course/GetWaveCatagory"                       //获取教材目录（已初始化成ztree所要求的格式）
+    static let URL_COMMONGETGRADES=HOST+"/api/Course/GetTopicCatagory"                             //获取知识点目录（已初始化成ztree所要求的格式）
+    static let URL_COMMONGETCOURSEWAVES=HOST+"/api/Course/GetTestCatagory"                   //获取考点目录（已初始化成ztree所要求的格式）
+    static let URL_UPLOAD_FILE=HOST+"/api/Course/GetTelevisionStationCatagory"                //获取电视台目录
     
     
     var token:String?{
@@ -132,7 +141,7 @@ final class HTTPServer{
             }
         }
     }
-    //MARK:-个人信息有关
+    //MARK:-Account个人信息有关
     //登录
     func login(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
         let timeFormatter=DateFormatter()
@@ -181,8 +190,34 @@ final class HTTPServer{
     func getAddUser(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
         KHttp.GET(url: HTTPServer.URL_ACCOUNTADDUSER, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
     }
-    
-    
+    //MARK:-Common
+    //获取所有的教材版本
+    func getCourseWareVersions(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
+        KHttp.GET(url: HTTPServer.URL_COMMONGETCOURSEWAREVERSIONS, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+    }
+    //获取学科
+    func getSubjects(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
+        KHttp.GET(url: HTTPServer.URL_COMMONGETSUBJECTS, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+    }
+    //获取学段
+    func getSchoolTypes(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
+        KHttp.GET(url: HTTPServer.URL_COMMONGETSCHOOLTYPES, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+    }
+    //获取轮播图 type:0-视频云前端轮播图 1-校园电视台轮播图
+    func getLunboList(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
+        KHttp.GET(url: HTTPServer.URL_COMMONGETLUNBOLIST, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+    }
+    //根据学段获取年级
+    func getGrades(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
+        KHttp.GET(url: HTTPServer.URL_COMMONGETGRADES, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+    }
+    //获取教材
+    func getCourseWaves(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){
+        KHttp.GET(url: HTTPServer.URL_COMMONGETCOURSEWAVES, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler)
+    }
+    //MARK:-Course
+    //MARK:-DataStatistics
+    //MARK:-UserCenter
     
 
 }
--
libgit2 0.21.0