Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weโ€™ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dev backend #79

Merged
merged 92 commits into from
Apr 20, 2024
Merged

Dev backend #79

merged 92 commits into from
Apr 20, 2024

Conversation

yeonjy
Copy link
Collaborator

@yeonjy yeonjy commented Apr 20, 2024

PULL REQUEST

๐ŸŽ‹ ์ž‘์—…์ค‘์ธ ๋ธŒ๋žœ์น˜

โšก๏ธ ์ž‘์—…๋™๊ธฐ

  • Dev-backend๋ฅผ Dev์— ๋จธ์ง€ํ•ฉ๋‹ˆ๋‹ค.

๐Ÿ”‘ ์ฃผ์š” ๋ณ€๊ฒฝ์‚ฌํ•ญ

  • ๏ฟฝCI/CD flow ๊ตฌ์ถ•
  • ๋งˆ์ดํŽ˜์ด์ง€ ๊ตฌํ˜„
  • ๋ถ๋งˆํฌ ๊ตฌํ˜„

๐Ÿ’ก ๊ด€๋ จ ์ด์Šˆ

yeonjy and others added 30 commits February 25, 2024 03:07
@yeonjy
build: runs-on ์กฐ๊ฑด ๋ณ€๊ฒฝ
86eaf1f
@yeonjy
build: runs-on ์กฐ๊ฑด ๋ณ€๊ฒฝ
6de378e
@yeonjy
build: docker-compose ์„ค์ • ์ถ”๊ฐ€
d171fe5
@yeonjy
Merge branch 'Dev' into build/#10-backend-cicd
4b3baad
@yeonjy
Merge remote-tracking branch 'origin/Dev-backend' into build/#10-backโ€ฆ
82ab53e 
โ€ฆend-cicd
@yeonjy
Merge branch 'Dev-backend' into build/#10-backend-cicd
7eeec25
@yeonjy
feat: application-prod.yml ์ถ”๊ฐ€
d362206
@yeonjy
feat: application.yml active file ์„ค์ •
bd2cde0
@yeonjy
refactor: database url ์ˆ˜์ •
4de52fe
@yeonjy
rename: gradle.yml
b598e90
@yeonjy
chore: java distribution ๋ณ€๊ฒฝ
8e6a108
@yeonjy
chore: active prod -> dev
2f6baa0
@yeonjy
feat: docker-compose.yml ์ž‘์„ฑ
c66502f
@yeonjy
feat: backend network ์ถ”๊ฐ€ & entrypoint ์„ค์ •
210fb34
@yeonjy
feat: Dockerfile ์ถ”๊ฐ€
9e5b5e5
@yeonjy
feat: RabbitMQ ๋””ํดํŠธ ๊ณ„์ • ์„ค์ • & ๋ณผ๋ฅจ ์„ค์ •
efbaf3c
@yeonjy
Merge branch 'Dev-backend' into build/#10-backend-cicd
2b626fd
@yeonjy
Merge pull request #11 from tukcomCD2024/build/#10-backend-cicd
2408555 
Build/#10 backend cicd
@yeonjy
build: application.yml์„ ์œ„ํ•œ submodule ์„ค์ • ์ถ”๊ฐ€
7e6c6c3
@yeonjy
fix: - uses์˜ '-' ์ œ๊ฑฐ
34aa789
@yeonjy
style: ๋“ค์—ฌ์“ฐ๊ธฐ ์กฐ์ •
aaa2563
@yeonjy
fix: submodule branch๋ช… ๋ณ€๊ฒฝ
0fba6ed
@yeonjy
fix: space -> tab
02cd645
@yeonjy
fix: submodule ๊ฒฝ๋กœ๋ช… ๋ณ€๊ฒฝ
7ab80c7
@yeonjy
feat: submodule update
de24e1e
@yeonjy
fix: working-directory ๊ฒฝ๋กœ ์ˆ˜์ •
12f25a6
@yeonjy
chore: ai_response_processor์˜ env ์ถ”๊ฐ€
6943c81
@yeonjy
feat: ai_response_processor env update
d755888
@yeonjy
Merge branch 'Dev-backend' of https://github.com/tukcomCD2024/JinJiHan โ€ฆ
073b36c 
โ€ฆinto Dev-backend
@yeonjy
chore: scoop-ai-env ๊ฒฝ๋กœ ๋ณ€๊ฒฝ
e7eb4ee
yeonjy and others added 23 commits April 19, 2024 22:35
@yeonjy
fix: app ๊ฒฝ๋กœ ์‚ญ์ œ
09f2d61
@yeonjy
fix: chromadb ๋ฒ„์ „ ์ถฉ๋Œ ํ•ด๊ฒฐ
d9885cb
@yeonjy
chore: ์‚ฌ์šฉํ•˜์ง€ ์•Š๋Š” ๋ผ์ด๋ธŒ๋Ÿฌ๋ฆฌ ์‚ญ์ œ
222ddbc
@yeonjy
build: login ์ฝ”๋“œ ์ถ”๊ฐ€
058f522
@yeonjy
Update gradle.yml
0f15943
@yeonjy
Update gradle.yml
751e540
@yeonjy
Update gradle.yml
4911365
@yeonjy
Update gradle.yml
770ca1a
@yeonjy
Update gradle.yml
6eb1718
@yeonjy
Update gradle.yml
fe64153
@yeonjy
Update gradle.yml
98764b8
@yeonjy
feat: submodule update
19fb729
@yeonjy
feat: application ์œ„์น˜ ๋ณ€๊ฒฝ
b39fd07
@yeonjy
feat: deleteByNewsId ์ถ”๊ฐ€
5c19680
@yeonjy
feat: saveBookmark & deleteBookmark ์ถ”๊ฐ€
562a2df
@yeonjy
feat: Bookmark Builder ๊ตฌํ˜„
a18ca80
@yeonjy
feat: saveBookmark & deleteBookmark ๋กœ์ง ๊ตฌํ˜„
8c5f3d8
@yeonjy
Merge pull request #74 from tukcomCD2024/feat/#71-backend-bookmark
0652055 
Feat/#71 Bookmark ์ƒ์„ฑ ๋ฐ ์‚ญ์ œ
@yeonjy
๏ฟฝstyle: ์‚ฌ์šฉํ•˜์ง€ ์•Š๋Š” import ์ •๋ฆฌ
7291675
@yeonjy
fix: newsService & BookmarkService ์ˆœํ™˜์ฐธ์กฐ ์ˆ˜์ •
bf9e2f2
@yeonjy
feat: MemberResponse ๊ตฌํ˜„
e1646fc
@yeonjy
feat: Member ์ •๋ณด ์ „๋‹ฌ ๋กœ์ง ๊ตฌํ˜„
3fff89d
@yeonjy
Merge pull request #76 from tukcomCD2024/feat/#75-backend-mypage
8804dec 
Feat/#75 MyPage ์‚ฌ์šฉ์ž ์ •๋ณด ์ „๋‹ฌ
@yeonjy yeonjy added ๐Ÿ› fix ๋ฒ„๊ทธ ์ˆ˜์ • ๐Ÿ‘ท build ๋นŒ๋“œ ํŒŒ์ผ ์ˆ˜์ • ๐Ÿ“ฆ chore ๋นŒ๋“œ ์—…๋ฌด ์ˆ˜์ •, ํŒจํ‚ค์ง€ ๋งค๋‹ˆ์ € ์ˆ˜์ • (gitignore ์ˆ˜์ • ๋“ฑ) โœจ feat ์ƒˆ๋กœ์šด ๊ธฐ๋Šฅ ์ถ”๊ฐ€ labels Apr 20, 2024
@yeonjy yeonjy self-assigned this Apr 20, 2024
@yeonjy yeonjy merged commit 6467a67 into Dev Apr 20, 2024
1 check passed
@yeonjy yeonjy mentioned this pull request May 14, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@yeonjy yeonjy

Labels
๐Ÿ‘ท build ๋นŒ๋“œ ํŒŒ์ผ ์ˆ˜์ • ๐Ÿ“ฆ chore ๋นŒ๋“œ ์—…๋ฌด ์ˆ˜์ •, ํŒจํ‚ค์ง€ ๋งค๋‹ˆ์ € ์ˆ˜์ • (gitignore ์ˆ˜์ • ๋“ฑ) โœจ feat ์ƒˆ๋กœ์šด ๊ธฐ๋Šฅ ์ถ”๊ฐ€ ๐Ÿ› fix ๋ฒ„๊ทธ ์ˆ˜์ •
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@yeonjy