Compare commits

...

7 Commits

Author SHA1 Message Date
“huailei000”
ee55cebf0e fix: 修复临时密码提示翻译 2022-04-29 10:53:55 +08:00
ibuler
2e5096f386 perf: 修改 build 2022-04-29 10:53:55 +08:00
feng626
bf57ee8910 fix: 开放platform 权限 2022-04-29 10:38:44 +08:00
feng626
f86f08f2b6 Merge pull request #1713 from jumpserver/pr@v2.21@workbench_orgs
fix: myorgs -> workbench_orgs
2022-04-25 11:36:57 +08:00
feng626
6eb429823d fix: myorgs -> workbench_orgs 2022-04-25 11:34:37 +08:00
feng626
d6be84026c Merge pull request #1711 from jumpserver/pr@v2.21@fix_temporary_password_text
fix: 修改临时密码提示文案
2022-04-25 11:05:26 +08:00
“huailei000”
4a7680ec7a fix: 修改临时密码提示文案 2022-04-25 03:00:15 +00:00
7 changed files with 12 additions and 10 deletions

View File

@@ -1,6 +1,4 @@
FROM node:10 as stage-build
ARG VERSION
ENV VERSION=$VERSION
ARG NPM_REGISTRY="https://registry.npm.taobao.org"
ENV NPM_REGISTY=$NPM_REGISTRY
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 npm rebuild node-sass
ARG VERSION
ENV VERSION=$VERSION
ADD . /data
RUN cd utils && bash -xieu build.sh build

View File

@@ -994,7 +994,7 @@
"LDAPUser": "LDAP User",
"InsecureCommandAlert": "Insecure command alert",
"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",
"authLdapSearchFilter": "Choice may be (cn|uid|sAMAccountName)=%(user)s)",
"authLdapSearchOu": "Use | split User OUs",

View File

@@ -431,7 +431,7 @@
"fileType": "ファイルタイプ",
"isValid": "有効",
"nav": {
"TempPassword": "いちじパスワード",
"TempPassword": "一時パスワード",
"APIKey": "APIキー",
"Workbench": "作業台",
"Navigation": "ナビゲーション",
@@ -1020,7 +1020,7 @@
"LDAPServerInfo": "LDAPサーバー",
"LDAPUser": "LDAPユーザー",
"helpText": {
"TempPassword": "一時パスワードの有効期間は300秒で、有効期間内に再利用できます",
"TempPassword": "一時パスワードの有効期間は300秒で、使用後すぐに失効します",
"ApiKeyList": "Api keyを使用してリクエストヘッダに署名します。リクエストのヘッダごとに異なります。使用ドキュメントを参照してください",
"authLdapSearchFilter": "可能なオプションは (cnまたはuidまたはsamaccount tname = %(user)s) です",
"authLdapSearchOu": "| を使用して各OUを区切る",

View File

@@ -1021,7 +1021,7 @@
"LDAPServerInfo": "LDAP 服务器",
"LDAPUser": "LDAP 用户",
"helpText": {
"TempPassword": "临时密码有效期为 300 秒,有效期内可重复使用",
"TempPassword": "临时密码有效期为 300 秒,使用后立刻失效",
"ApiKeyList": "使用api key签名请求头每个请求的头部是不一样的, 请查阅使用文档",
"authLdapSearchFilter": "可能的选项是(cn或uid或sAMAccountName=%(user)s)",
"authLdapSearchOu": "使用|分隔各OU",

View File

@@ -130,7 +130,7 @@ export default {
component: Select2,
el: {
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 }
})
},
@@ -163,7 +163,7 @@ export default {
}
},
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
userAllOrgIds = userAllOrgIds ? userAllOrgIds.map(i => i.id) : []
if (userAllOrgIds.length > 0) {

View File

@@ -101,7 +101,7 @@ export default {
component: Select2,
el: {
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 }
})
},
@@ -130,7 +130,7 @@ export default {
}
},
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
userAllOrgIds = userAllOrgIds ? userAllOrgIds.map(i => i.id) : []
if (userAllOrgIds.length > 0) {

View File

@@ -98,6 +98,8 @@ export default {
'assets.view_asset': ['assets.view_node'],
'assets.commandfilterrule': ['assets.view_commandfilter'],
'assets.gateway': ['assets.view_domain'],
'assets.add_asset': ['assets.view_platform'],
'assets.change_asset': ['assets.view_platform'],
'assets.view_authbook': ['assets.view_node'],
'assets.gathereduser': ['assets.view_node'],
'assets.refresh_assethardwareinfo': ['assets.change_asset'],