mirror of
https://github.com/jumpserver/lina.git
synced 2025-11-08 02:18:44 +00:00
Compare commits
7 Commits
pr@v3@fixe
...
v2.21.3
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ee55cebf0e | ||
|
|
2e5096f386 | ||
|
|
bf57ee8910 | ||
|
|
f86f08f2b6 | ||
|
|
6eb429823d | ||
|
|
d6be84026c | ||
|
|
4a7680ec7a |
@@ -1,6 +1,4 @@
|
|||||||
FROM node:10 as stage-build
|
FROM node:10 as stage-build
|
||||||
ARG VERSION
|
|
||||||
ENV VERSION=$VERSION
|
|
||||||
ARG NPM_REGISTRY="https://registry.npm.taobao.org"
|
ARG NPM_REGISTRY="https://registry.npm.taobao.org"
|
||||||
ENV NPM_REGISTY=$NPM_REGISTRY
|
ENV NPM_REGISTY=$NPM_REGISTRY
|
||||||
ARG SASS_BINARY_SITE="https://npm.taobao.org/mirrors/node-sass"
|
ARG SASS_BINARY_SITE="https://npm.taobao.org/mirrors/node-sass"
|
||||||
@@ -15,6 +13,8 @@ COPY package.json yarn.lock /data/
|
|||||||
RUN yarn install
|
RUN yarn install
|
||||||
RUN npm rebuild node-sass
|
RUN npm rebuild node-sass
|
||||||
|
|
||||||
|
ARG VERSION
|
||||||
|
ENV VERSION=$VERSION
|
||||||
ADD . /data
|
ADD . /data
|
||||||
RUN cd utils && bash -xieu build.sh build
|
RUN cd utils && bash -xieu build.sh build
|
||||||
|
|
||||||
|
|||||||
@@ -994,7 +994,7 @@
|
|||||||
"LDAPUser": "LDAP User",
|
"LDAPUser": "LDAP User",
|
||||||
"InsecureCommandAlert": "Insecure command alert",
|
"InsecureCommandAlert": "Insecure command alert",
|
||||||
"helpText": {
|
"helpText": {
|
||||||
"TempPassword": "For a while, there is a period of 300 seconds, and there is a period of reuse.",
|
"TempPassword": "For a while, there is a period of 300 seconds, failure immediately after use",
|
||||||
"ApiKeyList": "The API key is used to sign the request header. The header of each request is different. Please refer to the usage documentation",
|
"ApiKeyList": "The API key is used to sign the request header. The header of each request is different. Please refer to the usage documentation",
|
||||||
"authLdapSearchFilter": "Choice may be (cn|uid|sAMAccountName)=%(user)s)",
|
"authLdapSearchFilter": "Choice may be (cn|uid|sAMAccountName)=%(user)s)",
|
||||||
"authLdapSearchOu": "Use | split User OUs",
|
"authLdapSearchOu": "Use | split User OUs",
|
||||||
|
|||||||
@@ -431,7 +431,7 @@
|
|||||||
"fileType": "ファイルタイプ",
|
"fileType": "ファイルタイプ",
|
||||||
"isValid": "有効",
|
"isValid": "有効",
|
||||||
"nav": {
|
"nav": {
|
||||||
"TempPassword": "いちじパスワード",
|
"TempPassword": "一時パスワード",
|
||||||
"APIKey": "APIキー",
|
"APIKey": "APIキー",
|
||||||
"Workbench": "作業台",
|
"Workbench": "作業台",
|
||||||
"Navigation": "ナビゲーション",
|
"Navigation": "ナビゲーション",
|
||||||
@@ -1020,7 +1020,7 @@
|
|||||||
"LDAPServerInfo": "LDAPサーバー",
|
"LDAPServerInfo": "LDAPサーバー",
|
||||||
"LDAPUser": "LDAPユーザー",
|
"LDAPUser": "LDAPユーザー",
|
||||||
"helpText": {
|
"helpText": {
|
||||||
"TempPassword": "一時パスワードの有効期間は300秒で、有効期間内に再利用できます。",
|
"TempPassword": "一時パスワードの有効期間は300秒で、使用後すぐに失効します",
|
||||||
"ApiKeyList": "Api keyを使用してリクエストヘッダに署名します。リクエストのヘッダごとに異なります。使用ドキュメントを参照してください",
|
"ApiKeyList": "Api keyを使用してリクエストヘッダに署名します。リクエストのヘッダごとに異なります。使用ドキュメントを参照してください",
|
||||||
"authLdapSearchFilter": "可能なオプションは (cnまたはuidまたはsamaccount tname = %(user)s) です",
|
"authLdapSearchFilter": "可能なオプションは (cnまたはuidまたはsamaccount tname = %(user)s) です",
|
||||||
"authLdapSearchOu": "| を使用して各OUを区切る",
|
"authLdapSearchOu": "| を使用して各OUを区切る",
|
||||||
|
|||||||
@@ -1021,7 +1021,7 @@
|
|||||||
"LDAPServerInfo": "LDAP 服务器",
|
"LDAPServerInfo": "LDAP 服务器",
|
||||||
"LDAPUser": "LDAP 用户",
|
"LDAPUser": "LDAP 用户",
|
||||||
"helpText": {
|
"helpText": {
|
||||||
"TempPassword": "临时密码有效期为 300 秒,有效期内可重复使用",
|
"TempPassword": "临时密码有效期为 300 秒,使用后立刻失效",
|
||||||
"ApiKeyList": "使用api key签名请求头,每个请求的头部是不一样的, 请查阅使用文档",
|
"ApiKeyList": "使用api key签名请求头,每个请求的头部是不一样的, 请查阅使用文档",
|
||||||
"authLdapSearchFilter": "可能的选项是(cn或uid或sAMAccountName=%(user)s)",
|
"authLdapSearchFilter": "可能的选项是(cn或uid或sAMAccountName=%(user)s)",
|
||||||
"authLdapSearchOu": "使用|分隔各OU",
|
"authLdapSearchOu": "使用|分隔各OU",
|
||||||
|
|||||||
@@ -130,7 +130,7 @@ export default {
|
|||||||
component: Select2,
|
component: Select2,
|
||||||
el: {
|
el: {
|
||||||
multiple: false,
|
multiple: false,
|
||||||
options: this.$store.state.users.profile.myorgs?.map((item) => {
|
options: this.$store.state.users.profile.workbench_orgs?.map((item) => {
|
||||||
return { label: item.name, value: item.id }
|
return { label: item.name, value: item.id }
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
@@ -163,7 +163,7 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
let userAllOrgIds = this.$store.state.users.profile['myorgs']
|
let userAllOrgIds = this.$store.state.users.profile['workbench_orgs']
|
||||||
const currentOrgId = this.$store.getters.currentOrg ? this.$store.getters.currentOrg.id : null
|
const currentOrgId = this.$store.getters.currentOrg ? this.$store.getters.currentOrg.id : null
|
||||||
userAllOrgIds = userAllOrgIds ? userAllOrgIds.map(i => i.id) : []
|
userAllOrgIds = userAllOrgIds ? userAllOrgIds.map(i => i.id) : []
|
||||||
if (userAllOrgIds.length > 0) {
|
if (userAllOrgIds.length > 0) {
|
||||||
|
|||||||
@@ -101,7 +101,7 @@ export default {
|
|||||||
component: Select2,
|
component: Select2,
|
||||||
el: {
|
el: {
|
||||||
multiple: false,
|
multiple: false,
|
||||||
options: this.$store.state.users.profile['myorgs']?.map((item) => {
|
options: this.$store.state.users.profile['workbench_orgs']?.map((item) => {
|
||||||
return { label: item.name, value: item.id }
|
return { label: item.name, value: item.id }
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
@@ -130,7 +130,7 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
let userAllOrgIds = this.$store.state.users.profile['myorgs']
|
let userAllOrgIds = this.$store.state.users.profile['workbench_orgs']
|
||||||
const currentOrgId = this.$store.getters.currentOrg ? this.$store.getters.currentOrg.id : null
|
const currentOrgId = this.$store.getters.currentOrg ? this.$store.getters.currentOrg.id : null
|
||||||
userAllOrgIds = userAllOrgIds ? userAllOrgIds.map(i => i.id) : []
|
userAllOrgIds = userAllOrgIds ? userAllOrgIds.map(i => i.id) : []
|
||||||
if (userAllOrgIds.length > 0) {
|
if (userAllOrgIds.length > 0) {
|
||||||
|
|||||||
@@ -98,6 +98,8 @@ export default {
|
|||||||
'assets.view_asset': ['assets.view_node'],
|
'assets.view_asset': ['assets.view_node'],
|
||||||
'assets.commandfilterrule': ['assets.view_commandfilter'],
|
'assets.commandfilterrule': ['assets.view_commandfilter'],
|
||||||
'assets.gateway': ['assets.view_domain'],
|
'assets.gateway': ['assets.view_domain'],
|
||||||
|
'assets.add_asset': ['assets.view_platform'],
|
||||||
|
'assets.change_asset': ['assets.view_platform'],
|
||||||
'assets.view_authbook': ['assets.view_node'],
|
'assets.view_authbook': ['assets.view_node'],
|
||||||
'assets.gathereduser': ['assets.view_node'],
|
'assets.gathereduser': ['assets.view_node'],
|
||||||
'assets.refresh_assethardwareinfo': ['assets.change_asset'],
|
'assets.refresh_assethardwareinfo': ['assets.change_asset'],
|
||||||
|
|||||||
Reference in New Issue
Block a user