From a332decd68d6d8bb5678d8ec95e6c65e0ccf9f33 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期四, 02 七月 2020 17:14:45 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.Common.Model/Helper/SettingHelper.cs | 47 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 39 insertions(+), 8 deletions(-)
diff --git a/src/Bro.Common.Model/Helper/SettingHelper.cs b/src/Bro.Common.Model/Helper/SettingHelper.cs
index 8bfefd6..59ffa67 100644
--- a/src/Bro.Common.Model/Helper/SettingHelper.cs
+++ b/src/Bro.Common.Model/Helper/SettingHelper.cs
@@ -21,16 +21,13 @@
{
get
{
- if (data == null)
+ string configPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, SETTINGFILE);
+ if (File.Exists(configPath))
{
- string configPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, SETTINGFILE);
- if (File.Exists(configPath))
+ using (StreamReader reader = new StreamReader(configPath, System.Text.Encoding.UTF8))
{
- using (StreamReader reader = new StreamReader(configPath, System.Text.Encoding.UTF8))
- {
- string dataStr = reader.ReadToEnd();
- data = JsonConvert.DeserializeObject<JObject>(dataStr);
- }
+ string dataStr = reader.ReadToEnd();
+ data = JsonConvert.DeserializeObject<JObject>(dataStr);
}
}
@@ -66,6 +63,28 @@
return codes;
}
+ public static List<string> AddNewProductionCode(string code)
+ {
+ List<string> codes = GetProcessCodes();
+ if (!codes.Contains(code))
+ {
+ codes.Add(code);
+ }
+ if (Data != null && Data.ContainsKey(PROPERTY_PRODUCTIONCODES))
+ {
+ Data[PROPERTY_PRODUCTIONCODES] = new JArray(codes);
+ string newDataStr = JsonConvert.SerializeObject(Data, new JsonSerializerSettings() { TypeNameHandling = TypeNameHandling.Auto });
+ using (StreamWriter writer = new StreamWriter(GetSettingFilePath(), false, System.Text.Encoding.UTF8))
+ {
+ writer.Write(newDataStr);
+ writer.Flush();
+ writer.Close();
+ }
+ }
+
+ return GetProcessCodes();
+ }
+
public static string GetConfigFilePath()
{
string path = "";
@@ -78,6 +97,18 @@
return path;
}
+ public static string GetSettingFilePath()
+ {
+ string path = "";
+
+ if (Data != null && Data.ContainsKey(SETTINGFILE))
+ {
+ path = Data.Value<string>(SETTINGFILE);
+ }
+
+ return path;
+ }
+
public static string GetProgramDescription()
{
string desc = "浼偗妫嚜鍔ㄥ寲鎶�鏈湁闄愬叕鍙�";
--
Gitblit v1.8.0