mirror of https://github.com/abpframework/abp
Merge branch 'master' of https://github.com/volosoft/abp
Alper Ebicoglu
6 years ago
commit
77b414967a
@ -0,0 +1,59 @@
|
||||
using JetBrains.Annotations;
|
||||
using System.Linq;
|
||||
using Volo.Abp.Ui.Navigation;
|
||||
|
||||
namespace Volo.Abp.UI.Navigation
|
||||
{
|
||||
public static class ApplicationMenuExtensions
|
||||
{
|
||||
[NotNull]
|
||||
public static ApplicationMenuItem GetAdministration(
|
||||
[NotNull] this ApplicationMenu applicationMenu)
|
||||
{
|
||||
return applicationMenu.GetMenuItem(
|
||||
DefaultMenuNames.Application.Main.Administration
|
||||
);
|
||||
}
|
||||
|
||||
[NotNull]
|
||||
public static ApplicationMenuItem GetMenuItem(
|
||||
[NotNull] this IHasMenuItems menuWithItems,
|
||||
string menuItemName)
|
||||
{
|
||||
var menuItem = menuWithItems.GetMenuItemOrNull(menuItemName);
|
||||
if (menuItem == null)
|
||||
{
|
||||
throw new AbpException($"Could not find a menu item with given name: {menuItemName}");
|
||||
}
|
||||
|
||||
return menuItem;
|
||||
}
|
||||
|
||||
[CanBeNull]
|
||||
public static ApplicationMenuItem GetMenuItemOrNull(
|
||||
[NotNull] this IHasMenuItems menuWithItems,
|
||||
string menuItemName)
|
||||
{
|
||||
Check.NotNull(menuWithItems, nameof(menuWithItems));
|
||||
|
||||
return menuWithItems.Items.FirstOrDefault(mi => mi.Name == menuItemName);
|
||||
}
|
||||
|
||||
[NotNull]
|
||||
public static IHasMenuItems SetSubItemOrder(
|
||||
[NotNull] this IHasMenuItems menuWithItems,
|
||||
string menuItemName,
|
||||
int order)
|
||||
{
|
||||
Check.NotNull(menuWithItems, nameof(menuWithItems));
|
||||
|
||||
var menuItem = menuWithItems.GetMenuItemOrNull(menuItemName);
|
||||
if (menuItem != null)
|
||||
{
|
||||
menuItem.Order = order;
|
||||
}
|
||||
|
||||
return menuWithItems;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,6 @@
|
||||
{
|
||||
"culture": "en",
|
||||
"texts": {
|
||||
"Menu:Administration": "Administration"
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,10 @@
|
||||
{
|
||||
"culture": "zh-Hans",
|
||||
"texts": {
|
||||
"Permission:DocumentManagement": "文档管理",
|
||||
"Permission:Projects": "项目",
|
||||
"Permission:Edit": "编辑",
|
||||
"Permission:Delete": "删除",
|
||||
"Permission:Create": "创建"
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,26 @@
|
||||
{
|
||||
"culture": "zh-Hans",
|
||||
"texts": {
|
||||
"Menu:DocumentManagement": "文档",
|
||||
"Menu:ProjectManagement": "项目",
|
||||
"CreateANewProject": "创建新项目",
|
||||
"Edit": "编辑",
|
||||
"Create": "创建",
|
||||
"Projects": "项目",
|
||||
"Name": "名称",
|
||||
"ShortName": "简称",
|
||||
"DocumentStoreType": "文件存储类型",
|
||||
"Format": "格式",
|
||||
"ShortNameInfoText": "将用于唯一的URL.",
|
||||
"DisplayName:Name": "名称",
|
||||
"DisplayName:ShortName": "简称",
|
||||
"DisplayName:Format": "格式",
|
||||
"DisplayName:DefaultDocumentName": "默认文档名称",
|
||||
"DisplayName:NavigationDocumentName": "导航文档名称",
|
||||
"DisplayName:MinimumVersion": "最低版本",
|
||||
"DisplayName:MainWebsiteUrl": "主网站网址",
|
||||
"DisplayName:LatestVersionBranchName": "最新版本的分支名称",
|
||||
"DisplayName:GitHubRootUrl": "GitHub根网址",
|
||||
"DisplayName:GitHubAccessToken": "GitHub访问令牌"
|
||||
}
|
||||
}
|
||||
@ -1,12 +1,14 @@
|
||||
{
|
||||
"culture": "zh-Hans",
|
||||
"texts": {
|
||||
"Permission:IdentityManagement": "身份认证管理",
|
||||
"Volo.Abp.Identity:010001": "您无法删除自己的帐户!",
|
||||
"Permission:IdentityManagement": "身份标识管理",
|
||||
"Permission:RoleManagement": "角色管理",
|
||||
"Permission:Create": "创建",
|
||||
"Permission:Edit": "编辑",
|
||||
"Permission:Delete": "删除",
|
||||
"Permission:ChangePermissions": "更改权限",
|
||||
"Permission:UserManagement": "用户管理"
|
||||
"Permission:UserManagement": "用户管理",
|
||||
"Permission:UserLookup": "用户查询"
|
||||
}
|
||||
}
|
||||
@ -1,6 +1,8 @@
|
||||
{
|
||||
"culture": "zh-Hans",
|
||||
"texts": {
|
||||
"Permissions": "权限"
|
||||
"Permissions": "权限",
|
||||
"OnlyProviderPermissons": "只有这个提供商",
|
||||
"All": "所有"
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,6 @@
|
||||
{
|
||||
"culture": "en",
|
||||
"texts": {
|
||||
"Settings": "Settings"
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,6 @@
|
||||
{
|
||||
"culture": "zh-Hans",
|
||||
"texts": {
|
||||
"Settings": "设置"
|
||||
}
|
||||
}
|
||||
@ -1,33 +1,31 @@
|
||||
apiVersion: extensions/v1beta1
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
labels:
|
||||
io.kompose.service: auth-server
|
||||
name: auth-server
|
||||
spec:
|
||||
selector:
|
||||
matchLabels:
|
||||
app: auth-server
|
||||
replicas: 1
|
||||
strategy: {}
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
io.kompose.service: auth-server
|
||||
app: auth-server
|
||||
spec:
|
||||
containers:
|
||||
- env:
|
||||
- name: ASPNETCORE_ENVIRONMENT
|
||||
value: Development
|
||||
- name: ASPNETCORE_URLS
|
||||
value: http://0.0.0.0:51511
|
||||
- name: ConnectionStrings__Default
|
||||
value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
|
||||
- name: RabbitMQ__Connections__Default__HostName
|
||||
value: rabbitmq
|
||||
- name: Redis__Configuration
|
||||
value: redis
|
||||
image: volosoft/microservice-demo-auth-server
|
||||
name: auth-server
|
||||
ports:
|
||||
- containerPort: 51511
|
||||
resources: {}
|
||||
restartPolicy: Always
|
||||
status: {}
|
||||
- name: auth-server
|
||||
image: "volosoft/microservice-demo-auth-server"
|
||||
env:
|
||||
- name: ASPNETCORE_ENVIRONMENT
|
||||
value: Development
|
||||
- name: ASPNETCORE_URLS
|
||||
value: http://0.0.0.0:51511
|
||||
- name: ConnectionStrings__Default
|
||||
value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
|
||||
- name: RabbitMQ__Connections__Default__HostName
|
||||
value: rabbitmq
|
||||
- name: Redis__Configuration
|
||||
value: redis
|
||||
ports:
|
||||
- name: http
|
||||
containerPort: 51511
|
||||
@ -1,14 +1,11 @@
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
apiVersion: v1
|
||||
metadata:
|
||||
labels:
|
||||
io.kompose.service: auth-server
|
||||
name: auth-server
|
||||
spec:
|
||||
ports:
|
||||
- port: 51511
|
||||
targetPort: 51511
|
||||
selector:
|
||||
io.kompose.service: auth-server
|
||||
status:
|
||||
loadBalancer: {}
|
||||
app: auth-server
|
||||
ports:
|
||||
- protocol: TCP
|
||||
port: 51511
|
||||
targetPort: http
|
||||
@ -1,33 +1,31 @@
|
||||
apiVersion: extensions/v1beta1
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
labels:
|
||||
io.kompose.service: backend-admin-app
|
||||
name: backend-admin-app
|
||||
spec:
|
||||
selector:
|
||||
matchLabels:
|
||||
app: backend-admin-app
|
||||
replicas: 1
|
||||
strategy: {}
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
io.kompose.service: backend-admin-app
|
||||
app: backend-admin-app
|
||||
spec:
|
||||
containers:
|
||||
- env:
|
||||
- name: ASPNETCORE_ENVIRONMENT
|
||||
value: Development
|
||||
- name: ASPNETCORE_URLS
|
||||
value: http://0.0.0.0:80
|
||||
- name: AuthServer__Authority
|
||||
value: http://auth-server:51511
|
||||
- name: Redis__Configuration
|
||||
value: redis
|
||||
- name: RemoteServices__Default__BaseUrl
|
||||
value: http://backend-admin-app-gateway/
|
||||
image: volosoft/microservice-demo-backend-admin-app
|
||||
name: backend-admin-app
|
||||
ports:
|
||||
- containerPort: 80
|
||||
resources: {}
|
||||
restartPolicy: Always
|
||||
status: {}
|
||||
- name: backend-admin-app
|
||||
image: "volosoft/microservice-demo-backend-admin-app"
|
||||
env:
|
||||
- name: ASPNETCORE_ENVIRONMENT
|
||||
value: Development
|
||||
- name: ASPNETCORE_URLS
|
||||
value: http://0.0.0.0:80
|
||||
- name: AuthServer__Authority
|
||||
value: http://auth-server:51511
|
||||
- name: Redis__Configuration
|
||||
value: redis
|
||||
- name: RemoteServices__Default__BaseUrl
|
||||
value: http://backend-admin-app-gateway/
|
||||
ports:
|
||||
- name: http
|
||||
containerPort: 80
|
||||
@ -1,45 +1,43 @@
|
||||
apiVersion: extensions/v1beta1
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
labels:
|
||||
io.kompose.service: backend-admin-app-gateway
|
||||
name: backend-admin-app-gateway
|
||||
spec:
|
||||
selector:
|
||||
matchLabels:
|
||||
app: backend-admin-app-gateway
|
||||
replicas: 1
|
||||
strategy: {}
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
io.kompose.service: backend-admin-app-gateway
|
||||
app: backend-admin-app-gateway
|
||||
spec:
|
||||
containers:
|
||||
- env:
|
||||
- name: ASPNETCORE_ENVIRONMENT
|
||||
value: Development
|
||||
- name: ASPNETCORE_URLS
|
||||
value: http://0.0.0.0:80
|
||||
- name: AuthServer__Authority
|
||||
value: http://auth-server:51511
|
||||
- name: ConnectionStrings__Default
|
||||
value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
|
||||
- name: GlobalConfiguration__BaseUrl
|
||||
value: http://backend-admin-app-gateway
|
||||
- name: ReRoutes__0__DownstreamHostAndPorts__0__Host
|
||||
value: identity-service
|
||||
- name: ReRoutes__0__DownstreamHostAndPorts__0__Port
|
||||
value: "80"
|
||||
- name: ReRoutes__1__DownstreamHostAndPorts__0__Host
|
||||
value: product-service
|
||||
- name: ReRoutes__1__DownstreamHostAndPorts__0__Port
|
||||
value: "80"
|
||||
- name: Redis__Configuration
|
||||
value: redis
|
||||
- name: RemoteServices__Default__BaseUrl
|
||||
value: http://backend-admin-app-gateway/
|
||||
image: volosoft/microservice-demo-backend-admin-app-gateway
|
||||
name: backend-admin-app-gateway
|
||||
ports:
|
||||
- containerPort: 80
|
||||
resources: {}
|
||||
restartPolicy: Always
|
||||
status: {}
|
||||
- name: backend-admin-app-gateway
|
||||
image: "volosoft/microservice-demo-backend-admin-app-gateway"
|
||||
env:
|
||||
- name: ASPNETCORE_ENVIRONMENT
|
||||
value: Development
|
||||
- name: ASPNETCORE_URLS
|
||||
value: http://0.0.0.0:80
|
||||
- name: AuthServer__Authority
|
||||
value: http://auth-server:51511
|
||||
- name: ConnectionStrings__Default
|
||||
value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
|
||||
- name: GlobalConfiguration__BaseUrl
|
||||
value: http://backend-admin-app-gateway
|
||||
- name: ReRoutes__0__DownstreamHostAndPorts__0__Host
|
||||
value: identity-service
|
||||
- name: ReRoutes__0__DownstreamHostAndPorts__0__Port
|
||||
value: "80"
|
||||
- name: ReRoutes__1__DownstreamHostAndPorts__0__Host
|
||||
value: product-service
|
||||
- name: ReRoutes__1__DownstreamHostAndPorts__0__Port
|
||||
value: "80"
|
||||
- name: Redis__Configuration
|
||||
value: redis
|
||||
- name: RemoteServices__Default__BaseUrl
|
||||
value: http://backend-admin-app-gateway/
|
||||
ports:
|
||||
- name: http
|
||||
containerPort: 80
|
||||
@ -1,14 +1,11 @@
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
apiVersion: v1
|
||||
metadata:
|
||||
labels:
|
||||
io.kompose.service: backend-admin-app-gateway
|
||||
name: backend-admin-app-gateway
|
||||
spec:
|
||||
ports:
|
||||
- port: 80
|
||||
targetPort: 80
|
||||
selector:
|
||||
io.kompose.service: backend-admin-app-gateway
|
||||
status:
|
||||
loadBalancer: {}
|
||||
app: backend-admin-app-gateway
|
||||
ports:
|
||||
- protocol: TCP
|
||||
port: 80
|
||||
targetPort: http
|
||||
@ -1,14 +1,11 @@
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
apiVersion: v1
|
||||
metadata:
|
||||
labels:
|
||||
io.kompose.service: backend-admin-app
|
||||
name: backend-admin-app
|
||||
spec:
|
||||
ports:
|
||||
- port: 80
|
||||
targetPort: 80
|
||||
selector:
|
||||
io.kompose.service: backend-admin-app
|
||||
status:
|
||||
loadBalancer: {}
|
||||
app: backend-admin-app
|
||||
ports:
|
||||
- protocol: TCP
|
||||
port: 80
|
||||
targetPort: http
|
||||
@ -1,39 +1,37 @@
|
||||
apiVersion: extensions/v1beta1
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
labels:
|
||||
io.kompose.service: blogging-service
|
||||
name: blogging-service
|
||||
spec:
|
||||
selector:
|
||||
matchLabels:
|
||||
app: blogging-service
|
||||
replicas: 1
|
||||
strategy: {}
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
io.kompose.service: blogging-service
|
||||
app: blogging-service
|
||||
spec:
|
||||
containers:
|
||||
- env:
|
||||
- name: ASPNETCORE_ENVIRONMENT
|
||||
value: Development
|
||||
- name: ASPNETCORE_URLS
|
||||
value: http://0.0.0.0:80
|
||||
- name: AuthServer__Authority
|
||||
value: http://auth-server:51511
|
||||
- name: ConnectionStrings__Blogging
|
||||
value: mongodb://mongodb|MsDemo_Blogging
|
||||
- name: ConnectionStrings__Default
|
||||
value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
|
||||
- name: RabbitMQ__Connections__Default__HostName
|
||||
value: rabbitmq
|
||||
- name: Redis__Configuration
|
||||
value: redis
|
||||
- name: RemoteServices__Default__BaseUrl
|
||||
value: http://internal-gateway/
|
||||
image: volosoft/microservice-demo-blogging-service
|
||||
name: blogging-service
|
||||
ports:
|
||||
- containerPort: 80
|
||||
resources: {}
|
||||
restartPolicy: Always
|
||||
status: {}
|
||||
- name: blogging-service
|
||||
image: "volosoft/microservice-demo-blogging-service"
|
||||
env:
|
||||
- name: ASPNETCORE_ENVIRONMENT
|
||||
value: Development
|
||||
- name: ASPNETCORE_URLS
|
||||
value: http://0.0.0.0:80
|
||||
- name: AuthServer__Authority
|
||||
value: http://auth-server:51511
|
||||
- name: ConnectionStrings__Blogging
|
||||
value: mongodb://mongodb|MsDemo_Blogging
|
||||
- name: ConnectionStrings__Default
|
||||
value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
|
||||
- name: RabbitMQ__Connections__Default__HostName
|
||||
value: rabbitmq
|
||||
- name: Redis__Configuration
|
||||
value: redis
|
||||
- name: RemoteServices__Default__BaseUrl
|
||||
value: http://internal-gateway/
|
||||
ports:
|
||||
- name: http
|
||||
containerPort: 80
|
||||
@ -1,14 +1,11 @@
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
apiVersion: v1
|
||||
metadata:
|
||||
labels:
|
||||
io.kompose.service: blogging-service
|
||||
name: blogging-service
|
||||
spec:
|
||||
ports:
|
||||
- port: 80
|
||||
targetPort: 80
|
||||
selector:
|
||||
io.kompose.service: blogging-service
|
||||
status:
|
||||
loadBalancer: {}
|
||||
app: blogging-service
|
||||
ports:
|
||||
- protocol: TCP
|
||||
port: 80
|
||||
targetPort: http
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue