备份

Controllers/Base/SysDeptController.cs

@@ -5,6 +5,8 @@ using Enums;
 using Extensions;
 using Filters;
 using Infrastructure;
+using Mapster;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Middleware;
 using Model;
@@ -12,6 +14,7 @@ using Model.Base;
 using Services;
 using System.Collections;
 using Util;
+using Vo;
 
 namespace Controllers
 {
@@ -50,6 +53,14 @@ namespace Controllers
             return SUCCESS(DeptService.GetList(), TIME_FORMAT_FULL);
         }
 
+        [AllowAnonymous]
+        [HttpGet("/feign/dept/query")]
+        public DeptFeignVo Query([FromQuery] long id)
+        {
+            var info = DeptService.GetFirst(m => m.deptId == id).Adapt<DeptFeignVo>();
+            return info;
+        }
+
         /// <summary>
         /// 查询部门列表（排除节点）
         /// </summary>

Controllers/Base/SysUserController.cs

@@ -2,6 +2,7 @@ using Attribute;
 using Common;
 using Dto;
 using Enums;
+using Feign;
 using Filters;
 using Infrastructure;
 using Infrastructure.Model;
@@ -14,6 +15,7 @@ using Model;
 using Model.Base;
 using Services;
 using Util;
+using Vo;
 
 namespace Controllers
 {
@@ -27,17 +29,20 @@ namespace Controllers
         private readonly ISysRoleService RoleService;
         private readonly ISysPostService PostService;
         private readonly ISysUserPostService UserPostService;
+        private readonly SysDeptFeign SysDept;
 
         public SysUserController(
             ISysUserService userService,
             ISysRoleService roleService,
             ISysPostService postService,
-            ISysUserPostService userPostService)
+            ISysUserPostService userPostService,
+            SysDeptFeign sysDeptFeign)
         {
             UserService = userService;
             RoleService = roleService;
             PostService = postService;
             UserPostService = userPostService;
+            SysDept = sysDeptFeign;
         }
 
         /// <summary>
@@ -53,6 +58,24 @@ namespace Controllers
             return SUCCESS(list);
         }
 
+        [AllowAnonymous]
+        [HttpGet("/feign/user/test")]
+        public async Task<SysUserVo> Test([FromQuery] long id)
+        {
+            var info = UserService.GetFirst(m => m.userId == id).Adapt<SysUserVo>();
+            var dept = await SysDept.GetDeptInfo(info.deptId);
+            info.deptInfo = dept;
+            return info;
+        }
+
+        [AllowAnonymous]
+        [HttpGet("/feign/user/testlist")]
+        public async Task<PagedInfo<SysUserVo>> TestList()
+        {
+            var response = await UserService.TestList(SysDept);
+            return response;
+        }
+
         /// <summary>
         /// 用户管理 -> 编辑、添加用户获取用户，信息查询
         /// </summary>

Feign/SysDeptFeign.cs

@@ -0,0 +1,13 @@
+using Microsoft.AspNetCore.Mvc;
+using SummerBoot.Feign.Attributes;
+using Vo;
+
+namespace Feign
+{
+    [FeignClient(Url = "http://localhost:5296")]
+    public interface SysDeptFeign
+    {
+        [GetMapping("/feign/dept/query")]
+        Task<DeptFeignVo> GetDeptInfo([Query] long id);
+    }
+}

Filters/AuthorizationFilter.cs

@@ -29,51 +29,54 @@ namespace Filters
         public void OnAuthorization(AuthorizationFilterContext context)
         {
             var request = context.HttpContext.Request;
-            string content = "";
-            if(context.HttpContext.Request.Method.ToLower() == "get")
+            if(!request.Path.Value.ToLower().Contains("feign/"))
             {
-                content = context.HttpContext.GetQueryString();
-                content = content.Substring(content.IndexOf("=") + 1);
-                content = HttpUtility.UrlDecode(content);
-                content = Decrypt(content);
-                if(!string.IsNullOrEmpty(content))
+                string content = "";
+                if(context.HttpContext.Request.Method.ToLower() == "get")
                 {
-                    Dictionary<string, string> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, string>>(content);
-                    string queryString = "";
-                    foreach(string key in dic.Keys)
+                    content = context.HttpContext.GetQueryString();
+                    content = content.Substring(content.IndexOf("=") + 1);
+                    content = HttpUtility.UrlDecode(content);
+                    content = Decrypt(content);
+                    if(!string.IsNullOrEmpty(content))
                     {
-                        queryString += key + "=" + dic[key] + "&";
+                        Dictionary<string, string> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, string>>(content);
+                        string queryString = "";
+                        foreach(string key in dic.Keys)
+                        {
+                            queryString += key + "=" + dic[key] + "&";
+                        }
+                        request.QueryString = new QueryString("?" + queryString.TrimEnd('&'));
                     }
-                    request.QueryString = new QueryString("?" + queryString.TrimEnd('&'));
                 }
-            }
-            else if(context.HttpContext.Request.Method.ToLower() == "delete")
-            {
-                string path = request.Path.Value;
-                string value = path.Substring(path.LastIndexOf("/") + 1);
-                path = path.Substring(0, path.LastIndexOf("/") + 1);
-                value = Decrypt(value);
-                path += value;
-                request.Path = new PathString(path);
-                request.RouteValues["id"] = value;
-            }
-            else
-            {
-                content = context.HttpContext.GetBody();
-                content = Decrypt(content);
-                //{"username":"admin","password":"000000"}
-                request.Body = new MemoryStream(Encoding.UTF8.GetBytes(content));
-
-                //验证登录接口
-                if(request.Path.Value.EndsWith("/oauth2/token"))
+                else if(context.HttpContext.Request.Method.ToLower() == "delete")
+                {
+                    string path = request.Path.Value;
+                    string value = path.Substring(path.LastIndexOf("/") + 1);
+                    path = path.Substring(0, path.LastIndexOf("/") + 1);
+                    value = Decrypt(value);
+                    path += value;
+                    request.Path = new PathString(path);
+                    request.RouteValues["id"] = value;
+                }
+                else
                 {
-                    var scope = request.Query["scope"].ToString();
-                    var grantType = request.Query["grant_type"].ToString();
-                    bool checkLogin = SysLoginService.CheckLogin(scope, grantType, context.HttpContext.GetToken().Replace("Basic ", ""));
-                    if(!checkLogin)
+                    content = context.HttpContext.GetBody();
+                    content = Decrypt(content);
+                    //{"username":"admin","password":"000000"}
+                    request.Body = new MemoryStream(Encoding.UTF8.GetBytes(content));
+
+                    //验证登录接口
+                    if(request.Path.Value.EndsWith("/oauth2/token"))
                     {
-                        string msg = $"请求访问失败，无法访问系统资源";
-                        context.Result = new JsonResult(ApiResult.Error(ResultCode.DENY, msg));
+                        var scope = request.Query["scope"].ToString();
+                        var grantType = request.Query["grant_type"].ToString();
+                        bool checkLogin = SysLoginService.CheckLogin(scope, grantType, context.HttpContext.GetToken().Replace("Basic ", ""));
+                        if(!checkLogin)
+                        {
+                            string msg = $"请求访问失败，无法访问系统资源";
+                            context.Result = new JsonResult(ApiResult.Error(ResultCode.DENY, msg));
+                        }
                     }
                 }
             }

Filters/GlobalActionMonitor.cs

@@ -32,126 +32,129 @@ namespace Middleware
         /// <returns></returns>
         public override Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
         {
-            string content = "";
-            if(context.HttpContext.Request.Method.ToLower() == "get")
+            if(!context.HttpContext.Request.Path.Value.ToLower().Contains("feign/"))
             {
-                content = context.HttpContext.GetQueryString();
-                content = content.Substring(content.IndexOf("?") + 1);
-                if(!string.IsNullOrEmpty(content))
+                string content = "";
+                if(context.HttpContext.Request.Method.ToLower() == "get")
                 {
-                    string jsonString = "";
-                    string[] dataList = content.Split('&');
-                    foreach(string sub in dataList)
+                    content = context.HttpContext.GetQueryString();
+                    content = content.Substring(content.IndexOf("?") + 1);
+                    if(!string.IsNullOrEmpty(content))
                     {
-                        string[] item = sub.Split('=');
-                        jsonString += "\"" + item[0] + "\":\"" + item[1] + "\",";
+                        string jsonString = "";
+                        string[] dataList = content.Split('&');
+                        foreach(string sub in dataList)
+                        {
+                            string[] item = sub.Split('=');
+                            jsonString += "\"" + item[0] + "\":\"" + item[1] + "\",";
+                        }
+                        content = "{" + jsonString.TrimEnd(',') + "}";
                     }
-                    content = "{" + jsonString.TrimEnd(',') + "}";
                 }
-            }
-            else if(context.HttpContext.Request.Method.ToLower() == "delete")
-            {
-                string path = context.HttpContext.Request.Path.Value;
-                content = path.Substring(path.LastIndexOf("/") + 1);
-            }
-            else
-            {
-                content = context.HttpContext.GetBody();
-            }
-            if(!string.IsNullOrEmpty(content))
-            {                
-                if(content.Contains("{") && content.Contains("}") && content != "{}")
+                else if(context.HttpContext.Request.Method.ToLower() == "delete")
                 {
-                    Dictionary<string, object> dictionary = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, object>>(content);
-                    if(context.ActionDescriptor.Parameters.Count > 0)
+                    string path = context.HttpContext.Request.Path.Value;
+                    content = path.Substring(path.LastIndexOf("/") + 1);
+                }
+                else
+                {
+                    content = context.HttpContext.GetBody();
+                }
+                if(!string.IsNullOrEmpty(content))
+                {                
+                    if(content.Contains("{") && content.Contains("}") && content != "{}")
                     {
-                        var parameters = context.ActionDescriptor.Parameters;
-                        foreach(var parameter in parameters)
+                        Dictionary<string, object> dictionary = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, object>>(content);
+                        if(context.ActionDescriptor.Parameters.Count > 0)
                         {
-                            string parameterName = parameter.Name;
-                            Type objectType = parameter.ParameterType;
-                            if(objectType.FullName != "System.String")
+                            var parameters = context.ActionDescriptor.Parameters;
+                            foreach(var parameter in parameters)
                             {
-                                System.Reflection.Assembly assembly = System.Reflection.Assembly.GetAssembly(objectType);
-                                var entry = assembly.CreateInstance(objectType.FullName);
-                                Type type = entry.GetType();
-                                System.Reflection.PropertyInfo[] propertyInfos = type.GetProperties();
-                                for (int i = 0; i < propertyInfos.Length; i++)
+                                string parameterName = parameter.Name;
+                                Type objectType = parameter.ParameterType;
+                                if(objectType.FullName != "System.String")
                                 {
-                                    foreach (string key in dictionary.Keys)
+                                    System.Reflection.Assembly assembly = System.Reflection.Assembly.GetAssembly(objectType);
+                                    var entry = assembly.CreateInstance(objectType.FullName);
+                                    Type type = entry.GetType();
+                                    System.Reflection.PropertyInfo[] propertyInfos = type.GetProperties();
+                                    for (int i = 0; i < propertyInfos.Length; i++)
                                     {
-                                        if (propertyInfos[i].Name == key)
+                                        foreach (string key in dictionary.Keys)
                                         {
-                                            object value = dictionary[key];
-                                            string ParameterType = propertyInfos[i].GetMethod.ReturnParameter.ParameterType.Name;
-                                            if (ParameterType == "Int32")
-                                            {
-                                                if(value == null || value == "") value = "0";
-                                                value = Convert.ToInt32(value);
-                                            }
-                                            else if (ParameterType == "Int64[]")
-                                            {
-                                                value = Tools.SpitLongArrary(Newtonsoft.Json.JsonConvert.SerializeObject(value).Replace("[", "").Replace("]", "").Trim('"'), ',');
-                                            }
-                                            else if (ParameterType == "Int32[]")
-                                            {
-                                                value = Tools.SpitIntArrary(Newtonsoft.Json.JsonConvert.SerializeObject(value).Replace("[", "").Replace("]", "").Trim('"'), ',');
-                                            }
-                                            else if (ParameterType == "List`1")
+                                            if (propertyInfos[i].Name == key)
                                             {
-                                                string val = Newtonsoft.Json.JsonConvert.SerializeObject(value).Replace("[", "").Replace("]", "").Trim('"');
-                                                value = Tools.SpitLongArrary(val, ',').ToList();
+                                                object value = dictionary[key];
+                                                string ParameterType = propertyInfos[i].GetMethod.ReturnParameter.ParameterType.Name;
+                                                if (ParameterType == "Int32")
+                                                {
+                                                    if(value == null || value == "") value = "0";
+                                                    value = Convert.ToInt32(value);
+                                                }
+                                                else if (ParameterType == "Int64[]")
+                                                {
+                                                    value = Tools.SpitLongArrary(Newtonsoft.Json.JsonConvert.SerializeObject(value).Replace("[", "").Replace("]", "").Trim('"'), ',');
+                                                }
+                                                else if (ParameterType == "Int32[]")
+                                                {
+                                                    value = Tools.SpitIntArrary(Newtonsoft.Json.JsonConvert.SerializeObject(value).Replace("[", "").Replace("]", "").Trim('"'), ',');
+                                                }
+                                                else if (ParameterType == "List`1")
+                                                {
+                                                    string val = Newtonsoft.Json.JsonConvert.SerializeObject(value).Replace("[", "").Replace("]", "").Trim('"');
+                                                    value = Tools.SpitLongArrary(val, ',').ToList();
+                                                }
+                                                if(value.ToString() == "-1") value = -1;
+                                                if(value.ToString() == "[]") value = "";
+                                                propertyInfos[i].SetValue(entry, value, null);
+                                                break;
                                             }
-                                            if(value.ToString() == "-1") value = -1;
-                                            if(value.ToString() == "[]") value = "";
-                                            propertyInfos[i].SetValue(entry, value, null);
-                                            break;
                                         }
                                     }
-                                }
-                                if(context.ActionArguments.ContainsKey(parameterName))
-                                {
-                                    context.ActionArguments[parameterName] = entry;
-                                }
-                                else
-                                {
-                                    context.ActionArguments.Add(parameterName, entry);
+                                    if(context.ActionArguments.ContainsKey(parameterName))
+                                    {
+                                        context.ActionArguments[parameterName] = entry;
+                                    }
+                                    else
+                                    {
+                                        context.ActionArguments.Add(parameterName, entry);
+                                    }
                                 }
                             }
                         }
                     }
-                }
-                else
-                {
-                    string ParamName = context.ActionDescriptor.Parameters[0].Name;
-                    if(context.ActionArguments.ContainsKey(ParamName))
-                    {
-                        context.ActionArguments[ParamName] = Convert.ToInt32(content);
-                    }
                     else
                     {
-                        context.ActionArguments.Add(ParamName, Convert.ToInt32(content));
+                        string ParamName = context.ActionDescriptor.Parameters[0].Name;
+                        if(context.ActionArguments.ContainsKey(ParamName))
+                        {
+                            context.ActionArguments[ParamName] = Convert.ToInt32(content);
+                        }
+                        else
+                        {
+                            context.ActionArguments.Add(ParamName, Convert.ToInt32(content));
+                        }
                     }
                 }
-            }
-            else
-            {
-                if(context.ActionDescriptor.Parameters.Count > 0)
+                else
                 {
-                    string ParamName = context.ActionArguments.Keys.First();
-                    object ParamValue = context.ActionArguments.Values.First();
-                    // ParamValue = DesDecrypt(ParamValue.ToString());
-                    if(ParamValue.GetType() == typeof(int))
-                    {
-                        ParamValue = (int)ParamValue;
-                    }
-                    if(context.ActionArguments.ContainsKey(ParamName))
-                    {
-                        context.ActionArguments[ParamName] = ParamValue;
-                    }
-                    else
+                    if(context.ActionDescriptor.Parameters.Count > 0)
                     {
-                        context.ActionArguments.Add(ParamName, ParamValue);
+                        string ParamName = context.ActionArguments.Keys.First();
+                        object ParamValue = context.ActionArguments.Values.First();
+                        // ParamValue = DesDecrypt(ParamValue.ToString());
+                        if(ParamValue.GetType() == typeof(int))
+                        {
+                            ParamValue = (int)ParamValue;
+                        }
+                        if(context.ActionArguments.ContainsKey(ParamName))
+                        {
+                            context.ActionArguments[ParamName] = ParamValue;
+                        }
+                        else
+                        {
+                            context.ActionArguments.Add(ParamName, ParamValue);
+                        }
                     }
                 }
             }

KxsOperateAdminServer.csproj

@@ -27,8 +27,10 @@
     <PackageReference Include="MySqlConnector" Version="2.3.4" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NLog" Version="5.2.8" />
+    <PackageReference Include="Npgsql" Version="8.0.3" />
     <PackageReference Include="SqlSugar.IOC" Version="2.0.0" />
     <PackageReference Include="SqlSugarCoreNoDrive" Version="5.1.4.136" />
+    <PackageReference Include="summerboot" Version="2.1.3" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
     <PackageReference Include="ThoughtWorks.QRCode" Version="1.1.0" />
     <PackageReference Include="UAParser" Version="3.1.47" />

Middleware/GlobalExceptionMiddleware.cs

@@ -78,6 +78,7 @@ namespace Middleware
             {
                 msg = "服务器好像出了点问题，请联系系统管理员...";
                 error = $"{ex.Message}";
+                Console.Write("500错误：" + ex.ToString());
                 logLevel = NLog.LogLevel.Error;
                 context.Response.StatusCode = 500;
             }

Model/Vo/Base/DeptFeignVo.cs

@@ -0,0 +1,8 @@
+namespace Vo
+{
+    public class DeptFeignVo
+    {
+        public long deptId { get; set; }
+        public string name { get; set; }
+    }
+}

Model/Vo/Base/SysUserVo.cs

@@ -0,0 +1,10 @@
+namespace Vo
+{
+    public class SysUserVo
+    {
+        public long userId { get; set; }
+        public long deptId { get; set; }
+        public string username { get; set; }
+        public DeptFeignVo deptInfo { get; set; }
+    }
+}

Program.cs

@@ -9,6 +9,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Middleware;
 using Services;
+using SummerBoot.Core;
 using Util;
 
 var builder = WebApplication.CreateBuilder(args);
@@ -60,6 +61,8 @@ builder.Services.AddMvc(options =>
     options.JsonSerializerOptions.PropertyNamingPolicy = JsonNamingPolicy.CamelCase;
     //options.JsonSerializerOptions.PropertyNameCaseInsensitive = true;//属性可以忽略大小写格式，开启后性能会降低
 });
+builder.Services.AddSummerBoot();
+builder.Services.AddSummerBootFeign();
 
 var app = builder.Build();
 InternalApp.ServiceProvider = app.Services;

Services/Base/IService/ISysUserService.cs

@@ -1,6 +1,8 @@
 using Dto;
+using Feign;
 using Model;
 using Model.Base;
+using Vo;
 
 namespace Services
 {
@@ -81,5 +83,8 @@ namespace Services
         SysUser Login(LoginBodyDto user);
 
         void UpdateLoginInfo(string userIP, long userId);
+
+
+        Task<PagedInfo<SysUserVo>> TestList(SysDeptFeign SysDept);
     }
 }

Services/Base/SysUserService.cs

@@ -3,6 +3,7 @@ using Base;
 using Common;
 using Dto;
 using Extensions;
+using Feign;
 using Infrastructure;
 using IPTools.Core;
 using Model;
@@ -10,6 +11,7 @@ using Model.Base;
 using Repository;
 using Service;
 using System.Collections;
+using Vo;
 
 namespace Services
 {
@@ -53,14 +55,14 @@ namespace Services
                 .OrderByDescending(m => m.userId);
 
             PagedInfo<SysUser> result = query.ToPage(pager);
-            foreach(SysUser sub in result.Records)
-            {
-                List<long> userRoles = UserRoleService.GetList(m => m.UserId == sub.userId).Select(m => m.RoleId).ToList();
-                sub.RoleList = RoleService.GetList(m => userRoles.Contains(m.roleId));
+            // foreach(SysUser sub in result.Records)
+            // {
+            //     List<long> userRoles = UserRoleService.GetList(m => m.UserId == sub.userId).Select(m => m.RoleId).ToList();
+            //     sub.RoleList = RoleService.GetList(m => userRoles.Contains(m.roleId));
 
-                List<long> userPost = UserPostService.GetList(m => m.UserId == sub.userId).Select(m => m.PostId).ToList();
-                sub.PostList = PostService.GetList(m => userPost.Contains(m.postId));
-            }
+            //     List<long> userPost = UserPostService.GetList(m => m.UserId == sub.userId).Select(m => m.PostId).ToList();
+            //     sub.PostList = PostService.GetList(m => userPost.Contains(m.postId));
+            // }
 
             return result;
         }
@@ -327,5 +329,21 @@ namespace Services
         public void UpdateLoginInfo(string userIP, long userId)
         {
         }
+
+        public async Task<PagedInfo<SysUserVo>> TestList(SysDeptFeign SysDept)
+        {
+            //开始拼装查询条件
+            var predicate = Expressionable.Create<SysUser>();
+            var response = Queryable()
+                .Where(predicate.ToExpression())
+                .OrderByDescending(m => m.userId)
+                .ToPage<SysUser, SysUserVo>(new PagerInfo());
+            foreach(SysUserVo sub in response.Records)
+            {
+                var dept = await SysDept.GetDeptInfo(sub.deptId);
+                sub.deptInfo = dept;
+            }
+            return response;
+        }
     }
 }