Просмотр исходного кода

😁1、修复linux磁盘获取错误 2、修复创建租户和创建表时错误

zuohuaijun 2 лет назад
Родитель
Сommit
b0d8c3abe2

+ 6 - 0
Admin.NET/Admin.NET.Core/Enum/ErrorCodeEnum.cs

@@ -652,6 +652,12 @@ public enum ErrorCodeEnum
     [ErrorCodeItemMetadata("租户已禁用")]
     Z1003,
 
+    /// <summary>
+    /// 租户库连接不能为空
+    /// </summary>
+    [ErrorCodeItemMetadata("租户库连接不能为空")]
+    Z1004,
+
     /// <summary>
     /// 身份标识已存在
     /// </summary>

+ 1 - 0
Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs

@@ -344,6 +344,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
 
         for (var i = 0; i < templatePathList.Count; i++)
         {
+            if (!File.Exists(templatePathList[i])) continue;
             var tContent = File.ReadAllText(templatePathList[i]);
             var tResult = await _viewEngine.RunCompileFromCachedAsync(tContent, data, builderAction: builder =>
             {

+ 3 - 0
Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs

@@ -373,6 +373,9 @@ public class SysTenantService : IDynamicApiController, ITransient
         if (tenant.DbType == SqlSugar.DbType.Oracle)
             throw Oops.Oh(ErrorCodeEnum.Z1002);
 
+        if (string.IsNullOrWhiteSpace(tenant.Connection) || tenant.Connection.Length < 10)
+            throw Oops.Oh(ErrorCodeEnum.Z1004);
+
         // 默认数据库配置
         var defaultConfig = App.GetOptions<DbConnectionOptions>().ConnectionConfigs.FirstOrDefault();
 

+ 5 - 5
Admin.NET/Admin.NET.Core/Util/ComputerUtil.cs

@@ -34,17 +34,17 @@ public static class ComputerUtil
     /// <returns></returns>
     public static List<DiskInfo> GetDiskInfos()
     {
-        List<DiskInfo> diskInfos = new();
+        var diskInfos = new List<DiskInfo>();
 
         if (IsUnix())
         {
             var output = ShellHelper.Bash(@"df -mT | awk '/^\/dev\/(sd|vd|xvd|nvme|sda|vda)/ {print $1,$2,$3,$4,$5,$6}'");
             var disks = output.Split('\n', StringSplitOptions.RemoveEmptyEntries);
-            if (disks.Length == 0) return diskInfos;
+            if (disks.Length < 1) return diskInfos;
 
-            var rootDisk = disks[1].Split(' ', (char)StringSplitOptions.RemoveEmptyEntries);
-            if (rootDisk == null || rootDisk.Length == 0)
-                return diskInfos;
+            //var rootDisk = disks[1].Split(' ', (char)StringSplitOptions.RemoveEmptyEntries);
+            //if (rootDisk == null || rootDisk.Length < 1)
+            //    return diskInfos;
 
             foreach (var item in disks)
             {