diff --git a/Dll/Microsoft.Bcl.AsyncInterfaces.dll b/Dll/Microsoft.Bcl.AsyncInterfaces.dll new file mode 100644 index 0000000..abe9406 Binary files /dev/null and b/Dll/Microsoft.Bcl.AsyncInterfaces.dll differ diff --git a/Dll/ServiceStack.Client.dll b/Dll/ServiceStack.Client.dll new file mode 100644 index 0000000..b778593 Binary files /dev/null and b/Dll/ServiceStack.Client.dll differ diff --git a/Dll/ServiceStack.Common.dll b/Dll/ServiceStack.Common.dll new file mode 100644 index 0000000..0f73c8e Binary files /dev/null and b/Dll/ServiceStack.Common.dll differ diff --git a/Dll/ServiceStack.Interfaces.dll b/Dll/ServiceStack.Interfaces.dll new file mode 100644 index 0000000..7a42335 Binary files /dev/null and b/Dll/ServiceStack.Interfaces.dll differ diff --git a/Dll/ServiceStack.Redis.dll b/Dll/ServiceStack.Redis.dll new file mode 100644 index 0000000..1012d36 Binary files /dev/null and b/Dll/ServiceStack.Redis.dll differ diff --git a/Dll/ServiceStack.Text.dll b/Dll/ServiceStack.Text.dll new file mode 100644 index 0000000..e5095b7 Binary files /dev/null and b/Dll/ServiceStack.Text.dll differ diff --git a/Dll/ServiceStack.dll b/Dll/ServiceStack.dll new file mode 100644 index 0000000..0da1850 Binary files /dev/null and b/Dll/ServiceStack.dll differ diff --git a/StartServerWPF.Modules.MseedChart/StartServerWPF.Modules.MseedChart.csproj b/StartServerWPF.Modules.MseedChart/StartServerWPF.Modules.MseedChart.csproj index d9e34c4..c791a2e 100644 --- a/StartServerWPF.Modules.MseedChart/StartServerWPF.Modules.MseedChart.csproj +++ b/StartServerWPF.Modules.MseedChart/StartServerWPF.Modules.MseedChart.csproj @@ -216,22 +216,28 @@ ..\packages\Prism.Wpf.8.1.97\lib\net461\Prism.Wpf.dll - ..\packages\ServiceStack.6.0.2\lib\netstandard2.0\ServiceStack.dll + False + ..\Dll\ServiceStack.dll - ..\packages\ServiceStack.Client.6.0.2\lib\netstandard2.0\ServiceStack.Client.dll + False + ..\Dll\ServiceStack.Client.dll - ..\packages\ServiceStack.Common.6.0.2\lib\netstandard2.0\ServiceStack.Common.dll + False + ..\Dll\ServiceStack.Common.dll - ..\packages\ServiceStack.Interfaces.6.0.2\lib\netstandard2.0\ServiceStack.Interfaces.dll + False + ..\Dll\ServiceStack.Interfaces.dll - ..\packages\ServiceStack.Redis.6.0.2\lib\netstandard2.0\ServiceStack.Redis.dll + False + ..\Dll\ServiceStack.Redis.dll - ..\packages\ServiceStack.Text.6.0.2\lib\netstandard2.0\ServiceStack.Text.dll + False + ..\Dll\ServiceStack.Text.dll diff --git a/StartServerWPF.Modules.MseedChart/ViewModels/ChartPlotRealDataViewModel.cs b/StartServerWPF.Modules.MseedChart/ViewModels/ChartPlotRealDataViewModel.cs index 6496f78..2c836e7 100644 --- a/StartServerWPF.Modules.MseedChart/ViewModels/ChartPlotRealDataViewModel.cs +++ b/StartServerWPF.Modules.MseedChart/ViewModels/ChartPlotRealDataViewModel.cs @@ -262,6 +262,7 @@ namespace StartServerWPF.Modules.MseedChart.ViewModels Dictionary subNameList; private void Loaded() { + //N08,N25,N26 string station = "N02,N05,N06,N08,N09,N10,N11,N12,N13,N14,N15,N16,N19,N20,N22,N23,N24,N25,N26";//,N07,N08,N09,N10,N11,N12,N13,N14,N15,N16,N17,N18,N19,N20,N21,N22,N23,N24,N25,N26,N27"; var stations = station.Split(','); smList = _wavesModel.ReadWavesFromJson(stations); diff --git a/StartServerWPF.Modules.MseedChart/packages.config b/StartServerWPF.Modules.MseedChart/packages.config index 8648005..816c363 100644 --- a/StartServerWPF.Modules.MseedChart/packages.config +++ b/StartServerWPF.Modules.MseedChart/packages.config @@ -37,12 +37,6 @@ - - - - - - diff --git a/StartServerWPF/serverprogram/apms/apms.json b/StartServerWPF/serverprogram/apms/apms.json index 00337dc..34396bb 100644 --- a/StartServerWPF/serverprogram/apms/apms.json +++ b/StartServerWPF/serverprogram/apms/apms.json @@ -22,7 +22,7 @@ "RServer.host":"127.0.0.1", "channels":[ - {"network":"HA","station":"N02,N03,N04,N05,N06,N07,N08,N09,N10,N11,N12,N13,N14,N15,N16,N17,N18,N19,N20,N21,N22,N23,N24,N25,N26,N27","location":"06","channels":"SHZ:SHN:SHE"} + {"network":"HA","station":"N02,N05,N06,N08,N09,N10,N11,N12,N13,N14,N15,N16,N19,N20,N22,N23,N24,N25,N26","location":"06","channels":"SHZ:SHN:SHE"} ], diff --git a/StartServerWPF/serverprogram/recvftp/gw.recvftp.json b/StartServerWPF/serverprogram/recvftp/gw.recvftp.json index e74b8f4..e1bd12a 100644 --- a/StartServerWPF/serverprogram/recvftp/gw.recvftp.json +++ b/StartServerWPF/serverprogram/recvftp/gw.recvftp.json @@ -3,6 +3,6 @@ "log_level":"DEBUG", "send2server":"YES", "pack_time":12, - "stamseed":"5,10", + "stamseed":"2,5,6,8,9,10,11,12,13,14,15,16,19,20,22,23,24,25,26", "dirstruct": "NDHH" }