optimize: fix some vulnerabilities in console and upgrade skywalking-…

…eyes (apache#4921)
conghuhu · Sep 8, 2022 · ed308dd · ed308dd
1 parent cb16176
commit ed308dd
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/license-checker.yaml b/.github/workflows/license-checker.yaml
@@ -13,14 +13,14 @@ jobs:
         uses: actions/[email protected]
       # step 2
       - name: Check License Header
-        uses: apache/skywalking-eyes/header@v0.4.0
+        uses: apache/skywalking-eyes/header@25edfc2fd8d52fb266653fb5f6c42da633d85c07
         with:
           log: info
           config: .licenserc.yaml
           mode: check
       # step 3
       - name: Check Dependencies' License
-        uses: apache/skywalking-eyes/dependency@v0.4.0
+        uses: apache/skywalking-eyes/dependency@25edfc2fd8d52fb266653fb5f6c42da633d85c07
         with:
           log: info
           config: .licenserc.yaml

diff --git a/.licenserc.yaml b/.licenserc.yaml
@@ -81,5 +81,6 @@ dependency:
   files:
     - pom.xml
     - saga/seata-saga-statemachine-designer/package.json
+    - console/src/main/resources/static/console-fe/package.json
   excludes:
     - name: io.seata:*
diff --git a/console/src/main/resources/static/console-fe/package.json b/console/src/main/resources/static/console-fe/package.json
@@ -75,14 +75,14 @@
   },
   "dependencies": {
     "@alicloud/console-components": "^1.0.19",
+    "@alicloud/console-components-actions": "^1.0.4",
     "@alicloud/console-components-app-layout": "^1.0.4",
     "@alicloud/console-components-console-menu": "^1.0.4",
-    "@alicloud/console-components-actions": "^1.0.4",
-    "axios": "^0.18.0",
+    "axios": "^0.27.2",
     "history": "^4.10.1",
     "jquery": "^3.3.1",
     "lodash": "^4.17.15",
-    "moment": "^2.24.0",
+    "moment": "^2.29.4",
     "prop-types": "^15.6.2",
     "react": "^16.8.0",
     "react-dom": "^16.8.0",

diff --git a/distribution/Dockerfile b/distribution/Dockerfile
@@ -11,9 +11,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# the Dockerfile support x86 & arrch64
-
 
+# the Dockerfile support x86 & arrch64
 # build：
 # 1. mvn -Prelease-seata -Dmaven.test.skip=true clean install -U
 # 2. cd distribution/target/seata-server-xxx/seata/

diff --git a/distribution/bin/seata-server.bat b/distribution/bin/seata-server.bat
@@ -2,7 +2,7 @@
 @REM
 @REM Licensed under the Apache License, Version 2.0 (the "License");
 @REM you may not use this file except in compliance with the License.
-@REM You may obtain a copy of the License at、
+@REM You may obtain a copy of the License at
 @REM
 @REM      http://www.apache.org/licenses/LICENSE-2.0
 @REM

diff --git a/distribution/bin/seata-server.sh b/distribution/bin/seata-server.sh
@@ -3,7 +3,7 @@
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at、
+# You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #