Merge branch 'develop' into dev/seata-server_metrics_fix

apache · Aug 19, 2022 · d18e2ae · d18e2ae
2 parents 3d1c992 + 592d18b
commit d18e2ae
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 26 deletions.
diff --git a/changes/en-us/develop.md b/changes/en-us/develop.md
@@ -22,6 +22,7 @@ Add changes here for all PR submitted to the develop branch.
 - [[#4761](https://github.com/seata/seata/pull/4761)] use hget replace hmget because only one field
 - [[#4414](https://github.com/seata/seata/pull/4414)] exclude log4j dependencies
 - [[#4836](https://github.com/seata/seata/pull/4836)] optimize BaseTransactionalExecutor#buildLockKey(TableRecords rowsIncludingPK) method more readable
+- [[#4865](https://github.com/seata/seata/pull/4865)] fix some security vulnerabilities in GGEditor
 
 ### test:
 - [[#4794](https://github.com/seata/seata/pull/4794)] try to fix the test `DataSourceProxyTest.getResourceIdTest()`

diff --git a/changes/zh-cn/develop.md b/changes/zh-cn/develop.md
@@ -22,6 +22,7 @@
 - [[#4761](https://github.com/seata/seata/pull/4761)] 使用 hget 代替 RedisLocker 中的 hmget, 因为只有一个 field
 - [[#4414](https://github.com/seata/seata/pull/4414)] 移除log4j依赖
 - [[#4836](https://github.com/seata/seata/pull/4836)] 优化 BaseTransactionalExecutor#buildLockKey(TableRecords rowsIncludingPK) 方法可读性
+- [[#4865](https://github.com/seata/seata/pull/4865)] 修复 Saga 可视化设计器 GGEditor 安全漏洞
 
 ### test：
 - [[#4794](https://github.com/seata/seata/pull/4794)] 重构代码，尝试修复单元测试 `DataSourceProxyTest.getResourceIdTest()`

diff --git a/saga/seata-saga-statemachine-designer/README.md b/saga/seata-saga-statemachine-designer/README.md
@@ -16,7 +16,7 @@ $ npm start
 ## build a package
 ```sh
 $ cd saga/saga-statemachine-designer
-$ npm build
+$ npm run build
 ```
 
 copy 'index.html' and 'dist' directory to static html directory of web server

diff --git a/saga/seata-saga-statemachine-designer/README.zh-CN.md b/saga/seata-saga-statemachine-designer/README.zh-CN.md
@@ -16,7 +16,7 @@ $ npm start
 ## 打包
 ```sh
 $ cd saga/saga-statemachine-designer
-$ npm build
+$ npm run build
 ```
 
 然后将index.html和dist目录拷贝到web server的静态页面目录下

diff --git a/saga/seata-saga-statemachine-designer/index.html b/saga/seata-saga-statemachine-designer/index.html
@@ -6,16 +6,16 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
   <title>Seata Saga StateMachine Designer</title>
-  <link rel="stylesheet" href="http://g.alicdn.com/code/lib/antd/3.16.1/antd.min.css">
+  <link rel="stylesheet" href="//g.alicdn.com/code/lib/antd/3.16.1/antd.min.css">
 </head>
 
 <body>
   <div id="root"></div>
-  <script src="http://g.alicdn.com/code/lib/react/16.8.6/umd/react.production.min.js"></script>
-  <script src="http://g.alicdn.com/code/lib/react-dom/16.8.6/umd/react-dom.production.min.js"></script>
-  <script src="http://g.alicdn.com/code/lib/react-router-dom/5.0.0/react-router-dom.min.js"></script>
-  <script src="http://g.alicdn.com/code/lib/moment.js/2.24.0/moment.min.js"></script>
-  <script src="http://g.alicdn.com/code/lib/antd/3.16.1/antd.min.js"></script>
+  <script src="//g.alicdn.com/code/lib/react/16.8.6/umd/react.production.min.js"></script>
+  <script src="//g.alicdn.com/code/lib/react-dom/16.8.6/umd/react-dom.production.min.js"></script>
+  <script src="//g.alicdn.com/code/lib/react-router-dom/5.0.0/react-router-dom.min.js"></script>
+  <script src="//g.alicdn.com/code/lib/moment.js/2.24.0/moment.min.js"></script>
+  <script src="//g.alicdn.com/code/lib/antd/3.16.1/antd.min.js"></script>
   <script src="./dist/bundle.js"></script>
 </body>
 

diff --git a/saga/seata-saga-statemachine-designer/package-lock.json b/saga/seata-saga-statemachine-designer/package-lock.json
diff --git a/saga/seata-saga-statemachine-designer/package.json b/saga/seata-saga-statemachine-designer/package.json
@@ -51,7 +51,7 @@
     "@antv/g6": "^2.2.6",
     "codemirror": "^5.55.0",
     "core-js": "^3.6.5",
-    "lodash": "^4.17.10",
+    "lodash": "^4.17.21",
     "react-codemirror": "^1.0.0"
   },
   "devDependencies": {