gaofei
/
HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

This commit is contained in:
高飞 2025-03-12 11:13:04 +08:00
parent dbd7357a6d
commit 31e1076015
9 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DataBase/更新版本号脚本.sql Normal file
View File

@ -0,0 +1,2 @@
update Sys_Const set ConstValue='1.0.0' where ID='97A67079-48EE-439A-B7F9-A2877D3B084E'
update Sys_Const set ConstValue='https://hj.zpcds.com:8090/hjgl/file/1.0.0.wgt' where ID='66FE428E-0BFA-4E05-8231-F046385688EF'

BIN
HJGL_DS/.vs/SGGL/v15/.suo
View File

Binary file not shown.

BIN
HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide
View File

Binary file not shown.

BIN
HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal
View File

Binary file not shown.

2
HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
View File

@ -2,7 +2,7 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<UseIISExpress>true</UseIISExpress> <UseIISExpress>true</UseIISExpress>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress /> <Use64BitIISExpress />
<IISExpressSSLPort /> <IISExpressSSLPort />
<IISExpressAnonymousAuthentication /> <IISExpressAnonymousAuthentication />

31
HJGL_DS/WebAPI/Filter/TestPermissionAttribute.cs
View File

@ -37,6 +37,7 @@ namespace WebAPI.Filter
if (!isOk && token != null) if (!isOk && token != null)
{ {
isOk = true;
//var getUser = BLL.UserService.GetUserByUserId(token.FirstOrDefault()); //var getUser = BLL.UserService.GetUserByUserId(token.FirstOrDefault());
//if (getUser != null) //if (getUser != null)
//{ //{
@ -59,13 +60,13 @@ namespace WebAPI.Filter
// } // }
//} //}
} }
if (lists.FirstOrDefault(x => x == strValues) == null && actionContext.ActionDescriptor.ControllerDescriptor.ControllerName != "FileUpload" && !System.Web.HttpContext.Current.User.Identity.IsAuthenticated) //if (lists.FirstOrDefault(x => x == strValues) == null && actionContext.ActionDescriptor.ControllerDescriptor.ControllerName != "FileUpload" && !System.Web.HttpContext.Current.User.Identity.IsAuthenticated)
{ //{
isOk = false; // isOk = false;
actionContext.Response = actionContext.Request.CreateResponse(System.Net.HttpStatusCode.OK, // actionContext.Response = actionContext.Request.CreateResponse(System.Net.HttpStatusCode.OK,
new { code = "0", message = "登录超出，请重新登录！" }, actionContext.ControllerContext.Configuration.Formatters.JsonFormatter); // new { code = "0", message = "登录超出，请重新登录！" }, actionContext.ControllerContext.Configuration.Formatters.JsonFormatter);
} //}
//base.OnActionExecuting(actionContext); //base.OnActionExecuting(actionContext);
if (isOk) if (isOk)
@ -99,7 +100,7 @@ namespace WebAPI.Filter
else else
{ {
actionContext.Response = actionContext.Request.CreateResponse(System.Net.HttpStatusCode.OK, actionContext.Response = actionContext.Request.CreateResponse(System.Net.HttpStatusCode.OK,
new { code = "0", message = "您没有权限！" }, actionContext.ControllerContext.Configuration.Formatters.JsonFormatter); new { code = "0", message = "您没有权限，请联系管理员或下载最新版本安装使用！" }, actionContext.ControllerContext.Configuration.Formatters.JsonFormatter);
} }
} }
@ -118,7 +119,7 @@ namespace WebAPI.Filter
"HazardRealTime*SaveHazardRealTime", "HazardRealTime*SaveHazardRealTime",
"upload*attendance", "upload*attendance",
"upload*person", "upload*person",
"User*postLoginOn", "Login*login",
"Person*getPersonInOut", "Person*getPersonInOut",
"Person*getUpdatePersonExchangeTime", "Person*getUpdatePersonExchangeTime",
"Person*getPersonDataExchange", "Person*getPersonDataExchange",
@ -158,11 +159,11 @@ namespace WebAPI.Filter
"Environmental*SaveEnvironmentData", "Environmental*SaveEnvironmentData",
"Environmental*PushEnvironmentalCheckData", "Environmental*PushEnvironmentalCheckData",
"Project*pushProject", "Project*pushProject",
"Weld*usingPlanList", //"Weld*usingPlanList",
"Weld*getUsingPlanById", //"Weld*getUsingPlanById",
"Weld*welderQueIsPass", //"Weld*welderQueIsPass",
"Weld*CanAudit", //"Weld*CanAudit",
"Weld*addUsingPlan", //"Weld*addUsingPlan",
"Base*weldInfoList", "Base*weldInfoList",
"Base*getWeldInfo", "Base*getWeldInfo",
"Base*baseUnitList", "Base*baseUnitList",
@ -172,6 +173,10 @@ namespace WebAPI.Filter
"Base*bsWelderList", "Base*bsWelderList",
"Base*getWelderUnitAndTeamGroup", "Base*getWelderUnitAndTeamGroup",
"Base*bsSteelList", "Base*bsSteelList",
//"Weld*usingPlanList",
//"Weld*getUsingPlanById",
//"Weld*welderQueIsPass",
//"Weld*addUsingPlan",
}; };
/// <summary> /// <summary>

14
HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
View File

@ -79,13 +79,13 @@
<publishTime>09/10/2013 16:29:20</publishTime> <publishTime>09/10/2013 16:29:20</publishTime>
</File> </File>
<File Include="bin/BLL.dll"> <File Include="bin/BLL.dll">
<publishTime>03/11/2025 17:51:49</publishTime> <publishTime>03/12/2025 10:55:18</publishTime>
</File> </File>
<File Include="bin/BLL.dll.config"> <File Include="bin/BLL.dll.config">
<publishTime>07/03/2024 11:01:05</publishTime> <publishTime>07/03/2024 11:01:05</publishTime>
</File> </File>
<File Include="bin/BLL.pdb"> <File Include="bin/BLL.pdb">
<publishTime>03/11/2025 17:51:49</publishTime> <publishTime>03/12/2025 10:55:18</publishTime>
</File> </File>
<File Include="bin/BouncyCastle.Crypto.dll"> <File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/17/2020 21:32:28</publishTime> <publishTime>12/17/2020 21:32:28</publishTime>
@ -115,10 +115,10 @@
<publishTime>07/25/2012 11:48:56</publishTime> <publishTime>07/25/2012 11:48:56</publishTime>
</File> </File>
<File Include="bin/Model.dll"> <File Include="bin/Model.dll">
<publishTime>03/11/2025 17:51:48</publishTime> <publishTime>03/12/2025 10:55:15</publishTime>
</File> </File>
<File Include="bin/Model.pdb"> <File Include="bin/Model.pdb">
<publishTime>03/11/2025 17:51:48</publishTime> <publishTime>03/12/2025 10:55:15</publishTime>
</File> </File>
<File Include="bin/Newtonsoft.Json.dll"> <File Include="bin/Newtonsoft.Json.dll">
<publishTime>02/18/2018 09:44:54</publishTime> <publishTime>02/18/2018 09:44:54</publishTime>
@ -316,10 +316,10 @@
<publishTime>02/01/2018 12:20:56</publishTime> <publishTime>02/01/2018 12:20:56</publishTime>
</File> </File>
<File Include="bin/WebAPI.dll"> <File Include="bin/WebAPI.dll">
<publishTime>03/11/2025 17:51:50</publishTime> <publishTime>03/12/2025 10:55:21</publishTime>
</File> </File>
<File Include="bin/WebAPI.pdb"> <File Include="bin/WebAPI.pdb">
<publishTime>03/11/2025 17:51:50</publishTime> <publishTime>03/12/2025 10:55:21</publishTime>
</File> </File>
<File Include="bin/WebGrease.dll"> <File Include="bin/WebGrease.dll">
<publishTime>01/23/2014 13:57:34</publishTime> <publishTime>01/23/2014 13:57:34</publishTime>
@ -445,7 +445,7 @@
<publishTime>07/03/2024 11:01:07</publishTime> <publishTime>07/03/2024 11:01:07</publishTime>
</File> </File>
<File Include="Web.config"> <File Include="Web.config">
<publishTime>03/11/2025 17:51:59</publishTime> <publishTime>03/12/2025 10:55:47</publishTime>
</File> </File>
</ItemGroup> </ItemGroup>
</Project> </Project>

2
HJGL_DS/WebAPI/Web.config
View File

@ -19,7 +19,7 @@
<add key="PageSize" value="15"/> <add key="PageSize" value="15"/>
</appSettings> </appSettings>
<system.web> <system.web>
<compilation debug="true" targetFramework="4.6.1"/> <compilation debug="false" targetFramework="4.6.1"/>
<httpRuntime targetFramework="4.6.1"/> <httpRuntime targetFramework="4.6.1"/>
</system.web> </system.web>
<system.webServer> <system.webServer>

2
HJGL_DS/WebAPI/WebAPI.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress> <UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress /> <Use64BitIISExpress />