冲突

qin

2024-06-04 9490957edfc694a0378ee52af47e921b8ac44e7a

 Hydraulic/Hydro.CommonBase/Helper/GlobalConfig.cs

@@ -35,15 +35,20 @@
                path = value; if (!string.IsNullOrEmpty(path) && path[path.Length - 1] != '\\') path = path + "\\"; 
            } 
        }
        public static string configPath { get { string p = Path + @"\config\"; if (!Directory.Exists(p)) Directory.CreateDirectory(p); return p; }}
        public static string modelPath { get { string p = Path + @"\model\"; if (!Directory.Exists(p)) Directory.CreateDirectory(p); return p; } }
        public static string configPath { get { string p = Path + @"config\"; if (!Directory.Exists(p)) Directory.CreateDirectory(p); return p; }}
        public static string modelPath { get { string p = Path + @"model\"; if (!Directory.Exists(p)) Directory.CreateDirectory(p); return p; } }

        public static string resultPath { get { string p = Path + @"\result\"; if (!Directory.Exists(p)) Directory.CreateDirectory(p); return p; } }
        public static string resultPath { get { string p = Path + @"result\"; if (!Directory.Exists(p)) Directory.CreateDirectory(p); return p; } }

        public static string savePath { get { string p = Path + @"\save\"; if (!Directory.Exists(p)) Directory.CreateDirectory(p); return p; } }
        public static string savePath { get { string p = Path + @"save\"; if (!Directory.Exists(p)) Directory.CreateDirectory(p); return p; } }

        public static string bakPath { get { string p = Path + @"\config_bk\"; if (!Directory.Exists(p)) Directory.CreateDirectory(p); return p; } }
        public static string recordPath { get { string p = Path + @"\Record\"; if (!Directory.Exists(p)) Directory.CreateDirectory(p); return p; } }
        public static string bakPath { get { string p = Path + @"config_bk\"; if (!Directory.Exists(p)) Directory.CreateDirectory(p); return p; } }
        public static string recordPath { get { string p = Path + @"Record\"; if (!Directory.Exists(p)) Directory.CreateDirectory(p); return p; } }

        public static string ChartFilePath { get { string p = Path + @"Chart\"; if (!Directory.Exists(p)) Directory.CreateDirectory(p); return p; } }

        public static string BranchPath { get { string p = Path + @"Branch\"; if (!Directory.Exists(p)) Directory.CreateDirectory(p); return p; } }
     
    }
    public class GlobalConfig
    {