Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
e88b276
fix: gitignore 수정
leejuae May 3, 2024
3163df4
feat: api 연결 완료
leejuae May 3, 2024
42c2dc0
feat: 스티커 불러오는 api 추가 완료
leejuae May 3, 2024
52e4cde
fix: 오류 수정
leejuae May 3, 2024
1f1d38d
feat: 스티커 생성, id로 불러오는 기능 구현 완료
leejuae May 4, 2024
ca73ef4
fix: secret 삭제
leejuae May 4, 2024
eff57df
Merge pull request #2 from DoTheZ-Team/GLUE-260/feat-Dalle-api연결
leejuae May 8, 2024
4661358
feat: poststicker, membersticker추가 및 yml파일 수정
leejuae May 17, 2024
d3f1de1
Revert "feat: poststicker, membersticker추가 및 yml파일 수정"
leejuae May 17, 2024
4ae1c17
fix: yml파일 수정 및 파일 내부구조 수정
leejuae May 17, 2024
83ea817
Merge pull request #3 from DoTheZ-Team/GLUE-260/feat-Dalle-api연결
leejuae May 17, 2024
c6734bf
feat: postSticker 서비스 초기 구현
leejuae May 17, 2024
d9587e9
feat: MemberSticker 추가
leejuae May 17, 2024
2afc2b9
feat: 페이지네이션 추가
leejuae May 17, 2024
2d3eda0
feat: CI/CD, Dockerfile 추가
leejuae May 18, 2024
59a935f
delete: application.yml
leejuae May 18, 2024
92ac26f
Update StickerApplicationTest.java
leejuae May 18, 2024
6006943
Update sticker-server.yaml
leejuae May 18, 2024
bfeb310
Update Dockerfile
leejuae May 18, 2024
768a1f5
Update ChatGPTConfig.java
leejuae May 18, 2024
54c94f8
Update ChatGPTConfig.java
leejuae May 18, 2024
c03413a
Merge pull request #4 from DoTheZ-Team/GLUE-310/feat-PostSticker
anselmo228 May 19, 2024
c1009b5
fix: 스티커 포스트 내 정보저장 API request 형식 수정
leejuae May 20, 2024
fd5ec68
fix: 스티커 생성 관련 코드 수정
leejuae May 20, 2024
d099ac0
Update StickerController.java
leejuae May 20, 2024
a4ea6df
fix: 스티커 프롬프트 수정
leejuae May 21, 2024
bf58f4e
fix: 얼리리턴 형식으로 코드 수정
leejuae May 21, 2024
77cb3cd
Merge pull request #5 from DoTheZ-Team/GLUE-310/feat-PostSticker
leejuae May 21, 2024
a6b8df2
fix: API 수정
leejuae May 24, 2024
94d2beb
Update StickerController.java
leejuae May 24, 2024
dc5fc66
Merge pull request #6 from DoTheZ-Team/GLUE-327/fix-api
leejuae May 24, 2024
9faa563
Update StickerController.java
leejuae May 24, 2024
af3cd88
fix: api url 수정
leejuae May 24, 2024
b2ec723
Update pull_request_template.md
leejuae May 24, 2024
5b09c95
fix: description 명확하게 수정
leejuae May 24, 2024
0008ea6
Update pull_request_template.md
leejuae May 24, 2024
f1a1309
Update sticker-server.yaml
kylo-dev May 25, 2024
a734fd8
Update Dockerfile
kylo-dev May 25, 2024
52a364c
fix: 리뷰 사항 반영
leejuae May 26, 2024
1653bac
Merge pull request #11 from DoTheZ-Team/GLUE-327/fix-api
anselmo228 May 26, 2024
57686d2
fix: API 형식 수정
leejuae May 26, 2024
a6165aa
feat: basic sticker API 추가
leejuae May 27, 2024
3bff39c
fix: 루트에 pages 제거
leejuae May 27, 2024
22087f0
Merge pull request #12 from DoTheZ-Team/GLUE-352/fix-open-feign-post
anselmo228 May 27, 2024
dbcd27b
fix: test 코드 삭제
leejuae May 27, 2024
de2f7ba
fix: api 경로 수정
leejuae May 27, 2024
004693f
Merge pull request #14 from DoTheZ-Team/GLUE-352/fix-open-feign-post
anselmo228 May 27, 2024
6e9a1d5
fix: poststicker에 url 포함되도록 수정
leejuae May 27, 2024
d849b8c
Merge pull request #16 from DoTheZ-Team/GLUE-352/fix-open-feign-post
anselmo228 May 27, 2024
15286c6
fix: 페이징 리턴 형식 수정
leejuae Jun 4, 2024
1a5a5c1
Merge pull request #17 from DoTheZ-Team/GLUE-365/fix-page-response-변경
anselmo228 Jun 4, 2024
30d3748
feat: 포스트 저장 시, 스티커 리스트형태로 저장
leejuae Jun 5, 2024
9a9be57
Merge pull request #18 from DoTheZ-Team/GLUE-365/fix-page-response-변경
leejuae Jun 5, 2024
8331213
GLUE-372 fix: Entity Setter 제거
kylo-dev Jun 5, 2024
db534a8
GLUE-372 fix: PostSticker 저장 로직 수정
kylo-dev Jun 5, 2024
2069b36
GLUE-372 fix: PostSticker 조회 로직 수정
kylo-dev Jun 5, 2024
4bdfe24
GLUE-372 feat: PostStickerRequest 추가
kylo-dev Jun 5, 2024
8829e0b
GLUE-372 feat: PostSticker API 리팩토링 및 DTO 수정
kylo-dev Jun 5, 2024
4b2bdbb
GLUE-372 feat: PostStickerDTO @JsonProperty 수정
kylo-dev Jun 5, 2024
bb489d1
fix: 인텔리제이 내부함수로 getter 구현
leejuae Jun 6, 2024
8dfa9d1
GLUE-372 feat: PostSticker DTO 변수명 수정 완료
kylo-dev Jun 6, 2024
d30f07f
Merge pull request #19 from DoTheZ-Team/GLUE-372/fix-dto
leejuae Jun 6, 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
Binary file added .DS_Store
Binary file not shown.
19 changes: 19 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
name: Feature request
about: Feature 작업 사항을 입력해주세요.
title: ''
labels: ''
assignees: ''

---

## ✅ 구현할 기능
- 구현할 기능을 적어주세요

## 🔜 상세 작업 내용
- 상세 작업 내용을 적어주세요
- [ ] todo list 를 활용하면 좋습니다!
- [ ] todo2

## ETC
-
15 changes: 15 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
## 📌 요약

-

## 📝 상세 내용

-

## 🗣️ 질문 및 이외 사항

-

## ☑️ 이슈 번호

- close #
74 changes: 74 additions & 0 deletions .github/workflows/sticker-server.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
name: Glue Sticker Server CI/CD

on:
push:
branches: [ "develop" ]

permissions:
contents: read

jobs:
build-and-push-image:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3

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

- name: Set environment yml file
run: |
mkdir ./src/main/resources
cd ./src/main/resources
touch ./application.yml
echo "${{ secrets.APPLICATION }}" >> ./application.yml
shell: bash

- name: Build with Gradle
run: ./gradlew build

- name: Login KakaoCloud
uses: docker/login-action@v2
with:
registry: ${{ secrets.GLUE_PROJECT }}
username: ${{ secrets.ACCESS_ID }}
password: ${{ secrets.ACCESS_SECRET }}

- name: Build and Push to KakaoCloud
uses: docker/build-push-action@v4
with:
file: Dockerfile
context: .
push: true
tags: ${{ secrets.GLUE_PROJECT }}/glue-repository/glue-sticker:${{ github.sha }}

update-manifest:
runs-on: ubuntu-latest
needs: build-and-push-image
steps:
- name: Checkout configuration repository
uses: actions/checkout@v3
with:
repository: ${{ secrets.GIT_PROJECT }}/glue-msa-config
token: ${{ secrets.GIT_TOKEN }}
ref: "main"

- name: Install yq (YAML processor)
run: sudo snap install yq

- name: Update image in Kubernetes deployment file
run: |
yq e '.spec.template.spec.containers[0].image = "${{ secrets.GLUE_PROJECT }}/glue-repository/glue-sticker:${{ github.sha }}"' ./k8s-template/sticker-deployment.yaml -i

- name: Commit and push changes
run: |
git config --global user.email "${{ secrets.EMAIL }}"
git config --global user.name "${{ secrets.USERNAME }}"
git add .
git commit -m "[skip ci] Update sticker-deployment.yaml"
git remote set-url origin https://${{ secrets.GIT_TOKEN }}@github.com/${{ secrets.GIT_PROJECT }}/glue-msa-config
git push --set-upstream origin main
47 changes: 47 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
HELP.md
.gradle
build/
!gradle/wrapper/gradle-wrapper.jar
!**/src/main/**/build/
!**/src/test/**/build/

### STS ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache
bin/
!**/src/main/**/bin/
!**/src/test/**/bin/

### IntelliJ IDEA ###
.idea
*.iws
*.iml
*.ipr
out/
!**/src/main/**/out/
!**/src/test/**/out/

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

### VS Code ###
.vscode/

application-SECRET-KEY.yml
.DS_Store
/.gradle

application.yml
.gradle/8.6/executionHistory/executionHistory.lock
.gradle/8.6/fileHashes/fileHashes.bin
.gradle/8.6/fileHashes/fileHashes.lock
.gradle/buildOutputCleanup/buildOutputCleanup.lock
Binary file added .gradle/8.6/checksums/checksums.lock
Binary file not shown.
Binary file added .gradle/8.6/checksums/md5-checksums.bin
Binary file not shown.
Binary file added .gradle/8.6/checksums/sha1-checksums.bin
Binary file not shown.
Empty file.
Binary file added .gradle/8.6/executionHistory/executionHistory.lock
Binary file not shown.
Binary file added .gradle/8.6/fileChanges/last-build.bin
Binary file not shown.
Binary file added .gradle/8.6/fileHashes/fileHashes.bin
Binary file not shown.
Binary file added .gradle/8.6/fileHashes/fileHashes.lock
Binary file not shown.
Empty file added .gradle/8.6/gc.properties
Empty file.
Binary file added .gradle/buildOutputCleanup/buildOutputCleanup.lock
Binary file not shown.
2 changes: 2 additions & 0 deletions .gradle/buildOutputCleanup/cache.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#Fri May 03 03:25:02 KST 2024
gradle.version=8.6
Empty file added .gradle/vcs-1/gc.properties
Empty file.
7 changes: 7 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
FROM openjdk:17-jdk

ARG JAR_FILE=build/libs/*.jar

COPY ${JAR_FILE} app.jar

ENTRYPOINT ["java", "-jar", "-Dspring.profiles.active=prod","/app.jar"]
1 change: 0 additions & 1 deletion README.md

This file was deleted.

75 changes: 75 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
plugins {
id 'java'
id 'org.springframework.boot' version '3.2.4'
id 'io.spring.dependency-management' version '1.1.4'
}

group = 'com.justdo.glue'
version = '0.0.1-SNAPSHOT'

java {
sourceCompatibility = '17'
}

configurations {
compileOnly {
extendsFrom annotationProcessor
}
}

repositories {
mavenCentral()
}

ext {
set('springCloudVersion', "2023.0.0")
}

dependencies {
implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap'
implementation 'org.springframework.boot:spring-boot-starter-actuator'
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation 'org.springframework.boot:spring-boot-starter-validation'
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.cloud:spring-cloud-starter-config'

compileOnly 'org.projectlombok:lombok'
runtimeOnly 'com.mysql:mysql-connector-j'
annotationProcessor 'org.projectlombok:lombok'
testImplementation 'org.springframework.boot:spring-boot-starter-test'

// Aws S3
implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'

// swagger
implementation group: 'org.springdoc', name: 'springdoc-openapi-starter-webmvc-ui', version: '2.2.0'

// HttpClient for sending requests
implementation 'org.apache.httpcomponents.client5:httpclient5'

// Jackson for JSON handling
implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.4'

// chatGPT
implementation 'com.theokanning.openai-gpt3-java:client:0.10.0'
implementation 'com.theokanning.openai-gpt3-java:service:0.10.0'

implementation 'com.stripe:stripe-java:22.10.0'
implementation 'javax.xml.bind:jaxb-api:2.3.0'
implementation 'sh.platform:config:2.2.2'

// jwt
implementation group: 'io.jsonwebtoken', name: 'jjwt-api', version: '0.12.5'
runtimeOnly group: 'io.jsonwebtoken', name: 'jjwt-impl', version: '0.12.5'
runtimeOnly group: 'io.jsonwebtoken', name: 'jjwt-jackson', version: '0.12.5'
}

dependencyManagement {
imports {
mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
}
}

tasks.named('test') {
useJUnitPlatform()
}
Binary file added gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
23 changes: 23 additions & 0 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#
# Copyright 2012-2024 the original author or authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading