备份

Controllers/ApiGroupController.cs

@@ -118,6 +118,22 @@ namespace Controllers
 
 
 
+        /// <summary>
+        /// api接口分组下拉框数据
+        /// </summary>
+        /// <param name="parm">请求参数</param>
+        /// <returns>api接口分组下拉框数据</returns>
+        [HttpGet]
+        [Route("/v1/api/ApiGroup/SelectList")]
+        public IActionResult SelectList()
+        {
+            var response = _ApiGroupService.SelectList();
+            return SUCCESS(response);
+        }
+
+
+
+
 
 
     }

Controllers/ApiInfoController.cs

@@ -12,7 +12,6 @@ using Middleware;
 using Model;
 using Services;
 using Model.Base;
-using Microsoft.AspNetCore.Authorization;
 
 namespace Controllers
 {
@@ -27,77 +26,14 @@ namespace Controllers
         /// api分组接口
         /// </summary>
         private readonly IApiInfoService _ApiInfoService;
-        private readonly IApiGroupService _ApiGroupService;
 
 
-        public ApiInfoController(IApiInfoService ApiInfoService, IApiGroupService ApiGroupService)
+        public ApiInfoController(IApiInfoService ApiInfoService)
         {
             _ApiInfoService = ApiInfoService;
-            _ApiGroupService = ApiGroupService;
 
         }
 
-
-        [AllowAnonymous]
-        [HttpPost]
-        [Route("/noauth/apiinfo/groupsforadmin")]
-        public IActionResult GroupsForAdmin(string value)
-        {
-            var response = _ApiGroupService.GroupsForAdmin(value);
-            return SUCCESS(response);
-        }
-
-        [AllowAnonymous]
-        [HttpPost]
-        [Route("/noauth/apiinfo/listforadmin")]
-        public IActionResult ListForAdmin(string value)
-        {
-            string jsonString = Dbconn.DesDecrypt(value, "&L^kg4N9");
-            Dictionary<string, object> data = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, object>>(jsonString);
-            Dictionary<string, int> groupobj = new Dictionary<string, int>();
-            Dictionary<string, object> obj = new Dictionary<string, object>();
-            if(jsonString.Contains("\"groups\""))
-            {
-                List<Dictionary<string, object>> groupJson = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Dictionary<string, object>>>(data["groups"].ToString());
-                for(int i = 0; i < groupJson.Count; i ++)
-                {
-                    string name = groupJson[i]["name"].ToString();
-                    int version = int.Parse(groupJson[i]["version"].ToString());
-                    groupobj.Add(name, version);
-                }
-            }
-            var groups = _ApiGroupService.GetList(m => m.groupKind == 1);
-            foreach(var group in groups)
-            {
-                int curVersion = int.Parse(Function.CheckInt(group.groupVersion));
-                if(groupobj.Any(m => m.Key == group.groupName && m.Value < curVersion))
-                {
-                    Dictionary<string, object> groupData = new Dictionary<string, object>();
-                    var apis = _ApiInfoService.GetList(m => m.groupId == group.id).ToList();
-                    foreach(var api in apis)
-                    {
-                        Dictionary<string, object> apiData = new Dictionary<string, object>();
-                        string url = api.apiHost;
-                        if(api.apiPort != 80 && api.apiPort != 443)
-                        {
-                            url += ":" + api.apiPort;
-                        }
-                        url += api.apiRouter;
-                        apiData.Add("name", api.apiName);
-                        apiData.Add("url", url);
-                        apiData.Add("method", api.apiMethod);
-                        groupData.Add(api.apiKey, apiData);
-                    }
-                    groupData.Add("groupVersion", group.groupVersion);
-                    groupData.Add("groupInfo", group.groupRemark);
-                    obj.Add(group.groupName, groupData);
-                }
-            }
-            return SUCCESS(obj);
-        }
-
-
-
         /// <summary>
         /// api接口列表
         /// </summary>

Controllers/Base/ApiPubController.cs

@@ -0,0 +1,99 @@
+using Attribute;
+using Common;
+using Dto;
+using Vo;
+using Enums;
+using Filters;
+using Infrastructure;
+using Infrastructure.Model;
+using Mapster;
+using Microsoft.AspNetCore.Mvc;
+using Middleware;
+using Model;
+using Services;
+using Model.Base;
+using Microsoft.AspNetCore.Authorization;
+
+namespace Controllers
+{
+    /// <summary>
+    /// ApiInfo)Controller
+    /// </summary>
+    // [Route("ApiInfo")]
+    // [ApiExplorerSettings(GroupName = "ApiInfo")]
+    public class ApiPubController : BaseController
+    {
+        /// <summary>
+        /// api分组接口
+        /// </summary>
+        private readonly IApiInfoService _ApiInfoService;
+        private readonly IApiGroupService _ApiGroupService;
+
+
+        public ApiPubController(IApiInfoService ApiInfoService, IApiGroupService ApiGroupService)
+        {
+            _ApiInfoService = ApiInfoService;
+            _ApiGroupService = ApiGroupService;
+
+        }
+
+
+        [AllowAnonymous]
+        [HttpPost]
+        [Route("/noauth/apiinfo/groupsforadmin")]
+        public IActionResult GroupsForAdmin(string value)
+        {
+            var response = _ApiGroupService.GroupsForAdmin(value);
+            return SUCCESS(response);
+        }
+
+        [AllowAnonymous]
+        [HttpPost]
+        [Route("/noauth/apiinfo/listforadmin")]
+        public IActionResult ListForAdmin(string value)
+        {
+            string jsonString = Dbconn.DesDecrypt(value, "&L^kg4N9");
+            Dictionary<string, object> data = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, object>>(jsonString);
+            Dictionary<string, int> groupobj = new Dictionary<string, int>();
+            Dictionary<string, object> obj = new Dictionary<string, object>();
+            if(jsonString.Contains("\"groups\""))
+            {
+                List<Dictionary<string, object>> groupJson = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Dictionary<string, object>>>(data["groups"].ToString());
+                for(int i = 0; i < groupJson.Count; i ++)
+                {
+                    string name = groupJson[i]["name"].ToString();
+                    int version = int.Parse(groupJson[i]["version"].ToString());
+                    groupobj.Add(name, version);
+                }
+            }
+            var groups = _ApiGroupService.GetList(m => m.groupKind == 1);
+            foreach(var group in groups)
+            {
+                int curVersion = int.Parse(Function.CheckInt(group.groupVersion));
+                if(groupobj.Any(m => m.Key == group.groupName && m.Value < curVersion))
+                {
+                    Dictionary<string, object> groupData = new Dictionary<string, object>();
+                    var apis = _ApiInfoService.GetList(m => m.groupId == group.id).ToList();
+                    foreach(var api in apis)
+                    {
+                        Dictionary<string, object> apiData = new Dictionary<string, object>();
+                        string url = api.apiHost;
+                        if(api.apiPort != 80 && api.apiPort != 443)
+                        {
+                            url += ":" + api.apiPort;
+                        }
+                        url += api.apiRouter;
+                        apiData.Add("name", api.apiName);
+                        apiData.Add("url", url);
+                        apiData.Add("method", api.apiMethod);
+                        groupData.Add(api.apiKey, apiData);
+                    }
+                    groupData.Add("groupVersion", group.groupVersion);
+                    groupData.Add("groupInfo", group.groupRemark);
+                    obj.Add(group.groupName, groupData);
+                }
+            }
+            return SUCCESS(obj);
+        }
+    }
+}

Model/Vo/ApiGroupQueryVo.cs

@@ -17,7 +17,6 @@ namespace Vo
         /// 版本号
         /// </summary>
         public string groupVersion { get; set; }
-        public string groupRemark { get; set; }
 
 
         /// <summary>

Model/Vo/ApiGroupSelectListVo.cs

@@ -0,0 +1,24 @@
+using Newtonsoft.Json;
+
+namespace Vo
+{
+    /// <summary>
+    /// 下拉框数据
+    /// </summary>
+    public class ApiGroupSelectListVo
+    {
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string groupName { get; set; }
+
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        public int id { get; set; }
+
+
+
+    }
+}

Services/ApiGroupService.cs

@@ -34,6 +34,9 @@ namespace Services
             return response;
         }
 
+
+
+
         public List<string> GroupsForAdmin(string value)
         {
             string jsonString = Dbconn.DesDecrypt(value, "&L^kg4N9");
@@ -55,9 +58,20 @@ namespace Services
 
 
 
-
-
-
+        /// <summary>
+        /// api接口分组-下拉框数据
+        /// </summary>
+        /// <returns>api接口分组下拉框数据</returns>
+        public PagedInfo<ApiGroupSelectListVo> SelectList()
+        {
+            //开始拼装查询条件
+            var predicate = Expressionable.Create<ApiGroup>();
+            var response = Queryable()
+                .Where(predicate.ToExpression())
+                .OrderByDescending(m => m.id)
+                .ToPage<ApiGroup, ApiGroupSelectListVo>(new PagerInfo());
+            return response;
+        }
 
 
 

Services/ApiInfoService.cs

@@ -7,7 +7,6 @@ using Model.Base;
 using Repository;
 using Service;
 using Microsoft.AspNetCore.Mvc;
-using Common;
 
 namespace Services
 {
@@ -35,5 +34,18 @@ namespace Services
                 .ToPage<ApiInfo, ApiInfoListVo>(new PagerInfo());
             return response;
         }
+
+
+
+
+
+
+
+
+
+
+
+
+
     }
 }

Services/IService/IApiGroupService.cs

@@ -14,15 +14,21 @@ namespace Services
         /// <param name="parm">请求参数</param>
         /// <returns>api接口分组列表</returns>
         PagedInfo<ApiGroupListVo> List([FromQuery] ApiGroupListDto parm);
-        List<string> GroupsForAdmin(string value);
 
 
 
 
+        List<string> GroupsForAdmin(string value);
+
 
 
 
 
+        /// <summary>
+        /// api接口分组-下拉框数据
+        /// </summary>
+        /// <returns>api接口分组下拉框数据</returns>
+        PagedInfo<ApiGroupSelectListVo> SelectList();
 
 
 

Services/IService/IApiInfoService.cs

@@ -15,5 +15,15 @@ namespace Services
         /// <returns>api接口列表</returns>
         PagedInfo<ApiInfoListVo> List([FromQuery] ApiInfoListDto parm);
 
+
+
+
+
+
+
+
+
+
+
     }
 }