diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 87711fac..fb1e5404 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -22,11 +22,6 @@ on: jobs: analyze: name: Analyze (${{ matrix.language }}) - # Runner size impacts CodeQL analysis time. To learn more, please see: - # - https://gh.io/recommended-hardware-resources-for-running-codeql - # - https://gh.io/supported-runners-and-hardware-resources - # - https://gh.io/using-larger-runners (GitHub.com only) - # Consider using larger runners or machines with greater resources for possible analysis time improvements. runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }} timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }} permissions: @@ -46,14 +41,6 @@ jobs: include: - language: python build-mode: none - # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' - # Use `c-cpp` to analyze code written in C, C++ or both - # Use 'java-kotlin' to analyze code written in Java, Kotlin or both - # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both - # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis, - # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning. - # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how - # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages steps: - name: Checkout repository uses: actions/checkout@v4 @@ -64,19 +51,6 @@ jobs: with: languages: ${{ matrix.language }} build-mode: ${{ matrix.build-mode }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - - # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs - # queries: security-extended,security-and-quality - - # If the analyze step fails for one of the languages you are analyzing with - # "We were unable to automatically build your code", modify the matrix above - # to set the build mode to "manual" for that language. Then modify this step - # to build your code. - # ℹī¸ Command-line programs to run using the OS shell. - # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun - if: matrix.build-mode == 'manual' run: | echo 'If you are using a "manual" build mode for one or more of the' \ diff --git a/.secignore b/.secignore index 458eb299..04475d91 100644 --- a/.secignore +++ b/.secignore @@ -8,6 +8,7 @@ BFlow Secret Scan Ignore List # ** http://license.coscl.org.cn/* http://xxx.xxx.xxx.xxx:xxxx + http://xx.xx.xx.xx:xx https://getbootstrap.com/) https://github.com/twbs/bootstrap/blob/main/LICENSE) http://www.w3.org/2000/svg @@ -19,6 +20,7 @@ BFlow Secret Scan Ignore List # https://www.oceanbase.com/* http://mirrors.aliyun.com/pypi/simple/ https://mirrors.aliyun.com/oceanbase/OceanBase.repo + https://img.shields.io/* **/README.md http://xxx.xxx.xxx.xxx:xxxx **/init.sh @@ -34,4 +36,5 @@ BFlow Secret Scan Ignore List # **/common/constant.py openwebapi-pre.oceanbase.com* openwebapi.oceanbase.com* - openwebapi-pre.oceanbase.com* \ No newline at end of file + openwebapi-pre.oceanbase.com* + https://obbusiness-private.oss-cn-shanghai.aliyuncs.com* \ No newline at end of file diff --git a/stdio.py b/stdio.py index 5131df51..d0d8c7c6 100644 --- a/stdio.py +++ b/stdio.py @@ -1,21 +1,14 @@ -# coding: utf-8 -# OceanBase Deploy. -# Copyright (C) 2021 OceanBase -# -# This file is part of OceanBase Deploy. -# -# OceanBase Deploy is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# OceanBase Deploy is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OceanBase Deploy. If not, see . +#!/usr/bin/env python +# -*- coding: UTF-8 -* +# Copyright (c) 2022 OceanBase +# OceanBase Diagnostic Tool is licensed under Mulan PSL v2. +# You can use this software according to the terms and conditions of the Mulan PSL v2. +# You may obtain a copy of Mulan PSL v2 at: +# http://license.coscl.org.cn/MulanPSL2 +# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, +# EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, +# MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. +# See the Mulan PSL v2 for more details. from __future__ import absolute_import, division, print_function