From db5c273a1831e6ed53ff4fef70b3916f1ad76a88 Mon Sep 17 00:00:00 2001 From: chi Date: Thu, 9 Jan 2020 00:07:35 +0900 Subject: [PATCH] =?UTF-8?q?user=20=EA=B3=84=EC=A0=95=20=EA=B6=8C=ED=95=9C?= =?UTF-8?q?=20=EC=9E=85=EB=A0=A5=20-=20=EC=98=A4=ED=94=84=EB=9D=BC?= =?UTF-8?q?=EC=9D=B8=EC=9C=BC=EB=A1=9C=20BOTH=20=EB=A1=9C=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ArinLog/bin/Debug/ArinLog.Net4.dll | Bin 20480 -> 20480 bytes ArinLog/bin/Debug/ArinLog.Net4.pdb | Bin 40448 -> 40448 bytes ArinLog/obj/Debug/ArinLog.Net4.dll | Bin 20480 -> 20480 bytes ArinLog/obj/Debug/ArinLog.Net4.pdb | Bin 40448 -> 40448 bytes .../Debug/ArinLog.vbproj.FileListAbsolute.txt | 8 ++++ ...gnTimeResolveAssemblyReferencesInput.cache | Bin 5669 -> 5782 bytes ArinWarev1/ECO2_2016.vbproj | 16 +++---- ArinWarev1/Forms_Basic/Frm_Intro.vb | 31 ++++++++------ ArinWarev1/Forms_Input/Frm_Desc.vb | 6 +-- ArinWarev1/MdiMain.vb | 39 +++++++++++------- ArinWarev1/My Project/licenses.licx | 2 +- 11 files changed, 62 insertions(+), 40 deletions(-) diff --git a/ArinLog/bin/Debug/ArinLog.Net4.dll b/ArinLog/bin/Debug/ArinLog.Net4.dll index 7c1b2a5b95e89ab9c394553873ef01c4596449be..0b8be3006f240f97ab5391b170cd6b568fc1a538 100644 GIT binary patch delta 596 zcmZozz}T>WaY6?R%Lmc8jXg4qjPp0IWc)5_a-aVwKO4gjel{Q}D)5YpjX_xe#I^&I zkzle2Om>6G6+m+H74ZdJ^}m?(7)~=UV%KAM%zPe59%h~bBwsTh0+OE@7+LffE`!;( z!Q!)-pR?&PEN1=yBzH4s0o6=qz6WHlX66U7H#3K`J1`hC$TB%F2s5l;a)y%93>%p| z8M+y`nG+b4fwIXAAdzH{?Bvf%_FN!)4ujQBwox|XyUi%e#LNgXfSFO5VRDVKQa#Ab z1h7y8BZ%D$lmL;{V6quZg0wX=N;8PCEdZ-o$e7Ihigh6)NPIC+Jcn&Dlr78<%60&( z<^b5tgJ6{h!Lo*09+~MO}Dul@b4BeGApeQRc@c z2V1NZSS+D%NA>9{@2NZ`i!GVgUfRrK`HM+efRTaQw^GkJKewQ?B(;cvL70(&4=CVR zP>_?EoLG{XpSM}l<`eVe)eat$r5z@0{_G&g7zm1H1|VPp;$|S0NdRIe28N(umtf_S z(ju)>vc0z4F*UyvS9qHdDDP?&6Ox%%oLw0cmRVeyn4{p7Se%)x;Fe#c;OgfZ#pSS^EteKnu delta 571 zcmXYuO=uHQ6ov1dSErI_W+av_l5P@zaN!_P=nsWXCtWD$LSvy83n@df#kL8hq1Xxy z3{|076yMT?Qvwp{Dm-!H#xjV4OLbMKw*G-`O0y6O7Vo?G;C`Gr=e#?MR}HZm;@YFO z^PfJCHEU_aKt0Dl9hcr%re(se^&@7&9_zTRoioe<<_NRGd}h~d^|3RIEhmHnkr-`v zU`sqCz7ki7U&SKvw|Giy0k%2to}CYzO0jJ^@I?G1*2NxiLs-;QBGc}|Md&hINJ7KN zLkgNit*^i;92iB&QtGqsYhSi912LUP{2$q$%_a1wKwT8Lh4Owjv#hNm>djSVz;S>} zTSbLw3GzL37VCR6TZ)pAc@uYP8rW6<28Nf&86 xfE$IO!ie;adf%eK$EyqByUxRxNO`{RcA-?6^C#r6mr+ZeM0vqTtHjWL{2x7Gl6e3C diff --git a/ArinLog/bin/Debug/ArinLog.Net4.pdb b/ArinLog/bin/Debug/ArinLog.Net4.pdb index 2269fc0c34bce062b02ff0302dd7812404039a3b..0188d0e654d09c5f0f4ece5c92aa659e0399893b 100644 GIT binary patch delta 1910 zcmb7ETWAwO6rCg!8@Jl}XiI7|q-~-}OcPUE3}!uXmb5F;4o7`w z!co^$*Svg_2s+C{4tJF&5>78&@ukzSdPF7WP`lw>C|3ufnM}LtpO{JsG-EUcDKz z&JsNtemOn*GI;zma7NNb#{K|vVbkf_X=3aR&;t89K&_E8mgQ=AcBxl$ureragZ>la z7W9Q`xHaXrSblXkFRXd|${-$A%@d2=ll7?>z@KSB;?m|2mtwLS-Z0?pw-_6F=0??}sm7hA zO#QNyk;bp}ur=6n1pWChth^6gRs!b1ONg^lao-^2U0$@V5SSPb%M~X*1h-FM?KNu^qIr)s0jJhpj0_`jwMhwqLLrhFplanuE zM3|519*J9Owaz;tYEm9O61uoLYSr7+ippyg&q{MX3vxlIJK8Avg~pLOr#9bH;w* Gz48yxk-)#wvM{T=em7q0+JU^w7-T*S!W!y2e|ozoG7p5k2MdSvgshW=M?j zawU~pjX9xf8XBEd4nAly8tjG6+WHj@)%N1LtuB`}bI&$bm2Y>A0f$lmYz0sUplTc_ z&bLp@zy(vfdQu9%)0M6cW_0|QNjrtp@#<7<5Id-(1#y|P(t;Sl6vG!Nx*$$#o*jYb zu5~$_E_>;!l}mZOu}oFdu#*oMOEThdR29%1=)TBUyoxb8K7V@(!wg3gG|UHcqC@LJ z45)aMSsz7^0vV9F3)1!#HVTSGmgg@EZ~l7jg@A-?zSt5jmYMl}%jRa9$%2H0_t`@K zpBdIl*z|-nh++=({zen~*^MvFCyAw%5=*f_b^vSgvkQetVH#8S-1He)!pQa`-j z?8zsXc0e%gB5-0l4nN!f>3cn~bWFrjERY=z*xa>SZ33}$Y{XK`!8}Fl`qM7R;(gJ3 zF{dX=G>G1kC5lMnS0&dYg$l1{?O}_$011qZ+^+B%n!c%{`yvxDG~rWy4yD6B##38Y zNwJTdxqM%%T^bsO@sf^z7XlExd(fhFOl^LY^SsyaW28QIJc#+cscmRW8mW5W7vpgB&!8}F)jU?ZW&I+& T92*=dcrx|WIwfyX_xq5)upnIf diff --git a/ArinLog/obj/Debug/ArinLog.Net4.dll b/ArinLog/obj/Debug/ArinLog.Net4.dll index 7c1b2a5b95e89ab9c394553873ef01c4596449be..0b8be3006f240f97ab5391b170cd6b568fc1a538 100644 GIT binary patch delta 596 zcmZozz}T>WaY6?R%Lmc8jXg4qjPp0IWc)5_a-aVwKO4gjel{Q}D)5YpjX_xe#I^&I zkzle2Om>6G6+m+H74ZdJ^}m?(7)~=UV%KAM%zPe59%h~bBwsTh0+OE@7+LffE`!;( z!Q!)-pR?&PEN1=yBzH4s0o6=qz6WHlX66U7H#3K`J1`hC$TB%F2s5l;a)y%93>%p| z8M+y`nG+b4fwIXAAdzH{?Bvf%_FN!)4ujQBwox|XyUi%e#LNgXfSFO5VRDVKQa#Ab z1h7y8BZ%D$lmL;{V6quZg0wX=N;8PCEdZ-o$e7Ihigh6)NPIC+Jcn&Dlr78<%60&( z<^b5tgJ6{h!Lo*09+~MO}Dul@b4BeGApeQRc@c z2V1NZSS+D%NA>9{@2NZ`i!GVgUfRrK`HM+efRTaQw^GkJKewQ?B(;cvL70(&4=CVR zP>_?EoLG{XpSM}l<`eVe)eat$r5z@0{_G&g7zm1H1|VPp;$|S0NdRIe28N(umtf_S z(ju)>vc0z4F*UyvS9qHdDDP?&6Ox%%oLw0cmRVeyn4{p7Se%)x;Fe#c;OgfZ#pSS^EteKnu delta 571 zcmXYuO=uHQ6ov1dSErI_W+av_l5P@zaN!_P=nsWXCtWD$LSvy83n@df#kL8hq1Xxy z3{|076yMT?Qvwp{Dm-!H#xjV4OLbMKw*G-`O0y6O7Vo?G;C`Gr=e#?MR}HZm;@YFO z^PfJCHEU_aKt0Dl9hcr%re(se^&@7&9_zTRoioe<<_NRGd}h~d^|3RIEhmHnkr-`v zU`sqCz7ki7U&SKvw|Giy0k%2to}CYzO0jJ^@I?G1*2NxiLs-;QBGc}|Md&hINJ7KN zLkgNit*^i;92iB&QtGqsYhSi912LUP{2$q$%_a1wKwT8Lh4Owjv#hNm>djSVz;S>} zTSbLw3GzL37VCR6TZ)pAc@uYP8rW6<28Nf&86 xfE$IO!ie;adf%eK$EyqByUxRxNO`{RcA-?6^C#r6mr+ZeM0vqTtHjWL{2x7Gl6e3C diff --git a/ArinLog/obj/Debug/ArinLog.Net4.pdb b/ArinLog/obj/Debug/ArinLog.Net4.pdb index 2269fc0c34bce062b02ff0302dd7812404039a3b..0188d0e654d09c5f0f4ece5c92aa659e0399893b 100644 GIT binary patch delta 1910 zcmb7ETWAwO6rCg!8@Jl}XiI7|q-~-}OcPUE3}!uXmb5F;4o7`w z!co^$*Svg_2s+C{4tJF&5>78&@ukzSdPF7WP`lw>C|3ufnM}LtpO{JsG-EUcDKz z&JsNtemOn*GI;zma7NNb#{K|vVbkf_X=3aR&;t89K&_E8mgQ=AcBxl$ureragZ>la z7W9Q`xHaXrSblXkFRXd|${-$A%@d2=ll7?>z@KSB;?m|2mtwLS-Z0?pw-_6F=0??}sm7hA zO#QNyk;bp}ur=6n1pWChth^6gRs!b1ONg^lao-^2U0$@V5SSPb%M~X*1h-FM?KNu^qIr)s0jJhpj0_`jwMhwqLLrhFplanuE zM3|519*J9Owaz;tYEm9O61uoLYSr7+ippyg&q{MX3vxlIJK8Avg~pLOr#9bH;w* Gz48yxk-)#wvM{T=em7q0+JU^w7-T*S!W!y2e|ozoG7p5k2MdSvgshW=M?j zawU~pjX9xf8XBEd4nAly8tjG6+WHj@)%N1LtuB`}bI&$bm2Y>A0f$lmYz0sUplTc_ z&bLp@zy(vfdQu9%)0M6cW_0|QNjrtp@#<7<5Id-(1#y|P(t;Sl6vG!Nx*$$#o*jYb zu5~$_E_>;!l}mZOu}oFdu#*oMOEThdR29%1=)TBUyoxb8K7V@(!wg3gG|UHcqC@LJ z45)aMSsz7^0vV9F3)1!#HVTSGmgg@EZ~l7jg@A-?zSt5jmYMl}%jRa9$%2H0_t`@K zpBdIl*z|-nh++=({zen~*^MvFCyAw%5=*f_b^vSgvkQetVH#8S-1He)!pQa`-j z?8zsXc0e%gB5-0l4nN!f>3cn~bWFrjERY=z*xa>SZ33}$Y{XK`!8}Fl`qM7R;(gJ3 zF{dX=G>G1kC5lMnS0&dYg$l1{?O}_$011qZ+^+B%n!c%{`yvxDG~rWy4yD6B##38Y zNwJTdxqM%%T^bsO@sf^z7XlExd(fhFOl^LY^SsyaW28QIJc#+cscmRW8mW5W7vpgB&!8}F)jU?ZW&I+& T92*=dcrx|WIwfyX_xq5)upnIf diff --git a/ArinLog/obj/Debug/ArinLog.vbproj.FileListAbsolute.txt b/ArinLog/obj/Debug/ArinLog.vbproj.FileListAbsolute.txt index 3e9b32f..b884de1 100644 --- a/ArinLog/obj/Debug/ArinLog.vbproj.FileListAbsolute.txt +++ b/ArinLog/obj/Debug/ArinLog.vbproj.FileListAbsolute.txt @@ -102,3 +102,11 @@ C:\Source\ECO2\ECO2_170122_0003(190703)_Git\ArinLog\obj\Debug\ArinLog.Net4.pdb C:\Source\ECO2\ECO2_170122_0003(190703)_Git\ArinLog\bin\Debug\ArinLog.Net4.dll C:\Source\ECO2\ECO2_170122_0003(190703)_Git\ArinLog\bin\Debug\ArinLog.Net4.pdb C:\Source\ECO2\ECO2_170122_0003(190703)_Git\ArinLog\bin\Debug\ArinLog.Net4.xml +E:\Tinsky\Visual Basic For ENERGY\ECO2\ECO2_170122_0003(190703)_Git (2)\ArinLog\bin\Debug\ArinLog.Net4.dll +E:\Tinsky\Visual Basic For ENERGY\ECO2\ECO2_170122_0003(190703)_Git (2)\ArinLog\bin\Debug\ArinLog.Net4.pdb +E:\Tinsky\Visual Basic For ENERGY\ECO2\ECO2_170122_0003(190703)_Git (2)\ArinLog\bin\Debug\ArinLog.Net4.xml +E:\Tinsky\Visual Basic For ENERGY\ECO2\ECO2_170122_0003(190703)_Git (2)\ArinLog\obj\Debug\ArinLog.Resources.resources +E:\Tinsky\Visual Basic For ENERGY\ECO2\ECO2_170122_0003(190703)_Git (2)\ArinLog\obj\Debug\ArinLog.vbproj.GenerateResource.Cache +E:\Tinsky\Visual Basic For ENERGY\ECO2\ECO2_170122_0003(190703)_Git (2)\ArinLog\obj\Debug\ArinLog.Net4.dll +E:\Tinsky\Visual Basic For ENERGY\ECO2\ECO2_170122_0003(190703)_Git (2)\ArinLog\obj\Debug\ArinLog.Net4.xml +E:\Tinsky\Visual Basic For ENERGY\ECO2\ECO2_170122_0003(190703)_Git (2)\ArinLog\obj\Debug\ArinLog.Net4.pdb diff --git a/ArinLog/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/ArinLog/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 991693cc35b9f79234637512aa926eb85e4ce50e..a9f8dedc923d929b6ec8bfee7a91b60e85cd6219 100644 GIT binary patch delta 202 zcmZ3gGfj8Heh%ekMpvttkj%W|?8=z1%;M6-90jMu;>=_PxBManS3lPv_sGeLTuLko l8b+FvUvpej${|7hTTU%f)Ngj?`o*CXMZ5)@Gllms0RV;+K;-}c delta 81 zcmbQHyHsbxeh#j5XRDat{L-T2)Ja@QlQ}rAaRs1=sBvkbifo?2^^1ec4q4IWTf%#o E0BIc?wEzGB diff --git a/ArinWarev1/ECO2_2016.vbproj b/ArinWarev1/ECO2_2016.vbproj index 7f4a7a4..4000907 100644 --- a/ArinWarev1/ECO2_2016.vbproj +++ b/ArinWarev1/ECO2_2016.vbproj @@ -57,7 +57,7 @@ full true true - c:\eco2\debug_2016\ + ..\..\..\..\..\eco2\debug_2016\ 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42353,42354,42355 @@ -81,25 +81,25 @@ MDI=true - + True - + True - + True - + True - + True - + True - + True diff --git a/ArinWarev1/Forms_Basic/Frm_Intro.vb b/ArinWarev1/Forms_Basic/Frm_Intro.vb index 2fa3008..dd76e47 100644 --- a/ArinWarev1/Forms_Basic/Frm_Intro.vb +++ b/ArinWarev1/Forms_Basic/Frm_Intro.vb @@ -92,10 +92,10 @@ UseriNfo = New ArinLogin.ArinLOgin.User_Info() UseriNfo.authtype = "IP" UseriNfo.name = tb_id.Text - 'ElseIf tb_id.Text.StartsWith("user") Then - ' UseriNfo = New ArinLogin.ArinLOgin.User_Info() - ' UseriNfo.authtype = "IP" - ' UseriNfo.name = tb_id.Text + ElseIf tb_id.Text.StartsWith("user") Then + UseriNfo = New ArinLogin.ArinLOgin.User_Info() + UseriNfo.authtype = "IP" + UseriNfo.name = tb_id.Text Else Work_msg("서버 응답을 기다리는중") Dim L As New ArinLogin.ArinLOgin @@ -110,7 +110,7 @@ Select Case UseriNfo.authtype Case "IP" - If Me.tb_id.Text.ToLower() <> "guest" Then 'AndAlso Not Me.tb_id.Text.ToLower().StartsWith("user") Then + If Me.tb_id.Text.ToLower() <> "guest" AndAlso Not Me.tb_id.Text.ToLower().StartsWith("user") Then If Prj.CUrIP.ToUpper <> UseriNfo.authip.ToUpper Then MsgBox("로그인사용자와 현재컴퓨터의 IP가 일치하지않습니다", MsgBoxStyle.Critical, "확인") Return @@ -120,17 +120,24 @@ Dim userPass As String Dim userMAC As String Dim userIP As String - userMAC = Prj.CUrMac.GetHashCode + + + If Me.tb_id.Text.ToLower().StartsWith("user") Then + userMAC = ("USER" & Prj.CUrMac.Substring(4)).GetHashCode + Else + userMAC = Prj.CUrMac.GetHashCode + End If + userIP = Prj.CUrIP.GetHashCode userPass = userIP + userMAC userPass = userPass.GetHashCode If CLng(userPass) < 0 Then userPass = (CLng(userPass) * -1).ToString End If - 'If Me.tb_pw.Text <> userPass Then - ' MsgBox("존재하지 않는계정이거나 비밀번호오류입니다", MsgBoxStyle.Critical, "확인") - ' End - 'End If + If tb_id.Text.ToLower().StartsWith("user") AndAlso Me.tb_pw.Text <> userPass Then + MsgBox("존재하지 않는계정이거나 비밀번호오류입니다", MsgBoxStyle.Critical, "확인") + End + End If Catch ex As Exception MsgBox("존재하지 않는계정이거나 비밀번호오류입니다", MsgBoxStyle.Critical, "확인") End @@ -161,8 +168,8 @@ Prj.UserPass = Me.tb_pw.Text If Me.tb_id.Text.ToLower() = "guest" Then Prj.UserAuthType = "BOTH0" - 'ElseIf Me.tb_id.Text.ToLower().StartsWith("user") Then - ' Prj.UserAuthType = "BOTH" + ElseIf Me.tb_id.Text.ToLower().StartsWith("user") Then + Prj.UserAuthType = "BOTH" Else Prj.UserAuthType = UseriNfo.authtype End If diff --git a/ArinWarev1/Forms_Input/Frm_Desc.vb b/ArinWarev1/Forms_Input/Frm_Desc.vb index 7990a47..64572c6 100644 --- a/ArinWarev1/Forms_Input/Frm_Desc.vb +++ b/ArinWarev1/Forms_Input/Frm_Desc.vb @@ -113,7 +113,7 @@ Me.bs.MoveFirst() End Try - If Not (Prj.UserId.ToLower() = "guest" OrElse Prj.UserAuthType = "ADMIN" OrElse Prj.UserAuthType = "BOTH" OrElse Prj.UserAuthType = "BOTH2" OrElse Prj.UserAuthType = "BOTH1") Then '//2011.03.08 추가 + If Not (Prj.UserId.ToLower() = "guest" OrElse Prj.UserId.ToLower().StartsWith("user") OrElse Prj.UserAuthType = "ADMIN" OrElse Prj.UserAuthType = "BOTH" OrElse Prj.UserAuthType = "BOTH2" OrElse Prj.UserAuthType = "BOTH1") Then '//2011.03.08 추가 Dim MyVersion As String '= Format(My.Application.Info.Version.Minor, "0000") & Format(My.Application.Info.Version.Build, "0000") Dim L As New ArinLogin.ArinLOgin Dim VersionInfo As ArinLogin.ArinLOgin.sVersionInfo = Nothing @@ -177,12 +177,12 @@ End Try Else If Not Prj.UserId.ToLower() = "guest" Then - + '//서버업데이트기능 숨김 Me.LinkLabel1.Visible = True Me.LinkLabel2.Visible = True Me.LinkLabel3.Visible = True End If - End If + End If AddHandler DSET1.tbl_Desc.ColumnChanging, AddressOf AddNewDataRow_Zone_Changed2 diff --git a/ArinWarev1/MdiMain.vb b/ArinWarev1/MdiMain.vb index 5ec3237..f92e767 100644 --- a/ArinWarev1/MdiMain.vb +++ b/ArinWarev1/MdiMain.vb @@ -149,7 +149,7 @@ Public Class MdiMain End Select Try - If Not Prj.UserId.ToLower().StartsWith("guest") Then + If Not Prj.UserId.ToLower().StartsWith("guest") AndAlso Not Prj.UserId.ToLower().StartsWith("user") Then Work_msg("α׷ Ȯ") If Prj.UserAuthType = "ADMIN" OrElse Prj.UserAuthType = "BOTH" OrElse Prj.UserAuthType = "BOTH2" OrElse Prj.UserAuthType = "BOTH1" Then '//2011.03.09 ߰ VersionInfo = L.Get_LastVersion("E") '// µ eco ٲ߰ ^^ ڸ ֵ սô! @@ -834,7 +834,7 @@ Public Class MdiMain End Try pLog.Add(String.Format("ڵ = {0}", MyVersion)) - If Prj.UserId.ToLower() <> "guest" Then '//191020 + If Prj.UserId.ToLower() <> "guest" AndAlso Not Prj.UserId.ToLower().StartsWith("user") Then '//191020 Try VersionInfo = L.Get_LastVersion("C2") '// µ eco ٲ߰ ^^ ڸ ֵ սô! @@ -870,7 +870,7 @@ Public Class MdiMain pLog.Add(String.Format("ǥϹ = {0}", MyVersion)) - If Prj.UserId.ToLower() <> "guest" Then '//191020 + If Prj.UserId.ToLower() <> "guest" AndAlso Not Prj.UserId.ToLower().StartsWith("user") Then '//191020 Try VersionInfo = L.Get_LastVersion("P2") '// µ eco ٲ߰ ^^ ڸ ֵ սô! If VersionInfo.Ver <> "0" AndAlso (CInt(VersionInfo.Ver) > CInt(MyVersion)) Then '//0 ų ̹Ƿ Ѿ. @@ -905,7 +905,7 @@ Public Class MdiMain End Try pLog.Add(String.Format("͹ = {0}", MyVersion)) - If Prj.UserId.ToLower() <> "guest" Then '//191020 + If Prj.UserId.ToLower() <> "guest" AndAlso Not Prj.UserId.ToLower().StartsWith("user") Then '//191020 Try 'MyVersion = DSET1.tbl_Desc.Rows(0)("versionw").ToString VersionInfo = L.Get_LastVersion("W2") '// µ eco ٲ߰ ^^ ڸ ֵ սô! @@ -1327,19 +1327,26 @@ ENDSTAT: '// Prj.Admin = True Prj.Password = "" '//ȣ ⺻Ǿ - For Each A As Net.NetworkInformation.NetworkInterface In ArinNet.MyNet.GetMacArray - If A.NetworkInterfaceType <> Net.NetworkInformation.NetworkInterfaceType.Loopback Then - Prj.CUrMac = A.GetPhysicalAddress.ToString - End If - Next + Try + For Each A As Net.NetworkInformation.NetworkInterface In ArinNet.MyNet.GetMacArray + If A.NetworkInterfaceType <> Net.NetworkInformation.NetworkInterfaceType.Loopback Then + Prj.CUrMac = A.GetPhysicalAddress.ToString + End If + Next + Dim ipentry As Net.IPHostEntry = System.Net.Dns.GetHostEntry(System.Net.Dns.GetHostName) + For Each C As Net.IPAddress In ipentry.AddressList + If C.ToString.Length <= 15 AndAlso C.ToString.Length > 4 Then + Prj.CUrIP = C.ToString + Exit For + End If + Next + Catch ex As Exception + Prj.CUrMac = "NOMAC" + Prj.CUrIP = "127.0.0.1" + End Try - Dim ipentry As Net.IPHostEntry = System.Net.Dns.GetHostEntry(System.Net.Dns.GetHostName) - For Each C As Net.IPAddress In ipentry.AddressList - If C.ToString.Length <= 15 AndAlso C.ToString.Length > 4 Then - Prj.CUrIP = C.ToString - Exit For - End If - Next + + '//͵丮 ȮѴ ̰ ͺ̽ Ÿ ϰѴ '//̴ ͳݼġǰ ⋚̴ diff --git a/ArinWarev1/My Project/licenses.licx b/ArinWarev1/My Project/licenses.licx index 3cc5b63..b6d55c1 100644 --- a/ArinWarev1/My Project/licenses.licx +++ b/ArinWarev1/My Project/licenses.licx @@ -1 +1 @@ -FarPoint.Win.Spread.FpSpread, FarPoint.Win.Spread, Version=5.0.3505.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457 +FarPoint.Win.Spread.FpSpread, FarPoint.Win.Spread, Version=5.0.3518.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457