Commit 0945d81046be9e5facd92cf424ba58b9aa5b7bde
1 parent
fd7c1823
Exists in
master
Envio do MAC em nova variável.
Showing
3 changed files
with
7 additions
and
2 deletions
Show diff stats
CACIC_Comm.pas
@@ -35,7 +35,8 @@ var tStringStrResponseCS : TStringStream; | @@ -35,7 +35,8 @@ var tStringStrResponseCS : TStringStream; | ||
35 | strWin32_NetworkAdapterConfiguration, | 35 | strWin32_NetworkAdapterConfiguration, |
36 | strWin32_OperatingSystem, | 36 | strWin32_OperatingSystem, |
37 | strWin32_SoftwareFeature, | 37 | strWin32_SoftwareFeature, |
38 | - strTeDebugging : String; | 38 | + strTeDebugging, |
39 | + strMac : String; | ||
39 | Begin | 40 | Begin |
40 | Try | 41 | Try |
41 | tStringStrResponseCS := TStringStream.Create(''); | 42 | tStringStrResponseCS := TStringStream.Create(''); |
@@ -53,6 +54,9 @@ Begin | @@ -53,6 +54,9 @@ Begin | ||
53 | strWin32_OperatingSystem := fetchWmiValues('Win32_OperatingSystem' ,objCacicCOMM.getLocalFolderName); | 54 | strWin32_OperatingSystem := fetchWmiValues('Win32_OperatingSystem' ,objCacicCOMM.getLocalFolderName); |
54 | strWin32_ComputerSystem := fetchWmiValues('Win32_ComputerSystem' ,objCacicCOMM.getLocalFolderName); | 55 | strWin32_ComputerSystem := fetchWmiValues('Win32_ComputerSystem' ,objCacicCOMM.getLocalFolderName); |
55 | strWin32_NetworkAdapterConfiguration := fetchWmiValues('Win32_NetworkAdapterConfiguration',objCacicCOMM.getLocalFolderName); | 56 | strWin32_NetworkAdapterConfiguration := fetchWmiValues('Win32_NetworkAdapterConfiguration',objCacicCOMM.getLocalFolderName); |
57 | + strMac := objCacicCOMM.getValueFromTags('MACAddress',fetchWMIvalues('Win32_NetworkAdapterConfiguration',objCacicCOMM.getLocalFolderName,'MACAddress')); | ||
58 | + if pos('[', strMac) > 0 then | ||
59 | + strMac := copy(strMac, 0, pos('[', strMac) - 1); | ||
56 | 60 | ||
57 | // if (not (pos('get/test', pStrFullURL) > 0)) and (not (pos('get/config', pStrFullURL) > 0)) then | 61 | // if (not (pos('get/test', pStrFullURL) > 0)) and (not (pos('get/config', pStrFullURL) > 0)) then |
58 | // begin | 62 | // begin |
@@ -79,6 +83,7 @@ Begin | @@ -79,6 +83,7 @@ Begin | ||
79 | Values['te_so' ] := objCacicCOMM.replaceInvalidHTTPChars(objCacicCOMM.getWindowsStrId() ); | 83 | Values['te_so' ] := objCacicCOMM.replaceInvalidHTTPChars(objCacicCOMM.getWindowsStrId() ); |
80 | Values['te_versao_cacic' ] := objCacicCOMM.replaceInvalidHTTPChars(objCacicCOMM.getVersionInfo(objCacicCOMM.getLocalFolderName + objCacicCOMM.getMainProgramName)); | 84 | Values['te_versao_cacic' ] := objCacicCOMM.replaceInvalidHTTPChars(objCacicCOMM.getVersionInfo(objCacicCOMM.getLocalFolderName + objCacicCOMM.getMainProgramName)); |
81 | Values['te_versao_gercols' ] := objCacicCOMM.replaceInvalidHTTPChars(objCacicCOMM.getVersionInfo(objCacicCOMM.getLocalFolderName + 'Modules\gercols.exe' )); | 85 | Values['te_versao_gercols' ] := objCacicCOMM.replaceInvalidHTTPChars(objCacicCOMM.getVersionInfo(objCacicCOMM.getLocalFolderName + 'Modules\gercols.exe' )); |
86 | + Values['te_node_address' ] := objCacicCOMM.replaceInvalidHTTPChars(objCacicCOMM.enCrypt(strMac, true, true)); | ||
82 | End; | 87 | End; |
83 | 88 | ||
84 | if objCacicCOMM.isInDebugMode then | 89 | if objCacicCOMM.isInDebugMode then |
cacic280.dproj
@@ -40,7 +40,7 @@ | @@ -40,7 +40,7 @@ | ||
40 | <Borland.Personality>Delphi.Personality</Borland.Personality> | 40 | <Borland.Personality>Delphi.Personality</Borland.Personality> |
41 | <Borland.ProjectType>VCLApplication</Borland.ProjectType> | 41 | <Borland.ProjectType>VCLApplication</Borland.ProjectType> |
42 | <BorlandProject> | 42 | <BorlandProject> |
43 | -<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">12</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1046</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Dataprev - Emp. de TI da Prev.Social - URES/SESS</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Sistema CACIC - Módulo Agente Principal</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.12</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright">Baseado na licença GNU/LGPL</VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">Cacic - Configurador Automático e Coletor de Informações Computacionais</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">cacic280.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> | 43 | +<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">13</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1046</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Dataprev - Emp. de TI da Prev.Social - URES/SESS</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Sistema CACIC - Módulo Agente Principal</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.13</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright">Baseado na licença GNU/LGPL</VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">Cacic - Configurador Automático e Coletor de Informações Computacionais</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">cacic280.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> |
44 | </ProjectExtensions> | 44 | </ProjectExtensions> |
45 | <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> | 45 | <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> |
46 | <ItemGroup> | 46 | <ItemGroup> |
cacic280.res
No preview for this file type