完善接口

Common/CryptUtil.cs

@@ -0,0 +1,48 @@
+using System.Text;
+using System.Security.Cryptography;
+
+namespace MySystem
+{
+    public class CryptHelper
+    {
+        /// <summary>
+        /// aes加密
+        /// </summary>
+        /// <param name="str">加密字符串</param>
+        /// <param name="key">密钥</param>
+        /// <param name="iv">向量</param>
+        /// <param name="mode">加密模式</param>
+        /// <param name="padding">填充模式</param>
+        /// <returns>加密后字符串</returns>
+        public static string AesEncrypt(string str, string key, string iv, string mode = "CBC", string padding = "PKCS7")
+        {
+            if (string.IsNullOrEmpty(str)) return null;
+            Byte[] toEncryptArray = Encoding.UTF8.GetBytes(str);
+
+            CipherMode cipherMode = CipherMode.CBC;
+            PaddingMode paddingMode = PaddingMode.PKCS7;
+            if(mode == "CBC") cipherMode = CipherMode.CBC;
+            if(mode == "ECB") cipherMode = CipherMode.ECB;
+            if(mode == "CFB") cipherMode = CipherMode.CFB;
+            if(mode == "CTS") cipherMode = CipherMode.CTS;
+            if(padding == "PKCS7") paddingMode = PaddingMode.PKCS7;
+            if(padding == "None") paddingMode = PaddingMode.None;
+            if(padding == "Zeros") paddingMode = PaddingMode.Zeros;
+            if(padding == "ISO10126") paddingMode = PaddingMode.ISO10126;
+            if(padding == "ANSIX923") paddingMode = PaddingMode.ANSIX923;
+
+            System.Security.Cryptography.RijndaelManaged rm = new System.Security.Cryptography.RijndaelManaged
+            {
+                Key = Encoding.UTF8.GetBytes(key),
+                IV = Encoding.UTF8.GetBytes(iv),
+                Mode = cipherMode,
+                Padding = paddingMode
+            };
+            System.Security.Cryptography.ICryptoTransform cTransform = rm.CreateEncryptor();
+            Byte[] resultArray = cTransform.TransformFinalBlock(toEncryptArray, 0, toEncryptArray.Length);
+            string jsonData = Convert.ToBase64String(resultArray, 0, resultArray.Length);
+            return Convert.ToBase64String(Encoding.UTF8.GetBytes(jsonData));
+        }
+    
+    }
+}

Common/dbconn.cs

@@ -8,7 +8,7 @@ using System.IO;
 namespace Common
 {
     public class Dbconn
-    {        
+    {
         public static void InsertCache(string key, object val)
         {
             new MemoryCache(new MemoryCacheOptions()).Set(key, val, new MemoryCacheEntryOptions().SetAbsoluteExpiration(TimeSpan.FromMinutes(10)));

Controllers/Admin/ApiInfoController.cs

@@ -23,12 +23,12 @@ namespace Controllers.Admin
         /// api分组接口
         /// </summary>
         private readonly IApiInfoService _ApiInfoService;
+        private readonly IApiGroupService _ApiGroupService;
 
-
-        public ApiInfoController(IApiInfoService ApiInfoService)
+        public ApiInfoController(IApiInfoService ApiInfoService, IApiGroupService ApiGroupService)
         {
             _ApiInfoService = ApiInfoService;
-
+            _ApiGroupService = ApiGroupService;
         }
 
           /// <param name="page">分页参数</param>
@@ -144,7 +144,8 @@ namespace Controllers.Admin
         [Route("/v1/omega_source/ApiInfo/copyApiInfo")]
         public IActionResult copyApiInfo([FromBody] CopyApiInfoDto param)
         {
-            _ApiInfoService.copyApiInfo(param);
+            var group = _ApiGroupService.GetFirst(m => m.id == param.targetGroupId) ?? new ApiGroup();
+            _ApiInfoService.copyApiInfo(param, group);
             return SUCCESS("ok");
         }
 

Controllers/Admin/DatabaseFieldController.cs

@@ -20,12 +20,13 @@ namespace Controllers.Admin
     {
         private readonly IDatabaseFieldService _DatabaseFieldService;
         private readonly IDatabaseFieldTabsService _DatabaseFieldTabsService;
+        private readonly IDatabaseTableService _DatabaseTableService;
 
-
-        public DatabaseFieldController(IDatabaseFieldService DatabaseFieldService, IDatabaseFieldTabsService DatabaseFieldTabsService)
+        public DatabaseFieldController(IDatabaseFieldService DatabaseFieldService, IDatabaseFieldTabsService DatabaseFieldTabsService, IDatabaseTableService DatabaseTableService)
         {
             _DatabaseFieldService = DatabaseFieldService;
             _DatabaseFieldTabsService = DatabaseFieldTabsService;
+            _DatabaseTableService = DatabaseTableService;
         }
 
           /// <param name="page">分页参数</param>
@@ -140,7 +141,8 @@ namespace Controllers.Admin
         [Route("/v1/omega_source/DatabaseField/copyDatabaseField")]
         public IActionResult copyDatabaseField([FromBody] CopyDatabaseFieldDto param)
         {
-            _DatabaseFieldService.copyDatabaseField(param);
+            var targetTable = _DatabaseTableService.GetFirst(m => m.id == param.targetTableId) ?? new DatabaseTable();
+            _DatabaseFieldService.copyDatabaseField(param, targetTable);
             return SUCCESS("ok");
         }
 

Feign/IProject.cs

@@ -0,0 +1,20 @@
+using Common;
+
+namespace Feign
+{
+    public class IProject
+    {
+        // public static List<PageForMiniProgramVo> GetPageForMiniProgram(List<int> moduleIdList)
+        // {
+        //     string content = Function.GetWebRequest(Utils.FeignUrl["ym_material"] + "/v1/pub/pageForMiniProgram?moduleIdList=" + Newtonsoft.Json.JsonConvert.SerializeObject(moduleIdList).Replace("[", "").Replace("]", ""));
+        //     Utils.WriteLog(content, "GetPageForMiniProgram");
+        //     return Newtonsoft.Json.JsonConvert.DeserializeObject<List<PageForMiniProgramVo>>(content);
+        // }
+
+        // public static List<ModuleTreeVo> getProject()
+        // {
+        //     string content = Function.GetWebRequest(Utils.FeignUrl["ym_material"] + "/v1/pub/getBlockForModuleList");
+        //     return Newtonsoft.Json.JsonConvert.DeserializeObject<List<ModuleTreeVo>>(content);
+        // }
+    }
+}

Model/Database/ApiInfo.cs

@@ -168,6 +168,12 @@ namespace Model
         public bool resParam { get; set; }
 
 
+        /// <summary>
+        /// 自定义
+        /// </summary>
+        public bool customFlag { get; set; }
+
+
         /// <summary>
         /// 返回类型
         /// </summary>

Services/ApiGroupService.cs

@@ -36,6 +36,26 @@ namespace Services
         }
 
 
+        /// <summary>
+        /// 生成api文档
+        /// </summary>
+        /// <param name="serviceId">服务id</param>
+        public void makeApiDoc(int serviceId)
+        {
+            var apiGroups =  GetList(m => m.serviceId == serviceId);
+            foreach (var group in apiGroups)
+            {
+                
+            }
+        }
 
+        /// <summary>
+        /// 同步api到管理平台
+        /// </summary>
+        /// <param name="serviceId">服务id</param>
+        public void sycnApiToSystem(int serviceId)
+        {
+            
+        }
     }
 }

Services/ApiInfoService.cs

@@ -16,14 +16,12 @@ namespace Services
     [AppService(ServiceType = typeof(IApiInfoService), ServiceLifetime = LifeTime.Transient)]
     public class ApiInfoService : BaseService<ApiInfo>, IApiInfoService
     {
-        private readonly IApiGroupService _ApiGroupService;
         private readonly IDatabaseInfoService _DatabaseInfoService;
         private readonly IDatabaseTableService _DatabaseTableService;
         private readonly IDatabaseFieldService _DatabaseFieldService;
 
-        public ApiInfoService(IApiGroupService ApiGroupService, IDatabaseInfoService DatabaseInfoService, IDatabaseTableService DatabaseTableService, IDatabaseFieldService DatabaseFieldService)
+        public ApiInfoService(IDatabaseInfoService DatabaseInfoService, IDatabaseTableService DatabaseTableService, IDatabaseFieldService DatabaseFieldService)
         {
-            _ApiGroupService = ApiGroupService;
             _DatabaseInfoService = DatabaseInfoService;
             _DatabaseTableService = DatabaseTableService;
             _DatabaseFieldService = DatabaseFieldService;
@@ -74,9 +72,9 @@ namespace Services
         /// 克隆接口
         /// </summary>
         /// <param name="param">参数请求体</param>
-        public void copyApiInfo([FromBody] CopyApiInfoDto param)
+        public void copyApiInfo([FromBody] CopyApiInfoDto param, ApiGroup group)
         {
-            var group = _ApiGroupService.GetFirst(m => m.id == param.targetGroupId) ?? new ApiGroup();
+            // var group = _ApiGroupService.GetFirst(m => m.id == param.targetGroupId) ?? new ApiGroup();
             List<int> apiIdList = param.sourceApiId.ToList();
             var sourceApis = GetList(m => apiIdList.Contains(m.id)).ToList();
             foreach(ApiInfo sourceApi in sourceApis)
@@ -144,7 +142,7 @@ namespace Services
 
                     Add(new ApiInfo()
                     {
-                        serviceId = 0,
+                        serviceId = database.serverId,
                         groupId = param.groupId,
                         tabName = table.tableName,
                         apiName = table.tableName + (apiKind == 1 ? "列表" : apiKind == 2 ? "详情" : apiKind == 3 ? "添加" : apiKind == 4 ? "修改" : "删除"),

Services/DatabaseFieldService.cs

@@ -16,13 +16,6 @@ namespace Services
     [AppService(ServiceType = typeof(IDatabaseFieldService), ServiceLifetime = LifeTime.Transient)]
     public class DatabaseFieldService : BaseService<DatabaseField>, IDatabaseFieldService
     {
-        private readonly IDatabaseTableService _DatabaseTableService;
-
-        public DatabaseFieldService(IDatabaseTableService DatabaseTableService)
-        {
-            _DatabaseTableService = DatabaseTableService;
-        }
-
         /// <summary>
         /// 数据字段-列表
         /// </summary>
@@ -51,9 +44,9 @@ namespace Services
         /// 克隆数据字段
         /// </summary>
         /// <param name="param">参数请求体</param>
-        public void copyDatabaseField([FromBody] CopyDatabaseFieldDto param)
+        public void copyDatabaseField([FromBody] CopyDatabaseFieldDto param, DatabaseTable targetTable)
         {
-            var targetTable = _DatabaseTableService.GetFirst(m => m.id == param.targetTableId) ?? new DatabaseTable();
+            // var targetTable = _DatabaseTableService.GetFirst(m => m.id == param.targetTableId) ?? new DatabaseTable();
 
             List<int> fieldIdList = param.sourceFieldId.ToList();
             var sourceFields = GetList(m => fieldIdList.Contains(m.id)).ToList();

Services/IService/IApiInfoService.cs

@@ -30,7 +30,7 @@ namespace Services
         /// 克隆接口
         /// </summary>
         /// <param name="param">参数请求体</param>
-        void copyApiInfo([FromBody] CopyApiInfoDto param);
+        void copyApiInfo([FromBody] CopyApiInfoDto param, ApiGroup group);
         
 
         /// <summary>

Services/IService/IDatabaseFieldService.cs

@@ -22,6 +22,6 @@ namespace Services
         /// 克隆数据字段
         /// </summary>
         /// <param name="param">参数请求体</param>
-        void copyDatabaseField([FromBody] CopyDatabaseFieldDto param);
+        void copyDatabaseField([FromBody] CopyDatabaseFieldDto param, DatabaseTable targetTable);
     }
 }