Commit Graph

4468 Commits

Author SHA1 Message Date
李晓双 Li Xiao Shuang
40519a22d5
[ISSUE #9475] Abstract common count method (#9481)
* Abstract common count method

* Abstract common count method

* Abstract common count method

* Abstract common count method

* Abstract common count method

* Abstract common count method
2022-11-06 15:53:05 +08:00
The-Gamer-01
ff2497d999
[ISSUE #9449]Add Tenant Capacity mapper. (#9456) 2022-11-05 00:44:21 +08:00
李晓双 Li Xiao Shuang
d5fb300dd2
[ISSUE #9475] Abstract common count method (#9476)
* Abstract common count method

* Abstract common count method

* Abstract common count method

* Abstract common count method
2022-11-04 22:52:30 +08:00
李晓双 Li Xiao Shuang
9ea8333373
[ISSUE #9466] Modify the findMapper method of MapperManager to be a generic method (#9467)
* Modify the findMapper method of MapperManager to be a generic method

* Modify the findMapper method of MapperManager to be a generic method
2022-11-04 16:52:27 +08:00
hth
5ea747b863
[ISSUE #8619] add CustomEnvironmentPlugin (#8619) (#9296)
* [ISSUE #8619] add CustomEnvironmentPlugin (#8619)

* feature issue #8619 .

* custom properties.

* reformat codes and author fix

* remove customEnvironment to nacos-core and Complete test

* add license

* pmd fix

* code optimization

* conflict fix
2022-11-04 15:24:25 +08:00
Maksim-lk
c8c64a1c52
fix ClientWorker NullPointer judement order (#9461) 2022-11-04 14:14:23 +08:00
毛文超
82c2deae6c
[ISSUE #8622] sub pr of 9356 - config and naming module (#9455)
* [ISSUE #8622] resolve conflict

* [ISSUE #8622] fix unit test error
2022-11-04 14:03:51 +08:00
毛文超
46e6318809
[ISSUE #8622] sub pr of 9356 - logging module (#9450)
* [ISSUE #8622] sub pr of 9356 - logging module

- Replace system.getProperties and system.getEnv with  NacosClientProperties
- log4j and logback support reading properties from NacosClientProperties

relate #9356

* [ISSUE #8622] add unit tests for logging
2022-11-04 14:01:43 +08:00
李晓双 Li Xiao Shuang
e8d71359d3
Modify the method modifier of NacosApplicationListener to default (#9460) 2022-11-04 13:54:06 +08:00
The-Gamer-01
0aeb2bd2cc
[ISSUE #9449]Add Tenant Information mapper. (#9454) 2022-11-03 13:58:21 +08:00
毛文超
bd2b026bb4
[ISSUE #8622] sub pr of 9356 - util module (#9453)
- Replace system.getProperties and system.getEnv with NacosClientProperties

relate #9356
2022-11-03 13:54:41 +08:00
毛文超
645cd4a69a
[ISSUE #8622] sub pr of 9356 - auth module (#9447)
* [ISSUE #8622] sub pr of 9356 - auth module

- Replace system.getProperties and system.getEnv with  NacosClientProperties
- remove address server controller IT

relate #9356

* [ISSUE #8622] rollback about app name

* [ISSUE #8622] remove unused import

* [ISSUE #8622] retry ci
2022-11-03 13:48:59 +08:00
忆年
2d2b100507
Update NameSpaceList.js (#9436)
修复样式,存在多行 namespace后,显示不全。
2022-11-03 13:45:51 +08:00
Weizhan Yun
506bc26f4d
[ISSUE #9393] 设置线程为守护线程,保证在main线程推出时应用程序能过正常关闭。 (#9396)
* 设置线程为守护线程,保证在main线程退出时应用程序能过正常关闭。

* graceful shutdown naming executetask engine.
2022-11-03 13:44:00 +08:00
Weizhan Yun
c3c7e1ba1c
[ISSUE #9367] fix auth plugin's property 'token.secret.key' base64 decode error. (#9380)
* 1. 修复密钥编码问题--为了避免歧义,密钥必须为base64编码的字符串;不再支持原始明文密钥。
2. JwtParser是线程安全的,重构为成员变量。

* 配置项保持明文字符串
2022-11-03 13:40:26 +08:00
无处不在
98f7066519
[ISSUE #9423] ExternalDataSourceProperties add isEmpty check to support external config (#9439)
* [conf]Update group_id length from 255 to 128

* [impr]修改外部数据源加载驱动名称判断逻辑,外部配置为空时,才设置为默认mysql配置

* [impr]修改外部数据源加载驱动名称判断逻辑,外部配置为空时,才设置为默认mysql配置

* [impr]修改变量名称,确保CI可以通过
2022-11-02 14:14:29 +08:00
liuchen6
0a8027641e
[ISSUE #9414] Optimize fuzzy queries to make SQL more general (#9428) 2022-10-31 14:01:18 +08:00
Karson
2596ff346c
optimize InstancesChangeNotifier. (#9416) 2022-10-31 11:07:34 +08:00
Maksim-lk
3ee357295b
fix NotifySubscriberRequest name (#9417) 2022-10-31 11:06:20 +08:00
陈浩 Nineteen
afa73fd4a3
fix batch Deregister Common (#9419) 2022-10-31 11:04:46 +08:00
杨翊 SionYang
c5a20d1e97
Upgrade to 2.2.0-beta. (#9413) 2022-10-28 15:09:50 +08:00
无处不在
4a305f6584
[conf]Update group_id length from 255 to 128 (#9412) 2022-10-28 10:51:45 +08:00
杨翊 SionYang
a2f4595899
Merge pull request #9411 from alibaba/2.2.0
Upgrade To 2.2.0
2022-10-27 16:29:00 +08:00
KomachiSion
68d7f042d1 Fix update config info cas error. 2022-10-27 14:08:11 +08:00
KomachiSion
f56dedc7fe Fix sync connection client not removed. 2022-10-27 12:11:06 +08:00
KomachiSion
0428fe98a3 Make default naming async query subscribe as false. 2022-10-26 16:51:01 +08:00
The-Gamer-01
af897bc656
[ISSUE #8312]Fix Persist Service Implementation。 (#9395) 2022-10-25 22:24:37 +08:00
杨翊 SionYang
0293af3329
Remove upd and beat codes in nacos-client. (#9394) 2022-10-25 17:22:47 +08:00
杨翊 SionYang
a0816b5534
Merge pull request #9390 from alibaba/asoc2022_issue#8461
Merge Asoc2022#8461 into 2.2.0
2022-10-25 15:45:50 +08:00
KomachiSion
8410fbccf3 Merge remote-tracking branch 'upstream/2.2.0' into asoc2022_issue#8461
# Conflicts:
#	config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigController.java
2022-10-25 14:52:32 +08:00
杨翊 SionYang
ee79d1b060
Merge pull request #9389 from alibaba/2.2.0-summer2022#8312
Merge summer2022#8312 into 2.2
2022-10-25 14:32:23 +08:00
KomachiSion
7c36c36201 Fix checkstyle. 2022-10-25 14:31:15 +08:00
李晓双 Li Xiao Shuang
284acbfd02
[ISSUE #8312] Fixed some problems with configuration sql (#9388)
* fix sql

* fix history sql

* fix clone sql

* fix beta sql
2022-10-25 13:02:13 +08:00
Liu Yixiao
03345fd923
[ISSUE #8461] Enhance Nacos monitor observability system (#9038)
* Enhance MetricsMonitor with several new metrics

* Add config read and write rt

* Add ServiceEvent publisher queue size

* Add fuzzy search count

* Add naming subscriber and publisher count with v1 or v2 version tag

* Add config subscriber count with v1 or v2 version tag

* Add pending push task count and empty push count metrics

* collect pending push task count by scheduled task

* add unit test for increment metrics in NacosMonitorPushResultHook

* Add topn counter container and topn config change

* Create private MeterRegistry for config change

* Add scheduled clear for config change count, add removeAll for TopnCounterMetricsContainer

* Add topn service change

* Reconstruct metrics monitor with NacosMeterRegistryCenter.

* divide globalRegistry to different modules' CompositeMeterRegistry

* Add dynamic meters refresh service for config and naming module

* fix unit test

* Add try catch when init NacosMeterRegistryCenter
2022-10-25 11:31:29 +08:00
李晓双 Li Xiao Shuang
97ca821cee
fix sql (#9386) 2022-10-25 00:58:34 +08:00
The-Gamer-01
7a4897830b
[ISSUE #8312]Merge sql. (#9385)
* [ISSUE #8312]Merge sql.

* [ISSUE #8312]Fix bugs.
2022-10-24 23:07:05 +08:00
KomachiSion
469c43dddc Add console default resource server.port as 8848. 2022-10-24 20:06:53 +08:00
KomachiSion
3cf00c7ccb Fix some derby datasource plugin sql problem. 2022-10-24 19:53:44 +08:00
杨翊 SionYang
b637b63bd8
Merge pull request #9381 from KomachiSion/2.2.0-summer#8312
Merge summer#8312 into 2.2.0
2022-10-24 16:12:12 +08:00
KomachiSion
3863ede017 Change datasource plugin version as revision. 2022-10-24 16:09:50 +08:00
KomachiSion
696d489423 Merge remote-tracking branch 'upstream/2.2.0' into 2.2.0-summer#8312
# Conflicts:
#	plugin/pom.xml
2022-10-24 15:37:47 +08:00
The-Gamer-01
398959d931 [ISSUE #8312]Finish the datasource plugin. (#9226)
* [ISSUE #8312]Finish the datasource plugin.

* [ISSUE #8312]Update derby PersistService impl.
2022-10-24 15:34:40 +08:00
The-Gamer-01
a8d63609f2 [ISSUE #8312]Finish all mappers. (#9199)
* [ISSUE #8312]Finish all mappers.

* [ISSUE #8312]Fix some bugs about mapper.
2022-10-24 15:34:39 +08:00
The-Gamer-01
6a871b316f [ISSUE #8312]Update the mappers. (#9190)
* [ISSUE #8312]Update the mappers.

* [ISSUE #8312]Update derby mappers.
2022-10-24 15:34:38 +08:00
The-Gamer-01
6416e217a8 [ISSUE #8312]Update the ConfigInfoMapperByMySql and some derby mappers. (#9181) 2022-10-24 15:34:37 +08:00
The-Gamer-01
56c2a5954c [ISSUE #8312]Update the mappers. (#9171) 2022-10-24 15:34:35 +08:00
The-Gamer-01
30a9431bfc [ISSUE #8312]Update the mysql implementation of ConfigInfoAggrMapper and ConfigInfoBetaMapper. (#9159) 2022-10-24 15:34:35 +08:00
The-Gamer-01
77eb1915c9 [ISSUE #8312]Update all mapper. (#9145) 2022-10-24 15:34:33 +08:00
The-Gamer-01
0432b95c12 [ISSUE #8312] Add more mapper. (#9119)
* [ISSUE #8312] Create ConfigInfoTagMapper, HisConfigInfoMapper and TenantInfoMapper.

* [ISSUE #8312] Add more mapper.

* [ISSUE #8312]Let mappers extend Mapper.
2022-10-24 15:34:32 +08:00
The-Gamer-01
f44b28461a [ISSUE #8312] Create ConfigInfoBetaMapper.(#8312) (#9118) 2022-10-24 15:34:30 +08:00