zhao：增加DAL

XHZB.DAL/Class1.cs

@@ -0,0 +1,72 @@
+using Common.system;
+
+using Newtonsoft.Json.Linq;
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace XHZB.DAL
+{
+    public class Class1
+    {
+        /// <summary>
+        /// API请求地址
+        /// </summary>
+        private string APIRequestAddress = FileToolsCommon.GetConfigValue("APIRequestAddress");
+        /// <summary>
+        /// 文件请求地址
+        /// </summary>
+        private string FileRequestAddress = FileToolsCommon.GetConfigValue("FileRequestAddress");
+        /// <summary>
+        /// 测试
+        /// </summary>
+        /// <param name="Message"></param>
+        /// <returns></returns>
+        public bool test( string FileCode, out string Message)
+        {
+
+            Exception ex = null;
+            Message = "";//请求重试5次 共5秒
+            for (int num = 0; num < 5; num++)
+            {
+                try
+                {
+                    JObject jo = HttpHelper.PostFunction(FileRequestAddress + @"/chunkdb/mergechunk", @"application/x-www-form-urlencoded", @"identifier=" + FileCode, "");
+                    if (jo == null)
+                    {
+                        Message = "无法访问文件服务器，请检查网络或文件服务器地址。";
+                        return false;
+                    }
+                    //Model.ResultVo<Model_ResourceAddTwo> resultObj = JsonHelper.JsonToObj<Model.ResultVo<Model_ResourceAddTwo>>(jo.ToString());
+                    //APP.ResourceAddTwo = new Model_ResourceAddTwo();
+                    ////0成功，1失败
+                    //if (resultObj.code == 0 && resultObj.obj != null)
+                    //{
+                    //    APP.ResourceAddTwo = resultObj.obj;
+                        
+                    //    return true;
+                    //}
+                    //else
+                    //{
+                    //    //Message = "上传失败！";
+                    //    Message = jo["msg"].ToString();
+                    //    return false;
+                    //}
+                }
+                catch (Exception e)
+                {
+                    Message = e.Message;
+                    ex = e;
+                    Thread.Sleep(1000);
+                }
+            }
+            string ErrMessage = "【请求失败】(test):请求失败。" + Message;
+            LogHelper.WriteErrLog(ErrMessage, ex);
+            return false;
+        }
+    }
+}

XHZB.DAL/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("XHZB.DAL")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("XHZB.DAL")]
+[assembly: AssemblyCopyright("Copyright ©  2021")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
+[assembly: Guid("45c8855f-093c-4f92-b9a7-ad3e91c97c06")]
+
+// 程序集的版本信息由下列四个值组成: 
+//
+//      主版本
+//      次版本
+//      生成号
+//      修订号
+//
+//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
+//通过使用 "*"，如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

XHZB.DAL/XHZB.DAL.csproj

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{45C8855F-093C-4F92-B9A7-AD3E91C97C06}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>XHZB.DAL</RootNamespace>
+    <AssemblyName>XHZB.DAL</AssemblyName>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Common\dlls\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Common\dlls\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Class1.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Common\Common.csproj">
+      <Project>{808a7075-5af5-46b3-8ef6-514c0b5fa8d7}</Project>
+      <Name>Common</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>

XHZB.Desktop/App.config

@@ -13,5 +13,13 @@
     <add key="VersionName" value="1.0.1" />
     <!--流媒体服务器地址-->
     <add key="ServerPath" value="live2.xhkjedu.com"/>
+    <!--API请求地址-->
+    <add key="APIRequestAddress" value="http://schoolapi.xhkjedu.com" />
+    <!--文件平台请求地址-->
+    <add key="FileRequestAddress" value="http://schoolfile.xhkjedu.com" />
+    <!--展示文件服务器请求地址-->
+    <add key="SchoolfileRequestAddress" value="http://schoolfile.xhkjedu.com" />
+    <!--认证请求地址-->
+    <add key="CertapiRequestAddress" value="http://certapi.xhkjedu.com" />
   </appSettings>
 </configuration>

XHZB.Desktop/App.cs

@@ -1,4 +1,5 @@
-using Common.system;
+using Common;
+using Common.system;
 
 using System;
 using System.Collections.Generic;
@@ -24,6 +25,14 @@ namespace XHZB.Desktop
         /// </summary>
         public static string RTMPServerPath = FileToolsCommon.GetConfigValue("ServerPath");
         /// <summary>
+        /// AES账号加密字符串
+        /// </summary>
+        public static string AESAccountStr = null;
+        /// <summary>
+        /// AES密码加密字符串
+        /// </summary>
+        public static string AESPassWordStr = null;
+        /// <summary>
         /// 接口地址
         /// </summary>
         public static string apiUrl = isDebug ? "http://schoolapitest.xhkjedu.com" : FileToolsCommon.GetConfigValue("APIRequestAddress");
@@ -89,14 +98,33 @@ namespace XHZB.Desktop
         public static MainWindow W_MainWindow = null;
         #endregion
         #endregion
-
+        /// <summary>
+        /// 启动入口
+        /// </summary>
+        /// <param name="args">参数1：账号加密字符串 参数1：密码加密字符串</param>
         [STAThread]
-        private static void Main()
+        private static void Main(string[] args)
         {
             //myloading = new LoadDialog();
             StopSameProcess();
             Killffmpeg();
             try
+            {
+                if (args != null)
+                {
+                    AESAccountStr = args[0];
+                    AESPassWordStr = args[1];
+                    ////解密
+                    //string Account= AESHelper.AESDecrypt(AESAccountStr);
+                    //string PassWord = AESHelper.AESDecrypt(AESPassWordStr);
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteErrLog("参数接收失败：" + ex.Message, ex);
+                throw;
+            }
+            try
             {
                 WindowsIdentity identity = WindowsIdentity.GetCurrent();
                 WindowsPrincipal principal = new WindowsPrincipal(identity);

XHZB.Desktop/XHZB.Desktop.csproj

@@ -118,6 +118,10 @@
       <Project>{808a7075-5af5-46b3-8ef6-514c0b5fa8d7}</Project>
       <Name>Common</Name>
     </ProjectReference>
+    <ProjectReference Include="..\XHZB.DAL\XHZB.DAL.csproj">
+      <Project>{45c8855f-093c-4f92-b9a7-ad3e91c97c06}</Project>
+      <Name>XHZB.DAL</Name>
+    </ProjectReference>
     <ProjectReference Include="..\XHZB.Model\XHZB.Model.csproj">
       <Project>{fc00ab0b-da8c-46be-aad5-8d8a7fb8c767}</Project>
       <Name>XHZB.Model</Name>

XHZB.sln

@@ -9,6 +9,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XHZB.Desktop", "XHZB.Deskto
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XHZB.Model", "XHZB.Model\XHZB.Model.csproj", "{FC00AB0B-DA8C-46BE-AAD5-8D8A7FB8C767}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XHZB.DAL", "XHZB.DAL\XHZB.DAL.csproj", "{45C8855F-093C-4F92-B9A7-AD3E91C97C06}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -27,6 +29,10 @@ Global
 		{FC00AB0B-DA8C-46BE-AAD5-8D8A7FB8C767}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FC00AB0B-DA8C-46BE-AAD5-8D8A7FB8C767}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FC00AB0B-DA8C-46BE-AAD5-8D8A7FB8C767}.Release|Any CPU.Build.0 = Release|Any CPU
+		{45C8855F-093C-4F92-B9A7-AD3E91C97C06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{45C8855F-093C-4F92-B9A7-AD3E91C97C06}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{45C8855F-093C-4F92-B9A7-AD3E91C97C06}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{45C8855F-093C-4F92-B9A7-AD3E91C97C06}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE