From 65cecc86cda6edd84bf094f4b00d10e34c060020 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 14 12월 2021 15:43:37 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/scripts/config.js | 5 +++++
src/main/java/kr/wisestone/owl/service/impl/ApiTokenServiceImpl.java | 16 +++++++++++++---
src/main/java/kr/wisestone/owl/domain/interceptor/AuditLogInterceptor.java | 4 +++-
src/main/java/kr/wisestone/owl/repository/ApiTokenRepository.java | 2 ++
src/main/webapp/scripts/app/common/common.controller.js | 9 ++++++---
src/main/webapp/scripts/app/issue/issueList.controller.js | 1 -
6 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/domain/interceptor/AuditLogInterceptor.java b/src/main/java/kr/wisestone/owl/domain/interceptor/AuditLogInterceptor.java
index a37dc7e..70b7c5c 100644
--- a/src/main/java/kr/wisestone/owl/domain/interceptor/AuditLogInterceptor.java
+++ b/src/main/java/kr/wisestone/owl/domain/interceptor/AuditLogInterceptor.java
@@ -57,7 +57,9 @@
for (int i = 0; i < propertyNames.length; i++) {
if ("registerId".equals(propertyNames[i])) {
- state[i] = loginId;
+ if (state[i] == null) { // �엯�젰 媛믪씠 �뾾�쓣�븣留� �옄�룞 �엯�젰
+ state[i] = loginId;
+ }
} else if ("modifyId".equals(propertyNames[i])) {
state[i] = loginId;
} else if ("registerDate".equals(propertyNames[i])) {
diff --git a/src/main/java/kr/wisestone/owl/repository/ApiTokenRepository.java b/src/main/java/kr/wisestone/owl/repository/ApiTokenRepository.java
index c959847..deb9520 100644
--- a/src/main/java/kr/wisestone/owl/repository/ApiTokenRepository.java
+++ b/src/main/java/kr/wisestone/owl/repository/ApiTokenRepository.java
@@ -8,4 +8,6 @@
public interface ApiTokenRepository extends JpaRepository<ApiToken, Long> {
List<ApiToken> findByUserId(@Param("userId") Long userId);
+
+ List<ApiToken> findByToken(@Param("token") String token);
}
diff --git a/src/main/java/kr/wisestone/owl/service/impl/ApiTokenServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/ApiTokenServiceImpl.java
index e7165ed..4a831e9 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/ApiTokenServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/ApiTokenServiceImpl.java
@@ -10,6 +10,7 @@
import kr.wisestone.owl.exception.OwlRuntimeException;
import kr.wisestone.owl.repository.ApiTokenRepository;
import kr.wisestone.owl.service.ApiTokenService;
+import kr.wisestone.owl.service.UserService;
import kr.wisestone.owl.util.ConvertUtil;
import kr.wisestone.owl.util.DateUtil;
import kr.wisestone.owl.util.WebAppUtil;
@@ -37,7 +38,6 @@
@Autowired
private ApiTokenRepository apiTokenRepository;
-
@Autowired
protected WebAppUtil webAppUtil;
@@ -137,11 +137,12 @@
return null;
}
- // �넗�겙 �궗�슜�옄 �씤利�
+ // �넗�겙 �궗�슜�옄 �씤利�, �씤利앺썑 �궗�슜�옄 媛��졇�삤湲�
@Override
public UserVo certification(String token) {
UserVo userVo = this.getUserVo(token);
- if (userVo != null && containsToken(userVo, token)){
+ if (userVo != null && containsToken(userVo, token))
+ {
return userVo;
} else {
throw new OwlRuntimeException(
@@ -149,6 +150,15 @@
}
}
+ // �넗�겙�쑝濡� 李얘린
+ private ApiToken find(String token) {
+ List<ApiToken> apiTokens = this.apiTokenRepository.findByToken(token);
+ if (apiTokens != null && apiTokens.size() > 0) {
+ return apiTokens.get(0);
+ }
+ return null;
+ }
+
// �넗�겙 媛믪씠 db�뿉 議댁옱�븯�뒗吏� �솗�씤
private boolean containsToken(UserVo userVo, String token) {
List<ApiToken> apiTokens = this.apiTokenRepository.findByUserId(userVo.getId());
diff --git a/src/main/webapp/scripts/app/common/common.controller.js b/src/main/webapp/scripts/app/common/common.controller.js
index 9cd2e1a..c9fa6ee 100644
--- a/src/main/webapp/scripts/app/common/common.controller.js
+++ b/src/main/webapp/scripts/app/common/common.controller.js
@@ -36,7 +36,12 @@
}
};
-
+ // session check after route
+ $rootScope.$on("$stateChangeStart", function (event, toState, toStateParams) {
+ if (!$rootScope.isMainSearch) {
+ $scope.vm.searchAll.keyWord = "";
+ }
+ });
// �떆�뒪�뀥�뿉�꽌 �듅�젙 �씠�뒋濡� 諛붾줈 �씠�룞�븷 �닔 �엳�룄濡� �빐以��떎.
$scope.$on("makeIssueSearch", function (event, args) {
@@ -108,8 +113,6 @@
if ($rootScope.user.lastIssueTypeId !== issueTypeId) {
$scope.fn.setLastIssueType(issueTypeId);
}
-
-
}
function moveMenu(stateName) {
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index 8d51e5a..8af4fe4 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -120,7 +120,6 @@
$scope.$on("searchIssueList", function (event, args) {
$scope.vm.search.keyWord = args.keyWord;
$scope.fn.getPageList(0);
- $rootScope.isMainSearch = false;
});
// 寃��깋 議곌굔�쓣 湲곗뼲�븳�떎. - �쟻�슜 蹂대쪟
diff --git a/src/main/webapp/scripts/config.js b/src/main/webapp/scripts/config.js
index 3bf1da7..6f6abd8 100644
--- a/src/main/webapp/scripts/config.js
+++ b/src/main/webapp/scripts/config.js
@@ -503,6 +503,11 @@
$("#page-container").trigger("click");
$("body").unbind("click");
+ // �씠�뒋 寃��깋 �럹�씠吏��뿉�꽌 踰쀬뼱�궇 寃쎌슦 泥섎━
+ if ($rootScope.isMainSearch) {
+ $rootScope.isMainSearch = false;
+ }
+
var $uibModalStack = $injector.get('$uibModalStack');
$uibModalStack.dismissAll();
--
Gitblit v1.8.0