Skip to content

Commit

Permalink
Merge pull request #51 from Dapp-Learning-DAO/feature/better
Browse files Browse the repository at this point in the history
better ci
  • Loading branch information
hotaplayer authored Nov 4, 2023
2 parents 0543c55 + 236ecb2 commit 05344fd
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 05344fd

Please sign in to comment.