From 24cddf61a781a198f74df35c304dcb2a54bc0808 Mon Sep 17 00:00:00 2001 From: yongsik Date: Thu, 11 Dec 2025 00:42:19 +0900 Subject: [PATCH 1/4] =?UTF-8?q?(fix)=20=EB=8C=80=ED=95=99=EA=B5=90=20?= =?UTF-8?q?=EC=86=8C=EA=B0=9C=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=98=88?= =?UTF-8?q?=EC=99=B8=20=EC=B2=98=EB=A6=AC=20=EB=B0=8F=20=EB=94=94=ED=8F=B4?= =?UTF-8?q?=ED=8A=B8=20=EB=A7=81=ED=81=AC=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/school/model/IntroPost.java | 2 +- .../fragments/school/universityBasicInfo.html | 8 ++++---- .../templates/fragments/school/universityInfoCard.html | 10 ++++++---- .../fragments/school/universityIntroSection.html | 6 ++++-- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/cooperation/project/cooperationcenter/domain/school/model/IntroPost.java b/src/main/java/com/cooperation/project/cooperationcenter/domain/school/model/IntroPost.java index 22d7815..11e4814 100644 --- a/src/main/java/com/cooperation/project/cooperationcenter/domain/school/model/IntroPost.java +++ b/src/main/java/com/cooperation/project/cooperationcenter/domain/school/model/IntroPost.java @@ -70,7 +70,7 @@ public void updateCollege(List colleges){ } public String getImgUrl(){ - if(this.schoolPicUrl==null){ + if(this.schoolPicUrl==null || this.schoolPicUrl.isEmpty()){ return "/api/v1/file/default/school"; }else{ return this.schoolPicUrl; diff --git a/src/main/resources/templates/fragments/school/universityBasicInfo.html b/src/main/resources/templates/fragments/school/universityBasicInfo.html index c1816cf..97aa270 100644 --- a/src/main/resources/templates/fragments/school/universityBasicInfo.html +++ b/src/main/resources/templates/fragments/school/universityBasicInfo.html @@ -23,25 +23,25 @@

기본 정보

학교명
-
학교명 (영문명)
+
-
설립 연도
-
1954년
+
-
위치
- 인천광역시 미추홀구 인하로 100, 22212 + -
특징
- 공학 중심의 종합대학 / 항공우주·조선·AI 융합 분야 특성화 / 산학연 클러스터 협력 강화 + -
diff --git a/src/main/resources/templates/fragments/school/universityInfoCard.html b/src/main/resources/templates/fragments/school/universityInfoCard.html index 34e6d31..2d6662c 100644 --- a/src/main/resources/templates/fragments/school/universityInfoCard.html +++ b/src/main/resources/templates/fragments/school/universityInfoCard.html @@ -12,7 +12,7 @@

카드 제목

-

내용 1

+

-

내용 2

보조 설명

@@ -32,12 +32,14 @@

카드 제목

관련 홈페이지

    -
  • +
  • : 바로가기 + th:href="${urls[iter.index]}"> + 바로가기 +
diff --git a/src/main/resources/templates/fragments/school/universityIntroSection.html b/src/main/resources/templates/fragments/school/universityIntroSection.html index e35038a..781e60b 100644 --- a/src/main/resources/templates/fragments/school/universityIntroSection.html +++ b/src/main/resources/templates/fragments/school/universityIntroSection.html @@ -31,11 +31,13 @@

학교 소
- 공식 홈페이지 - English Site From 08abca880320e01ee3afa891ae6362b139cf0871 Mon Sep 17 00:00:00 2001 From: yongsik Date: Thu, 11 Dec 2025 01:16:24 +0900 Subject: [PATCH 2/4] =?UTF-8?q?(fix)=20file=20download=20url=20=EC=9E=98?= =?UTF-8?q?=EB=AA=BB=20=EB=B0=98=ED=99=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cooperationcenter/domain/school/dto/SchoolResponse.java | 2 +- .../domain/school/service/SchoolFindService.java | 6 ++---- .../resources/templates/fragments/school/admin/modals.html | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/cooperation/project/cooperationcenter/domain/school/dto/SchoolResponse.java b/src/main/java/com/cooperation/project/cooperationcenter/domain/school/dto/SchoolResponse.java index 2e90420..2cac4ef 100644 --- a/src/main/java/com/cooperation/project/cooperationcenter/domain/school/dto/SchoolResponse.java +++ b/src/main/java/com/cooperation/project/cooperationcenter/domain/school/dto/SchoolResponse.java @@ -222,7 +222,7 @@ public record PostFileDto( String fileId ){ public static PostFileDto from(FileAttachment file){ - String url = "/api/v1/file/"+file.getFiletype().getFileType()+"/"+file.getFileId(); + String url = "/api/v1/file/"+file.getFiletype().getFileType().toLowerCase()+"/"+file.getFileId(); return new PostFileDto( file.getOriginalName(), url, diff --git a/src/main/java/com/cooperation/project/cooperationcenter/domain/school/service/SchoolFindService.java b/src/main/java/com/cooperation/project/cooperationcenter/domain/school/service/SchoolFindService.java index 4ffe3ef..90a2eb2 100644 --- a/src/main/java/com/cooperation/project/cooperationcenter/domain/school/service/SchoolFindService.java +++ b/src/main/java/com/cooperation/project/cooperationcenter/domain/school/service/SchoolFindService.java @@ -407,16 +407,14 @@ public SchoolResponse.PostDetailDto getDetailPostDto(Long postId){ increasePostView(postId); SchoolPost schoolPost = loadPostById(postId); SchoolResponse.SchoolPostDto dto = SchoolResponse.SchoolPostDto.from(schoolPost); - SchoolBoard schoolBoard = schoolPost.getSchoolBoard(); //fixme 수정하기 QueryDSL로 -// SchoolPost beforePost = getBeforePostById(postId,schoolBoard); -// SchoolPost afterPost = getAfterPostById(postId,schoolBoard); try{ SchoolPost beforePost = schoolPostQSDLRepository.findBeforePost(schoolPost); SchoolPost afterPost = schoolPostQSDLRepository.findAfterPost(schoolPost); - return new SchoolResponse.PostDetailDto(dto, + return new SchoolResponse.PostDetailDto( + dto, loadPostFileByPost(postId), (beforePost==null)? null: SchoolResponse.SchoolPostSimpleDto.from(beforePost), (afterPost==null)? null: SchoolResponse.SchoolPostSimpleDto.from(afterPost)); diff --git a/src/main/resources/templates/fragments/school/admin/modals.html b/src/main/resources/templates/fragments/school/admin/modals.html index 047ca3a..d54e63a 100644 --- a/src/main/resources/templates/fragments/school/admin/modals.html +++ b/src/main/resources/templates/fragments/school/admin/modals.html @@ -99,7 +99,7 @@

새 카테고리 추가

@@ -97,11 +97,11 @@ th:if="${!requestURI.startsWith('/profile')}">
- + 首页 @@ -112,9 +112,9 @@ class="block text-gray-600 hover:text-primary">
- 유학원 + 留学机构 설문조사 + class="block pl-4 pr-4 py-2 text-gray-700 hover:bg-gray-100">问卷调查 - \ No newline at end of file + diff --git a/src/main/resources/templates/fragments/common/pagination.html b/src/main/resources/templates/fragments/common/pagination.html index 74ab028..7ead2a6 100644 --- a/src/main/resources/templates/fragments/common/pagination.html +++ b/src/main/resources/templates/fragments/common/pagination.html @@ -17,10 +17,10 @@ - 이전 + 上一页 - 이전 + 上一页 @@ -41,11 +41,11 @@ - 다음 + 下一页 - 다음 + 下一页 - \ No newline at end of file + diff --git a/src/main/resources/templates/fragments/common/survey-nav.html b/src/main/resources/templates/fragments/common/survey-nav.html index e44fc9a..316b931 100644 --- a/src/main/resources/templates/fragments/common/survey-nav.html +++ b/src/main/resources/templates/fragments/common/survey-nav.html @@ -6,22 +6,22 @@
diff --git a/src/main/resources/templates/fragments/form/address-input.html b/src/main/resources/templates/fragments/form/address-input.html index 818694c..06e7b6f 100644 --- a/src/main/resources/templates/fragments/form/address-input.html +++ b/src/main/resources/templates/fragments/form/address-input.html @@ -17,23 +17,23 @@
+ placeholder="邮政编码"/>
+ placeholder="基本地址"/> + placeholder="详细地址"/>
- \ No newline at end of file + diff --git a/src/main/resources/templates/fragments/member/agencyAlreadySignup.html b/src/main/resources/templates/fragments/member/agencyAlreadySignup.html index cad1adc..35c67a3 100644 --- a/src/main/resources/templates/fragments/member/agencyAlreadySignup.html +++ b/src/main/resources/templates/fragments/member/agencyAlreadySignup.html @@ -1,15 +1,15 @@
- + placeholder="全球留学机构"/>
-
-
\ No newline at end of file +
diff --git a/src/main/resources/templates/fragments/member/agencySignup.html b/src/main/resources/templates/fragments/member/agencySignup.html index 0fe3a39..c0b2679 100644 --- a/src/main/resources/templates/fragments/member/agencySignup.html +++ b/src/main/resources/templates/fragments/member/agencySignup.html @@ -2,77 +2,80 @@
- + placeholder="全球留学机构"/>
+
- + placeholder="金**"/>

- 대표자 성함을 입력해주세요.

+ 请输入负责人姓名。

+
-

- 대표자 이메일을 입력해주세요

+ 请输入负责人邮箱

+
-

- '-' 없이 숫자만 입력해주세요

+ 请输入数字(不含“-”)

-
+ placeholder="邮政编码"/>
+ placeholder="基本地址"/> + placeholder="详细地址"/>
+ 留学机构地区 *
@@ -81,9 +84,10 @@
+
-
@@ -91,30 +95,31 @@

- 이미지를 여기에 끌어다 놓거나

+ 将图片拖拽到此处,或

- JPG, PNG, GIF 파일 (최대 5MB)

+ JPG、PNG、GIF 文件(最多 5MB)

+
-
@@ -122,12 +127,12 @@

- 파일을 여기에 끌어다 놓거나

+ 将文件拖拽到此处,或

- PDF, JPG, PNG 파일 (최대 10MB)

+ PDF、JPG、PNG 文件(最多 10MB)

@@ -150,4 +155,4 @@
- \ No newline at end of file + diff --git a/src/main/resources/templates/fragments/member/userSignup.html b/src/main/resources/templates/fragments/member/userSignup.html index 6082be6..6c5a55d 100644 --- a/src/main/resources/templates/fragments/member/userSignup.html +++ b/src/main/resources/templates/fragments/member/userSignup.html @@ -2,15 +2,16 @@
- + placeholder="洪吉童"/>
+
-

- 이메일 형식으로 입력해주세요.

+ 请按邮箱格式输入。

+
-
+ placeholder="请输入密码"/>

- 영문, 숫자, 특수문자 조합 8자리 이상

+ 至少 8 位,包含字母、数字和特殊字符

+
-
+ placeholder="请再次输入密码"/>
-
-

- '-' 없이 숫자만 입력해주세요

+ 请输入数字(不含“-”)

+
-

- '-' 없이 숫자만 입력해주세요

+ 请输入数字(不含“-”)

+
-
+ placeholder="邮政编码"/>
+ placeholder="基本地址"/> + placeholder="详细地址"/>
-
\ No newline at end of file +
diff --git a/src/main/resources/templates/fragments/school/schoolCard.html b/src/main/resources/templates/fragments/school/schoolCard.html index 9a9e263..d0a3e0c 100644 --- a/src/main/resources/templates/fragments/school/schoolCard.html +++ b/src/main/resources/templates/fragments/school/schoolCard.html @@ -14,8 +14,8 @@
- 대학교 이름 - University English Name + 大学名称 + 大学英文名称
@@ -36,6 +36,6 @@
-

no-data

+

暂无数据

- \ No newline at end of file + diff --git a/src/main/resources/templates/fragments/school/universityBasicInfo.html b/src/main/resources/templates/fragments/school/universityBasicInfo.html index 97aa270..77a714e 100644 --- a/src/main/resources/templates/fragments/school/universityBasicInfo.html +++ b/src/main/resources/templates/fragments/school/universityBasicInfo.html @@ -17,29 +17,29 @@
-

기본 정보

+

基本信息

-
학교명
+
学校名称
-
-
설립 연도
+
成立年份
-
-
위치
+
位置
-
-
특징
+
特色
-
diff --git a/src/main/resources/templates/fragments/school/universityCampusMap.html b/src/main/resources/templates/fragments/school/universityCampusMap.html index 74014f5..e55d9c2 100644 --- a/src/main/resources/templates/fragments/school/universityCampusMap.html +++ b/src/main/resources/templates/fragments/school/universityCampusMap.html @@ -17,21 +17,19 @@
-

캠퍼스 위치

+

校园位置

-
-
-

주소

+

地址

서울특별시 광진구 능동로 209 (05006) 세종대학교

@@ -39,7 +37,7 @@

주소

- 오시는 길 안내 + 路线指引
diff --git a/src/main/resources/templates/fragments/school/universityCollegeCard.html b/src/main/resources/templates/fragments/school/universityCollegeCard.html index b975bef..cb0d98a 100644 --- a/src/main/resources/templates/fragments/school/universityCollegeCard.html +++ b/src/main/resources/templates/fragments/school/universityCollegeCard.html @@ -12,7 +12,7 @@
-

단과대명

+

单科学院名称

@@ -21,7 +21,7 @@

단과

diff --git a/src/main/resources/templates/fragments/school/universityInfoCard.html b/src/main/resources/templates/fragments/school/universityInfoCard.html index 2d6662c..6000253 100644 --- a/src/main/resources/templates/fragments/school/universityInfoCard.html +++ b/src/main/resources/templates/fragments/school/universityInfoCard.html @@ -11,10 +11,10 @@ -->
-

카드 제목

+

卡片标题

-

-

내용 2

-

보조 설명

+

内容 2

+

辅助说明

@@ -29,7 +29,7 @@

카드 제목

-->
-

관련 홈페이지

+

相关网站

  • 관련 홈페이지 - 바로가기 + 前往
diff --git a/src/main/resources/templates/fragments/school/universityIntroSection.html b/src/main/resources/templates/fragments/school/universityIntroSection.html index 781e60b..8a81e37 100644 --- a/src/main/resources/templates/fragments/school/universityIntroSection.html +++ b/src/main/resources/templates/fragments/school/universityIntroSection.html @@ -23,8 +23,8 @@
-

학교 소개 제목

-

학교 설명 문구

+

学校介绍标题

+

学校说明文案

@@ -47,7 +47,7 @@

학교 소
- 학교 전경 + 校园全景

diff --git a/src/main/resources/templates/fragments/school/universityLeftSideBar.html b/src/main/resources/templates/fragments/school/universityLeftSideBar.html index d62eb3e..7d793bb 100644 --- a/src/main/resources/templates/fragments/school/universityLeftSideBar.html +++ b/src/main/resources/templates/fragments/school/universityLeftSideBar.html @@ -15,7 +15,7 @@
- 게시판 + 板块
@@ -23,12 +23,12 @@
-

국제 교류처 연락처

-

전화: 02-1234-5678

-

이메일: international@university.ac.kr

-

위치: 국제교류관 203호

+

国际交流处联系方式

+

电话: 02-1234-5678

+

邮箱: international@university.ac.kr

+

位置: 国际交流馆 203号

- \ No newline at end of file + diff --git a/src/main/resources/templates/fragments/school/universityNavHeader.html b/src/main/resources/templates/fragments/school/universityNavHeader.html index bfb95f5..6e75a00 100644 --- a/src/main/resources/templates/fragments/school/universityNavHeader.html +++ b/src/main/resources/templates/fragments/school/universityNavHeader.html @@ -2,11 +2,11 @@
- + 首页 > - 대학교 + 大学 >
-

세종대학교 소개

+

世宗大学介绍

- \ No newline at end of file + diff --git a/src/main/resources/templates/homepage/user/agency/agency-introduction.html b/src/main/resources/templates/homepage/user/agency/agency-introduction.html index f5bf05d..bbaccee 100644 --- a/src/main/resources/templates/homepage/user/agency/agency-introduction.html +++ b/src/main/resources/templates/homepage/user/agency/agency-introduction.html @@ -2,7 +2,7 @@ - 유학원 정보 - 유학 정보 플랫폼 + 留学机构信息 - 留学信息平台 @@ -49,6 +19,7 @@
+
@@ -59,6 +30,7 @@

내 프로필

프로필 편집 + + + +
@@ -157,29 +131,25 @@

프로필 편집

-

- jihyun.kim@example.com

+

jihyun.kim@example.com

-

- 010-1234-5678

+

010-1234-5678

-

- 010-1234-5678

+

010-1234-5678

-

- 경기도 성남시

+

경기도 성남시

+
@@ -189,13 +159,14 @@

유학원 정보

정보 수정 +
+ -
-
-
-
-

- 글로벌 에듀케이션 센터

-
-
-
-

대표자

-
-
- -
- -
-
-
-

컨설턴트 연락처

-
-
- -
- 010-9876-5432 -
-
-
-

유학원 지역

-
-
- -
- -
-
-
-

유학원 이메일

-
-
- -
- -
-
-
-

유학원 주소

-
-
- -
- 경기도 성남시 수정구 챔ㅇㄻㅇㄴㄻㄴㄹㄴ -
-
-
-
-
-
+ + +
-
-
-

사업자등록증

-
- - 다운로드 - - -
-
- -
- -
-
- 사업자등록증 - -
-
-
-
- 파일명 -

- biz-cert.pdf

-
-
- 업로드 -

- -

-
-

이미지(JPG/PNG/GIF/WEBP) 또는 PDF

-
-
- - -
- -

등록된 사업자등록증이 없습니다.

- -
-
- - - - - -
-
-

유학원 대표사진

- -
- - -
-
-
- 대표사진 -
-
-
-
- 파일명 -

- agency.jpg

-
-
- 업로드 -

- -

-
-

이미지(JPG/PNG/GIF/WEBP) 권장

-
-
- - -
- -

등록된 대표사진이 없습니다.

- -
-
- - - - - - - -
-
-

설문조사 기록

-
-
-
-
- -
-
- -
- 아직 설문 기록이 없습니다. -
- - -
-
-
-
-
- -
-
-

설문 제목

-

설문 설명

-
-
-
- -
- 2025년 5월 15일 - - - -
-
-
-
- - -
-
- - - - - - - - 1 - - - - - - -
- - -
- 1 - / - 10 페이지 · 총 - 0건 -
-
-
-
+ +
- - + + - - @@ -111,10 +110,11 @@

-

세종대학교 대학원 과/학과

+

研究生院系/学科

-
@@ -124,7 +124,7 @@

세종대학교 대학원 과/학 +

+
+ + - + - \ No newline at end of file + diff --git a/src/main/resources/templates/homepage/user/school/school-board.html b/src/main/resources/templates/homepage/user/school/school-board.html index aadca3a..9808b9e 100644 --- a/src/main/resources/templates/homepage/user/school/school-board.html +++ b/src/main/resources/templates/homepage/user/school/school-board.html @@ -2,16 +2,16 @@ - 국제 프로그램 - 신청 양식 + 国际项目 - 申请表格
-

학교 신청 양식들

+

学校申请表格

-
@@ -19,6 +19,7 @@

학교 신청 양식들

+
@@ -26,240 +27,90 @@

학교 신청 양식들

-

2025-2026학년도 신청 마감일

-

2025년 7월 31일까지 모든 신청서를 제출해주세요. 마감일 이후에는 접수가 불가능합니다.

+

2025-2026学年申请截止日期

+

+ 请在2025年7月31日前提交所有申请表。截止日期后无法受理。 +

+
- - - + + + + + + + + - - - - - - - - + + + + + + - - - + th:href="@{/api/v1/file/school/{fileId}(fileId=${post.fileId})}"> +
+ +
+ 下载 + + + + - - - -
문서명업데이트다운로드文件名更新日期下载
+
+ +
+ +
+
+ +
- -
-
- -
- -
-
- -
- -
-
- - - 공지 - -

- 문서 제목 -

-
-

- 설명 +

+
+ + + 公告 + +

+ 文件标题

- - -
- -
+

+ 说明 +

-
- 2025-06-01 - - + + + + + 2025-06-01 + + -
- -
- 다운로드 -
-
- 등록된 문서가 없습니다. + 暂无已登记的文件。
- - -
- -
- 1 - - - 10 - / - 0 -
- - - -
-
-
- -
-

신청서 제출 안내

-
-
-
- -
-
-

모든 서류는 PDF 형식으로 제출해주세요.

-
-
-
-
- -
-
-

작성된 서류는 international@university.ac.kr로 - 보내주세요.

-
-
-
-
- -
-
-

이메일 제목에는 [국제 프로그램 신청] 이름 - 지원 과정을 명시해주세요. -

-
-
-
-
- -
-
-

문의사항은 국제교류처 (02-1234-5678)로 연락주세요.

-
-
-
-
- -
-
-
- - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/templates/homepage/user/school/school-left-sidebar.html b/src/main/resources/templates/homepage/user/school/school-left-sidebar.html index 5810c72..151248e 100644 --- a/src/main/resources/templates/homepage/user/school/school-left-sidebar.html +++ b/src/main/resources/templates/homepage/user/school/school-left-sidebar.html @@ -27,10 +27,10 @@
-

국제 교류처 연락처

-

전화: 02-1234-5678

-

이메일: international@university.ac.kr

-

위치: 국제교류관 203호

+

国际交流处联系方式

+

电话: 02-1234-5678

+

邮箱: international@university.ac.kr

+

位置: 国际交流馆 203号

- \ No newline at end of file + diff --git a/src/main/resources/templates/homepage/user/school/school-schedule.html b/src/main/resources/templates/homepage/user/school/school-schedule.html index ece2c72..2a04755 100644 --- a/src/main/resources/templates/homepage/user/school/school-schedule.html +++ b/src/main/resources/templates/homepage/user/school/school-schedule.html @@ -2,7 +2,7 @@ - 국제 프로그램 - 학사 일정 + 国际项目 - 校历