KICT/ECO2
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

user 계정 권한 입력 - 오프라인으로 BOTH 로 적용

Browse Source
This commit is contained in:
chi
2020-01-09 00:07:35 +09:00
parent a444193a53
commit db5c273a18
11 changed files with 62 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
ArinLog/bin/Debug/ArinLog.Net4.dll
View File

Binary file not shown.

BIN
ArinLog/bin/Debug/ArinLog.Net4.pdb
View File

Binary file not shown.

BIN
ArinLog/obj/Debug/ArinLog.Net4.dll
View File

Binary file not shown.

BIN
ArinLog/obj/Debug/ArinLog.Net4.pdb
View File

Binary file not shown.

8
ArinLog/obj/Debug/ArinLog.vbproj.FileListAbsolute.txt
View File

@@ -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.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.pdb
C:\Source\ECO2\ECO2_170122_0003(190703)_Git\ArinLog\bin\Debug\ArinLog.Net4.xml 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

BIN
ArinLog/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

16
ArinWarev1/ECO2_2016.vbproj
View File

@@ -57,7 +57,7 @@
<DebugType>full</DebugType> <DebugType>full</DebugType>
<DefineDebug>true</DefineDebug> <DefineDebug>true</DefineDebug>
<DefineTrace>true</DefineTrace> <DefineTrace>true</DefineTrace>
<OutputPath>c:\eco2\debug_2016\</OutputPath> <OutputPath>..\..\..\..\..\eco2\debug_2016\</OutputPath>
<DocumentationFile> <DocumentationFile>
</DocumentationFile> </DocumentationFile>
<NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42353,42354,42355</NoWarn> <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42353,42354,42355</NoWarn>
@@ -81,25 +81,25 @@
<DefineConstants>MDI=true</DefineConstants> <DefineConstants>MDI=true</DefineConstants>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="FarPoint.CalcEngine, Version=5.0.3505.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457"> <Reference Include="FarPoint.CalcEngine, Version=5.0.3518.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457">
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="FarPoint.Excel, Version=5.0.3505.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457"> <Reference Include="FarPoint.Excel, Version=5.0.3518.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457">
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="FarPoint.PDF, Version=5.0.3505.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457"> <Reference Include="FarPoint.PDF, Version=5.0.3518.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457">
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="FarPoint.PluginCalendar.WinForms, Version=5.0.3505.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457"> <Reference Include="FarPoint.PluginCalendar.WinForms, Version=5.0.3518.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457">
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="FarPoint.Win, Version=5.0.3505.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457"> <Reference Include="FarPoint.Win, Version=5.0.3518.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457">
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="FarPoint.Win.Chart, Version=5.0.3505.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457"> <Reference Include="FarPoint.Win.Chart, Version=5.0.3518.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457">
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="FarPoint.Win.Spread, Version=5.0.3505.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457, processorArchitecture=MSIL"> <Reference Include="FarPoint.Win.Spread, Version=5.0.3518.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457, processorArchitecture=MSIL">
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="Interop.Excel, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Interop.Excel, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">

31
ArinWarev1/Forms_Basic/Frm_Intro.vb
View File

@@ -92,10 +92,10 @@
UseriNfo = New ArinLogin.ArinLOgin.User_Info() UseriNfo = New ArinLogin.ArinLOgin.User_Info()
UseriNfo.authtype = "IP" UseriNfo.authtype = "IP"
UseriNfo.name = tb_id.Text UseriNfo.name = tb_id.Text
'ElseIf tb_id.Text.StartsWith("user") Then ElseIf tb_id.Text.StartsWith("user") Then
' UseriNfo = New ArinLogin.ArinLOgin.User_Info() UseriNfo = New ArinLogin.ArinLOgin.User_Info()
' UseriNfo.authtype = "IP" UseriNfo.authtype = "IP"
' UseriNfo.name = tb_id.Text UseriNfo.name = tb_id.Text
Else Else
Work_msg("서버 응답을 기다리는중") Work_msg("서버 응답을 기다리는중")
Dim L As New ArinLogin.ArinLOgin Dim L As New ArinLogin.ArinLOgin
@@ -110,7 +110,7 @@
Select Case UseriNfo.authtype Select Case UseriNfo.authtype
Case "IP" 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 If Prj.CUrIP.ToUpper <> UseriNfo.authip.ToUpper Then
MsgBox("로그인사용자와 현재컴퓨터의 IP가 일치하지않습니다", MsgBoxStyle.Critical, "확인") MsgBox("로그인사용자와 현재컴퓨터의 IP가 일치하지않습니다", MsgBoxStyle.Critical, "확인")
Return Return
@@ -120,17 +120,24 @@
Dim userPass As String Dim userPass As String
Dim userMAC As String Dim userMAC As String
Dim userIP 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 userIP = Prj.CUrIP.GetHashCode
userPass = userIP + userMAC userPass = userIP + userMAC
userPass = userPass.GetHashCode userPass = userPass.GetHashCode
If CLng(userPass) < 0 Then If CLng(userPass) < 0 Then
userPass = (CLng(userPass) * -1).ToString userPass = (CLng(userPass) * -1).ToString
End If End If
'If Me.tb_pw.Text <> userPass Then If tb_id.Text.ToLower().StartsWith("user") AndAlso Me.tb_pw.Text <> userPass Then
' MsgBox("존재하지 않는계정이거나 비밀번호오류입니다", MsgBoxStyle.Critical, "확인") MsgBox("존재하지 않는계정이거나 비밀번호오류입니다", MsgBoxStyle.Critical, "확인")
' End End
'End If End If
Catch ex As Exception Catch ex As Exception
MsgBox("존재하지 않는계정이거나 비밀번호오류입니다", MsgBoxStyle.Critical, "확인") MsgBox("존재하지 않는계정이거나 비밀번호오류입니다", MsgBoxStyle.Critical, "확인")
End End
@@ -161,8 +168,8 @@
Prj.UserPass = Me.tb_pw.Text Prj.UserPass = Me.tb_pw.Text
If Me.tb_id.Text.ToLower() = "guest" Then If Me.tb_id.Text.ToLower() = "guest" Then
Prj.UserAuthType = "BOTH0" Prj.UserAuthType = "BOTH0"
'ElseIf Me.tb_id.Text.ToLower().StartsWith("user") Then ElseIf Me.tb_id.Text.ToLower().StartsWith("user") Then
' Prj.UserAuthType = "BOTH" Prj.UserAuthType = "BOTH"
Else Else
Prj.UserAuthType = UseriNfo.authtype Prj.UserAuthType = UseriNfo.authtype
End If End If

6
ArinWarev1/Forms_Input/Frm_Desc.vb
View File

@@ -113,7 +113,7 @@
Me.bs.MoveFirst() Me.bs.MoveFirst()
End Try 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 MyVersion As String '= Format(My.Application.Info.Version.Minor, "0000") & Format(My.Application.Info.Version.Build, "0000")
Dim L As New ArinLogin.ArinLOgin Dim L As New ArinLogin.ArinLOgin
Dim VersionInfo As ArinLogin.ArinLOgin.sVersionInfo = Nothing Dim VersionInfo As ArinLogin.ArinLOgin.sVersionInfo = Nothing
@@ -177,12 +177,12 @@
End Try End Try
Else Else
If Not Prj.UserId.ToLower() = "guest" Then If Not Prj.UserId.ToLower() = "guest" Then
'//서버업데이트기능 숨김
Me.LinkLabel1.Visible = True Me.LinkLabel1.Visible = True
Me.LinkLabel2.Visible = True Me.LinkLabel2.Visible = True
Me.LinkLabel3.Visible = True Me.LinkLabel3.Visible = True
End If End If
End If End If
AddHandler DSET1.tbl_Desc.ColumnChanging, AddressOf AddNewDataRow_Zone_Changed2 AddHandler DSET1.tbl_Desc.ColumnChanging, AddressOf AddNewDataRow_Zone_Changed2

39
ArinWarev1/MdiMain.vb
View File

@@ -149,7 +149,7 @@ Public Class MdiMain
End Select End Select
Try 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("프로그램 버젼확인중") Work_msg("프로그램 버젼확인중")
If Prj.UserAuthType = "ADMIN" OrElse Prj.UserAuthType = "BOTH" OrElse Prj.UserAuthType = "BOTH2" OrElse Prj.UserAuthType = "BOTH1" Then '//2011.03.09 추가 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 버젼만 가져오게 바꺼야겟죵 ^^ 구분자를 넣도록 합시닷! VersionInfo = L.Get_LastVersion("E") '//버젼을 가져오는데 eco 버젼만 가져오게 바꺼야겟죵 ^^ 구분자를 넣도록 합시닷!
@@ -834,7 +834,7 @@ Public Class MdiMain
End Try End Try
pLog.Add(String.Format("공용코드버젼 = {0}", MyVersion)) 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 Try
VersionInfo = L.Get_LastVersion("C2") '//버젼을 가져오는데 eco 버젼만 가져오게 바꺼야겟죵 ^^ 구분자를 넣도록 합시닷! VersionInfo = L.Get_LastVersion("C2") '//버젼을 가져오는데 eco 버젼만 가져오게 바꺼야겟죵 ^^ 구분자를 넣도록 합시닷!
@@ -870,7 +870,7 @@ Public Class MdiMain
pLog.Add(String.Format("표준프로파일버젼 = {0}", MyVersion)) 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 Try
VersionInfo = L.Get_LastVersion("P2") '//버젼을 가져오는데 eco 버젼만 가져오게 바꺼야겟죵 ^^ 구분자를 넣도록 합시닷! VersionInfo = L.Get_LastVersion("P2") '//버젼을 가져오는데 eco 버젼만 가져오게 바꺼야겟죵 ^^ 구분자를 넣도록 합시닷!
If VersionInfo.Ver <> "0" AndAlso (CInt(VersionInfo.Ver) > CInt(MyVersion)) Then '//0은 없거나 관리안함의 뜻이므로 넘어간다. If VersionInfo.Ver <> "0" AndAlso (CInt(VersionInfo.Ver) > CInt(MyVersion)) Then '//0은 없거나 관리안함의 뜻이므로 넘어간다.
@@ -905,7 +905,7 @@ Public Class MdiMain
End Try End Try
pLog.Add(String.Format("기상데이터버젼 = {0}", MyVersion)) 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 Try
'MyVersion = DSET1.tbl_Desc.Rows(0)("versionw").ToString 'MyVersion = DSET1.tbl_Desc.Rows(0)("versionw").ToString
VersionInfo = L.Get_LastVersion("W2") '//버젼을 가져오는데 eco 버젼만 가져오게 바꺼야겟죵 ^^ 구분자를 넣도록 합시닷! VersionInfo = L.Get_LastVersion("W2") '//버젼을 가져오는데 eco 버젼만 가져오게 바꺼야겟죵 ^^ 구분자를 넣도록 합시닷!
@@ -1327,19 +1327,26 @@ ENDSTAT: '//
Prj.Admin = True Prj.Admin = True
Prj.Password = "" '//암호는 기본해제되어있음 Prj.Password = "" '//암호는 기본해제되어있음
For Each A As Net.NetworkInformation.NetworkInterface In ArinNet.MyNet.GetMacArray Try
If A.NetworkInterfaceType <> Net.NetworkInformation.NetworkInterfaceType.Loopback Then For Each A As Net.NetworkInformation.NetworkInterface In ArinNet.MyNet.GetMacArray
Prj.CUrMac = A.GetPhysicalAddress.ToString If A.NetworkInterfaceType <> Net.NetworkInformation.NetworkInterfaceType.Loopback Then
End If Prj.CUrMac = A.GetPhysicalAddress.ToString
Next 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
'//데이터디렉토리정보를 확인한다 이곳에서 데이터베이스및 기타 설정파일을 저장하게한다 '//데이터디렉토리정보를 확인한다 이곳에서 데이터베이스및 기타 설정파일을 저장하게한다
'//이는 인터넷설치버젼의경우 사용자폴더로 들어가기떄문이다 '//이는 인터넷설치버젼의경우 사용자폴더로 들어가기떄문이다

2
ArinWarev1/My Project/licenses.licx
View File

@@ -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