diff --git a/DataBase/更新版本号脚本.sql b/DataBase/更新版本号脚本.sql
new file mode 100644
index 0000000..6e4c86c
--- /dev/null
+++ b/DataBase/更新版本号脚本.sql
@@ -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'
\ No newline at end of file
diff --git a/HJGL_DS/.vs/SGGL/v15/.suo b/HJGL_DS/.vs/SGGL/v15/.suo
index ee9d684..7d91946 100644
Binary files a/HJGL_DS/.vs/SGGL/v15/.suo and b/HJGL_DS/.vs/SGGL/v15/.suo differ
diff --git a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide
index 05a95cb..f78d3b0 100644
Binary files a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide and b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide differ
diff --git a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal
index c381143..8556135 100644
Binary files a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal and b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal differ
diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
index bf54086..8aa7c11 100644
--- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -2,7 +2,7 @@
true
- Debug|Any CPU
+ Release|Any CPU
diff --git a/HJGL_DS/WebAPI/Filter/TestPermissionAttribute.cs b/HJGL_DS/WebAPI/Filter/TestPermissionAttribute.cs
index 818ef3b..6ddefe7 100644
--- a/HJGL_DS/WebAPI/Filter/TestPermissionAttribute.cs
+++ b/HJGL_DS/WebAPI/Filter/TestPermissionAttribute.cs
@@ -37,6 +37,7 @@ namespace WebAPI.Filter
if (!isOk && token != null)
{
+ isOk = true;
//var getUser = BLL.UserService.GetUserByUserId(token.FirstOrDefault());
//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)
- {
- isOk = false;
- actionContext.Response = actionContext.Request.CreateResponse(System.Net.HttpStatusCode.OK,
- new { code = "0", message = "登录超出，请重新登录！" }, actionContext.ControllerContext.Configuration.Formatters.JsonFormatter);
+ //if (lists.FirstOrDefault(x => x == strValues) == null && actionContext.ActionDescriptor.ControllerDescriptor.ControllerName != "FileUpload" && !System.Web.HttpContext.Current.User.Identity.IsAuthenticated)
+ //{
+ // isOk = false;
+ // actionContext.Response = actionContext.Request.CreateResponse(System.Net.HttpStatusCode.OK,
+ // new { code = "0", message = "登录超出，请重新登录！" }, actionContext.ControllerContext.Configuration.Formatters.JsonFormatter);
- }
+ //}
//base.OnActionExecuting(actionContext);
if (isOk)
@@ -99,7 +100,7 @@ namespace WebAPI.Filter
else
{
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",
"upload*attendance",
"upload*person",
- "User*postLoginOn",
+ "Login*login",
"Person*getPersonInOut",
"Person*getUpdatePersonExchangeTime",
"Person*getPersonDataExchange",
@@ -158,11 +159,11 @@ namespace WebAPI.Filter
"Environmental*SaveEnvironmentData",
"Environmental*PushEnvironmentalCheckData",
"Project*pushProject",
- "Weld*usingPlanList",
- "Weld*getUsingPlanById",
- "Weld*welderQueIsPass",
- "Weld*CanAudit",
- "Weld*addUsingPlan",
+ //"Weld*usingPlanList",
+ //"Weld*getUsingPlanById",
+ //"Weld*welderQueIsPass",
+ //"Weld*CanAudit",
+ //"Weld*addUsingPlan",
"Base*weldInfoList",
"Base*getWeldInfo",
"Base*baseUnitList",
@@ -172,6 +173,10 @@ namespace WebAPI.Filter
"Base*bsWelderList",
"Base*getWelderUnitAndTeamGroup",
"Base*bsSteelList",
+ //"Weld*usingPlanList",
+ //"Weld*getUsingPlanById",
+ //"Weld*welderQueIsPass",
+ //"Weld*addUsingPlan",
};
///
diff --git a/HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 4cd65cc..17a9a86 100644
--- a/HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -79,13 +79,13 @@
09/10/2013 16:29:20
- 03/11/2025 17:51:49
+ 03/12/2025 10:55:18
07/03/2024 11:01:05
- 03/11/2025 17:51:49
+ 03/12/2025 10:55:18
12/17/2020 21:32:28
@@ -115,10 +115,10 @@
07/25/2012 11:48:56
- 03/11/2025 17:51:48
+ 03/12/2025 10:55:15
- 03/11/2025 17:51:48
+ 03/12/2025 10:55:15
02/18/2018 09:44:54
@@ -316,10 +316,10 @@
02/01/2018 12:20:56
- 03/11/2025 17:51:50
+ 03/12/2025 10:55:21
- 03/11/2025 17:51:50
+ 03/12/2025 10:55:21
01/23/2014 13:57:34
@@ -445,7 +445,7 @@
07/03/2024 11:01:07
- 03/11/2025 17:51:59
+ 03/12/2025 10:55:47
\ No newline at end of file
diff --git a/HJGL_DS/WebAPI/Web.config b/HJGL_DS/WebAPI/Web.config
index ccf9edc..3df6799 100644
--- a/HJGL_DS/WebAPI/Web.config
+++ b/HJGL_DS/WebAPI/Web.config
@@ -19,7 +19,7 @@
-
+
diff --git a/HJGL_DS/WebAPI/WebAPI.csproj.user b/HJGL_DS/WebAPI/WebAPI.csproj.user
index a48b337..28be9c4 100644
--- a/HJGL_DS/WebAPI/WebAPI.csproj.user
+++ b/HJGL_DS/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
- Debug|Any CPU
+ Release|Any CPU
FolderProfile
true