diff --git a/build.gradle b/build.gradle index 2eb2884..ab76853 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ dependencies { // implementation 'io.jsonwebtoken:jjwt:0.9.1' implementation group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.7.4' - implementation 'org.bgee.log4jdbc-log4j2:log4jdbc-log4j2-jdbc4.1:1.16' + developmentOnly 'org.bgee.log4jdbc-log4j2:log4jdbc-log4j2-jdbc4.1:1.16' testImplementation 'org.springframework.boot:spring-boot-starter-test:2.5.6' testImplementation 'org.springframework.security:spring-security-test:5.5.1' diff --git a/src/main/java/com/dbnt/kcgfilemanager/controller/InfoController.java b/src/main/java/com/dbnt/kcgfilemanager/controller/InfoController.java index f122dab..42562bb 100644 --- a/src/main/java/com/dbnt/kcgfilemanager/controller/InfoController.java +++ b/src/main/java/com/dbnt/kcgfilemanager/controller/InfoController.java @@ -107,10 +107,10 @@ public class InfoController { public ModelAndView modifyRequestDetail(@AuthenticationPrincipal UserInfo loginUser, ModifyRequest modifyRequest){ ModelAndView mav = new ModelAndView("user/modifyRequestDetail"); ModifyRequest request = modifyRequestService.selectModifyRequestByRequestSeq(modifyRequest.getRequestSeq()); - mav.addObject("modifyRequest", request); + UserInfo requestUser = userInfoService.selectUserInfoByUserId(request.getCreateId()); switch (request.getRequestType()){ case "userInfo": - mav.addObject("userInfo", userInfoService.selectUserInfoByUserId(request.getCreateId())); + mav.addObject("userInfo", requestUser); break; case "categoryRole": String[] categoryAry = request.getRequestCategoryAry().split(","); @@ -120,10 +120,11 @@ public class InfoController { } request.setRequestCategoryList(requestCategoryList); CategoryRole categoryRole = new CategoryRole(); - categoryRole.setUserSeq(loginUser.getUserSeq()); + categoryRole.setUserSeq(requestUser.getUserSeq()); mav.addObject("categorySeqList", categoryRoleService.selectCategorySeqListToUser(categoryRole)); break; } + mav.addObject("modifyRequest", request); mav.addObject("loginUser", loginUser); return mav; } diff --git a/src/main/java/com/dbnt/kcgfilemanager/service/BoardCategoryService.java b/src/main/java/com/dbnt/kcgfilemanager/service/BoardCategoryService.java index 90de367..47bb066 100644 --- a/src/main/java/com/dbnt/kcgfilemanager/service/BoardCategoryService.java +++ b/src/main/java/com/dbnt/kcgfilemanager/service/BoardCategoryService.java @@ -79,7 +79,7 @@ public class BoardCategoryService { public String makeFilePath(Integer categorySeq){ BoardCategory category = boardCategoryRepository.findById(categorySeq).orElse(null); if(category.getParentSeq()==null){ - return "D:\\kcgFileManager\\"+category.getCategoryName(); + return "C:\\kcgFileManager\\"+category.getCategoryName(); } return makeFilePath(category.getParentSeq())+"\\"+category.getCategoryName(); } diff --git a/src/main/java/com/dbnt/kcgfilemanager/service/ModifyRequestService.java b/src/main/java/com/dbnt/kcgfilemanager/service/ModifyRequestService.java index 4420da5..1d5742f 100644 --- a/src/main/java/com/dbnt/kcgfilemanager/service/ModifyRequestService.java +++ b/src/main/java/com/dbnt/kcgfilemanager/service/ModifyRequestService.java @@ -4,6 +4,7 @@ import com.dbnt.kcgfilemanager.mapper.ModifyRequestMapper; import com.dbnt.kcgfilemanager.model.ModifyRequest; import com.dbnt.kcgfilemanager.model.UserInfo; import com.dbnt.kcgfilemanager.repository.ModifyRequestRepository; +import com.dbnt.kcgfilemanager.repository.UserInfoRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -17,7 +18,7 @@ public class ModifyRequestService { private final ModifyRequestRepository modifyRequestRepository; private final ModifyRequestMapper modifyRequestMapper; - private final UserInfoService userInfoService; + private final UserInfoRepository userInfoRepository; private final CategoryRoleService categoryRoleService; public Integer saveModifyRequest(ModifyRequest modifyRequest) { @@ -78,14 +79,13 @@ public class ModifyRequestService { switch (modifyRequest.getStatus()){ case "approval": ModifyRequest request = modifyRequestRepository.findById(modifyRequest.getRequestSeq()).orElse(null); - UserInfo userInfo = userInfoService.selectUserInfoByUserId(modifyRequest.getCreateId()); + UserInfo userInfo = userInfoRepository.findByUserId(request.getCreateId()).orElse(null); switch (request.getRequestType()) { case "userInfo": - userInfo.setUserId(request.getCreateId()); userInfo.setName(request.getRequestName()); userInfo.setPosition(request.getRequestPosition()); userInfo.setDepartment(request.getRequestDepartment()); - userInfoService.updateUserInfo(userInfo); + userInfoRepository.save(userInfo); break; case "categoryRole": String[] categoryAry = request.getRequestCategoryAry().split(","); diff --git a/src/main/resources/application.properties b/src/main/resources/application-dev.properties similarity index 90% rename from src/main/resources/application.properties rename to src/main/resources/application-dev.properties index 0042edd..ad97695 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application-dev.properties @@ -1,6 +1,6 @@ spring.devtools.livereload.enabled=true -#?? ??? ?? ??. +#file upload size spring.servlet.multipart.max-file-size=20MB spring.servlet.multipart.max-request-size=100MB @@ -11,7 +11,7 @@ spring.thymeleaf.suffix=.html spring.thymeleaf.mode=HTML spring.thymeleaf.cache=false -#mariaDB +#mariaDB & log4jdbc spring.datasource.driverClassName=net.sf.log4jdbc.sql.jdbcapi.DriverSpy spring.datasource.url=jdbc:log4jdbc:mariadb://cks0504.iptime.org:3306/kcg_fm?characterEncoding=UTF-8&serverTimezone=UTC spring.datasource.username=root diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties new file mode 100644 index 0000000..773055d --- /dev/null +++ b/src/main/resources/application-prod.properties @@ -0,0 +1,29 @@ +spring.devtools.livereload.enabled=true + +#?? ??? ?? ??. +spring.servlet.multipart.max-file-size=20MB +spring.servlet.multipart.max-request-size=100MB + +#thymeleaf +spring.thymeleaf.prefix=classpath:templates/ +spring.thymeleaf.check-template-location=true +spring.thymeleaf.suffix=.html +spring.thymeleaf.mode=HTML +#spring.thymeleaf.cache=false + +#mariaDB +spring.datasource.driverClassName=org.mariadb.jdbc.Driver +spring.datasource.url=jdbc:mariadb://cks0504.iptime.org:3306/kcg_fm?characterEncoding=UTF-8&serverTimezone=UTC +spring.datasource.username=root +spring.datasource.password=mariadb#0524 + +#jpa +spring.jpa.show-sql=true +spring.jpa.generate-ddl=false +spring.jpa.hibernate.naming.physical-strategy = org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl + +# MyBatis +mybatis.mapper-locations: mybatisMapper/**/*.xml +mybatis.configuration.map-underscore-to-camel-case=true +mybatis.type-aliases-package=com.dbnt.kcgfilemanager.model +logging.level.com.atoz_develop.mybatissample.repository=TRACE \ No newline at end of file diff --git a/src/main/resources/static/js/user/modifyRequestList.js b/src/main/resources/static/js/user/modifyRequestList.js index ecfb403..386bfa8 100644 --- a/src/main/resources/static/js/user/modifyRequestList.js +++ b/src/main/resources/static/js/user/modifyRequestList.js @@ -32,11 +32,18 @@ $(document).on('click', '#dinialBtn', function (){ $(document).on('click', '#approvalBtn', function (){ if(confirm("요청을 승인 하시겠습니까?")){ - modifyRequestStatusChange({ - requestSeq: $(this).attr("data-requestseq"), - createId: $(this).attr("data-createid"), - status: 'approval' - }) + const request = $(this) + let flag = true; + if(request.attr("data-requesttype")==="etc"){ + flag = confirm("기타 분류의 요청은 직접 요청 내용을 수정해주셔야 합니다."); + } + if(flag){ + modifyRequestStatusChange({ + requestSeq: request.attr("data-requestseq"), + createId: request.attr("data-createid"), + status: 'approval' + }) + } } }) diff --git a/src/main/resources/templates/admin/main.html b/src/main/resources/templates/admin/main.html index d21c24b..10bfdc8 100644 --- a/src/main/resources/templates/admin/main.html +++ b/src/main/resources/templates/admin/main.html @@ -2,7 +2,22 @@ -
+
+

관리자 메인 페이지

-
+
+
+
+
+
+ +
+
+
+
+
+
+
+ +
\ No newline at end of file diff --git a/src/main/resources/templates/user/modifyRequestDetail.html b/src/main/resources/templates/user/modifyRequestDetail.html index e50ea12..5f5c2de 100644 --- a/src/main/resources/templates/user/modifyRequestDetail.html +++ b/src/main/resources/templates/user/modifyRequestDetail.html @@ -22,60 +22,325 @@
-
-
- -
-
- - - + +
+
+ +
+
+ + + +
+
+
+
+ +
+
+ + + + + + + + + + + +
+
+
+
+ +
+
+ + + + + + + + + + + +
-
- -
-
- - - - - - + + +
+
+ +
+ +
+
+
+ +
- +
-
-
- -
-
- - - - - - +
+ +
- +
-
+ - +
+ +
+
+
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
유지
삭제
추가
-
연도중분류소분류변동
유지
삭제
추가
-
유지
삭제
추가
-
유지
삭제
추가
-
+
+ +
+ + +
+
+
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
연도중분류소분류
+ +
+ +
+ +
+
+ +
+ +
@@ -94,14 +359,17 @@
- -
-
- + + +
+
+ +
+
+ +
-
- -
-
+
\ No newline at end of file diff --git a/src/main/resources/templates/user/modifyRequestList.html b/src/main/resources/templates/user/modifyRequestList.html index 8e82e0b..4e4936b 100644 --- a/src/main/resources/templates/user/modifyRequestList.html +++ b/src/main/resources/templates/user/modifyRequestList.html @@ -70,7 +70,7 @@
-
+
@@ -145,7 +145,7 @@
- 수정 요청 + 수정 요청
diff --git a/src/main/resources/templates/user/modifyRequestWrite.html b/src/main/resources/templates/user/modifyRequestWrite.html index 8c3690a..79d64db 100644 --- a/src/main/resources/templates/user/modifyRequestWrite.html +++ b/src/main/resources/templates/user/modifyRequestWrite.html @@ -125,8 +125,14 @@ - + + + + + + @@ -141,9 +147,16 @@ - + + + + + + @@ -152,9 +165,16 @@ - + + + + + + @@ -163,9 +183,16 @@ - + + + + + +