optimize: optimize some files

README.md

@@ -4,10 +4,10 @@
 
 # Seata: Simple Extensible Autonomous Transaction Architecture
 
-[![Build Status](https://github.com/seata/seata/workflows/build/badge.svg?branch=develop)](https://github.com/seata/seata/actions)
-[![codecov](https://codecov.io/gh/seata/seata/branch/develop/graph/badge.svg)](https://codecov.io/gh/seata/seata)
-[![license](https://img.shields.io/github/license/seata/seata.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
-[![maven](https://img.shields.io/maven-central/v/io.seata/seata-parent?versionSuffix=2.0.0)](https://search.maven.org/search?q=io.seata)
+[![Build Status](https://github.com/apache/incubator-seata/workflows/build/badge.svg?branch=develop)](https://github.com/apache/incubator-seata/actions)
+[![codecov](https://codecov.io/gh/apache/incubator-seata/branch/develop/graph/badge.svg)](https://codecov.io/gh/apache/incubator-seata)
+[![license](https://img.shields.io/github/license/apache/incubator-seata.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
+[![maven](https://img.shields.io/maven-central/v/io.apache/incubator-seata-parent?versionSuffix=2.0.0)](https://search.maven.org/search?q=io.seata)
 
 ## What is Seata?
 
@@ -56,7 +56,7 @@ A typical lifecycle of Seata managed distributed transaction:
 
 ![Typical Process](https://cdn.nlark.com/lark/0/2018/png/18862/1545296917881-26fabeb9-71fa-4f3e-8a7a-fc317d3389f4.png) 
 
-For more details about principle and design, please go to [Seata wiki page](https://github.com/seata/seata/wiki). 
+For more details about principle and design, please go to [Seata wiki page](https://github.com/apache/incubator-seata/wiki). 
 
 ### History
 
@@ -108,12 +108,12 @@ Depending on the scenario, choose one of the two dependencies: `io.seata:seata-a
 
 ## Quick Start
 
-[Quick Start](https://seata.io/zh-cn/docs/ops/deploy-guide-beginner.html)
+[Quick Start](https://seata.apache.org/zh-cn/docs/ops/deploy-guide-beginner)
 
 ## Documentation
 
 
-You can view the full documentation from Seata Official Website: [Seata Website page](https://seata.io/zh-cn/docs/overview/what-is-seata.html).
+You can view the full documentation from Seata Official Website: [Seata Website page](https://seata.apache.org/zh-cn/docs/overview/what-is-seata).
 
 ## Reporting bugs
 
@@ -140,26 +140,24 @@ Contributors are welcomed to join the Seata project. Please check [CONTRIBUTING]
 ## Seata ecosystem
 
 * [Seata Website](https://github.com/apache/incubator-seata.github.io) - Seata official website
-* [Seata Ecosystem Entry](https://github.com/seata) - A GitHub group `seata` to gather all Seata relevant projects
 * [Seata GoLang](https://github.com/apache/incubator-seata-go) - Seata GoLang client and server
 * [Seata Samples](https://github.com/apache/incubator-seata-samples) - Samples for Seata
 * [Seata GoLang Simples](https://github.com/apache/incubator-seata-go-samples) - Samples for Seata GoLang
 * [Seata K8s](https://github.com/apache/incubator-seata-k8s) - Seata integration with k8s
 * [Seata CLI](https://github.com/apache/incubator-seata-ctl) - CLI tool for Seata
-* [Awesome Seata](https://github.com/seata/awesome-fescar) - Seata's slides and video address in meetup
 
 ## Contributors
 
-This project exists thanks to all the people who contribute. [[Contributors](https://github.com/seata/seata/graphs/contributors)].
+This project exists thanks to all the people who contribute. [[Contributors](https://github.com/apache/incubator-seata/graphs/contributors)].
 
 ## License
 
-Seata is under the Apache 2.0 license. See the [LICENSE](https://github.com/seata/seata/blob/master/LICENSE) file for details.
+Seata is under the Apache 2.0 license. See the [LICENSE](https://github.com/apache/incubator-seata/blob/master/LICENSE) file for details.
 
 ## Who is using
 
 These are only part of the companies using Seata, for reference only. If you are using Seata, please [add your company 
-here](https://github.com/seata/seata/issues/1246) to tell us your scenario to make Seata better.
+here](https://github.com/apache/incubator-seata/issues/1246) to tell us your scenario to make Seata better.
 
 <div style='vertical-align: middle'>
     <img alt='Alibaba Group' height='40'  src='https://img.alicdn.com/imgextra/i1/O1CN01TleQq128FAP8POtL5_!!6000000007902-2-tps-241-42.png'  /img>

build/pom.xml

@@ -38,30 +38,30 @@
     </licenses>
 
     <organization>
-        <name>Seata</name>
-        <url>https://github.com/seata</url>
+        <name>Apache</name>
+        <url>https://github.com/apache</url>
     </organization>
 
-    <url>https://seata.io</url>
+    <url>https://seata.apache.org</url>
 
     <developers>
         <developer>
             <id>Seata</id>
             <name>Seata</name>
-            <url>https://seata.io</url>
-            <email>dev[email protected]</email>
+            <url>https://seata.apache.org</url>
+            <email>dev@seata.apache.org</email>
         </developer>
     </developers>
 
     <issueManagement>
         <system>github</system>
-        <url>https://github.com/seata/seata/issues</url>
+        <url>https://github.com/apache/incubator-seata/issues</url>
     </issueManagement>
 
     <scm>
-        <url>[email protected]:seata/seata.git</url>
-        <connection>scm:[email protected]:seata/seata.git</connection>
-        <developerConnection>scm:[email protected]:seata/seata.git</developerConnection>
+        <url>[email protected]:apache/incubator-seata.git</url>
+        <connection>scm:[email protected]:apache/incubator-seata.git</connection>
+        <developerConnection>scm:[email protected]:apache/incubator-seata.git</developerConnection>
     </scm>
 
     <properties>

changes/en-us/2.x.md

@@ -48,6 +48,8 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#6227](https://github.com/apache/incubator-seata/pull/6227)] validate that the primary key is free of illegal characters
 - [[#6004](https://github.com/apache/incubator-seata/pull/6004)] optimize RM TM startup connect server fail fast
 - [[#6243](https://github.com/apache/incubator-seata/pull/6243)] optimize links in the console header
+- [[#6238](https://github.com/apache/incubator-seata/pull/6238)] optimize some files
+- [[#6239](https://github.com/apache/incubator-seata/pull/6239)] update security policy, disclaimer and notice
 
 ### security:
 - [[#6069](https://github.com/apache/incubator-seata/pull/6069)] Upgrade Guava dependencies to fix security vulnerabilities

changes/zh-cn/2.x.md

@@ -48,6 +48,8 @@
 - [[#6227](https://github.com/apache/incubator-seata/pull/6227)] 校验pk中不含逗号
 - [[#6004](https://github.com/apache/incubator-seata/pull/6004)] 优化RM,TM连接server快速失败
 - [[#6243](https://github.com/apache/incubator-seata/pull/6243)] 优化控制台页眉中的链接
+- [[#6238](https://github.com/apache/incubator-seata/pull/6238)] 文件合规优化
+- [[#6239](https://github.com/apache/incubator-seata/pull/6239)] 更新security policy，disclaimer 和 notice 文件
 
 ### security:
 - [[#6069](https://github.com/apache/incubator-seata/pull/6069)] 升级Guava依赖版本，修复安全漏洞

console/src/main/resources/static/console-fe/package.json

@@ -23,7 +23,7 @@
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/seata/seata.git"
+    "url": "git+https://github.com/apache/incubator-seata.git"
   },
   "devDependencies": {
     "@babel/cli": "^7.2.3",

core/src/main/java/io/seata/core/rpc/netty/v1/ProtocolV1Encoder.java

@@ -64,6 +64,7 @@ public class ProtocolV1Encoder extends MessageToByteEncoder {
     @Override
     public void encode(ChannelHandlerContext ctx, Object msg, ByteBuf out) {
         try {
+
             if (msg instanceof RpcMessage) {
                 RpcMessage rpcMessage = (RpcMessage) msg;
 

distribution/Dockerfile

@@ -28,7 +28,7 @@
 FROM openjdk:8u342
 
 # set label
-LABEL maintainer="Seata <seata.io>"
+LABEL maintainer="Seata <seata.apache.org>"
 
 WORKDIR /$BASE_DIR
 

mvnw.cmd

@@ -1,5 +1,4 @@
 @REM ----------------------------------------------------------------------------
-@REM Copyright 1999-2019 Seata.io Group.
 @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.

saga/seata-saga-statemachine-designer/README.md

@@ -7,7 +7,7 @@ A visual graph Seata Saga StateMachine Designer based on [GGEditor](https://gith
 ## run
 
 ```sh
-$ git clone https://github.com/seata/seata.git
+$ git clone https://github.com/apache/incubator-seata.git
 $ cd saga/seata-saga-statemachine-designer
 $ npm install
 $ npm start
@@ -22,4 +22,4 @@ $ npm run build
 copy 'index.html' and 'dist' directory to static html directory of web server
 
 ## Usage
-To understand the state types of the state machine, please see [document of Saga](https://seata.io/zh-cn/docs/user/saga.html). After using the designer to complete the design of the state machine, you can click the 'Json View' button on the toolbar to switch to the Json view, and save the Json to the project of your own application. Although the Json generated by the designer is different from the standard Json of the Saga state machine (because the json generated by the designer has layout information), the state machine can be directly loaded and it will be converted into the Json of the Saga state machine standard.
+To understand the state types of the state machine, please see [document of Saga](https://seata.apache.org/zh-cn/docs/user/mode/saga). After using the designer to complete the design of the state machine, you can click the 'Json View' button on the toolbar to switch to the Json view, and save the Json to the project of your own application. Although the Json generated by the designer is different from the standard Json of the Saga state machine (because the json generated by the designer has layout information), the state machine can be directly loaded and it will be converted into the Json of the Saga state machine standard.

saga/seata-saga-statemachine-designer/README.zh-CN.md

@@ -7,7 +7,7 @@ Seata Saga 状态机可视化图形设计器, 基于 [GGEditor](https://github.c
 ## 运行
 
 ```sh
-$ git clone https://github.com/seata/seata.git
+$ git clone https://github.com/apache/incubator-seata.git
 $ cd saga/seata-saga-statemachine-designer
 $ npm install
 $ npm start
@@ -22,4 +22,4 @@ $ npm run build
 然后将index.html和dist目录拷贝到web server的静态页面目录下
 
 ## 使用
-了解状态机的种状态类型，请看Saga的[文档](https://seata.io/zh-cn/docs/user/saga.html)。 通过设计器完成设计后可以点击工具栏的'Json View'按钮切换到Json视图，将Json拷贝保存到自己应用的工程里。虽然设计器生成的Json与Saga标准的Json有所差别（因为设计器生成的json带有布局信息），但状态机可以直接加载，它会将其转化成Saga状态机标准的Json。
+了解状态机的种状态类型，请看Saga的[文档](https://seata.apache.org/zh-cn/docs/user/mode/saga)。 通过设计器完成设计后可以点击工具栏的'Json View'按钮切换到Json视图，将Json拷贝保存到自己应用的工程里。虽然设计器生成的Json与Saga标准的Json有所差别（因为设计器生成的json带有布局信息），但状态机可以直接加载，它会将其转化成Saga状态机标准的Json。

saga/seata-saga-statemachine-designer/package.json

@@ -27,7 +27,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/seata/seata.git"
+    "url": "git+https://github.com/apache/incubator-seata.git"
   },
   "authors": [
     {
@@ -37,9 +37,9 @@
   ],
   "license": "Apache-2.0",
   "bugs": {
-    "url": "https://github.com/seata/seata/issues"
+    "url": "https://github.com/apache/incubator-seata/issues"
   },
-  "homepage": "https://seata.io/",
+  "homepage": "https://seata.apache.org/",
   "peerDependencies": {
     "react": "^16.3.0"
   },

saga/seata-saga-statemachine-designer/src/components/EditorDetailPanel/DetailForm.js

@@ -116,7 +116,7 @@ class DetailForm extends React.Component {
             initialValue: JSON.stringify(stateProps, null, 2),
           })(<TextArea onBlur={this.handleSubmit} rows={16} />)}
         </Item>
-        <a target="_blank" style={{ float: 'right' }} href="https://seata.io/zh-cn/docs/user/saga.html">How to fill the properties?</a>
+        <a target="_blank" style={{ float: 'right' }} href="https://seata.apache.org/zh-cn/docs/user/mode/saga">How to fill the properties?</a>
       </Fragment >
     );
   };
@@ -142,7 +142,7 @@ class DetailForm extends React.Component {
             initialValue: JSON.stringify(stateProps, null, 2),
           })(<TextArea onBlur={this.handleSubmit} rows={16} />)}
         </Item>
-        <a target="_blank" style={{ float: 'right' }} href="https://seata.io/zh-cn/docs/user/saga.html">How to fill the properties?</a>
+        <a target="_blank" style={{ float: 'right' }} href="https://seata.apache.org/zh-cn/docs/user/mode/saga">How to fill the properties?</a>
       </Fragment>
     );
   };

script/config-center/README.md

@@ -3,7 +3,7 @@
 
 ## important attributes 
 
-you only need to follow the instructions below and keep the corresponding configuration in 'config.txt' to run. For more configuration information, please visit [seata.io](https://seata.io/)
+you only need to follow the instructions below and keep the corresponding configuration in 'config.txt' to run. For more configuration information, please visit [seata.apache.org](https://seata.apache.org/)
 
 | server                   | client                                                       |
 | ------------------------ | ------------------------------------------------------------ |

script/config-center/config.txt

@@ -1,4 +1,4 @@
-#For details about configuration items, see https://seata.io/zh-cn/docs/user/configurations.html
+#For details about configuration items, see https://seata.apache.org/zh-cn/docs/user/configurations
 #Transport configuration, for client and server
 transport.type=TCP
 transport.server=NIO

server/src/main/resources/README-zh.md

@@ -1,6 +1,6 @@
 # 脚本说明
 
-## [client](https://github.com/seata/seata/tree/develop/script/client) 
+## [client](https://github.com/apache/incubator-seata/tree/develop/script/client) 
 
 > 存放用于客户端的配置和SQL
 
@@ -9,7 +9,7 @@
 - saga: SAGA 模式下所需表的建表语句
 - spring: SpringBoot 应用支持的配置文件
 
-## [server](https://github.com/seata/seata/tree/develop/script/server)
+## [server](https://github.com/apache/incubator-seata/tree/develop/script/server)
 
 > 存放server侧所需SQL和部署脚本
 
@@ -18,7 +18,7 @@
 - helm: server 侧通过 Helm 部署的脚本
 - kubernetes: server 侧通过 Kubernetes 部署的脚本
 
-## [config-center](https://github.com/seata/seata/tree/develop/script/config-center)
+## [config-center](https://github.com/apache/incubator-seata/tree/develop/script/config-center)
 
 > 用于存放各种配置中心的初始化脚本，执行时都会读取 `config.txt`配置文件，并写入配置中心
 

server/src/main/resources/README.md

@@ -1,6 +1,6 @@
 # Script Description
 
-## [client](https://github.com/seata/seata/tree/develop/script/client) 
+## [client](https://github.com/apache/incubator-seata/tree/develop/script/client) 
 
 > Store configuration and SQL for client side
 
@@ -9,7 +9,7 @@
 - saga: Script of create table in SAGA mode
 - spring: Configuration for Spring Boot 
 
-## [server](https://github.com/seata/seata/tree/develop/script/server)
+## [server](https://github.com/apache/incubator-seata/tree/develop/script/server)
 
 > Store SQL and deploy script for server side
 
@@ -18,7 +18,7 @@
 - helm: Script for deploy server by Helm
 - kubernetes: Script for deploy server by Kubernetes
 
-## [config-center](https://github.com/seata/seata/tree/develop/script/config-center)
+## [config-center](https://github.com/apache/incubator-seata/tree/develop/script/config-center)
 
 > Store initialize script for configuration center, will use `config.txt` as configuration when initial
 

sqlparser/seata-sqlparser-druid/src/main/java/io/seata/sqlparser/druid/BaseRecognizer.java

@@ -123,36 +123,36 @@ public boolean isSqlSyntaxSupports() {
             public boolean visit(SQLInSubQueryExpr x) {
                 //just like: ...where id in (select id from t)
                 throw new NotSupportYetException("not support the sql syntax with InSubQuery:" + x
-                        + "\nplease see the doc about SQL restrictions https://seata.io/zh-cn/docs/user/sqlreference/dml.html");
+                        + "\nplease see the doc about SQL restrictions https://seata.apache.org/zh-cn/docs/user/sqlreference/dml");
             }
 
             @Override
             public boolean visit(SQLSubqueryTableSource x) {
                 //just like: select * from (select * from t)
                 throw new NotSupportYetException("not support the sql syntax with SubQuery:" + x
-                        + "\nplease see the doc about SQL restrictions https://seata.io/zh-cn/docs/user/sqlreference/dml.html");
+                        + "\nplease see the doc about SQL restrictions https://seata.apache.org/zh-cn/docs/user/sqlreference/dml");
             }
 
             @Override
             public boolean visit(SQLReplaceStatement x) {
                 //just like: replace into t (id,dr) values (1,'2'), (2,'3')
                 throw new NotSupportYetException("not support the sql syntax with ReplaceStatement:" + x
-                        + "\nplease see the doc about SQL restrictions https://seata.io/zh-cn/docs/user/sqlreference/dml.html");
+                        + "\nplease see the doc about SQL restrictions https://seata.apache.org/zh-cn/docs/user/sqlreference/dml");
             }
 
             @Override
             public boolean visit(SQLMergeStatement x) {
                 //just like: merge into ... WHEN MATCHED THEN ...
                 throw new NotSupportYetException("not support the sql syntax with MergeStatement:" + x
-                        + "\nplease see the doc about SQL restrictions https://seata.io/zh-cn/docs/user/sqlreference/dml.html");
+                        + "\nplease see the doc about SQL restrictions https://seata.apache.org/zh-cn/docs/user/sqlreference/dml");
             }
 
             @Override
             public boolean visit(SQLInsertStatement x) {
                 if (null != x.getQuery()) {
                     //just like: insert into t select * from t1
                     throw new NotSupportYetException("not support the sql syntax insert with query:" + x
-                            + "\nplease see the doc about SQL restrictions https://seata.io/zh-cn/docs/user/sqlreference/dml.html");
+                            + "\nplease see the doc about SQL restrictions https://seata.apache.org/zh-cn/docs/user/sqlreference/dml");
                 }
                 return true;
             }