请求添加认证参数和用户ID

XHWK.Model/Model_UserInfo.cs → XHWK.Model/ModelUserInfo.cs

@@ -2,8 +2,11 @@
 
 namespace XHWK.Model
 {
-    public class Model_UserInfo
+    public class ModelUserInfo
     {
+        public string token_key { get; set; }
+        public string token_value { get; set; }
+
         /// <summary>
         /// 用户id
         /// </summary>

XHWK.Model/XHWK.Model.csproj

@@ -81,7 +81,7 @@
     <Compile Include="Model_Signatures.cs" />
     <Compile Include="Model_TmatrixCode.cs" />
     <Compile Include="Model_TsubjectbookList.cs" />
-    <Compile Include="Model_UserInfo.cs" />
+    <Compile Include="ModelUserInfo.cs" />
     <Compile Include="Model_Video.cs" />
     <Compile Include="Model_WKData.cs" />
     <Compile Include="NotifyModel.cs" />

XHWK.WKTool/App.config

@@ -5,12 +5,12 @@
   </startup>
   <appSettings>
     <!--0正式 1测试-->
-    <add key="IsDebug" value="0" />
+    <add key="IsDebug" value="1" />
     <!--参数是否加密 0不加密 1加密-->
     <add key="IsParameterEncryption" value="0" />
     <!--版本号-->
-    <add key="VersionCode" value="125" />
-    <add key="VersionName" value="3.9.8" />
+    <add key="VersionCode" value="126" />
+    <add key="VersionName" value="3.12.0" />
     <!--皮肤样式 0白 1蓝 2黑色 -->
     <add key="SkinStyle" value="0" />
     <!--是否输出视频记录日志：0否-->

XHWK.WKTool/App.xaml.cs

@@ -136,7 +136,7 @@ namespace XHWK.WKTool
         /// <summary>
         /// 用户信息
         /// </summary>
-        public static Model_UserInfo UserInfo;
+        public static ModelUserInfo UserInfo;
 
         /// <summary>
         /// 接口返回消息
@@ -316,11 +316,13 @@ namespace XHWK.WKTool
         {
             Console.WriteLine(@"初始化APP");
             LogHelper.InitLog4Net();
+            bool isParameterEncryption = FileToolsCommon.GetConfigValue("IsParameterEncryption") != "0";
+            HttpHelper.isParameterEncryption = isParameterEncryption;
             myloading = new LoadDialog();
             Killffmpeg();
             try
             {
-                UserInfo = new Model_UserInfo();
+                UserInfo = new ModelUserInfo();
                 WKDataList = new List<Model_WKData>();
                 VideoList = new List<Model_Video>();
 

XHWK.WKTool/DAL/XHApi.cs

@@ -13,16 +13,19 @@ namespace XHWK.WKTool.DAL
 {
     using system;
 
-    public class XHApi
+    public class XhApi
     {
         /// <summary>
         /// 激活信息--添加
         /// </summary>
-        /// <param name="request">
-        /// </param>
         /// <returns>
         /// </returns>
-        public int ActivationAdd(string mac, string device, string projectcode)
+        public int ActivationAdd
+        (
+            string mac,
+            string device,
+            string projectcode
+        )
         {
             try
             {
@@ -42,37 +45,27 @@ namespace XHWK.WKTool.DAL
                     App.ServerMsg = "网络异常！";
                     return 1;
                 }
-                else
+                JObject obj = JObject.Parse(xmlDoc);
+                if (obj["code"].ToString().Equals("0"))
                 {
-                    JObject obj = JObject.Parse(xmlDoc);
-                    if (obj != null)
-                    {
-                        if (obj["code"].ToString().Equals("0"))
-                        {
-                            App.Signature = obj["obj"].ToString();
-                            if (!Directory.Exists(App.DataPath))
-                            {
-                                Directory.CreateDirectory(App.DataPath);
-                            }
-                            string ApplicationData = App.DataPath + "signature.txt";
-                            System.IO.File.WriteAllText
-                            (
-                                ApplicationData,
-                                App.Signature,
-                                Encoding.Default
-                            ); //存放签名
-                            return 0;
-                        }
-                        else
-                        {
-                            App.ServerMsg = obj["msg"].ToString();
-                            return Convert.ToInt32(obj["code"].ToString());
-                        }
-                    }
-                    else
+                    App.Signature = obj["obj"]?.ToString();
+                    if (!Directory.Exists(App.DataPath))
                     {
-                        return 1;
+                        Directory.CreateDirectory(App.DataPath);
                     }
+                    string applicationData = App.DataPath + "signature.txt";
+                    System.IO.File.WriteAllText
+                    (
+                        applicationData,
+                        App.Signature,
+                        Encoding.Default
+                    ); //存放签名
+                    return 0;
+                }
+                else
+                {
+                    App.ServerMsg = obj["msg"]?.ToString();
+                    return Convert.ToInt32(obj["code"].ToString());
                 }
             }
             catch (Exception ex)
@@ -86,8 +79,6 @@ namespace XHWK.WKTool.DAL
         /// <summary>
         /// 激活信息--添加激活历史
         /// </summary>
-        /// <param name="request">
-        /// </param>
         /// <returns>
         /// </returns>
         public int ActivationAddHistory()
@@ -107,15 +98,8 @@ namespace XHWK.WKTool.DAL
                 else
                 {
                     JObject obj = JObject.Parse(xmlDoc);
-                    if (obj != null)
-                    {
-                        App.ServerMsg = obj["msg"].ToString();
-                        return Convert.ToInt32(obj["code"].ToString());
-                    }
-                    else
-                    {
-                        return 1;
-                    }
+                    App.ServerMsg = obj["msg"]?.ToString();
+                    return Convert.ToInt32(obj["code"]?.ToString());
                 }
             }
             catch (Exception ex)
@@ -128,8 +112,6 @@ namespace XHWK.WKTool.DAL
         /// <summary>
         /// 登录
         /// </summary>
-        /// <param name="request">
-        /// </param>
         /// <returns>
         /// </returns>
         public int Login(string loginname, string loginpwd)
@@ -138,35 +120,35 @@ namespace XHWK.WKTool.DAL
             string url = App.apiUrl + "/suser/user/login"; //地址
 
             //1.193.37.200
-            string Address = "";//河南 郑州
-            HttpHelper.GetAddressIP(out string AddressIP, out AddressIP);
+            const string address = ""; //河南 郑州
+            HttpHelper.GetAddressIp(out string addressIp, out addressIp);
             Dictionary<string, object> dic = new Dictionary<string, object>
             {
-                { "loginname", loginname},
-                { "loginpwd", loginpwd},
-                {"logip", AddressIP},
-                {"logaddress", Address},
-                {"ultype", "microlecture_pc_t"},
-                {"versionnum", FileToolsCommon.GetConfigValue("VersionName")}
+                { "loginname", loginname },
+                { "loginpwd", loginpwd },
+                { "logip", addressIp },
+                { "logaddress", address },
+                { "ultype", "microlecture_pc_t" },
+                { "versionnum", FileToolsCommon.GetConfigValue("VersionName") }
             };
             string body = JsonHelper.ToJson(dic);
-            ResultVo<Model_UserInfo> result = HttpHelper.PostAndRespSignle<ResultVo<Model_UserInfo>>(url, postData: body);
+            ResultVo<ModelUserInfo> result = HttpHelper.PostAndRespSignle<ResultVo<ModelUserInfo>>(url, postData: body);
             if (result != null)
             {
-                App.UserInfo = new Model_UserInfo();
+                App.UserInfo = new ModelUserInfo();
                 App.ServerMsg = result.msg;
                 if (result.obj != null)
                 {
                     App.UserInfo = result.obj;
+                    HttpHelper.tokenKey = result.obj.token_key;
+                    HttpHelper.tokenValue = result.obj.token_value;
+                    HttpHelper.userId = result.obj.Userid + "";
                 }
                 return result.code;
             }
-            else
-            {
-                App.ServerMsg = "网络异常！";
-                App.UserInfo = new Model_UserInfo();
-                return 1;
-            }
+            App.ServerMsg = "网络异常！";
+            App.UserInfo = new ModelUserInfo();
+            return 1;
         }
 
         /// <summary>
@@ -174,22 +156,25 @@ namespace XHWK.WKTool.DAL
         /// </summary>
         /// <param name="headPortrait">
         /// </param>
-        /// <param name="SavePath">
+        /// <param name="savePath">
         /// </param>
         /// <returns>
         /// </returns>
-        public bool DownloadAvatar(string headPortrait, string SavePath)
+        public bool DownloadAvatar(string headPortrait, string savePath)
         {
             string url = App.showImageUrl + headPortrait;
-            bool result = HttpHelper.GetDataGetHtml(url, SavePath, "");
+            bool result = HttpHelper.GetDataGetHtml
+            (
+                url,
+                savePath,
+                ""
+            );
             return result;
         }
 
         /// <summary>
         /// 教师教材列表
         /// </summary>
-        /// <param name="request">
-        /// </param>
         /// <returns>
         /// </returns>
         public int TsubjectbookList()
@@ -223,11 +208,14 @@ namespace XHWK.WKTool.DAL
         /// <summary>
         /// 章节--列表
         /// </summary>
-        /// <param name="request">
-        /// </param>
         /// <returns>
         /// </returns>
-        public int DirectorList(string lsbid, int belong, int createid)
+        public int DirectorList
+        (
+            string lsbid,
+            int belong,
+            int createid
+        )
         {
             App.DirectorList = new List<Model_DirectorList>();
             try
@@ -263,8 +251,6 @@ namespace XHWK.WKTool.DAL
         /// <summary>
         /// 资源--添加
         /// </summary>
-        /// <param name="request">
-        /// </param>
         /// <returns>
         /// </returns>
         public int ResourceAdd(Model_ResourceAdd model)
@@ -320,16 +306,8 @@ namespace XHWK.WKTool.DAL
                 string body = JsonHelper.ToJson(dic);
                 string xmlDoc = HttpHelper.HttpPost(body, url);
                 JObject obj = JObject.Parse(xmlDoc);
-                if (obj != null)
-                {
-                    App.ServerMsg = obj["msg"].ToString();
-                    return Convert.ToInt32(obj["code"].ToString());
-                }
-                else
-                {
-                    App.ServerMsg = "网络异常！";
-                    return 1;
-                }
+                App.ServerMsg = obj["msg"]?.ToString();
+                return Convert.ToInt32(obj["code"]?.ToString());
             }
             catch (Exception ex)
             {
@@ -342,17 +320,15 @@ namespace XHWK.WKTool.DAL
         /// <summary>
         /// 请求服务地址
         /// </summary>
-        /// <param name="Schoolcode">
+        /// <param name="schoolcode">
         /// </param>
+        /// <param name="message"></param>
         /// <returns>
         /// </returns>
-        public bool GetServiceAddress(string Schoolcode, out string Message)
+        public bool GetServiceAddress(string schoolcode, out string message)
         {
             string url = App.certapiUrl + "/school/find_code"; //地址
-            Dictionary<string, object> dic = new Dictionary<string, object>
-            {
-                { "schoolcode", Schoolcode}
-            };
+            Dictionary<string, object> dic = new Dictionary<string, object> { { "schoolcode", schoolcode } };
             string body = JsonHelper.ToJson(dic);
             ResultVo<Model_ServiceAddress> result = HttpHelper.PostAndRespSignle<ResultVo<Model_ServiceAddress>>(url, postData: body);
             if (result != null)
@@ -361,26 +337,26 @@ namespace XHWK.WKTool.DAL
                 {
                     if (result.obj != null)
                     {
-                        Message = result.msg;
+                        message = result.msg;
                         App.ServiceAddress = result.obj;
                         App.SaveServiceAddressData();
                         return true;
                     }
                     else
                     {
-                        Message = "服务地址错误，请输入正确的地址！";
+                        message = "服务地址错误，请输入正确的地址！";
                         return false;
                     }
                 }
                 else
                 {
-                    Message = result.msg;
+                    message = result.msg;
                     return false;
                 }
             }
             else
             {
-                Message = "无法与服务器建立连接，请检查网络状态。";
+                message = "无法与服务器建立连接，请检查网络状态。";
                 return false;
             }
         }

XHWK.WKTool/KeyVerification.xaml

@@ -44,7 +44,7 @@
                 Grid.Row="0"
                 Padding="10,0,10,0"
                 HorizontalAlignment="Right"
-                Click="close_click"
+                Click="CloseClick"
                 Content="×"
                 Cursor="Hand"
                 FontSize="30"
@@ -77,7 +77,7 @@
             Width="138"
             Height="36"
             Margin="30,0,30,0"
-            Click="btnEnd_Click"
+            Click="BtnEndClick"
             Content="验证"
             Cursor="Hand"
             FontSize="16"

XHWK.WKTool/KeyVerification.xaml.cs

@@ -17,7 +17,7 @@ namespace XHWK.WKTool
          */
     public partial class KeyVerification
     {
-        private readonly XHApi _registerController = new XHApi();
+        private readonly XhApi _registerController = new XhApi();
         private int _serverReturnCode;
 
         public KeyVerification()
@@ -34,7 +34,7 @@ namespace XHWK.WKTool
             DragMove();
         }
 
-        private void btnEnd_Click(object sender, RoutedEventArgs e)
+        private void BtnEndClick(object sender, RoutedEventArgs e)
         {
             if (string.IsNullOrWhiteSpace(TxbKey.Text))
             {
@@ -154,7 +154,7 @@ namespace XHWK.WKTool
             }
         }
 
-        private void close_click(object sender, RoutedEventArgs e)
+        private void CloseClick(object sender, RoutedEventArgs e)
         {
             CloseAction();
         }

XHWK.WKTool/LoginWindow.xaml

@@ -122,7 +122,7 @@
                                 FontSize="14"
                                 Foreground="#FF999999"
                                 InputMethod.IsInputMethodEnabled="False"
-                                PreviewTextInput="txbAccountNumber_PreviewTextInput"
+                                PreviewTextInput="TxbAccountNumberPreviewTextInput"
                                 Text="" />
                             <Label Height="1.5" Background="#3F6FFF" />
                         </StackPanel>

XHWK.WKTool/LoginWindow.xaml.cs

@@ -23,7 +23,7 @@ namespace XHWK.WKTool
         /// <summary>
         /// 调用接口
         /// </summary>
-        private readonly XHApi xhapi = new XHApi();
+        private readonly XhApi xhapi = new XhApi();
 
         public LoginWindow()
         {
@@ -224,7 +224,7 @@ namespace XHWK.WKTool
         /// </param>
         /// <param name="e">
         /// </param>
-        private void txbAccountNumber_PreviewTextInput(object sender, TextCompositionEventArgs e)
+        private void TxbAccountNumberPreviewTextInput(object sender, TextCompositionEventArgs e)
         {
             try
             {

XHWK.WKTool/MainWindow.xaml.cs

@@ -376,7 +376,7 @@ namespace XHWK.WKTool
             TxbLoginType.Text = "未登录";
             ImgHeadImgN.Visibility = Visibility.Visible;
             ImgHeadImg.Visibility = Visibility.Collapsed;
-            App.UserInfo = new Model_UserInfo();
+            App.UserInfo = new ModelUserInfo();
         }
 
         #endregion 登录

XHWK.WKTool/ProductVerification.xaml

@@ -85,7 +85,7 @@
                     HorizontalAlignment="Right"
                     VerticalAlignment="Center"
                     Background="White"
-                    Click="close_click"
+                    Click="CloseClick"
                     Cursor="Hand"
                     >
                     <Button.Template>

XHWK.WKTool/ProductVerification.xaml.cs

@@ -20,7 +20,7 @@ namespace XHWK.WKTool
          */
     public partial class ProductVerification : Window
     {
-        private readonly XHApi registerController = new XHApi();
+        private readonly XhApi registerController = new XhApi();
         private int serverReturnCode = 0;
 
         public ProductVerification()
@@ -132,14 +132,15 @@ namespace XHWK.WKTool
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void close_click(object sender, RoutedEventArgs e)
+        private void CloseClick(object sender, RoutedEventArgs e)
         {
-            closeAction();
+            CloseAction();
         }
+
         /// <summary>
         /// 退出程序
         /// </summary>
-        private void closeAction()
+        private void CloseAction()
         {
             Dispatcher.Invoke(new Action(() =>
             {

XHWK.WKTool/UploadWindow.xaml

@@ -93,7 +93,7 @@
             Foreground="Black"
             ItemsSource="{Binding bookList}"
             SelectedValuePath="Key"
-            SelectionChanged="toolbar_list_SelectionChanged">
+            SelectionChanged="ToolbarListSelectionChanged">
             <ComboBox.Resources>
                 <SolidColorBrush x:Key="{x:Static SystemColors.WindowBrushKey}" Color="White" />
                 <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="Gray" />

XHWK.WKTool/UploadWindow.xaml.cs

@@ -17,12 +17,12 @@ namespace XHWK.WKTool
     /// <summary>
     /// UploadWindow.xaml 的交互逻辑
     /// </summary>
-    public partial class UploadWindow : Window
+    public partial class UploadWindow
     {
         /// <summary>
         /// 调用接口
         /// </summary>
-        private readonly XHApi xhapi = new XHApi();
+        private readonly XhApi _xhapi = new XhApi();
 
         /// <summary>
         /// 前台数据
@@ -32,22 +32,22 @@ namespace XHWK.WKTool
         /// <summary>
         /// 文件名
         /// </summary>
-        private string Resourcename = string.Empty;
+        private string _resourcename = string.Empty;
 
         /// <summary>
         /// 文件大小
         /// </summary>
-        private long Resourcesize = 0;
+        private long _resourcesize;
 
         /// <summary>
         /// 文件类型
         /// </summary>
-        private string Suffix = string.Empty;
+        private string _suffix = string.Empty;
 
         /// <summary>
         /// 唯一编号
         /// </summary>
-        private string Guid = string.Empty;
+        private string _guid = string.Empty;
 
         //定义事件
         public event ChangeTextHandlers ChangeTextEvents;
@@ -55,9 +55,9 @@ namespace XHWK.WKTool
         /// <summary>
         /// 当前视频的下标
         /// </summary>
-        private int i = 0;
+        private int _i;
 
-        private System.Timers.Timer times;
+        private System.Timers.Timer _times;
 
         public UploadWindow()
         {
@@ -67,13 +67,20 @@ namespace XHWK.WKTool
         /// <summary>
         /// 初始化
         /// </summary>
-        public void Initialize(string _resourcename, long _resourcesize, string _suffix, string _guid, int _i)
+        public void Initialize
+        (
+            string mResourcename,
+            long mResourcesize,
+            string mSuffix,
+            string mGuid,
+            int m
+        )
         {
-            i = _i;
-            Resourcename = _resourcename;
-            Resourcesize = _resourcesize;
-            Suffix = _suffix;
-            Guid = _guid;
+            this._i = m;
+            this._resourcename = mResourcename;
+            this._resourcesize = mResourcesize;
+            this._suffix = mSuffix;
+            this._guid = mGuid;
             tip_outer.Visibility = Visibility.Collapsed;
             Tsubjectbook();
         }
@@ -85,7 +92,7 @@ namespace XHWK.WKTool
         /// </returns>
         private void Tsubjectbook()
         {
-            int code = xhapi.TsubjectbookList();
+            int code = _xhapi.TsubjectbookList();
             if (code == 0)
             {
                 for (int i = 0; i < App.TsubjectbookList.Count; i++)
@@ -132,7 +139,7 @@ namespace XHWK.WKTool
             }
             if (App.TsubjectbookList.Count > selectIndex)
             {
-                int code = xhapi.DirectorList
+                int code = _xhapi.DirectorList
                 (
                     App.TsubjectbookList[selectIndex].Lsbid,
                     4,
@@ -162,7 +169,7 @@ namespace XHWK.WKTool
                                 leaf = item.leaf
                             }
                         );
-                        addChild(item);
+                        AddChild(item);
                     }
                     cmbTeachingMaterial.SelectedIndex = 0;
                 }
@@ -178,21 +185,24 @@ namespace XHWK.WKTool
         /// </summary>
         /// <param name="directorList">
         /// </param>
-        private void addChild(Model_DirectorList directorList)
+        private void AddChild(Model_DirectorList directorList)
         {
             if (directorList.children != null && directorList.children.Count > 0)
             {
                 foreach (Model_DirectorList child in directorList.children)
                 {
-                    pageData.zhangjieList.Add(new ComboBoxBean()
-                    {
-                        Key = child.directorid,
-                        Value = getSpace(child.directorlevel) + child.directorname,
-                        leaf = child.leaf
-                    });
+                    pageData.zhangjieList.Add
+                    (
+                        new ComboBoxBean()
+                        {
+                            Key = child.directorid,
+                            Value = GetSpace(child.directorlevel) + child.directorname,
+                            leaf = child.leaf
+                        }
+                    );
                     if (child.children != null && child.children.Count > 0)
                     {
-                        addChild(child);
+                        AddChild(child);
                     }
                 }
             }
@@ -205,7 +215,7 @@ namespace XHWK.WKTool
         /// </param>
         /// <returns>
         /// </returns>
-        private string getSpace(int num)
+        private string GetSpace(int num)
         {
             string str = "";
             for (int i = 0; i < num; i++)
@@ -231,7 +241,7 @@ namespace XHWK.WKTool
         /// </param>
         /// <param name="e">
         /// </param>
-        private void toolbar_list_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        private void ToolbarListSelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             if (App.TsubjectbookList.Count > 0)
             {
@@ -280,21 +290,20 @@ namespace XHWK.WKTool
             book_list.IsEnabled = false;
             cmbTeachingMaterial.IsEnabled = false;
             Thread myThread = new Thread(StartUpload);
-
-            num = 0;
+            _num = 0;
             tip_outer.Visibility = Visibility.Visible;
             myThread.Start();
-            times = new System.Timers.Timer(100);
-            times.Elapsed += Times_ElapsedClick;
-            times.Start();
+            _times = new System.Timers.Timer(100);
+            _times.Elapsed += Times_ElapsedClick;
+            _times.Start();
         }
 
         private void StartUpload()
         {
             try
             {
-                DalUpload dAL_Upload = new DalUpload();
-                if (dAL_Upload.UploadVideoTwo(Guid, out string ErrMessage))
+                DalUpload dAlUpload = new DalUpload();
+                if (dAlUpload.UploadVideoTwo(_guid, out string errMessage))
                 {
                     //        converted: 0
                     //createid: 80
@@ -314,104 +323,116 @@ namespace XHWK.WKTool
                     //schoolid: 12
                     //suffix: "mp4"
                     //uid: 80
-                    Model_ResourceAdd model_ResourceAdd = new Model_ResourceAdd();
-                    Dispatcher.Invoke(() =>
-                    {
-                        model_ResourceAdd = new Model_ResourceAdd
+                    Model_ResourceAdd modelResourceAdd = new Model_ResourceAdd();
+                    Dispatcher.Invoke
+                    (
+                        () =>
                         {
-                            converted = 0,
-                            createid = App.UserInfo.Userid,
-                            directorid = cmbTeachingMaterial.SelectedValue.ToString(),
-                            duration = App.ResourceAddTwo.duration,
-                            subjectid = App.TsubjectbookList[book_list.SelectedIndex].Subjectid,
-                            imgUrl = "",
-                            level = 2,
-                            lsbid = book_list.SelectedValue.ToString(),
-                            mp4code = App.ResourceAddTwo.mp4code,
-                            resourcebelong = 3,
-                            resourceclass = 5,
-                            resourcecover = App.ResourceAddTwo.coverpath,
-                            resourcename = Resourcename,
-                            resourcesize = Resourcesize,
-                            resourcetype = 10,
-                            resourceurl = App.ResourceAddTwo.videopath,
-                            schoolid = App.UserInfo.Schoolid
-                        };
-                    });
-
-                    if (Suffix.Equals("FLV"))
+                            modelResourceAdd = new Model_ResourceAdd
+                            {
+                                converted = 0,
+                                createid = App.UserInfo.Userid,
+                                directorid = cmbTeachingMaterial.SelectedValue.ToString(),
+                                duration = App.ResourceAddTwo.duration,
+                                subjectid = App.TsubjectbookList[book_list.SelectedIndex].Subjectid,
+                                imgUrl = "",
+                                level = 2,
+                                lsbid = book_list.SelectedValue.ToString(),
+                                mp4code = App.ResourceAddTwo.mp4code,
+                                resourcebelong = 3,
+                                resourceclass = 5,
+                                resourcecover = App.ResourceAddTwo.coverpath,
+                                resourcename = _resourcename,
+                                resourcesize = _resourcesize,
+                                resourcetype = 10,
+                                resourceurl = App.ResourceAddTwo.videopath,
+                                schoolid = App.UserInfo.Schoolid
+                            };
+                        }
+                    );
+                    if (_suffix.Equals("FLV"))
                     {
-                        Suffix = "flv";
+                        _suffix = "flv";
                     }
-                    else if (Suffix.Equals("AVI"))
+                    else if (_suffix.Equals("AVI"))
                     {
-                        Suffix = "avi";
+                        _suffix = "avi";
                     }
                     else
                     {
-                        Suffix = "mp4";
+                        _suffix = "mp4";
                     }
-
-                    model_ResourceAdd.suffix = Suffix;
+                    modelResourceAdd.suffix = _suffix;
                     //model_ResourceAdd.uid = 0;//zxy
-                    int code = xhapi.ResourceAdd(model_ResourceAdd);
+                    int code = _xhapi.ResourceAdd(modelResourceAdd);
                     if (code == 0)
                     {
-                        Dispatcher.Invoke(() =>
-                        {
-                            foreach (Model_WKData Vdata in App.WKDataList)
+                        Dispatcher.Invoke
+                        (
+                            () =>
                             {
-                                if (Vdata.VideoList == null)
+                                foreach (Model_WKData vdata in App.WKDataList)
                                 {
-                                    continue;
-                                }
-                                foreach (Model_Video videoinfo in Vdata.VideoList)
-                                {
-                                    if (videoinfo.FileGuid == Guid)
+                                    if (vdata.VideoList == null)
+                                    {
+                                        continue;
+                                    }
+                                    foreach (Model_Video videoinfo in vdata.VideoList)
                                     {
-                                        videoinfo.IsUpload = true;
-                                        break;
+                                        if (videoinfo.FileGuid == _guid)
+                                        {
+                                            videoinfo.IsUpload = true;
+                                            break;
+                                        }
                                     }
                                 }
+                                btnStart.IsEnabled = true;
+                                book_list.IsEnabled = true;
+                                cmbTeachingMaterial.IsEnabled = true;
+                                _num = 99;
+                                _times.Stop();
+                                pgbProcess.Value = 100;
+                                lbProcess.Content = "100%";
+                                MessageWindow.Show("视频上传成功！");
+                                tip_outer.Visibility = Visibility.Collapsed;
+                                if (ChangeTextEvents != null)
+                                {
+                                    ChangeTextEvents("上传成功", _i);
+                                }
+                                Hide();
                             }
-
-                            btnStart.IsEnabled = true;
-                            book_list.IsEnabled = true;
-                            cmbTeachingMaterial.IsEnabled = true;
-                            num = 99;
-                            times.Stop();
-                            pgbProcess.Value = 100;
-                            lbProcess.Content = "100%";
-                            MessageWindow.Show("视频上传成功！");
-                            tip_outer.Visibility = Visibility.Collapsed;
-                            ChangeTextEvents("上传成功", i);
-                            Hide();
-                        });
+                        );
                     }
                     else
                     {
-                        Dispatcher.Invoke(() =>
+                        Dispatcher.Invoke
+                        (
+                            () =>
+                            {
+                                btnStart.IsEnabled = true;
+                                book_list.IsEnabled = true;
+                                cmbTeachingMaterial.IsEnabled = true;
+                                _times.Stop();
+                                tip_outer.Visibility = Visibility.Collapsed;
+                                MessageWindow.Show(App.ServerMsg);
+                            }
+                        );
+                    }
+                }
+                else
+                {
+                    Dispatcher.Invoke
+                    (
+                        () =>
                         {
                             btnStart.IsEnabled = true;
                             book_list.IsEnabled = true;
                             cmbTeachingMaterial.IsEnabled = true;
-                            times.Stop();
+                            _times.Stop();
                             tip_outer.Visibility = Visibility.Collapsed;
-                            MessageWindow.Show(App.ServerMsg);
-                        });
-                    }
-                }
-                else
-                {
-                    Dispatcher.Invoke(() =>
-                    {
-                        btnStart.IsEnabled = true;
-                        book_list.IsEnabled = true;
-                        cmbTeachingMaterial.IsEnabled = true;
-                        times.Stop();
-                        tip_outer.Visibility = Visibility.Collapsed;
-                        MessageWindow.Show(ErrMessage);
-                    });
+                            MessageWindow.Show(errMessage);
+                        }
+                    );
                 }
             }
             catch (Exception ex)
@@ -421,7 +442,7 @@ namespace XHWK.WKTool
                     btnStart.IsEnabled = true;
                     book_list.IsEnabled = true;
                     cmbTeachingMaterial.IsEnabled = true;
-                    times.Stop();
+                    _times.Stop();
                     tip_outer.Visibility = Visibility.Collapsed;
                     MessageWindow.Show("无法上传视频，请检查与服务器链接状态！");
                     App.IsUpLoad = false;
@@ -431,7 +452,7 @@ namespace XHWK.WKTool
             }
         }
 
-        private int num = 0;
+        private int _num;
 
         /// <summary>
         /// 计时器
@@ -444,16 +465,16 @@ namespace XHWK.WKTool
         {
             Dispatcher.Invoke(() =>
             {
-                pgbProcess.Value = num;
-                lbProcess.Content = num.ToString() + "%";
-                if (num < 99)
+                pgbProcess.Value = _num;
+                lbProcess.Content = _num.ToString() + "%";
+                if (_num < 99)
                 {
-                    num++;
-                    times.Interval += (num / 2);
+                    _num++;
+                    _times.Interval += _num / 2;
                 }
                 else
                 {
-                    times.Stop();
+                    _times.Stop();
                 }
             });
         }

XHWK.WKTool/system/HttpHelper.cs

@@ -12,15 +12,18 @@ using System.Threading;
 
 namespace Common.system
 {
-    using XHWK.WKTool.system;
-
     /// <summary>
     /// HttpHelper
     /// 创建人：赵耀
     /// </summary>
     public class HttpHelper
     {
-        public static void init_Request(ref System.Net.HttpWebRequest request)
+        public static string tokenKey = "";
+        public static string tokenValue = "";
+        public static string userId = "";
+        public static bool isParameterEncryption = false;
+
+        public static void InitRequest(ref System.Net.HttpWebRequest request)
         {
             request.Accept = "text/json,*/*;q=0.5";
             request.Headers.Add("Accept-Charset", "utf-8;q=0.7,*;q=0.7");
@@ -36,7 +39,7 @@ namespace Common.system
 
         public static System.Net.HttpWebRequest GetHttpWebRequest(string url)
         {
-            HttpWebRequest request = null;
+            HttpWebRequest request;
             if (url.StartsWith("https", StringComparison.OrdinalIgnoreCase))
             {
                 ServicePointManager.ServerCertificateValidationCallback = new RemoteCertificateValidationCallback(CheckValidationResult);
@@ -57,7 +60,7 @@ namespace Common.system
                 try
                 {
                     HttpWebRequest request = HttpHelper.GetHttpWebRequest(downloadUrl);
-                    HttpHelper.init_Request(ref request);
+                    HttpHelper.InitRequest(ref request);
                     request.Accept = "text/json,*/*;q=0.5";
                     request.AddRange(from, to);
                     request.Headers.Add("Accept-Charset", "utf-8;q=0.7,*;q=0.7");
@@ -95,11 +98,11 @@ namespace Common.system
                 HttpWebRequest request = GetHttpWebRequest(url);
                 if (request != null)
                 {
-                    string retval = null;
-                    init_Request(ref request);
-                    using (WebResponse Response = request.GetResponse())
+                    string retval;
+                    InitRequest(ref request);
+                    using (WebResponse response = request.GetResponse())
                     {
-                        using (StreamReader reader = new System.IO.StreamReader(Response.GetResponseStream(), System.Text.Encoding.UTF8))
+                        using (StreamReader reader = new System.IO.StreamReader(response.GetResponseStream(), System.Text.Encoding.UTF8))
                         {
                             retval = reader.ReadToEnd();
                         }
@@ -121,12 +124,12 @@ namespace Common.system
                 if (request != null)
                 {
                     string retval = null;
-                    init_Request(ref request);
+                    InitRequest(ref request);
                     request.Method = "POST";
                     request.ServicePoint.Expect100Continue = false;
                     request.ContentType = "application/json; charset=utf-8";
                     request.Timeout = 5000;
-                    byte[] bytes = System.Text.UTF8Encoding.UTF8.GetBytes(data);
+                    byte[] bytes = System.Text.Encoding.UTF8.GetBytes(data);
                     request.ContentLength = bytes.Length;
                     using (Stream stream = request.GetRequestStream())
                     {
@@ -148,30 +151,39 @@ namespace Common.system
             return null;
         }
 
-        /// <summary>
-        ///调用Post接口
-        /// </summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
-        public static string HttpPost(string body, string Url)
+        ///  <summary>
+        /// 调用Post接口
+        ///  </summary>
+        ///  <returns></returns>
+        public static string HttpPost(string body, string url)
         {
             try
             {
                 Encoding encoding = Encoding.UTF8;
-
-                HttpWebRequest request = (HttpWebRequest)WebRequest.Create(Url);
+                HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
                 request.Method = "POST";
                 request.Accept = "text/html,application/xhtml+xml,*/*";
                 request.ContentType = "application/json";
-
-                string postDataAES = body;
-                bool IsParameterEncryption = FileToolsCommon.GetConfigValue("IsParameterEncryption") != "0";
-                if (IsParameterEncryption)
+                string postDataAes = body;
+                if (isParameterEncryption)
                 {
-                    postDataAES = AESHelper.AESEncrypt(body, "XINGHUOLIAOYUAN7");
+                    postDataAes = AESHelper.AESEncrypt(body, "XINGHUOLIAOYUAN7");
+                    request.Headers.Add("st", "true");
                 }
-
-                byte[] buffer = encoding.GetBytes(postDataAES);
+                else
+                {
+                    request.Headers.Add("st", "false");
+                }
+                if (!string.IsNullOrEmpty(tokenKey) && !string.IsNullOrEmpty(tokenValue))
+                {
+                    request.Headers.Add("Token-Key", tokenKey);
+                    request.Headers.Add("Token-Value", tokenValue);
+                }
+                if (!string.IsNullOrEmpty(userId))
+                {
+                    request.Headers.Add("User-Id", userId);
+                }
+                byte[] buffer = encoding.GetBytes(postDataAes);
                 request.ContentLength = buffer.Length;
                 request.GetRequestStream().Write(buffer, 0, buffer.Length);
 
@@ -201,46 +213,30 @@ namespace Common.system
         {
             if (!string.IsNullOrEmpty(url) && !string.IsNullOrEmpty(encode) && !string.IsNullOrEmpty(contentType) && postData != null)
             {
-                // webRequest.Headers.Add("Authorization", "Bearer " + "SportApiAuthData");
-                HttpWebResponse webResponse = null;
-                Stream responseStream = null;
-                Stream requestStream = null;
-                StreamReader streamReader = null;
                 try
                 {
-                    string postDataAES = postData;
-                    bool IsParameterEncryption = FileToolsCommon.GetConfigValue("IsParameterEncryption") != "0";
-                    if (IsParameterEncryption)
+                    string postDataAes = postData;
+                    if (isParameterEncryption)
                     {
-                        postDataAES = AESHelper.AESEncrypt(postData, "XINGHUOLIAOYUAN7");
+                        postDataAes = AESHelper.AESEncrypt(postDataAes, "XINGHUOLIAOYUAN7");
                     }
-                    string respstr = GetStreamReader(url, responseStream, requestStream, streamReader, webResponse, timeout, encode, postDataAES, contentType);
+                    string respstr = GetStreamReader
+                    (
+                        url,
+                        null,
+                        null,
+                        null,
+                        null,
+                        timeout,
+                        encode,
+                        postDataAes,
+                        contentType
+                    );
                     return JsonHelper.JsonToObj<T>(respstr);
                 }
                 catch (Exception)
                 {
-                }
-                finally
-                {
-                    if (responseStream != null)
-                    {
-                        responseStream.Dispose();
-                    }
-
-                    if (webResponse != null)
-                    {
-                        webResponse.Close();
-                    }
-
-                    if (requestStream != null)
-                    {
-                        requestStream.Dispose();
-                    }
-
-                    if (streamReader != null)
-                    {
-                        streamReader.Dispose();
-                    }
+                    // ignored
                 }
             }
             return default(T);
@@ -256,6 +252,23 @@ namespace Common.system
                 webRequest.ContentType = contentType + ";" + encode;
                 webRequest.ContentLength = data.Length;
                 webRequest.Timeout = timeout;
+                if (isParameterEncryption)
+                {
+                    webRequest.Headers.Add("st", "true");
+                }
+                else
+                {
+                    webRequest.Headers.Add("st", "false");
+                }
+                if (!string.IsNullOrEmpty(tokenKey) && !string.IsNullOrEmpty(tokenValue))
+                {
+                    webRequest.Headers.Add("Token-Key", tokenKey);
+                    webRequest.Headers.Add("Token-Value", tokenValue);
+                }
+                if (!string.IsNullOrEmpty(userId))
+                {
+                    webRequest.Headers.Add("User-Id", userId);
+                }
                 requestStream = webRequest.GetRequestStream();
                 requestStream.Write(data, 0, data.Length);
                 webResponse = (HttpWebResponse)webRequest.GetResponse();
@@ -282,8 +295,16 @@ namespace Common.system
         /// <param name="strcontent">头</param>
         /// <param name="contenttype">参数</param>
         /// <param name="header">token</param>
+        /// <param name="timeout"></param>
         /// <returns></returns>
-        public static JObject GetFunction(string serviceaddress, string strcontent, string contenttype, string header, int Timeout = 5000)
+        public static JObject GetFunction
+        (
+            string serviceaddress,
+            string strcontent,
+            string contenttype,
+            string header,
+            int timeout = 5000
+        )
         {
             try
             {
@@ -301,7 +322,7 @@ namespace Common.system
                 HttpWebResponse response = (HttpWebResponse)request.GetResponse();
 
                 string encoding = response.ContentEncoding;
-                if (encoding == null || encoding.Length < 1)
+                if (encoding.Length < 1)
                 {
                     encoding = "UTF-8"; //默认编码
                 }
@@ -609,44 +630,29 @@ namespace Common.system
         {
             if (!string.IsNullOrEmpty(url) && !string.IsNullOrEmpty(encode) && !string.IsNullOrEmpty(contentType) && postData != null)
             {
-                HttpWebResponse webResponse = null;
-                Stream responseStream = null;
-                Stream requestStream = null;
-                StreamReader streamReader = null;
                 try
                 {
-                    string postDataAES = postData;
-                    bool IsParameterEncryption = FileToolsCommon.GetConfigValue("IsParameterEncryption") != "0";
-                    if (IsParameterEncryption)
+                    string postDataAes = postData;
+                    if (isParameterEncryption)
                     {
-                        postDataAES = AESHelper.AESEncrypt(postData, "XINGHUOLIAOYUAN7");
+                        postDataAes = AESHelper.AESEncrypt(postData, "XINGHUOLIAOYUAN7");
                     }
-                    return GetStreamReader(url, responseStream, requestStream, streamReader, webResponse, timeout, encode, postDataAES, contentType);
+                    return GetStreamReader
+                    (
+                        url,
+                        null,
+                        null,
+                        null,
+                        null,
+                        timeout,
+                        encode,
+                        postDataAes,
+                        contentType
+                    );
                 }
                 catch (Exception)
                 {
-                }
-                finally
-                {
-                    if (responseStream != null)
-                    {
-                        responseStream.Dispose();
-                    }
-
-                    if (webResponse != null)
-                    {
-                        webResponse.Close();
-                    }
-
-                    if (requestStream != null)
-                    {
-                        requestStream.Dispose();
-                    }
-
-                    if (streamReader != null)
-                    {
-                        streamReader.Dispose();
-                    }
+                    // ignored
                 }
             }
             return null;
@@ -655,13 +661,13 @@ namespace Common.system
         /// <summary>
         /// 获取公网IP和地址，失败则获取局域网IP
         /// </summary>
-        /// <param name="AddressIP">IP地址</param>
-        /// <param name="Address">地址</param>
+        /// <param name="addressIp">IP地址</param>
+        /// <param name="address">地址</param>
         /// <returns></returns>
-        public static bool GetAddressIP(out string AddressIP, out string Address)
+        public static bool GetAddressIp(out string addressIp, out string address)
         {
-            AddressIP = "";
-            Address = "";
+            addressIp = "";
+            address = "";
             try
             {
                 //请求搜狐获取公网IP，获取失败后获取局域网IP
@@ -673,8 +679,8 @@ namespace Common.system
                 string htmlinfo = sr.ReadToEnd();
                 string jsonStr = htmlinfo.Substring(htmlinfo.IndexOf("{"), htmlinfo.LastIndexOf("}") - htmlinfo.IndexOf("{") + 1);
                 JObject obj = JObject.Parse(jsonStr);
-                AddressIP = obj["cip"].ToString();
-                Address = obj["cname"].ToString();
+                addressIp = obj["cip"].ToString();
+                address = obj["cname"].ToString();
                 resStream.Close();
                 sr.Close();
                 return true;
@@ -685,11 +691,11 @@ namespace Common.system
             catch (Exception)
             {
                 //获取本地局域网IP
-                foreach (System.Net.IPAddress _IPAddress in Dns.GetHostEntry(Dns.GetHostName()).AddressList)
+                foreach (System.Net.IPAddress ipAddress in Dns.GetHostEntry(Dns.GetHostName()).AddressList)
                 {
-                    if (_IPAddress.AddressFamily.ToString() == "InterNetwork")
+                    if (ipAddress.AddressFamily.ToString() == "InterNetwork")
                     {
-                        AddressIP = _IPAddress.ToString();
+                        addressIp = ipAddress.ToString();
                     }
                 }
                 return false;

星火微课/星火微课-测试.iss

@@ -3,7 +3,7 @@
 
 #define MyAppName "星火微课测试版"  
 #define MyAppDir "xhwk_test"
-#define MyAppVersion "3.9.8"
+#define MyAppVersion "3.12.0"
 #define MyAppPublisher "河南星火燎原软件科技有限公司"
 #define MyAppURL "http://www.xhkjedu.com/"
 #define MySourcePath "D:\Project\CSharp\xh-wkclient\XHWK.WKTool\bin\x86\Debug\"