Commit 449f83ed authored by 向偲彪's avatar 向偲彪 Committed by lgcareer
Browse files

replace cookie.js with js-cookie, add js-cookie license (#1562) 

* Front-end compliance modification

* Front-end supplemental license

* Modify naming

* Repair license

* replace cookie.js with js-cookie, add js-cookie license
parent f167d536

dolphinscheduler-dist/dolphinscheduler-front/src/main/release-docs/LICENSE

+1 −0
Original line number Diff line number Diff line
@@ -221,6 +221,7 @@ MIT licenses 
    html2canvas 0.5.0-beta4: https://github.com/niklasvh/html2canvas MIT

    jquery 3.3.1: https://github.com/jquery/jquery MIT

    jquery-ui 1.12.1: https://github.com/jquery/jquery-ui MIT

    js-cookie 2.2.1: https://github.com/js-cookie/js-cookie MIT

    jsplumb 2.8.6: https://github.com/jsplumb/jsplumb MIT and GPLv2

    lodash 4.17.11: https://github.com/lodash/lodash MIT

    vue	2.5.17:	https://github.com/vuejs/vue	MIT

dolphinscheduler-dist/dolphinscheduler-front/src/main/release-docs/licenses/LICENSE-js-cookie

0 → 100644
+21 −0
Original line number Diff line number Diff line 
MIT License



Copyright (c) 2018 Copyright 2018 Klaus Hartl, Fagner Brack, GitHub Contributors



Permission is hereby granted, free of charge, to any person obtaining a copy

of this software and associated documentation files (the "Software"), to deal

in the Software without restriction, including without limitation the rights

to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

copies of the Software, and to permit persons to whom the Software is

furnished to do so, subject to the following conditions:



The above copyright notice and this permission notice shall be included in all

copies or substantial portions of the Software.



THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

SOFTWARE.
 
 No newline at end of file

dolphinscheduler-ui/package.json

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
    "html2canvas": "^0.5.0-beta4",

    "jquery": "3.3.1",

    "jquery-ui": "^1.12.1",

    "js-cookie": "^2.2.1",

    "jsplumb": "^2.8.6",

    "lodash": "^4.17.11",

    "vue": "^2.5.17",

dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/http.vue

+2 −2
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ 
<script>

  import _ from 'lodash'

  import i18n from '@/module/i18n'

  import cookie from '@/module/util/cookie'

  import cookies from 'js-cookie'

  import mLocalParams from './_source/localParams'

  import mHttpParams from './_source/httpParams'

  import mListBox from './_source/listBox'
@@ -117,7 +117,7 @@ 
        httpMethod: 'GET',

        httpMethodList: [{ code: 'GET' }, { code: 'POST' }, { code: 'HEAD' }, { code: 'PUT' }, { code: 'DELETE' }],

        httpCheckCondition: 'STATUS_CODE_DEFAULT',

        httpCheckConditionList: cookie.get('language') == 'en_US'? [{ code: 'STATUS_CODE_DEFAULT',value:'Default response code 200' }, { code: 'STATUS_CODE_CUSTOM',value:'Custom response code' }, { code: 'BODY_CONTAINS',value:'Content includes' }, { code: 'BODY_NOT_CONTAINS',value:'Content does not contain' }]:[{ code: 'STATUS_CODE_DEFAULT',value:'默认响应码200' }, { code: 'STATUS_CODE_CUSTOM',value:'自定义响应码' }, { code: 'BODY_CONTAINS',value:'内容包含' }, { code: 'BODY_NOT_CONTAINS',value:'内容不包含' }]

        httpCheckConditionList: cookies.get('language') == 'en_US'? [{ code: 'STATUS_CODE_DEFAULT',value:'Default response code 200' }, { code: 'STATUS_CODE_CUSTOM',value:'Custom response code' }, { code: 'BODY_CONTAINS',value:'Content includes' }, { code: 'BODY_NOT_CONTAINS',value:'Content does not contain' }]:[{ code: 'STATUS_CODE_DEFAULT',value:'默认响应码200' }, { code: 'STATUS_CODE_CUSTOM',value:'自定义响应码' }, { code: 'BODY_CONTAINS',value:'内容包含' }, { code: 'BODY_NOT_CONTAINS',value:'内容不包含' }]

      }

    },

    props: {

dolphinscheduler-ui/src/js/conf/login/App.vue

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
<script>

  import i18n from '@/module/i18n'

  import io from '@/module/io'

  import cookie from '@/module/util/cookie'

  import cookies from 'js-cookie'



  export default {

    name: 'login-model',
@@ -85,7 +85,7 @@ 
            setTimeout(() => {

              this.spinnerLoading = false

              sessionStorage.setItem("sessionId", res.data)

              cookie.set('sessionId', res.data,{ path: '/' })

              cookies.set('sessionId', res.data,{ path: '/' })

              if (this.userName === 'admin') {

                window.location.href = `${PUBLIC_PATH}/#/security/tenant`

              } else {