From ed90e19eff577d539f7efd59fd4b4c2249098434 Mon Sep 17 00:00:00 2001 From: qiaozhanwei Date: Fri, 8 Nov 2019 18:24:01 +0800 Subject: [PATCH] dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187) * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml * .escheduler_env.sh to dolphinscheduler_env.sh * dao yml assembly to conf directory * table name modify * entity title table name modify * logback log name modify * running through the big process * running through the big process error modify * logback log name modify * data_source.properties rename * logback log name modify * install.sh optimization * install.sh optimization * command count modify * command state update * countCommandState sql update * countCommandState sql update * remove application.yml file * master.properties modify * install.sh modify * install.sh modify * api server startup modify * the current user quits and the session is completely emptied. bug fix * remove pom package resources * checkQueueNameExist method update * checkQueueExist * install.sh error output update * signOut error update * ProcessDao is null bug fix * install.sh add mail.user * request url variables replace * process define import bug fix * process define import export bug fix * processdefine import export bug fix * down log suffix format modify * import export process define contains crontab error bug fix * add Flink local mode * ProcessDao is null bug fix * loadAverage display problem bug fix * MasterServer rename Server * rollback .env * rollback .env * MasterServer rename Server * the task is abnormal and task is running bug fix * owners and administrators can delete * dockerfile optimization * dockerfile optimization * dockerfile optimization * remove application-alert.properties * task log print worker log bug fix * remove .escheduler_env.sh * change dockerfile email address * dockerfile dao application.properties and install.sh modify * application.properties modify * application.properties modify --- .../dolphinscheduler/conf/application.properties | 12 ++++++------ .../src/main/resources/application.properties | 8 ++++---- install.sh | 1 - 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dockerfile/conf/dolphinscheduler/conf/application.properties b/dockerfile/conf/dolphinscheduler/conf/application.properties index e0add25652..04eb130fad 100644 --- a/dockerfile/conf/dolphinscheduler/conf/application.properties +++ b/dockerfile/conf/dolphinscheduler/conf/application.properties @@ -1,6 +1,6 @@ # base spring data source configuration spring.datasource.type=com.alibaba.druid.pool.DruidDataSource -# postgre +# postgresql spring.datasource.driver-class-name=org.postgresql.Driver spring.datasource.url=jdbc:postgresql://127.0.0.1:5432/dolphinscheduler spring.datasource.username=root @@ -27,7 +27,7 @@ spring.datasource.timeBetweenConnectErrorMillis=60000 spring.datasource.minEvictableIdleTimeMillis=300000 #the SQL used to check whether the connection is valid requires a query statement. If validation Query is null, testOnBorrow, testOnReturn, and testWhileIdle will not work. -spring.datasource.validationQuery=SELECT 1 +spring.datasource.validationQuery=SELECT 1 FROM DUAL #check whether the connection is valid for timeout, in seconds spring.datasource.validationQueryTimeout=3 @@ -78,9 +78,9 @@ mybatis-plus.configuration.jdbc-type-for-null=null # data quality analysis is not currently in use. please ignore the following configuration # task record flag task.record.flag=false -task.record.datasource.url=jdbc:postgresql://127.0.0.1:5432/dolphinscheduler -task.record.datasource.username=root -task.record.datasource.password=root@123 +task.record.datasource.url=jdbc:mysql://192.168.xx.xx:3306/etl?characterEncoding=UTF-8 +task.record.datasource.username=xx +task.record.datasource.password=xx # Logger Config -logging.level.org.apache.dolphinscheduler.dao=debug +#logging.level.org.apache.dolphinscheduler.dao=debug diff --git a/dolphinscheduler-dao/src/main/resources/application.properties b/dolphinscheduler-dao/src/main/resources/application.properties index 10a92ebe07..37d67d47a5 100644 --- a/dolphinscheduler-dao/src/main/resources/application.properties +++ b/dolphinscheduler-dao/src/main/resources/application.properties @@ -2,12 +2,12 @@ spring.datasource.type=com.alibaba.druid.pool.DruidDataSource # postgre #spring.datasource.driver-class-name=org.postgresql.Driver -#spring.datasource.url=jdbc:postgresql://192.168.220.154:5432/dolphinscheduler +#spring.datasource.url=jdbc:postgresql://192.168.xx.xx:5432/dolphinscheduler # mysql spring.datasource.driver-class-name=com.mysql.jdbc.Driver -spring.datasource.url=jdbc:mysql://192.168.220.188:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8 -spring.datasource.username=root -spring.datasource.password=root@123 +spring.datasource.url=jdbc:mysql://192.168.xx.xx:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8 +spring.datasource.username=xx +spring.datasource.password=xx # connection configuration spring.datasource.initialSize=5 diff --git a/install.sh b/install.sh index 4477cf4926..afe822a8bb 100644 --- a/install.sh +++ b/install.sh @@ -403,7 +403,6 @@ sed -i ${txt} "s#enterprise.wechat.corp.id.*#enterprise.wechat.corp.id=${enterpr sed -i ${txt} "s#enterprise.wechat.secret.*#enterprise.wechat.secret=${enterpriseWechatSecret}#g" conf/alert.properties sed -i ${txt} "s#enterprise.wechat.agent.id.*#enterprise.wechat.agent.id=${enterpriseWechatAgentId}#g" conf/alert.properties sed -i ${txt} "s#enterprise.wechat.users.*#enterprise.wechat.users=${enterpriseWechatUsers}#g" conf/alert.properties -sed -i ${txt} "s#server.port.*#server.port=${alertPort}#g" conf/application-alert.properties