Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

이민희

2021-12-14 65cecc86cda6edd84bf094f4b00d10e34c060020

Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

 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])) {

 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);
}

 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());

 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) {

 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;
                });

                //  검색 조건을 기억한다. - 적용 보류

 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();