From b7041949338728f4f8b7cc96f4ed6a92b40fda36 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 05 一月 2024 12:30:56 +0800
Subject: [PATCH] 1.Startup.cs 文件中增加授权.apk文件 2.Excel下载方法中增加.net core直接下载wwwroot下的文件代码(暂时不用，先注释掉)
---
VueWebCoreApi/Controllers/ImportExcelController.cs | 36 +++++++++++++++++
VueWebCoreApi/Tools/ExcelList.cs | 8 ++--
VueWebCoreApi/DLL/DAL/BasicSettingDAL.cs | 18 ++++++--
VueWebCoreApi/Startup.cs | 25 ++++++------
VueWebCoreApi/appsettings.json | 2
5 files changed, 66 insertions(+), 23 deletions(-)
diff --git a/VueWebCoreApi/Controllers/ImportExcelController.cs b/VueWebCoreApi/Controllers/ImportExcelController.cs
index e2ef326..e6de79f 100644
--- a/VueWebCoreApi/Controllers/ImportExcelController.cs
+++ b/VueWebCoreApi/Controllers/ImportExcelController.cs
@@ -1,4 +1,5 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
+锘縰sing Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc;
using System;
using System.Collections.Generic;
using System.Data;
@@ -18,6 +19,12 @@
//[ChannelActionFilter]
public class ImportExcelController : Controller
{
+ private readonly IWebHostEnvironment _hostingEnvironment;
+
+ public ImportExcelController(IWebHostEnvironment hostingEnvironment)
+ {
+ _hostingEnvironment = hostingEnvironment;
+ }
#region[Excel瀵煎叆妯℃澘鍒楄〃]
/// <summary>
@@ -55,6 +62,33 @@
mes.code = "200";
mes.data = msg;
return Json(mes);
+
+ //ToMessage mes = new ToMessage();
+ //List<ScoreReport> list = ExcelList.ExcelData();
+ //list = list.Where(s => s.FileCode == FileCode).ToList();
+ //var filename = list[0].FileName + ".xls";
+ //var wwwRootPath = _hostingEnvironment.WebRootPath;
+ //var fileDirectory = Path.Combine(wwwRootPath, "Excel"); // 鏇挎崲涓烘偍鐨凟xcel鏂囦欢鎵�鍦ㄧ洰褰�
+ //var filePath = Path.Combine(fileDirectory, $"{filename}.xlsx"); // 鍋囪鏂囦欢鍚嶇紪鐮佷负鏂囦欢鍚�
+
+ //if (System.IO.File.Exists(filePath))
+ //{
+ // var fileInfo = new FileInfo(filePath);
+ // var result = new
+ // {
+ // FileName = fileInfo.Name,
+ // FilePath = filePath,
+ // FileSize = fileInfo.Length
+ // };
+ // return Json(result);
+ //}
+ //else
+ //{
+ // mes.code = "300";
+ // mes.data = "";
+ // mes.message = "鏂囦欢涓嶅瓨鍦�";
+ //}
+ //return Json(mes);
}
#endregion
diff --git a/VueWebCoreApi/DLL/DAL/BasicSettingDAL.cs b/VueWebCoreApi/DLL/DAL/BasicSettingDAL.cs
index 2bd8568..8b4db5a 100644
--- a/VueWebCoreApi/DLL/DAL/BasicSettingDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/BasicSettingDAL.cs
@@ -3039,6 +3039,14 @@
IEnumerable<object> data;
try
{
+ if (flag == "-1" && stckcode == null)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.message = "鏆傛棤鏁版嵁!";
+ mes.data = null;
+ return mes;
+ }
string[] classcode = Array.ConvertAll<string, string>(stckcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
switch (flag)
{
@@ -3092,7 +3100,7 @@
#endregion
#region[浠撲綅淇℃伅鏂板/缂栬緫淇濆瓨]
- public static ToMessage TSecLocaAddUpdate(string data_sources, string locacode, string locaname, string stckcode, string parentlocacode,string depth, string status, string description, string OperType, User us)
+ public static ToMessage TSecLocaAddUpdate(string data_sources, string locacode, string locaname, string stckcode, string parentlocacode, string depth, string status, string description, string OperType, User us)
{
string sql = "";
List<object> list = new List<object>();
@@ -3146,7 +3154,7 @@
lm_user = us.usercode,
lm_date = DateTime.Now.ToString(),
data_sources = data_sources,
- depth= depth
+ depth = depth
}
});
bool aa = DapperHelper.DoTransaction(list);
@@ -3207,7 +3215,7 @@
name = locaname,
idwarehouse = stckcode,
idparent = parentlocacode,
- depth= depth,
+ depth = depth,
status = status,
description = description,
lm_user = us.usercode,
@@ -3321,7 +3329,7 @@
#region[宸ュ簭鏌ヨ]
- public static ToMessage StepSearch(string stepcode, string stepname, string enable, string steptypecode,int startNum, int endNum, string prop, string order)
+ public static ToMessage StepSearch(string stepcode, string stepname, string enable, string steptypecode, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -3442,7 +3450,7 @@
}
sql = @"update TStep set stepname=@stepname,flwtype=@steptypecode,enable=@enable,descr=@description,
lm_user=@username,lm_date=@CreateDate where id=@stepid";
- list.Add(new { str = sql, parm = new {stepid = stepid, stepname = stepname, steptypecode = steptypecode, enable = enable, description = description, username = us.usercode, CreateDate = DateTime.Now.ToString() } });
+ list.Add(new { str = sql, parm = new { stepid = stepid, stepname = stepname, steptypecode = steptypecode, enable = enable, description = description, username = us.usercode, CreateDate = DateTime.Now.ToString() } });
bool aa = DapperHelper.DoTransaction(list);
if (aa)
{
diff --git a/VueWebCoreApi/Startup.cs b/VueWebCoreApi/Startup.cs
index b3b5999..a9f68a3 100644
--- a/VueWebCoreApi/Startup.cs
+++ b/VueWebCoreApi/Startup.cs
@@ -76,7 +76,7 @@
Description = $"Panda.Sewerage : {version} ",
});
});
-
+
string basePath = Path.GetDirectoryName(typeof(Program).Assembly.Location);
string xmlPath = Path.Combine(basePath, "VueWebCoreApi.xml");
c.IncludeXmlComments(xmlPath, true);
@@ -146,7 +146,7 @@
{
c.SwaggerEndpoint($"/swagger/{version}/swagger.json", $"{version}");
});
-
+
});
#endregion
app.UseHttpsRedirection();
@@ -157,12 +157,13 @@
//添加静态文件中间件
app.UseDefaultFiles();
//添加授权文件
- app.UseStaticFiles(new StaticFileOptions()
- {
- ContentTypeProvider = new FileExtensionContentTypeProvider()
- {
- Mappings = { [".xls"] = "application/vnd.ms-excel" }
- }
+ app.UseStaticFiles(new StaticFileOptions() {
+ ContentTypeProvider = new FileExtensionContentTypeProvider() {
+ Mappings = {
+ [".xls"] = "application/vnd.ms-excel",
+ [".apk"] = "application/vnd.android.package-archive"
+ }
+ }
});
app.UseStaticFiles();
//跨域
@@ -189,15 +190,15 @@
// Mappings = { [".exe"] = "application/octect-stream" }
// }
//});
-
+
app.UseEndpoints(endpoints =>
{
endpoints.MapControllers();
endpoints.MapHub<ChatHub>("/ChatHub", options =>
{
- options.Transports =
- HttpTransportType.WebSockets |
- HttpTransportType.LongPolling;
+ options.Transports =
+ HttpTransportType.WebSockets |
+ HttpTransportType.LongPolling;
});
});
loggerFactory.AddLog4Net("Config/log4net.config");
diff --git a/VueWebCoreApi/Tools/ExcelList.cs b/VueWebCoreApi/Tools/ExcelList.cs
index 78cbdec..f1fc142 100644
--- a/VueWebCoreApi/Tools/ExcelList.cs
+++ b/VueWebCoreApi/Tools/ExcelList.cs
@@ -22,10 +22,10 @@
//new ScoreReport("7","搴撲綅璁剧疆"),
new ScoreReport("8","瀛樿揣妗ｆ"),
new ScoreReport("9","璁惧娓呭崟"),
- new ScoreReport("10","璁惧鐐规椤圭洰"),
- new ScoreReport("10_1","璁惧鐐规鏍囧噯"),
- new ScoreReport("11","璁惧淇濆吇椤圭洰"),
- new ScoreReport("11_1","璁惧淇濆吇鏍囧噯"),
+ //new ScoreReport("10","璁惧鐐规椤圭洰"),
+ //new ScoreReport("10_1","璁惧鐐规鏍囧噯"),
+ //new ScoreReport("11","璁惧淇濆吇椤圭洰"),
+ //new ScoreReport("11_1","璁惧淇濆吇鏍囧噯"),
new ScoreReport("12","妯″叿娓呭崟"),
new ScoreReport("13","妯″叿鐐规椤圭洰"),
new ScoreReport("13_1","妯″叿鐐规鏍囧噯"),
diff --git a/VueWebCoreApi/appsettings.json b/VueWebCoreApi/appsettings.json
index ba8ed33..9b7ac9f 100644
--- a/VueWebCoreApi/appsettings.json
+++ b/VueWebCoreApi/appsettings.json
@@ -25,7 +25,7 @@
//session澶辨晥鏃堕棿
"InProc": "240",
//Excel瀵煎嚭妯℃澘閰嶇疆IP
- "FileIP": "http://121.196.36.24:8025/",
+ "FileIP": "http://121.196.36.24:8021/",
//jwtkey
"SigningKey": "Hello World"
}
--
Gitblit v1.9.3