DevFW-CICD/spring-petclinic
16
0
Fork 1
mirror of https://github.com/spring-projects/spring-petclinic.git synced 2025-07-18 05:25:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolved merge conflicts

Browse source
This commit is contained in:
yyeeqii 2025-04-27 12:08:01 +08:00
commit 7ba1af8450
10 changed files with 38 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.vagrant/machines/default/virtualbox/action_provision
View file

@ -1 +1,2 @@
1.5:558bbbdc-672d-4236-b18d-0747cd5fbeaf
1.5:0a8e3252-0dfa-4c2d-93e4-132058372cdb

3
.vagrant/machines/default/virtualbox/action_set_name
View file

@ -1 +1,2 @@
1745624815
1745717021

2
.vagrant/machines/default/virtualbox/id
View file

@ -1 +1 @@
558bbbdc-672d-4236-b18d-0747cd5fbeaf 0a8e3252-0dfa-4c2d-93e4-132058372cdb

10
.vagrant/machines/default/virtualbox/private_key
View file

@ -1,8 +1,10 @@
-----BEGIN OPENSSH PRIVATE KEY----- -----BEGIN OPENSSH PRIVATE KEY-----
b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAA b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAA
AAtzc2gtZWQyNTUxOQAAACBNkoyert5NF60C2rjOy+AILyPoPkGR2q4Fc/Om
nfAeXQAAAJCq/MI+qvzCPgAAAAtzc2gtZWQyNTUxOQAAACBNkoyert5NF60C AAtzc2gtZWQyNTUxOQAAACCAZpIqWjfT3tGuR4Xz+e6Cw1CXaZT2qvrJhgTJ
2rjOy+AILyPoPkGR2q4Fc/OmnfAeXQAAAED6zsQ7eTXA+yBDkw3/0A65h6q3 nDff7wAAAJAhtFL2IbRS9gAAAAtzc2gtZWQyNTUxOQAAACCAZpIqWjfT3tGu
y/LQartCCPYFBb+vC02SjJ6u3k0XrQLauM7L4AgvI+g+QZHargVz86ad8B5d R4Xz+e6Cw1CXaZT2qvrJhgTJnDff7wAAAEDSvbiNPJz3gaknOq4NpKVeB0ha
EZfwyaBuUPtR/bGLYoBmkipaN9Pe0a5HhfP57oLDUJdplPaq+smGBMmcN9/v
AAAAB3ZhZ3JhbnQBAgMEBQY= AAAAB3ZhZ3JhbnQBAgMEBQY=
-----END OPENSSH PRIVATE KEY----- -----END OPENSSH PRIVATE KEY-----

3
.vagrant/machines/default/virtualbox/synced_folders
View file

@ -1 +1,2 @@
{"virtualbox":{"/vagrant":{"guestpath":"/vagrant","hostpath":"C:/Users/HP/SCC Practical/spring-petclinic","disabled":false,"__vagrantfile":true}}} {"virtualbox":{"/home/vagrant/petclinic":{"guestpath":"/home/vagrant/petclinic","hostpath":"C:/Users/Asus User/Desktop/workspace_SCC/spring-petclinic","disabled":false,"__vagrantfile":true}}}

4
.vagrant/machines/default/virtualbox/vagrant_cwd
View file

@ -1 +1,5 @@
<<<<<<< HEAD
C:/Users/HP/SCC Practical/spring-petclinic C:/Users/HP/SCC Practical/spring-petclinic
=======
C:/Users/Asus User/Desktop/workspace_SCC/spring-petclinic
>>>>>>> 64ca1a6e8d6262a76717e6ee9e02d13aa15cd1e8

14
Vagrantfile vendored
View file

@ -11,8 +11,13 @@ Vagrant.configure("2") do |config|
end end
# Configuring VirtualBox network settings # Configuring VirtualBox network settings
<<<<<<< HEAD
config.vm.network "forwarded_port", guest: 8080, host: 8086 config.vm.network "forwarded_port", guest: 8080, host: 8086
~ ~
=======
config.vm.network "forwarded_port", guest: 8080, host: 8087
>>>>>>> 64ca1a6e8d6262a76717e6ee9e02d13aa15cd1e8
# Configuring VirtualBox folder settings # Configuring VirtualBox folder settings
config.vm.synced_folder ".", "/home/vagrant/petclinic" config.vm.synced_folder ".", "/home/vagrant/petclinic"
@ -24,7 +29,11 @@ Vagrant.configure("2") do |config|
APP_DIR="/home/vagrant/petclinic" APP_DIR="/home/vagrant/petclinic"
REPO_URL="https://github.com/yiting68/spring-petclinic.git" REPO_URL="https://github.com/yiting68/spring-petclinic.git"
JAR_NAME="spring-petclinic-3.4.0.jar" JAR_NAME="spring-petclinic-3.4.0.jar"
<<<<<<< HEAD
SERVICE_NAME="petclinic"~~ SERVICE_NAME="petclinic"~~
=======
SERVICE_NAME="petclinic"
>>>>>>> 64ca1a6e8d6262a76717e6ee9e02d13aa15cd1e8
# Clone Spring PetClinic project if does not exist # Clone Spring PetClinic project if does not exist
if [ ! -d "$APP_DIR/.git" ]; then if [ ! -d "$APP_DIR/.git" ]; then
@ -43,6 +52,11 @@ Vagrant.configure("2") do |config|
# Run the JAR file # Run the JAR file
nohup java -jar build/libs/$JAR_NAME > $APP_DIR/app.log 2>&1 & nohup java -jar build/libs/$JAR_NAME > $APP_DIR/app.log 2>&1 &
<<<<<<< HEAD
SHELL SHELL
end end
=======
SHELL
end
>>>>>>> 64ca1a6e8d6262a76717e6ee9e02d13aa15cd1e8

4
src/main/scss/header.scss
View file

@ -19,8 +19,8 @@
.navbar a.navbar-brand span { .navbar a.navbar-brand span {
display: block; display: block;
width: 229px; width: 231px;
height: 46px; height: 44px;
background: url("../images/spring-logo-dataflow.png") -1px -48px no-repeat; background: url("../images/spring-logo-dataflow.png") -1px -48px no-repeat;
opacity: 0; opacity: 0;
-moz-transition: opacity 0.12s ease-in-out; -moz-transition: opacity 0.12s ease-in-out;

4
src/main/scss/petclinic.scss
View file

@ -105,7 +105,7 @@ h1 {
.index-page--subtitle { .index-page--subtitle {
font-size: 18px; font-size: 18px;
line-height: 24px; line-height: 23px;
margin: 0 0 30px; margin: 0 0 30px;
} }
@ -114,7 +114,7 @@ h1 {
} }
#job-params-modal .modal-dialog { #job-params-modal .modal-dialog {
width: 90%; width: 92%;
margin-left:auto; margin-left:auto;
margin-right:auto; margin-right:auto;
} }