Skip to content

Commit 06b17e1

Browse files
kjunh972kjunh972
committed
우분투 자바 변경
1 parent 7642f8f commit 06b17e1

File tree

1 file changed

+51
-51
lines changed

1 file changed

+51
-51
lines changed

‎.github/workflows/gradle.yml‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ jobs:
8383
key: ${{ secrets.SSH_PRIVATE_KEY }}
8484
script: |
8585
cd /home/${{ secrets.SERVER_USER }}
86+
8687
# JAR 파일 권한 설정
8788
chmod +x Location-based-target-authentication-0.0.1-SNAPSHOT.jar
8889
@@ -98,68 +99,66 @@ jobs:
9899
WorkingDirectory=/home/${{ secrets.SERVER_USER }}
99100
100101
# 환경 변수 설정
101-
Environment="JWT_SECRET_KEY=${{ secrets.JWT_SECRET_KEY }}"
102-
Environment="JWT_ACCESS_TOKEN_EXPIRATION=600000"
103-
Environment="JWT_REFRESH_TOKEN_EXPIRATION=604800000"
104-
Environment="KAKAO_API_KEY=${{ secrets.KAKAO_API_KEY }}"
105-
Environment="KAKAO_CLIENT_ID=${{ secrets.KAKAO_CLIENT_ID }}"
106-
Environment="KAKAO_CLIENT_SECRET=${{ secrets.KAKAO_CLIENT_SECRET }}"
107-
Environment="KAKAO_REDIRECT_URI=https://${{ secrets.SERVER_IP }}:8443/api/v1/auth/kakao/callback"
108-
Environment="GOOGLE_CLIENT_ID=${{ secrets.GOOGLE_CLIENT_ID }}"
109-
Environment="GOOGLE_CLIENT_SECRET=${{ secrets.GOOGLE_CLIENT_SECRET }}"
110-
Environment="GOOGLE_REDIRECT_URI=https://${{ secrets.SERVER_IP }}:8443/api/v1/auth/google/callback"
111-
Environment="SPRING_MAIL_HOST=${{ secrets.MAIL_HOST }}"
112-
Environment="SPRING_MAIL_PORT=${{ secrets.MAIL_PORT }}"
113-
Environment="SPRING_MAIL_USERNAME=${{ secrets.MAIL_USERNAME }}"
114-
Environment="SPRING_MAIL_PASSWORD=${{ secrets.MAIL_PASSWORD }}"
115-
Environment="SERVER_PORT=8443"
116-
Environment="SERVER_ADDRESS=0.0.0.0"
117-
Environment="SPRING_PROFILES_ACTIVE=secret"
118-
119-
# 로깅 설정
120-
Environment="LOGGING_LEVEL_ROOT=INFO"
121-
Environment="LOGGING_LEVEL_COM_SWYP=DEBUG"
122-
Environment="LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_SECURITY=DEBUG"
123-
Environment="LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_WEB=DEBUG"
124-
Environment="LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_OAUTH2=DEBUG"
125-
126-
ExecStart=/usr/bin/java \\
102+
Environment=JWT_SECRET_KEY=${{ secrets.JWT_SECRET_KEY }}
103+
Environment=JWT_ACCESS_TOKEN_EXPIRATION=600000
104+
Environment=JWT_REFRESH_TOKEN_EXPIRATION=604800000
105+
Environment=KAKAO_API_KEY=${{ secrets.KAKAO_API_KEY }}
106+
Environment=KAKAO_CLIENT_ID=${{ secrets.KAKAO_CLIENT_ID }}
107+
Environment=KAKAO_CLIENT_SECRET=${{ secrets.KAKAO_CLIENT_SECRET }}
108+
Environment=KAKAO_REDIRECT_URI=https://${{ secrets.SERVER_IP }}:8443/api/v1/auth/kakao/callback
109+
Environment=GOOGLE_CLIENT_ID=${{ secrets.GOOGLE_CLIENT_ID }}
110+
Environment=GOOGLE_CLIENT_SECRET=${{ secrets.GOOGLE_CLIENT_SECRET }}
111+
Environment=GOOGLE_REDIRECT_URI=https://${{ secrets.SERVER_IP }}:8443/api/v1/auth/google/callback
112+
Environment=SPRING_MAIL_HOST=${{ secrets.MAIL_HOST }}
113+
Environment=SPRING_MAIL_PORT=${{ secrets.MAIL_PORT }}
114+
Environment=SPRING_MAIL_USERNAME=${{ secrets.MAIL_USERNAME }}
115+
Environment=SPRING_MAIL_PASSWORD=${{ secrets.MAIL_PASSWORD }}
116+
Environment=SERVER_PORT=8443
117+
Environment=SERVER_ADDRESS=0.0.0.0
118+
Environment=SPRING_PROFILES_ACTIVE=secret
119+
Environment=LOGGING_LEVEL_ROOT=INFO
120+
Environment=LOGGING_LEVEL_COM_SWYP=DEBUG
121+
Environment=LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_SECURITY=DEBUG
122+
Environment=LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_WEB=DEBUG
123+
Environment=LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_OAUTH2=DEBUG
124+
125+
ExecStart=/usr/lib/jvm/java-17-openjdk-amd64/bin/java \\
127126
-Xms512m \\
128127
-Xmx1024m \\
129128
-XX:+HeapDumpOnOutOfMemoryError \\
130129
-XX:HeapDumpPath=/home/${{ secrets.SERVER_USER }}/heapdump.hprof \\
131130
-Dspring.output.ansi.enabled=always \\
132131
-Dlogging.file.name=/home/${{ secrets.SERVER_USER }}/logs/willgo.log \\
133-
-Dlogging.pattern.console="%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n" \\
134-
-Dlogging.pattern.file="%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n" \\
132+
-Dlogging.pattern.console='%d{yyyy-MM-dd HH:mm:ss} [%%thread] %-5level %logger{36} - %msg%%n' \\
133+
-Dlogging.pattern.file='%d{yyyy-MM-dd HH:mm:ss} [%%thread] %-5level %logger{36} - %msg%%n' \\
135134
-jar Location-based-target-authentication-0.0.1-SNAPSHOT.jar \\
136-
--spring.profiles.active=${SPRING_PROFILES_ACTIVE} \\
137-
--server.port=${SERVER_PORT} \\
138-
--server.address=${SERVER_ADDRESS} \\
135+
--spring.profiles.active=\${SPRING_PROFILES_ACTIVE} \\
136+
--server.port=\${SERVER_PORT} \\
137+
--server.address=\${SERVER_ADDRESS} \\
139138
--server.ssl.enabled=true \\
140-
--logging.level.root=${LOGGING_LEVEL_ROOT} \\
141-
--logging.level.com.swyp=${LOGGING_LEVEL_COM_SWYP} \\
142-
--logging.level.org.springframework.security=${LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_SECURITY} \\
143-
--logging.level.org.springframework.web=${LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_WEB} \\
144-
--logging.level.org.springframework.oauth2=${LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_OAUTH2} \\
139+
--logging.level.root=\${LOGGING_LEVEL_ROOT} \\
140+
--logging.level.com.swyp=\${LOGGING_LEVEL_COM_SWYP} \\
141+
--logging.level.org.springframework.security=\${LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_SECURITY} \\
142+
--logging.level.org.springframework.web=\${LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_WEB} \\
143+
--logging.level.org.springframework.oauth2=\${LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_OAUTH2} \\
145144
--logging.level.org.springframework.web.cors=TRACE \\
146145
--debug=true \\
147146
--trace=true \\
148-
--spring.mail.host=${SPRING_MAIL_HOST} \\
149-
--spring.mail.port=${SPRING_MAIL_PORT} \\
150-
--spring.mail.username=${SPRING_MAIL_USERNAME} \\
151-
--spring.mail.password=${SPRING_MAIL_PASSWORD} \\
147+
--spring.mail.host=\${SPRING_MAIL_HOST} \\
148+
--spring.mail.port=\${SPRING_MAIL_PORT} \\
149+
--spring.mail.username=\${SPRING_MAIL_USERNAME} \\
150+
--spring.mail.password=\${SPRING_MAIL_PASSWORD} \\
152151
--spring.mail.properties.mail.smtp.auth=true \\
153152
--spring.mail.properties.mail.smtp.starttls.enable=true \\
154153
--spring.mail.properties.mail.smtp.ssl.trust=smtp.gmail.com \\
155154
--spring.mail.properties.mail.smtp.ssl.protocols=TLSv1.2 \\
156155
--spring.mail.properties.mail.debug=true \\
157-
--spring.security.oauth2.client.registration.google.client-id=${GOOGLE_CLIENT_ID} \\
158-
--spring.security.oauth2.client.registration.google.client-secret=${GOOGLE_CLIENT_SECRET} \\
159-
--spring.security.oauth2.client.registration.google.redirect-uri=${GOOGLE_REDIRECT_URI} \\
160-
--spring.security.oauth2.client.registration.kakao.client-id=${KAKAO_CLIENT_ID} \\
161-
--spring.security.oauth2.client.registration.kakao.client-secret=${KAKAO_CLIENT_SECRET} \\
162-
--spring.security.oauth2.client.registration.kakao.redirect-uri=${KAKAO_REDIRECT_URI} \\
156+
--spring.security.oauth2.client.registration.google.client-id=\${GOOGLE_CLIENT_ID} \\
157+
--spring.security.oauth2.client.registration.google.client-secret=\${GOOGLE_CLIENT_SECRET} \\
158+
--spring.security.oauth2.client.registration.google.redirect-uri=\${GOOGLE_REDIRECT_URI} \\
159+
--spring.security.oauth2.client.registration.kakao.client-id=\${KAKAO_CLIENT_ID} \\
160+
--spring.security.oauth2.client.registration.kakao.client-secret=\${KAKAO_CLIENT_SECRET} \\
161+
--spring.security.oauth2.client.registration.kakao.redirect-uri=\${KAKAO_REDIRECT_URI} \\
163162
--cors.allowed-origins="https://locationcheckgo.netlify.app,https://localhost:8443,https://${{ secrets.SERVER_IP }}:8443"
164163
165164
Restart=always
@@ -173,15 +172,16 @@ jobs:
173172
sudo mkdir -p /home/${{ secrets.SERVER_USER }}/logs
174173
sudo chown -R ${{ secrets.SERVER_USER }}:${{ secrets.SERVER_USER }} /home/${{ secrets.SERVER_USER }}/logs
175174
175+
# Java 버전 확인
176+
/usr/lib/jvm/java-17-openjdk-amd64/bin/java -version
177+
176178
# 서비스 시작
177179
sudo systemctl daemon-reload
178180
sudo systemctl enable willgo
179181
sudo systemctl restart willgo
182+
sleep 3
180183
sudo systemctl status willgo
181184
182185
# 로그 확인
183-
echo "Waiting for service to start..."
184-
sleep 5
185-
sudo journalctl -u willgo -n 100 --no-pager
186-
echo "Checking application logs..."
187-
tail -n 100 /home/${{ secrets.SERVER_USER }}/logs/willgo.log
186+
echo "Checking system logs..."
187+
sudo journalctl -u willgo -n 50 --no-pager

0 commit comments

Comments
 (0)