From 8b0dec06973544a787daee232414beef756fc7af Mon Sep 17 00:00:00 2001
From: luanhui <luanhui@bwpsoft.com>
Date: Wed, 17 Jan 2018 11:16:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E6=BA=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/B3ClientService/ServerHostConfig.cs | 26 ++++++++++++++-----
 B3ClientService/BO/ServerHost.cs              | 16 +++++++++++-
 B3ClientService/Rpcs/BaseInfoRpc.cs           |  6 +++++
 3 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/B3ClientService.Web/Pages/B3ClientService/ServerHostConfig.cs b/B3ClientService.Web/Pages/B3ClientService/ServerHostConfig.cs
index 478b9bd..599f66a 100644
--- a/B3ClientService.Web/Pages/B3ClientService/ServerHostConfig.cs
+++ b/B3ClientService.Web/Pages/B3ClientService/ServerHostConfig.cs
@@ -14,22 +14,35 @@ namespace BWP.Web.Pages.B3ClientService
 {
   class ServerHostConfig : ServerPage
   {
-    DFTextBox serverUrlInput;
+    DFTextBox serverUrlInput, traceServerUrlInput;
     protected override void InitForm(HtmlForm form)
     {
       form.Controls.Add(new PageTitle("服务器地址配置"));
-      var hPanel = new HLayoutPanel();
-      form.Controls.Add(hPanel);
 
-      hPanel.Add(new SimpleLabel("地址"));
+      var vPanel=new VLayoutPanel();
+      form.Controls.Add(vPanel);
+
+      var hPanel = new HLayoutPanel();
+      vPanel.Add(hPanel);
+      hPanel.Add(new SimpleLabel("B3服务器地址"));
       serverUrlInput = hPanel.Add(new DFTextBox() { Width = Unit.Pixel(300) });
-      hPanel.Add(new TSButton("保存", delegate
+
+
+      var hPanel1 = new HLayoutPanel();
+      vPanel.Add(hPanel1);
+      hPanel1.Add(new SimpleLabel("追溯服务器地址"));
+      traceServerUrlInput = hPanel1.Add(new DFTextBox() { Width = Unit.Pixel(300) });
+
+
+      var hPane2 = new HLayoutPanel();
+      vPanel.Add(hPane2);
+      hPane2.Add(new TSButton("保存", delegate
       {
         if (serverUrlInput.IsEmpty)
           throw new Exception("地址不能为空");
         using (var session = Dmo.NewSession())
         {
-          var entity = new ServerHost() { ServerUrl = serverUrlInput.Text.Trim() };
+          var entity = new ServerHost() { ServerUrl = serverUrlInput.Text.Trim() ,TraceServerUrl = traceServerUrlInput.Text.Trim()};
           if (Exist())
             session.Update(entity);
           else
@@ -53,6 +66,7 @@ namespace BWP.Web.Pages.B3ClientService
       if (!IsPostBack)
       {
         serverUrlInput.Text = ServerHost.GetServerUrl();
+        traceServerUrlInput.Text = ServerHost.GetTraceServerUrl();
       }
     }
   }
diff --git a/B3ClientService/BO/ServerHost.cs b/B3ClientService/BO/ServerHost.cs
index 82c2ef1..6596763 100644
--- a/B3ClientService/BO/ServerHost.cs
+++ b/B3ClientService/BO/ServerHost.cs
@@ -16,10 +16,15 @@ namespace BWP.B3ClientService.BO
   [BOClass]
   public class ServerHost
   {
-    [LogicName("摘要")]
+    [LogicName("B3服务器地址")]
     [DbColumn(Length = 1000)]
     public string ServerUrl { get; set; }
 
+
+    [LogicName("追溯服务器地址")]
+    [DbColumn(Length = 1000)]
+    public string TraceServerUrl { get; set; }
+
     public static string GetServerUrl()
     {
       using (var session = Dmo.NewSession())
@@ -29,5 +34,14 @@ namespace BWP.B3ClientService.BO
         return query.EExecuteScalar<string>(session);
       }
     }
+    public static string GetTraceServerUrl()
+    {
+      using (var session = Dmo.NewSession())
+      {
+        var query = new DQueryDom(new JoinAlias(typeof(ServerHost)));
+        query.Columns.Add(DQSelectColumn.Field("TraceServerUrl"));
+        return query.EExecuteScalar<string>(session);
+      }
+    }
   }
 }
diff --git a/B3ClientService/Rpcs/BaseInfoRpc.cs b/B3ClientService/Rpcs/BaseInfoRpc.cs
index abf0698..8986ba3 100644
--- a/B3ClientService/Rpcs/BaseInfoRpc.cs
+++ b/B3ClientService/Rpcs/BaseInfoRpc.cs
@@ -20,6 +20,12 @@ namespace BWP.B3ClientService.Rpcs
   {
     static JavaScriptSerializer serializer = new JavaScriptSerializer();
 
+    [Rpc]
+    public static string GetTraceOutAddress()
+    {
+      return ServerHost.GetTraceServerUrl();
+
+    }
 
     [Rpc]
     public static string GetWorkShopList()