개정판 84c48033
issue #000: daelim merged(settings =>ini) 내/외부 구분 하여 api url 을 리턴하도록 Commonlib 추가. daelim ini 추가
Change-Id: I2904309621897cda96f9537982fbd6e53874be29
| CommonLib/Common.cs | ||
|---|---|---|
| 37 | 37 |
} |
| 38 | 38 |
|
| 39 | 39 |
/// <summary> |
| 40 |
/// isExternal 이 True 이면 Internal IP를 External 로 치환하여 Return |
|
| 41 |
/// </summary> |
|
| 42 |
/// <param name="section"></param> |
|
| 43 |
/// <param name="key"></param> |
|
| 44 |
/// <param name="def"></param> |
|
| 45 |
/// <param name="isExternal"></param> |
|
| 46 |
/// <returns></returns> |
|
| 47 |
public static string GetConfigString(string section, string key, string def,bool isExternal) |
|
| 48 |
{
|
|
| 49 |
System.Text.StringBuilder strbuilder = new System.Text.StringBuilder(512); |
|
| 50 |
GetPrivateProfileString(section, key, def, strbuilder, 512, Path.Combine(AppDataFolder, "MARKUS.ini")); |
|
| 51 |
|
|
| 52 |
string result = strbuilder.ToString(); |
|
| 53 |
//internal 이면 result return |
|
| 54 |
if (isExternal) |
|
| 55 |
{
|
|
| 56 |
System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder(512); |
|
| 57 |
GetPrivateProfileString("External", "IP", "", stringBuilder, 512, Path.Combine(AppDataFolder, "MARKUS.ini"));
|
|
| 58 |
string external_ip = stringBuilder.ToString(); |
|
| 59 |
stringBuilder = new StringBuilder(); |
|
| 60 |
GetPrivateProfileString("Internal", "IP", "", stringBuilder, 512, Path.Combine(AppDataFolder, "MARKUS.ini"));
|
|
| 61 |
string internal_ip = stringBuilder.ToString(); |
|
| 62 |
result = result.Replace(internal_ip, external_ip); |
|
| 63 |
} |
|
| 64 |
return result; |
|
| 65 |
} |
|
| 66 |
public static string GetAlertMessageString(string section, string key, string def) |
|
| 67 |
{
|
|
| 68 |
System.Text.StringBuilder strbuilder = new System.Text.StringBuilder(1024); |
|
| 69 |
GetPrivateProfileString(section, key, def, strbuilder, 1024, Path.Combine(AppDataFolder, "MARKUS.ini")); |
|
| 70 |
byte[] byte64 = Convert.FromBase64String(strbuilder.ToString()); |
|
| 71 |
|
|
| 72 |
return Encoding.UTF8.GetString(byte64); |
|
| 73 |
} |
|
| 74 |
/// <summary> |
|
| 40 | 75 |
/// 서버에 설치된 Service ini 의 Connection String 을 참조 |
| 41 | 76 |
/// </summary> |
| 42 | 77 |
/// <returns></returns> |
| KCOM/App.xaml.cs | ||
|---|---|---|
| 51 | 51 |
public static string urlPort_DB; |
| 52 | 52 |
public static string Custom_ViewInfoId; |
| 53 | 53 |
public static bool ParameterMode = false; |
| 54 |
public static bool isExternal = false; |
|
| 54 | 55 |
|
| 55 | 56 |
/// <summary> |
| 56 | 57 |
/// logger |
| ... | ... | |
| 163 | 164 |
_binding.TextEncoding = System.Text.Encoding.UTF8; |
| 164 | 165 |
_binding.TransferMode = TransferMode.Buffered; |
| 165 | 166 |
//Support.SetLicense(); |
| 166 |
|
|
| 167 |
string sBaseServiceURL = CommonLib.Common.GetConfigString("BaseClientAddress", "URL", "");
|
|
| 168 | 167 |
|
| 168 |
string sBaseServiceURL = string.Empty;//CommonLib.Common.GetConfigString("BaseClientAddress", "URL", "");
|
|
| 169 |
string localdomain = CommonLib.Common.GetConfigString("HOST_DOMAIN", "DOMAIN", "");
|
|
| 169 | 170 |
var ipaddress = DNSHelper.GetDnsAdress(); |
| 170 | 171 |
|
| 171 | 172 |
try |
| 172 | 173 |
{
|
| 173 | 174 |
var hostName = Dns.GetHostEntry(ipaddress).HostName; |
| 174 | 175 |
|
| 175 |
if (!hostName.EndsWith(KCOM.Properties.Settings.Default.HOST_DOMAIN))
|
|
| 176 |
if (!hostName.EndsWith(localdomain))
|
|
| 176 | 177 |
{
|
| 177 | 178 |
// 외부 사용자 |
| 178 |
sBaseServiceURL = global::KCOM.Properties.Settings.Default.Remote_BaseClientAddress;
|
|
| 179 |
isExternal = true;
|
|
| 179 | 180 |
} |
| 180 | 181 |
} |
| 181 | 182 |
catch (Exception ex) |
| 182 | 183 |
{
|
| 183 | 184 |
System.Diagnostics.Debug.WriteLine(ex.ToString()); |
| 184 | 185 |
} |
| 185 |
#if DEBUG |
|
| 186 |
//_EndPoint = new EndpointAddress(@"http://10.11.252.3/MARKUS/ServiceDeepView.svc"); //효성 |
|
| 187 |
_EndPoint = new EndpointAddress(string.Format("{0}/ServiceDeepView.svc", sBaseServiceURL));
|
|
| 188 | 186 |
|
| 187 |
#if DEBUG |
|
| 188 |
sBaseServiceURL = CommonLib.Common.GetConfigString("Debug_BaseClientAddress", "URL", "");
|
|
| 189 | 189 |
#else |
| 190 |
_EndPoint = new EndpointAddress(string.Format("{0}/ServiceDeepView.svc", sBaseServiceURL));
|
|
| 190 |
sBaseServiceURL = CommonLib.Common.GetConfigString("BaseClientAddress", "URL", "", isExternal);
|
|
| 191 | 191 |
#endif |
| 192 |
|
|
| 192 |
_EndPoint = new EndpointAddress(string.Format("{0}/ServiceDeepView.svc", sBaseServiceURL));
|
|
| 193 |
|
|
| 193 | 194 |
if (Environment.Is64BitProcess == true) //64 bit machine |
| 194 | 195 |
{
|
| 195 |
versionPath = KCOM.Properties.Settings.Default.UpdateVer64;
|
|
| 196 |
versionPath = CommonLib.Common.GetConfigString("UpdateVer64", "URL", "", isExternal);
|
|
| 196 | 197 |
} |
| 197 | 198 |
else //32 bit machine |
| 198 | 199 |
{
|
| 199 |
versionPath = KCOM.Properties.Settings.Default.UpdateVer86;
|
|
| 200 |
versionPath = CommonLib.Common.GetConfigString("UpdateVer86", "URL", "", isExternal);
|
|
| 200 | 201 |
} |
| 201 | 202 |
|
| 202 | 203 |
if (File.Exists(versionPath)) |
| KCOM/Controls/CheckList.xaml.cs | ||
|---|---|---|
| 400 | 400 |
} |
| 401 | 401 |
|
| 402 | 402 |
string extension = "xlsx"; |
| 403 |
string excelpath = global::KCOM.Properties.Settings.Default.excelFilePath;
|
|
| 403 |
string excelpath = CommonLib.Common.GetConfigString("excelFilePath", "URL", "", App.isExternal);
|
|
| 404 | 404 |
Uri url = new Uri(excelpath); |
| 405 | 405 |
|
| 406 | 406 |
System.Windows.Forms.SaveFileDialog dialog = new System.Windows.Forms.SaveFileDialog() |
| KCOM/MARKUS.ini | ||
|---|---|---|
| 1 |
[PDFMovePath] |
|
| 2 |
URL=\\192.168.0.67\finalpdf\ |
|
| 3 |
[ApprovedImgPath] |
|
| 4 |
URL=\\192.168.0.67\finalpdf\Approved.png |
|
| 5 |
[CheckmarkImgPath] |
|
| 6 |
URL=\\192.168.0.67\finalpdf\checkmark.png |
|
| 1 |
[Internal] |
|
| 2 |
IP=192.168.0.67 |
|
| 3 |
[External] |
|
| 4 |
IP=125.129.196.207 |
|
| 7 | 5 |
[BaseClientAddress] |
| 8 |
URL=http://www.devdoftech.co.kr:5979 |
|
| 6 |
URL=http://192.168.0.67:5979 |
|
| 7 |
[HubAddress] |
|
| 8 |
URL=http://192.168.0.67:5100/ |
|
| 9 |
[UpdateVer64] |
|
| 10 |
URL=http://192.168.0.67:5977/TileSource/Version/version_x64.xml |
|
| 11 |
[UpdateVer86] |
|
| 12 |
URL=http://192.168.0.67:5977/TileSource/Version/version_x86.xml |
|
| 13 |
[excelFilePath] |
|
| 14 |
URL=http://192.168.0.67:5977/TileSource/Check_Test/CheckList_T.xlsx |
|
| 15 |
[KCOM_Get_FinalImage_Get_PdfImage] |
|
| 16 |
URL=http://192.168.0.67:5977/Get_FInalImage/Get_PdfImage.asmx |
|
| 17 |
[KCOM_kr_co_devdoftech_cloud_FileUpload] |
|
| 18 |
URL=http://192.168.0.67:5977/ImageUpload/FileUpload.asmx |
|
| 19 |
[mainServerImageWebPath] |
|
| 20 |
URL=http://192.168.0.67:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png
|
|
| 21 |
[subServerImageWebPath] |
|
| 22 |
URL=http://192.168.0.67:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png
|
|
| 23 |
[Debug_BaseClientAddress] |
|
| 24 |
URL=http://192.168.0.67:5979 |
|
| 25 |
[HOST_DOMAIN] |
|
| 26 |
DOMAIN=router.asus.com |
|
| 27 |
[GetConversionStateFailed] |
|
| 28 |
MSG=VG9vIE1hbnkgVi9QIEZpbGVzIGFyZSB1cGxvYWRpbmcgaW5zdGFudGFuZW91c2x5LCBUaGlzIFYvUCBmaWxlIGNhbiBub3QgYmUgb3BlbiBub3cuIFBsZWFzZSBmZWVsIGZyZWUgdG8gcmUtb3BlbiB3YWl0IGEgbW9tZW50IGFnYWluIVxuXG7tmITsnqwg7J287Iuc7KCB7Jy866GcIOunjuydgCDslpHsnZggVi9Q6rCAIOuTseuhneuQmOqzoCDsnojslrQg7J20IOusuOyEnOulvCDsl7TrnoztlaAg7IiYIOyXhuyKteuLiOuLpC5cbuyeoOyLnOunjCDquLDri6TroKQg7KO87IugIO2bhCDri6Tsi5wg7Je0656M7ZWY7JesIOyjvOyLnOq4sCDrsJTrno3ri4jri6Q= |
|
| 29 |
[SetFinalPDFError] |
|
| 30 |
MSG=7LWc7KKFIO2MjOydvOydhCDrp4zrk5zripTrjbAg66y47KCc6rCAIOuwnOyDne2VmOyYgOyKteuLiOuLpA== |
|
| 31 |
[SetFinalPDFSuccess] |
|
| 32 |
MSG=7LWc7KKFIO2MjOydvCDsg53shLEg7KSR7J6F64uI64ukLiDrrLjshJzqtIDrpqzsi5zsiqTthZzsnYQg7ZmV7J247ZW07KO87IS47JqU |
|
| KCOM/MARKUS_daelim.ini | ||
|---|---|---|
| 1 |
[Internal] |
|
| 2 |
IP=172.20.120.141 |
|
| 3 |
[External] |
|
| 4 |
IP=203.226.6.165 |
|
| 5 |
[BaseClientAddress] |
|
| 6 |
URL=http://172.20.120.141:5978 |
|
| 7 |
[HubAddress] |
|
| 8 |
URL=http://172.20.120.141:5100/ |
|
| 9 |
[UpdateVer64] |
|
| 10 |
URL=http://172.20.120.141:5977/TileSource/Version/version_x64.xml |
|
| 11 |
[UpdateVer86] |
|
| 12 |
URL=http://172.20.120.141:5977/TileSource/Version/version_x86.xml |
|
| 13 |
[excelFilePath] |
|
| 14 |
URL=http://172.20.120.141:5977/TileSource/Check_Test/CheckList_T.xlsx |
|
| 15 |
[KCOM_Get_FinalImage_Get_PdfImage] |
|
| 16 |
URL=http://172.20.120.141:5977/Get_FInalImage/Get_PdfImage.asmx |
|
| 17 |
[KCOM_kr_co_devdoftech_cloud_FileUpload] |
|
| 18 |
URL=http://172.20.120.141:5977/ImageUpload/FileUpload.asmx |
|
| 19 |
[mainServerImageWebPath] |
|
| 20 |
URL=http://172.20.120.141:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png
|
|
| 21 |
[subServerImageWebPath] |
|
| 22 |
URL=http://172.20.120.141:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png
|
|
| 23 |
[Debug_BaseClientAddress] |
|
| 24 |
URL=http://172.20.120.141:5978 |
|
| 25 |
[HOST_DOMAIN] |
|
| 26 |
DOMAIN=DAELIM.COM |
|
| 27 |
[GetConversionStateFailed] |
|
| 28 |
MSG=VG9vIE1hbnkgVi9QIEZpbGVzIGFyZSB1cGxvYWRpbmcgaW5zdGFudGFuZW91c2x5LCBUaGlzIFYvUCBmaWxlIGNhbiBub3QgYmUgb3BlbiBub3cuIFBsZWFzZSBmZWVsIGZyZWUgdG8gcmUtb3BlbiB3YWl0IGEgbW9tZW50IGFnYWluIVxuXG7tmITsnqwg7J287Iuc7KCB7Jy866GcIOunjuydgCDslpHsnZggVi9Q6rCAIOuTseuhneuQmOqzoCDsnojslrQg7J20IOusuOyEnOulvCDsl7TrnoztlaAg7IiYIOyXhuyKteuLiOuLpC5cbuyeoOyLnOunjCDquLDri6TroKQg7KO87IugIO2bhCDri6Tsi5wg7Je0656M7ZWY7JesIOyjvOyLnOq4sCDrsJTrno3ri4jri6RcblxuQ29udGFjdCBQb2ludCA6IFlPVSwgU3VuZy1IbyAoMDItMzY5LTU2NDMpXHJcbuyXsOudveyymDog7Jyg7ISx7Zi4IOu2gOyepSgwMiAtIDM2OSAtIDU2MzQp |
|
| 29 |
[SetFinalPDFError] |
|
| 30 |
MSG=7LWc7KKFIO2MjOydvOydhCDrp4zrk5zripTrjbAg66y47KCc6rCAIOuwnOyDne2VmOyYgOyKteuLiOuLpA== |
|
| 31 |
[SetFinalPDFSuccess] |
|
| 32 |
MSG=RmluYWwgUERGIOyDneyEsSDspJEg7J6F64uI64ukLiDsmYTro4wg65CY66m0ICBPdXRsb29rIOyVjOumvCDrqZTsnbwg67Cc7IahIOuQqeuLiOuLpC4gXHJcbuyeoOyLnOunjCDquLDri6TroKQg7KO87IS47JqULg== |
|
| KCOM/Services/BaseServices.cs | ||
|---|---|---|
| 144 | 144 |
private void BaseClient_SetFinalPDFCompleted(object sender, SetFinalPDFCompletedEventArgs e) |
| 145 | 145 |
{
|
| 146 | 146 |
Logger.sendResLog("SetFinalPDFCompleted", "UserState : " + e.UserState + "\r Result :" + e.Result + "\r Cancelled :" + e.Cancelled + "\r Error :" + e.Error, 1);
|
| 147 |
|
|
| 147 |
string errormsg = CommonLib.Common.GetAlertMessageString("SetFinalPDFError", "MSG", "최종 파일을 만드는데 문제가 발생하였습니다");
|
|
| 148 |
string successmsg = CommonLib.Common.GetAlertMessageString("SetFinalPDFSuccess", "MSG", "최종 파일 생성 중입니다. 문서관리시스템을 확인해주세요");
|
|
| 148 | 149 |
if (e.Error != null || e.Result.Status == FinalStatus.Error) |
| 149 | 150 |
{
|
| 150 |
DialogMessage_Alert("최종 파일을 만드는데 문제가 발생하였습니다", "안내");
|
|
| 151 |
DialogMessage_Alert(errormsg, "안내");
|
|
| 151 | 152 |
} |
| 152 | 153 |
else |
| 153 | 154 |
{
|
| 154 |
DialogMessage_Alert("최종 파일 생성 중입니다. 문서관리시스템을 확인해주세요", "안내");
|
|
| 155 |
DialogMessage_Alert(successmsg, "안내");
|
|
| 155 | 156 |
} |
| 156 | 157 |
} |
| 157 | 158 |
|
| ... | ... | |
| 630 | 631 |
|
| 631 | 632 |
private void BaseClient_GetConversionStateCompleted(object sender, GetConversionStateCompletedEventArgs e) |
| 632 | 633 |
{
|
| 634 |
|
|
| 633 | 635 |
Logger.sendResLog("GetConversionStateCompleted", "UserState : " + e.UserState + "\r Result :" + e.Result + "\r Cancelled :" + e.Cancelled + "\r Error :" + e.Error, 1);
|
| 634 |
|
|
| 636 |
string failedmsg = CommonLib.Common.GetAlertMessageString("GetConversionStateFailed", "MSG", "Too Many V/P Files are uploading instantaneously, This V/P file can not be open now. Please feel free to re-open wait a moment again!\n\n현재 일시적으로 많은 양의 V/P가 등록되고 있어 이 문서를 열람할 수 없습니다.\n잠시만 기다려 주신 후 다시 열람하여 주시기 바랍니다");
|
|
| 635 | 637 |
if (e.Error == null && e.Result == true) |
| 636 | 638 |
{
|
| 637 | 639 |
Logger.sendReqLog("GetDocumentItemInfoAsync", _ViewInfo.ProjectNO + "," + _ViewInfo.DocumentItemID + "," + _ViewInfo.UserID, 1);
|
| ... | ... | |
| 658 | 660 |
} |
| 659 | 661 |
else |
| 660 | 662 |
{
|
| 661 |
DialogMessage_Alert("Too Many V/P Files are uploading instantaneously, This V/P file can not be open now. Please feel free to re-open wait a moment again!"
|
|
| 662 |
+ "\n\n" + "현재 일시적으로 많은 양의 V/P가 등록되고 있어 이 문서를 열람할 수 없습니다." + "\n" + "잠시만 기다려 주신 후 다시 열람하여 주시기 바랍니다", "Warning"); |
|
| 663 |
//System.Windows.Forms.MessageBox.Show("Too Many V/P Files are uploading instantaneously, This V/P file can not be open now. Please feel free to re-open wait a moment again!"
|
|
| 664 |
// + "\n\n" + "현재 일시적으로 많은 양의 V/P가 등록되고 있어 이 문서를 열람할 수 없습니다." + "\n" + "잠시만 기다려 주신 후 다시 열람하여 주시기 바랍니다", "Warning"); |
|
| 665 |
//this.ParentOfType<MainPage>().DialogMessage_Alert("Too Many V/P Files are uploading instantaneously, This V/P file can not be open now. Please feel free to re-open wait a moment again!"
|
|
| 666 |
// + "\n\n" + "현재 일시적으로 많은 양의 V/P가 등록되고 있어 이 문서를 열람할 수 없습니다." + "\n" + "잠시만 기다려 주신 후 다시 열람하여 주시기 바랍니다", "Warning"); |
|
| 667 |
//System.Windows.Browser.HtmlPage.Window.Invoke("close");
|
|
| 663 |
|
|
| 664 |
DialogMessage_Alert(failedmsg, "Warning"); |
|
| 668 | 665 |
} |
| 669 | 666 |
} |
| 670 | 667 |
|
| ... | ... | |
| 692 | 689 |
{
|
| 693 | 690 |
|
| 694 | 691 |
// 허브 연결 구성 |
| 695 |
var hubConnection = new HubConnection(global::KCOM.Properties.Settings.Default.HubAddress);
|
|
| 692 |
var hubConnection = new HubConnection(CommonLib.Common.GetConfigString("HubAddress", "URL", "", App.isExternal));
|
|
| 696 | 693 |
IHubProxy MarkusLicenseProxy = hubConnection.CreateHubProxy("MarkusLicenseHub");
|
| 697 | 694 |
|
| 698 | 695 |
|
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 538 | 538 |
string uri = ""; |
| 539 | 539 |
if (userData.COMPANY != "EXT") |
| 540 | 540 |
{
|
| 541 |
uri = String.Format(Properties.Settings.Default.mainServerImageWebPath, _ViewInfo.ProjectNO, (Convert.ToInt32(_ViewInfo.DocumentItemID) / 100).ToString(), _ViewInfo.DocumentItemID, e.PageNumber);
|
|
| 541 |
uri = String.Format(CommonLib.Common.GetConfigString("mainServerImageWebPath", "URL", "", App.isExternal), _ViewInfo.ProjectNO, (Convert.ToUInt32(_ViewInfo.DocumentItemID) / 100).ToString(), _ViewInfo.DocumentItemID, e.PageNumber);
|
|
| 542 | 542 |
} |
| 543 | 543 |
else |
| 544 | 544 |
{
|
| 545 |
uri = String.Format(Properties.Settings.Default.subServerImageWebPath, _ViewInfo.ProjectNO, _ViewInfo.DocumentItemID, e.PageNumber);
|
|
| 545 |
uri = String.Format(CommonLib.Common.GetConfigString("subServerImageWebPath", "URL", "", App.isExternal), _ViewInfo.ProjectNO, _ViewInfo.DocumentItemID, e.PageNumber);
|
|
| 546 | 546 |
} |
| 547 | 547 |
|
| 548 | 548 |
var defaultBitmapImage = new BitmapImage(); |
| ... | ... | |
| 620 | 620 |
string uri2 = ""; |
| 621 | 621 |
if (userData.COMPANY != "EXT") |
| 622 | 622 |
{
|
| 623 |
uri2 = String.Format(Properties.Settings.Default.mainServerImageWebPath, _ViewInfo.ProjectNO, (Convert.ToInt32(CurrentRev.DOCUMENT_ID) / 100).ToString(), CurrentRev.DOCUMENT_ID, BalancePoint);
|
|
| 623 |
uri2 = String.Format(CommonLib.Common.GetConfigString("mainServerImageWebPath", "URL", "", App.isExternal), _ViewInfo.ProjectNO, (Convert.ToUInt32(CurrentRev.DOCUMENT_ID) / 100).ToString(), CurrentRev.DOCUMENT_ID, BalancePoint);
|
|
| 624 | 624 |
} |
| 625 | 625 |
else |
| 626 | 626 |
{
|
| 627 |
uri2 = String.Format(Properties.Settings.Default.subServerImageWebPath, _ViewInfo.ProjectNO, CurrentRev.DOCUMENT_ID, BalancePoint);
|
|
| 627 |
uri2 = String.Format(CommonLib.Common.GetConfigString("subServerImageWebPath", "URL", "", App.isExternal), _ViewInfo.ProjectNO, CurrentRev.DOCUMENT_ID, BalancePoint);
|
|
| 628 | 628 |
} |
| 629 | 629 |
|
| 630 | 630 |
Logger.sendCheckLog("pageNavigator_PageChanging_defaultBitmapImage_Compare BitmapImage 설정", 1);
|
| ... | ... | |
| 2738 | 2738 |
string uri = ""; |
| 2739 | 2739 |
if (userData.COMPANY != "EXT") |
| 2740 | 2740 |
{
|
| 2741 |
uri = String.Format(Properties.Settings.Default.mainServerImageWebPath, _ViewInfo.ProjectNO,
|
|
| 2741 |
uri = String.Format(CommonLib.Common.GetConfigString("mainServerImageWebPath", "URL", "", App.isExternal), _ViewInfo.ProjectNO,
|
|
| 2742 | 2742 |
(Convert.ToInt32(_ViewInfo.DocumentItemID) / 100).ToString(), _ViewInfo.DocumentItemID, Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.CurrentPage.PageNumber); |
| 2743 | 2743 |
} |
| 2744 | 2744 |
else |
| 2745 | 2745 |
{
|
| 2746 |
uri = String.Format(Properties.Settings.Default.subServerImageWebPath, _ViewInfo.ProjectNO, _ViewInfo.DocumentItemID,
|
|
| 2746 |
uri = String.Format(CommonLib.Common.GetConfigString("subServerImageWebPath", "URL", "", App.isExternal), _ViewInfo.ProjectNO, _ViewInfo.DocumentItemID,
|
|
| 2747 | 2747 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.CurrentPage.PageNumber); |
| 2748 | 2748 |
} |
| 2749 | 2749 |
|
| ... | ... | |
| 5361 | 5361 |
|
| 5362 | 5362 |
if (userData.COMPANY != "EXT") |
| 5363 | 5363 |
{
|
| 5364 |
uri = String.Format(Properties.Settings.Default.mainServerImageWebPath, _ViewInfo.ProjectNO, (Convert.ToUInt32(CurrentRev.DOCUMENT_ID) / 100).ToString(), CurrentRev.DOCUMENT_ID, ViewerDataModel.Instance.PageNumber);
|
|
| 5364 |
uri = String.Format(CommonLib.Common.GetConfigString("mainServerImageWebPath", "URL", "", App.isExternal), _ViewInfo.ProjectNO, (Convert.ToUInt32(CurrentRev.DOCUMENT_ID) / 100).ToString(), CurrentRev.DOCUMENT_ID, ViewerDataModel.Instance.PageNumber);
|
|
| 5365 | 5365 |
} |
| 5366 | 5366 |
else |
| 5367 | 5367 |
{
|
| 5368 |
uri = String.Format(Properties.Settings.Default.subServerImageWebPath, _ViewInfo.ProjectNO, CurrentRev.DOCUMENT_ID, ViewerDataModel.Instance.PageNumber);
|
|
| 5368 |
uri = String.Format(CommonLib.Common.GetConfigString("subServerImageWebPath", "URL", "", App.isExternal), _ViewInfo.ProjectNO, CurrentRev.DOCUMENT_ID, ViewerDataModel.Instance.PageNumber);
|
|
| 5369 | 5369 |
} |
| 5370 | 5370 |
|
| 5371 | 5371 |
var defaultBitmapImage_Compare = new BitmapImage(new Uri(uri)); |
| ... | ... | |
| 5462 | 5462 |
string uri = ""; |
| 5463 | 5463 |
if (userData.COMPANY != "EXT") |
| 5464 | 5464 |
{
|
| 5465 |
uri = String.Format(Properties.Settings.Default.mainServerImageWebPath, _ViewInfo.ProjectNO, (Convert.ToUInt32(CurrentRev.DOCUMENT_ID) / 100).ToString(), CurrentRev.DOCUMENT_ID, pageNavigator.CurrentPage.PageNumber);
|
|
| 5465 |
uri = String.Format(CommonLib.Common.GetConfigString("mainServerImageWebPath", "URL", "", App.isExternal), _ViewInfo.ProjectNO, (Convert.ToUInt32(CurrentRev.DOCUMENT_ID) / 100).ToString(), CurrentRev.DOCUMENT_ID, pageNavigator.CurrentPage.PageNumber);
|
|
| 5466 | 5466 |
} |
| 5467 | 5467 |
else |
| 5468 | 5468 |
{
|
| 5469 |
uri = String.Format(Properties.Settings.Default.subServerImageWebPath, _ViewInfo.ProjectNO, CurrentRev.DOCUMENT_ID, pageNavigator.CurrentPage.PageNumber);
|
|
| 5469 |
uri = String.Format(CommonLib.Common.GetConfigString("subServerImageWebPath", "URL", "", App.isExternal), _ViewInfo.ProjectNO, CurrentRev.DOCUMENT_ID, pageNavigator.CurrentPage.PageNumber);
|
|
| 5470 | 5470 |
} |
| 5471 | 5471 |
|
| 5472 | 5472 |
var defaultBitmapImage_Compare = new BitmapImage(new Uri(uri)); |
| ... | ... | |
| 5524 | 5524 |
string uri = ""; |
| 5525 | 5525 |
if (userData.COMPANY != "EXT") |
| 5526 | 5526 |
{
|
| 5527 |
uri = String.Format(Properties.Settings.Default.mainServerImageWebPath, _ViewInfo.ProjectNO, (Convert.ToUInt32(CurrentRev.DOCUMENT_ID) / 100).ToString(), CurrentRev.DOCUMENT_ID, pageNavigator.CurrentPage.PageNumber);
|
|
| 5527 |
uri = String.Format(CommonLib.Common.GetConfigString("mainServerImageWebPath", "URL", "", App.isExternal), _ViewInfo.ProjectNO, (Convert.ToUInt32(CurrentRev.DOCUMENT_ID) / 100).ToString(), CurrentRev.DOCUMENT_ID, pageNavigator.CurrentPage.PageNumber);
|
|
| 5528 | 5528 |
} |
| 5529 | 5529 |
else |
| 5530 | 5530 |
{
|
| 5531 |
uri = String.Format(Properties.Settings.Default.subServerImageWebPath, _ViewInfo.ProjectNO, CurrentRev.DOCUMENT_ID, pageNavigator.CurrentPage.PageNumber);
|
|
| 5531 |
uri = String.Format(CommonLib.Common.GetConfigString("subServerImageWebPath", "URL", "", App.isExternal), _ViewInfo.ProjectNO, CurrentRev.DOCUMENT_ID, pageNavigator.CurrentPage.PageNumber);
|
|
| 5532 | 5532 |
} |
| 5533 | 5533 |
|
| 5534 | 5534 |
Sync_Offset_Point = new Point(zoomAndPanControl.ContentOffsetX, zoomAndPanControl.ContentOffsetY); |
| ... | ... | |
| 5606 | 5606 |
string uri = ""; |
| 5607 | 5607 |
if (userData.COMPANY != "EXT") |
| 5608 | 5608 |
{
|
| 5609 |
uri = String.Format(Properties.Settings.Default.mainServerImageWebPath, _ViewInfo.ProjectNO, (Convert.ToUInt32(CurrentRev.DOCUMENT_ID) / 100).ToString(), CurrentRev.DOCUMENT_ID, pageNavigator.CurrentPage.PageNumber);
|
|
| 5609 |
uri = String.Format(CommonLib.Common.GetConfigString("mainServerImageWebPath", "URL", "", App.isExternal), _ViewInfo.ProjectNO, (Convert.ToUInt32(CurrentRev.DOCUMENT_ID) / 100).ToString(), CurrentRev.DOCUMENT_ID, pageNavigator.CurrentPage.PageNumber);
|
|
| 5610 | 5610 |
} |
| 5611 | 5611 |
else |
| 5612 | 5612 |
{
|
| 5613 |
uri = String.Format(Properties.Settings.Default.subServerImageWebPath, _ViewInfo.ProjectNO, CurrentRev.DOCUMENT_ID, pageNavigator.CurrentPage.PageNumber);
|
|
| 5613 |
uri = String.Format(CommonLib.Common.GetConfigString("subServerImageWebPath", "URL", "", App.isExternal), _ViewInfo.ProjectNO, CurrentRev.DOCUMENT_ID, pageNavigator.CurrentPage.PageNumber);
|
|
| 5614 | 5614 |
} |
| 5615 | 5615 |
|
| 5616 | 5616 |
Sync_Offset_Point = new Point(zoomAndPanControl.ContentOffsetX, zoomAndPanControl.ContentOffsetY); |
| KCOM/Web References/Get_FinalImage/Reference.cs | ||
|---|---|---|
| 35 | 35 |
|
| 36 | 36 |
/// <remarks/> |
| 37 | 37 |
public Get_PdfImage() {
|
| 38 |
this.Url = global::KCOM.Properties.Settings.Default.KCOM_Get_FinalImage_Get_PdfImage;
|
|
| 38 |
this.Url = CommonLib.Common.GetConfigString("KCOM_Get_FinalImage_Get_PdfImage", "URL", "", App.isExternal);
|
|
| 39 | 39 |
if ((this.IsLocalFileSystemWebService(this.Url) == true)) {
|
| 40 | 40 |
this.UseDefaultCredentials = true; |
| 41 | 41 |
this.useDefaultCredentialsSetExplicitly = false; |
| KCOM/Web References/kr.co.devdoftech.cloud/Reference.cs | ||
|---|---|---|
| 35 | 35 |
|
| 36 | 36 |
/// <remarks/> |
| 37 | 37 |
public FileUpload() {
|
| 38 |
this.Url = global::KCOM.Properties.Settings.Default.KCOM_kr_co_devdoftech_cloud_FileUpload;
|
|
| 38 |
this.Url = CommonLib.Common.GetConfigString("KCOM_kr_co_devdoftech_cloud_FileUpload", "URL", "", App.isExternal);
|
|
| 39 | 39 |
if ((this.IsLocalFileSystemWebService(this.Url) == true)) {
|
| 40 | 40 |
this.UseDefaultCredentials = true; |
| 41 | 41 |
this.useDefaultCredentialsSetExplicitly = false; |
| KCOMDataModel/Common/ConnectStringBuilder.cs | ||
|---|---|---|
| 23 | 23 |
} |
| 24 | 24 |
public static EntityConnectionStringBuilder ProjectCIConnectString(string ProjectNo) |
| 25 | 25 |
{
|
| 26 |
return CIConnectionStringBuilder(Properties.Settings.Default.ProjectConnectionString, ProjectNo, CIMeta);
|
|
| 26 |
return CIConnectionStringBuilder(CommonLib.Common.GetConnectionString(), ProjectNo, CIMeta);
|
|
| 27 | 27 |
} |
| 28 | 28 |
|
| 29 | 29 |
private static EntityConnectionStringBuilder CIConnectionStringBuilder(string adoConnectionString, string ProjectNo, string Metadata) |
| 30 | 30 |
{
|
| 31 | 31 |
try |
| 32 | 32 |
{
|
| 33 |
SqlConnectionStringBuilder bl = new SqlConnectionStringBuilder(string.Format(Properties.Settings.Default.ProjectConnectionString, "markus"));
|
|
| 33 |
SqlConnectionStringBuilder bl = new SqlConnectionStringBuilder(string.Format(CommonLib.Common.GetConnectionString(), "markus"));
|
|
| 34 | 34 |
|
| 35 | 35 |
using (DataModel.KCOMEntities entity |
| 36 | 36 |
= new DataModel.KCOMEntities(EntityConnectionStringBuilder(bl, DeepViewMeta).ToString())) |
| ... | ... | |
| 66 | 66 |
entityBuilder.Provider = providerName; |
| 67 | 67 |
entityBuilder.ProviderConnectionString = providerString; |
| 68 | 68 |
entityBuilder.Metadata = EntityMetaData; |
| 69 |
Console.WriteLine(entityBuilder.ToString()); |
|
| 69 |
//Console.WriteLine(entityBuilder.ToString());
|
|
| 70 | 70 |
|
| 71 |
using (EntityConnection conn = |
|
| 72 |
new EntityConnection(entityBuilder.ToString())) |
|
| 73 |
{
|
|
| 74 |
conn.Open(); |
|
| 75 |
Console.WriteLine("Just testing the connection.");
|
|
| 76 |
conn.Close(); |
|
| 77 |
} |
|
| 71 |
//using (EntityConnection conn =
|
|
| 72 |
// new EntityConnection(entityBuilder.ToString()))
|
|
| 73 |
//{
|
|
| 74 |
// conn.Open();
|
|
| 75 |
// Console.WriteLine("Just testing the connection.");
|
|
| 76 |
// conn.Close();
|
|
| 77 |
//}
|
|
| 78 | 78 |
|
| 79 | 79 |
return entityBuilder; |
| 80 | 80 |
} |
내보내기 Unified diff
