From 46075fca58c82ba09f49e32dc10ac7a9d502f248 Mon Sep 17 00:00:00 2001 From: imashimaro Date: Mon, 5 Aug 2024 23:28:55 +0800 Subject: [PATCH 1/2] optimize: add the default console and security config on application.example.yml(#6725) --- server/src/main/resources/application.example.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/server/src/main/resources/application.example.yml b/server/src/main/resources/application.example.yml index b14414b6cd9..bcbb5d4bd06 100644 --- a/server/src/main/resources/application.example.yml +++ b/server/src/main/resources/application.example.yml @@ -32,7 +32,10 @@ logging: kafka-appender: bootstrap-servers: 127.0.0.1:9092 topic: logback_to_logstash - +console: + user: + username: seata + password: seata seata: config: # support: nacos 、 consul 、 apollo 、 zk 、 etcd3 @@ -215,3 +218,8 @@ seata: boss-thread-prefix: NettyBoss worker-thread-prefix: NettyServerNIOWorker boss-thread-size: 1 + security: + secretKey: SeataSecretKey0c382ef121d778043159209298fd40bf3850a017 + tokenValidityInMilliseconds: 1800000 + ignore: + urls: /,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.jpeg,/**/*.ico,/api/v1/auth/login,/version.json,/health,/error From 5e46463e881145a86e8f2d60e3f558764e598180 Mon Sep 17 00:00:00 2001 From: imashimaro Date: Tue, 6 Aug 2024 12:47:19 +0800 Subject: [PATCH 2/2] optimize: add the default console and security config on application.raft.example.yml(#6725) --- changes/en-us/2.x.md | 2 ++ changes/zh-cn/2.x.md | 4 ++-- server/src/main/resources/application.raft.example.yml | 10 +++++++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md index 18addd09085..5d5ef05b2b1 100644 --- a/changes/en-us/2.x.md +++ b/changes/en-us/2.x.md @@ -37,6 +37,7 @@ Add changes here for all PR submitted to the 2.x branch. - [[#6667](https://github.com/apache/incubator-seata/pull/6667)] optimize Namingserver log output - [[#6687](https://github.com/apache/incubator-seata/pull/6687)] delete static code built on the frontend - [[#6700](https://github.com/apache/incubator-seata/pull/6700)] remove sdk version checking +- [[#6732](https://github.com/apache/incubator-seata/pull/6732)] add the default console and security config on application.example.yml and application.raft.example.yml ### refactor: @@ -72,6 +73,7 @@ Thanks to these contributors for their code commits. Please report an unintended - [GoodBoyCoder](https://github.com/GoodBoyCoder) - [liuqiufeng](https://github.com/liuqiufeng) - [caohdgege](https://github.com/caohdgege) +- [imashimaro](https://github.com/hmj776521114) Also, we receive many valuable issues, questions and advices from our community. Thanks for you all. diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md index 66ef670815c..c3f3341d0e1 100644 --- a/changes/zh-cn/2.x.md +++ b/changes/zh-cn/2.x.md @@ -37,7 +37,7 @@ - [[#6667](https://github.com/apache/incubator-seata/pull/6667)] 优化Namingserver日志输出 - [[#6687](https://github.com/apache/incubator-seata/pull/6687)] 删除前端构建的静态代码 - [[#6700](https://github.com/apache/incubator-seata/pull/6700)] 去掉sdk版本检查 - +- [[#6732](https://github.com/apache/incubator-seata/pull/6732)] 为application.example.yml与application.raft.example.yml添加默认安全配置 ### refactor: @@ -76,7 +76,7 @@ - [GoodBoyCoder](https://github.com/GoodBoyCoder) - [liuqiufeng](https://github.com/liuqiufeng) - [caohdgege](https://github.com/caohdgege) - +- [imashimaro](https://github.com/hmj776521114) 同时，我们收到了社区反馈的很多有价值的issue和建议，非常感谢大家。 diff --git a/server/src/main/resources/application.raft.example.yml b/server/src/main/resources/application.raft.example.yml index 8b313be3500..9840a60a8f7 100644 --- a/server/src/main/resources/application.raft.example.yml +++ b/server/src/main/resources/application.raft.example.yml @@ -32,7 +32,10 @@ logging: kafka-appender: bootstrap-servers: 127.0.0.1:9092 topic: logback_to_logstash - +console: + user: + username: seata + password: seata seata: config: # support: nacos 、 consul 、 apollo 、 zk 、 etcd3 @@ -135,3 +138,8 @@ seata: boss-thread-prefix: NettyBoss worker-thread-prefix: NettyServerNIOWorker boss-thread-size: 1 + security: + secretKey: SeataSecretKey0c382ef121d778043159209298fd40bf3850a017 + tokenValidityInMilliseconds: 1800000 + ignore: + urls: /,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.jpeg,/**/*.ico,/api/v1/auth/login,/version.json,/health,/error