Skip to content

Commit 42dfd86

Browse files
HD152521HD152521
authored
Merge pull request #57 from HD152521/develop
Develop
2 parents fa5e7f6 + 1caaf0a commit 42dfd86

44 files changed

Lines changed: 1492 additions & 1967 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/main/java/com/cooperation/project/cooperationcenter/domain/agency/repository/AgencyRepository.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
public interface AgencyRepository extends JpaRepository<Agency,Long> {
1313
long countByAgencyPicture(FileAttachment file);
14-
Optional<Agency> findAgencyByAgencyNameAndAgencyEmail(String name, String email);
14+
Optional<Agency> findAgencyByAgencyNameAndAgencyEmailAndShare(String name, String email,Boolean share);
1515
List<Agency> findAgenciesByShare(boolean share);
1616
Page<Agency> findAgenciesByShare(boolean share, Pageable pageable);
1717

‎src/main/java/com/cooperation/project/cooperationcenter/domain/member/service/MemberService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public void signup(String memberData,String agencyData, MultipartFile agencyPict
9696
}
9797

9898
private Agency checkAgency(MemberRequest.SignupExistingAgencyDto agencyDto){
99-
return agencyRepository.findAgencyByAgencyNameAndAgencyEmail(agencyDto.agencyName(),agencyDto.agencyEmail()).orElseThrow(
99+
return agencyRepository.findAgencyByAgencyNameAndAgencyEmailAndShare(agencyDto.agencyName(),agencyDto.agencyEmail(),true).orElseThrow(
100100
() -> new BaseException(ErrorCode.AGENCY_NOT_FOUND)
101101
);
102102
}

‎src/main/java/com/cooperation/project/cooperationcenter/domain/school/dto/SchoolResponse.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ public record PostFileDto(
222222
String fileId
223223
){
224224
public static PostFileDto from(FileAttachment file){
225-
String url = "/api/v1/file/"+file.getFiletype().getFileType()+"/"+file.getFileId();
225+
String url = "/api/v1/file/"+file.getFiletype().getFileType().toLowerCase()+"/"+file.getFileId();
226226
return new PostFileDto(
227227
file.getOriginalName(),
228228
url,

‎src/main/java/com/cooperation/project/cooperationcenter/domain/school/model/IntroPost.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void updateCollege(List<College> colleges){
7070
}
7171

7272
public String getImgUrl(){
73-
if(this.schoolPicUrl==null){
73+
if(this.schoolPicUrl==null || this.schoolPicUrl.isEmpty()){
7474
return "/api/v1/file/default/school";
7575
}else{
7676
return this.schoolPicUrl;

‎src/main/java/com/cooperation/project/cooperationcenter/domain/school/service/SchoolFindService.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -407,16 +407,14 @@ public SchoolResponse.PostDetailDto getDetailPostDto(Long postId){
407407
increasePostView(postId);
408408
SchoolPost schoolPost = loadPostById(postId);
409409
SchoolResponse.SchoolPostDto dto = SchoolResponse.SchoolPostDto.from(schoolPost);
410-
SchoolBoard schoolBoard = schoolPost.getSchoolBoard();
411410
//fixme 수정하기 QueryDSL로
412-
// SchoolPost beforePost = getBeforePostById(postId,schoolBoard);
413-
// SchoolPost afterPost = getAfterPostById(postId,schoolBoard);
414411

415412
try{
416413
SchoolPost beforePost = schoolPostQSDLRepository.findBeforePost(schoolPost);
417414
SchoolPost afterPost = schoolPostQSDLRepository.findAfterPost(schoolPost);
418415

419-
return new SchoolResponse.PostDetailDto(dto,
416+
return new SchoolResponse.PostDetailDto(
417+
dto,
420418
loadPostFileByPost(postId),
421419
(beforePost==null)? null: SchoolResponse.SchoolPostSimpleDto.from(beforePost),
422420
(afterPost==null)? null: SchoolResponse.SchoolPostSimpleDto.from(afterPost));

‎src/main/java/com/cooperation/project/cooperationcenter/domain/survey/service/homepage/SurveySaveService.java‎

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -309,54 +309,53 @@ public List<QuestionDto> getStudentTempalte(){
309309
new QuestionDto(
310310
null,
311311
"hierarchy",
312-
"학/석사 선택",
312+
"本科/硕士选择",
313313
"",
314314
List.of(
315315
// ====== Level 1 (학사 / 석사) ======
316-
new OptionDto(0, null, "학사", null, null, "1-1", 1),
317-
new OptionDto(0, null, "석사", null, null, "1-2", 1),
316+
new OptionDto(0, null, "本科", null, null, "1-1", 1),
317+
new OptionDto(0, null, "硕士", null, null, "1-2", 1),
318318

319319
// ====== Level 2: 학사 계열 단과대학 ======
320-
new OptionDto(0, null, "소프트웨어융합대학", null, "1-1", "2-1", 2),
321-
new OptionDto(0, null, "자연과학대학", null, "1-1", "2-2", 2),
320+
new OptionDto(0, null, "软件融合学院", null, "1-1", "2-1", 2),
321+
new OptionDto(0, null, "自然科学学院", null, "1-1", "2-2", 2),
322322

323323
// ====== Level 3: 소프트웨어융합대학 학과 ======
324-
new OptionDto(0, null, "컴퓨터공학과", null, "2-1", "3-1", 3),
325-
new OptionDto(0, null, "지능기전공학과", null, "2-1", "3-2", 3),
324+
new OptionDto(0, null, "计算机工程系", null, "2-1", "3-1", 3),
325+
new OptionDto(0, null, "智能机电工程系", null, "2-1", "3-2", 3),
326326

327327
// ====== Level 3: 자연과학대학 학과 ======
328-
new OptionDto(0, null, "물리천문학과", null, "2-2", "3-3", 3),
329-
new OptionDto(0, null, "수학통계학과", null, "2-2", "3-4", 3),
328+
new OptionDto(0, null, "物理天文学系", null, "2-2", "3-3", 3),
329+
new OptionDto(0, null, "数学统计学系", null, "2-2", "3-4", 3),
330330

331331
// ====== Level 2: 석사 계열 단과대학 ======
332-
new OptionDto(0, null, "자연과학", null, "1-2", "2-3", 2),
333-
new OptionDto(0, null, "공학", null, "1-2", "2-4", 2),
332+
new OptionDto(0, null, "自然科学", null, "1-2", "2-3", 2),
333+
new OptionDto(0, null, "工学", null, "1-2", "2-4", 2),
334334

335335
// ====== Level 3: 석사 계열 학과 ======
336-
new OptionDto(0, null, "수학과", null, "2-3", "3-5", 3),
337-
new OptionDto(0, null, "응용통계학과", null, "2-3", "3-6", 3),
338-
new OptionDto(0, null, "건축공학과", null, "2-4", "3-7", 3),
339-
new OptionDto(0, null, "건설환경공학과", null, "2-4", "3-8", 3)
336+
new OptionDto(0, null, "数学系", null, "2-3", "3-5", 3),
337+
new OptionDto(0, null, "应用统计学系", null, "2-3", "3-6", 3),
338+
new OptionDto(0, null, "建筑工程系", null, "2-4", "3-7", 3),
339+
new OptionDto(0, null, "建设环境工程系", null, "2-4", "3-8", 3)
340340
),
341341
0,
342342
true,
343343
"degreeZip"
344-
)
345-
,
346-
new QuestionDto(null, "short", "중국어이름", "", null, 0, true, "chineseName"),
347-
new QuestionDto(null, "short", "영문이름", "", null, 0, true, "englishName"),
348-
new QuestionDto(null, "date", "생년월일", "", null, 0, true, "birthDate"),
349-
new QuestionDto(null, "multiple", "성별", "", List.of(
350-
new OptionDto(0, null, "남성", null,null,null,0),
351-
new OptionDto(0, null, "여성", null,null,null,0)
344+
),
345+
new QuestionDto(null, "short", "中文姓名", "", null, 0, true, "chineseName"),
346+
new QuestionDto(null, "short", "英文姓名", "", null, 0, true, "englishName"),
347+
new QuestionDto(null, "date", "出生日期", "", null, 0, true, "birthDate"),
348+
new QuestionDto(null, "multiple", "性别", "", List.of(
349+
new OptionDto(0, null, "男", null, null, null, 0),
350+
new OptionDto(0, null, "女", null, null, null, 0)
352351
), 0, true, "gender"),
353352

354-
new QuestionDto(null, "short", "학생 메일", "", null, 0, true, "studentEmail"),
355-
new QuestionDto(null, "short", "여권 번호", "", null, 0, true, "passportNumber"),
356-
new QuestionDto(null, "short", "수험 번호", "", null, 0, true, "examNumber"),
357-
new QuestionDto(null, "short", "유학원 담당자 위챗", "", null, 0, true, "agentWechat"),
358-
new QuestionDto(null, "short", "유학원 담당자 이메일", "", null, 0, true, "agentEmail"),
359-
new QuestionDto(null, "short", "긴급연락처", "", null, 0, true, "emergencyContactNum")
353+
new QuestionDto(null, "short", "学生邮箱", "", null, 0, true, "studentEmail"),
354+
new QuestionDto(null, "short", "护照号码", "", null, 0, true, "passportNumber"),
355+
new QuestionDto(null, "short", "准考证号", "", null, 0, true, "examNumber"),
356+
new QuestionDto(null, "short", "留学机构负责人微信", "", null, 0, true, "agentWechat"),
357+
new QuestionDto(null, "short", "留学机构负责人邮箱", "", null, 0, true, "agentEmail"),
358+
new QuestionDto(null, "short", "紧急联系方式", "", null, 0, true, "emergencyContactNum")
360359
);
361360
}
362361

‎src/main/resources/static/js/css/output.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/main/resources/templates/fragments/common/footer.html‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,31 @@
66
<div>
77
<a href="#" class="text-2xl font-['Pacifico'] text-white">logo</a>
88
<p class="mt-4 text-gray-400">
9-
당신의 꿈을 위한 완벽한 유학 가이드. 전 세계 유수의 대학교와
10-
신뢰할 수 있는 유학원 정보를 한 곳에서 만나보세요. </p>
9+
为你的梦想提供最完美的留学指南。汇聚全球知名大学与可信赖的留学机构信息，一站式尽在这里。
10+
</p>
1111
</div>
1212
<div>
13-
<h3 class="text-lg font-semibold mb-4">서비스</h3>
13+
<h3 class="text-lg font-semibold mb-4">服务</h3>
1414
<ul class="space-y-2">
15-
<li><a th:href="@{/info}" class="text-gray-400 hover:text-white">유학 정보</a></li>
16-
<li><a th:href="@{/school/list}" class="text-gray-400 hover:text-white">대학교 찾기</a></li>
17-
<li><a th:href="@{/agency/list}" class="text-gray-400 hover:text-white">유학원 찾기</a></li>
15+
<li><a th:href="@{/info}" class="text-gray-400 hover:text-white">留学信息</a></li>
16+
<li><a th:href="@{/school/list}" class="text-gray-400 hover:text-white">查找大学</a></li>
17+
<li><a th:href="@{/agency/list}" class="text-gray-400 hover:text-white">查找留学机构</a></li>
1818
</ul>
1919
</div>
2020
<div>
21-
<h3 class="text-lg font-semibold mb-4">회사 정보</h3>
21+
<h3 class="text-lg font-semibold mb-4">公司信息</h3>
2222
<ul class="space-y-2">
23-
<li><a href="#" class="text-gray-400 hover:text-white">회사 소개</a></li>
24-
<li><a href="#" class="text-gray-400 hover:text-white">이용약관</a></li>
25-
<li><a href="#" class="text-gray-400 hover:text-white">개인정보처리방침</a></li>
23+
<li><a href="#" class="text-gray-400 hover:text-white">公司介绍</a></li>
24+
<li><a href="#" class="text-gray-400 hover:text-white">服务条款</a></li>
25+
<li><a href="#" class="text-gray-400 hover:text-white">隐私政策</a></li>
2626
</ul>
2727
</div>
2828
<div>
29-
<h3 class="text-lg font-semibold mb-4">연락처</h3>
29+
<h3 class="text-lg font-semibold mb-4">联系方式</h3>
3030
<ul class="space-y-2">
3131
<li class="flex items-center">
3232
<i class="ri-map-pin-line mr-2"></i>
33-
<span class="text-gray-400">서울특별시 강남구 테헤란로 123</span>
33+
<span class="text-gray-400">首尔特别市 江南区 德黑兰路 123号</span>
3434
</li>
3535
<li class="flex items-center">
3636
<i class="ri-phone-line mr-2"></i>
@@ -44,8 +44,8 @@ <h3 class="text-lg font-semibold mb-4">연락처</h3>
4444
</div>
4545
</div>
4646
<div class="mt-12 pt-8 border-t border-gray-800 text-center text-gray-400 text-sm">
47-
<p>© 2025 유학 정보 플랫폼. All rights reserved.</p>
47+
<p>© 2025 留学信息平台。保留所有权利。</p>
4848
</div>
4949
</div>
5050
</footer>
51-
</html>
51+
</html>

‎src/main/resources/templates/fragments/common/nav-user.html‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
<a href="/home"
1616
th:classappend="${requestURI == '/home' ? 'border-primary text-gray-900' : 'border-transparent text-gray-500 hover:border-gray-300 hover:text-gray-700'}"
1717
class="inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium">
18-
홈
18+
首页
1919
</a>
2020

2121
<!-- 대학교 드롭다운 (group-hover 및 group-focus-within 사용) -->
2222
<div class="relative group">
2323
<button th:classappend="${requestURI.startsWith('/school') ? 'border-primary text-gray-900' : 'border-transparent text-gray-500 hover:border-gray-300 hover:text-gray-700'}"
2424
class="inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium h-full">
25-
대학교
25+
大学
2626
<i class="ri-arrow-down-s-line ml-1 transition-transform duration-200 group-hover:rotate-180 group-focus-within:rotate-180"></i>
2727
</button>
2828
<div class="absolute top-full left-1/2 -translate-x-1/2 mt-1 bg-white rounded-lg shadow-lg py-2 w-48
@@ -40,13 +40,13 @@
4040
<a href="/agency/list"
4141
th:classappend="${requestURI.startsWith('/agency') ? 'border-primary text-gray-900' : 'border-transparent text-gray-500 hover:border-gray-300 hover:text-gray-700'}"
4242
class="inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium">
43-
유학원
43+
留学机构
4444
</a>
4545

4646
<a th:if="${loginMember != null}" href="/survey/list"
4747
th:classappend="${requestURI.startsWith('/survey') ? 'border-primary text-gray-900' : 'border-transparent text-gray-500 hover:border-gray-300 hover:text-gray-700'}"
4848
class="inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium">
49-
설문조사
49+
问卷调查
5050
</a>
5151
</div>
5252
</div>
@@ -55,12 +55,12 @@
5555
<div class="relative group">
5656
<a href="/member/login" th:if="${loginMember == null}"
5757
class="px-4 py-2 rounded-md whitespace-nowrap cursor-pointer bg-primary text-white transition-all duration-300 hover:bg-indigo-800">
58-
로그인
58+
登录
5959
</a>
6060

6161
<button th:unless="${loginMember == null}"
6262
class="size-[42px] flex items-center justify-center text-sm font-bold text-indigo-600 bg-indigo-200 rounded-full"
63-
th:text="${loginMember.memberName.substring(0, 1)}">
63+
th:text="${loginMember.memberName.substring(0, 1)}">
6464
</button>
6565
<div th:unless="${loginMember == null}"
6666
class="absolute top-full right-0 mt-1 bg-white rounded-lg shadow-lg py-2 w-48
@@ -69,11 +69,11 @@
6969
transition-all duration-200">
7070
<button id="profile-button"
7171
class="px-4 py-2 w-full text-gray text-left -700 hover:bg-gray-50 hover:text-primary">
72-
마이페이지
72+
个人中心
7373
</button>
7474
<button id="web-logout-button"
7575
class="px-4 py-2 w-full text-gray text-left -700 hover:bg-gray-50 hover:text-primary">
76-
로그아웃
76+
退出登录
7777
</button>
7878
</div>
7979
</div>
@@ -84,7 +84,7 @@
8484
<button id="mobile-menu-button"
8585
type="button"
8686
class="inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-600 hover:bg-gray-100 focus:outline-none focus:ring-2 focus:ring-inset focus:ring-primary">
87-
<span class="sr-only">메뉴 열기</span>
87+
<span class="sr-only">打开菜单</span>
8888
<i class="ri-menu-line ri-lg"></i>
8989
</button>
9090
</div>
@@ -97,11 +97,11 @@
9797
th:if="${!requestURI.startsWith('/profile')}">
9898

9999
<div class="pt-2 pb-3 space-y-1">
100-
<a href="/home" class="block pl-4 pr-4 py-2 text-gray-700 hover:bg-gray-100">홈</a>
100+
<a href="/home" class="block pl-4 pr-4 py-2 text-gray-700 hover:bg-gray-100">首页</a>
101101

102102
<button id="mobile-university-button"
103103
class="w-full flex justify-between items-center pl-4 pr-4 py-2 text-gray-700 hover:bg-gray-100">
104-
대학교
104+
大学
105105
<i class="ri-arrow-down-s-line transition-transform"></i>
106106
</button>
107107

@@ -112,9 +112,9 @@
112112
class="block text-gray-600 hover:text-primary"></a>
113113
</div>
114114

115-
<a href="/agency/list" class="block pl-4 pr-4 py-2 text-gray-700 hover:bg-gray-100">유학원</a>
115+
<a href="/agency/list" class="block pl-4 pr-4 py-2 text-gray-700 hover:bg-gray-100">留学机构</a>
116116
<a th:if="${loginMember != null}" href="/survey/list"
117-
class="block pl-4 pr-4 py-2 text-gray-700 hover:bg-gray-100">설문조사</a>
117+
class="block pl-4 pr-4 py-2 text-gray-700 hover:bg-gray-100">问卷调查</a>
118118
</div>
119119
</div>
120-
</nav>
120+
</nav>

‎src/main/resources/templates/fragments/common/pagination.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
<!-- '이전' 버튼 -->
1818
<a th:if="${page.hasPrevious()}" th:href="@{''.toString() (page=${page.number - 1})}"
1919
class="px-3 py-1 rounded border text-sm text-gray-700 hover:bg-gray-100 transition-colors">
20-
이전
20+
上一页
2121
</a>
2222
<span th:if="${!page.hasPrevious()}" class="px-3 py-1 rounded border text-sm text-gray-400 cursor-not-allowed">
23-
이전
23+
上一页
2424
</span>
2525

2626
<!-- 페이지 번호 버튼 -->
@@ -41,11 +41,11 @@
4141
<!-- '다음' 버튼 -->
4242
<a th:if="${page.hasNext()}" th:href="@{''.toString() (page=${page.number + 1})}"
4343
class="px-3 py-1 rounded border text-sm text-gray-700 hover:bg-gray-100 transition-colors">
44-
다음
44+
下一页
4545
</a>
4646
<span th:if="${!page.hasNext()}" class="px-3 py-1 rounded border text-sm text-gray-400 cursor-not-allowed">
47-
다음
47+
下一页
4848
</span>
4949
</div>
5050

51-
</html>
51+
</html>

0 commit comments

Comments
 (0)