Commit Graph

4494 Commits

Author SHA1 Message Date
WangLiang/王良
6ba05fa7a8
Replace flatten-maven-plugin with easyj-maven-plugin (#9985)
* Replace `flatten-maven-plugin` with `easyj-maven-plugin`

* revert indent

* apache-rat-plugin exclude `.flattened-pom.xml`

* fix style

* optimize github action

* optimize github action

* fix dependencies

* upgrade easyj-maven-plugin to 1.1.5

* optimize github action

* optimize spring-boot-maven-plugin configuration
2023-03-02 10:43:08 +08:00
ZhangShenao
d5bbe9ebfd
[ISSUE #10020] Use Generic Type When Declaring authFilterRegistration in com.alibaba.nacos.core.auth.AuthConfig (#10021)
* code optimization for `ConfigChangeHandler`

* [ISSUE #9930] fix word spelling error in com.alibaba.nacos.common.http.AbstractHttpClientFactory#ASYNC_IO_REACTOR_NAME

* [ISSUE #10020] Use Generic Type When Declaring `authFilterRegistration` in com.alibaba.nacos.core.auth.AuthConfig

* fix code format

* fix code format

* Fix Code Format

* Fix Code Format
2023-03-02 10:18:12 +08:00
毛文超
ec9e281f16
[ISSUES #10029] optimize SearchableProperties building code (#10030)
Close #10029
2023-03-02 10:08:52 +08:00
WangLiang/王良
a397c10a54
Optimize the nacos-client/pom.xml for exclude google/**/*.proto (#9982)
* Optimize the pom.xml of the nacos-client

* optimize pom

* exclude `google/**/*.proto`

* tab

* Remove dependency `io.grpc:protoc-gen-grpc-java:${version}:pom`

* revert indent

* revert native-image
2023-03-01 09:42:15 +08:00
chenyiqin
5a8f6f5f6a
Fix cluster node state error (#10011)
* Fix cluster node state error

* Fix checkstyle
2023-03-01 09:40:30 +08:00
云野
aebe583049
fix #9954 -- timeunit. (#10004) 2023-02-27 10:54:33 +08:00
毛文超
7ca8c59580
[ISSUE #9448] use local font files (#9995)
- add some font files to local path

Close #9448
2023-02-23 14:20:53 +08:00
胡俊
579571ceb3
[ISSUE #9860] abstract the nacos logback configurator to solve the problem between different version (#9934)
* logback update

* update comment

* ident update

* comment update

* judge version

* remove logback-adapter
2023-02-22 11:20:46 +08:00
XS
4242fc626a
fix LDAP login failed (#9932)
*  fix LDAP login failed
 fix LDAP AD login Ignore partial result exception

* 🎨 checkstyle reformat
2023-02-22 11:18:47 +08:00
t8g
90bfe0af9e
Fixed some minor bugs in CollectionUtils.java (#9989)
* fix:CollectionUtils下for循环中的字符串拼接改用StringBuilder

* fix:The LinkedHashSet in CollectionUtils.java lacks a generic

* docs:a is used before a consonant; an is used before a vowel
2023-02-22 11:17:36 +08:00
杨翊 SionYang
c04b0bbb44
Remove the default token.secret.key (#9992) 2023-02-22 10:52:13 +08:00
zhanghong
a6332b250d
[ISSUE #9276] 新增根据配置信息检索内容的功能 (#9925)
* 新增根据配置信息检索内容的功能

* use offer replace add

* use offer replace add

* use offer replace add

* update exception type and  limit some config as configurable

* update

* update params

* update params

* update params
2023-02-21 10:25:19 +08:00
贾璞
67d5acc892
[ISSUE #9965] Delete method getRemoteIp() from class NacosHttpTpsCont... (#9966)
* [ISSUE #9965] Delete method getRemoteIp() from class NacosHttpTpsControlInterceptor

* [ISSUE #9965] Supplementary deletes three extra strings
2023-02-20 10:29:16 +08:00
The-Gamer-01
d16023c156
[ISSUE #9821] Update ConfigInfoBetaMapper data-source-plugin input and output parameters (#9967)
* Add MapperContext and MapperResult.

* Update ConfigInfoAggrMapper by MapperContext and MapperResult.

Update ConfigInfoAggrMapper by MapperContext and MapperResult.

* resolve git conflicts.

* Added Map mapping refinement corresponding to UPDATE and WHERE.

* [ISSUE #9821] Fix API of return class of ConfigInfoAggrMapper.

* [ISSUE #9821] Update ConfigInfoBetaMapper data-source-plugin input and output parameters
2023-02-20 10:04:10 +08:00
hth
4e78a769e5
replaced report API to Grpc (#9976) 2023-02-20 09:55:34 +08:00
杨翊 SionYang
9ebf5aeade
Judge the message whether null for metadata processor. (#9951) 2023-02-15 10:39:39 +08:00
githubcheng2978
e736455713
display the namespace on add,edit,detail configuration page #(9827) (#9845)
* display the namespace on add,edit,detail configuration page and resolve junit test problem #(9827)

* delete duplicate UT code

---------

Co-authored-by: githubcheng2978 <yeliang.cheng@freemud.com>
2023-02-14 17:23:17 +08:00
Karson
0c9f08130e
[Enhancement] Add prometheus api exception handling (#9885)
* add prometheus api exceptionHandler and ut.

* fix style issue.

* return failure status。

* add it case.

* enhance exception handler

* enhance exception handler

* fix IT problem.

* delete it test
2023-02-13 14:57:00 +08:00
ZhangShenao
815197cdf1
[ISSUE #9930] fix word spelling error in com.alibaba.nacos.common.http.AbstractHttpClientFactory#ASYNC_IO_REACTOR_NAME (#9931)
* code optimization for `ConfigChangeHandler`

* [ISSUE #9930] fix word spelling error in com.alibaba.nacos.common.http.AbstractHttpClientFactory#ASYNC_IO_REACTOR_NAME
2023-02-13 09:45:59 +08:00
MajorHe1
5a8c567633
[ISSUE #9906] cache token to improve performance (#9914)
* [ISSUE #9906] cache token to improve performance

* [ISSUE #9906] add cache token enable switch to application.properties

* [ISSUE #9906] update javadoc

* [ISSUE #9906] update javadoc

* [ISSUE #9906] update unit test

* [ISSUE #9906] make ci rerun
2023-02-10 10:51:05 +08:00
The-Gamer-01
1ff7a3f6bd
[ISSUE #9821] Update data-source-plugin input and output parameters (#9851)
* Add MapperContext and MapperResult.

* Update ConfigInfoAggrMapper by MapperContext and MapperResult.

Update ConfigInfoAggrMapper by MapperContext and MapperResult.

* resolve git conflicts.
2023-02-10 09:45:14 +08:00
ZhangShenao
882c6edb64
code optimization for ConfigChangeHandler (#9923) 2023-02-10 09:41:04 +08:00
杨翊 SionYang
2faa5b58d0
Add Unit test for api module naming package. (#9918) 2023-02-08 15:55:41 +08:00
杨翊 SionYang
1ef245d058
Add Unit test for api naming remote request. (#9916)
* Add Unit test for api naming remote request.

* For checkstyle.
2023-02-08 13:30:38 +08:00
vivid
4e08d61c4a
[ISSUE #9710]prometheus-sd support basic auth. (#9912)
* [ISSUE #9710]prometheus-sd support basic auth.

* [ISSUE #9710]prometheus-sd support basic auth.
2023-02-08 11:23:43 +08:00
MajorHe1
30954dc612
[ISSUE #9816] check expected final state before remove redo data. (#9907)
* [ISSUE #9816] check expected final state before remove redo data.

* check expected final state before remove subscriber redo data.

* update NamingGrpcRedoServiceTest when test remove

* update NamingGrpcRedoService, set expect register status to false when subscribers deregister
2023-02-08 09:38:37 +08:00
杨翊 SionYang
428e0bc668
Develop add unit test api (#9910)
* Add some unit test for api.

* Add Unit test for api.naming.utils.

* Add Unit test for api.naming.ability.

* Add Unit test for some pojo.

* Add Unit test for naming.pojo.

* For checkstyle.
2023-02-07 17:05:35 +08:00
云野
98d3da4a48
fix typo 'curcuit';remove unused variable. (#9901) 2023-02-07 10:24:14 +08:00
陈浩 Nineteen
8c90f892b4
fix batchRegister authentication (#9899) 2023-02-05 16:06:53 +08:00
liu-xg
65da789215
fix(修复配置历史分页异常): 配置历史分页异常,所有页都是全部记录 (#9828)
* fix(修复配置历史分页异常): 配置历史分页异常,所有页都是全部记录

* fix(修复配置历史分页异常): 修复代码格式不满足nacos要求

* fix(修复配置历史分页异常): 修复代码格式不满足nacos要求
2023-02-03 15:41:13 +08:00
Frank Zhao
a1c7defa19
Update README.md (#9895)
Add contribution leaderboard badge into README file.

Signed-off-by: frank-zsy <syzhao1988@126.com>
2023-02-03 15:39:25 +08:00
云野
42b28f9bc0
[ISSUE #9859] 重构默认插件的登陆/鉴权逻辑 (#9889)
* refactor auth logic;fix conflict

* update unit test.
2023-02-03 14:47:06 +08:00
陈浩 Nineteen
35b98841ab
del no use code (#9892)
* del no use code

* check style
2023-02-03 14:31:14 +08:00
杨翊 SionYang
4db3e8c28f
[ISSUE #9816] Add expected final state for redo data. (#9893)
* Fix #9816, add expected final state to make redo task execute right finally.

* Upgrade version to 2.2.1-SNAPSHOT.
2023-02-03 14:13:08 +08:00
云野
71389b0f56
add feature -- list instance record which enabled was false (#9855) 2023-02-02 10:50:16 +08:00
云野
ade3f8295f
[ISSUE #9859]使用自定义的JWT生成/验证方法,而不依赖于jjwt. (#9873)
* 使用自定义jwt生成

* add unit test; fix log msg.

* add license
2023-02-02 10:47:27 +08:00
杨翊 SionYang
986c024ccc
Fix Unit test problem. (#9884) 2023-02-01 14:02:00 +08:00
杨翊 SionYang
fee349b667
Fix #9861, auth check before distro filter. (#9871) 2023-01-28 11:11:29 +08:00
云野
332dc1d348
fix #9819 (#9850) 2023-01-28 10:35:57 +08:00
xzxiaoshan
41f03fea0f
[ISSUE#9730] 对多数据源插件代码进行调整(向前兼容) (#9784)
* Upgrade to 2.2.1-RC (#9741)

* 补充处理所有 tenantId

* 补充处理 tenantId

* 处理tenantid,内部类引用的变量不能被修改,换个变量名

* 新增支持:nacos 默认的 tenant/namespaceId 为空字符串,自 nacos 2.2.0 版本起开始支持多数据源插件,为空的 ID 会在 oracle 数据库适配中出现问题 ( where tenantid = '' ),本次修改对以往程序不产生影响。

* 固定填充的ID为public,完全自定义没有太大意义,目的是在保证默认id不为空,可选填充,不配置默认照旧

* fix bug

* 将通用的SQL提取到Mapper接口中,这样能很大的降低不同数据库需要重写的SQL的量,同时避免了大量的重复代码问题。

* 将原来sql中固定写死的 tenant_id = ''  修改为 tenant_id =  NamespaceUtil.getNamespaceDefaultId() 。暂时没深究为什么不用问号动参而是固定写死。

* 方法提取到 mapper 接口中,顺便解决了多余 paramList 定义的(虽然这个方法好像已经弃用)

* 方法迁移到接口默认实现中

* 恢复 publci id 默认值为空值 "",等以后决策好使用默认值为 "public" 时,再设置 NAMESPACE_PUBLIC_ID_DEFAULT="public" 即可。

* 回滚 Controller 层对 tenant_id 的处理,另起PR讨论和修改。

* code style

* 变量名称和注释未通过 checkStyle 检查,按规范调整。

* nacos check style 修改,无代码变动

* fix code

* fix checkstyle

* fix checkstyle 去除多余的 return

* fix pmd

* fix test unit bug

* 因为将sql提取到 mapper 接口中,一些不影响sql语句运行的sql,有空格等差异,出现了test用例差异问题,逐个处理。比如(where a =? 和 where a= ?)

Co-authored-by: 杨翊 SionYang <xiweng.yy@alibaba-inc.com>
2023-01-16 16:14:29 +08:00
sixsixsix516
4fa126f7fc
Modify the return value comment of the isBasicInfoChanged method (#9849) 2023-01-16 14:02:50 +08:00
Karson
c8b04b03fa
[ISSUE #9783] 处理namespaceId=public 时 v2接口 无法创建与删除配置 (#9809)
* fix issue #9783

* fix issue #9783

* add it test for v2 config.

* fix ci problem.

* fix ci problem.

* fix ci problem.

* fix history process NamespaceParameter

* fix ci problem.

* add some unit test

* reformat code
2023-01-16 10:01:54 +08:00
胡俊
01faa47c76
快照首次加载失败问题 (#9838) 2023-01-13 10:36:57 +08:00
Karson
ba15e23362
fix issue #9795 (#9844) 2023-01-13 10:33:46 +08:00
云野
732e7012ab
Provide more configuration items to allow users to customize their grpc services to better optimize network performance. (#9806) 2023-01-11 09:47:15 +08:00
gongzhongqiang
708387c277
fix:replace nacos website url to https. (#9797) 2023-01-10 09:47:52 +08:00
MajorHe1
5ac56885a1
[#ISSUE 9733] return origin key if value is null in StringPool.get() (#9798) 2023-01-09 13:55:31 +08:00
云野
aa6ce2eadf
fix config auth failed. (#9807) 2023-01-09 13:16:01 +08:00
Weizhan Yun
1bc2e4185e
upgrade grpc-java version to 1.50.2, (#9799)
protobuf-java  to 3.21.11, proto-google-common-protos to 2.7.1
2023-01-05 17:27:56 +08:00
zz630
20145fd256
enhancement: CloseableHttpAsyncClient does not clean up expired and i… (#9727)
* enhancement: CloseableHttpAsyncClient does not clean up expired and invalid connections (#9708)

* enhancement: CloseableHttpAsyncClient does not clean up expired and invalid connections (#9708)

* style:satisfy style/NacosCheckStyle.xml

* add unit test(#9708)

* Revert "add unit test(#9708)"

This reverts commit 939905cb56f30af4d0ec35543d6d630f0777eb98.

* add unit test
2023-01-05 10:04:27 +08:00