This is an automated email from the ASF dual-hosted git repository.
panjuan pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob-ui.git
The following commit(s) were added to refs/heads/master by this push:
new 3482d48 Remove unnecessary guest user
new 1ddec80 Merge pull request #157 from TeslaCN/remove_guest_user
3482d48 is described below
commit 3482d483bcd43112526ab962fca1a2f4cd3d4c85
Author: 吴伟杰 <[email protected]>
AuthorDate: Fri May 27 15:12:02 2022 +0800
Remove unnecessary guest user
---
.../cloud/ui/security/AuthenticationFilter.java | 5 ++---
.../cloud/ui/security/AuthenticationResult.java | 3 ---
.../ui/security/UserAuthenticationService.java | 24 ++++++++--------------
.../src/main/resources/application.properties | 6 ++----
.../src/views/app-config/module/appConfig.vue | 6 ------
.../src/views/job-config/module/jobConfig.vue | 6 ------
.../src/views/job-detail/module/jobDetail.vue | 1 -
.../src/views/job-status/module/jobStatus.vue | 1 -
.../src/views/login/index.vue | 1 -
.../registry-center/module/registryCenter.vue | 4 ----
.../lite/ui/security/AuthenticationFilter.java | 5 ++---
.../lite/ui/security/AuthenticationResult.java | 3 ---
.../ui/security/UserAuthenticationService.java | 24 ++++++++--------------
.../src/main/resources/application.properties | 6 ++----
.../src/views/data-source/module/dataSource.vue | 4 ----
.../src/views/login/index.vue | 1 -
.../module/operationJobsDetail.vue | 3 ---
.../views/operation-jobs/module/operationJobs.vue | 7 -------
.../module/operationServersDetail.vue | 5 -----
.../operation-servers/module/operationServers.vue | 5 -----
.../registry-center/module/registryCenter.vue | 4 ----
21 files changed, 24 insertions(+), 100 deletions(-)
diff --git
a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/security/AuthenticationFilter.java
b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/security/AuthenticationFilter.java
index 3fcc81b..c4fbbdf 100644
---
a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/security/AuthenticationFilter.java
+++
b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/security/AuthenticationFilter.java
@@ -80,10 +80,9 @@ public final class AuthenticationFilter implements Filter {
}
httpResponse.setContentType("application/json");
httpResponse.setCharacterEncoding("UTF-8");
- Map<String, Object> result = new HashMap<>(4, 1);
+ Map<String, Object> result = new HashMap<>(2, 1);
result.put("username", authenticationResult.getUsername());
- result.put("accessToken",
userAuthenticationService.getToken(authenticationResult.getUsername(),
authenticationResult.isGuest()));
- result.put("isGuest", authenticationResult.isGuest());
+ result.put("accessToken",
userAuthenticationService.getToken(authenticationResult.getUsername()));
objectMapper.writeValue(httpResponse.getWriter(),
ResponseResultUtil.build(result));
} catch (IOException e) {
e.printStackTrace();
diff --git
a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/security/AuthenticationResult.java
b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/security/AuthenticationResult.java
index 13d2cb4..27ab043 100644
---
a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/security/AuthenticationResult.java
+++
b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/security/AuthenticationResult.java
@@ -32,7 +32,4 @@ public final class AuthenticationResult {
private final String password;
private final boolean success;
-
- private final boolean isGuest;
-
}
diff --git
a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/security/UserAuthenticationService.java
b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/security/UserAuthenticationService.java
index e24b4e9..7ce080d 100644
---
a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/security/UserAuthenticationService.java
+++
b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/security/UserAuthenticationService.java
@@ -46,13 +46,9 @@ public final class UserAuthenticationService {
private final JWTVerifier verifier =
JWT.require(algorithm).withIssuer(JWT_TOKEN_ISSUER).build();
- private String rootUsername;
+ private String username;
- private String rootPassword;
-
- private String guestUsername;
-
- private String guestPassword;
+ private String password;
private int tokenExpiresAfterSeconds = 3600;
@@ -64,15 +60,12 @@ public final class UserAuthenticationService {
*/
public AuthenticationResult checkUser(final UserAccount userAccount) {
if (null == userAccount ||
Strings.isNullOrEmpty(userAccount.getUsername()) ||
Strings.isNullOrEmpty(userAccount.getPassword())) {
- return new AuthenticationResult(null, null, false, false);
- }
- if (rootUsername.equals(userAccount.getUsername()) &&
rootPassword.equals(userAccount.getPassword())) {
- return new AuthenticationResult(rootUsername, rootPassword, true,
false);
+ return new AuthenticationResult(null, null, false);
}
- if (guestUsername.equals(userAccount.getUsername()) &&
guestPassword.equals(userAccount.getPassword())) {
- return new AuthenticationResult(guestUsername, guestPassword,
true, true);
+ if (username.equals(userAccount.getUsername()) &&
password.equals(userAccount.getPassword())) {
+ return new AuthenticationResult(username, password, true);
}
- return new AuthenticationResult(null, null, false, false);
+ return new AuthenticationResult(null, null, false);
}
/**
@@ -80,10 +73,9 @@ public final class UserAuthenticationService {
*
* @return authentication token
*/
- public String getToken(final String username, final boolean isGuest) {
- Map<String, Object> payload = new HashMap<>(2, 1);
+ public String getToken(final String username) {
+ Map<String, Object> payload = new HashMap<>(1, 1);
payload.put("username", username);
- payload.put("isGuest", isGuest);
Date expiresAt = new Date(System.currentTimeMillis() +
TimeUnit.SECONDS.toMillis(tokenExpiresAfterSeconds));
return
JWT.create().withExpiresAt(expiresAt).withIssuer(JWT_TOKEN_ISSUER).withPayload(payload).sign(algorithm);
}
diff --git
a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/resources/application.properties
b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/resources/application.properties
index a372eca..df13cdf 100644
---
a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/resources/application.properties
+++
b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/resources/application.properties
@@ -17,10 +17,8 @@
server.port=8088
-auth.root_username=root
-auth.root_password=root
-auth.guest_username=guest
-auth.guest_password=guest
+auth.username=root
+auth.password=root
auth.token_expires_after_seconds=3600
# ElasticJob-Cloud's zookeeper address
diff --git
a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-frontend/src/views/app-config/module/appConfig.vue
b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-frontend/src/views/app-config/module/appConfig.vue
index 5323f65..1ba36f3 100644
---
a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-frontend/src/views/app-config/module/appConfig.vue
+++
b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-frontend/src/views/app-config/module/appConfig.vue
@@ -19,7 +19,6 @@
<el-row class="box-card">
<div class="btn-group">
<el-button
- :disabled="isGuest"
class="btn-plus"
type="primary"
icon="el-icon-plus"
@@ -39,25 +38,21 @@
<template slot-scope="scope">
<el-button-group>
<el-button
- :disabled="isGuest"
size="mini"
type="primary"
plain
@click="handleDetail(scope.row)">{{
$t("appConfig.table.operateDetail") }}</el-button>
<el-button
- :disabled="isGuest"
size="mini"
type="primary"
plain
@click="handleModify(scope.row)">{{
$t("appConfig.table.operateModify") }}</el-button>
<el-button
- :disabled="isGuest"
size="mini"
type="primary"
plain
@click="handleDelete(scope.row)">{{
$t("appConfig.table.operateDel") }}</el-button>
<el-button
- :disabled="isGuest"
size="mini"
type="primary"
plain
@@ -207,7 +202,6 @@ export default {
addDialogVisible: false,
editDialogVisible: false,
isEdit: false,
- isGuest: window.localStorage.getItem('isGuest') === 'true',
column: [
{
label: this.$t('appConfig').table.appName,
diff --git
a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-frontend/src/views/job-config/module/jobConfig.vue
b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-frontend/src/views/job-config/module/jobConfig.vue
index 5e67153..7882819 100644
---
a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-frontend/src/views/job-config/module/jobConfig.vue
+++
b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-frontend/src/views/job-config/module/jobConfig.vue
@@ -21,7 +21,6 @@
<el-form-item>
<el-col :span="4">
<el-button
- :disabled="isGuest"
class="btn-plus"
type="primary"
icon="el-icon-plus"
@@ -75,13 +74,11 @@
plain
@click="handleDetail(scope.row)">{{
$t("jobConfig.actionText.detail") }}</el-button>
<el-button
- :disabled="isGuest"
size="mini"
type="primary"
plain
@click="handleModify(scope.row)">{{
$t("jobConfig.actionText.modify") }}</el-button>
<el-button
- :disabled="isGuest"
size="mini"
type="danger"
icon="el-icon-delete"
@@ -89,14 +86,12 @@
@click="handlerRemove(scope.row)">{{
$t("jobConfig.actionText.remove") }}</el-button>
<el-button
v-if="scope.row.disabled"
- :disabled="isGuest"
size="mini"
type="success"
plain
@click="handleEnable(scope.row)">{{
$t("jobConfig.actionText.enable") }}</el-button>
<el-button
v-if="!scope.row.disabled"
- :disabled="isGuest"
size="mini"
type="warning"
plain
@@ -319,7 +314,6 @@ export default {
data() {
return {
modifyDialogVisible: false,
- isGuest: window.localStorage.getItem('isGuest') === 'true',
column: [
{
label: this.$t('jobConfig').labelInfo.jobName,
diff --git
a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-frontend/src/views/job-detail/module/jobDetail.vue
b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-frontend/src/views/job-detail/module/jobDetail.vue
index 2e473bd..e41f187 100644
---
a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-frontend/src/views/job-detail/module/jobDetail.vue
+++
b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-frontend/src/views/job-detail/module/jobDetail.vue
@@ -278,7 +278,6 @@ export default {
name: 'OperationJobs',
data() {
return {
- isGuest: window.localStorage.getItem('isGuest') === 'true',
viewMode: true,
jobName: '',
searchForm: {
diff --git
a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-frontend/src/views/job-status/module/jobStatus.vue
b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-frontend/src/views/job-status/module/jobStatus.vue
index 616be0a..0ea8b1e 100644
---
a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-frontend/src/views/job-status/module/jobStatus.vue
+++
b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-frontend/src/views/job-status/module/jobStatus.vue
@@ -182,7 +182,6 @@ export default {
name: 'JobStatus',
data() {
return {
- isGuest: window.localStorage.getItem('isGuest') === 'true',
activeTabName: 'running',
lazyInit: true,
columnRunning: [
diff --git
a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-frontend/src/views/login/index.vue
b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-frontend/src/views/login/index.vue
index 6b26648..17bc82d 100644
---
a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-frontend/src/views/login/index.vue
+++
b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-frontend/src/views/login/index.vue
@@ -104,7 +104,6 @@ export default {
const store = window.localStorage
store.setItem('Access-Token', data.accessToken)
store.setItem('username', data.username)
- store.setItem('isGuest', data.isGuest)
location.href = '#/app-config'
})
}
diff --git
a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-frontend/src/views/registry-center/module/registryCenter.vue
b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-frontend/src/views/registry-center/module/registryCenter.vue
index ce9540f..f77a6c8 100644
---
a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-frontend/src/views/registry-center/module/registryCenter.vue
+++
b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-frontend/src/views/registry-center/module/registryCenter.vue
@@ -19,7 +19,6 @@
<el-row class="box-card">
<div class="btn-group">
<el-button
- :disabled="isGuest"
class="btn-plus"
type="primary"
icon="el-icon-plus"
@@ -45,7 +44,6 @@
>
<el-button
:type="scope.row.activated ? 'success' : 'primary'"
- :disabled="isGuest"
icon="el-icon-link"
size="small"
@click="handleConnect(scope.row)"
@@ -58,7 +56,6 @@
placement="top"
>
<el-button
- :disabled="isGuest"
size="small"
type="danger"
icon="el-icon-delete"
@@ -128,7 +125,6 @@ export default {
data() {
return {
addDialogVisible: false,
- isGuest: window.localStorage.getItem('isGuest') === 'true',
column: [
{
label: this.$t('registryCenter').registDialog.name,
diff --git
a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/security/AuthenticationFilter.java
b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/security/AuthenticationFilter.java
index b4b832a..98541d5 100644
---
a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/security/AuthenticationFilter.java
+++
b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/security/AuthenticationFilter.java
@@ -80,10 +80,9 @@ public final class AuthenticationFilter implements Filter {
}
httpResponse.setContentType("application/json");
httpResponse.setCharacterEncoding("UTF-8");
- Map<String, Object> result = new HashMap<>(4, 1);
+ Map<String, Object> result = new HashMap<>(2, 1);
result.put("username", authenticationResult.getUsername());
- result.put("accessToken",
userAuthenticationService.getToken(authenticationResult.getUsername(),
authenticationResult.isGuest()));
- result.put("isGuest", authenticationResult.isGuest());
+ result.put("accessToken",
userAuthenticationService.getToken(authenticationResult.getUsername()));
objectMapper.writeValue(httpResponse.getWriter(),
ResponseResultUtil.build(result));
} catch (IOException e) {
e.printStackTrace();
diff --git
a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/security/AuthenticationResult.java
b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/security/AuthenticationResult.java
index 4531a75..fa5536c 100644
---
a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/security/AuthenticationResult.java
+++
b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/security/AuthenticationResult.java
@@ -32,7 +32,4 @@ public final class AuthenticationResult {
private final String password;
private final boolean success;
-
- private final boolean isGuest;
-
}
diff --git
a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/security/UserAuthenticationService.java
b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/security/UserAuthenticationService.java
index ba2f0e2..7082f5c 100644
---
a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/security/UserAuthenticationService.java
+++
b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/security/UserAuthenticationService.java
@@ -46,13 +46,9 @@ public final class UserAuthenticationService {
private final JWTVerifier verifier =
JWT.require(algorithm).withIssuer(JWT_TOKEN_ISSUER).build();
- private String rootUsername;
+ private String username;
- private String rootPassword;
-
- private String guestUsername;
-
- private String guestPassword;
+ private String password;
private int tokenExpiresAfterSeconds = 3600;
@@ -64,15 +60,12 @@ public final class UserAuthenticationService {
*/
public AuthenticationResult checkUser(final UserAccount userAccount) {
if (null == userAccount ||
Strings.isNullOrEmpty(userAccount.getUsername()) ||
Strings.isNullOrEmpty(userAccount.getPassword())) {
- return new AuthenticationResult(null, null, false, false);
- }
- if (rootUsername.equals(userAccount.getUsername()) &&
rootPassword.equals(userAccount.getPassword())) {
- return new AuthenticationResult(rootUsername, rootPassword, true,
false);
+ return new AuthenticationResult(null, null, false);
}
- if (guestUsername.equals(userAccount.getUsername()) &&
guestPassword.equals(userAccount.getPassword())) {
- return new AuthenticationResult(guestUsername, guestPassword,
true, true);
+ if (username.equals(userAccount.getUsername()) &&
password.equals(userAccount.getPassword())) {
+ return new AuthenticationResult(username, password, true);
}
- return new AuthenticationResult(null, null, false, false);
+ return new AuthenticationResult(null, null, false);
}
/**
@@ -80,10 +73,9 @@ public final class UserAuthenticationService {
*
* @return authentication token
*/
- public String getToken(final String username, final boolean isGuest) {
- Map<String, Object> payload = new HashMap<>(2, 1);
+ public String getToken(final String username) {
+ Map<String, Object> payload = new HashMap<>(1, 1);
payload.put("username", username);
- payload.put("isGuest", isGuest);
Date expiresAt = new Date(System.currentTimeMillis() +
TimeUnit.SECONDS.toMillis(tokenExpiresAfterSeconds));
return
JWT.create().withExpiresAt(expiresAt).withIssuer(JWT_TOKEN_ISSUER).withPayload(payload).sign(algorithm);
}
diff --git
a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/resources/application.properties
b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/resources/application.properties
index 44f85a4..e2177b2 100644
---
a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/resources/application.properties
+++
b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/resources/application.properties
@@ -17,10 +17,8 @@
server.port=8088
-auth.root_username=root
-auth.root_password=root
-auth.guest_username=guest
-auth.guest_password=guest
+auth.username=root
+auth.password=root
auth.token_expires_after_seconds=3600
spring.datasource.default.driver-class-name=org.h2.Driver
diff --git
a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/data-source/module/dataSource.vue
b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/data-source/module/dataSource.vue
index ec9b4c9..ed89c55 100644
---
a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/data-source/module/dataSource.vue
+++
b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/data-source/module/dataSource.vue
@@ -19,7 +19,6 @@
<el-row class="box-card">
<div class="btn-group">
<el-button
- :disabled="isGuest"
class="btn-plus"
type="primary"
icon="el-icon-plus"
@@ -45,7 +44,6 @@
>
<el-button
:type="scope.row.activated ? 'success' : 'primary'"
- :disabled="isGuest"
icon="el-icon-link"
size="small"
@click="handleConnect(scope.row)"
@@ -58,7 +56,6 @@
placement="top"
>
<el-button
- :disabled="isGuest"
size="small"
type="danger"
icon="el-icon-delete"
@@ -150,7 +147,6 @@ export default {
return {
regustDialogVisible: false,
availableDriverClasses: [],
- isGuest: window.localStorage.getItem('isGuest') === 'true',
column: [
{
label: this.$t('dataSource').addDialog.name,
diff --git
a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/login/index.vue
b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/login/index.vue
index 03373ba..cd7ebc0 100644
---
a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/login/index.vue
+++
b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/login/index.vue
@@ -104,7 +104,6 @@ export default {
const store = window.localStorage
store.setItem('Access-Token', data.accessToken)
store.setItem('username', data.username)
- store.setItem('isGuest', data.isGuest)
location.href = '#/registry-center'
})
}
diff --git
a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-jobs-detail/module/operationJobsDetail.vue
b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-jobs-detail/module/operationJobsDetail.vue
index 4236c0e..2fba2e3 100644
---
a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-jobs-detail/module/operationJobsDetail.vue
+++
b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-jobs-detail/module/operationJobsDetail.vue
@@ -79,14 +79,12 @@
<el-button-group>
<el-button
v-if="'DISABLED'===scope.row.status"
- :disabled="isGuest"
size="mini"
type="success"
plain
@click="handleEnable(scope.row)">{{
$t("operationJobs.actionText.enable") }}</el-button>
<el-button
v-if="'PENDING'===scope.row.status"
- :disabled="isGuest"
size="mini"
type="warning"
plain
@@ -106,7 +104,6 @@ export default {
name: 'OperationJobs',
data() {
return {
- isGuest: window.localStorage.getItem('isGuest') === 'true',
jobName: '',
column: [
{
diff --git
a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-jobs/module/operationJobs.vue
b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-jobs/module/operationJobs.vue
index b71ac71..aa6478c 100644
---
a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-jobs/module/operationJobs.vue
+++
b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-jobs/module/operationJobs.vue
@@ -63,7 +63,6 @@
<template slot-scope="scope">
<el-button-group>
<el-button
- :disabled="isGuest"
size="mini"
type="primary"
plain
@@ -76,35 +75,30 @@
@click="handleDetail(scope.row)">{{
$t("operationJobs.actionText.detail") }}</el-button>
<el-button
v-if="'OK'===scope.row.status"
- :disabled="isGuest"
size="mini"
type="success"
plain
@click="handleTrigger(scope.row)">{{
$t("operationJobs.actionText.trigger") }}</el-button>
<el-button
v-if="'DISABLED'===scope.row.status"
- :disabled="isGuest"
size="mini"
type="success"
plain
@click="handleEnable(scope.row)">{{
$t("operationJobs.actionText.enable") }}</el-button>
<el-button
v-if="'OK'===scope.row.status"
- :disabled="isGuest"
size="mini"
type="warning"
plain
@click="handleDisable(scope.row)">{{
$t("operationJobs.actionText.disable") }}</el-button>
<el-button
v-if="'CRASHED'!==scope.row.status"
- :disabled="isGuest"
size="mini"
type="danger"
plain
@click="handleShutdown(scope.row)">{{
$t("operationJobs.actionText.shutdown") }}</el-button>
<el-button
v-if="'CRASHED'===scope.row.status"
- :disabled="isGuest"
size="mini"
type="danger"
icon="el-icon-delete"
@@ -331,7 +325,6 @@ export default {
data() {
return {
modifyDialogVisible: false,
- isGuest: window.localStorage.getItem('isGuest') === 'true',
column: [
{
label: this.$t('operationJobs').labelInfo.jobName,
diff --git
a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-servers-detail/module/operationServersDetail.vue
b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-servers-detail/module/operationServersDetail.vue
index e96302e..ff2f455 100644
---
a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-servers-detail/module/operationServersDetail.vue
+++
b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-servers-detail/module/operationServersDetail.vue
@@ -118,28 +118,24 @@
<el-button-group>
<el-button
v-if="scope.row.instanceCount && 'DISABLED'===scope.row.status"
- :disabled="isGuest"
size="mini"
type="success"
plain
@click="handleEnable(scope.row)">{{
$t("operationServers.actionText.enable") }}</el-button>
<el-button
v-if="scope.row.instanceCount && 'OK'===scope.row.status"
- :disabled="isGuest"
size="mini"
type="warning"
plain
@click="handleDisable(scope.row)">{{
$t("operationServers.actionText.disable") }}</el-button>
<el-button
v-if="scope.row.instanceCount"
- :disabled="isGuest"
size="mini"
type="danger"
plain
@click="handleShutdown(scope.row)">{{
$t("operationServers.actionText.shutdown") }}</el-button>
<el-button
v-if="!scope.row.instanceCount"
- :disabled="isGuest"
size="mini"
type="danger"
plain
@@ -169,7 +165,6 @@ export default {
name: 'OperationServers',
data() {
return {
- isGuest: window.localStorage.getItem('isGuest') === 'true',
serverIp: '',
columnJobName: {
label: this.$t('operationServers').labelInfo.jobName,
diff --git
a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-servers/module/operationServers.vue
b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-servers/module/operationServers.vue
index 2cad2d4..40f6bab 100644
---
a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-servers/module/operationServers.vue
+++
b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-servers/module/operationServers.vue
@@ -63,28 +63,24 @@
@click="handleDetail(scope.row)">{{
$t("operationServers.actionText.detail") }}</el-button>
<el-button
v-if="scope.row.instancesNum && scope.row.disabledJobsNum"
- :disabled="isGuest"
size="mini"
type="success"
plain
@click="handleEnable(scope.row)">{{
$t("operationServers.actionText.enable") }}</el-button>
<el-button
v-if="0===scope.row.disabledJobsNum && scope.row.instancesNum"
- :disabled="isGuest"
size="mini"
type="warning"
plain
@click="handleDisable(scope.row)">{{
$t("operationServers.actionText.disable") }}</el-button>
<el-button
v-if="scope.row.instancesNum"
- :disabled="isGuest"
size="mini"
type="danger"
plain
@click="handleShutdown(scope.row)">{{
$t("operationServers.actionText.shutdown") }}</el-button>
<el-button
v-if="0===scope.row.instancesNum"
- :disabled="isGuest"
size="mini"
type="danger"
icon="el-icon-delete"
@@ -114,7 +110,6 @@ export default {
name: 'OperationServers',
data() {
return {
- isGuest: window.localStorage.getItem('isGuest') === 'true',
column: [
{
label: this.$t('operationServers').labelInfo.serverIp,
diff --git
a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/registry-center/module/registryCenter.vue
b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/registry-center/module/registryCenter.vue
index e397cc7..90276eb 100644
---
a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/registry-center/module/registryCenter.vue
+++
b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/registry-center/module/registryCenter.vue
@@ -19,7 +19,6 @@
<el-row class="box-card">
<div class="btn-group">
<el-button
- :disabled="isGuest"
class="btn-plus"
type="primary"
icon="el-icon-plus"
@@ -45,7 +44,6 @@
>
<el-button
:type="scope.row.activated ? 'success' : 'primary'"
- :disabled="isGuest"
icon="el-icon-link"
size="small"
@click="handleConnect(scope.row)"
@@ -58,7 +56,6 @@
placement="top"
>
<el-button
- :disabled="isGuest"
size="small"
type="danger"
icon="el-icon-delete"
@@ -128,7 +125,6 @@ export default {
data() {
return {
addDialogVisible: false,
- isGuest: window.localStorage.getItem('isGuest') === 'true',
column: [
{
label: this.$t('registryCenter').registDialog.name,
