Skip to content

C
code
Commit e6aa593f authored by solho's avatar solho
Browse files
Options

feat:套件升級相關修改 

feat:部分基底CODE調整
parent edfb1d02
Show whitespace changes
Inline Side-by-side
Showing with 159 additions and 199 deletions
WebAPI/Areas/HelpPage/Views/Web.config
View file @ e6aa593f
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
</configSections> </configSections>
<system.web.webPages.razor> <system.web.webPages.razor>
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" /> <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.8.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<pages pageBaseType="System.Web.Mvc.WebViewPage"> <pages pageBaseType="System.Web.Mvc.WebViewPage">
<namespaces> <namespaces>
<add namespace="System.Web.Mvc" /> <add namespace="System.Web.Mvc" />
......
WebAPI/Areas/HelpPage/Views/_ViewStart.cshtml
View file @ e6aa593f
@{ @{
// Change the Layout path below to blend the look and feel of the help page with your existing web pages // Change the Layout path below to blend the look and feel of the help page with your existing web pages.
Layout = "~/Views/Shared/_Layout.cshtml"; Layout = "~/Areas/HelpPage/Views/Shared/_Layout.cshtml";
} }
\ No newline at end of file
WebAPI/Controllers/Esn_Subitem/Esn_Todos_FlowController.cs
View file @ e6aa593f
...@@ -132,7 +132,7 @@ namespace WebAPI.Controllers ...@@ -132,7 +132,7 @@ namespace WebAPI.Controllers
ExportEHR_hisModel hisT; ExportEHR_hisModel hisT;
SqlCommand cmd = new SqlCommand("", Conn) SqlCommand cmd = new SqlCommand("", Conn)
{ {
CommandText = @"select b.cn_name, a.* from esn_todos_SettleLog a CommandText = @"select b.cn_name, a.id, a.Country, a.update_time, a.update_user_id, a.Create_user_id, a.Create_time from esn_todos_SettleLog a
left join s_user_info b on a.Create_user_id=b.user_id left join s_user_info b on a.Create_user_id=b.user_id
where a.Create_user_id=@Create_user_id @wherecase" where a.Create_user_id=@Create_user_id @wherecase"
}; };
...@@ -146,7 +146,7 @@ namespace WebAPI.Controllers ...@@ -146,7 +146,7 @@ namespace WebAPI.Controllers
hisT = new ExportEHR_hisModel() hisT = new ExportEHR_hisModel()
{ {
id = (int)dr["id"], id = (int)dr["id"],
SaveData = dr["SaveData"].ToString(), //SaveData = dr["SaveData"].ToString(),
update_time = (DateTime?)dr["update_time"], update_time = (DateTime?)dr["update_time"],
update_user_id = dr["update_user_id"].ToString(), update_user_id = dr["update_user_id"].ToString(),
Create_time = (DateTime?)dr["Create_time"], Create_time = (DateTime?)dr["Create_time"],
......
WebAPI/Controllers/Esn_Subitem/Esn_todosController.cs
View file @ e6aa593f
...@@ -16,7 +16,6 @@ using System.Web.Http; ...@@ -16,7 +16,6 @@ using System.Web.Http;
using WebAPI.Models; using WebAPI.Models;
using MySql.Data.MySqlClient; using MySql.Data.MySqlClient;
using static WebAPI.Tool.Common; using static WebAPI.Tool.Common;
using System.Web.Script.Serialization;
using System.Text; using System.Text;
namespace WebAPI.Controllers namespace WebAPI.Controllers
...@@ -467,8 +466,6 @@ namespace WebAPI.Controllers ...@@ -467,8 +466,6 @@ namespace WebAPI.Controllers
public List<validpointModel> validpoint(JObject obj_input) public List<validpointModel> validpoint(JObject obj_input)
{ {
List<validpointModel> resultslist = new List<validpointModel>(); List<validpointModel> resultslist = new List<validpointModel>();
try
{
using (MySqlConnection mconn = new MySqlConnection(ConfigurationManager.ConnectionStrings["essenConnection"].ConnectionString)) using (MySqlConnection mconn = new MySqlConnection(ConfigurationManager.ConnectionStrings["essenConnection"].ConnectionString))
{ {
String sqlstr = @"select v2.text as attr_userID, v22.text as attr_UserName, ROUND(-v21.vInt / 3) AS lastthreeAvg, v21.* from String sqlstr = @"select v2.text as attr_userID, v22.text as attr_UserName, ROUND(-v21.vInt / 3) AS lastthreeAvg, v21.* from
...@@ -493,10 +490,6 @@ namespace WebAPI.Controllers ...@@ -493,10 +490,6 @@ namespace WebAPI.Controllers
resultslist = results.ToList<validpointModel>(); resultslist = results.ToList<validpointModel>();
} }
}
catch (Exception e)
{
}
return resultslist; return resultslist;
} }
...@@ -507,8 +500,7 @@ namespace WebAPI.Controllers ...@@ -507,8 +500,7 @@ namespace WebAPI.Controllers
{ {
using (SqlConnection Conn = new SqlConnection(connString)) using (SqlConnection Conn = new SqlConnection(connString))
{ {
Dapper.SqlMapper.Settings.CommandTimeout = 60000;
var results = Conn.Query<SP_rpt_PerformanceMonth_FlowModel>("rpt_PerformanceMonth_Flow" var results = Conn.Query<SP_rpt_PerformanceMonth_FlowModel>("rpt_PerformanceMonth_Flow"
, new , new
{ {
...@@ -525,8 +517,9 @@ namespace WebAPI.Controllers ...@@ -525,8 +517,9 @@ namespace WebAPI.Controllers
} }
} }
catch (Exception e) catch
{ {
} }
return resultslist; return resultslist;
} }
...@@ -566,6 +559,11 @@ namespace WebAPI.Controllers ...@@ -566,6 +559,11 @@ namespace WebAPI.Controllers
return result; return result;
} }
/// <summary>
/// 取得EHR資料 輸出部分
/// </summary>
/// <param name="param"></param>
/// <returns></returns>
[Route("Get_EHRData")] [Route("Get_EHRData")]
[CorsHandle] [CorsHandle]
...@@ -588,11 +586,12 @@ namespace WebAPI.Controllers ...@@ -588,11 +586,12 @@ namespace WebAPI.Controllers
if (obj_input["@furtherSql"] == null || obj_input["@furtherSql"].ToString() == "") if (obj_input["@furtherSql"] == null || obj_input["@furtherSql"].ToString() == "")
{ {
//給SP預設參數 預設為所有人
obj_input["@furtherSql"] = @"select eemp.user_id from[dbo].[evw_Employee] eemp obj_input["@furtherSql"] = @"select eemp.user_id from[dbo].[evw_Employee] eemp
left join[dbo].[evw_qResult_EmpDS] eqeds on eemp.Emp_DS = eqeds.Emp_DS left join[dbo].[evw_qResult_EmpDS] eqeds on eemp.Emp_DS = eqeds.Emp_DS
left join[dbo].evw_qResult_EmpItem eqeit on eemp.Emp_Item = eqeit.Emp_Item left join evw_qResult_Dept eqd on eqd.targetID = eemp.Emp_DeptNum"; left join[dbo].evw_qResult_EmpItem eqeit on eemp.Emp_Item = eqeit.Emp_Item left join evw_qResult_Dept eqd on eqd.targetID = eemp.Emp_DeptNum";
} }
obj_input["@p_params"] = "report,,-999999,"+ Date_settlement_begin + "," + Date_settlement_end + ",Flow,HR,HR"; obj_input["@p_params"] = "report,,-999999,"+ Date_settlement_begin + "," + Date_settlement_end + ",Flow,HR,HR"; //給SP預設參數
obj_input["@strFlowUserID_also"] = ""; obj_input["@strFlowUserID_also"] = "";
List<validpointModel> resultslist檢核扣點 = validpoint(obj_input); List<validpointModel> resultslist檢核扣點 = validpoint(obj_input);
List<SP_rpt_PerformanceMonth_FlowModel> resultslist = rpt_PerformanceMonth_Flow(obj_input); List<SP_rpt_PerformanceMonth_FlowModel> resultslist = rpt_PerformanceMonth_Flow(obj_input);
...@@ -609,11 +608,13 @@ namespace WebAPI.Controllers ...@@ -609,11 +608,13 @@ namespace WebAPI.Controllers
} }
} }
resultslist = resultslist.Where(p => p.處理事項數 > 0).ToList();
foreach (SP_rpt_PerformanceMonth_FlowModel data in resultslist) foreach (SP_rpt_PerformanceMonth_FlowModel data in resultslist)
{ {
ExportEhrModel TempExportEhrModel = new ExportEhrModel() ExportEhrModel TempExportEhrModel = new ExportEhrModel()
{ {
userID = data.attr_userID,
所別 = data.所別, 所別 = data.所別,
管理中心 = data.管理中心, 管理中心 = data.管理中心,
一級部門 = data.一級部門, 一級部門 = data.一級部門,
...@@ -631,13 +632,8 @@ namespace WebAPI.Controllers ...@@ -631,13 +632,8 @@ namespace WebAPI.Controllers
} }
obj_input["gUserID_wade"] = obj_input["@p_Emp_ID"]; obj_input["gUserID_wade"] = obj_input["@p_Emp_ID"];
String jstring = JsonConvert.SerializeObject(ExportEhr); String jstring = JsonConvert.SerializeObject(ExportEhr);
//cmd.Parameters.AddWithValue("@SaveData", obj_input["SaveData"].ToString());
//cmd.Parameters.AddWithValue("@gUserID_wade", obj_input["gUserID_wade"].ToString());
obj_input["SaveData"] = jstring; obj_input["SaveData"] = jstring;
DataTable dtsave = Esn_Todos_FlowController.Save_PointSettlement_Log_Base(obj_input); DataTable dtsave = Esn_Todos_FlowController.Save_PointSettlement_Log_Base(obj_input);
//var json = new JavaScriptSerializer().Serialize(resultslist[0]);
//JObject json2 =JObject.Parse(new JavaScriptSerializer().Serialize(resultslist));
//json[0]["aaa"] = "12345";
response.Msg = ExportEhr; response.Msg = ExportEhr;
response.Code = "1"; response.Code = "1";
} }
......
WebAPI/Controllers/FeeOfferConfigController.cs
View file @ e6aa593f
...@@ -271,11 +271,7 @@ namespace WebAPI.Controllers ...@@ -271,11 +271,7 @@ namespace WebAPI.Controllers
var table = ds.Tables[0]; var table = ds.Tables[0];
DataRow drh = table.Rows[0]; DataRow drh = table.Rows[0];
for (int i = 0; i < drh.ItemArray.Length; i++) for (int i = 0; i < drh.ItemArray.Length; i++)
{
string a = drh[i].ToString();
Console.WriteLine(ToTraditional(drh[i].ToString()));
table.Columns[i].ColumnName = ToTraditional(drh[i].ToString()); table.Columns[i].ColumnName = ToTraditional(drh[i].ToString());
}
Dictionary<String, String> ids = new Dictionary<String, String>(), Temps = new Dictionary<String, String>(); Dictionary<String, String> ids = new Dictionary<String, String>(), Temps = new Dictionary<String, String>();
DataRow drRow; DataRow drRow;
......
WebAPI/Models/Esn_TodosModel.cs
View file @ e6aa593f
...@@ -54,7 +54,7 @@ namespace WebAPI.Models ...@@ -54,7 +54,7 @@ namespace WebAPI.Models
public String attr_todos2 { get; set; } public String attr_todos2 { get; set; }
public String attr_RejectCount { get; set; } public String attr_RejectCount { get; set; }
public String attr_nn_toConfirmAll { get; set; } public String attr_nn_toConfirmAll { get; set; }
public String 處理事項數 { get; set; } public int 處理事項數 { get; set; }
public String attr_todos3 { get; set; } public String attr_todos3 { get; set; }
public String attr_MapClasslist { get; set; } public String attr_MapClasslist { get; set; }
...@@ -89,6 +89,7 @@ namespace WebAPI.Models ...@@ -89,6 +89,7 @@ namespace WebAPI.Models
/// </summary> /// </summary>
public class ExportEhrModel public class ExportEhrModel
{ {
public String userID { get; set; }
public String 所別 { get; set; } public String 所別 { get; set; }
public String 管理中心 { get; set; } public String 管理中心 { get; set; }
public String 一級部門 { get; set; } public String 一級部門 { get; set; }
......
WebAPI/Tool/SqlServerHelper.cs
View file @ e6aa593f
...@@ -165,7 +165,9 @@ namespace WebAPI.Tool ...@@ -165,7 +165,9 @@ namespace WebAPI.Tool
if (selectSqlCommand ==null) if (selectSqlCommand ==null)
throw new Exception("要执行的selectSqlCommand不能为空"); throw new Exception("要执行的selectSqlCommand不能为空");
OpenConnection(); OpenConnection();
if(selectSqlCommand.Connection==null)
selectSqlCommand.Connection = SqlCnt; selectSqlCommand.Connection = SqlCnt;
SqlDataAdapter sqlDataAdapter = new SqlDataAdapter(selectSqlCommand); SqlDataAdapter sqlDataAdapter = new SqlDataAdapter(selectSqlCommand);
DataTable dataTable = new DataTable(); DataTable dataTable = new DataTable();
try try
......
WebAPI/Web.config
View file @ e6aa593f
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
<add name="DefaultConnection" connectionString="Data Source=47.91.213.74,6002;Initial Catalog=IPEasy_test;Persist Security Info=True;User ID=ipeasy;Password=ipeasy.123" providerName="System.Data.SqlClient" /> <add name="DefaultConnection" connectionString="Data Source=47.91.213.74,6002;Initial Catalog=IPEasy_test;Persist Security Info=True;User ID=ipeasy;Password=ipeasy.123" providerName="System.Data.SqlClient" />
<!--核稿歷史--> <!--核稿歷史-->
<add name="eflow_cur" connectionString="Data Source=47.91.213.74,6002;Initial Catalog=IPEasy_test;Persist Security Info=True;User ID=ipeasyTest;Password=ipeasy.123" providerName="System.Data.SqlClient" /> <add name="eflow_cur" connectionString="Data Source=47.91.213.74,6002;Initial Catalog=IPEasy_test;Persist Security Info=True;User ID=ipeasyTest;Password=ipeasy.123" providerName="System.Data.SqlClient" />
<!--內管系統-->
<add name="essenConnection" connectionString="server=192.168.1.174;port=3306;user id=sol; password=FK35cnvbeH3BNAxV; database=essen_test " /> <add name="essenConnection" connectionString="server=192.168.1.174;port=3306;user id=sol; password=FK35cnvbeH3BNAxV; database=essen_test " />
</connectionStrings> </connectionStrings>
<appSettings> <appSettings>
...@@ -20,7 +21,6 @@ ...@@ -20,7 +21,6 @@
<add key="webpages:Enabled" value="false" /> <add key="webpages:Enabled" value="false" />
<add key="ClientValidationEnabled" value="true" /> <add key="ClientValidationEnabled" value="true" />
<add key="UnobtrusiveJavaScriptEnabled" value="true" /> <add key="UnobtrusiveJavaScriptEnabled" value="true" />
<add key="admin_user_id" value="true" />
</appSettings> </appSettings>
<!-- <!--
如需 web.config 變更的說明，請參閱 http://go.microsoft.com/fwlink/?LinkId=235367。 如需 web.config 變更的說明，請參閱 http://go.microsoft.com/fwlink/?LinkId=235367。
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" /> <assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" />
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />
...@@ -70,6 +70,14 @@ ...@@ -70,6 +70,14 @@
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" /> <bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" /> <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
...@@ -80,24 +88,22 @@ ...@@ -80,24 +88,22 @@
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" /> <bindingRedirect oldVersion="1.0.0.0-5.2.8.0" newVersion="5.2.8.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> <assemblyIdentity name="ExcelNumberFormat" publicKeyToken="23c6f5d73be07eca" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" /> <bindingRedirect oldVersion="0.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> <assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" /> <bindingRedirect oldVersion="0.0.0.0-1.8.9.0" newVersion="1.8.9.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Web.Infrastructure" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<system.codedom>
<compilers>
<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701" />
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
</compilers>
</system.codedom>
<entityFramework> <entityFramework>
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework"> <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
<parameters> <parameters>
...@@ -108,4 +114,10 @@ ...@@ -108,4 +114,10 @@
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" /> <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
</providers> </providers>
</entityFramework> </entityFramework>
<system.codedom>
<compilers>
<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=3.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701" />
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=3.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
</compilers>
</system.codedom>
</configuration> </configuration>
\ No newline at end of file
WebAPI/WebAPI.csproj
View file @ e6aa593f
...@@ -46,8 +46,11 @@ ...@@ -46,8 +46,11 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="BouncyCastle.Crypto, Version=1.8.3.0, Culture=neutral, PublicKeyToken=0e99375e54769942"> <Reference Include="Antlr3.Runtime, Version=3.5.0.2, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
<HintPath>packages\BouncyCastle.1.8.3.1\lib\BouncyCastle.Crypto.dll</HintPath> <HintPath>packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll</HintPath>
</Reference>
<Reference Include="BouncyCastle.Crypto, Version=1.8.9.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
<HintPath>packages\BouncyCastle.1.8.9\lib\BouncyCastle.Crypto.dll</HintPath>
</Reference> </Reference>
<Reference Include="ClosedXML, Version=0.95.3.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="ClosedXML, Version=0.95.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\ClosedXML.0.95.3\lib\net46\ClosedXML.dll</HintPath> <HintPath>packages\ClosedXML.0.95.3\lib\net46\ClosedXML.dll</HintPath>
...@@ -71,13 +74,13 @@ ...@@ -71,13 +74,13 @@
<HintPath>packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath> <HintPath>packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
</Reference> </Reference>
<Reference Include="ExcelDataReader, Version=3.6.0.0, Culture=neutral, PublicKeyToken=93517dbe6a4012fa, processorArchitecture=MSIL"> <Reference Include="ExcelDataReader, Version=3.6.0.0, Culture=neutral, PublicKeyToken=93517dbe6a4012fa, processorArchitecture=MSIL">
<HintPath>.\packages\ExcelDataReader.3.6.0\lib\net45\ExcelDataReader.dll</HintPath> <HintPath>packages\ExcelDataReader.3.6.0\lib\net45\ExcelDataReader.dll</HintPath>
</Reference> </Reference>
<Reference Include="ExcelDataReader.DataSet, Version=3.6.0.0, Culture=neutral, PublicKeyToken=93517dbe6a4012fa, processorArchitecture=MSIL"> <Reference Include="ExcelDataReader.DataSet, Version=3.6.0.0, Culture=neutral, PublicKeyToken=93517dbe6a4012fa, processorArchitecture=MSIL">
<HintPath>.\packages\ExcelDataReader.DataSet.3.6.0\lib\net35\ExcelDataReader.DataSet.dll</HintPath> <HintPath>packages\ExcelDataReader.DataSet.3.6.0\lib\net35\ExcelDataReader.DataSet.dll</HintPath>
</Reference> </Reference>
<Reference Include="ExcelNumberFormat, Version=1.0.10.0, Culture=neutral, PublicKeyToken=23c6f5d73be07eca, processorArchitecture=MSIL"> <Reference Include="ExcelNumberFormat, Version=1.1.0.0, Culture=neutral, PublicKeyToken=23c6f5d73be07eca, processorArchitecture=MSIL">
<HintPath>packages\ExcelNumberFormat.1.0.10\lib\net20\ExcelNumberFormat.dll</HintPath> <HintPath>packages\ExcelNumberFormat.1.1.0\lib\net20\ExcelNumberFormat.dll</HintPath>
</Reference> </Reference>
<Reference Include="Google.Protobuf, Version=3.11.4.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL"> <Reference Include="Google.Protobuf, Version=3.11.4.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
<HintPath>packages\Google.Protobuf.3.11.4\lib\net45\Google.Protobuf.dll</HintPath> <HintPath>packages\Google.Protobuf.3.11.4\lib\net45\Google.Protobuf.dll</HintPath>
...@@ -91,23 +94,29 @@ ...@@ -91,23 +94,29 @@
<Reference Include="K4os.Hash.xxHash, Version=1.0.6.0, Culture=neutral, PublicKeyToken=32cd54395057cec3, processorArchitecture=MSIL"> <Reference Include="K4os.Hash.xxHash, Version=1.0.6.0, Culture=neutral, PublicKeyToken=32cd54395057cec3, processorArchitecture=MSIL">
<HintPath>packages\K4os.Hash.xxHash.1.0.6\lib\net46\K4os.Hash.xxHash.dll</HintPath> <HintPath>packages\K4os.Hash.xxHash.1.0.6\lib\net46\K4os.Hash.xxHash.dll</HintPath>
</Reference> </Reference>
<Reference Include="log4net, Version=2.0.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL"> <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>packages\log4net.2.0.12\lib\net45\log4net.dll</HintPath> <HintPath>packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=3.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualBasic" /> <Reference Include="Microsoft.VisualBasic" />
<Reference Include="Microsoft.Web.Infrastructure, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>packages\Microsoft.Web.Infrastructure.2.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
</Reference>
<Reference Include="MySql.Data, Version=8.0.22.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL"> <Reference Include="MySql.Data, Version=8.0.22.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<HintPath>packages\MySql.Data.8.0.22\lib\net452\MySql.Data.dll</HintPath> <HintPath>packages\MySql.Data.8.0.22\lib\net452\MySql.Data.dll</HintPath>
</Reference> </Reference>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath> <HintPath>packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference> </Reference>
<Reference Include="Renci.SshNet, Version=2016.1.0.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL"> <Reference Include="Renci.SshNet, Version=2016.1.0.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
<HintPath>packages\SSH.NET.2016.1.0\lib\net40\Renci.SshNet.dll</HintPath> <HintPath>packages\SSH.NET.2016.1.0\lib\net40\Renci.SshNet.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>packages\System.Buffers.4.5.1\lib\netstandard1.1\System.Buffers.dll</HintPath> <HintPath>packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.ComponentModel" /> <Reference Include="System.ComponentModel" />
<Reference Include="System.Configuration.Install" /> <Reference Include="System.Configuration.Install" />
...@@ -125,94 +134,74 @@ ...@@ -125,94 +134,74 @@
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>packages\System.Memory.4.5.3\lib\netstandard1.1\System.Memory.dll</HintPath> <HintPath>packages\System.Memory.4.5.3\lib\netstandard1.1\System.Memory.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Net.Http.Formatting, Version=5.2.8.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>packages\Microsoft.AspNet.WebApi.Client.5.2.8\lib\net45\System.Net.Http.Formatting.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath> <HintPath>packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Security" /> <Reference Include="System.Security" />
<Reference Include="System.Transactions" /> <Reference Include="System.Transactions" />
<Reference Include="System.Web.Cors, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="System.Web.Cors, Version=5.2.8.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>packages\Microsoft.AspNet.Cors.5.2.7\lib\net45\System.Web.Cors.dll</HintPath> <HintPath>packages\Microsoft.AspNet.Cors.5.2.8\lib\net45\System.Web.Cors.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Web.DynamicData" /> <Reference Include="System.Web.DynamicData" />
<Reference Include="System.Web.Entity" /> <Reference Include="System.Web.Entity" />
<Reference Include="System.Web.ApplicationServices" /> <Reference Include="System.Web.ApplicationServices" />
<Reference Include="System.ComponentModel.DataAnnotations" /> <Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Web.Extensions" /> <Reference Include="System.Web.Extensions" />
<Reference Include="System.Web.Http.Cors, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>packages\Microsoft.AspNet.WebApi.Cors.5.2.7\lib\net45\System.Web.Http.Cors.dll</HintPath>
</Reference>
<Reference Include="System.Web" /> <Reference Include="System.Web" />
<Reference Include="System.Web.Abstractions" /> <Reference Include="System.Web.Abstractions" />
<Reference Include="System.Web.Routing" />
<Reference Include="System.Xml" />
<Reference Include="System.Configuration" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>.\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http">
</Reference>
<Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>.\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http.WebRequest">
</Reference>
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private> <HintPath>packages\Microsoft.AspNet.WebPages.3.2.8\lib\net45\System.Web.Helpers.dll</HintPath>
<HintPath>.\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Web.Http, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="System.Web.Http, Version=5.2.8.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>.\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll</HintPath> <HintPath>packages\Microsoft.AspNet.WebApi.Core.5.2.8\lib\net45\System.Web.Http.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Web.Http.WebHost, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="System.Web.Http.Cors, Version=5.2.8.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>.\packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll</HintPath> <HintPath>packages\Microsoft.AspNet.WebApi.Cors.5.2.8\lib\net45\System.Web.Http.Cors.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="System.Web.Http.WebHost, Version=5.2.8.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private> <HintPath>packages\Microsoft.AspNet.WebApi.WebHost.5.2.8\lib\net45\System.Web.Http.WebHost.dll</HintPath>
<HintPath>.\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Web.Optimization"> <Reference Include="System.Web.Mvc, Version=5.2.8.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>.\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath> <HintPath>packages\Microsoft.AspNet.Mvc.5.2.8\lib\net45\System.Web.Mvc.dll</HintPath>
</Reference>
<Reference Include="System.Web.Optimization, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private> <HintPath>packages\Microsoft.AspNet.Razor.3.2.8\lib\net45\System.Web.Razor.dll</HintPath>
<HintPath>.\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Web.Routing" />
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private> <HintPath>packages\Microsoft.AspNet.WebPages.3.2.8\lib\net45\System.Web.WebPages.dll</HintPath>
<HintPath>.\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private> <HintPath>packages\Microsoft.AspNet.WebPages.3.2.8\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
<HintPath>.\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private> <HintPath>packages\Microsoft.AspNet.WebPages.3.2.8\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
<HintPath>.\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath> </Reference>
<Reference Include="System.Xml" />
<Reference Include="System.Configuration" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Net.Http">
</Reference>
<Reference Include="System.Net.Http.WebRequest">
</Reference> </Reference>
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
<Reference Include="Ubiety.Dns.Core, Version=2.2.1.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL"> <Reference Include="Ubiety.Dns.Core, Version=2.2.1.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<HintPath>packages\MySql.Data.8.0.22\lib\net452\Ubiety.Dns.Core.dll</HintPath> <HintPath>packages\MySql.Data.8.0.22\lib\net452\Ubiety.Dns.Core.dll</HintPath>
</Reference> </Reference>
<Reference Include="WebGrease"> <Reference Include="WebGrease, Version=1.6.5135.21930, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private> <HintPath>packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>
<HintPath>.\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>
</Reference>
<Reference Include="Antlr3.Runtime">
<Private>True</Private>
<HintPath>.\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll</HintPath>
</Reference> </Reference>
<Reference Include="WindowsBase" /> <Reference Include="WindowsBase" />
<Reference Include="Zstandard.Net, Version=1.1.7.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL"> <Reference Include="Zstandard.Net, Version=1.1.7.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<HintPath>packages\MySql.Data.8.0.22\lib\net452\Zstandard.Net.dll</HintPath> <HintPath>packages\MySql.Data.8.0.22\lib\net452\Zstandard.Net.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform">
<HintPath>.\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Controllers\AnnualInfoController.cs" /> <Compile Include="Controllers\AnnualInfoController.cs" />
<Compile Include="Controllers\Esn_Subitem\Esn_todos_SettleController.cs" /> <Compile Include="Controllers\Esn_Subitem\Esn_todos_SettleController.cs" />
...@@ -230,7 +219,6 @@ ...@@ -230,7 +219,6 @@
<Compile Include="Dal\DalFee.cs" /> <Compile Include="Dal\DalFee.cs" />
<Compile Include="Dal\DalCaseInfo.cs" /> <Compile Include="Dal\DalCaseInfo.cs" />
<Compile Include="Dal\DalProcInfo.cs" /> <Compile Include="Dal\DalProcInfo.cs" />
<Compile Include="Models\DataObjects\PCaseInfo.cs" />
<Compile Include="Models\EhrEmployee.cs" /> <Compile Include="Models\EhrEmployee.cs" />
<Compile Include="Models\SP_rpt_PerformanceMonth_FlowModel.cs" /> <Compile Include="Models\SP_rpt_PerformanceMonth_FlowModel.cs" />
<Compile Include="Models\Esn_todos_SettleModel.cs" /> <Compile Include="Models\Esn_todos_SettleModel.cs" />
...@@ -239,10 +227,9 @@ ...@@ -239,10 +227,9 @@
<Compile Include="Models\Esn_TodosModel.cs" /> <Compile Include="Models\Esn_TodosModel.cs" />
<Compile Include="Models\ParamModel.cs" /> <Compile Include="Models\ParamModel.cs" />
<Compile Include="Models\CommonResponseMsg.cs" /> <Compile Include="Models\CommonResponseMsg.cs" />
<Compile Include="Models\DataObjects\SDeptInfo.cs" /> <Compile Include="Models\SDeptInfo.cs" />
<Compile Include="Models\DataObjects\SDeptUser.cs" /> <Compile Include="Models\SDeptUser.cs" />
<Compile Include="Models\DataObjects\SUserInfo.cs" /> <Compile Include="Models\SUserInfo.cs" />
<Compile Include="Models\ViewModels\UserInfo\DeptUserImportViewModel.cs" />
<Compile Include="Tool\Common.cs" /> <Compile Include="Tool\Common.cs" />
<Compile Include="Tool\CorsHandle.cs" /> <Compile Include="Tool\CorsHandle.cs" />
<Compile Include="Tool\ExcelHelper.cs" /> <Compile Include="Tool\ExcelHelper.cs" />
...@@ -304,8 +291,6 @@ ...@@ -304,8 +291,6 @@
<Content Include="favicon.ico" /> <Content Include="favicon.ico" />
<Content Include="fonts\glyphicons-halflings-regular.svg" /> <Content Include="fonts\glyphicons-halflings-regular.svg" />
<Content Include="Global.asax" /> <Content Include="Global.asax" />
<Content Include="Scripts\bootstrap.js" />
<Content Include="Scripts\bootstrap.min.js" />
<Content Include="Areas\HelpPage\Views\Web.config" /> <Content Include="Areas\HelpPage\Views\Web.config" />
<Content Include="Areas\HelpPage\Views\Shared\_Layout.cshtml" /> <Content Include="Areas\HelpPage\Views\Shared\_Layout.cshtml" />
<Content Include="Areas\HelpPage\Views\Help\ResourceModel.cshtml" /> <Content Include="Areas\HelpPage\Views\Help\ResourceModel.cshtml" />
...@@ -329,8 +314,19 @@ ...@@ -329,8 +314,19 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="libman.json" /> <Content Include="libman.json" />
<Content Include="fonts\glyphicons-halflings-regular.woff2" />
<Content Include="fonts\glyphicons-halflings-regular.woff" />
<Content Include="fonts\glyphicons-halflings-regular.ttf" />
<Content Include="fonts\glyphicons-halflings-regular.eot" />
<Content Include="Content\bootstrap.min.css.map" />
<Content Include="Content\bootstrap.css.map" />
<Content Include="Content\bootstrap-theme.min.css.map" />
<Content Include="Content\bootstrap-theme.css.map" />
<None Include="packages.config" />
<None Include="Properties\PublishProfiles\FolderProfile.pubxml" /> <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
<None Include="Scripts\jquery-3.4.1.intellisense.js" /> <None Include="Scripts\jquery-3.4.1.intellisense.js" />
<Content Include="Scripts\bootstrap.js" />
<Content Include="Scripts\bootstrap.min.js" />
<Content Include="Scripts\jquery-3.4.1.js" /> <Content Include="Scripts\jquery-3.4.1.js" />
<Content Include="Scripts\jquery-3.4.1.min.js" /> <Content Include="Scripts\jquery-3.4.1.min.js" />
<Content Include="Scripts\jquery-3.4.1.slim.js" /> <Content Include="Scripts\jquery-3.4.1.slim.js" />
...@@ -352,41 +348,14 @@ ...@@ -352,41 +348,14 @@
<Content Include="Views\Shared\_Layout.cshtml" /> <Content Include="Views\Shared\_Layout.cshtml" />
<Content Include="Template\核稿歷史樣板.xlsx" /> <Content Include="Template\核稿歷史樣板.xlsx" />
<Content Include="Template\報價導入樣板- CN.xls" /> <Content Include="Template\報價導入樣板- CN.xls" />
<Content Include="Scripts\jquery-3.4.1.slim.min.map" />
<Content Include="Scripts\jquery-3.4.1.min.map" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="App_Data\" /> <Folder Include="App_Data\" />
<Folder Include="Data\" /> <Folder Include="Data\" />
<Folder Include="Views\Esn_Todos_Flow\" /> <Folder Include="Views\Esn_Todos_Flow\" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Content Include="fonts\glyphicons-halflings-regular.woff2" />
</ItemGroup>
<ItemGroup>
<Content Include="fonts\glyphicons-halflings-regular.woff" />
</ItemGroup>
<ItemGroup>
<Content Include="fonts\glyphicons-halflings-regular.ttf" />
</ItemGroup>
<ItemGroup>
<Content Include="fonts\glyphicons-halflings-regular.eot" />
</ItemGroup>
<ItemGroup>
<Content Include="Content\bootstrap.min.css.map" />
</ItemGroup>
<ItemGroup>
<Content Include="Content\bootstrap.css.map" />
</ItemGroup>
<ItemGroup>
<Content Include="Content\bootstrap-theme.min.css.map" />
</ItemGroup>
<ItemGroup>
<Content Include="Content\bootstrap-theme.css.map" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<Content Include="Scripts\jquery-3.4.1.slim.min.map" />
<Content Include="Scripts\jquery-3.4.1.min.map" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" /> <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
</ItemGroup> </ItemGroup>
...@@ -419,11 +388,9 @@ ...@@ -419,11 +388,9 @@
</VisualStudio> </VisualStudio>
</ProjectExtensions> </ProjectExtensions>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup> <Error Condition="!Exists('packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\build\net472\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\build\net472\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.targets'))" />
<ErrorText>此專案參考這部電腦上所缺少的 NuGet 套件。請啟用 NuGet 套件還原，以下載該套件。如需詳細資訊，請參閱 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的檔案是 {0}。</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('.\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '.\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
</Target> </Target>
<Import Project="packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\build\net472\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.targets" Condition="Exists('packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\build\net472\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">
......
WebAPI/packages.config
View file @ e6aa593f
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Antlr" version="3.5.0.2" targetFramework="net46" /> <package id="Antlr" version="3.5.0.2" targetFramework="net48" />
<package id="bootstrap" version="3.4.1" targetFramework="net46" /> <package id="bootstrap" version="3.4.1" targetFramework="net48" />
<package id="BouncyCastle" version="1.8.3.1" targetFramework="net46" /> <package id="BouncyCastle" version="1.8.9" targetFramework="net48" />
<package id="ClosedXML" version="0.95.3" targetFramework="net46" />
<package id="Dapper" version="2.0.123" targetFramework="net48" /> <package id="Dapper" version="2.0.123" targetFramework="net48" />
<package id="Dapper.Contrib" version="2.0.78" targetFramework="net48" /> <package id="Dapper.Contrib" version="2.0.78" targetFramework="net48" />
<package id="DocumentFormat.OpenXml" version="2.7.2" targetFramework="net46" /> <package id="EastAsiaNumericFormatter" version="1.0.0" targetFramework="net48" />
<package id="EastAsiaNumericFormatter" version="1.0.0" targetFramework="net46" />
<package id="EntityFramework" version="6.2.0" targetFramework="net48" /> <package id="EntityFramework" version="6.2.0" targetFramework="net48" />
<package id="EntityFramework.zh-Hant" version="6.2.0" targetFramework="net48" /> <package id="EntityFramework.zh-Hant" version="6.2.0" targetFramework="net48" />
<package id="ExcelDataReader" version="3.6.0" targetFramework="net46" /> <package id="ExcelDataReader" version="3.6.0" targetFramework="net48" />
<package id="ExcelDataReader.DataSet" version="3.6.0" targetFramework="net46" /> <package id="ExcelDataReader.DataSet" version="3.6.0" targetFramework="net48" />
<package id="ExcelNumberFormat" version="1.0.10" targetFramework="net46" /> <package id="ExcelNumberFormat" version="1.1.0" targetFramework="net48" />
<package id="Google.Protobuf" version="3.11.4" targetFramework="net46" /> <package id="jQuery" version="3.4.1" targetFramework="net48" />
<package id="jQuery" version="3.4.1" targetFramework="net46" /> <package id="log4net" version="2.0.14" targetFramework="net48" />
<package id="K4os.Compression.LZ4" version="1.1.11" targetFramework="net46" /> <package id="Microsoft.AspNet.Cors" version="5.2.8" targetFramework="net48" />
<package id="K4os.Compression.LZ4.Streams" version="1.1.11" targetFramework="net46" /> <package id="Microsoft.AspNet.Mvc" version="5.2.8" targetFramework="net48" />
<package id="K4os.Hash.xxHash" version="1.0.6" targetFramework="net46" /> <package id="Microsoft.AspNet.Mvc.zh-Hant" version="5.2.8" targetFramework="net48" />
<package id="log4net" version="2.0.12" targetFramework="net46" /> <package id="Microsoft.AspNet.Razor" version="3.2.8" targetFramework="net48" />
<package id="Microsoft.AspNet.Cors" version="5.2.7" targetFramework="net46" /> <package id="Microsoft.AspNet.Razor.zh-Hant" version="3.2.8" targetFramework="net48" />
<package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net46" /> <package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net48" />
<package id="Microsoft.AspNet.Mvc.zh-Hant" version="5.2.7" targetFramework="net46" /> <package id="Microsoft.AspNet.Web.Optimization.zh-Hant" version="1.1.3" targetFramework="net48" />
<package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net46" /> <package id="Microsoft.AspNet.WebApi" version="5.2.8" targetFramework="net48" />
<package id="Microsoft.AspNet.Razor.zh-Hant" version="3.2.7" targetFramework="net46" /> <package id="Microsoft.AspNet.WebApi.Client" version="5.2.8" targetFramework="net48" />
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net46" /> <package id="Microsoft.AspNet.WebApi.Client.zh-Hant" version="5.2.8" targetFramework="net48" />
<package id="Microsoft.AspNet.Web.Optimization.zh-Hant" version="1.1.3" targetFramework="net46" /> <package id="Microsoft.AspNet.WebApi.Core" version="5.2.8" targetFramework="net48" />
<package id="Microsoft.AspNet.WebApi" version="5.2.7" targetFramework="net46" /> <package id="Microsoft.AspNet.WebApi.Core.zh-Hant" version="5.2.8" targetFramework="net48" />
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.7" targetFramework="net46" /> <package id="Microsoft.AspNet.WebApi.Cors" version="5.2.8" targetFramework="net48" />
<package id="Microsoft.AspNet.WebApi.Client.zh-Hant" version="5.2.7" targetFramework="net46" /> <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.8" targetFramework="net48" />
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.7" targetFramework="net46" /> <package id="Microsoft.AspNet.WebPages" version="3.2.8" targetFramework="net48" />
<package id="Microsoft.AspNet.WebApi.Core.zh-Hant" version="5.2.7" targetFramework="net46" /> <package id="Microsoft.AspNet.WebPages.zh-Hant" version="3.2.8" targetFramework="net48" />
<package id="Microsoft.AspNet.WebApi.Cors" version="5.2.7" targetFramework="net46" /> <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="3.6.0" targetFramework="net48" />
<package id="Microsoft.AspNet.WebApi.HelpPage" version="5.2.7" targetFramework="net46" /> <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net48" />
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.7" targetFramework="net46" /> <package id="Microsoft.Web.Infrastructure" version="2.0.0" targetFramework="net48" />
<package id="Microsoft.AspNet.WebApi.WebHost.zh-Hant" version="5.2.7" targetFramework="net46" /> <package id="Modernizr" version="2.8.3" targetFramework="net48" />
<package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net46" /> <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
<package id="Microsoft.AspNet.WebPages.zh-Hant" version="3.2.7" targetFramework="net46" /> <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.1" targetFramework="net46" /> <package id="WebGrease" version="1.6.0" targetFramework="net48" />
<package id="Microsoft.CSharp" version="4.7.0" targetFramework="net46" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
<package id="Modernizr" version="2.8.3" targetFramework="net46" />
<package id="MySql.Data" version="8.0.22" targetFramework="net46" requireReinstallation="true" />
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net46" />
<package id="SSH.NET" version="2016.1.0" targetFramework="net46" />
<package id="System.Buffers" version="4.5.1" targetFramework="net46" requireReinstallation="true" />
<package id="System.IO.FileSystem.Primitives" version="4.0.1" targetFramework="net46" />
<package id="System.IO.Packaging" version="4.0.0" targetFramework="net46" />
<package id="System.Memory" version="4.5.3" targetFramework="net46" requireReinstallation="true" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net46" requireReinstallation="true" />
<package id="WebGrease" version="1.6.0" targetFramework="net46" />
</packages> </packages>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment