-
-
-
-
-
- {{name}}
-
-
-
-
-
-
-
- {{$t('Return')}}
- {{spinnerLoading ? 'Loading...' : $t('Save')}}
-
-
-
-
-
-
-
+
+
+
+
+ {{name}}
+
+
+
+
+
+
+
+ {{$t('Return')}}
+ {{spinnerLoading ? 'Loading...' : $t('Save')}}
+
-
-
-
+
+
+
+
+
+
-
-
+
+
+
+
diff --git a/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue b/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue
index 83672d005b..6555d7a6d4 100644
--- a/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue
+++ b/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue
@@ -1,33 +1,30 @@
-
-
-
-
-
-
-
- $router.push({name: 'resource-file-create'})" v-ps="['GENERAL_USER']">{{$t('Create File')}}
- {{$t('Upload Files')}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ $router.push({name: 'resource-file-create'})" v-ps="['GENERAL_USER']">{{$t('Create File')}}
+ {{$t('Upload Files')}}
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
\ No newline at end of file
diff --git a/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue b/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue
index 8e99a0f92f..84a79be603 100644
--- a/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue
+++ b/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue
@@ -1,30 +1,27 @@
-
-
-
-
-
-
- {{$t('Create UDF Function')}}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ {{$t('Create UDF Function')}}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
diff --git a/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue b/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue
index e9bef997ab..ed9a81a705 100644
--- a/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue
+++ b/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue
@@ -1,7 +1,5 @@
-
-
-
+
@@ -24,7 +22,6 @@
-
diff --git a/escheduler-ui/src/js/conf/home/pages/security/index.vue b/escheduler-ui/src/js/conf/home/pages/security/index.vue
index f7b27bcdf1..547a2cb678 100644
--- a/escheduler-ui/src/js/conf/home/pages/security/index.vue
+++ b/escheduler-ui/src/js/conf/home/pages/security/index.vue
@@ -1,8 +1,13 @@
-
+
+
+
+
diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue b/escheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue
index f65ab97d2c..249e398ef5 100644
--- a/escheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue
+++ b/escheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue
@@ -1,30 +1,25 @@
-
-
-
-
-
-
-
- {{$t('Create queue')}}
-
-
+
+
+
+
+ {{$t('Create queue')}}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/servers/pages/master/index.vue b/escheduler-ui/src/js/conf/home/pages/security/pages/servers/pages/master/index.vue
index 3f2d6de934..c629857c6d 100644
--- a/escheduler-ui/src/js/conf/home/pages/security/pages/servers/pages/master/index.vue
+++ b/escheduler-ui/src/js/conf/home/pages/security/pages/servers/pages/master/index.vue
@@ -1,26 +1,22 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
+
+
+
+
+
+
diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/servers/pages/worker/index.vue b/escheduler-ui/src/js/conf/home/pages/security/pages/servers/pages/worker/index.vue
index 6c525e3e29..e720cdfd22 100644
--- a/escheduler-ui/src/js/conf/home/pages/security/pages/servers/pages/worker/index.vue
+++ b/escheduler-ui/src/js/conf/home/pages/security/pages/servers/pages/worker/index.vue
@@ -1,25 +1,21 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
+
+
+
+
+
+
diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue b/escheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue
index 81ea08638c..31379e0903 100644
--- a/escheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue
+++ b/escheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue
@@ -1,30 +1,25 @@
-
-
-
-
-
-
-
- {{$t('Create Tenant')}}
-
-
+
+
+
+
+ {{$t('Create Tenant')}}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue b/escheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue
index 74bf2ac2bb..47b17185e3 100644
--- a/escheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue
+++ b/escheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue
@@ -1,30 +1,25 @@
-
-
-
-
-
-
-
- {{$t('Create User')}}
-
-
+
+
+
+
+ {{$t('Create User')}}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue b/escheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue
index e9b302e001..9ea3d2498f 100644
--- a/escheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue
+++ b/escheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue
@@ -1,30 +1,25 @@
-
-
-
-
-
-
-
- {{$t('Create alarm group')}}
-
-
+
+
+
+
+ {{$t('Create alarm group')}}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/escheduler-ui/src/js/conf/home/pages/user/index.vue b/escheduler-ui/src/js/conf/home/pages/user/index.vue
index e2dab05e4f..e7add4411f 100644
--- a/escheduler-ui/src/js/conf/home/pages/user/index.vue
+++ b/escheduler-ui/src/js/conf/home/pages/user/index.vue
@@ -1,8 +1,14 @@
-
+
+
+
+
+
\ No newline at end of file
diff --git a/escheduler-ui/src/js/conf/home/pages/user/pages/account/index.vue b/escheduler-ui/src/js/conf/home/pages/user/pages/account/index.vue
index 8ed4db3158..7cf2ec8486 100644
--- a/escheduler-ui/src/js/conf/home/pages/user/pages/account/index.vue
+++ b/escheduler-ui/src/js/conf/home/pages/user/pages/account/index.vue
@@ -1,20 +1,16 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/escheduler-ui/src/js/conf/home/pages/user/pages/password/index.vue b/escheduler-ui/src/js/conf/home/pages/user/pages/password/index.vue
index a576fb35e9..43aef8c277 100644
--- a/escheduler-ui/src/js/conf/home/pages/user/pages/password/index.vue
+++ b/escheduler-ui/src/js/conf/home/pages/user/pages/password/index.vue
@@ -1,20 +1,16 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/escheduler-ui/src/js/conf/home/pages/user/pages/token/_source/createToken.vue b/escheduler-ui/src/js/conf/home/pages/user/pages/token/_source/createToken.vue
new file mode 100644
index 0000000000..4616dfe6e6
--- /dev/null
+++ b/escheduler-ui/src/js/conf/home/pages/user/pages/token/_source/createToken.vue
@@ -0,0 +1,152 @@
+
+
+
+
+
+ *失效时间
+
+
+
+
+
+
+ *用户
+
+
+
+
+
+
+
+
+ Token
+
+
+
+ 生成Token
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/escheduler-ui/src/js/conf/home/pages/user/pages/token/_source/list.vue b/escheduler-ui/src/js/conf/home/pages/user/pages/token/_source/list.vue
new file mode 100644
index 0000000000..89c50580f4
--- /dev/null
+++ b/escheduler-ui/src/js/conf/home/pages/user/pages/token/_source/list.vue
@@ -0,0 +1,125 @@
+
+
+
+
+
+
+ 编号
+ |
+
+ 用户
+ |
+
+ Token
+ |
+
+ 开始时间
+ |
+
+ 失效时间
+ |
+
+ 创建时间
+ |
+
+ 更新时间
+ |
+
+ {{$t('Operation')}}
+ |
+
+
+
+ {{parseInt(pageNo === 1 ? ($index + 1) : (($index + 1) + (pageSize * (pageNo - 1))))}}
+ |
+
+
+ {{item.userName}}
+
+ |
+ {{item.token}} |
+
+ {{item.createTime | formatDate}}
+ |
+
+ {{item.expireTime | formatDate}}
+ |
+ {{item.createTime | formatDate}} |
+ {{item.updateTime | formatDate}} |
+
+
+
+
+ {{$t('Delete?')}}
+
+ {{$t('Cancel')}}
+ {{$t('Confirm')}}
+
+
+
+
+
+
+ |
+
+
+
+
+
+
\ No newline at end of file
diff --git a/escheduler-ui/src/js/conf/home/pages/user/pages/token/index.vue b/escheduler-ui/src/js/conf/home/pages/user/pages/token/index.vue
new file mode 100644
index 0000000000..56cf5d0bf9
--- /dev/null
+++ b/escheduler-ui/src/js/conf/home/pages/user/pages/token/index.vue
@@ -0,0 +1,115 @@
+
+
+
+
+
+ 创建令牌
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/escheduler-ui/src/js/conf/home/router/index.js b/escheduler-ui/src/js/conf/home/router/index.js
index 7b7cd349e6..f1a47ed433 100644
--- a/escheduler-ui/src/js/conf/home/router/index.js
+++ b/escheduler-ui/src/js/conf/home/router/index.js
@@ -375,6 +375,14 @@ const router = new Router({
meta: {
title: `${i18n.$t('Edit password')}`
}
+ },
+ {
+ path: '/user/token',
+ name: 'token',
+ component: resolve => require(['../pages/user/pages/token/index'], resolve),
+ meta: {
+ title: `令牌管理`
+ }
}
]
}
diff --git a/escheduler-ui/src/js/conf/home/store/security/actions.js b/escheduler-ui/src/js/conf/home/store/security/actions.js
index a3c9909069..ac8ac20358 100644
--- a/escheduler-ui/src/js/conf/home/store/security/actions.js
+++ b/escheduler-ui/src/js/conf/home/store/security/actions.js
@@ -90,7 +90,7 @@ export default {
* @param "searchVal":string,
* @param "pageSize":int
*/
- getUsersList ({ state }, payload) {
+ getUsersListP ({ state }, payload) {
return new Promise((resolve, reject) => {
io.get(`users/list-paging`, payload, res => {
resolve(res.data)
@@ -99,6 +99,18 @@ export default {
})
})
},
+ /**
+ * Paging query user list
+ */
+ getUsersList ({ state }, payload) {
+ return new Promise((resolve, reject) => {
+ io.get(`users/list`, payload, res => {
+ resolve(res.data)
+ }).catch(e => {
+ reject(e)
+ })
+ })
+ },
/**
* Update user
* @param "id":int,
diff --git a/escheduler-ui/src/js/conf/home/store/user/actions.js b/escheduler-ui/src/js/conf/home/store/user/actions.js
index d7cd36a4ad..0bc12c33cd 100644
--- a/escheduler-ui/src/js/conf/home/store/user/actions.js
+++ b/escheduler-ui/src/js/conf/home/store/user/actions.js
@@ -42,5 +42,82 @@ export default {
}).catch(e => {
console.log(e)
})
+ },
+ /**
+ * get token list
+ * User loginUser,
+ * Integer pageNo,
+ * String searchVal,
+ * Integer pageSize
+ */
+ getTokenListP ({ state }, payload) {
+ return new Promise((resolve, reject) => {
+ io.get(`access-token/list-paging`, payload, res => {
+ resolve(res.data)
+ }).catch(e => {
+ reject(e)
+ })
+ })
+ },
+ /**
+ * create token
+ * User loginUser,
+ * int userId,
+ * String expireTime,
+ * String token
+ */
+ createToken ({ state }, payload) {
+ return new Promise((resolve, reject) => {
+ io.post(`access-token/create`, payload, res => {
+ resolve(res)
+ }).catch(e => {
+ reject(e)
+ })
+ })
+ },
+ /**
+ * update token
+ * User loginUser,
+ * int userId,
+ * String expireTime,
+ * String token
+ */
+ updateToken ({ state }, payload) {
+ return new Promise((resolve, reject) => {
+ io.post(`access-token/update`, payload, res => {
+ resolve(res)
+ }).catch(e => {
+ reject(e)
+ })
+ })
+ },
+ /**
+ * create token
+ * User loginUser,
+ * int userId,
+ * String expireTime
+ */
+ generateToken ({ state }, payload) {
+ return new Promise((resolve, reject) => {
+ io.post(`access-token/generate`, payload, res => {
+ resolve(res.data)
+ }).catch(e => {
+ reject(e)
+ })
+ })
+ },
+ /**
+ * delete token
+ * User loginUser,
+ * int id
+ */
+ deleteToken ({ state }, payload) {
+ return new Promise((resolve, reject) => {
+ io.post(`access-token/delete`, payload, res => {
+ resolve(res)
+ }).catch(e => {
+ reject(e)
+ })
+ })
}
}
diff --git a/escheduler-ui/src/js/module/components/conditions/conditions.vue b/escheduler-ui/src/js/module/components/conditions/conditions.vue
index 2ba9aab2d7..0d1f9e5677 100644
--- a/escheduler-ui/src/js/module/components/conditions/conditions.vue
+++ b/escheduler-ui/src/js/module/components/conditions/conditions.vue
@@ -53,6 +53,12 @@
return this.$slots['search-group']
}
},
+ created () {
+ // Routing parameter merging
+ if (!_.isEmpty(this.$route.query)) {
+ this.searchVal = this.$route.query.searchVal || ''
+ }
+ },
components: {}
}
diff --git a/escheduler-ui/src/js/module/components/nav/nav.vue b/escheduler-ui/src/js/module/components/nav/nav.vue
index 7a8c511524..f889b8e234 100644
--- a/escheduler-ui/src/js/module/components/nav/nav.vue
+++ b/escheduler-ui/src/js/module/components/nav/nav.vue
@@ -32,13 +32,13 @@