Commit Graph

478 Commits

Author SHA1 Message Date
wjm0729
4da3c82895
优化 FileTypeEnum 取值逻辑, 避免使用异常当作逻辑分支 (#4607)
* 优化 FileTypeEnum 取值逻辑, 避免使用异常当作逻辑分支
异常的代价是很大的, 非必要情况下. 应该尽量避免

* comment

* comment

* license
2020-12-31 15:50:07 +08:00
mai.jh
2af6784f55
for #4594,#4594 Fix IO close problem. (#4606) 2020-12-31 15:48:26 +08:00
haoyann
dd854e3b49
fix cluster mode query config type is null (#4579) 2020-12-28 09:48:11 +08:00
haoyann
1bc350b99a
fix derbyOps interface security problem (#4517) 2020-12-21 09:55:49 +08:00
Brent
b8b57dc980
fix: 修复参数类型注释及单词拼写错误 (#4419) 2020-12-07 19:42:05 +08:00
mai.jh
f78bef9665
[ISSUE-#4333]Add MapRowMapper to RowMapperManager (#4334)
* for #4311,Fixed Derby data source related SQL LIMIT exception.

* Revert "for #4311,Fixed Derby data source related SQL LIMIT exception."

This reverts commit 49188f14

* fix #4333.

* Remove case conversion.
2020-11-27 10:10:11 +08:00
mai.jh
3bf8844992
[ISSUE #4311] Fix Derby data source related SQL LIMIT exception (#4313)
* for #4311,Fixed Derby data source related SQL LIMIT exception.

* fix code style.

* code format.
2020-11-24 13:21:15 +08:00
赵延
7f2a3307d6
[ISSUE-#4256] Just inject environment in StartingSpringApplicationRunListener (#4257)
* just inject environment in StartingSpringApplicationRunListener

* make nacosStartingListener is decoupling with springApplicationRunListener.

* add api doc

* refactor. transfer nacos listeners to SpringApplicationRunListener.

* remove unuseful import

* add doc info
2020-11-24 11:17:13 +08:00
zhuhao
b7b7b1975f
refactor issue #4275 (#4299) 2020-11-23 13:50:14 +08:00
赵延
8500279c79
[ISSUE-#4294] Use EnvUtils.setEnvironment to replace ApplicationUtils.injectEnvironment (#4295)
* use EnvUtils.setEnvironment to replace ApplicationUtils.injectEnvironment.

* remove unuseful import

* remove unuseful import
2020-11-21 19:03:51 +08:00
赵延
886715b2d7
[ISSUE-#4232] Use EnvUtil to replace ApplicationUtils about env operation (#4281)
* use EnvUtil to replace ApplicationUtils about env operation

* remove unuse import

* remove unuse import

* remove profile usage
2020-11-21 06:54:05 +08:00
赵延
ba9ed8e736
[ISSUE-#4262] Fix public namespace permission problem (#4273)
* fix public namespace permission problem

* move NamespaceUtilTest to common module
2020-11-20 20:00:57 +08:00
paderlol
501b1e73e4
Fix sql injection bug (#4245)
* Fix sql injection bug

* Fix checkstyle issue
2020-11-18 09:23:48 +08:00
liaochuntao
bcd62d5574
Refactor issue 4228 (#4229)
* refactor: adjusts conformance protocol layer objects

* feat: repair problems

* refactor: reafctor consistency model
2020-11-16 09:58:52 +08:00
蚊子猫
3e33851d17
[ISSUE #3102] remove lang dependency. (#4202)
* add commons-lang3 dependency into core and sys, prepare to remove lang/lang3 dependency in common/api/client.

Change-Id: I4b7a0bec09359e64ecf997b123b85c265bfe16cf

* remove lang dependency.

Change-Id: I5cbd811babc8269a54b93e278ad6e5e2663c8427
2020-11-11 19:50:45 +08:00
杨翊 SionYang
6b7fb05601
For #3607, #4078, #4170, Datasource pool configuration can be configured. (#4178)
* For #3607, #4078, #4170, Datasource pool configuration.

* Fix ci error.
2020-11-09 20:18:27 +08:00
赵延
39a2f20d56
[ISSUE #3907] when publishConfig, if type is absent, set default value 'text' (#3915)
* when publishConfig, if type is absent, set default value 'text'

* 1.add publishConfig api(add param type)
2.check type is valid in nacos server
2020-11-09 11:36:50 +08:00
邪影oO
538509502f
IPv6 support (#3773)
* IPv6 support

* AddressServerParamCheckUtil 合并到 IpUtil 及一些修改

* 解决魔法值

* 修改隐患

* 调整使用了类似 ip.indexOf(":") 查找是否有端口的地方的逻辑, 一些 ":" 替换为常量

* 删除无用测试

* IpUtil 改名 为 IPUtil, 涉及IP的相关方法名修改,涉及到的调用修改,检测IP的地方调用的isIPv4改为isIP. 修改涉及IP的字段长度及相关升级更新的sql

* no message

* no message

* no message

* no message

* 获取本机IP时,如果本机IP是IPv6并且包含网卡信息(V6地址中最后面的百分号和百分号后面的内容)则去除网卡信息

* 解决 AvoidComplexConditionRule(请不要在条件中使用复杂的表达式)

* 移除无用代码

* 添加注释

* 调整code style, 调整获取本机IP的逻辑
2020-11-05 20:15:06 +08:00
杨翊 SionYang
ccea6ee112
Upgrade to 1.4.1-SNAPSHOT (#4135) 2020-11-05 09:43:33 +08:00
KomachiSion
adbcb7549d Upgrade to 1.4.0 2020-11-02 19:09:19 +08:00
杨翊 SionYang
6eeeb76473
Develop fix jraft null datum (#4048)
* Fix old raft sync null datum problem

* Fix TimerContext NPE problem
2020-10-22 15:40:00 +08:00
jiang
6df2b229d0
[ISSUE-#3855] Provided a feature to view version comparisons in the configDetails page (#3988)
* add detail previous config history api

* modify the previous config history url

* modify log description

* 详情页面添加“历史对比”按钮,点击可打开对比面板

* 点击“历史对比”按钮,获取上一版本数据

* 在查看历史对比的时候 不显示revert按钮

* append doc info

* Add unit tests for ISSUE#3855

* Add the previous updates to main.js and main.css

Co-authored-by: 赵延 <1060026287@qq.com>
2020-10-19 09:29:59 +08:00
杨翊 SionYang
d78ebbbce1
Refactor dispatch task execute (#3995)
* Refactor nacos task execute engine

* Refactor nacos task execute engine

* For checkstyle

* For checkstyle

* Use ThreadUtils to reduce duplicate codes

* Set custom logger for TaskExecuteWorker

* Set custom logger for TaskExecuteWorker
2020-10-16 14:32:39 +08:00
邪影oO
13599fd83d
Fix#3973 (#3974)
* fix #3973

* 重复代码抽取到一个方法

* 删除私有方法的注释

* 处理namespace参数的方法提出到一个工具类中

* 修改注释

* 添加licences

* 增加 TenantUtil 的测试

* TenantUtil 改名为 NamespaceUtil
2020-10-13 15:48:46 +08:00
赵延
c0496b364e
[ISSUE #3909] add domain's judgement (#3913)
* add domain's judgement

* modify domain's judgement, can resolve = true

* remove judgement in 'if' code block

* replace Ip to IP in InetUtils

* log warn info when domain can not be resolved

* fix vaiable name
2020-10-12 12:19:02 +08:00
赵延
d6cc8ce5b0
fix typo error (#3954) 2020-10-12 12:18:14 +08:00
liaochuntao
7fd4d9a5d1
feature issue #3804 (#3805)
* improvement: merge upstream/develop

* feat: merge upstream develop

* feat: manage the loading of configuration files uniformly

* fix: fix copyright style

* style: fix code style

* fix: fix code style
2020-09-18 16:05:36 +08:00
邪影oO
043a504a33
fix: #3617 (#3678)
* fix #3617

* 调整代码格式

* 修改抛出的Exception类型

* 调整逻辑

* 移除没用到的方法

* 修改注释
2020-09-03 21:14:23 +08:00
Gagharv
3428d8830e
[ISSUE #3671] move some tools class into common package (#3672) 2020-08-24 13:24:56 +08:00
杨翊 SionYang
a0c8353b70
[ISSUE#3658] refactor TaskManager and move to nacos-common module (#3663)
* Add TaskManagerTest

* Move Abstract Task and Task processor to nacos-common

* Add Nacos execute engine interface and nacos task interface

* Refactor Task Manager to NacosDelayTaskExecuteEngine

* for code style
2020-08-23 16:39:58 +08:00
mai.jh
526e2bc130
[ISSUE #3566] move the permission code of nacos-core module to nacos-auth module (#3593)
* move the permission code of nacos-core module to nacos-auth module.

* Fix some code style issues

* address server module auth package name change.

* test change

* Incorrect package name correction
2020-08-14 09:50:05 +08:00
杨翊 SionYang
0b73cfc769
Upgrade version to 1.4.0-SNAPSHOT (#3549) 2020-08-12 09:32:06 +08:00
lidaoyang
fae37481e5
Fix #3269 When nacos.core.auth.enabled = true, user information is saved to the request in login (#3543)
* Fix #3269 NacosAuthManager request.setAttribute(user) and ConfigController getSrcUserName(req)

* Fix #3269 format code

* Fix #3269 format code
2020-08-07 12:43:44 +08:00
ZZQ的
7a471c5100
When binding roles, the user list is changed to the drop-down selection mode (在绑定角色的时候用户列表改成下拉选中的模式) #3518 (#3522)
* 配置pageSize列表 #3439

* Service List Page Increase the number of pages switching function is the same as the configuration management page #3500

* issues#3500 编译之后的代码

* 在绑定角色的时候用户列表改成下拉选中的模式 #3518

* change code style

* delete unused import

* delete changed indent please.

* Javadoc add an ending period

* fix bad sql and change return type

* change js get value

* delete whitespace

* check code style

* add permissions, associated role, change to fuzzy matching drop-down(java code)

* add permissions, associated role, change to fuzzy matching drop-down(js code)

* delete "/"
2020-08-06 13:23:53 +08:00
mai.jh
a64a356e45
[ISSUE #3192] replace nacos-config module http client (#3523)
* nacos-config module replace http client

* replace http client

* Remove redundant package import

* add license

* Delete JOSNUtils and use JacksonUtils instead; modify NacosAsyncRestTemplate exception handling.
2020-08-06 11:53:27 +08:00
杨翊 SionYang
df4b006b36
Upgrade version to 1.3.2 (#3512) 2020-08-04 12:58:45 +08:00
wangwei
e4a478a1f9 [#1839]add ContentType return while getConfig 2020-07-29 14:58:28 +08:00
ljhrot
c3818ff064
Fix bad SQL grammar (#3445) 2020-07-25 23:07:13 +08:00
yangy
2eaed4bcdc
Use PrepareStatement to replace string concatenation (#3393) 2020-07-21 14:50:19 +08:00
Hu Zongtang
52d9cf9cf9
[ISSUE##2859]Remove original EventDispatcher in the config module. (#3319) 2020-07-14 19:38:08 +08:00
Hu Zongtang
fee6cf4dc9
Replace original EventDispatcher with NotifyCenter in the config module. (#3313)
* [ISSUE##2859]Replace some usage of EventDispatcher for ConfigCacheService and LongPollingService.

* [ISSUE##2859]Replace some usage of EventDispatcher for AsyncNotifyService and ConfigChangePublisher.

* [ISSUE#3179]fix typo.

* [ISSUE#3179]fix typo.

* [ISSUE#3179]fix typo.
2020-07-14 15:10:25 +08:00
Gagharv
891c1f3ba5
[ISSUE #2856]Adjust the use of thread pools (config module) (#3206)
* [ISSUE #2856]Adjust the use of thread pools (config、cmdb module)

* add CmdbExecutor class
2020-07-13 17:33:25 +08:00
zongtanghu
34fd36b115 [ISSUE#3179]fix import formate issue. 2020-07-12 13:52:29 +08:00
zongtanghu
d8e1d2aebc [ISSUE#3179]Replace the NotifyCenter with new refactor in the config and test module. 2020-07-12 11:28:54 +08:00
CsyDesign
84b733a31f
[ISSUE#3300] Optimize the default "minIdle"" of HikariPool set by naocs (#3304) 2020-07-12 00:32:11 +08:00
杨翊 SionYang
7ddba00865
Upgrade 1.3.1 (#3294) 2020-07-10 18:05:07 +08:00
杨翊 SionYang
95f3bfb587
[ISSUE #2992]Recheck all checkstyle and open checkstyle during building (#3293)
* Re-check code style for nacos-config module.

* Re-check code style for other module.

* Open checkstyle plugin check during build
2020-07-10 17:18:53 +08:00
zhangjidi2016
5d65653740
Resolve the issues of codestyle of nacos-config module for phase7 (#3288)
* Resolve the issues of codestyle of nacos-config module for phase7

* fix typo of code style.
2020-07-10 14:26:39 +08:00
杨翊 SionYang
886fbe463c
Use new code style for nacos-config module/test. (#3290) 2020-07-10 13:24:43 +08:00
Hu Zongtang
753a736815
[ISSUE#3249]Resolve the issues of codestyle of nacos-config module for phase8. (#3286)
* [ISSUE#3249]Resolve the issues of codestyle of nacos-config module for phase8.

* [ISSUE#3249]fix typo.
2020-07-09 20:12:05 +08:00