Compare commits

...

4 Commits

Author SHA1 Message Date
fit2bot
7250a6be01 feat: Update v2.28.3 2022-12-12 17:12:13 +08:00
jiangweidong
5667c39bcb fix: 解决命令过滤获取不到一些应用的系统用户问题 2022-11-24 09:37:57 +08:00
jiangweidong
982ce90a9a fix: 去掉clickhouse改密页面入口 2022-11-22 18:39:40 +08:00
吴小白
86ce758adb feat: 更新 action node 版本 2022-11-17 21:56:54 +08:00
5 changed files with 57 additions and 49 deletions

View File

@@ -39,7 +39,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Build it and upload
uses: jumpserver/action-build-upload-assets@node10
uses: jumpserver/action-build-upload-assets@node14.16
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:

1
GITSHA Normal file
View File

@@ -0,0 +1 @@
5667c39bcb45300676b63d25754fd022543dca06

View File

@@ -54,51 +54,54 @@ export const REDIS = 'redis'
export const MONGODB = 'mongodb'
export const CLICKHOUSE = 'clickhouse'
export const DATABASE = [
{
name: MYSQL,
title: i18n.t(`applications.applicationsType.${MYSQL}`),
type: 'primary',
category: DATABASE_CATEGORY,
has: true,
group: i18n.t('applications.RDBProtocol')
},
{
name: MARIADB,
title: i18n.t(`applications.applicationsType.${MARIADB}`),
type: 'primary',
category: DATABASE_CATEGORY,
has: true
},
{
name: ORACLE,
title: i18n.t(`applications.applicationsType.${ORACLE}`),
type: 'primary',
category: DATABASE_CATEGORY,
has: hasLicence
},
{
name: POSTGRESQL,
title: i18n.t(`applications.applicationsType.${POSTGRESQL}`),
type: 'primary',
category: DATABASE_CATEGORY,
has: hasLicence
},
{
name: SQLSERVER,
title: i18n.t(`applications.applicationsType.${SQLSERVER}`),
type: 'primary',
category: DATABASE_CATEGORY,
has: hasLicence
},
{
name: CLICKHOUSE,
title: i18n.t(`applications.applicationsType.${CLICKHOUSE}`),
type: 'primary',
category: DATABASE_CATEGORY,
has: hasLicence
}
]
const MYSQL_ITEM = {
name: MYSQL,
title: i18n.t(`applications.applicationsType.${MYSQL}`),
type: 'primary',
category: DATABASE_CATEGORY,
has: true,
group: i18n.t('applications.RDBProtocol')
}
const MARIADB_ITEM = {
name: MARIADB,
title: i18n.t(`applications.applicationsType.${MARIADB}`),
type: 'primary',
category: DATABASE_CATEGORY,
has: true
}
const ORACLE_ITEM = {
name: ORACLE,
title: i18n.t(`applications.applicationsType.${ORACLE}`),
type: 'primary',
category: DATABASE_CATEGORY,
has: hasLicence
}
const POSTGRESQL_ITEM = {
name: POSTGRESQL,
title: i18n.t(`applications.applicationsType.${POSTGRESQL}`),
type: 'primary',
category: DATABASE_CATEGORY,
has: hasLicence
}
const SQLSERVER_ITEM = {
name: SQLSERVER,
title: i18n.t(`applications.applicationsType.${SQLSERVER}`),
type: 'primary',
category: DATABASE_CATEGORY,
has: hasLicence
}
const CLICKHOUSE_ITEM = {
name: CLICKHOUSE,
title: i18n.t(`applications.applicationsType.${CLICKHOUSE}`),
type: 'primary',
category: DATABASE_CATEGORY,
has: hasLicence
}
const MONGODB_ITEM = {
name: MONGODB,
@@ -116,11 +119,15 @@ const REDIS_ITEM = {
has: true
}
export const DATABASE = [
MYSQL_ITEM, MARIADB_ITEM, ORACLE_ITEM, POSTGRESQL_ITEM, SQLSERVER_ITEM, CLICKHOUSE_ITEM
]
export const KV_DATABASE = [
MONGODB_ITEM, REDIS_ITEM
]
export const AppPlanDatabase = [...DATABASE, MONGODB_ITEM]
export const AppPlanDatabase = [MYSQL_ITEM, MARIADB_ITEM, ORACLE_ITEM, POSTGRESQL_ITEM, SQLSERVER_ITEM, MONGODB_ITEM]
export const KUBERNETES = 'k8s'
export const CLOUD_CATEGORY = 'cloud'

View File

@@ -74,7 +74,7 @@ export default {
el: {
value: [],
ajax: {
url: `/api/v1/assets/system-users/?protocol__in=ssh,telnet,mysql,postgresql,mariadb,oracle,sqlserver,k8s`,
url: `/api/v1/assets/system-users/?protocol__in=ssh,telnet,mysql,postgresql,mariadb,oracle,sqlserver,k8s,redis,mongodb,clickhouse`,
transformOption: (item) => {
if (this.$route.query.type === 'k8s') {
return { label: item.name, value: item.id }

View File

@@ -75,7 +75,7 @@ export default {
icon: 'fa-info-circle',
title: this.$t('assets.SystemUser'),
objectsAjax: {
url: `/api/v1/assets/system-users/?protocol__in=ssh,telnet,mysql,postgresql,mariadb,oracle,sqlserver,k8s`,
url: `/api/v1/assets/system-users/?protocol__in=ssh,telnet,mysql,postgresql,mariadb,oracle,sqlserver,k8s,redis,mongodb,clickhouse`,
transformOption: (item) => defaultTransformOption(item, 'username')
},
hasObjectsId: this.object.system_users,