zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,629 Commits 2 Branches 3 Tags 58 MiB
4095d172d0
Commit Graph

890 Commits

Author SHA1 Message Date
Darren Luo
4095d172d0
替换 yamljs 为 js-yaml 进行 yaml 格式校验，处理 yaml 同 key 不报错的问题 (#10647) 
* 替换 yamljs 为 js-yaml 进行 yaml 格式校验，处理 yaml 同 key 不报错的问题

* 听说要build一下
 2023-06-19 10:44:32 +08:00
Karson
780e2f570a
add ldap config (#10608) 2023-06-07 13:28:47 +08:00
chenyiqin
8cd5a5ea0b
Add the validation for namespace name (#10520) 
* add the validation for namespace name

* move the validation action to controller

* fix checkstyle

* add the check for namespaceId when creating

* fix checkstyle

* add UT for namespace controller

* remove unnecessary mock

* fix checkstyle

* fix checkstyle
 2023-05-23 10:23:08 +08:00
KomachiSion
131dc643b3 Merge remote-tracking branch 'upstream/develop' into asoc2022_issue#8460-2 
# Conflicts:
#	persistence/src/test/java/com/alibaba/nacos/persistence/configuration/condition/ConfigChangeConfigsTest.java
 2023-05-11 15:41:17 +08:00
KomachiSion
0555619b05 Merge remote-tracking branch 'upstream/develop' into develop#10361 
# Conflicts:
#	config/src/main/java/com/alibaba/nacos/config/server/constant/Constants.java
 2023-05-09 15:50:12 +08:00
KomachiSion
c701689314 Fix -f config still can see naming console problem. 2023-05-09 15:46:35 +08:00
KomachiSion
607074c877 Make HealthController not strongly depend config and naming module. 2023-05-09 14:43:25 +08:00
KomachiSion
9d92b5122a Add NamespaceDetailInjector and move NamespaceOperationService to core module. 2023-05-09 10:05:26 +08:00
KomachiSion
e93d417de6 Move CommonPersistService impls to core module and rename to NamespacePersistService. 2023-05-08 20:42:29 +08:00
KomachiSion
515ae912b2 Move some TenantInfo and NamespaceRowMapperInjector to core module. 2023-05-08 20:29:53 +08:00
zhanghong
5cf5829253
add configModuleState/raftModuleState/distroModuleState in branch develop#10153 (#10288) 
* add configModuleState/raftModuleState/distroModuleState

* add configModuleState/raftModuleState/distroModuleState

* update TEST

* 修复test bug

* 移除ip暴露风险
 2023-05-08 18:05:34 +08:00
KomachiSion
11fc4792c4 Move namespace module to core module. 2023-04-23 16:41:43 +08:00
KomachiSion
aa6144aa80 Use Namespace.java replace NamespaceAllInfo.java 2023-04-23 16:38:47 +08:00
KomachiSion
f83061f47d Move some datasource and relative classes into persistence module. 2023-04-23 16:00:42 +08:00
zhanghong
1c97d715eb
[ISSUE #10318]fix import bug (#10319) 
* fix import bug

* fix import bug
 2023-04-14 14:43:37 +08:00
杨翊 SionYang
250f5c3708
Build console main.js. (#10264) 2023-04-03 16:29:28 +08:00
杨翊 SionYang
5fffde5bde
[ISSUE#10153] Add auth state into /state api and add announcement api. (#10203) 
* Add ModuleState and use ModuleState replace ServerStateController.

* Add AuthModuleStateBuilder

* state接口使用ModuleState.

* Add announcement api.

* skip rat scan for announcement.conf

* default plugin open login page when auth.enabled=true.
 2023-03-27 19:00:22 +08:00
杨翊 SionYang
cdd2be65af
Remove identity default value. (#10108) 2023-03-16 11:08:33 +08:00
杨翊 SionYang
bff133f8f4
Re build console ui. (#10083) 2023-03-13 18:06:19 +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
毛文超
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
杨翊 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
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
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
李云飞
d45ba449ca
[ISSUE #8460]add config change plugin (#9820) 2023-01-16 10:04:24 +08:00
Karson
ba15e23362
fix issue #9795 (#9844) 2023-01-13 10:33:46 +08:00
gongzhongqiang
708387c277
fix:replace nacos website url to https. (#9797) 2023-01-10 09:47:52 +08:00
杨翊 SionYang
f093002e8c
Fix namespace v2 api auth not work problem. (#9754) 2022-12-27 14:03:53 +08:00
陈浩 Nineteen
a7a5ced21a
fix no dataSet when nacos server started (#9677) 
* Close Comment

* runci

* check style
 2022-12-08 15:18:21 +08:00
杨翊 SionYang
dfcdd391af
Add auth for some v2 api. (#9671) 2022-12-08 10:31:32 +08:00
杨翊 SionYang
528574de75
Upgrade ui dependencies to fix some depend vulnerability. (#9652) 
* Upgrade ui dependencies to fix some depend vulnerability.

* Upgrade ui dependencies to fix some depend vulnerability.
 2022-12-06 20:21:31 +08:00
zhanghong
ccf24a9297
[ISSUE #9471] 更新搜索参数不会重置 (#9649) 
* 更新搜索信息不会重置

* fix some console-ui build warning

* 维持historyRollback页面的搜索项不被清空
 2022-12-06 16:45:01 +08:00
nov.lzf
acc8ab46cf
Refactor connection limit module to plugin (#9653) 
* 限流插件提交

* 限流插件提交

* 限流插件提交

* 限流插件重构提交

* connection control test case submit

* tps control test case submit

* tps control test case submit

* tps control test case submit

* exact model has higher priority

* exact model has higher priority

* tpsreporter

* tpsreporter

* tpsreporter

* check style

* log optimize

* interceptor

* checkstyle

* tps check

* configController query http

* rename component

* 优化参数命名

* 优化参数命名

* 优化参数命名

* 优化参数命名

* optimize connection manager

* optimize connection manager

* optimize connection manager

* optimize connection manager

* interceptor to mse

* Monitor Model

* Monitor Model

* revert opensource tps ability

* revert opensource tps ability

* revert opensource tps ability

* revert opensource tps ability

* revert opensource tps ability

* revert opensource tps ability

* opensource submit

* opensource submit

* check style

* check style

* pmd ,rat

* update db params

* test case fix

* 简化开源反脆弱实现

* test case

* test  case fix

* 修复单测

* 修复单测

* 修复单测
 2022-12-06 16:15:51 +08:00
zhanghong
2d317227b3
[ISSUE #9655] fix ExceptionHandler order bug (#9657) 
* fix #9655 ExceptionHandler order bug

* Change GlobalExceptionHandler order
 2022-12-03 19:24:39 +08:00
李晓双 Li Xiao Shuang
ba37d63ad4
[ISSUE #9571] Replace PersistService (#9583) 
* replace PersistService

* replace PersistService

* fix test
 2022-11-18 11:08:18 +08:00
Karson
4bd5b7c85a
support prometheus sd (#9518) 2022-11-17 11:13:51 +08:00
The-Gamer-01
b14cc257bf
[ISSUE #9510]Add sql log print function. (#9511) 
* [ISSUE #9510]Add sql log print function.

* [ISSUE #9510]Remove AspectJ and add sql proxy.

* [ISSUE #9510]Update data source plugin log.

* [ISSUE #9510]Update args log.

* [ISSUE #9510]Add unit test.
 2022-11-11 11:28:22 +08:00
李晓双 Li Xiao Shuang
0348014c17
[ISSUE #9490] Optimize datasource name configuration reading (#9491) 
* Optimize data source name configuration reading

* Optimize data source name configuration reading

* Compatible with old and new datasource platform read

* Compatible with old and new datasource platform read

* Compatible with old and new datasource platform read

* Compatible with old and new datasource platform read

* fix unit test

* fix unit test
 2022-11-08 09:22:33 +08:00
David-wu91
e5bbfe704d
resolve issue #9318 add ldap filter config:caseSensitive (#9444) 
* resolve issue #9318 add ldap filter config:caseSensitive

* resolve issue #9318 change code style

* resolve issue #9318 add unit test
 2022-11-07 17:24:53 +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
KomachiSion
469c43dddc Add console default resource server.port as 8848. 2022-10-24 20:06:53 +08:00
KomachiSion
f4438ac202 Follow 2.2.0 branch. 2022-10-21 15:33:04 +08:00
KomachiSion
aa6816b69f Merge remote-tracking branch 'upstream/2.2.0' into summer2022_issue#8308 
# Conflicts:
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/v2/InstanceControllerV2.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/v2/ServiceControllerV2.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/UtilsAndCommons.java
 2022-10-21 14:16:18 +08:00
KomachiSion
22169055ed Merge remote-tracking branch 'upstream/develop' into 2.2.0 
# Conflicts:
#	naming/src/main/java/com/alibaba/nacos/naming/core/Cluster.java
 2022-10-17 19:17:31 +08:00
zhouchunhai
3ca75cdc7f
fix bug #9263, lost page condition in configuration management page. (#9290) 2022-10-11 09:24:31 +08:00
DongYafei
94d812a269
fix api result (#9237) 2022-09-29 10:39:23 +08:00
zhouchunhai
1d8e5d9443
Feature #8941 Support Fuzzy Query in Authority Control--for ui change. (#9127) 2022-09-26 10:33:45 +08:00
阿魁
9a474a0ec5
Fix wrong and duplicate mysql connection configuration. (#9208) 2022-09-26 10:08:37 +08:00
DongYafei
0032b8cfc1
Add ClientInfoControllerV2 (#9197) 
* add ClientInfoControllerV2

* rename tenant to namespaceId
 2022-09-23 14:11:59 +08:00