mirror of
https://github.com/jumpserver/lina.git
synced 2025-11-09 03:14:48 +00:00
Compare commits
30 Commits
revert-519
...
v2.28.2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
89a3886a00 | ||
|
|
5667c39bcb | ||
|
|
982ce90a9a | ||
|
|
86ce758adb | ||
|
|
582a84178d | ||
|
|
9b9f7c936c | ||
|
|
2a6100957f | ||
|
|
16606d6a27 | ||
|
|
0a612f50e6 | ||
|
|
fe36fa9390 | ||
|
|
ba109900ec | ||
|
|
ec7768267f | ||
|
|
cc58b374ab | ||
|
|
04ffbb8fd6 | ||
|
|
49880f6739 | ||
|
|
e6f98d58c4 | ||
|
|
fd1f16d43c | ||
|
|
968b2415b1 | ||
|
|
776090d6ba | ||
|
|
3a37952288 | ||
|
|
62b8fc0e3b | ||
|
|
b2028869cb | ||
|
|
5277a725f8 | ||
|
|
f137788c1a | ||
|
|
f7d17c8de7 | ||
|
|
feea70b0be | ||
|
|
04696ef3d6 | ||
|
|
1731f4f788 | ||
|
|
6f25d93909 | ||
|
|
46461ec324 |
2
.github/workflows/release-drafter.yml
vendored
2
.github/workflows/release-drafter.yml
vendored
@@ -39,7 +39,7 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- name: Build it and upload
|
- name: Build it and upload
|
||||||
uses: jumpserver/action-build-upload-assets@node10
|
uses: jumpserver/action-build-upload-assets@node14.16
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
with:
|
with:
|
||||||
|
|||||||
@@ -54,51 +54,54 @@ export const REDIS = 'redis'
|
|||||||
export const MONGODB = 'mongodb'
|
export const MONGODB = 'mongodb'
|
||||||
export const CLICKHOUSE = 'clickhouse'
|
export const CLICKHOUSE = 'clickhouse'
|
||||||
|
|
||||||
export const DATABASE = [
|
const MYSQL_ITEM = {
|
||||||
{
|
name: MYSQL,
|
||||||
name: MYSQL,
|
title: i18n.t(`applications.applicationsType.${MYSQL}`),
|
||||||
title: i18n.t(`applications.applicationsType.${MYSQL}`),
|
type: 'primary',
|
||||||
type: 'primary',
|
category: DATABASE_CATEGORY,
|
||||||
category: DATABASE_CATEGORY,
|
has: true,
|
||||||
has: true,
|
group: i18n.t('applications.RDBProtocol')
|
||||||
group: i18n.t('applications.RDBProtocol')
|
}
|
||||||
},
|
|
||||||
{
|
const MARIADB_ITEM = {
|
||||||
name: MARIADB,
|
name: MARIADB,
|
||||||
title: i18n.t(`applications.applicationsType.${MARIADB}`),
|
title: i18n.t(`applications.applicationsType.${MARIADB}`),
|
||||||
type: 'primary',
|
type: 'primary',
|
||||||
category: DATABASE_CATEGORY,
|
category: DATABASE_CATEGORY,
|
||||||
has: true
|
has: true
|
||||||
},
|
}
|
||||||
{
|
|
||||||
name: ORACLE,
|
const ORACLE_ITEM = {
|
||||||
title: i18n.t(`applications.applicationsType.${ORACLE}`),
|
name: ORACLE,
|
||||||
type: 'primary',
|
title: i18n.t(`applications.applicationsType.${ORACLE}`),
|
||||||
category: DATABASE_CATEGORY,
|
type: 'primary',
|
||||||
has: hasLicence
|
category: DATABASE_CATEGORY,
|
||||||
},
|
has: hasLicence
|
||||||
{
|
}
|
||||||
name: POSTGRESQL,
|
|
||||||
title: i18n.t(`applications.applicationsType.${POSTGRESQL}`),
|
const POSTGRESQL_ITEM = {
|
||||||
type: 'primary',
|
name: POSTGRESQL,
|
||||||
category: DATABASE_CATEGORY,
|
title: i18n.t(`applications.applicationsType.${POSTGRESQL}`),
|
||||||
has: hasLicence
|
type: 'primary',
|
||||||
},
|
category: DATABASE_CATEGORY,
|
||||||
{
|
has: hasLicence
|
||||||
name: SQLSERVER,
|
}
|
||||||
title: i18n.t(`applications.applicationsType.${SQLSERVER}`),
|
|
||||||
type: 'primary',
|
const SQLSERVER_ITEM = {
|
||||||
category: DATABASE_CATEGORY,
|
name: SQLSERVER,
|
||||||
has: hasLicence
|
title: i18n.t(`applications.applicationsType.${SQLSERVER}`),
|
||||||
},
|
type: 'primary',
|
||||||
{
|
category: DATABASE_CATEGORY,
|
||||||
name: CLICKHOUSE,
|
has: hasLicence
|
||||||
title: i18n.t(`applications.applicationsType.${CLICKHOUSE}`),
|
}
|
||||||
type: 'primary',
|
|
||||||
category: DATABASE_CATEGORY,
|
const CLICKHOUSE_ITEM = {
|
||||||
has: hasLicence
|
name: CLICKHOUSE,
|
||||||
}
|
title: i18n.t(`applications.applicationsType.${CLICKHOUSE}`),
|
||||||
]
|
type: 'primary',
|
||||||
|
category: DATABASE_CATEGORY,
|
||||||
|
has: hasLicence
|
||||||
|
}
|
||||||
|
|
||||||
const MONGODB_ITEM = {
|
const MONGODB_ITEM = {
|
||||||
name: MONGODB,
|
name: MONGODB,
|
||||||
@@ -116,11 +119,15 @@ const REDIS_ITEM = {
|
|||||||
has: true
|
has: true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const DATABASE = [
|
||||||
|
MYSQL_ITEM, MARIADB_ITEM, ORACLE_ITEM, POSTGRESQL_ITEM, SQLSERVER_ITEM, CLICKHOUSE_ITEM
|
||||||
|
]
|
||||||
|
|
||||||
export const KV_DATABASE = [
|
export const KV_DATABASE = [
|
||||||
MONGODB_ITEM, REDIS_ITEM
|
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 KUBERNETES = 'k8s'
|
||||||
export const CLOUD_CATEGORY = 'cloud'
|
export const CLOUD_CATEGORY = 'cloud'
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ export default {
|
|||||||
el: {
|
el: {
|
||||||
value: [],
|
value: [],
|
||||||
ajax: {
|
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) => {
|
transformOption: (item) => {
|
||||||
if (this.$route.query.type === 'k8s') {
|
if (this.$route.query.type === 'k8s') {
|
||||||
return { label: item.name, value: item.id }
|
return { label: item.name, value: item.id }
|
||||||
|
|||||||
@@ -75,7 +75,7 @@ export default {
|
|||||||
icon: 'fa-info-circle',
|
icon: 'fa-info-circle',
|
||||||
title: this.$t('assets.SystemUser'),
|
title: this.$t('assets.SystemUser'),
|
||||||
objectsAjax: {
|
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')
|
transformOption: (item) => defaultTransformOption(item, 'username')
|
||||||
},
|
},
|
||||||
hasObjectsId: this.object.system_users,
|
hasObjectsId: this.object.system_users,
|
||||||
|
|||||||
Reference in New Issue
Block a user