diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index a50a282a..a322d837 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -10,8 +10,8 @@ spring: url: jdbc:mysql://127.0.0.1:3306/dl?allowPublicKeyRetrieval=true&useSSL=false #type: com.alibaba.druid.pool.DruidDataSource username: root -# password: 12345678 - password: {{SPRING_DATASOURCE_PASSWORD}} + password: 12345678 +# password: {{SPRING_DATASOURCE_PASSWORD}} jpa: hibernate: ddl-auto: update diff --git a/start.sh b/start.sh index ec7cfe69..198efff1 100644 --- a/start.sh +++ b/start.sh @@ -5,7 +5,7 @@ CLASSPATH='conf/:apps/*:lib/*' CURRENT_DIR=$(pwd)/ LOG_DIR=${CURRENT_DIR}log CONF_DIR=${CURRENT_DIR}conf -cat conf/application.yml | sed "s/{{SPRING_DATASOURCE_PASSWORD}}/$DBPWD/g" conf/application-template.yml > conf/application.yml +sed "s/{{SPRING_DATASOURCE_PASSWORD}}/$DBPWD/g" conf/application-template.yml > conf/application.yml SERVER_PORT=$(cat $CONF_DIR/application.yml | grep "server:" -A 3 | grep "port" | awk '{print $2}'| sed 's/\r//') if [ ${SERVER_PORT}"" = "" ];then echo "$CONF_DIR/application.yml server port has not been configured"