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

2642 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
chuntaojun
f1811027f9 Merge branch 'develop' of https://github.com/alibaba/nacos into new_develop 2020-06-29 16:22:27 +08:00
zhichen
adb5bc9bfc
Upgrade jquery dependency to fix security problems (#3201) 
* upgrade jquery #3115

* upgrade webpack to fix websocket-extensions security #3115
 2020-06-29 15:43:07 +08:00
杨翊 SionYang
88480f7c0f
Update to 1.3.1-BETA (#3194) 2020-06-29 13:56:16 +08:00
杨翊 SionYang
0a65aa8976
Use new code style for nacos-console module. (#3195) 2020-06-29 13:55:42 +08:00
杨翊 SionYang
c9bf5f2f70
For new codeStyle in nacos-api module (#3190) 2020-06-29 13:54:31 +08:00
Hu Zongtang
51c0eb25ad
[#3179]fix Notify's typos in common module and remove NotifyCenter's unit test in test module (#3187) 
* [#3141]fix Notify's typos in common module and remove NotifyCenter's unit test in test module.

* [#3141]fix variable naming issue.
 2020-06-28 13:01:12 +08:00
Gagharv
3f145e6374
[ISSUE #2856]Adjust the use of thread pools (naming module) (#3136) 
Change-Id: I626179bd9ee8e852d9d51787950ad80744ec71cd
 2020-06-28 10:59:09 +08:00
吴晟 Wu Sheng
b1f0d63e05
Update NOTICE (#3177) 2020-06-28 10:32:31 +08:00
liaochuntao
2c733d57ff
[#2979] Inline storage support importing data from external data sources (#3138) 
* feat: data import Derby, Derby export complete

* feat: external data source import is complete

* feat: import data to derby and derby backup finished

* fix: fixed bug where external storage mode could not find beans

* style: fix code style

* style: remove unuse code

* refactor: fixed configuration file information

* improvement: merge upstream/develop

* style: fix code style

* fix: a way to fix the missing

* fix: fix derby data import in standalone mode

* style: fix code style

* refactor: merge upstream develop and fix code style

* test: modify ut

* style: fix code style
 2020-06-28 10:25:06 +08:00
liwen2555376
82efc57017
移除NacosAuthConfig类上冗余注解@Configuration (#3149) 2020-06-28 10:09:09 +08:00
Hu Zongtang
38a2aa111a
[#3185]Fix chinese unit method name in config test module. (#3186) 2020-06-28 09:49:53 +08:00
Joe
41525b0a5c
Update ServiceController.java (#3176) 
adjust order for start and end ，avoid end value is negative number
 2020-06-28 09:21:28 +08:00
杨翊 SionYang
49c163b266
Hotfix frequent member change logs after #3168 (#3174) 
* Fix operate for unmodifiableList error

* Hotfix frequent member change logs after #3168
 2020-06-25 11:14:38 +08:00
mai.jh
aac1c6f013
[ISSUE #3160]fix compatibility issue when reading cache files with suffix ".datum" (#3163) 
* fix: #3160

* change the name definition
 2020-06-24 19:18:24 +08:00
Hu Zongtang
ac0eabf6cc
[#3141]Move the related notify test cases code to common module, fix NPE and improve peformance. (#3145) 
* [#3141]fix typo and move unit test cases codes from core to common module.

* [#3141]implement DefaultSharePublisher to separate sharePublish from default publisher and fix typo.

* [#3141]fix typo and NPE issue.

* [#3141]improve performance and fix typo.

* [#3141]add removeSubscriber logical codes.

* [#3141]rename the unit test method's names.

* [#3141]fix typo.

* [#3141]fix thread unsafe and atomic issue.
 2020-06-24 19:13:34 +08:00
chuntaojun
a07f84efa5 feat: merge upstream develop 2020-06-24 18:21:37 +08:00
chuntaojun
3d8b55cca0 Merge branch 'develop' of https://github.com/alibaba/nacos into new_develop 2020-06-24 15:52:09 +08:00
liaochuntao
f5e1025f14
[ISSUE #3110] Hotfix member health (#3168) 
* improvement: merge upstream/develop

* fix: fix node status change not notified

* style: fix code style

* refactor: optimize node change event logic

* refactor: adjust the node change event receiver logic
 2020-06-24 15:30:10 +08:00
chuntaojun
9e7cf30554 Merge branch 'develop' of https://github.com/alibaba/nacos into new_develop 2020-06-24 10:43:54 +08:00
lin-mt
1c8425300c
replace lang3 in api (#3126) 
* replace lang3

* style:remove this
 2020-06-23 22:20:28 +08:00
lin-mt
9d34193bb4
Add the location of the CodeStyle plugin configuration (#3151) 2020-06-23 09:45:49 +08:00
mai.jh
6ce8d8ca79
[ISSUE #3140]nacos-client module replace http client (#3142) 
* nacos-client http client replace

* Remove some explain

* Remove some explain

* Adjust some code styles and fix some misspelled method names

* Fix code style issues

* fix some misspelled method names

* Fix code style issues
 2020-06-22 20:42:46 +08:00
Hu Zongtang
1dc29f2d52
[#3117]Just Sink the Notify implementation into common module and optimize some parts (#3118) 
* [#3117]Sink the Notify implementation into common module and optimize some parts.

* [#3117]fix typo and reformat code styles.

* [#3117]fix typo and reformat code styles.

* [#3118]fix typo and formate.

* [#3118]Unify Subsciber and SmartSubscriber, and fix some typo and reformat.

* [#3118]fix some typo and reformat.
 2020-06-22 01:10:56 +08:00
chuntaojun
7915e4fc64 Merge branch 'develop' of https://github.com/alibaba/nacos into new_develop 2020-06-19 21:40:16 +08:00
liaochuntao
bb7cfbcc5d
[ISSUE #2847] Fix config IT (#3120) 
* improvement: merge upstream/develop

* fix: fix config ut bug

* style: fix code style

* fix: fix ut bug
 2020-06-19 20:14:22 +08:00
chuntaojun
78167ab1e7 Merge branch 'develop' of https://github.com/alibaba/nacos into new_develop 2020-06-19 11:39:46 +08:00
杨翊 SionYang
532aad685e
upgrade version of Jackson and Guava (#3116) 2020-06-19 10:55:14 +08:00
杨翊 SionYang
67b58a0117
Add missing java doc for nacos-common for checkstyle (#3112) 2020-06-19 10:24:25 +08:00
chuntaojun
29df82f694 refactor: merge upstream develop 2020-06-18 23:15:01 +08:00
liaochuntao
9a44b920a8
[ISSUE #3107] Style format core (#3108) 
* improvement: merge upstream/develop

* style: format code style

* style: modify pom.xml

* fix: fix code style
 2020-06-18 21:27:49 +08:00
pengzhengfa
961f0d14f2
Schedule naming optimization of cp architecture (#3109) 
* Instance eliminate module naming optimization

* Solve PMD check failed

* Method name optimization

* Solve code space problem

* Method name optimization

* Optimize the naming of persistence layer

* Schedule naming optimization of cp architecture
 2020-06-18 19:17:20 +08:00
杨翊 SionYang
f864880136
[ISSUE #2992] use new code style for nacos-common (#3106) 
* use new code style for nacos-common

* Fix code style file can't set java import problem.
 2020-06-18 17:05:15 +08:00
pengzhengfa
38d0b6bdbe
Method name optimization (#3104) 
* Instance eliminate module naming optimization

* Solve PMD check failed

* Method name optimization

* Solve code space problem

* Method name optimization

* Optimize the naming of persistence layer
 2020-06-18 16:32:14 +08:00
pengzhengfa
d24f36b9eb
Instance eliminate module naming optimization (#3093) 
* Instance eliminate module naming optimization

* Solve PMD check failed
 2020-06-17 21:04:50 +08:00
杨翊 SionYang
67829bb5e3
[ISSUE #2992] Use new code style for nacos-naming (#3090) 
* Update check style to ignore spring bean java doc

* use new code style for nacos-naming
 2020-06-17 18:21:41 +08:00
Gagharv
f94e8f8fb4
[ISSUE #2856]Adjust the use of thread pools (#3084) 
* [ISSUE #2856][module:core、consistency]Adjust the use of thread pools

Change-Id: I793770ca0f287157dc88e3ecf1147ea308e4a547

* code optimize

Change-Id: I023ed73332f3f69c93277f25e57e0ee5c3975f02
 2020-06-17 18:21:00 +08:00
mai.jh
e528ea82e9
[ISSUE #3094]abstract create nacos restTemplate factory (#3095) 
* abstract create nacos restTemplate factory, allowing users to customize the commonly used http client config

* add class file license.

* change class file name

* Adjust some code
 2020-06-17 17:53:37 +08:00
chuntaojun
9585d55adc improvement: merge upstream/develop 2020-06-17 15:20:06 +08:00
liaochuntao
3f401c94d6
Merge pull request #3088 from KomachiSion/develop-issue#2992 
[ISSUE #2992] Add text import guide in codeStyle.md to enhance code style import
 2020-06-17 11:48:02 +08:00
赵延
aea7dd69ed
[ISSUE #2810] don't send beat when standalone model (#3047) 
* don't send beat when standalone model

* format the code.
 2020-06-17 11:33:34 +08:00
KomachiSion
a0227a0ab6 Add text import guide in codeStyle.md to enhance code style import 2020-06-17 10:09:45 +08:00
杨翊 SionYang
7c4cca4360
Add code style file for Idea and checkstyle file for option (#3082) 2020-06-16 20:16:58 +08:00
huqingfeng
3ddbbf49f1
Optimization dependency (#3075) 2020-06-16 09:13:43 +08:00
zhenxianyimeng
a4613c4787
Fix history time local (#2845) 
* keep query criteria

* fix time format
 2020-06-15 16:37:40 +08:00
zhenxianyimeng
49ff59ef67
[ISSUE #2089]Config list return page bug fix (#2737) 
* keep query criteria

* configlist_returnpage_bug_fix
 2020-06-15 16:35:14 +08:00
pengzhengfa
ee8da9ba6f
Method name optimization (#3068) 2020-06-15 14:27:44 +08:00
keker
4c0ba562ab
Watch files add empty check. (#3035) 
* watch files add empty check.

* watch files add empty check.

Co-authored-by: yanlinly <yan.lin2009@163.com>
 2020-06-15 13:48:35 +08:00
Hu Zongtang
3f0023a3a9
Remove dependency of apache-common-lang3 in the client. (#3031) 
* [#3026]remove dependency of apache-common-lang3 in the client.

* [#1815]adjust, optimize codes and merge some class.

* [#3031]adjust some codes.

* [#3031]adjust codes and fix typo.

* [#3031]fix typo.
 2020-06-15 13:41:53 +08:00
yanlinly
86d5a32fb3
Merge pull request #3064 from chuntaojun/hotfix_client_validator 
[#3063] fixed parameter validation boundary problem
 2020-06-15 11:42:24 +08:00
chuntaojun
abae5e106b refactor: remove unuse code 2020-06-15 11:08:10 +08:00