This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris-manager.git
The following commit(s) were added to refs/heads/master by this push:
new 2a15312 [fix] remove some sensitive info (#3)
2a15312 is described below
commit 2a1531215e7450ecd0ace46abde872bdec98c510
Author: caijunhui81 <[email protected]>
AuthorDate: Thu Feb 17 23:14:34 2022 +0800
[fix] remove some sensitive info (#3)
---
manager/conf/manager.conf | 2 +-
.../src/main/java/org/apache/doris/manager/agent/util/Request.java | 2 +-
.../src/main/java/org/apache/doris/stack/util/TelnetUtil.java | 2 +-
...ger Server \346\216\245\345\217\243\346\226\207\346\241\243.md" | 2 +-
manager/doris-manager/config/webpack.dev.config.js | 4 ++--
.../apache/doris/stack/exception/DorisHttpPortErrorException.java | 7 -------
.../org/apache/doris/stack/exception/DorisIpErrorException.java | 7 -------
.../apache/doris/stack/exception/DorisJdbcPortErrorException.java | 7 -------
.../apache/doris/stack/exception/DorisUerOrPassErrorException.java | 7 -------
.../doris/stack/exception/DorisUserNoPermissionException.java | 7 -------
.../apache/doris/stack/service/user/AuthenticationServiceTest.java | 6 +++---
.../java/org/apache/doris/stack/service/user/UserServiceTest.java | 6 +++---
.../src/main/java/org/apache/doris/stack/ManagerSwaggerConfig.java | 2 +-
.../org/apache/doris/stack/service/PaloUserSpaceServiceTest.java | 4 ++--
14 files changed, 15 insertions(+), 50 deletions(-)
diff --git a/manager/conf/manager.conf b/manager/conf/manager.conf
index 32c31d5..63bff58 100644
--- a/manager/conf/manager.conf
+++ b/manager/conf/manager.conf
@@ -51,7 +51,7 @@ MB_DB_TYPE=mysql
# The name of the current Doris manage service instance is as follows by
default and
# can be customized and modified according to the actual situation
-# DS_SITE_NAME=Baidu-Doris-Manager
+# DS_SITE_NAME=test-Doris-Manager
# The language of the current Doris manage service instance is Chinese (zh) by
default, and can support zh and en
# DS_SITE_LOCALE=zh
diff --git
a/manager/dm-agent/src/main/java/org/apache/doris/manager/agent/util/Request.java
b/manager/dm-agent/src/main/java/org/apache/doris/manager/agent/util/Request.java
index a71321f..8e3570f 100644
---
a/manager/dm-agent/src/main/java/org/apache/doris/manager/agent/util/Request.java
+++
b/manager/dm-agent/src/main/java/org/apache/doris/manager/agent/util/Request.java
@@ -108,7 +108,7 @@ public class Request {
}
public static void main(String[] args) {
- String rResult = sendGetRequest("http://www.baidu.com";, new
HashMap<>());
+ String rResult = sendGetRequest("http://www.test.com";, new
HashMap<>());
System.out.println(rResult);
}
diff --git
a/manager/dm-server/src/main/java/org/apache/doris/stack/util/TelnetUtil.java
b/manager/dm-server/src/main/java/org/apache/doris/stack/util/TelnetUtil.java
index 9545507..516a770 100644
---
a/manager/dm-server/src/main/java/org/apache/doris/stack/util/TelnetUtil.java
+++
b/manager/dm-server/src/main/java/org/apache/doris/stack/util/TelnetUtil.java
@@ -37,6 +37,6 @@ public class TelnetUtil {
}
public static void main(String[] args) {
- telnet("www.baidu.com", 11111);
+ telnet("www.test.com", 11111);
}
}
diff --git "a/manager/doc/Doris Manager Server
\346\216\245\345\217\243\346\226\207\346\241\243.md" "b/manager/doc/Doris
Manager Server \346\216\245\345\217\243\346\226\207\346\241\243.md"
index feec4d2..98855e3 100644
--- "a/manager/doc/Doris Manager Server
\346\216\245\345\217\243\346\226\207\346\241\243.md"
+++ "b/manager/doc/Doris Manager Server
\346\216\245\345\217\243\346\226\207\346\241\243.md"
@@ -50,7 +50,7 @@
``` json
{
"clusterId":"1",
-
"packageUrl":"https://palo-cloud-repo-bd.bd.bcebos.com/baidu-doris-release/PALO-0.15.1-rc03-no-avx2-binary.tar.gz";,
+
"packageUrl":"https://localhost/doris-release/PALO-0.15.1-rc03-no-avx2-binary.tar.gz";,
"installDir":"/usr/local/doris",
"hosts":["10.10.10.11"],
"user":"root",
diff --git a/manager/doris-manager/config/webpack.dev.config.js
b/manager/doris-manager/config/webpack.dev.config.js
index e5d4f49..8012d95 100644
--- a/manager/doris-manager/config/webpack.dev.config.js
+++ b/manager/doris-manager/config/webpack.dev.config.js
@@ -20,9 +20,9 @@ const path = require("path");
const { merge } = require("webpack-merge");
const { webpack } = require("webpack");
-const SERVER_QA = 'http://st01-meg-lijiu02-403.st01.baidu.com:8090';
+const SERVER_QA = 'http://127.0.0.1:8090';
-const SERVER_RD = 'http://www.baidu.com:8080';
+const SERVER_RD = 'http://127.0.0.1:8080';
module.exports = merge(webpackBaseConfig, {
mode: "development",
devtool: "eval-source-map",
diff --git
a/manager/general/src/main/java/org/apache/doris/stack/exception/DorisHttpPortErrorException.java
b/manager/general/src/main/java/org/apache/doris/stack/exception/DorisHttpPortErrorException.java
index 83c9d67..2a6350d 100644
---
a/manager/general/src/main/java/org/apache/doris/stack/exception/DorisHttpPortErrorException.java
+++
b/manager/general/src/main/java/org/apache/doris/stack/exception/DorisHttpPortErrorException.java
@@ -17,13 +17,6 @@
package org.apache.doris.stack.exception;
-/**
- * Copyright (C) 2020 Baidu, Inc. All Rights Reserved.
- *
- * @Author: [email protected]
- * @Description：
- * @Date: 2021/10/18
- */
public class DorisHttpPortErrorException extends Exception {
public static final String MESSAGE = "HTTP端口无法访问，请检查后重新输入";
diff --git
a/manager/general/src/main/java/org/apache/doris/stack/exception/DorisIpErrorException.java
b/manager/general/src/main/java/org/apache/doris/stack/exception/DorisIpErrorException.java
index 6743490..784ffc0 100644
---
a/manager/general/src/main/java/org/apache/doris/stack/exception/DorisIpErrorException.java
+++
b/manager/general/src/main/java/org/apache/doris/stack/exception/DorisIpErrorException.java
@@ -17,13 +17,6 @@
package org.apache.doris.stack.exception;
-/**
- * Copyright (C) 2020 Baidu, Inc. All Rights Reserved.
- *
- * @Author: [email protected]
- * @Description：
- * @Date: 2021/10/18
- */
public class DorisIpErrorException extends Exception {
public static final String MESSAGE = "IP地址无法访问，请检查后重新输入";
diff --git
a/manager/general/src/main/java/org/apache/doris/stack/exception/DorisJdbcPortErrorException.java
b/manager/general/src/main/java/org/apache/doris/stack/exception/DorisJdbcPortErrorException.java
index 86b327b..f6f541a 100644
---
a/manager/general/src/main/java/org/apache/doris/stack/exception/DorisJdbcPortErrorException.java
+++
b/manager/general/src/main/java/org/apache/doris/stack/exception/DorisJdbcPortErrorException.java
@@ -17,13 +17,6 @@
package org.apache.doris.stack.exception;
-/**
- * Copyright (C) 2020 Baidu, Inc. All Rights Reserved.
- *
- * @Author: [email protected]
- * @Description：
- * @Date: 2021/10/18
- */
public class DorisJdbcPortErrorException extends Exception {
public static final String MESSAGE = "JDBC端口无法访问，请检查后重新输入";
diff --git
a/manager/general/src/main/java/org/apache/doris/stack/exception/DorisUerOrPassErrorException.java
b/manager/general/src/main/java/org/apache/doris/stack/exception/DorisUerOrPassErrorException.java
index f0ca130..cf787db 100644
---
a/manager/general/src/main/java/org/apache/doris/stack/exception/DorisUerOrPassErrorException.java
+++
b/manager/general/src/main/java/org/apache/doris/stack/exception/DorisUerOrPassErrorException.java
@@ -17,13 +17,6 @@
package org.apache.doris.stack.exception;
-/**
- * Copyright (C) 2020 Baidu, Inc. All Rights Reserved.
- *
- * @Author: [email protected]
- * @Description：
- * @Date: 2021/10/18
- */
public class DorisUerOrPassErrorException extends Exception {
public static final String MESSAGE = "用户名/密码错误，请检查后重新输入";
diff --git
a/manager/general/src/main/java/org/apache/doris/stack/exception/DorisUserNoPermissionException.java
b/manager/general/src/main/java/org/apache/doris/stack/exception/DorisUserNoPermissionException.java
index 728b20b..eaf354c 100644
---
a/manager/general/src/main/java/org/apache/doris/stack/exception/DorisUserNoPermissionException.java
+++
b/manager/general/src/main/java/org/apache/doris/stack/exception/DorisUserNoPermissionException.java
@@ -17,13 +17,6 @@
package org.apache.doris.stack.exception;
-/**
- * Copyright (C) 2020 Baidu, Inc. All Rights Reserved.
- *
- * @Author: [email protected]
- * @Description：
- * @Date: 2021/10/18
- */
public class DorisUserNoPermissionException extends Exception {
public static final String MESSAGE = "用户不具备集群Admin权限，请更换其他具备权限用户";
diff --git
a/manager/general/src/test/java/org/apache/doris/stack/service/user/AuthenticationServiceTest.java
b/manager/general/src/test/java/org/apache/doris/stack/service/user/AuthenticationServiceTest.java
index dcf841d..d4cd4ee 100644
---
a/manager/general/src/test/java/org/apache/doris/stack/service/user/AuthenticationServiceTest.java
+++
b/manager/general/src/test/java/org/apache/doris/stack/service/user/AuthenticationServiceTest.java
@@ -205,7 +205,7 @@ public class AuthenticationServiceTest {
public void testLogin() throws Exception {
log.debug("test login.");
String passwd = "ewe232";
- String userName = "[email protected]";
+ String userName = "[email protected]";
int userId = 1;
when(environment.getProperty(PropertyDefine.LOGIN_DELAY_TIME_PROPERTY)).thenReturn("300000");
when(environment.getProperty(PropertyDefine.MAX_LOGIN_FAILED_TIMES_PROPERTY)).thenReturn("10");
@@ -696,7 +696,7 @@ public class AuthenticationServiceTest {
@Transactional
public void testForgetPassword() throws Exception {
log.debug("test forget password.");
- String email = "{\"email\":\"[email protected]\"}";
+ String email = "{\"email\":\"[email protected]\"}";
String hostName = "ss";
when(ldapComponent.enabled()).thenReturn(true);
// ldap user can't be reseted password
@@ -717,7 +717,7 @@ public class AuthenticationServiceTest {
Assert.assertEquals(ResetPasswordTokenException.MESSAGE,
e.getMessage());
}
// mock user
-
when(userRepository.getByEmail("[email protected]")).thenReturn(Lists.newArrayList(userEntity));
+
when(userRepository.getByEmail("[email protected]")).thenReturn(Lists.newArrayList(userEntity));
String resetTokenStr = UuidUtil.newUuid();
// mock reset password token
when(utilService.resetUserToken(userEntity,
false)).thenReturn(resetTokenStr);
diff --git
a/manager/general/src/test/java/org/apache/doris/stack/service/user/UserServiceTest.java
b/manager/general/src/test/java/org/apache/doris/stack/service/user/UserServiceTest.java
index 2c8aa8c..4dfe705 100644
---
a/manager/general/src/test/java/org/apache/doris/stack/service/user/UserServiceTest.java
+++
b/manager/general/src/test/java/org/apache/doris/stack/service/user/UserServiceTest.java
@@ -311,7 +311,7 @@ public class UserServiceTest {
int userId = 2;
int defaultGroupId = 3;
int allUserGroupId = 4;
- String email = "[email protected]";
+ String email = "[email protected]";
UserAddReq userAddReq = new UserAddReq();
when(ldapComponent.enabled()).thenReturn(true);
// request exception
@@ -434,7 +434,7 @@ public class UserServiceTest {
public void testUpdateUser() throws Exception {
log.debug("test update user.");
String name = "name";
- String email = "[email protected]";
+ String email = "[email protected]";
int userId = 1;
int requestId = 2;
int groupId = 3;
@@ -680,7 +680,7 @@ public class UserServiceTest {
invitor.setId(requestId);
CoreUserEntity user = new CoreUserEntity();
user.setId(userId);
- user.setEmail("[email protected]");
+ user.setEmail("[email protected]");
user.setFirstName("first");
// mock Invitor
when(userRepository.findById(requestId)).thenReturn(Optional.of(invitor));
diff --git
a/manager/manager-server/src/main/java/org/apache/doris/stack/ManagerSwaggerConfig.java
b/manager/manager-server/src/main/java/org/apache/doris/stack/ManagerSwaggerConfig.java
index eeaafc2..24b8ac4 100644
---
a/manager/manager-server/src/main/java/org/apache/doris/stack/ManagerSwaggerConfig.java
+++
b/manager/manager-server/src/main/java/org/apache/doris/stack/ManagerSwaggerConfig.java
@@ -45,7 +45,7 @@ public class ManagerSwaggerConfig {
// title
.title("Doris-Manager server RESTful API")
// Creator
- .contact(new Contact("songchuanyuan", " ",
"[email protected]"))
+ .contact(new Contact("test", " ", "[email protected]"))
// version
.version("0.2")
// description
diff --git
a/manager/manager-server/src/test/java/org/apache/doris/stack/service/PaloUserSpaceServiceTest.java
b/manager/manager-server/src/test/java/org/apache/doris/stack/service/PaloUserSpaceServiceTest.java
index 7dfa9f8..a41a36b 100644
---
a/manager/manager-server/src/test/java/org/apache/doris/stack/service/PaloUserSpaceServiceTest.java
+++
b/manager/manager-server/src/test/java/org/apache/doris/stack/service/PaloUserSpaceServiceTest.java
@@ -165,7 +165,7 @@ public class PaloUserSpaceServiceTest {
String clusterName = "doris1";
createReq.setName(clusterName);
UserSpaceCreateReq.UserAdminInfo userAdminInfo = new
UserSpaceCreateReq.UserAdminInfo();
- userAdminInfo.setEmail("[email protected]");
+ userAdminInfo.setEmail("[email protected]");
userAdminInfo.setName("test");
userAdminInfo.setPassword("test@123");
createReq.setUser(userAdminInfo);
@@ -309,7 +309,7 @@ public class PaloUserSpaceServiceTest {
String clusterName = "doris1";
createReq.setName(clusterName);
UserSpaceCreateReq.UserAdminInfo userAdminInfo = new
UserSpaceCreateReq.UserAdminInfo();
- userAdminInfo.setEmail("[email protected]");
+ userAdminInfo.setEmail("[email protected]");
createReq.setUser(userAdminInfo);
// After initialization, use LDAP authentication
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
