From a9dbcf1b5b044c7f4e258d96852ec7fd70c990b6 Mon Sep 17 00:00:00 2001 From: "DESKTOP-H2PAFLR\\Administrator" Date: Wed, 2 Aug 2023 13:36:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/System/SysLoginController.cs | 1 + ZR.Admin.WebApi/Extensions/LogoExtension.cs | 5 +---- ZR.Admin.WebApi/Filters/VerifyAttribute.cs | 3 ++- ZR.Admin.WebApi/Framework/JwtUtil.cs | 6 ++++-- ZR.Admin.WebApi/Program.cs | 3 +++ ZR.Admin.WebApi/wwwroot/logo.txt | 13 ++++++------- ZR.Service/System/SysDeptService.cs | 4 ++-- ZR.Vue/.env.development | 2 +- ZR.Vue/.env.staging | 2 +- ZR.Vue/src/layout/components/Navbar.vue | 7 +------ ZR.Vue/src/settings.js | 2 +- ZR.Vue/src/views/basisManagement/BOM.vue | 0 .../src/views/basisManagement/devicestation.vue | 0 ZR.Vue/src/views/basisManagement/line.vue | 0 ZR.Vue/src/views/basisManagement/materiel.vue | 0 ZR.Vue/src/views/basisManagement/procedure.vue | 0 ZR.Vue/src/views/basisManagement/process.vue | 0 ZR.Vue/src/views/basisManagement/sop.vue | 0 ZR.Vue/src/views/basisManagement/tray.vue | 0 ZR.Vue/src/views/basisManagement/unit.vue | 15 +++++++++++++++ ZR.Vue/src/views/basisManagement/workshop.vue | 0 ZR.Vue/src/views/basisManagement/workstation.vue | 0 .../src/views/deviceManagement/device_account.vue | 0 ZR.Vue/src/views/deviceManagement/device_type.vue | 0 ZR.Vue/src/views/deviceManagement/repairlist.vue | 0 .../deviceManagement/spot_inspection_plan.vue | 0 .../deviceManagement/spot_inspection_project.vue | 0 .../productManagement/completion_statistics.vue | 0 ZR.Vue/src/views/productManagement/dispatch.vue | 0 .../views/productManagement/production_order.vue | 0 .../productManagement/production_schedule.vue | 0 .../views/productManagement/production_track.vue | 0 ZR.Vue/src/views/qualityManagement/FQC.vue | 0 ZR.Vue/src/views/qualityManagement/IPQC.vue | 0 ZR.Vue/src/views/qualityManagement/IQC.vue | 0 ZR.Vue/src/views/qualityManagement/OQC.vue | 0 ZR.Vue/src/views/qualityManagement/checkItem.vue | 0 .../views/warehouseManagement/barcode_list.vue | 0 ZR.Vue/src/views/warehouseManagement/define.vue | 0 .../views/warehouseManagement/material_entry.vue | 0 .../views/warehouseManagement/material_return.vue | 0 .../warehouseManagement/materials_requisition.vue | 0 .../views/warehouseManagement/pack_management.vue | 0 .../views/warehouseManagement/product_inbound.vue | 0 .../warehouseManagement/product_outbound.vue | 0 .../views/warehouseManagement/sales_outbound.vue | 0 ZR.Vue/src/views/warehouseManagement/stock.vue | 0 47 files changed, 38 insertions(+), 25 deletions(-) create mode 100644 ZR.Vue/src/views/basisManagement/BOM.vue create mode 100644 ZR.Vue/src/views/basisManagement/devicestation.vue create mode 100644 ZR.Vue/src/views/basisManagement/line.vue create mode 100644 ZR.Vue/src/views/basisManagement/materiel.vue create mode 100644 ZR.Vue/src/views/basisManagement/procedure.vue create mode 100644 ZR.Vue/src/views/basisManagement/process.vue create mode 100644 ZR.Vue/src/views/basisManagement/sop.vue create mode 100644 ZR.Vue/src/views/basisManagement/tray.vue create mode 100644 ZR.Vue/src/views/basisManagement/unit.vue create mode 100644 ZR.Vue/src/views/basisManagement/workshop.vue create mode 100644 ZR.Vue/src/views/basisManagement/workstation.vue create mode 100644 ZR.Vue/src/views/deviceManagement/device_account.vue create mode 100644 ZR.Vue/src/views/deviceManagement/device_type.vue create mode 100644 ZR.Vue/src/views/deviceManagement/repairlist.vue create mode 100644 ZR.Vue/src/views/deviceManagement/spot_inspection_plan.vue create mode 100644 ZR.Vue/src/views/deviceManagement/spot_inspection_project.vue create mode 100644 ZR.Vue/src/views/productManagement/completion_statistics.vue create mode 100644 ZR.Vue/src/views/productManagement/dispatch.vue create mode 100644 ZR.Vue/src/views/productManagement/production_order.vue create mode 100644 ZR.Vue/src/views/productManagement/production_schedule.vue create mode 100644 ZR.Vue/src/views/productManagement/production_track.vue create mode 100644 ZR.Vue/src/views/qualityManagement/FQC.vue create mode 100644 ZR.Vue/src/views/qualityManagement/IPQC.vue create mode 100644 ZR.Vue/src/views/qualityManagement/IQC.vue create mode 100644 ZR.Vue/src/views/qualityManagement/OQC.vue create mode 100644 ZR.Vue/src/views/qualityManagement/checkItem.vue create mode 100644 ZR.Vue/src/views/warehouseManagement/barcode_list.vue create mode 100644 ZR.Vue/src/views/warehouseManagement/define.vue create mode 100644 ZR.Vue/src/views/warehouseManagement/material_entry.vue create mode 100644 ZR.Vue/src/views/warehouseManagement/material_return.vue create mode 100644 ZR.Vue/src/views/warehouseManagement/materials_requisition.vue create mode 100644 ZR.Vue/src/views/warehouseManagement/pack_management.vue create mode 100644 ZR.Vue/src/views/warehouseManagement/product_inbound.vue create mode 100644 ZR.Vue/src/views/warehouseManagement/product_outbound.vue create mode 100644 ZR.Vue/src/views/warehouseManagement/sales_outbound.vue create mode 100644 ZR.Vue/src/views/warehouseManagement/stock.vue diff --git a/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs b/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs index 87892827..b5c0e0c9 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs @@ -80,6 +80,7 @@ namespace ZR.Admin.WebApi.Controllers.System List permissions = permissionService.GetMenuPermission(user); LoginUser loginUser = new(user, roles, permissions); + //todo 把权限加到缓存里 CacheService.SetUserPerms(GlobalConstant.UserPermKEY + user.UserId, permissions); return SUCCESS(JwtUtil.GenerateJwtToken(JwtUtil.AddClaims(loginUser), jwtSettings.JwtSettings)); } diff --git a/ZR.Admin.WebApi/Extensions/LogoExtension.cs b/ZR.Admin.WebApi/Extensions/LogoExtension.cs index ff908cea..704778fd 100644 --- a/ZR.Admin.WebApi/Extensions/LogoExtension.cs +++ b/ZR.Admin.WebApi/Extensions/LogoExtension.cs @@ -13,10 +13,7 @@ namespace ZR.Admin.WebApi.Extensions Console.WriteLine(content); Console.ForegroundColor = ConsoleColor.Blue; - Console.WriteLine("🎉源码地址: https://gitee.com/izory/ZrAdminNetCore"); - Console.WriteLine("📖官方文档：http://www.izhaorui.cn/doc"); - Console.WriteLine("🤑打赏作者：http://www.izhaorui.cn/doc/support.html"); - Console.WriteLine("📱移动端体验：http://www.izhaorui.cn/h5"); + } } } diff --git a/ZR.Admin.WebApi/Filters/VerifyAttribute.cs b/ZR.Admin.WebApi/Filters/VerifyAttribute.cs index a925b3ed..f26a33cc 100644 --- a/ZR.Admin.WebApi/Filters/VerifyAttribute.cs +++ b/ZR.Admin.WebApi/Filters/VerifyAttribute.cs @@ -42,11 +42,12 @@ namespace ZR.Admin.WebApi.Filters var isAuthed = context.HttpContext.User.Identity.IsAuthenticated; //使用jwt token校验2020-11-21 + //todo 认证是否合法用户和校验 LoginUser info = JwtUtil.GetLoginUser(context.HttpContext); if (info == null || !isAuthed) { - string msg = $"请求访问[{url}]失败，无法访问系统资源"; + string msg = $"非法用户 请求访问[{url}]失败，无法访问系统资源"; logger.Info($"{msg}"); context.Result = new JsonResult(new ApiResult((int)ResultCode.DENY, msg)); diff --git a/ZR.Admin.WebApi/Framework/JwtUtil.cs b/ZR.Admin.WebApi/Framework/JwtUtil.cs index c6ef1139..d580421d 100644 --- a/ZR.Admin.WebApi/Framework/JwtUtil.cs +++ b/ZR.Admin.WebApi/Framework/JwtUtil.cs @@ -63,7 +63,7 @@ namespace ZR.Admin.WebApi.Framework return tokenHandler.WriteToken(token); } /// - /// 验证Token + /// 检查客户端和服务器的Token是否一样 /// /// public static TokenValidationParameters ValidParameters() @@ -117,7 +117,7 @@ namespace ZR.Admin.WebApi.Framework } /// - /// jwt token校验 + /// jwt token校验 合法用户和其权限 /// /// /// @@ -131,7 +131,9 @@ namespace ZR.Admin.WebApi.Framework if (userData != null) { loginUser = JsonConvert.DeserializeObject(userData); + //todo 从缓存拿到权限，如果拿不到权限说明非法用户 var permissions = CacheService.GetUserPerms(GlobalConstant.UserPermKEY + loginUser?.UserId); + if (loginUser?.UserName == GlobalConstant.AdminRole) { permissions = new List() { GlobalConstant.AdminPerm }; diff --git a/ZR.Admin.WebApi/Program.cs b/ZR.Admin.WebApi/Program.cs index 690339a5..7e9d481d 100644 --- a/ZR.Admin.WebApi/Program.cs +++ b/ZR.Admin.WebApi/Program.cs @@ -46,6 +46,7 @@ builder.Services.AddAuthentication(options => }).AddCookie() .AddJwtBearer(o => { + // 检查客户端和服务器的Token是否一样 o.TokenValidationParameters = JwtUtil.ValidParameters(); o.Events = new JwtBearerEvents { @@ -116,7 +117,9 @@ app.UseRouting(); app.UseCors("Policy");//要放在app.UseEndpoints前。 //app.UseHttpsRedirection(); +//todo 认证 app.UseAuthentication(); +//todo 授权 app.UseAuthorization(); //开启缓存 diff --git a/ZR.Admin.WebApi/wwwroot/logo.txt b/ZR.Admin.WebApi/wwwroot/logo.txt index 8b06c934..20cc19e6 100644 --- a/ZR.Admin.WebApi/wwwroot/logo.txt +++ b/ZR.Admin.WebApi/wwwroot/logo.txt @@ -1,7 +1,6 @@ - ___________ _ _ _ _ ______ _______ - |___ / __ \ /\ | | (_) | \ | | ____|__ __| - / /| |__) | / \ __| |_ __ ___ _ _ __ | \| | |__ | | - / / | _ / / /\ \ / _` | '_ ` _ \| | '_ \ | . ` | __| | | - / /__| | \ \ / ____ \ (_| | | | | | | | | | |_| |\ | |____ | | - /_____|_| \_\/_/ \_\__,_|_| |_| |_|_|_| |_(_)_| \_|______| |_| - \ No newline at end of file + __ __ ______ _____ + | \/ | ____|/ ____| + | \ / | |__ | (___ + | |\/| | __| \___ \ + | | | | |____ ____) | + |_| |_|______|_____/ \ No newline at end of file diff --git a/ZR.Service/System/SysDeptService.cs b/ZR.Service/System/SysDeptService.cs index 78bb0ba7..2fbafc2e 100644 --- a/ZR.Service/System/SysDeptService.cs +++ b/ZR.Service/System/SysDeptService.cs @@ -35,7 +35,7 @@ namespace ZR.Service.System var predicate = Expressionable.Create(); predicate = predicate.And(it => it.DelFlag == 0); predicate = predicate.AndIF(dept.DeptName.IfNotEmpty(), it => it.DeptName.Contains(dept.DeptName)); - predicate = predicate.AndIF(dept.Status != null, it => it.Status == dept.Status); + predicate = predicate.AndIF(dept.Status != null, it => it.Status == Convert.ToChar(dept.Status)); var response = GetList(predicate.ToExpression()); @@ -112,7 +112,7 @@ namespace ZR.Service.System private void UpdateParentDeptStatusNormal(SysDept dept) { long[] depts = Tools.SpitLongArrary(dept.Ancestors); - dept.Status = 0; + dept.Status = '0'; dept.Update_time = DateTime.Now; Update(dept, it => new { it.Update_by, it.Update_time, it.Status }, f => depts.Contains(f.DeptId)); diff --git a/ZR.Vue/.env.development b/ZR.Vue/.env.development index 349a4c39..73d9d37e 100644 --- a/ZR.Vue/.env.development +++ b/ZR.Vue/.env.development @@ -2,7 +2,7 @@ ENV = 'development' # 页面标题 -VUE_APP_TITLE = 'ZrAdmin.NET后台管理' +VUE_APP_TITLE = '上海干巷MES' # 开发环境 VUE_APP_BASE_API = '/dev-api' diff --git a/ZR.Vue/.env.staging b/ZR.Vue/.env.staging index 76909f2e..ef9eee6e 100644 --- a/ZR.Vue/.env.staging +++ b/ZR.Vue/.env.staging @@ -2,7 +2,7 @@ ENV = 'staging' # 页面标题 -VUE_APP_TITLE = 'ZrAdmin.NET后台管理' +VUE_APP_TITLE = '上海干巷MES' # 测试环境 VUE_APP_BASE_API = '/stage-api' diff --git a/ZR.Vue/src/layout/components/Navbar.vue b/ZR.Vue/src/layout/components/Navbar.vue index 45cc275e..c6deae21 100644 --- a/ZR.Vue/src/layout/components/Navbar.vue +++ b/ZR.Vue/src/layout/components/Navbar.vue @@ -14,12 +14,7 @@ - - - - - - +
diff --git a/ZR.Vue/src/settings.js b/ZR.Vue/src/settings.js index beb84da0..8301d83f 100644 --- a/ZR.Vue/src/settings.js +++ b/ZR.Vue/src/settings.js @@ -3,7 +3,7 @@ module.exports = { * 框架版本号 */ version: '3.8.1', - title: 'ZrAdmin.NET-后台管理', + title: '上海干巷MES', /** * 主题颜色 */ diff --git a/ZR.Vue/src/views/basisManagement/BOM.vue b/ZR.Vue/src/views/basisManagement/BOM.vue new file mode 100644 index 00000000..e69de29b diff --git a/ZR.Vue/src/views/basisManagement/devicestation.vue b/ZR.Vue/src/views/basisManagement/devicestation.vue new file mode 100644 index 00000000..e69de29b diff --git a/ZR.Vue/src/views/basisManagement/line.vue b/ZR.Vue/src/views/basisManagement/line.vue new file mode 100644 index 00000000..e69de29b diff --git a/ZR.Vue/src/views/basisManagement/materiel.vue b/ZR.Vue/src/views/basisManagement/materiel.vue new file mode 100644 index 00000000..e69de29b diff --git a/ZR.Vue/src/views/basisManagement/procedure.vue b/ZR.Vue/src/views/basisManagement/procedure.vue new file mode 100644 index 00000000..e69de29b diff --git a/ZR.Vue/src/views/basisManagement/process.vue b/ZR.Vue/src/views/basisManagement/process.vue new file mode 100644 index 00000000..e69de29b diff --git a/ZR.Vue/src/views/basisManagement/sop.vue b/ZR.Vue/src/views/basisManagement/sop.vue new file mode 100644 index 00000000..e69de29b diff --git a/ZR.Vue/src/views/basisManagement/tray.vue b/ZR.Vue/src/views/basisManagement/tray.vue new file mode 100644 index 00000000..e69de29b diff --git a/ZR.Vue/src/views/basisManagement/unit.vue b/ZR.Vue/src/views/basisManagement/unit.vue new file mode 100644 index 00000000..c9ebd4dc --- /dev/null +++ b/ZR.Vue/src/views/basisManagement/unit.vue @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/ZR.Vue/src/views/basisManagement/workshop.vue b/ZR.Vue/src/views/basisManagement/workshop.vue new file mode 100644 index 00000000..e69de29b diff --git a/ZR.Vue/src/views/basisManagement/workstation.vue b/ZR.Vue/src/views/basisManagement/workstation.vue new file mode 100644 index 00000000..e69de29b diff --git a/ZR.Vue/src/views/deviceManagement/device_account.vue b/ZR.Vue/src/views/deviceManagement/device_account.vue new file mode 100644 index 00000000..e69de29b diff --git a/ZR.Vue/src/views/deviceManagement/device_type.vue b/ZR.Vue/src/views/deviceManagement/device_type.vue new file mode 100644 index 00000000..e69de29b diff --git a/ZR.Vue/src/views/deviceManagement/repairlist.vue b/ZR.Vue/src/views/deviceManagement/repairlist.vue new file mode 100644 index 00000000..e69de29b diff --git a/ZR.Vue/src/views/deviceManagement/spot_inspection_plan.vue b/ZR.Vue/src/views/deviceManagement/spot_inspection_plan.vue new file mode 100644 index 00000000..e69de29b diff --git a/ZR.Vue/src/views/deviceManagement/spot_inspection_project.vue b/ZR.Vue/src/views/deviceManagement/spot_inspection_project.vue new file mode 100644 index 00000000..e69de29b diff --git a/ZR.Vue/src/views/productManagement/completion_statistics.vue b/ZR.Vue/src/views/productManagement/completion_statistics.vue new file mode 100644 index 00000000..e69de29b diff --git a/ZR.Vue/src/views/productManagement/dispatch.vue b/ZR.Vue/src/views/productManagement/dispatch.vue new file mode 100644 index 00000000..e69de29b diff --git a/ZR.Vue/src/views/productManagement/production_order.vue b/ZR.Vue/src/views/productManagement/production_order.vue new file mode 100644 index 00000000..e69de29b diff --git a/ZR.Vue/src/views/productManagement/production_schedule.vue b/ZR.Vue/src/views/productManagement/production_schedule.vue new file mode 100644 index 00000000..e69de29b diff --git a/ZR.Vue/src/views/productManagement/production_track.vue b/ZR.Vue/src/views/productManagement/production_track.vue new file mode 100644 index 00000000..e69de29b diff --git a/ZR.Vue/src/views/qualityManagement/FQC.vue b/ZR.Vue/src/views/qualityManagement/FQC.vue new file mode 100644 index 00000000..e69de29b diff --git a/ZR.Vue/src/views/qualityManagement/IPQC.vue b/ZR.Vue/src/views/qualityManagement/IPQC.vue new file mode 100644 index 00000000..e69de29b diff --git a/ZR.Vue/src/views/qualityManagement/IQC.vue b/ZR.Vue/src/views/qualityManagement/IQC.vue new file mode 100644 index 00000000..e69de29b diff --git a/ZR.Vue/src/views/qualityManagement/OQC.vue b/ZR.Vue/src/views/qualityManagement/OQC.vue new file mode 100644 index 00000000..e69de29b diff --git a/ZR.Vue/src/views/qualityManagement/checkItem.vue b/ZR.Vue/src/views/qualityManagement/checkItem.vue new file mode 100644 index 00000000..e69de29b diff --git a/ZR.Vue/src/views/warehouseManagement/barcode_list.vue b/ZR.Vue/src/views/warehouseManagement/barcode_list.vue new file mode 100644 index 00000000..e69de29b diff --git a/ZR.Vue/src/views/warehouseManagement/define.vue b/ZR.Vue/src/views/warehouseManagement/define.vue new file mode 100644 index 00000000..e69de29b diff --git a/ZR.Vue/src/views/warehouseManagement/material_entry.vue b/ZR.Vue/src/views/warehouseManagement/material_entry.vue new file mode 100644 index 00000000..e69de29b diff --git a/ZR.Vue/src/views/warehouseManagement/material_return.vue b/ZR.Vue/src/views/warehouseManagement/material_return.vue new file mode 100644 index 00000000..e69de29b diff --git a/ZR.Vue/src/views/warehouseManagement/materials_requisition.vue b/ZR.Vue/src/views/warehouseManagement/materials_requisition.vue new file mode 100644 index 00000000..e69de29b diff --git a/ZR.Vue/src/views/warehouseManagement/pack_management.vue b/ZR.Vue/src/views/warehouseManagement/pack_management.vue new file mode 100644 index 00000000..e69de29b diff --git a/ZR.Vue/src/views/warehouseManagement/product_inbound.vue b/ZR.Vue/src/views/warehouseManagement/product_inbound.vue new file mode 100644 index 00000000..e69de29b diff --git a/ZR.Vue/src/views/warehouseManagement/product_outbound.vue b/ZR.Vue/src/views/warehouseManagement/product_outbound.vue new file mode 100644 index 00000000..e69de29b diff --git a/ZR.Vue/src/views/warehouseManagement/sales_outbound.vue b/ZR.Vue/src/views/warehouseManagement/sales_outbound.vue new file mode 100644 index 00000000..e69de29b diff --git a/ZR.Vue/src/views/warehouseManagement/stock.vue b/ZR.Vue/src/views/warehouseManagement/stock.vue new file mode 100644 index 00000000..e69de29b