Skip to content

release: develop 브랜치에서 main으로 릴리즈 병합 #68

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

Merged
soo0711 merged 193 commits into from
Jul 4, 2025
Merged

release: develop 브랜치에서 main으로 릴리즈 병합 #68

Changes from all commits
Commits
Show all changes
193 commits
Select commit Hold shift + click to select a range
ad9ff27
api
ghbtkk May 16, 2025
26c5739
Merge remote-tracking branch 'upstream/main' into front-main
chaechae128 May 16, 2025
3cb5183
admin/user RUD fabric CRUD
ghbtkk May 16, 2025
9306e10
user backend connect
chaechae128 May 16, 2025
c710c4f
Merge pull request #31 from chaechae128/front-main
chaechae128 May 16, 2025
c02e70a
김채연/[refactor] 사용자 이메일찾기, 인증번호 확인 api 주소 수정
chaechae128 May 16, 2025
6f2f0c0
Merge pull request #32 from chaechae128/front-main
chaechae128 May 16, 2025
c26401e
admin/stain-removal CRUD
ghbtkk May 16, 2025
5c171c7
Merge branch 'front-main' of https://github.com/soo0711/rushWash into…
ghbtkk May 16, 2025
24d73e0
feat : 섬유유연제 추천 backend 연결
soo0711 May 16, 2025
2bcd8af
refactor : error 처리가 500으로만 나와서 알맞게 수정, alert 중복 방지, error발생시 alert후 …
soo0711 May 16, 2025
9bce406
김채연/[refactor] 관리자 얼룩별 세탁법 crud, 관리자 사용자 분석 내역 조회 수정
chaechae128 May 17, 2025
f50de43
Merge pull request #36 from chaechae128/front-main
chaechae128 May 17, 2025
34f887e
김채연/[refactor] 관리자 분석내역 조회 시 userEmail까지 조인해서 조회로 수정
chaechae128 May 17, 2025
6369b98
Merge pull request #37 from chaechae128/front-main
chaechae128 May 17, 2025
aa86ead
feat : fabric_softener DB 이미지 추가에 맞춰 조회 다시 구현
soo0711 May 17, 2025
05595a3
feat : fabric_softener DB 이미지 추가에 맞춰 조회 다시 구현, 섬유유연제 이미지 추가
soo0711 May 17, 2025
9591b57
ai_v1
tyoon11 May 18, 2025
d35dc81
Merge remote-tracking branch 'origin/tyoon' into back-main
soo0711 May 20, 2025
753b82c
user/history historydetail
ghbtkk May 20, 2025
9c13fbd
feat : stain 분석 파이썬 연결
soo0711 May 20, 2025
884aaa2
refactor: stain분석 연결 오류 - washingResult 도메인 수정, istrutions null 처리
soo0711 May 20, 2025
34054ba
refactor: 이미지 저장 중복 메소드 추출
soo0711 May 20, 2025
4303583
feat: label 분석 파이썬 연결
soo0711 May 20, 2025
6a4911b
refactor: 파이썬 경로 수정
soo0711 May 20, 2025
c8b5d71
Merge branch 'back-main' into front-main
chaechae128 May 21, 2025
4889110
김채연/[refactor]얼룩분석하기 프론트 백엔드 연걸
chaechae128 May 21, 2025
70c3533
Merge pull request #40 from chaechae128/front-main
chaechae128 May 21, 2025
a481519
김채연[refactor]백엔트 프론트 연결
chaechae128 May 21, 2025
54f1062
Merge pull request #41 from chaechae128/front-main
chaechae128 May 21, 2025
9ec46c6
refactor: 얼룩, 라벨 분석 사진 이상시 재등록 에러 처리
soo0711 May 21, 2025
6aafa7e
admin/washinghistory
ghbtkk May 21, 2025
ff1db83
Merge branch 'front-main' of https://github.com/soo0711/rushWash into…
ghbtkk May 21, 2025
a528629
김채연/[refactor]얼룩 분석 상세 페이지 수정
chaechae128 May 21, 2025
ed2e602
Merge pull request #42 from chaechae128/front-main
chaechae128 May 21, 2025
b3cf28c
admin/dashboard
ghbtkk May 21, 2025
eb9b41b
김채연/[refactor]섬유유연제 추가
chaechae128 May 21, 2025
b4d121c
Merge pull request #43 from chaechae128/front-main
chaechae128 May 21, 2025
b7bca49
refactor: PathVariable 이름 명시
soo0711 May 21, 2025
9bda467
파이프라인 수정
tyoon11 May 21, 2025
bb54010
김채연/[refactor]관리자 대시보드 화면 백엔드 코드 추가, 프론트와 연결
chaechae128 May 22, 2025
e86e48a
Merge pull request #44 from chaechae128/front-main
chaechae128 May 22, 2025
235d01d
admin/AI json 연동
ghbtkk May 22, 2025
a4a3dcb
feat : 관리자 섬유유연제 이미지 추가해서 생성, 수정, 삭제 구현
soo0711 May 22, 2025
c784d67
feat: 사진 찍기 UI 추가
soo0711 May 23, 2025
db76ac8
fix: 이미지 삭제
soo0711 May 23, 2025
50a76a4
performance폴더 내용 수정
Jae-Hyuk-Jang May 23, 2025
fcb1b02
react spring 연동시도
chaechae128 May 23, 2025
3cb88e1
Merge branch 'depoly-dev' of https://github.com/soo0711/rushWash into…
soo0711 May 23, 2025
6633440
Merge pull request #46 from chaechae128/depoly-dev
soo0711 May 23, 2025
fe1eeb9
Merge branch 'depoly-dev' of https://github.com/soo0711/rushWash into…
soo0711 May 23, 2025
5fed680
add output_path
tyoon11 May 23, 2025
2ceb4c3
ai_v2
tyoon11 May 23, 2025
8cec593
react spring 연동시도
chaechae128 May 23, 2025
02ab79e
Merge pull request #47 from chaechae128/depoly-dev
chaechae128 May 23, 2025
467d729
Merge branch 'depoly-dev' of https://github.com/soo0711/rushWash into…
soo0711 May 23, 2025
5140689
fix: 머지 충돌해결, .idea git 추적 삭제
soo0711 May 23, 2025
efcd277
feat: 얼룩 분석 이미지 응답 추가
soo0711 May 23, 2025
b3e9710
refactor: output 경로 수정
soo0711 May 23, 2025
367fef7
feat: label 분석 응답 이미지 추가
soo0711 May 23, 2025
ba22a18
fix: react라우터 경로 중복으로 admin 경로 /api 붙여서 /api/admin으로 변경
soo0711 May 24, 2025
40cab95
user analyze camera
ghbtkk May 24, 2025
5c5e69f
front 수정사항
ghbtkk May 24, 2025
ec2fe94
refactor: /api/admin 경로 수정해서 그에 맞게 고침
soo0711 May 24, 2025
c26b338
llm 구현
tyoon11 May 25, 2025
5851f3a
분석 결과 수정 및 관리자 분석 내역 수정
chaechae128 May 25, 2025
7325ef8
Merge pull request #48 from chaechae128/depoly-dev
chaechae128 May 25, 2025
e26cd4f
chore : schema.sql 추가
soo0711 May 25, 2025
e6fe904
Merge branch 'deploy-dev' of https://github.com/soo0711/rushWash into…
soo0711 May 25, 2025
1af87de
fix: 이미지 파일 삭제
soo0711 May 25, 2025
6b947a5
chore : ci/cd 파이프라인 구축
soo0711 May 25, 2025
f9e93ca
chore : gitactions 돌아가게 다시 push
soo0711 May 25, 2025
a54d24e
chore : cicd gradle 경로 수정
soo0711 May 25, 2025
3de1beb
chore : cicd 위치 변경
soo0711 May 25, 2025
d1a1dd7
chore : cicd 위치 변경
soo0711 May 25, 2025
54c7605
chore : cicd front 복사 위치 변경
soo0711 May 25, 2025
7c7ebca
chore : cicd front error 무시하기
soo0711 May 25, 2025
484c402
chore : gradle 고치기
soo0711 May 25, 2025
92ac6bb
chore : cicd 통합
soo0711 May 25, 2025
47a7405
chore : front - back port 번호 바꾸기
soo0711 May 25, 2025
e13d24f
refactor: 경로 수정
soo0711 May 25, 2025
e7a10bb
refactor: 경로 수정
soo0711 May 25, 2025
3d2c158
user/ stain camera
ghbtkk May 25, 2025
c77e7b9
user analyze camera
ghbtkk May 25, 2025
840b839
refactor: 메인페이지 bubble 수정
soo0711 May 25, 2025
1fbfe79
user/analyze camera
ghbtkk May 25, 2025
d22c8f4
user/ camera
ghbtkk May 25, 2025
528a506
user/both label camera
ghbtkk May 25, 2025
c8a3176
ai commit 0526
tyoon11 May 25, 2025
8d03858
refactor : ai 경로 수정
soo0711 May 26, 2025
277b11a
Merge remote-tracking branch 'origin/tyoon' into deploy-dev
soo0711 May 26, 2025
86749aa
feat : 얼룩 + 라벨 분석하기 ai 연동
soo0711 May 26, 2025
2232207
user/both result
ghbtkk May 26, 2025
6cfa32d
관리자 분석내역 삭제 시 이미지도 함께 삭제
chaechae128 May 26, 2025
260e5af
관리자 분석내역 삭제 시 이미지도 함께 삭제
chaechae128 May 26, 2025
4963f97
Merge pull request #49 from chaechae128/depoly-dev
chaechae128 May 26, 2025
41062c2
feat : cicd ai 삭제 후 모두 복사 => ai 달라는것만 복사
soo0711 May 26, 2025
699c006
Merge branch 'deploy-dev' of https://github.com/soo0711/rushWash into…
soo0711 May 26, 2025
0d6a562
feat : cicd ai 삭제 후 모두 복사 => ai 달라는것만 복사
soo0711 May 26, 2025
8cd12ab
chore : cicd front 삭제 후 모두 복사 => front 달라는것만 복사
soo0711 May 26, 2025
5c2d510
refactor: delete 매소드 변경
soo0711 May 26, 2025
9784179
fix : washingHistory log확인
soo0711 May 26, 2025
ff4e142
fix : washingHistory log 확인 python 추가
soo0711 May 26, 2025
96bacf2
refactor : stain_label response 수정
soo0711 May 26, 2025
adcb039
refactor : stain+label 분석 시 stain insert 수정
soo0711 May 26, 2025
fc5ee13
refactor : stain+label null error 추가
soo0711 May 26, 2025
a2cd63d
refactor : cicd python test.py 실행 추가
soo0711 May 26, 2025
b231e07
refactor : analysis transactional 추가
soo0711 May 26, 2025
1c18796
refactor : log 안 찍혀서 syso로 변경
soo0711 May 26, 2025
2ffb8dd
refactor : log 추가
soo0711 May 26, 2025
bde1bb0
refactor: react both 경로 수정
soo0711 May 26, 2025
bc340f8
refactor: stain-label stain db insert 추가
soo0711 May 26, 2025
a875adc
refactor: stain-label 파이썬 json log 추가
soo0711 May 26, 2025
de6ea57
refactor: stain-label db 가이드로 insert로 수정
soo0711 May 26, 2025
0d34ae8
refactor : 얼룩+ 라벨 guide 따로 저장
soo0711 May 26, 2025
593cbb8
관리자 분석 내역 페이지 수정
chaechae128 May 26, 2025
523f4d0
Merge pull request #50 from chaechae128/depoly-dev
chaechae128 May 26, 2025
ac079f2
user/both analysis
ghbtkk May 26, 2025
1ed9cca
Merge branch 'deploy-dev' of https://github.com/soo0711/rushWash into…
ghbtkk May 26, 2025
ea59295
admin/ washinghistory
ghbtkk May 26, 2025
f1850cc
분석 결과 페이지 수정
chaechae128 May 26, 2025
1a362f8
Merge pull request #51 from chaechae128/depoly-dev
chaechae128 May 26, 2025
5d061f9
user/both analysis
ghbtkk May 26, 2025
dc7192b
Merge branch 'deploy-dev' of https://github.com/soo0711/rushWash into…
ghbtkk May 26, 2025
8104a8a
chore: ci/cd front 지우고 복사로 수정
soo0711 May 26, 2025
e74b958
Merge branch 'deploy-dev' of https://github.com/soo0711/rushWash into…
soo0711 May 26, 2025
8a116aa
user/both analysis
ghbtkk May 26, 2025
f5b4fd3
chore : cicd gradle 권한 추가
soo0711 May 26, 2025
adbe8b6
분석 결과 상세 페이지 수정
chaechae128 May 26, 2025
2596c94
Merge pull request #52 from chaechae128/depoly-dev
chaechae128 May 26, 2025
ce2fe62
분석 결과 상세 페이지 수정
chaechae128 May 26, 2025
8f9bf43
Merge pull request #53 from chaechae128/depoly-dev
chaechae128 May 26, 2025
7c4e1b8
admin/ washinghistory
ghbtkk May 27, 2025
afbc054
Merge branch 'deploy-dev' of https://github.com/soo0711/rushWash into…
ghbtkk May 27, 2025
bda5afb
admin/ washinghistory modal
ghbtkk May 27, 2025
b82c646
rushwash logo
ghbtkk May 27, 2025
1450af5
admin/ AI retrain button
ghbtkk May 27, 2025
6cb9033
refactor: py 출력이 ''면 재업로드로 간주해서 에러
soo0711 May 27, 2025
278bae3
refactor: py 출력이 empty, null이면 얼룩, 라벨, 얼룩+라벨 모두 재업로드 에러 처리로 수정
soo0711 May 27, 2025
5317bfb
refactor: py 출력이 empty, null 에러 둘다 추가
soo0711 May 27, 2025
7926c67
refactor: py 출력 에러 수정
soo0711 May 27, 2025
76160f9
refactor : ai null처리 추가
soo0711 May 27, 2025
a204e71
refactor : back stain, stain and label null처리 추가
soo0711 May 27, 2025
7806924
[FEATURE] 사용자 분석 상세 페이지 수정
chaechae128 May 28, 2025
28b75d2
Merge pull request #54 from chaechae128/depoly-dev
chaechae128 May 28, 2025
14e26cc
[FEATURE] 사용자 분석 상세 페이지 수정
chaechae128 May 28, 2025
b16070a
Merge pull request #55 from chaechae128/depoly-dev
chaechae128 May 28, 2025
e6aaacb
[FEATURE] 관리자 섬유유연제 추가 시 이미지도 추가
chaechae128 May 28, 2025
c7f5349
Merge pull request #56 from chaechae128/depoly-dev
chaechae128 May 28, 2025
3089dde
[FEATURE] 관리자 섬유유연제 추가 수정
chaechae128 May 28, 2025
8b661bd
Merge pull request #57 from chaechae128/depoly-dev
chaechae128 May 28, 2025
e1bd293
[FEATURE] 사용자 얼룩+라벨 분석 시 얼룩별 세탁법 표시 제거
chaechae128 May 28, 2025
74231ca
Merge pull request #58 from chaechae128/depoly-dev
chaechae128 May 28, 2025
7056d69
[FEATURE] 사용자 얼룩+라벨 분석 시 얼룩별 세탁법 표시 제거
chaechae128 May 28, 2025
dd0537d
Merge pull request #59 from chaechae128/depoly-dev
chaechae128 May 28, 2025
88f2a75
재학습및 성능평가 파이프라인 통합
tyoon11 May 28, 2025
e10110c
db접속 관련 수정
tyoon11 May 28, 2025
10ccc15
llm 폴더 생성관련 수정
tyoon11 May 28, 2025
b8489cd
[FEATURE] 사용자 얼룩+라벨 분석 시 얼룩별 세탁법 표시 제거
chaechae128 May 28, 2025
165e274
Merge pull request #60 from chaechae128/depoly-dev
chaechae128 May 28, 2025
9760690
Merge remote-tracking branch 'upstream/tyoon' into depoly-dev
chaechae128 May 28, 2025
3f24854
[FEATURE] ai 재학습 파이썬 코드연결
chaechae128 May 28, 2025
e8b6b7f
Merge pull request #61 from chaechae128/depoly-dev
chaechae128 May 28, 2025
0e9713f
[FEATURE] 재학습연동 수정
chaechae128 May 28, 2025
649f1b3
Merge pull request #62 from chaechae128/depoly-dev
chaechae128 May 28, 2025
5db502c
DB config 수정 및 파이프라인 수정
tyoon11 May 28, 2025
d950310
DB config 수정 및 파이프라인 수정2
tyoon11 May 28, 2025
4ce5e49
DB config 수정 및 파이프라인 수정2
tyoon11 May 28, 2025
3a47d71
Merge remote-tracking branch 'upstream/tyoon' into depoly-dev
chaechae128 May 29, 2025
3523271
[FEATURE] 재학습연동 수정
chaechae128 May 29, 2025
30ff2a8
Merge pull request #63 from chaechae128/depoly-dev
chaechae128 May 29, 2025
7e6d69e
[FEATURE] 재학습연동 수정
chaechae128 May 29, 2025
3f4e226
Merge pull request #64 from chaechae128/depoly-dev
chaechae128 May 29, 2025
3bdb8bb
[FEATURE] 재학습연동 수정
chaechae128 May 29, 2025
ccbcaca
Merge pull request #65 from chaechae128/depoly-dev
chaechae128 May 29, 2025
65f1c80
DB 연결 수정 및 test셋 수정
tyoon11 May 29, 2025
0c50a47
[FEATURE] 재학습연동 수정
chaechae128 May 29, 2025
32cd381
Merge pull request #66 from chaechae128/depoly-dev
chaechae128 May 29, 2025
8dfe204
Merge remote-tracking branch 'upstream/tyoon' into depoly-dev
chaechae128 May 29, 2025
6293049
Merge pull request #67 from chaechae128/depoly-dev
chaechae128 May 29, 2025
17c2d1d
front 수정
ghbtkk May 29, 2025
0a4f0d0
refactor : null처리 수정
soo0711 May 29, 2025
7c46cd8
refactor : null 주석처리
soo0711 May 29, 2025
4b1d8fa
refactor : 파일명 중복 방지
soo0711 May 29, 2025
ec0a4bd
refactor: ai 응답 log 추가
soo0711 May 29, 2025
1b91122
refactor: ai 응답 log 추가2
soo0711 May 29, 2025
e7a22f9
refactor: stain and label response name 수정
soo0711 May 29, 2025
4edfb8e
refactor: 필드 유효성 검증 주석 삭제
soo0711 May 29, 2025
1366e9b
ai_train , aidata 폴더 추가
Jae-Hyuk-Jang Jun 13, 2025
333c429
Merge branch 'deploy-dev' of https://github.com/soo0711/rushWash into…
Jae-Hyuk-Jang Jun 13, 2025
be70229
feat: gradle cache 추가
soo0711 Jul 4, 2025
62f8b93
Merge branch 'deploy-dev' of https://github.com/soo0711/rushWash into…
soo0711 Jul 4, 2025
4037795
feat: 학과서버 닫아서 배포 주석처리
soo0711 Jul 4, 2025

Sorry, this diff is taking too long to generate.

It may be too large to display on GitHub.