This is an automated email from the ASF dual-hosted git repository.
liyang pushed a commit to branch kylin5
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit b03278ad46af7432bdb0a875e9054386bcb088a4
Author: jlf <longfei.ji...@kyligence.io>
AuthorDate: Thu Oct 12 14:20:12 2023 +0800
KYLIN-5851 Fix weak password configuration item
---
.../src/main/resources/config/init.properties | 2 +-
.../src/main/resources/config/init_min.properties | 2 +-
.../src/main/resources/kylin-defaults0.properties | 4 +-
src/core-job/pom.xml | 3 +-
.../main/resources/mybatis-generator-config.xml | 65 ----------------------
.../src/main/resources/config/init.properties | 2 +-
.../src/main/resources/config/init_min.properties | 2 +-
.../src/main/resources/config/init.properties | 2 +-
.../src/main/resources/config/init_min.properties | 2 +-
.../src/main/resources/config/init.properties | 2 +-
.../src/main/resources/config/init_min.properties | 2 +-
11 files changed, 12 insertions(+), 76 deletions(-)
diff --git a/src/common-booter/src/main/resources/config/init.properties
b/src/common-booter/src/main/resources/config/init.properties
index 8ba5a4539c..63aab73eb1 100644
--- a/src/common-booter/src/main/resources/config/init.properties
+++ b/src/common-booter/src/main/resources/config/init.properties
@@ -32,7 +32,7 @@ kylin.env.channel=cloud
kylin.monitor.enabled=false
kylin.influxdb.address=localhost:8086
kylin.influxdb.username=root
-kylin.influxdb.password=root
+kylin.influxdb.password=ENC('NyiG//i7loPFfdUoO9BFuA==')
kylin.influxdb.https.enabled=false
# daily operations
kylin.garbage.storage.executable-survival-time-threshold=30d
diff --git a/src/common-booter/src/main/resources/config/init_min.properties
b/src/common-booter/src/main/resources/config/init_min.properties
index 535f8b45f7..26b7a4a3e5 100644
--- a/src/common-booter/src/main/resources/config/init_min.properties
+++ b/src/common-booter/src/main/resources/config/init_min.properties
@@ -38,7 +38,7 @@ kylin.env.channel=cloud
kylin.monitor.enabled=false
kylin.influxdb.address=localhost:8086
kylin.influxdb.username=root
-kylin.influxdb.password=root
+kylin.influxdb.password=ENC('NyiG//i7loPFfdUoO9BFuA==')
kylin.influxdb.https.enabled=false
# daily operations
kylin.garbage.storage.executable-survival-time-threshold=30d
diff --git a/src/core-common/src/main/resources/kylin-defaults0.properties
b/src/core-common/src/main/resources/kylin-defaults0.properties
index c0c0347925..0c84645ff7 100644
--- a/src/core-common/src/main/resources/kylin-defaults0.properties
+++ b/src/core-common/src/main/resources/kylin-defaults0.properties
@@ -35,7 +35,7 @@ kylin.env.zookeeper-connect-string=
# save for InfluxDB
kylin.influxdb.address=localhost:8086
kylin.influxdb.username=root
-kylin.influxdb.password=root
+kylin.influxdb.password=ENC('NyiG//i7loPFfdUoO9BFuA==')
kylin.influxdb.https.enabled=false
# daily operations
kylin.garbage.storage.executable-survival-time-threshold=30d
@@ -385,7 +385,7 @@ kylin.cache.config=classpath:ehcache.xml
kylin.cache.redis.enabled=false
kylin.cache.redis.cluster-enabled=false
kylin.cache.redis.hosts=localhost:6379
-kylin.cache.redis.password=
+#kylin.cache.redis.password=
kylin.cache.redis.expire-time-unit=EX
kylin.cache.redis.expire-time=86400
kylin.cache.redis.exception-expire-time=600
diff --git a/src/core-job/pom.xml b/src/core-job/pom.xml
index 5f54b1e486..b78ebb3699 100644
--- a/src/core-job/pom.xml
+++ b/src/core-job/pom.xml
@@ -20,7 +20,7 @@
<packaging>jar</packaging>
<name>Kylin - Core Job</name>
<url>http://kylin.apache.org</url>
- <description>Kylin Core Job</description>
+ <description>Kylin Core Job</description>
<parent>
<groupId>org.apache.kylin</groupId>
@@ -148,6 +148,7 @@
<build>
<plugins>
+ <!-- use plugin: mybatis-generator-maven-plugin, need add
mybatis-generator-config.xml in resource directory -->
<plugin>
<groupId>org.mybatis.generator</groupId>
<artifactId>mybatis-generator-maven-plugin</artifactId>
diff --git a/src/core-job/src/main/resources/mybatis-generator-config.xml
b/src/core-job/src/main/resources/mybatis-generator-config.xml
deleted file mode 100644
index 269285ebb6..0000000000
--- a/src/core-job/src/main/resources/mybatis-generator-config.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (C) 2020 Kyligence Inc. All rights reserved.
- *
- * http://kyligence.io
- *
- * This software is the confidential and proprietary information of
- * Kyligence Inc. ("Confidential Information"). You shall not disclose
- * such Confidential Information and shall use it only in accordance
- * with the terms of the license agreement you entered into with
- * Kyligence Inc.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
--->
-
-<!DOCTYPE generatorConfiguration
- PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
- "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd";>
-<generatorConfiguration>
-
- <classPathEntry
location="/Users/yu.gan/Desktop/sandbox/yinglong/mysql-connector-java-5.1.41.jar"/>
-
- <context id="dataLoading" targetRuntime="MyBatis3">
-
- <commentGenerator>
- <property name="suppressAllComments" value="true"/>
- </commentGenerator>
-
- <jdbcConnection driverClass="com.mysql.jdbc.Driver"
- connectionURL="jdbc:mysql://localhost:3306/kylin"
- userId="root"
- password="12345678!"/>
-
- <javaModelGenerator targetPackage="io.kyligence.kap.job.domain"
targetProject="src/main/java"/>
-
- <sqlMapGenerator targetPackage="mybatis-mapper"
targetProject="src/main/resources"/>
-
- <javaClientGenerator type="XMLMAPPER"
targetPackage="io.kyligence.kap.job.mapper" targetProject="src/main/java"/>
-
- <table tableName="job_info" domainObjectName="JobInfo"
mapperName="JobInfoMapper"
- enableCountByExample="false" enableUpdateByExample="false"
enableDeleteByExample="false"
- enableSelectByExample="false" selectByExampleQueryId="false">
- <property name="useActualColumnNames" value="false"/>
- </table>
-
- <table tableName="job_lock" domainObjectName="JobLock"
mapperName="JobLockMapper"
- enableCountByExample="false" enableUpdateByExample="false"
enableDeleteByExample="false"
- enableSelectByExample="false" selectByExampleQueryId="false">
- <property name="useActualColumnNames" value="false"/>
- </table>
-
- </context>
-</generatorConfiguration>
\ No newline at end of file
diff --git a/src/data-loading-booter/src/main/resources/config/init.properties
b/src/data-loading-booter/src/main/resources/config/init.properties
index c3dc41a610..cd8dd06e97 100644
--- a/src/data-loading-booter/src/main/resources/config/init.properties
+++ b/src/data-loading-booter/src/main/resources/config/init.properties
@@ -32,7 +32,7 @@ kylin.env.channel=cloud
kylin.monitor.enabled=false
kylin.influxdb.address=localhost:8086
kylin.influxdb.username=root
-kylin.influxdb.password=root
+kylin.influxdb.password=ENC('NyiG//i7loPFfdUoO9BFuA==')
kylin.influxdb.https.enabled=false
# daily operations
kylin.garbage.storage.executable-survival-time-threshold=30d
diff --git
a/src/data-loading-booter/src/main/resources/config/init_min.properties
b/src/data-loading-booter/src/main/resources/config/init_min.properties
index 8b0478d81d..1975c1ee6d 100644
--- a/src/data-loading-booter/src/main/resources/config/init_min.properties
+++ b/src/data-loading-booter/src/main/resources/config/init_min.properties
@@ -38,7 +38,7 @@ kylin.env.channel=cloud
kylin.monitor.enabled=false
kylin.influxdb.address=localhost:8086
kylin.influxdb.username=root
-kylin.influxdb.password=root
+kylin.influxdb.password=ENC('NyiG//i7loPFfdUoO9BFuA==')
kylin.influxdb.https.enabled=false
# daily operations
kylin.garbage.storage.executable-survival-time-threshold=30d
diff --git a/src/ops-booter/src/main/resources/config/init.properties
b/src/ops-booter/src/main/resources/config/init.properties
index d5488d33e5..8855774547 100644
--- a/src/ops-booter/src/main/resources/config/init.properties
+++ b/src/ops-booter/src/main/resources/config/init.properties
@@ -32,7 +32,7 @@ kylin.env.channel=cloud
kylin.monitor.enabled=false
kylin.influxdb.address=localhost:8086
kylin.influxdb.username=root
-kylin.influxdb.password=root
+kylin.influxdb.password=ENC('NyiG//i7loPFfdUoO9BFuA==')
kylin.influxdb.https.enabled=false
# daily operations
kylin.garbage.storage.executable-survival-time-threshold=30d
diff --git a/src/ops-booter/src/main/resources/config/init_min.properties
b/src/ops-booter/src/main/resources/config/init_min.properties
index 43de8dfab6..bebd00a4d7 100644
--- a/src/ops-booter/src/main/resources/config/init_min.properties
+++ b/src/ops-booter/src/main/resources/config/init_min.properties
@@ -38,7 +38,7 @@ kylin.env.channel=cloud
kylin.monitor.enabled=false
kylin.influxdb.address=localhost:8086
kylin.influxdb.username=root
-kylin.influxdb.password=root
+kylin.influxdb.password=ENC('NyiG//i7loPFfdUoO9BFuA==')
kylin.influxdb.https.enabled=false
# daily operations
kylin.garbage.storage.executable-survival-time-threshold=30d
diff --git a/src/query-booter/src/main/resources/config/init.properties
b/src/query-booter/src/main/resources/config/init.properties
index 7d84ae5df8..f13403b434 100644
--- a/src/query-booter/src/main/resources/config/init.properties
+++ b/src/query-booter/src/main/resources/config/init.properties
@@ -32,7 +32,7 @@ kylin.env.channel=cloud
kylin.monitor.enabled=false
kylin.influxdb.address=localhost:8086
kylin.influxdb.username=root
-kylin.influxdb.password=root
+kylin.influxdb.password=ENC('NyiG//i7loPFfdUoO9BFuA==')
kylin.influxdb.https.enabled=false
# daily operations
kylin.garbage.storage.executable-survival-time-threshold=30d
diff --git a/src/query-booter/src/main/resources/config/init_min.properties
b/src/query-booter/src/main/resources/config/init_min.properties
index 9fada7143e..d55d15aaad 100644
--- a/src/query-booter/src/main/resources/config/init_min.properties
+++ b/src/query-booter/src/main/resources/config/init_min.properties
@@ -38,7 +38,7 @@ kylin.env.channel=cloud
kylin.monitor.enabled=false
kylin.influxdb.address=localhost:8086
kylin.influxdb.username=root
-kylin.influxdb.password=root
+kylin.influxdb.password=ENC('NyiG//i7loPFfdUoO9BFuA==')
kylin.influxdb.https.enabled=false
# daily operations
kylin.garbage.storage.executable-survival-time-threshold=30d
