Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

optimize: optimize some scripts related to Apollo #5926

Merged
merged 3 commits into from
Oct 16, 2023
Merged

optimize: optimize some scripts related to Apollo #5926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4d6215
optimize: optimize the script
wangliang181230 Oct 12, 2023
84c8beb
modify 2.0.0.md
wangliang181230 Oct 12, 2023
afb7901
bugfix
wangliang181230 Oct 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changes/en-us/2.0.0.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ The version is updated as follows:
- [[#5829](https://github.com/seata/seata/pull/5829)] fix codecov chart not display
- [[#5878](https://github.com/seata/seata/pull/5878)] optimize `httpcore` and `httpclient` dependencies
- [[#5917](https://github.com/seata/seata/pull/5917)] upgrade native-lib-loader version
- [[#5926](https://github.com/seata/seata/pull/5926)] optimize some scripts related to Apollo

### security:
- [[#5642](https://github.com/seata/seata/pull/5642)] add Hessian Serializer WhiteDenyList
Expand Down
2 changes: 1 addition & 1 deletion changes/zh-cn/2.0.0.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ Seata 是一款开源的分布式事务解决方案，提供高性能和简单
- [[#5829](https://github.com/seata/seata/pull/5829)] 修正 `codecov chart` 不展示的问题
- [[#5878](https://github.com/seata/seata/pull/5878)] 优化 `httpcore` 和 `httpclient` 的依赖定义
- [[#5917](https://github.com/seata/seata/pull/5917)] 升级 native-lib-loader 版本

- [[#5926](https://github.com/seata/seata/pull/5926)] 优化一些与 Apollo 相关的脚本

### security:
- [[#5642](https://github.com/seata/seata/pull/5642)] 增加Hessian 序列化黑白名单
Expand Down
4 changes: 2 additions & 2 deletions config/seata-config-apollo/src/main/java/io/seata/config/apollo/ApolloConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,13 +186,13 @@ private void readyApolloConfig() {
System.setProperty(PROP_APOLLO_SECRET, apolloAccesskeySecret);
}
}
if (!properties.containsKey(APOLLO_CLUSTER)) {
if (!properties.containsKey(PROP_APOLLO_CLUSTER)) {
String apolloCluster = FILE_CONFIG.getConfig(getApolloCluster());
if (StringUtils.isNotBlank(apolloCluster)) {
System.setProperty(PROP_APOLLO_CLUSTER, apolloCluster);
}
}
if (!properties.containsKey(APOLLO_CONFIG_SERVICE)) {
if (!properties.containsKey(PROP_APOLLO_CONFIG_SERVICE)) {
String apolloConfigService = FILE_CONFIG.getConfig(getApolloConfigService());
if (StringUtils.isNotBlank(apolloConfigService)) {
System.setProperty(PROP_APOLLO_CONFIG_SERVICE, apolloConfigService);
Expand Down
1 change: 1 addition & 0 deletions script/client/conf/registry.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ config {
apolloMeta = "http://192.168.1.204:8801"
namespace = "application"
apolloAccesskeySecret = ""
cluster = ""
}
zk {
serverAddr = "127.0.0.1:2181"
Expand Down
1 change: 1 addition & 0 deletions script/client/spring/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ seata.config.apollo.apollo-meta=http://192.168.1.204:8801
seata.config.apollo.apollo-accesskey-secret=
seata.config.apollo.app-id=seata-server
seata.config.apollo.namespace=application
seata.config.apollo.cluster=

seata.config.etcd3.server-addr=http://localhost:2379

Expand Down
1 change: 1 addition & 0 deletions script/client/spring/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ seata:
app-id: seata-server
namespace: application
apollo-accesskey-secret:
cluster:
etcd3:
server-addr: http://localhost:2379
nacos:
Expand Down
Loading