Skip to content

Commit

Permalink
Merge branch 'develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
funky-eyes committed Dec 2, 2021
2 parents 6ca750e + c60cb5e commit eae37b6
Show file tree
Hide file tree
Showing 199 changed files with 25,463 additions and 243 deletions.
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*.js linguist-language=java
*.css linguist-language=java
*.html linguist-language=java
12 changes: 9 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,14 @@ To put forward a PR, we assume you have registered a GitHub ID. Then you could f

1. **Set Remote** upstream to be `git@github.com:seata/seata.git` using the following two commands:

```
```bash
git remote add upstream git@github.com:seata/seata.git
git remote set-url --push upstream no-pushing
```

With this remote setting, you can check your git remote configuration like this:

```
```shell
$ git remote -v
origin git@github.com:<your-username>/seata.git (fetch)
origin git@github.com:<your-username>/seata.git (push)
Expand Down Expand Up @@ -140,7 +140,13 @@ Commit content represents all content changes included in one commit. We had bet

* avoid very large change in a commit;
* complete and reviewable for each commit.
* check git config(`user.name`, `user.email`) when committing to ensure that it is associated with your github ID.
* check git config(`user.name`, `user.email`) when committing to ensure that it is associated with your GitHub ID.

```bash
git config --get user.name
git config --get user.email
```

* when submitting pr, please add a brief description of the current changes to the X.X.X.md file under the 'changes/' folder


Expand Down
12 changes: 9 additions & 3 deletions CONTRIBUTING_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,14 @@

3. **设置远程** 将上游设置为 `git@github.com:seata/seata.git` 使用以下两个命令:

```
```bash
git remote add upstream git@github.com:seata/seata.git
git remote set-url --push upstream no-pushing
```

使用此远程设置,您可以像这样检查您的 git 远程配置:

```
```shell
$ git remote -v
origin git@github.com:<your-username>/seata.git (fetch)
origin git@github.com:<your-username>/seata.git (push)
Expand Down Expand Up @@ -140,7 +140,13 @@ upstream no-pushing (push)

* 避免在提交中进行非常大的更改;
* 每次提交都完整且可审查。
* 提交时检查 git config(`user.name`, `user.email`) 以确保它与您的 github ID 相关联。
* 提交时检查 git config(`user.name`, `user.email`) 以确保它与您的 GitHub ID 相关联。

```bash
git config --get user.name
git config --get user.email
```

* 提交pr时,请在'changes/'文件夹下的XXXmd文件中添加当前更改的简要说明


Expand Down
15 changes: 15 additions & 0 deletions changes/1.5.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Seata 是一款开源的分布式事务解决方案,提供高性能和简单


### feature:
- [[#4042](https://github.com/seata/seata/pull/4042)] 支持用户控制台
- [[#3472](https://github.com/seata/seata/pull/3472)] 添加redisLocker的lua模式
- [[#3575](https://github.com/seata/seata/pull/3575)] 支持对锁和会话不同存储的混合使用
- [[#3374](https://github.com/seata/seata/pull/3374)] 支持mysql INSERT ON DUPLICATE KEY UPDATE
Expand Down Expand Up @@ -67,10 +68,15 @@ Seata 是一款开源的分布式事务解决方案,提供高性能和简单
- [[#4023](https://github.com/seata/seata/pull/4023)] 修复 dubbo部分场景存在xid未清除的问题
- [[#4032](https://github.com/seata/seata/pull/4032)] 修复server端的ShutdownHook在资源释放时,ApplicationContext已关闭的问题
- [[#4039](https://github.com/seata/seata/pull/4039)] 修复 本地事务抛出异常之后,RM没有清除xid
- [[#4074](https://github.com/seata/seata/pull/4074)] 修复XA模式资源悬挂问题
- [[#4107](https://github.com/seata/seata/pull/4107)] 修复项目构建时的死锁问题
- [[#4158](https://github.com/seata/seata/pull/4158)] 修复logback无法加载到`RPC_PORT`的问题
- [[#4162](https://github.com/seata/seata/pull/4162)] 修复Redis注册中心内置配置名导致启动报错问题



### optimize:
- [[#4163](https://github.com/seata/seata/pull/4163)] 完善开发者奉献文档
- [[#3678](https://github.com/seata/seata/pull/3678)] 补充遗漏的配置及新版本pr登记md文件
- [[#3654](https://github.com/seata/seata/pull/3654)] 修正拼写,applicationContex -> applicationContext
- [[#3615](https://github.com/seata/seata/pull/3615)] 二阶段同步提交时,全局事务记录异步删除
Expand Down Expand Up @@ -127,6 +133,10 @@ Seata 是一款开源的分布式事务解决方案,提供高性能和简单
- [[#4034](https://github.com/seata/seata/pull/4034)] 优化“优化 Nacos、Consul、Zookeeper、Etcd3 配置(#4019)”的单元测试类
- [[#4055](https://github.com/seata/seata/pull/4055)] 优化NetUtil的getLocalAddress0方法
- [[#4056](https://github.com/seata/seata/pull/4056)] 优化 DurationUtil
- [[#4103](https://github.com/seata/seata/pull/4103)] 减少分支事务注册无需竞争锁时的内存占用
- [[#4144](https://github.com/seata/seata/pull/4144)] 支持默认的事务分组配置
- [[#4157](https://github.com/seata/seata/pull/4157)] 优化客户端批量发送请求

### test:


Expand Down Expand Up @@ -160,8 +170,13 @@ Seata 是一款开源的分布式事务解决方案,提供高性能和简单
- [Rubbernecker](https://github.com/Rubbernecker)
- [dmego](https://github.com/dmego)
- [zhixing](https://github.com/chenlei3641)
- [jameslcj](https://github.com/jameslcj)
- [wfnuser](https://github.com/wfnuser)
- [siyu](https://github.com/Pinocchio2018)
- [zhouchuhang](https://github.com/zch0214)
- [xujj](https://github.com/XBNGit)
- [portman](https://github.com/iportman)


同时,我们收到了社区反馈的很多有价值的issue和建议,非常感谢大家。

Expand Down
18 changes: 16 additions & 2 deletions changes/en-us/1.5.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@


### feature:
- [[#4042](https://github.com/seata/seata/pull/4042)] support console management
- [[#3472](https://github.com/seata/seata/pull/3472)] add redisLocker's lua mode
- [[#3575](https://github.com/seata/seata/pull/3575)] support the mixed use of different storages of locks and sessions
- [[#3374](https://github.com/seata/seata/pull/3374)] add a Executor for INSERT ON DUPLICATE KEY UPDATE
Expand Down Expand Up @@ -65,10 +66,14 @@
- [[#4023](https://github.com/seata/seata/pull/4023)] fix the problem that the xid is not cleared in some scenes of dubbo
- [[#4039](https://github.com/seata/seata/pull/4039)] fix RM did not clear XID after the local transaction threw an exception
- [[#4032](https://github.com/seata/seata/pull/4032)] fix ApplicationContext already closed problem when Seata server using ShutdownHook to destroy

- [[#4074](https://github.com/seata/seata/pull/4074)] fix prevents XA mode resource suspension
- [[#4107](https://github.com/seata/seata/pull/4107)] fix deadlock problems during project construction
- [[#4158](https://github.com/seata/seata/pull/4158)] fix the logback can't load the `RPC_PORT`
- [[#4162](https://github.com/seata/seata/pull/4162)] fix correct built-in properties for redis registry


### optimize:
- [[#4163](https://github.com/seata/seata/pull/4163)] improve CONTRIBUTING docs
- [[#3678](https://github.com/seata/seata/pull/3678)] supplement missing configuration and new version documents
- [[#3654](https://github.com/seata/seata/pull/3654)] fix typo,applicationContex -> applicationContext
- [[#3615](https://github.com/seata/seata/pull/3615)] asynchronous deletion after the transaction is committed
Expand Down Expand Up @@ -126,7 +131,10 @@
- [[#4034](https://github.com/seata/seata/pull/4034)] optimize Nacos, Consul, Zookeeper and Etcd3 configuration Junit test Class
- [[#4055](https://github.com/seata/seata/pull/4055)] optimize NetUtil#getLocalAddress0
- [[#4056](https://github.com/seata/seata/pull/4056)] optimize the DurationUtil

- [[#4103](https://github.com/seata/seata/pull/4103)] optimize AbstractLockManager#collectRowLocks logic
- [[#4144](https://github.com/seata/seata/pull/4144)] support default configuration of tx-service-group
- [[#4157](https://github.com/seata/seata/pull/4157)] optimize client batch sending.

### test:


Expand Down Expand Up @@ -159,8 +167,14 @@
- [elrond-g](https://github.com/elrond-g)
- [dmego](https://github.com/dmego)
- [zhixing](https://github.com/chenlei3641)
- [jameslcj](https://github.com/jameslcj)
- [wfnuser](https://github.com/wfnuser)
- [siyu](https://github.com/Pinocchio2018)
- [zhouchuhang](https://github.com/zch0214)
- [xujj](https://github.com/XBNGit)
- [portman](https://github.com/iportman)


Also, we receive many valuable issues, questions and advices from our community. Thanks for you all.

#### Link
Expand Down
7 changes: 6 additions & 1 deletion common/src/main/java/io/seata/common/DefaultValues.java
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,10 @@ public interface DefaultValues {

String DEFAULT_SELECTOR_THREAD_PREFIX = "NettyClientSelector";
String DEFAULT_WORKER_THREAD_PREFIX = "NettyClientWorkerThread";
@Deprecated
boolean DEFAULT_ENABLE_CLIENT_BATCH_SEND_REQUEST = true;
boolean DEFAULT_ENABLE_TM_CLIENT_BATCH_SEND_REQUEST = false;
boolean DEFAULT_ENABLE_RM_CLIENT_BATCH_SEND_REQUEST = true;


String DEFAULT_BOSS_THREAD_PREFIX = "NettyBoss";
Expand Down Expand Up @@ -84,7 +87,9 @@ public interface DefaultValues {
int DEFAULT_TM_ROLLBACK_RETRY_COUNT = 5;
int DEFAULT_GLOBAL_TRANSACTION_TIMEOUT = 60000;

String DEFAULT_TX_GROUP = "my_test_tx_group";
String DEFAULT_TX_GROUP = "default_tx_group";
@Deprecated
String DEFAULT_TX_GROUP_OLD = "my_test_tx_group";
String DEFAULT_TC_CLUSTER = "default";
String DEFAULT_GROUPLIST = "127.0.0.1:8091";

Expand Down
2 changes: 1 addition & 1 deletion config/seata-config-core/src/main/resources/file.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
service {
#transaction service group mapping
vgroupMapping.my_test_tx_group = "default"
vgroupMapping.default_tx_group = "default"
#only support when registry.type=file, please don't set multiple addresses
default.grouplist = "127.0.0.1:8091"
#disable seata
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
service {
#transaction service group mapping
vgroupMapping.my_test_tx_group = "default"
vgroupMapping.default_tx_group = "default"
#only support when registry.type=file, please don't set multiple addresses
default.grouplist = "127.0.0.1:8092"
#disable seata
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
service {
#transaction service group mapping
vgroupMapping.my_test_tx_group = "default"
vgroupMapping.default_tx_group = "default"
#only support when registry.type=file, please don't set multiple addresses
default.grouplist = "127.0.0.1:8093"
#disable seata
Expand Down
2 changes: 1 addition & 1 deletion config/seata-config-core/src/test/resources/file-test.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
service {
#transaction service group mapping
vgroupMapping.my_test_tx_group = "default"
vgroupMapping.default_tx_group = "default"
#only support when registry.type=file, please don't set multiple addresses
default.grouplist = "127.0.0.1:8091"
#disable seata
Expand Down
2 changes: 1 addition & 1 deletion config/seata-config-core/src/test/resources/file.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
service {
#transaction service group mapping
vgroupMapping.my_test_tx_group = "default"
vgroupMapping.default_tx_group = "default"
#only support when registry.type=file, please don't set multiple addresses
default.grouplist = "127.0.0.1:8091"
#disable seata
Expand Down
82 changes: 82 additions & 0 deletions console/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>io.seata</groupId>
<artifactId>seata-parent</artifactId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>seata-console</artifactId>
<packaging>jar</packaging>
<name>seata-console ${project.version}</name>

<properties>
<spring-boot.version>2.3.10.RELEASE</spring-boot.version>
<jwt.version>0.10.5</jwt.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<!--<dependency>-->
<!--<groupId>io.jsonwebtoken</groupId>-->
<!--<artifactId>jjwt</artifactId>-->
<!--<version>${jwt.version}</version>-->
<!--</dependency>-->
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-api</artifactId>
<version>${jwt.version}</version>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-impl</artifactId>
<version>${jwt.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-jackson</artifactId>
<version>${jwt.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
</project>
37 changes: 37 additions & 0 deletions console/src/main/java/io/seata/console/Application.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/*
* Copyright 1999-2019 Seata.io Group.
*
* 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
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* 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.
*/
package io.seata.console;

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;

/**
* The type Application.
*
* @author jameslcj
*/
@SpringBootApplication(scanBasePackages = {"io.seata.console"})
public class Application {

/**
* The entry point of application.
*
* @param args the input arguments
*/
public static void main(String[] args) {
SpringApplication.run(Application.class, args);
}
}
Loading

0 comments on commit eae37b6

Please sign in to comment.