对接微服务接口

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="108" />
-    <add key="VersionName" value="3.1.14" />
+    <add key="VersionCode" value="109" />
+    <add key="VersionName" value="3.2.0" />
     <!--皮肤样式 0白 1蓝 2黑色 -->
     <add key="SkinStyle" value="0" />
     <!--是否输出视频记录日志：0否-->

XHWK.WKTool/CreateAMicroLessonWindow.xaml.cs

@@ -8,7 +8,6 @@ using System.Windows.Forms;
 using System.Windows.Input;
 
 using XHWK.Model;
-using XHWK.WKTool.Skin;
 
 namespace XHWK.WKTool
 {
@@ -47,7 +46,7 @@ namespace XHWK.WKTool
                 debugStr = "正式版";
             }
 
-            versionLabel.Content = debugStr+" v" + versionName + "(" + versionCode + ")";
+            versionLabel.Content = debugStr + " v" + versionName + "(" + versionCode + ")";
 
             LoadingCarouseImg();
         }
@@ -340,7 +339,7 @@ namespace XHWK.WKTool
                     //软件是否更新，版本号小于0不更新
                     return;
                 }
-                string url = APP.apiUrl + "/apprecord/get_new";
+                string url = APP.apiUrl + "/sapi/apprecord/get_new";
 
                 string result = HttpHelper.PostAndRespStr(url, "{}");
                 Model.ResultVo<Model_App> resultObj = JsonHelper.JsonToObj<Model.ResultVo<Model_App>>(result);

XHWK.WKTool/DAL/DAL_Upload.cs

@@ -12,21 +12,24 @@ using XHWK.Model;
 namespace XHWK.WKTool.DAL
 {
     /// <summary>
-    /// 上传相关方法
-    /// 创建人：赵耀
-    /// 创建时间：2020年9月4日
+    /// 上传相关方法 创建人：赵耀 创建时间：2020年9月4日
     /// </summary>
     public class DAL_Upload
     {
-        //private string APIRequestAddress = APP.apiUrl;
         private string FileRequestAddress = APP.uploadUrl;
+
         //private string schoolfileRequestAddress = APP.showImageUrl;
         /// <summary>
         /// 文件是否允许上传
         /// </summary>
-        /// <param name="MD5">MD5</param>
-        /// <param name="Message">错误消息</param>
-        /// <returns></returns>
+        /// <param name="MD5">
+        /// MD5
+        /// </param>
+        /// <param name="Message">
+        /// 错误消息
+        /// </param>
+        /// <returns>
+        /// </returns>
         public bool IsAllowUploaded(string MD5, out string Message)
         {
             Exception ex = null;
@@ -52,16 +55,8 @@ namespace XHWK.WKTool.DAL
                         APP.ResourceAddTwo = resultObj.obj;
                         //已存在 不允许上传
                         return false;
-                        //    if (string.IsNullOrWhiteSpace(jo["obj"].ToString()))
-                        //    {
-                        //        //不存在 允许上传
-                        //        return true;
-                        //    }
-                        //    else
-                        //    {
-                        //        //已存在 不允许上传
-                        //        return false;
-                        //    }
+                        // if (string.IsNullOrWhiteSpace(jo["obj"].ToString())) { //不存在 允许上传 return
+                        // true; } else { //已存在 不允许上传 return false; }
                     }
                     else
                     {
@@ -81,13 +76,21 @@ namespace XHWK.WKTool.DAL
             LogHelper.WriteErrLog(ErrMessage, ex);
             return false;
         }
+
         /// <summary>
         /// 上报文件合并指令
         /// </summary>
-        /// <param name="Savefolder">保存文件位置  学校id/resource</param>
-        /// <param name="FileCode">文件唯一编号 Guid</param>
-        /// <param name="Message">错误信息</param>
-        /// <returns></returns>
+        /// <param name="Savefolder">
+        /// 保存文件位置 学校id/resource
+        /// </param>
+        /// <param name="FileCode">
+        /// 文件唯一编号 Guid
+        /// </param>
+        /// <param name="Message">
+        /// 错误信息
+        /// </param>
+        /// <returns>
+        /// </returns>
         public bool ReportFileMerge(string Savefolder, string FileCode, out string Message)
         {
             Exception ex = null;
@@ -147,7 +150,8 @@ namespace XHWK.WKTool.DAL
         /// <summary>
         /// 上传视频
         /// </summary>
-        /// <returns></returns>
+        /// <returns>
+        /// </returns>
         public bool UploadVideo(string VideoGuid, out string ErrMessage)
         {
             ErrMessage = "";
@@ -189,7 +193,6 @@ namespace XHWK.WKTool.DAL
                 {
                     return true;
                 }
-
             }
             catch (Exception ex)
             {
@@ -197,10 +200,12 @@ namespace XHWK.WKTool.DAL
             }
             return false;
         }
+
         /// <summary>
         /// 上传视频
         /// </summary>
-        /// <returns></returns>
+        /// <returns>
+        /// </returns>
         public bool UploadVideoTwo(string VideoGuid, out string ErrMessage)
         {
             ErrMessage = "";
@@ -252,7 +257,7 @@ namespace XHWK.WKTool.DAL
                     string fileName = FileToolsCommon.GetFileName(VideoInfo.VideoPath);
                     //是否续传
                     bool IsSequel = true;
-                    //分块数为0时 从未上传过 
+                    //分块数为0时 从未上传过
                     if (VideoInfo.Block > 0)
                     {
                         //是否已上传所有分块
@@ -267,6 +272,7 @@ namespace XHWK.WKTool.DAL
                             IsSequel = false;
 
                             #region 合并文件
+
                             //合并文件
                             bool isres = ReportFileMerge(APP.UserInfo.cloudcode + "/" + APP.UserInfo.Schoolid.ToString() + "/resource", VideoInfo.FileGuid, out ErrMessage);
                             if (isres)
@@ -278,8 +284,8 @@ namespace XHWK.WKTool.DAL
                             {
                                 return false;
                             }
-                            #endregion
 
+                            #endregion 合并文件
                         }
                     }
                     else
@@ -304,7 +310,6 @@ namespace XHWK.WKTool.DAL
                             VideoInfo.IsUpload = true;
                             return true;
                         }
-
                     }
 
                     ////临时修改 没有断点续传，每次上传都重新上传。
@@ -315,6 +320,7 @@ namespace XHWK.WKTool.DAL
                         long len = VideoInfo.Uploaded * VideoInfo.SliceLen;
 
                         #region 废弃
+
                         ////分块
                         //for (; len + VideoInfo.SliceLen < filelen; VideoInfo.Uploaded++)
                         //{
@@ -336,7 +342,8 @@ namespace XHWK.WKTool.DAL
                         //        return false;
                         //    }
                         //}
-                        #endregion
+
+                        #endregion 废弃
 
                         //分块
                         do
@@ -373,6 +380,7 @@ namespace XHWK.WKTool.DAL
                         } while (len + VideoInfo.SliceLen < filelen);
 
                         #region 合并文件
+
                         //合并文件
                         bool isres = ReportFileMerge(APP.UserInfo.cloudcode + "/" + APP.UserInfo.Schoolid.ToString() + "/resource", VideoInfo.FileGuid, out ErrMessage);
                         if (isres)
@@ -384,7 +392,8 @@ namespace XHWK.WKTool.DAL
                         {
                             return false;
                         }
-                        #endregion
+
+                        #endregion 合并文件
                     }
                     else
                     {
@@ -399,7 +408,6 @@ namespace XHWK.WKTool.DAL
                         }
                     }
                 }
-
             }
             catch (Exception ex)
             {
@@ -408,4 +416,4 @@ namespace XHWK.WKTool.DAL
             return false;
         }
     }
-}
+}

XHWK.WKTool/DAL/XHApi.cs

@@ -16,8 +16,10 @@ namespace XHWK.WKTool.DAL
         /// <summary>
         /// 激活信息--添加
         /// </summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
+        /// <param name="request">
+        /// </param>
+        /// <returns>
+        /// </returns>
         public int ActivationAdd(string mac, string device, string projectcode)
         {
             try
@@ -74,11 +76,14 @@ namespace XHWK.WKTool.DAL
                 return 1;
             }
         }
+
         /// <summary>
         /// 激活信息--添加激活历史
         /// </summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
+        /// <param name="request">
+        /// </param>
+        /// <returns>
+        /// </returns>
         public int ActivationAddHistory()
         {
             try
@@ -116,17 +121,18 @@ namespace XHWK.WKTool.DAL
                 return 1;
             }
         }
+
         /// <summary>
         /// 登录
         /// </summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
+        /// <param name="request">
+        /// </param>
+        /// <returns>
+        /// </returns>
         public int Login(string loginname, string loginpwd)
         {
-            Console.WriteLine(APP.isDebug);
-            Console.WriteLine(APP.apiUrl);
             Console.WriteLine(FileToolsCommon.GetConfigValue("APIRequestAddress"));
-            string url = APP.apiUrl + "/user/login";//地址
+            string url = APP.apiUrl + "/suser/user/login";//地址
 
             //1.193.37.200
             string Address = "";//河南 郑州
@@ -159,29 +165,36 @@ namespace XHWK.WKTool.DAL
                 return 1;
             }
         }
+
         /// <summary>
         /// 下载头像
         /// </summary>
-        /// <param name="headPortrait"></param>
-        /// <param name="SavePath"></param>
-        /// <returns></returns>
+        /// <param name="headPortrait">
+        /// </param>
+        /// <param name="SavePath">
+        /// </param>
+        /// <returns>
+        /// </returns>
         public bool DownloadAvatar(string headPortrait, string SavePath)
         {
             string url = APP.showImageUrl + headPortrait;
             bool result = HttpHelper.GetDataGetHtml(url, SavePath, "");
             return result;
         }
+
         /// <summary>
         /// 教师教材列表
         /// </summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
+        /// <param name="request">
+        /// </param>
+        /// <returns>
+        /// </returns>
         public int TsubjectbookList()
         {
             APP.TsubjectbookList = new List<Model_TsubjectbookList>();
             try
             {
-                string url = APP.apiUrl + "/tsubjectbook/list";//地址
+                string url = APP.apiUrl + "/sstudy/tsubjectbook/list";//地址
                 Dictionary<string, int> dic = new Dictionary<string, int>
                 {
                     { "teacherid",APP.UserInfo.Userid}
@@ -206,17 +219,20 @@ namespace XHWK.WKTool.DAL
                 return 1;
             }
         }
+
         /// <summary>
         /// 章节--列表
         /// </summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
+        /// <param name="request">
+        /// </param>
+        /// <returns>
+        /// </returns>
         public int DirectorList(string lsbid, int belong, int createid)
         {
             APP.DirectorList = new List<Model_DirectorList>();
             try
             {
-                string url = APP.apiUrl + "/director/list";//地址
+                string url = APP.apiUrl + "/sstudy/director/list";//地址
                 Dictionary<string, string> dic = new Dictionary<string, string>
                 {
                     { "lsbid", lsbid },
@@ -243,17 +259,20 @@ namespace XHWK.WKTool.DAL
                 return 1;
             }
         }
+
         /// <summary>
         /// 资源--添加
         /// </summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
+        /// <param name="request">
+        /// </param>
+        /// <returns>
+        /// </returns>
         public int ResourceAdd(Model_ResourceAdd model)
         {
             APP.DirectorList = new List<Model_DirectorList>();
             try
             {
-                string url = APP.apiUrl + "/resource/add";//地址
+                string url = APP.apiUrl + "/sstudy/resource/add";//地址
                 Dictionary<string, object> dic = new Dictionary<string, object>
                 {
                     //            converted: 0
@@ -298,7 +317,6 @@ namespace XHWK.WKTool.DAL
                 dic.Add("suffix", model.suffix);
                 //dic.Add("uid", model.uid);
 
-
                 string body = JsonHelper.ToJson(dic);
                 string xmlDoc = HttpHelper.HttpPost(body, url);
                 JObject obj = JObject.Parse(xmlDoc);
@@ -324,8 +342,10 @@ namespace XHWK.WKTool.DAL
         /// <summary>
         /// 请求服务地址
         /// </summary>
-        /// <param name="Schoolcode"></param>
-        /// <returns></returns>
+        /// <param name="Schoolcode">
+        /// </param>
+        /// <returns>
+        /// </returns>
         public bool GetServiceAddress(string Schoolcode, out string Message)
         {
             string url = APP.certapiUrl + "/school/find_code";//地址
@@ -366,4 +386,4 @@ namespace XHWK.WKTool.DAL
             }
         }
     }
-}
+}

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

@@ -3,7 +3,7 @@
 
 #define MyAppName "星火微课"  
 #define MyAppDir "xhwk"
-#define MyAppVersion "3.1.14"
+#define MyAppVersion "3.2.0"
 #define MyAppPublisher "河南星火燎原软件科技有限公司"
 #define MyAppURL "http://www.xhkjedu.com/"
 #define MySourcePath "D:\Project\CSharp\xhwkclient\XHWK.WKTool\bin\x86\Debug\"
@@ -30,7 +30,7 @@ UsedUserAreasWarning=no
 ; 以下行取消注释，以在非管理安装模式下运行（仅为当前用户安装）。
 ;PrivilegesRequired=lowest
 OutputDir={#MyTargetPath}
-OutputBaseFilename="{#MyAppName} v{#MyAppVersion}"
+OutputBaseFilename="{#MyAppName}v{#MyAppVersion}"
 SetupIconFile="{#MySourcePath}{#MyIcoName}"
 Compression=lzma
 SolidCompression=yes