diff --git a/README.md b/README.md index e32ef586994..ecff43685d1 100644 --- a/README.md +++ b/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.
Alibaba Group diff --git a/build/pom.xml b/build/pom.xml index 336567f90ad..9b8f85b7839 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -38,30 +38,30 @@ - Seata - https://github.com/seata + Apache + https://github.com/apache - https://seata.io + https://seata.apache.org Seata Seata - https://seata.io - dev-seata@googlegroups.com + https://seata.apache.org + dev@seata.apache.org github - https://github.com/seata/seata/issues + https://github.com/apache/incubator-seata/issues - git@github.com:seata/seata.git - scm:git@github.com:seata/seata.git - scm:git@github.com:seata/seata.git + git@github.com:apache/incubator-seata.git + scm:git@github.com:apache/incubator-seata.git + scm:git@github.com:apache/incubator-seata.git diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md index a80513286f4..a99b2592d97 100644 --- a/changes/en-us/2.x.md +++ b/changes/en-us/2.x.md @@ -49,6 +49,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 - [[#6245](https://github.com/apache/incubator-seata/pull/6245)] in file mode, the configuration in the application takes effect, when the spring configuration in the configuration center is changed - [[#6247](https://github.com/apache/incubator-seata/pull/6247)] optimize asf.yml diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md index 79e0ce2ab48..309ee68f4e0 100644 --- a/changes/zh-cn/2.x.md +++ b/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 文件 - [[#6245](https://github.com/apache/incubator-seata/pull/6245)] file模式下，在配置中心的spring配置改变时，使应用程序中的配置生效 - [[#6247](https://github.com/apache/incubator-seata/pull/6247)] 优化 asf.yml 配置 diff --git a/console/src/main/resources/static/console-fe/package.json b/console/src/main/resources/static/console-fe/package.json index e16c89407aa..7ad83a039be 100644 --- a/console/src/main/resources/static/console-fe/package.json +++ b/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", diff --git a/core/src/main/java/io/seata/core/rpc/netty/v1/ProtocolV1Encoder.java b/core/src/main/java/io/seata/core/rpc/netty/v1/ProtocolV1Encoder.java index 0f35eff8492..97b786e2af1 100644 --- a/core/src/main/java/io/seata/core/rpc/netty/v1/ProtocolV1Encoder.java +++ b/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; diff --git a/distribution/Dockerfile b/distribution/Dockerfile index 25bc060a02c..6c6bf88d745 100644 --- a/distribution/Dockerfile +++ b/distribution/Dockerfile @@ -28,7 +28,7 @@ FROM openjdk:8u342 # set label -LABEL maintainer="Seata " +LABEL maintainer="Seata " WORKDIR /$BASE_DIR diff --git a/mvnw.cmd b/mvnw.cmd index 0dd17319b8f..169db32e236 100755 --- a/mvnw.cmd +++ b/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. diff --git a/saga/seata-saga-statemachine-designer/README.md b/saga/seata-saga-statemachine-designer/README.md index 9f86bd1839d..9938741fc88 100644 --- a/saga/seata-saga-statemachine-designer/README.md +++ b/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. diff --git a/saga/seata-saga-statemachine-designer/README.zh-CN.md b/saga/seata-saga-statemachine-designer/README.zh-CN.md index 35f9e9e37d1..71a8df35667 100644 --- a/saga/seata-saga-statemachine-designer/README.zh-CN.md +++ b/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。 diff --git a/saga/seata-saga-statemachine-designer/package.json b/saga/seata-saga-statemachine-designer/package.json index 0f2fbfe95e6..2f420ebe9f9 100644 --- a/saga/seata-saga-statemachine-designer/package.json +++ b/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" }, diff --git a/saga/seata-saga-statemachine-designer/src/components/EditorDetailPanel/DetailForm.js b/saga/seata-saga-statemachine-designer/src/components/EditorDetailPanel/DetailForm.js index bdcc470f27c..5c9dd0ca4a6 100644 --- a/saga/seata-saga-statemachine-designer/src/components/EditorDetailPanel/DetailForm.js +++ b/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), })(