- api 문서 페이지에서 토큰 표시 되도록 수정

jhjang

2021-12-23 0955929c20645fd95d4bb968a7a70c9d27be5673

- api 문서 페이지에서 토큰 표시 되도록 수정

 src/main/java/kr/wisestone/owl/web/controller/ApiController.java

@@ -47,7 +47,9 @@
    Map<String, Object> addIssue(MultipartHttpServletRequest request) throws OwlRuntimeException, CloneNotSupportedException {
        Map<String, Object> resJsonData = new HashMap<>();

        IssueApiForm issueForm = IssueApiForm.make(ConvertUtil.convertJsonToMap(request.getParameter(Constants.REQ_KEY_CONTENT)), request.getFiles("file"));
        String str = request.getParameter(Constants.REQ_KEY_CONTENT);

        IssueApiForm issueForm = IssueApiForm.make(ConvertUtil.convertJsonToMap(str), request.getFiles("file"));
        if (issueForm == null) {
            throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.API_PARAMETER_ERROR));
        }

 src/main/webapp/assets/styles/main.css

@@ -262,6 +262,8 @@
    margin-top: 0;
    margin-bottom: 1rem;
    overflow: auto;
    white-space: pre-line;
    word-break : break-word;
    -ms-overflow-style: scrollbar;
}

@@ -29722,7 +29724,7 @@
    z-index: 2;
    overflow: hidden;
    margin-top: 80px;
 }
}

.footer-w .logo-element {
    text-align: center;

 src/main/webapp/scripts/app/api/apiSetting.controller.js

@@ -25,17 +25,19 @@
                    getSeverities : getSeverities,
                    onChangeColumnSetting : onChangeColumnSetting,
                    onChangeEndIssueStatus : onChangeEndIssueStatus,
                    onChangeIssueTypeOverlap : onChangeIssueTypeOverlap,
                    onChangeIssueTypeSpec : onChangeIssueTypeSpec,
                    onChangeProject : onChangeProject,
                    onChangeIssueStatus : onChangeIssueStatus,
                    getIssueTypes : getIssueTypes,
                    reset : reset,
                    resetOverlap : resetOverlap,
                    formSubmitOverlap : formSubmitOverlap,
                    removeCustomField : removeCustomField,
                    getOverlapList : getOverlapList,
                    onChangeIssueTypeOverlap : onChangeIssueTypeOverlap,
                    getIssueTypeCustomFields : getIssueTypeCustomFields,
                    getCurrentIssueTypeVo : getCurrentIssueTypeVo,
                    getIssueStatuses : getIssueStatuses,
                    onChangeIssueTypeSpec : onChangeIssueTypeSpec,
                    createRequestModifyJson : createRequestModifyJson,
                    createRequestAddJson : createRequestAddJson,
                    createCustomFields : createCustomFields,
@@ -44,8 +46,9 @@
                    loadPage : loadPage,
                    resetCompleteIssueStatus : resetCompleteIssueStatus,
                    findIssueList : findIssueList,
                    onChangeProject : onChangeProject,
                    setApiIssueTypeStatus : setApiIssueTypeStatus
                    setApiIssueTypeStatus : setApiIssueTypeStatus,
                    findToken : findToken,
                    createAPISample : createAPISample
                };

                $scope.vm = {
@@ -60,6 +63,7 @@
                    sampleJsonModify : "",
                    // projects : [],
                    form : {
                        token : "!토큰값입력(토큰발급필요)!",
                        issueCustomFields : [],
                        issueApiDefault : {
                            title : "",
@@ -316,7 +320,7 @@

                     //  이슈 유형에 연결된 사용자 정의 필드
                function getIssueTypeCustomFields() {

                    var deferred = $q.defer();
                    $scope.vm.form.issueCustomFields = [];

                    var issueTypeVo = $scope.fn.getCurrentIssueTypeVo();
@@ -335,7 +339,7 @@
                                $scope.vm.form.issueCustomFields.push(issueTypeCustomField);
                            });

                            $scope.$broadcast("getIssueTypeListComplete", $scope.vm.form.issueCustomFields);
                            deferred.resolve(result.data.data);
                        }
                        else {

@@ -343,6 +347,7 @@
                        }

                    });
                    return deferred.promise;
                }


@@ -361,12 +366,12 @@
                    });
                }

                $scope.$on("getIssueTypeListComplete", function (event, args) {
                    if ($scope.vm.tab === "API_SPEC_SETTING") {
                        $scope.fn.createRequestAddJson();
                        $scope.fn.createRequestModifyJson();
                    }
                });
                // $scope.$on("getIssueTypeListComplete", function (event, args) {
                //     if ($scope.vm.tab === "API_SPEC_SETTING") {
                //         $scope.fn.createRequestAddJson();
                //         $scope.fn.createRequestModifyJson();
                //     }
                // });

                function changeTab(tab) {
                    $scope.vm.tab = tab;
@@ -411,6 +416,7 @@
                }

                function getIssueStatuses() {
                    var deferred = $q.defer();
                    var condition = {
                        issueTypeId: $scope.vm.issueTypeId
                    }
@@ -419,6 +425,7 @@

                        if (result.data.message.status === "success") {
                            $scope.vm.issueStatuses = result.data.data;
                            deferred.resolve(result.data.data);

                            // $scope.vm.issueStatusId = "";
                            if ($scope.vm.issueStatuses != null && $scope.vm.issueStatuses.length > 0) {
@@ -429,11 +436,11 @@
                                $scope.fn.setApiIssueTypeStatus();
                            }

                            $scope.$broadcast("getIssueStatusComplete", $scope.vm.issueStatuses);
                        } else {
                            SweetAlert.swal($filter("translate")("issue.failedToCriticalListLookup"), result.data.message.message, "error"); // 중요도 목록 조회 실패
                        }
                    });
                    return deferred.promise;
                }

                function onChangeColumnSetting() {
@@ -502,9 +509,28 @@
                    });
                }

                function createAPISample() {
                    $scope.fn.createRequestAddJson();
                    $scope.fn.createRequestModifyJson();
                }

                function onChangeIssueStatus() {
                    // $scope.fn.getIssueStatuses();
                    // $scope.fn.getIssueTypeCustomFields();
                    $scope.fn.findToken();
                    $scope.fn.createAPISample();
                }


                function onChangeIssueTypeSpec() {
                    $scope.fn.getIssueStatuses();
                    $scope.fn.getIssueTypeCustomFields();
                    var promises = {
                        issueStatues : $scope.fn.getIssueStatuses(),
                        issueTypeCustomFields : $scope.fn.getIssueTypeCustomFields(),
                        token : $scope.fn.findToken()
                    }
                    $q.all(promises).then(function (results) {
                        $scope.fn.createAPISample();
                    });
                }

                // 요청 데이터 만들기( 추가)
@@ -512,7 +538,7 @@
                    var customFields = $scope.fn.createCustomFields();

                    var jsonData = {
                            token: "||발급받은 토큰}||",
                            token: $scope.vm.form.token,
                            title: "||이슈 제목||",
                            issueTypeId: $scope.vm.issueTypeId,
                            apiType: "add",
@@ -520,6 +546,29 @@
                        };

                    $scope.vm.sampleJsonAdd = JSON.stringify(jsonData,undefined, 4);
                }


                function findToken() {
                    var deferred = $q.defer();
                    var conditions = {
                    }

                    Api.find($resourceProvider.getContent(conditions,
                        $resourceProvider.getPageContent(0, 1))).then(function (result) {

                        if (result.data.message.status === "success") {
                            if (result.data.data != null) {
                                $scope.vm.form.token = result.data.data.token;
                            }
                            deferred.resolve(result.data.data);
                        }
                        else {

                        }
                    });

                    return deferred.promise;
                }

                function createCustomFields() {
@@ -538,7 +587,7 @@
                    var customFields = $scope.fn.createCustomFields();

                    var jsonData = {
                        token: "||발급받은 토큰||",
                        token: $scope.vm.form.token,
                        issueTypeId: $scope.vm.issueTypeId,
                        apiType: "modify",
                        issueStatusId: $scope.vm.issueStatusId,

 src/main/webapp/views/api/apiSettingSpec.html

@@ -14,7 +14,7 @@
                                class="form-control input-sm issue-select-label"
                                ng-style="{ 'color' : fn.getOptionColor(vm.issueStatuses, vm.issueStatusId) }"
                                ng-model="vm.issueStatusId"
                                ng-change="fn.onChangeIssueTypeSpec()"
                                ng-change="fn.onChangeIssueStatus()"
                                required>
                            <option ng-repeat="issueStatus in vm.issueStatuses"
                                    ng-style="{ 'color' : issueStatus.color, 'font-weight': 600 }"
@@ -56,16 +56,20 @@

<div class="element-box">
    <div class="row">
        <div class="col-md-1">
        <div>
            <label class="issue-label">
                <span translate="api.requestSampleAdd">이슈 추가</span>
            </label>
        </div>
        <div>
    </div>
    <div class="row">
        <div class="text-wrap">
            <pre>{{vm.sampleJsonAdd}}</pre>
        </div>
        <div class="col-md-1"></div>
        <div class="col-md-1">
    </div>
    <hr>
    <div class="row">
        <div>
            <label class="issue-label">
                <span translate="api.requestSampleModify">이슈 수정</span>
            </label>
@@ -73,7 +77,9 @@
                <span translate="api.requestSampleModifyDesc">수정시</span>
            </label>
        </div>
        <div class="col-md-2">
    </div>
    <div class="row">
        <div class="text-wrap">
            <div>
                <pre>{{vm.sampleJsonModify}}</pre>
            </div>