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

865 Commits

Author SHA1 Message Date
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
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
karsonto
8d75c28151 resolve issue #9175 add ldap filter config 2022-09-20 11:56:44 +08:00
DongYafei
02b7280b69
[fix] rename ConfigVo, ConfigRequestInfoVo and NamespaceVo to ConfigForm, ConfigRequestInfo and NamespaceForm respectively (#9077) 2022-09-05 17:38:32 +08:00
DongYafei
f9824c8acb
fix NacosApiException (#9059) 2022-09-01 10:06:43 +08:00
onewe
c505a3f1f5
set server.error.include-message to ALWAYS (#9045) 2022-08-30 10:21:29 +08:00
KomachiSion
976f8a6729 Remove some old properties. 2022-08-29 20:19:04 +08:00
DongYafei
429d2bb5ee
for #8308, add namespace api v2.0 (#9012) 
* Add NamespaceControllerV2 and UT

* add api [query namespace by namespaceId]
 2022-08-26 09:51:58 +08:00
yjqg6666
cb3c78b93b
[#344] rename initialization sql files (#8969) 2022-08-25 16:54:18 +08:00
DongYafei
0df376afd5
for issue#8308, add config and config history api v2.0 (#8953) 
* Add ConfigV2Controller and HistoryV2Controller

* fix ConfigControllerV2 and HistoryControllerV2

* fix ConfigControllerV2Test and HistoryControllerV2Test

* add ConfigService and HistoryService

* fix HistoryControllerV2 and HistoryControllerV2Test

* rename ConfigService to ConfigOperationService
 2022-08-22 09:37:40 +08:00
chenhao26
bdf9d04ead
remove namespaceShowName uniqueness check (#8989) 2022-08-18 11:11:52 +08:00
@xiaochangbai
8c43096171
optimize: internationalization of product description content on landing pages (#8956) 2022-08-15 10:09:06 +08:00
chenhao26
b9609b365f
add some junit test (#8966) 
* add some junit test

* fix some junit

* add license
 2022-08-15 10:08:28 +08:00
heimanba
8cede1cf84
refactor: 💡 update console-ui theme (#8951) 
✅ Closes: https://github.com/alibaba/nacos/issues/8950
 2022-08-11 21:40:54 +08:00
onewe
54a3b9ebe3
[ISSUE #8880] add a request exception handler (#8881) 
* [ISSUE #8880] add a request exception handler

Close #8880

* [ISSUE #8880] retry ci
 2022-08-05 14:55:19 +08:00
chenhao26
de5ec356cc
import config file auth fail (#8844) 
* import config file auth fail

* run ci

* run ci2
 2022-08-01 16:48:55 +08:00
onewe
29d472e94a
[ISSUE #8784] fix some bugs for Console UI (#8787) 
* [ISSUE #8784] fix some bugs for Console UI

- add server.error.include-message property
- add no permission tip when push config
- use addAllowedOriginPattern instead of addAllowedOrigin
- remove RAM logic in the lib.js
- fix button type error and mode value error in NewConfig.js
- fix the password reset dialog can't show

Close #8784

* [ISSUE #8784] fix translate error

* [ISSUE #8784] user ON_PARAM instead of ALWAYS

* [ISSUE #8784] fix user reset password in the Header.js
 2022-07-25 09:56:20 +08:00
onewe
29b2fa4302
[ISSUE #8602] fix display error after delete current namespace (#8609) 
- fix some warnings, such as use rowProps instead of getRowProps etc
- MainLayout keeps namespace param

Close #8602
 2022-06-24 15:01:08 +08:00
Cherish 蔡梦缘
703925a84f
feat(#8472): [Dependency Governance] Remove useless dependencies. (#8472) (#8473) 2022-06-13 10:31:11 +08:00
onewe
b6db08bdd4
[ISSUE #8528] update server.tomcat.basedir default value (#8529) 
Close #8528
 2022-06-07 15:22:16 +08:00
onewe
d6f27409a6
[ISSUES #8417] throw a HttpSessionRequiredException when sessions expired (#8419) 
* [ISSUE #8417] throw a HttpSessionRequiredException when sessions expired

* [ISSUE #8417] add unit test

* [ISSUE #8417] repackage

Close #8417

* [ISSUE #8417] retry ci

* [ISSUE #8417] retry ci
 2022-05-23 15:17:51 +08:00
onewe
5926c67062
[ISSUE #8150] Add the namespace description item to the namespace list page (#8155) 
* [ISSUE #8150] Add the namespace description item to the namespace list page

Close #8150

* [ISSUE #8150] resolve conflict

Close #8150

* [ISSUE #8150] Rebuild console-ui
 2022-04-29 11:36:07 +08:00
onewe
eda178f27b
[ISSUE #8217] Rebuild console-ui (#8224) 
Close #8217
 2022-04-22 15:40:40 +08:00
onewe
af90533c8e
[ISSUE #8156] Add hash-tag for js and css (#8157) 
* [ISSUE #8156] Add hash-tag for js and css

- add index.html to copyList
- use index.ejs instead of index.html
- webpack enable hash

Close #8156

* [ISSUE #8156] Fix context-path error in development environment

Close #8156
 2022-04-20 10:20:26 +08:00
onewe
19185cb338
[ISSUE #8161] Icon-font-path and font-custom-path use relative path instead of absolute path (#8172) 
- banner.txt use `server.servlet.contextPath` instead of nacos

Close #8161
 2022-04-18 11:27:39 +08:00
Karson
fa09c65a30
Fix issue #7924 (#8062) 
* Fix issue#7924

* reformat code style
 2022-04-11 10:29:45 +08:00
杨翊 SionYang
9fbc7a1426
Keep actuator default close. (#8103) 2022-04-08 13:00:57 +08:00