SVN r280

SVN-Revision: r280

插件库/Lskj.Main/FrmConfig.cs

@@ -65,7 +65,7 @@ namespace Lskj.Main
             try
             {
                 DBConfig.Instance.ReadConfig(true);
-                this.txtServerName.Text = string.IsNullOrWhiteSpace(DBConfig.Instance.ExternalNetworkAddress)? DBConfig.Instance.ServerName: DBConfig.Instance.ExternalNetworkAddress;
+                this.txtServerName.Text =  DBConfig.Instance.ServerName;
                 this.txtServerNameInternal.Text = DBConfig.Instance.InternalNetworkAddress;
                 this.txtDBName.Text = DBConfig.Instance.DataBase;
 
@@ -197,32 +197,4 @@ namespace Lskj.Main
             {
                 if (DBConfig.Instance.CreateConnection())
                 {
-                    if (DelphiHelper.Delphi_Init(new StringBuilder(DBConfig.Instance.GetDelphiConnection())) == 0)
-                    {
-                        MessageUtil.Show(ResourceKeys.UnConnectServer + "[By Delphi]");
-                        return;
-                    }
-                    if (isSave)
-                    {
-                        DBConfig.Instance.WriteConfig();
-                        this.DialogResult = DialogResult.OK;
-                        this.Close();
-                    }
-                    else
-                    {
-                        MessageUtil.Show(ResourceKeys.ConnectSuccess);
-                    }
-                }
-                else
-                {
-                    MessageUtil.Show(ResourceKeys.ConnectFault);
-                }
-                //IniHelper.Write("SystemResources.ini", "FrmConfigFlag", "0");
-            }
-            catch (Exception)
-            {
-                MessageUtil.Show(ResourceKeys.ConnectFault);
-            }
-        }
-    }
-}
+                    if (Del