YOHOBUY / yohobuy-union · Commits

Go to a project

Authored by ping
Commit 6d52a52ac4363f9eea69eae658c4e106c2160858 2 parents d43a3298 8a744f5a

Merge branch 'dev' of git.dev.yoho.cn:yoho30/yohobuy-union into dev

Inline Side-by-side
Showing 4 changed files with 8 additions and 2 deletions
  1 +activeProfiles=
  2 +eclipse.preferences.version=1
  3 +resolveWorkspaceProjects=true
  4 +version=1
  1 +disabled=06target
  2 +eclipse.preferences.version=1
@@ -6,7 +6,7 @@ datasources: @@ -6,7 +6,7 @@ datasources:
6 username: yh_test 6 username: yh_test
7 password: 9nm0icOwt6bMHjMusIfMLw== 7 password: 9nm0icOwt6bMHjMusIfMLw==
8 8
9 - yoho_logs: 9 + yohobuy_logs:
10 servers: 10 servers:
11 - 192.168.50.69:9980 11 - 192.168.50.69:9980
12 username: yh_test 12 username: yh_test
@@ -6,7 +6,7 @@ datasources: @@ -6,7 +6,7 @@ datasources:
6 username: ${jdbc.mysql.yohopassport.username} 6 username: ${jdbc.mysql.yohopassport.username}
7 password: ${jdbc.mysql.yohopassport.password} 7 password: ${jdbc.mysql.yohopassport.password}
8 8
9 - yoho_logs: 9 + yohobuy_logs:
10 servers: 10 servers:
11 - ${jdbc.mysql.yohologs.master} 11 - ${jdbc.mysql.yohologs.master}
12 username: ${jdbc.mysql.yohologs.username} 12 username: ${jdbc.mysql.yohologs.username}