개정판 5928384e
issue #000 ini 에서 Config 를 읽는 Commonlib 추가. 별도로 soap api 를 Connection 하는 부분을 BaseClient Static Class 를 참조하도록 수정.
Change-Id: I54563f8e7e368ace8d50f9fef6a57e6995812a47
| KCOM.sln | ||
|---|---|---|
| 26 | 26 |
EndProject |
| 27 | 27 |
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IFinalPDF", "FinalService\KCOM_FinalService\IFinalPDF\IFinalPDF.csproj", "{784438BE-2074-41AE-A692-24E1A4A67FE3}"
|
| 28 | 28 |
EndProject |
| 29 |
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommonLib", "CommonLib\CommonLib.csproj", "{DEF47FC2-B898-4C92-AD8D-D7B9E994495E}"
|
|
| 30 |
EndProject |
|
| 29 | 31 |
Global |
| 30 | 32 |
GlobalSection(SolutionConfigurationPlatforms) = preSolution |
| 31 | 33 |
Debug|Any CPU = Debug|Any CPU |
| ... | ... | |
| 114 | 116 |
{784438BE-2074-41AE-A692-24E1A4A67FE3}.Release|Any CPU.Build.0 = Release|Any CPU
|
| 115 | 117 |
{784438BE-2074-41AE-A692-24E1A4A67FE3}.Release|x64.ActiveCfg = Release|Any CPU
|
| 116 | 118 |
{784438BE-2074-41AE-A692-24E1A4A67FE3}.Release|x64.Build.0 = Release|Any CPU
|
| 119 |
{DEF47FC2-B898-4C92-AD8D-D7B9E994495E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
| 120 |
{DEF47FC2-B898-4C92-AD8D-D7B9E994495E}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
| 121 |
{DEF47FC2-B898-4C92-AD8D-D7B9E994495E}.Debug|x64.ActiveCfg = Debug|Any CPU
|
|
| 122 |
{DEF47FC2-B898-4C92-AD8D-D7B9E994495E}.Debug|x64.Build.0 = Debug|Any CPU
|
|
| 123 |
{DEF47FC2-B898-4C92-AD8D-D7B9E994495E}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
| 124 |
{DEF47FC2-B898-4C92-AD8D-D7B9E994495E}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
| 125 |
{DEF47FC2-B898-4C92-AD8D-D7B9E994495E}.Release|x64.ActiveCfg = Release|Any CPU
|
|
| 126 |
{DEF47FC2-B898-4C92-AD8D-D7B9E994495E}.Release|x64.Build.0 = Release|Any CPU
|
|
| 117 | 127 |
EndGlobalSection |
| 118 | 128 |
GlobalSection(SolutionProperties) = preSolution |
| 119 | 129 |
HideSolutionNode = FALSE |
| KCOM/App.xaml.cs | ||
|---|---|---|
| 69 | 69 |
} |
| 70 | 70 |
} |
| 71 | 71 |
|
| 72 |
[DllImport("kernel32")]
|
|
| 73 |
private static extern int GetPrivateProfileString(string section, string key, string def, StringBuilder retVal, int size, string filePath); |
|
| 74 |
|
|
| 72 |
|
|
| 75 | 73 |
public static RestSharp.RestClient BaseClient { get; set; }
|
| 76 | 74 |
public static IKCOM.KCOM_SystemInfo SystemInfo { get; set; }
|
| 77 | 75 |
private static OpenProperties ParamDecoding(string DecodingText, System.Text.Encoding oEncoding = null) |
| ... | ... | |
| 163 | 161 |
_binding.TextEncoding = System.Text.Encoding.UTF8; |
| 164 | 162 |
_binding.TransferMode = TransferMode.Buffered; |
| 165 | 163 |
//Support.SetLicense(); |
| 166 |
|
|
| 167 |
StringBuilder BaseClientAddress = new StringBuilder(512); |
|
| 168 |
GetPrivateProfileString("BaseClientAddress", "URL", "(NONE)", BaseClientAddress, 512, Path.Combine(AppDataFolder, "MARKUS.ini"));
|
|
| 169 |
|
|
| 170 |
//string sBaseServiceURL = global::KCOM.Properties.Settings.Default.BaseClientAddress; |
|
| 171 |
string sBaseServiceURL = BaseClientAddress.ToString(); |
|
| 164 |
|
|
| 165 |
string sBaseServiceURL = CommonLib.Common.GetConfigString("BaseClientAddress", "URL", "");
|
|
| 172 | 166 |
|
| 173 | 167 |
var ipaddress = DNSHelper.GetDnsAdress(); |
| 174 | 168 |
|
| KCOM/Controls/Symbol.xaml.cs | ||
|---|---|---|
| 93 | 93 |
//lstSymbolPublic.ItemsSource = null; |
| 94 | 94 |
|
| 95 | 95 |
Symbol_Custom Custom = new Symbol_Custom(); |
| 96 |
List<Symbol_Custom> Custom_List = new List<Symbol_Custom>(); |
|
| 97 |
ServiceDeepView.ServiceDeepViewClient client = new ServiceDeepView.ServiceDeepViewClient(App._binding, App._EndPoint); |
|
| 98 |
var symbol_Private = client.GetSymbolList(App.ViewInfo.UserID);
|
|
| 96 |
List<Symbol_Custom> Custom_List = new List<Symbol_Custom>();
|
|
| 97 |
|
|
| 98 |
var symbol_Private = ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetSymbolList(App.ViewInfo.UserID);
|
|
| 99 | 99 |
foreach (var item in symbol_Private) |
| 100 | 100 |
{
|
| 101 | 101 |
Custom.Name = item.NAME; |
| ... | ... | |
| 109 | 109 |
Custom = new Symbol_Custom(); |
| 110 | 110 |
Custom_List = new List<Symbol_Custom>(); |
| 111 | 111 |
|
| 112 |
deptlist.ItemsSource = client.GetPublicSymbolDeptList();
|
|
| 112 |
deptlist.ItemsSource = ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetPublicSymbolDeptList();
|
|
| 113 | 113 |
|
| 114 | 114 |
List<SYMBOL_PUBLIC> symbol_Public; |
| 115 | 115 |
|
| 116 | 116 |
|
| 117 | 117 |
if (deptlist.SelectedValue != null) |
| 118 | 118 |
{
|
| 119 |
symbol_Public = client.GetPublicSymbolList(deptlist.SelectedValue.ToString());
|
|
| 119 |
symbol_Public = ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetPublicSymbolList(deptlist.SelectedValue.ToString());
|
|
| 120 | 120 |
} |
| 121 | 121 |
else |
| 122 | 122 |
{
|
| 123 |
symbol_Public = client.GetPublicSymbolList(null);
|
|
| 123 |
symbol_Public = ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetPublicSymbolList(null);
|
|
| 124 | 124 |
} |
| 125 | 125 |
foreach (var item in symbol_Public) |
| 126 | 126 |
{
|
| ... | ... | |
| 130 | 130 |
Custom_List.Add(Custom); |
| 131 | 131 |
Custom = new Symbol_Custom(); |
| 132 | 132 |
} |
| 133 |
lstSymbolPublic.ItemsSource = Custom_List; |
|
| 134 |
client.Close(); |
|
| 133 |
lstSymbolPublic.ItemsSource = Custom_List; |
|
| 135 | 134 |
} |
| 136 | 135 |
|
| 137 | 136 |
public PngBitmapEncoder symImage(string data) |
| KCOM/KCOM.csproj | ||
|---|---|---|
| 1260 | 1260 |
<Resource Include="Resources\Images\MenuImage_New\white.png" /> |
| 1261 | 1261 |
</ItemGroup> |
| 1262 | 1262 |
<ItemGroup> |
| 1263 |
<ProjectReference Include="..\CommonLib\CommonLib.csproj"> |
|
| 1264 |
<Project>{def47fc2-b898-4c92-ad8d-d7b9e994495e}</Project>
|
|
| 1265 |
<Name>CommonLib</Name> |
|
| 1266 |
</ProjectReference> |
|
| 1263 | 1267 |
<ProjectReference Include="..\IKCOM\IKCOM.csproj"> |
| 1264 | 1268 |
<Project>{f236a005-12f4-406a-b9ed-0c3b5d994001}</Project>
|
| 1265 | 1269 |
<Name>IKCOM</Name> |
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 5917 | 5917 |
{
|
| 5918 | 5918 |
Symbol_Custom Custom = new Symbol_Custom(); |
| 5919 | 5919 |
List<Symbol_Custom> Custom_List = new List<Symbol_Custom>(); |
| 5920 |
//ServiceDeepView.ServiceDeepViewClient client = new ServiceDeepView.ServiceDeepViewClient(App._binding, App._EndPoint); |
|
| 5920 |
|
|
| 5921 | 5921 |
var symbol_Private = BaseClient.GetSymbolList(App.ViewInfo.UserID); |
| 5922 | 5922 |
foreach (var item in symbol_Private) |
| 5923 | 5923 |
{
|
| KCOMDataModel/Common/ConnectStringBuilder.cs | ||
|---|---|---|
| 18 | 18 |
|
| 19 | 19 |
public static EntityConnectionStringBuilder KCOMConnectionString() |
| 20 | 20 |
{
|
| 21 |
SqlConnectionStringBuilder _bl = new SqlConnectionStringBuilder(string.Format(Properties.Settings.Default.ProjectConnectionString, "markus"));
|
|
| 21 |
SqlConnectionStringBuilder _bl = new SqlConnectionStringBuilder(string.Format(CommonLib.Common.GetConnectionString(), "markus"));
|
|
| 22 | 22 |
return EntityConnectionStringBuilder(_bl, DeepViewMeta); |
| 23 | 23 |
} |
| 24 | 24 |
public static EntityConnectionStringBuilder ProjectCIConnectString(string ProjectNo) |
| KCOMDataModel/KCOMDataModel.csproj | ||
|---|---|---|
| 75 | 75 |
</EntityDeploy> |
| 76 | 76 |
</ItemGroup> |
| 77 | 77 |
<ItemGroup> |
| 78 |
|
|
| 78 | 79 |
<None Include="App.Config"> |
| 79 | 80 |
<SubType>Designer</SubType> |
| 80 | 81 |
</None> |
| ... | ... | |
| 93 | 94 |
<ItemGroup> |
| 94 | 95 |
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
|
| 95 | 96 |
</ItemGroup> |
| 97 |
<ItemGroup> |
|
| 98 |
<ProjectReference Include="..\CommonLib\CommonLib.csproj"> |
|
| 99 |
<Project>{def47fc2-b898-4c92-ad8d-d7b9e994495e}</Project>
|
|
| 100 |
<Name>CommonLib</Name> |
|
| 101 |
</ProjectReference> |
|
| 102 |
</ItemGroup> |
|
| 96 | 103 |
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> |
| 97 | 104 |
</Project> |
| MarkupToPDF/Common/GetUserSign.cs | ||
|---|---|---|
| 25 | 25 |
} |
| 26 | 26 |
} |
| 27 | 27 |
|
| 28 |
[DllImport("kernel32")]
|
|
| 29 |
private static extern int GetPrivateProfileString(string section, string key, string def, StringBuilder retVal, int size, string filePath); |
|
| 30 |
|
|
| 28 |
|
|
| 31 | 29 |
/// <summary> |
| 32 | 30 |
/// get signature of given user of given project |
| 33 | 31 |
/// </summary> |
| ... | ... | |
| 49 | 47 |
_binding.TextEncoding = System.Text.Encoding.UTF8; |
| 50 | 48 |
_binding.TransferMode = TransferMode.Buffered; |
| 51 | 49 |
|
| 52 |
StringBuilder BaseClientAddress = new StringBuilder(512); |
|
| 53 |
GetPrivateProfileString("BaseClientAddress", "URL", "(NONE)", BaseClientAddress, 512, Path.Combine(AppDataFolder, "MARKUS.ini"));
|
|
| 54 |
|
|
| 55 |
//string sBaseServiceURL = global::MarkupToPDF.Properties.Settings.Default.BaseClientAddress; |
|
| 56 |
string sBaseServiceURL = BaseClientAddress.ToString(); |
|
| 50 |
string sBaseServiceURL = CommonLib.Common.GetConfigString("BaseClientAddress", "URL", "");
|
|
| 57 | 51 |
|
| 58 | 52 |
_EndPoint = new EndpointAddress(string.Format("{0}/ServiceDeepView.svc", sBaseServiceURL));
|
| 59 | 53 |
|
| MarkupToPDF/MarkupToPDF.csproj | ||
|---|---|---|
| 292 | 292 |
</None> |
| 293 | 293 |
</ItemGroup> |
| 294 | 294 |
<ItemGroup> |
| 295 |
<ProjectReference Include="..\CommonLib\CommonLib.csproj"> |
|
| 296 |
<Project>{def47fc2-b898-4c92-ad8d-d7b9e994495e}</Project>
|
|
| 297 |
<Name>CommonLib</Name> |
|
| 298 |
</ProjectReference> |
|
| 295 | 299 |
<ProjectReference Include="..\KCOMDataModel\KCOMDataModel.csproj"> |
| 296 | 300 |
<Project>{629dc8cd-d458-47ef-8f02-cd12c7001c3e}</Project>
|
| 297 | 301 |
<Name>KCOMDataModel</Name> |
내보내기 Unified diff
