diff --git a/ArinLog/bin/Debug/ArinLog.Net4.dll b/ArinLog/bin/Debug/ArinLog.Net4.dll index 7c1b2a5..0b8be30 100644 Binary files a/ArinLog/bin/Debug/ArinLog.Net4.dll and b/ArinLog/bin/Debug/ArinLog.Net4.dll differ diff --git a/ArinLog/bin/Debug/ArinLog.Net4.pdb b/ArinLog/bin/Debug/ArinLog.Net4.pdb index 2269fc0..0188d0e 100644 Binary files a/ArinLog/bin/Debug/ArinLog.Net4.pdb and b/ArinLog/bin/Debug/ArinLog.Net4.pdb differ diff --git a/ArinLog/obj/Debug/ArinLog.Net4.dll b/ArinLog/obj/Debug/ArinLog.Net4.dll index 7c1b2a5..0b8be30 100644 Binary files a/ArinLog/obj/Debug/ArinLog.Net4.dll and b/ArinLog/obj/Debug/ArinLog.Net4.dll differ diff --git a/ArinLog/obj/Debug/ArinLog.Net4.pdb b/ArinLog/obj/Debug/ArinLog.Net4.pdb index 2269fc0..0188d0e 100644 Binary files a/ArinLog/obj/Debug/ArinLog.Net4.pdb and b/ArinLog/obj/Debug/ArinLog.Net4.pdb differ 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 991693c..a9f8ded 100644 Binary files a/ArinLog/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/ArinLog/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ 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