Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
cdy816
Mars
提交
0a1b7b8f
Mars
项目概览
cdy816
/
Mars
通知
3
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Mars
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
0a1b7b8f
编写于
9月 07, 2020
作者:
cdy816
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
完善DBDevelopService WebApi接口
上级
0736789e
变更
15
展开全部
隐藏空白更改
内联
并排
Showing
15 changed file
with
2555 addition
and
48 deletion
+2555
-48
Develop/DBDevelopClientWebApi/Database.cs
Develop/DBDevelopClientWebApi/Database.cs
+129
-5
Develop/DBDevelopClientWebApi/DatabaseUser.cs
Develop/DBDevelopClientWebApi/DatabaseUser.cs
+157
-0
Develop/DBDevelopClientWebApi/DevelopServiceHelper.cs
Develop/DBDevelopClientWebApi/DevelopServiceHelper.cs
+986
-9
Develop/DBDevelopClientWebApi/RequestBase.cs
Develop/DBDevelopClientWebApi/RequestBase.cs
+87
-8
Develop/DBDevelopClientWebApi/SystemUser.cs
Develop/DBDevelopClientWebApi/SystemUser.cs
+82
-0
Develop/DBDevelopService/Controllers/Database.cs
Develop/DBDevelopService/Controllers/Database.cs
+127
-2
Develop/DBDevelopService/Controllers/DatabaseUser.cs
Develop/DBDevelopService/Controllers/DatabaseUser.cs
+157
-0
Develop/DBDevelopService/Controllers/DevelopServerController.cs
...p/DBDevelopService/Controllers/DevelopServerController.cs
+626
-17
Develop/DBDevelopService/Controllers/RequestBase.cs
Develop/DBDevelopService/Controllers/RequestBase.cs
+57
-2
Develop/DBDevelopService/Controllers/SystemUser.cs
Develop/DBDevelopService/Controllers/SystemUser.cs
+82
-0
Develop/DBDevelopService/Security/UserDocument.cs
Develop/DBDevelopService/Security/UserDocument.cs
+3
-2
Develop/DBDevelopService/Services/DevelopServerService.cs
Develop/DBDevelopService/Services/DevelopServerService.cs
+2
-2
Develop/DBStudio/Properties/launchSettings.json
Develop/DBStudio/Properties/launchSettings.json
+1
-1
Example/Develop/DevelopWebApiDemo/MainWindow.xaml
Example/Develop/DevelopWebApiDemo/MainWindow.xaml
+6
-0
Example/Develop/DevelopWebApiDemo/MainWindow.xaml.cs
Example/Develop/DevelopWebApiDemo/MainWindow.xaml.cs
+53
-0
未找到文件。
Develop/DBDevelopClientWebApi/Database.cs
浏览文件 @
0a1b7b8f
using
System
;
using
Cdy.Tag
;
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Threading.Tasks
;
namespace
DBDevelopClientWebApi
{
/// <summary>
///
/// </summary>
public
class
Database
{
public
string
Name
{
get
;
set
;
}
...
...
@@ -21,19 +25,139 @@ namespace DBDevelopClientWebApi
public
string
Parent
{
get
;
set
;
}
}
/// <summary>
///
/// </summary>
public
class
WebApiTag
{
/// <summary>
///
/// </summary>
public
Cdy
.
Tag
.
Tagbase
RealTag
{
get
;
set
;
}
public
WebApiRealTag
RealTag
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
Cdy
.
Tag
.
HisTag
HisTag
{
get
;
set
;
}
}
public
class
WebApiRealTag
{
public
int
Id
{
get
;
set
;
}
public
string
Name
{
get
;
set
;
}
public
int
Type
{
get
;
set
;
}
public
string
Group
{
get
;
set
;
}
public
string
Desc
{
get
;
set
;
}
public
string
LinkAddress
{
get
;
set
;
}
public
int
ReadWriteType
{
get
;
set
;
}
public
string
Convert
{
get
;
set
;
}
public
double
MaxValue
{
get
;
set
;
}
public
double
MinValue
{
get
;
set
;
}
public
byte
Precision
{
get
;
set
;
}
/// <summary>
///
/// </summary>
/// <param name="realtag"></param>
/// <returns></returns>
public
static
WebApiRealTag
CreatFromTagbase
(
Tagbase
realtag
)
{
WebApiRealTag
tag
=
new
WebApiRealTag
();
tag
.
CloneFromRealTag
(
realtag
);
return
tag
;
}
/// <summary>
///
/// </summary>
/// <param name="realtag"></param>
public
void
CloneFromRealTag
(
Tagbase
realtag
)
{
this
.
Id
=
realtag
.
Id
;
this
.
Name
=
realtag
.
Name
;
this
.
Type
=
(
byte
)
realtag
.
Type
;
this
.
Group
=
realtag
.
Group
;
this
.
Desc
=
realtag
.
Desc
;
this
.
LinkAddress
=
realtag
.
LinkAddress
;
this
.
ReadWriteType
=
(
int
)
realtag
.
ReadWriteType
;
this
.
Convert
=
realtag
.
Conveter
!=
null
?
realtag
.
Conveter
.
SeriseToString
()
:
""
;
if
(
realtag
is
NumberTagBase
)
{
this
.
MaxValue
=
(
realtag
as
NumberTagBase
).
MaxValue
;
this
.
MinValue
=
(
realtag
as
NumberTagBase
).
MinValue
;
}
if
(
realtag
is
FloatingTagBase
)
{
this
.
Precision
=
(
realtag
as
FloatingTagBase
).
Precision
;
}
}
public
Tagbase
ConvertToTagbase
()
{
Cdy
.
Tag
.
Tagbase
re
=
null
;
switch
(
this
.
Type
)
{
case
(
int
)(
Cdy
.
Tag
.
TagType
.
Bool
):
re
=
new
Cdy
.
Tag
.
BoolTag
();
break
;
case
(
int
)(
Cdy
.
Tag
.
TagType
.
Byte
):
re
=
new
Cdy
.
Tag
.
ByteTag
();
break
;
case
(
int
)(
Cdy
.
Tag
.
TagType
.
DateTime
):
re
=
new
Cdy
.
Tag
.
DateTimeTag
();
break
;
case
(
int
)(
Cdy
.
Tag
.
TagType
.
Double
):
re
=
new
Cdy
.
Tag
.
DoubleTag
();
break
;
case
(
int
)(
Cdy
.
Tag
.
TagType
.
Float
):
re
=
new
Cdy
.
Tag
.
FloatTag
();
break
;
case
(
int
)(
Cdy
.
Tag
.
TagType
.
Int
):
re
=
new
Cdy
.
Tag
.
IntTag
();
break
;
case
(
int
)(
Cdy
.
Tag
.
TagType
.
UInt
):
re
=
new
Cdy
.
Tag
.
UIntTag
();
break
;
case
(
int
)(
Cdy
.
Tag
.
TagType
.
ULong
):
re
=
new
Cdy
.
Tag
.
ULongTag
();
break
;
case
(
int
)(
Cdy
.
Tag
.
TagType
.
UShort
):
re
=
new
Cdy
.
Tag
.
UShortTag
();
break
;
case
(
int
)(
Cdy
.
Tag
.
TagType
.
Long
):
re
=
new
Cdy
.
Tag
.
LongTag
();
break
;
case
(
int
)(
Cdy
.
Tag
.
TagType
.
Short
):
re
=
new
Cdy
.
Tag
.
ShortTag
();
break
;
case
(
int
)(
Cdy
.
Tag
.
TagType
.
String
):
re
=
new
Cdy
.
Tag
.
StringTag
();
break
;
}
if
(
re
!=
null
)
{
re
.
Name
=
this
.
Name
;
re
.
LinkAddress
=
this
.
LinkAddress
;
re
.
Group
=
this
.
Group
;
re
.
Desc
=
this
.
Desc
;
re
.
Id
=
(
int
)
this
.
Id
;
re
.
ReadWriteType
=
(
Cdy
.
Tag
.
ReadWriteMode
)
this
.
ReadWriteType
;
if
(!
string
.
IsNullOrEmpty
(
this
.
Convert
))
{
re
.
Conveter
=
this
.
Convert
.
DeSeriseToValueConvert
();
}
if
(
re
is
Cdy
.
Tag
.
NumberTagBase
)
{
(
re
as
Cdy
.
Tag
.
NumberTagBase
).
MaxValue
=
this
.
MaxValue
;
(
re
as
Cdy
.
Tag
.
NumberTagBase
).
MinValue
=
this
.
MinValue
;
}
if
(
re
is
Cdy
.
Tag
.
FloatingTagBase
)
{
(
re
as
Cdy
.
Tag
.
FloatingTagBase
).
Precision
=
(
byte
)
this
.
Precision
;
}
}
return
re
;
}
}
}
Develop/DBDevelopClientWebApi/DatabaseUser.cs
0 → 100644
浏览文件 @
0a1b7b8f
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Threading.Tasks
;
namespace
DBDevelopClientWebApi
{
/// <summary>
///
/// </summary>
public
class
WebApiUserGroup
{
public
string
Name
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
string
Parent
{
get
;
set
;
}
}
/// <summary>
///
/// </summary>
public
class
WebApiUserGroupRequest
:
WebApiDatabaseRequest
{
public
string
Name
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
string
Parent
{
get
;
set
;
}
}
/// <summary>
///
/// </summary>
public
class
WebApiMoveUserGroupRequest
:
WebApiDatabaseRequest
{
public
string
Name
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
string
OldParentName
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
string
NewParentName
{
get
;
set
;
}
}
/// <summary>
///
/// </summary>
public
class
WebApiRenameUserGroupRequest
:
WebApiDatabaseRequest
{
public
string
NewName
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
string
OldFullName
{
get
;
set
;
}
}
/// <summary>
///
/// </summary>
public
class
WebApiRequestByUserGroup
:
WebApiDatabaseRequest
{
public
string
GroupFullName
{
get
;
set
;
}
}
/// <summary>
///
/// </summary>
public
class
WebApiNewDatabasePermissionRequest
:
WebApiDatabaseRequest
{
/// <summary>
///
/// </summary>
public
string
Name
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
string
Desc
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
bool
EnableWrite
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
bool
SuperPermission
{
get
;
set
;
}
/// <summary>
/// 访问的变量
/// </summary>
public
List
<
string
>
Group
{
get
;
set
;
}
}
/// <summary>
///
/// </summary>
public
class
WebApiRemoveDatabasePermissionRequest
:
WebApiDatabaseRequest
{
public
string
Permission
{
get
;
set
;
}
}
public
class
WebApiUserRequest
:
WebApiDatabaseRequest
{
public
string
UserName
{
get
;
set
;
}
}
public
class
WebApiUserAndPassword
:
WebApiUserRequest
{
public
string
Password
{
get
;
set
;
}
}
/// <summary>
///
/// </summary>
public
class
WebApiUserInfo
:
WebApiUserAndPassword
{
/// <summary>
///
/// </summary>
public
string
Group
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
List
<
string
>
Permissions
{
get
;
set
;
}
}
public
class
WebApiUserInfoWithoutPassword
:
WebApiUserRequest
{
/// <summary>
///
/// </summary>
public
string
Group
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
List
<
string
>
Permissions
{
get
;
set
;
}
}
}
Develop/DBDevelopClientWebApi/DevelopServiceHelper.cs
浏览文件 @
0a1b7b8f
此差异已折叠。
点击以展开。
Develop/DBDevelopClientWebApi/RequestBase.cs
浏览文件 @
0a1b7b8f
...
...
@@ -6,11 +6,6 @@ using System.Threading.Tasks;
namespace
DBDevelopClientWebApi
{
public
class
RequestBase
{
public
string
Id
{
get
;
set
;
}
}
/// <summary>
///
/// </summary>
...
...
@@ -51,6 +46,14 @@ namespace DBDevelopClientWebApi
#
endregion
...
Interfaces
...
}
/// <summary>
///
/// </summary>
public
class
RequestBase
{
public
string
Id
{
get
;
set
;
}
}
/// <summary>
///
/// </summary>
...
...
@@ -106,7 +109,7 @@ namespace DBDevelopClientWebApi
/// <summary>
///
/// </summary>
public
class
NewDatabaseRequest
:
WebApiDatabaseRequest
public
class
WebApi
NewDatabaseRequest
:
WebApiDatabaseRequest
{
/// <summary>
///
...
...
@@ -118,7 +121,7 @@ namespace DBDevelopClientWebApi
/// <summary>
///
/// </summary>
public
class
GetTagByGroupRequest
:
WebApiDatabaseRequest
public
class
WebApi
GetTagByGroupRequest
:
WebApiDatabaseRequest
{
/// <summary>
///
...
...
@@ -128,7 +131,7 @@ namespace DBDevelopClientWebApi
/// <summary>
///
/// </summary>
public
Dictionary
<
string
,
string
>
Filters
{
get
;
set
;
}
public
Dictionary
<
string
,
string
>
Filters
{
get
;
set
;
}
/// <summary>
///
...
...
@@ -136,6 +139,60 @@ namespace DBDevelopClientWebApi
public
int
Index
{
get
;
set
;
}
}
/// <summary>
///
/// </summary>
public
class
WebApiAddGroupRequest
:
WebApiDatabaseRequest
{
public
string
Name
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
string
ParentName
{
get
;
set
;
}
}
/// <summary>
///
/// </summary>
public
class
WebApiRemoveGroupRequest
:
WebApiDatabaseRequest
{
public
string
FullName
{
get
;
set
;
}
}
/// <summary>
///
/// </summary>
public
class
WebApiRenameGroupRequest
:
WebApiDatabaseRequest
{
public
string
Name
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
string
OldFullName
{
get
;
set
;
}
}
/// <summary>
///
/// </summary>
public
class
WebApiMoveTagGroupRequest
:
WebApiDatabaseRequest
{
/// <summary>
///
/// </summary>
public
string
Name
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
string
NewParentName
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
string
OldParentName
{
get
;
set
;
}
}
/// <summary>
///
/// </summary>
...
...
@@ -158,5 +215,27 @@ namespace DBDevelopClientWebApi
}
/// <summary>
///
/// </summary>
public
class
ResultResponse
<
T
>
{
/// <summary>
///
/// </summary>
public
bool
HasErro
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
T
Result
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
string
ErroMsg
{
get
;
set
;
}
}
}
Develop/DBDevelopClientWebApi/SystemUser.cs
0 → 100644
浏览文件 @
0a1b7b8f
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Threading.Tasks
;
namespace
DBDevelopClientWebApi
{
public
class
WebApiNewSystemUserRequest
:
RequestBase
{
#
region
...
Variables
...
#
endregion
...
Variables
...
#
region
...
Events
...
#
endregion
...
Events
...
#
region
...
Constructor
...
#
endregion
...
Constructor
...
#
region
...
Properties
...
public
string
UserName
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
string
Password
{
get
;
set
;
}
#
endregion
...
Properties
...
#
region
...
Methods
...
#
endregion
...
Methods
...
#
region
...
Interfaces
...
#
endregion
...
Interfaces
...
}
public
class
WebApiReNameSystemUserRequest
:
RequestBase
{
public
string
OldName
{
get
;
set
;
}
public
string
NewName
{
get
;
set
;
}
}
public
class
WebApiModifySystemUserPasswordRequest
:
RequestBase
{
public
string
UserName
{
get
;
set
;
}
public
string
Password
{
get
;
set
;
}
public
string
NewPassword
{
get
;
set
;
}
}
public
class
WebApiUpdateSystemUserRequest
:
RequestBase
{
public
string
UserName
{
get
;
set
;
}
public
bool
IsAdmin
{
get
;
set
;
}
public
bool
NewDatabasePermission
{
get
;
set
;
}
public
List
<
string
>
Databases
{
get
;
set
;
}
}
/// <summary>
///
/// </summary>
public
class
WebApiSystemUserItem
{
public
string
UserName
{
get
;
set
;
}
public
bool
IsAdmin
{
get
;
set
;
}
public
bool
NewDatabase
{
get
;
set
;
}
public
List
<
string
>
Databases
{
get
;
set
;
}
}
/// <summary>
///
/// </summary>
public
class
WebApiRemoveSystemUserRequest
:
RequestBase
{
public
string
UserName
{
get
;
set
;
}
}
}
Develop/DBDevelopService/Controllers/Database.cs
浏览文件 @
0a1b7b8f
using
System
;
using
Cdy.Tag
;
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Threading.Tasks
;
...
...
@@ -29,7 +30,7 @@ namespace DBDevelopService.Controllers
/// <summary>
///
/// </summary>
public
Cdy
.
Tag
.
Tagbase
RealTag
{
get
;
set
;
}
public
WebApiRealTag
RealTag
{
get
;
set
;
}
/// <summary>
///
...
...
@@ -37,5 +38,129 @@ namespace DBDevelopService.Controllers
public
Cdy
.
Tag
.
HisTag
HisTag
{
get
;
set
;
}
}
public
class
WebApiRealTag
{
public
int
Id
{
get
;
set
;
}
public
string
Name
{
get
;
set
;
}
public
int
Type
{
get
;
set
;
}
public
string
Group
{
get
;
set
;
}
public
string
Desc
{
get
;
set
;
}
public
string
LinkAddress
{
get
;
set
;
}
public
int
ReadWriteType
{
get
;
set
;
}
public
string
Convert
{
get
;
set
;
}
public
double
MaxValue
{
get
;
set
;
}
public
double
MinValue
{
get
;
set
;
}
public
byte
Precision
{
get
;
set
;
}
/// <summary>
///
/// </summary>
/// <param name="realtag"></param>
/// <returns></returns>
public
static
WebApiRealTag
CreatFromTagbase
(
Tagbase
realtag
)
{
WebApiRealTag
tag
=
new
WebApiRealTag
();
tag
.
CloneFromRealTag
(
realtag
);
return
tag
;
}
/// <summary>
///
/// </summary>
/// <param name="realtag"></param>
public
void
CloneFromRealTag
(
Tagbase
realtag
)
{
this
.
Id
=
realtag
.
Id
;
this
.
Name
=
realtag
.
Name
;
this
.
Type
=
(
byte
)
realtag
.
Type
;
this
.
Group
=
realtag
.
Group
;
this
.
Desc
=
realtag
.
Desc
;
this
.
LinkAddress
=
realtag
.
LinkAddress
;
this
.
ReadWriteType
=
(
int
)
realtag
.
ReadWriteType
;
this
.
Convert
=
realtag
.
Conveter
!=
null
?
realtag
.
Conveter
.
SeriseToString
()
:
""
;
if
(
realtag
is
NumberTagBase
)
{
this
.
MaxValue
=
(
realtag
as
NumberTagBase
).
MaxValue
;
this
.
MinValue
=
(
realtag
as
NumberTagBase
).
MinValue
;
}
if
(
realtag
is
FloatingTagBase
)
{
this
.
Precision
=
(
realtag
as
FloatingTagBase
).
Precision
;
}
}
public
Tagbase
ConvertToTagbase
()
{
Cdy
.
Tag
.
Tagbase
re
=
null
;
switch
(
this
.
Type
)
{
case
(
int
)(
Cdy
.
Tag
.
TagType
.
Bool
):
re
=
new
Cdy
.
Tag
.
BoolTag
();
break
;
case
(
int
)(
Cdy
.
Tag
.
TagType
.
Byte
):
re
=
new
Cdy
.
Tag
.
ByteTag
();
break
;
case
(
int
)(
Cdy
.
Tag
.
TagType
.
DateTime
):
re
=
new
Cdy
.
Tag
.
DateTimeTag
();
break
;
case
(
int
)(
Cdy
.
Tag
.
TagType
.
Double
):
re
=
new
Cdy
.
Tag
.
DoubleTag
();
break
;
case
(
int
)(
Cdy
.
Tag
.
TagType
.
Float
):
re
=
new
Cdy
.
Tag
.
FloatTag
();
break
;
case
(
int
)(
Cdy
.
Tag
.
TagType
.
Int
):
re
=
new
Cdy
.
Tag
.
IntTag
();
break
;
case
(
int
)(
Cdy
.
Tag
.
TagType
.
UInt
):
re
=
new
Cdy
.
Tag
.
UIntTag
();
break
;
case
(
int
)(
Cdy
.
Tag
.
TagType
.
ULong
):
re
=
new
Cdy
.
Tag
.
ULongTag
();
break
;
case
(
int
)(
Cdy
.
Tag
.
TagType
.
UShort
):
re
=
new
Cdy
.
Tag
.
UShortTag
();
break
;
case
(
int
)(
Cdy
.
Tag
.
TagType
.
Long
):
re
=
new
Cdy
.
Tag
.
LongTag
();
break
;
case
(
int
)(
Cdy
.
Tag
.
TagType
.
Short
):
re
=
new
Cdy
.
Tag
.
ShortTag
();
break
;
case
(
int
)(
Cdy
.
Tag
.
TagType
.
String
):
re
=
new
Cdy
.
Tag
.
StringTag
();
break
;
}
if
(
re
!=
null
)
{
re
.
Name
=
this
.
Name
;
re
.
LinkAddress
=
this
.
LinkAddress
;
re
.
Group
=
this
.
Group
;
re
.
Desc
=
this
.
Desc
;
re
.
Id
=
(
int
)
this
.
Id
;
re
.
ReadWriteType
=
(
Cdy
.
Tag
.
ReadWriteMode
)
this
.
ReadWriteType
;
if
(!
string
.
IsNullOrEmpty
(
this
.
Convert
))
{
re
.
Conveter
=
this
.
Convert
.
DeSeriseToValueConvert
();
}
if
(
re
is
Cdy
.
Tag
.
NumberTagBase
)
{
(
re
as
Cdy
.
Tag
.
NumberTagBase
).
MaxValue
=
this
.
MaxValue
;
(
re
as
Cdy
.
Tag
.
NumberTagBase
).
MinValue
=
this
.
MinValue
;
}
if
(
re
is
Cdy
.
Tag
.
FloatingTagBase
)
{
(
re
as
Cdy
.
Tag
.
FloatingTagBase
).
Precision
=
(
byte
)
this
.
Precision
;
}
}
return
re
;
}
}
}
Develop/DBDevelopService/Controllers/DatabaseUser.cs
0 → 100644
浏览文件 @
0a1b7b8f
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Threading.Tasks
;
namespace
DBDevelopService.Controllers
{
/// <summary>
///
/// </summary>
public
class
WebApiUserGroup
{
public
string
Name
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
string
Parent
{
get
;
set
;
}
}
/// <summary>
///
/// </summary>
public
class
WebApiUserGroupRequest
:
WebApiDatabaseRequest
{
public
string
Name
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
string
Parent
{
get
;
set
;
}
}
/// <summary>
///
/// </summary>
public
class
WebApiMoveUserGroupRequest
:
WebApiDatabaseRequest
{
public
string
Name
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
string
OldParentName
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
string
NewParentName
{
get
;
set
;
}
}
/// <summary>
///
/// </summary>
public
class
WebApiRenameUserGroupRequest
:
WebApiDatabaseRequest
{
public
string
NewName
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
string
OldFullName
{
get
;
set
;
}
}
/// <summary>
///
/// </summary>
public
class
WebApiRequestByUserGroup
:
WebApiDatabaseRequest
{
public
string
GroupFullName
{
get
;
set
;
}
}
/// <summary>
///
/// </summary>
public
class
WebApiNewDatabasePermissionRequest
:
WebApiDatabaseRequest
{
/// <summary>
///
/// </summary>
public
string
Name
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
string
Desc
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
bool
EnableWrite
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
bool
SuperPermission
{
get
;
set
;
}
/// <summary>
/// 访问的变量
/// </summary>
public
List
<
string
>
Group
{
get
;
set
;
}
}
/// <summary>
///
/// </summary>
public
class
WebApiRemoveDatabasePermissionRequest
:
WebApiDatabaseRequest
{
public
string
Permission
{
get
;
set
;
}
}
public
class
WebApiUserRequest
:
WebApiDatabaseRequest
{
public
string
UserName
{
get
;
set
;
}
}
public
class
WebApiUserAndPassword
:
WebApiUserRequest
{
public
string
Password
{
get
;
set
;
}
}
/// <summary>
///
/// </summary>
public
class
WebApiUserInfo
:
WebApiUserAndPassword
{
/// <summary>
///
/// </summary>
public
string
Group
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
List
<
string
>
Permissions
{
get
;
set
;
}
}
public
class
WebApiUserInfoWithoutPassword
:
WebApiUserRequest
{
/// <summary>
///
/// </summary>
public
string
Group
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
List
<
string
>
Permissions
{
get
;
set
;
}
}
}
Develop/DBDevelopService/Controllers/DevelopServerController.cs
浏览文件 @
0a1b7b8f
此差异已折叠。
点击以展开。
Develop/DBDevelopService/Controllers/RequestBase.cs
浏览文件 @
0a1b7b8f
...
...
@@ -6,6 +6,7 @@ using System.Threading.Tasks;
namespace
DBDevelopService.Controllers
{
public
class
RequestBase
{
public
string
Id
{
get
;
set
;
}
...
...
@@ -66,7 +67,7 @@ namespace DBDevelopService.Controllers
/// <summary>
///
/// </summary>
public
class
NewDatabaseRequest
:
WebApiDatabaseRequest
public
class
WebApi
NewDatabaseRequest
:
WebApiDatabaseRequest
{
/// <summary>
///
...
...
@@ -78,7 +79,7 @@ namespace DBDevelopService.Controllers
/// <summary>
///
/// </summary>
public
class
GetTagByGroupRequest
:
WebApiDatabaseRequest
public
class
WebApi
GetTagByGroupRequest
:
WebApiDatabaseRequest
{
/// <summary>
///
...
...
@@ -96,6 +97,60 @@ namespace DBDevelopService.Controllers
public
int
Index
{
get
;
set
;
}
}
/// <summary>
///
/// </summary>
public
class
WebApiAddGroupRequest
:
WebApiDatabaseRequest
{
public
string
Name
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
string
ParentName
{
get
;
set
;
}
}
/// <summary>
///
/// </summary>
public
class
WebApiRemoveGroupRequest
:
WebApiDatabaseRequest
{
public
string
FullName
{
get
;
set
;
}
}
/// <summary>
///
/// </summary>
public
class
WebApiRenameGroupRequest
:
WebApiDatabaseRequest
{
public
string
Name
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
string
OldFullName
{
get
;
set
;
}
}
/// <summary>
///
/// </summary>
public
class
WebApiMoveTagGroupRequest
:
WebApiDatabaseRequest
{
/// <summary>
///
/// </summary>
public
string
Name
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
string
NewParentName
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
string
OldParentName
{
get
;
set
;
}
}
/// <summary>
///
/// </summary>
...
...
Develop/DBDevelopService/Controllers/SystemUser.cs
0 → 100644
浏览文件 @
0a1b7b8f
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Threading.Tasks
;
namespace
DBDevelopService.Controllers
{
public
class
WebApiNewSystemUserRequest
:
RequestBase
{
#
region
...
Variables
...
#
endregion
...
Variables
...
#
region
...
Events
...
#
endregion
...
Events
...
#
region
...
Constructor
...
#
endregion
...
Constructor
...
#
region
...
Properties
...
public
string
UserName
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
string
Password
{
get
;
set
;
}
#
endregion
...
Properties
...
#
region
...
Methods
...
#
endregion
...
Methods
...
#
region
...
Interfaces
...
#
endregion
...
Interfaces
...
}
public
class
WebApiReNameSystemUserRequest
:
RequestBase
{
public
string
OldName
{
get
;
set
;
}
public
string
NewName
{
get
;
set
;
}
}
public
class
WebApiModifySystemUserPasswordRequest
:
RequestBase
{
public
string
UserName
{
get
;
set
;
}
public
string
Password
{
get
;
set
;
}
public
string
NewPassword
{
get
;
set
;
}
}
public
class
WebApiUpdateSystemUserRequest
:
RequestBase
{
public
string
UserName
{
get
;
set
;
}
public
bool
IsAdmin
{
get
;
set
;
}
public
bool
NewDatabasePermission
{
get
;
set
;
}
public
List
<
string
>
Databases
{
get
;
set
;
}
}
/// <summary>
///
/// </summary>
public
class
WebApiSystemUserItem
{
public
string
UserName
{
get
;
set
;
}
public
bool
IsAdmin
{
get
;
set
;
}
public
bool
NewDatabase
{
get
;
set
;
}
public
List
<
string
>
Databases
{
get
;
set
;
}
}
/// <summary>
///
/// </summary>
public
class
WebApiRemoveSystemUserRequest
:
WebApiDatabaseRequest
{
public
string
UserName
{
get
;
set
;
}
}
}
Develop/DBDevelopService/Security/UserDocument.cs
浏览文件 @
0a1b7b8f
...
...
@@ -91,13 +91,14 @@ namespace DBDevelopService
///
/// </summary>
/// <param name="user"></param>
public
void
AddUser
(
User
user
)
public
bool
AddUser
(
User
user
)
{
if
(!
mUsers
.
ContainsKey
(
user
.
Name
))
{
mUsers
.
Add
(
user
.
Name
,
user
);
return
true
;
}
return
false
;
}
/// <summary>
...
...
Develop/DBDevelopService/Services/DevelopServerService.cs
浏览文件 @
0a1b7b8f
...
...
@@ -448,7 +448,7 @@ namespace DBDevelopService
var
usergroup
=
db
.
Security
.
User
.
GetUserGroup
(
request
.
Name
);
if
(
usergroup
!=
null
)
{
db
.
Security
.
User
.
RemoveUserGroup
(
usergroup
.
Name
);
db
.
Security
.
User
.
RemoveUserGroup
(
usergroup
.
Full
Name
);
}
}
return
Task
.
FromResult
(
new
BoolResultReplay
()
{
Result
=
true
});
...
...
@@ -1413,7 +1413,7 @@ namespace DBDevelopService
}
/// <summary>
///
///
清除某个变量组内所有变量
/// </summary>
/// <param name="request"></param>
/// <param name="context"></param>
...
...
Develop/DBStudio/Properties/launchSettings.json
浏览文件 @
0a1b7b8f
...
...
@@ -2,7 +2,7 @@
"profiles"
:
{
"DBInStudioServer"
:
{
"commandName"
:
"Executable"
,
"executablePath"
:
"C:
\\
Users
\\
c
dy81
\\
source
\\
repos
\\
mars
\\
Output
\\
DBInStudioServer.exe"
"executablePath"
:
"C:
\\
Users
\\
c
hongdaoyang
\\
source
\\
repos
\\
mars
\\
Output
\\
DBInStudioServer.exe"
}
}
}
\ No newline at end of file
Example/Develop/DevelopWebApiDemo/MainWindow.xaml
浏览文件 @
0a1b7b8f
...
...
@@ -14,6 +14,12 @@
<Label Content="服务器:" HorizontalAlignment="Left" Margin="12,0,0,0" VerticalAlignment="Center"/>
<TextBox x:Name="serverIp" HorizontalAlignment="Left" Margin="69,0,0,0" Text="http://localhost:9000" TextWrapping="Wrap" VerticalAlignment="Center" Width="558"/>
<Button x:Name="loginb" Content="登录" HorizontalAlignment="Left" Margin="647,0,0,0" VerticalAlignment="Center" Width="72" Click="loginb_Click"/>
<Button x:Name="getTagGroup" Content="获取变量组" HorizontalAlignment="Left" Margin="23,47,0,0" VerticalAlignment="Top" Width="72" Click="getTagGroup_Click" Grid.Row="1"/>
<Button x:Name="getTag" Content="获取变量" HorizontalAlignment="Left" Margin="23,85,0,0" VerticalAlignment="Top" Width="72" Click="getTag_Click" Grid.Row="1"/>
<ComboBox x:Name="groupList" SelectionChanged="groupList_SelectionChanged" HorizontalAlignment="Left" Margin="109,45,0,0" Grid.Row="1" VerticalAlignment="Top" Width="518"/>
<Button x:Name="getDatabase" Content="获取数据库" HorizontalAlignment="Left" Margin="23,9,0,0" VerticalAlignment="Top" Width="72" Click="getDatabase_Click" Grid.Row="1"/>
<ComboBox SelectionChanged="databaseList_SelectionChanged" x:Name="databaseList" HorizontalAlignment="Left" Margin="109,8,0,0" Grid.Row="1" VerticalAlignment="Top" Width="518"/>
<ComboBox x:Name="taglist" HorizontalAlignment="Left" Margin="109,84,0,0" Grid.Row="1" VerticalAlignment="Top" Width="518"/>
</Grid>
</Window>
Example/Develop/DevelopWebApiDemo/MainWindow.xaml.cs
浏览文件 @
0a1b7b8f
...
...
@@ -21,6 +21,8 @@ namespace DevelopWebApiDemo
public
partial
class
MainWindow
:
Window
{
DBDevelopClientWebApi
.
DevelopServiceHelper
mHelper
;
private
string
mCurrentDatabase
=
""
;
private
string
mTagGroup
=
""
;
public
MainWindow
()
{
InitializeComponent
();
...
...
@@ -32,5 +34,56 @@ namespace DevelopWebApiDemo
mHelper
.
Server
=
serverIp
.
Text
;
mHelper
.
Login
(
"Admin"
,
"Admin"
);
}
private
void
getTag_Click
(
object
sender
,
RoutedEventArgs
e
)
{
var
tags
=
mHelper
.
GetTagByGroup
(
mCurrentDatabase
,
mTagGroup
,
0
);
if
(
tags
!=
null
)
{
taglist
.
ItemsSource
=
tags
.
Select
(
e
=>
e
.
Item1
.
Name
).
ToList
();
}
}
private
void
getTagGroup_Click
(
object
sender
,
RoutedEventArgs
e
)
{
List
<
string
>
ltmp
=
new
List
<
string
>();
ltmp
.
Add
(
""
);
var
grps
=
mHelper
.
GetTagGroup
(
mCurrentDatabase
);
if
(
grps
!=
null
)
{
foreach
(
var
vv
in
grps
)
{
if
(!
string
.
IsNullOrEmpty
(
vv
.
Parent
))
{
ltmp
.
Add
(
vv
.
Parent
+
"."
+
vv
.
Name
);
}
else
{
ltmp
.
Add
(
vv
.
Name
);
}
}
}
groupList
.
ItemsSource
=
ltmp
;
}
private
void
getDatabase_Click
(
object
sender
,
RoutedEventArgs
e
)
{
var
vdd
=
mHelper
.
QueryDatabase
();
if
(
vdd
!=
null
)
{
databaseList
.
ItemsSource
=
vdd
.
Select
(
e
=>
e
.
Name
);
}
}
private
void
databaseList_SelectionChanged
(
object
sender
,
SelectionChangedEventArgs
e
)
{
mCurrentDatabase
=
databaseList
.
SelectedItem
.
ToString
();
}
private
void
groupList_SelectionChanged
(
object
sender
,
SelectionChangedEventArgs
e
)
{
mTagGroup
=
groupList
.
SelectedItem
.
ToString
();
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录