Skip to content
Merged

Dev #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
126 commits
Select commit Hold shift + click to select a range
9bb65ae
chore : .env path setting, implement generalSignup
tjdansw Nov 20, 2024
fb33e4a
chore : .env path setting, implement generalSignup
tjdansw Nov 20, 2024
03076ce
setting:package reset
tjdansw Nov 20, 2024
974a741
feat:createAiSchedule
jja6312 Nov 21, 2024
6adf7da
feat:addSchedule
tjdansw Nov 21, 2024
5665fd3
Merge pull request #1 from jja6312/feat/AiSchedule
jja6312 Nov 21, 2024
ec5a20a
feat:addSchedule
tjdansw Nov 21, 2024
f90c2fb
feat:addSchedule
tjdansw Nov 21, 2024
fe2cbb3
fix:add content .gitignore
jja6312 Nov 21, 2024
e37506c
merge:스케줄+AI스케줄 초안 병합
jja6312 Nov 21, 2024
4e0e225
fix:updated gitignore
jja6312 Nov 21, 2024
1a9c94c
fix:updated gitignore..
jja6312 Nov 21, 2024
6c74116
fix:gitignore
tjdansw Nov 21, 2024
64f74a6
.
tjdansw Nov 21, 2024
55b0589
fix:gpt-4로 버전 업 및 prompting 수정
jja6312 Nov 21, 2024
87d792c
Merge pull request #2 from jja6312/feat/AiSchedule
jja6312 Nov 21, 2024
f271c87
feat:금주일정조회, 특정주일정조회 api 구현
tjdansw Nov 21, 2024
87191a5
.
tjdansw Nov 21, 2024
7d04ea2
Merge pull request #3 from jja6312/feat/schedule
tjdansw Nov 21, 2024
422cb41
feat:Ai스케줄 재요청 기능
jja6312 Nov 22, 2024
638990e
feat/AiSchedule
jja6312 Nov 22, 2024
8826a29
merge:dev + feat/AiSchedule merge
jja6312 Nov 22, 2024
7db38b7
Merge pull request #4 from jja6312/feat/AiSchedule
jja6312 Nov 22, 2024
dc748fe
feat:클로바 도입
jja6312 Nov 22, 2024
af58584
Merge branch 'dev' into feat/NaverClova
jja6312 Nov 22, 2024
7b54669
Merge pull request #5 from jja6312/feat/NaverClova
jja6312 Nov 22, 2024
21e62e9
feat:클로바->ChatGPT 요청 전달 및 응답
jja6312 Nov 22, 2024
23126cc
Merge branch 'dev' into feat/NaverClova
jja6312 Nov 22, 2024
645da91
Merge pull request #6 from jja6312/feat/NaverClova
jja6312 Nov 22, 2024
ce1d71d
feat:ãlogin,refreshtoken,logout
tjdansw Nov 22, 2024
136420b
.
tjdansw Nov 22, 2024
06c6c74
infra:ci/cd-1
jja6312 Nov 22, 2024
fdbd3e6
Merge pull request #7 from jja6312/feat/CICD
jja6312 Nov 22, 2024
48a6cba
infra:cicd-2
jja6312 Nov 22, 2024
b3f38d9
Merge pull request #8 from jja6312/feat/CICD
jja6312 Nov 22, 2024
dfbba4c
infra:cicd-3
jja6312 Nov 22, 2024
9975139
Merge pull request #9 from jja6312/feat/CICD
jja6312 Nov 22, 2024
bde8cc2
infra:cicd-4
jja6312 Nov 22, 2024
64a7248
infra:cicd-5
jja6312 Nov 22, 2024
4dbc53c
infra:cicd-6
jja6312 Nov 22, 2024
7ae9f35
infra:cicd-7
jja6312 Nov 23, 2024
7226f08
infra:cicd-8,환경변수 secretManager
jja6312 Nov 23, 2024
7fecb9d
infra:cicd-9
jja6312 Nov 23, 2024
3a0d9ec
infra:cicd-9
jja6312 Nov 23, 2024
2f3b4d8
infra:cicd-10
jja6312 Nov 23, 2024
c77b74c
infra:cicd-11
jja6312 Nov 23, 2024
ca8bb47
infra:cicd-11
jja6312 Nov 23, 2024
0640eaa
infra:cicd-12
jja6312 Nov 23, 2024
7c3ea33
infra:cicd-14
jja6312 Nov 23, 2024
e7a65c0
infra:cicd-15
jja6312 Nov 23, 2024
9a7ea4e
infra:cicd16
jja6312 Nov 23, 2024
53d7340
infra:cicd-17
jja6312 Nov 23, 2024
0afa8bb
infra:cicd-18
jja6312 Nov 23, 2024
366d629
ìfeat:token
tjdansw Nov 23, 2024
2540380
infra:cicd-18
jja6312 Nov 23, 2024
0afdf50
.
tjdansw Nov 23, 2024
116d993
.
tjdansw Nov 23, 2024
2ba4445
.
tjdansw Nov 23, 2024
c8838ee
infra:cicd-19
jja6312 Nov 23, 2024
73efef2
infra:cicd-20
jja6312 Nov 23, 2024
9327ce8
infra:cicd-21
jja6312 Nov 23, 2024
cfa812b
infra:cicd-22
jja6312 Nov 23, 2024
d3ea3df
infra:cicd-23
jja6312 Nov 23, 2024
4e7b87b
infra:cicd-24
jja6312 Nov 23, 2024
eb8f0bf
infra:cicd-25
jja6312 Nov 23, 2024
0ae18e8
infra:cicd-25
jja6312 Nov 23, 2024
1c6a668
infra:cicd-25
jja6312 Nov 23, 2024
2dc1a54
infra:cicd-26
jja6312 Nov 23, 2024
85eff46
infra:cicd-27
jja6312 Nov 23, 2024
405dd68
infra:cicd-28
jja6312 Nov 23, 2024
4517970
infra:cicd-29
jja6312 Nov 23, 2024
3367b80
infra:cicd-30
jja6312 Nov 23, 2024
8e165a1
infra:cicd-31
jja6312 Nov 23, 2024
dcede24
infra:cicd-31
jja6312 Nov 23, 2024
96d7007
infra:cicd-32
jja6312 Nov 23, 2024
79e2b24
infra:cicd-33
jja6312 Nov 23, 2024
7cf877c
infra:cicd-34
jja6312 Nov 23, 2024
b950cd7
refactor:dotEnv -> System.env
jja6312 Nov 23, 2024
89213fb
infra:cicd-35
jja6312 Nov 23, 2024
f9ecafb
infra:cicd-36
jja6312 Nov 23, 2024
e86f827
infra:cicd-3
jja6312 Nov 23, 2024
57b35f3
infra:cicd-37
jja6312 Nov 23, 2024
c4208f7
infra:cicd-37
jja6312 Nov 23, 2024
be9837a
infra:cicd-38
jja6312 Nov 23, 2024
c74588f
infra:cicd-39
jja6312 Nov 23, 2024
c141edf
infra:cicd-40
jja6312 Nov 23, 2024
6c33213
infra:cicd-41
jja6312 Nov 23, 2024
cd6e40f
infra:cicd-42
jja6312 Nov 23, 2024
8e5669b
infra:cicd-42
jja6312 Nov 23, 2024
f203409
infra:cicd-43
jja6312 Nov 23, 2024
961e3df
infra:cicd-44
jja6312 Nov 23, 2024
162be1e
infra:cicd-45
jja6312 Nov 23, 2024
18a404d
infra:cicd-46
jja6312 Nov 23, 2024
5874838
infra:cicd-47
jja6312 Nov 23, 2024
f567303
infra:cicd-48
jja6312 Nov 23, 2024
474628c
50
jja6312 Nov 24, 2024
2ab657b
infra:51
jja6312 Nov 24, 2024
6de0fa9
infra:cicd-51
jja6312 Nov 24, 2024
c0bbbc4
infra:cicd-52
jja6312 Nov 24, 2024
2000f64
infra:cicd-53
jja6312 Nov 24, 2024
6444e35
infra:cicd-54
jja6312 Nov 24, 2024
d327b9d
infra:cicd-55
jja6312 Nov 24, 2024
e11874e
infra:cicd-56
jja6312 Nov 24, 2024
873810f
infra:cicd-57
jja6312 Nov 24, 2024
b054e60
infra:cicd-55
jja6312 Nov 24, 2024
5b12fde
infra:cicd-56(getenv->getproperty)
jja6312 Nov 24, 2024
95286c6
infra:cicd설정완료. (***주의:환경변수관련.json을 추가해야 로컬에서 동작함***)
jja6312 Nov 24, 2024
1243d1f
fix:GPT initial prompt edit
jja6312 Nov 24, 2024
dbf1ac9
Merge pull request #10 from jja6312/fix/febe연동
jja6312 Nov 24, 2024
0fc363f
merge:성문로그인 ->dev합치기전
jja6312 Nov 24, 2024
402f22a
merge:성문로그인 - 지안설정 병합완료
jja6312 Nov 24, 2024
16584b7
Merge pull request #11 from jja6312/feat/schedule
jja6312 Nov 24, 2024
c8d7888
feat:fe/be 일정추가 연동
jja6312 Nov 24, 2024
49209ae
Merge branch 'dev' into feat/schedule-jian
jja6312 Nov 24, 2024
bec6ddf
Merge pull request #12 from jja6312/feat/schedule-jian
jja6312 Nov 24, 2024
1776375
feat:일정삭제
jja6312 Nov 24, 2024
5314f3d
Merge pull request #13 from jja6312/feat/schedule-jian
jja6312 Nov 24, 2024
6c7042d
feat:ai일정반영
jja6312 Nov 24, 2024
2523f55
Merge pull request #15 from jja6312/feat/schedule-jian
jja6312 Nov 24, 2024
f3cd2dd
.
tjdansw Nov 25, 2024
3681ef3
fix:jwtToken
tjdansw Nov 25, 2024
bd6130a
fix:jwtToken
tjdansw Nov 25, 2024
334580f
Merge pull request #17 from jja6312/feat/schedule
tjdansw Nov 25, 2024
0da9faf
feat/awsredis
tjdansw Nov 25, 2024
31dc903
.
tjdansw Nov 25, 2024
584de35
fix:redis
tjdansw Nov 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 87 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
name: Java Servlet CI/CD Workflow

on:
push:
branches:
- dev

env:
REGION: ${{ secrets.REGION }}
ECS_CLUSTER: luckyweeky-ecs-cluster
SERVICE_NAME: luckyweeky-service

jobs:
build-and-deploy:
name: Build and Deploy Docker Image
runs-on: ubuntu-latest

steps:
- name: Checkout Code
uses: actions/checkout@v3

- name: Set up Java
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'

- name: Build with Maven (Skip Tests)
run: mvn clean package -DskipTests

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2

- name: Log in to Docker Hub
run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin

- name: Build and Push Docker Image
run: |
TAG=${{ github.sha }}
IMAGE_NAME=${{ secrets.DOCKER_USERNAME }}/luckyweeky-server
docker build -t $IMAGE_NAME:${TAG} -t $IMAGE_NAME:latest .
docker push $IMAGE_NAME:${TAG}
docker push $IMAGE_NAME:latest

- name: Install jq
run: sudo apt-get update && sudo apt-get install -y jq

- name: Update Task Definition
run: |
TAG=${{ github.sha }}
IMAGE_NAME=${{ secrets.DOCKER_USERNAME }}/luckyweeky-server
echo "Updating Task Definition with IMAGE: $IMAGE_NAME:$TAG"

# Using jq to update the image field
jq '.containerDefinitions[0].image = "'$IMAGE_NAME:$TAG'"' ecs-task-definition.json > ecs-task-definition-updated.json
sed -i '/"taskRoleArn":/d' ecs-task-definition-updated.json

- name: Verify Updated Task Definition
run: |
echo "Updated Task Definition:"
cat ecs-task-definition-updated.json

- name: Register Task Definition
id: register_task_definition
run: |
TASK_DEF_ARN=$(aws ecs register-task-definition \
--cli-input-json file://ecs-task-definition-updated.json \
--query 'taskDefinition.taskDefinitionArn' \
--output text \
--region $REGION)
echo "TASK_DEF_ARN=$TASK_DEF_ARN" >> $GITHUB_ENV
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
REGION: ${{ secrets.REGION }}

- name: Update ECS Service
run: |
aws ecs update-service \
--cluster $ECS_CLUSTER \
--service $SERVICE_NAME \
--task-definition $TASK_DEF_ARN \
--region ${{ secrets.REGION }}
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
TASK_DEF_ARN: ${{ env.TASK_DEF_ARN }}
51 changes: 50 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,50 @@
src/main/webapp/WEB-INF/.env

# Ignore target directories
/target/
/**/target/

# IntelliJ IDEA
.idea/
/*.iml
*.ipr
*.iws



# Exclude specific IDEA settings explicitly if needed
!.idea/misc.xml
!.idea/modules.xml
!.idea/jarRepositories.xml
!.idea/compiler.xml
!.idea/libraries/

# Eclipse
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache

# NetBeans
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/

# Build directories
/build/
/**/build/

# VS Code
.vscode/

# macOS system files
.DS_Store

# Environment files
src/main/webapp/WEB-INF/.env
src/main/webapp/WEB-INF/local-secrets.json

8 changes: 0 additions & 8 deletions .idea/.gitignore

This file was deleted.

1 change: 0 additions & 1 deletion .idea/.name

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/inspectionProfiles/Project_Default.xml

This file was deleted.

20 changes: 0 additions & 20 deletions .idea/jarRepositories.xml

This file was deleted.

12 changes: 0 additions & 12 deletions .idea/misc.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/sqldialects.xml

This file was deleted.

124 changes: 0 additions & 124 deletions .idea/uiDesigner.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

14 changes: 14 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# 1. Base Image
FROM tomcat:10.1.30-jdk17-temurin

# 2. Set timezone
ENV JAVA_OPTS="-Duser.timezone=Asia/Seoul"

# 3. Copy Maven build artifact to Tomcat webapps
COPY target/ROOT.war /usr/local/tomcat/webapps/

# 4. Expose application port
EXPOSE 8080

# 5. Start Tomcat
CMD ["catalina.sh", "run"]
34 changes: 34 additions & 0 deletions ecs-task-definition.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"family": "luckyweeky-task",
"networkMode": "awsvpc",
"requiresCompatibilities": ["FARGATE"],
"cpu": "256",
"memory": "512",
"executionRoleArn": "arn:aws:iam::397064606679:role/luckyweeky-ecs-task-execution-role",
"containerDefinitions": [
{
"name": "app",
"image": "law10000hours/luckyweeky-server:${TAG}",
"essential": true,
"portMappings": [
{
"containerPort": 8080
}
],
"secrets": [
{
"name": "LUCKYWEEKY_ENV_VARS",
"valueFrom": "arn:aws:secretsmanager:ap-northeast-2:397064606679:secret:luckyweeky-env-vars-eb8zE2"
}
],
"logConfiguration": {
"logDriver": "awslogs",
"options": {
"awslogs-group": "/ecs/luckyweeky",
"awslogs-region": "ap-northeast-2",
"awslogs-stream-prefix": "ecs"
}
}
}
]
}
Loading