Skip to content

S
slm-bi
Commit 7b1240e9 authored by linruibiao's avatar linruibiao
Browse files
Options

Merge remote-tracking branch 'origin/master'

# Conflicts: # src/main/resources/application-dev.yml
parents 0e862c2f b32a2356
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
slm-bi.iml deleted 100644 → 0
View file @ 0e862c2f
This diff is collapsed.
src/main/resources/application-dev.yml
View file @ 7b1240e9
......@@ -4,4 +4,4 @@ spring:
password: Test123!
url: jdbc:mysql://${MYSQL_HOST:116.63.67.122}:${MYSQL_PORT:3306}/${MYSQL_DB:slm_bi}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
dc_client:
host: http://139.9.194.252:2400/dc # http://192.168.0.3:2400/dc # http://apidev.sycdev.com/dc
\ No newline at end of file
host: http://139.9.194.252:2400/dc #http://139.9.194.252:2400/dc # http://192.168.0.3:2400/dc # http://apidev.sycdev.com/dc
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment