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

2939 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
蚊子猫
6607a1efbf
[ISSUE #3515] upgrade spring-boot-dependencies version to 2.1.16.RELEASE, tomcat-embed-jasper version to 9.0.37 (#3563) 
Change-Id: I021396ae0b75fc889f087c4a4c253549ad46b46f
 2020-08-12 16:44:14 +08:00
ljhrot
8081acf662
[ISSUE #1654] Fix content hightlight does not work in config detail page (#3555) 
* Fix content hightlight does not work in config detail page

* Solve conflict
 2020-08-12 09:51:15 +08:00
杨翊 SionYang
0b73cfc769
Upgrade version to 1.4.0-SNAPSHOT (#3549) 2020-08-12 09:32:06 +08:00
ZZQ的
13bfc45242
On click nacos logo jump to index page (#3570) 
* On Click Nacos Logo jump to index page

* On Click Nacos Logo jump to index page

* npm run-script build
 2020-08-11 13:18:08 +08:00
ZZQ的
ad2951a116
change aliyun logo to nacos logo (#3569) 
* change aliyun logo to nacos logo

* change aliyun logo to nacos logo

* reset file name
 2020-08-11 11:37:30 +08:00
ZZQ的
2726591dae
ISSUE #3530 add button for user role page (#3553) 
* ISSUE #3530 add button for user role page

* Merge branch 'upstream-develop' into develop-issues-#2792

# Conflicts:
#	console/src/main/resources/static/js/main.js
 2020-08-11 09:47:39 +08:00
chuntaojun
14039fd9cd Merge branch 'develop' of https://github.com/alibaba/nacos into jraft_naming 2020-08-10 23:33:50 +08:00
ZZQ的
f1382d690e
ISSUE #2792historyDetail page and historyRollback page add field 'srU… (#3552) 
* ISSUE #2792historyDetail page and historyRollback page add field 'srUser'

* Merge branch 'upstream-develop' into develop-issues-#2792

# Conflicts:
#	console/src/main/resources/static/js/main.js
 2020-08-10 18:59:38 +08:00
赵延
c9b64e0173
fix-#3550. write cache file and delete the old version cache file (#3551) 2020-08-10 09:09:13 +08:00
ljhrot
c45542c8ff
[ISSUE #2835] Fix an uncaught exception when accessing restricted namespace in authentication mode. (#3541) 
* Fix an uncaught exception when accessing restricted namespace in authentication mode.

* Resolved merge conflict

* Withdraw changes that are not part of this pr
 2020-08-10 09:07:17 +08:00
linqunhui
ac8ced1cb5
[ISSUE #3536] upgrade Jjwt to 0.11.2 (#3547) 
* 15096346912@163.com

更新jjwt-api版本为0.11.2，更新Deprecated Method

* 15096346912@163.com

nacos-all  pom.xml更改版本

* 1509346912@163.com

格式检查
 2020-08-07 17:00:20 +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
赵延
9734deeefc
[ISSUE #3486] Fix com.alibaba.nacos.core.code.ControllerMethodsCache will mismatch sometimes (#3487) 
* fix #3486

* modify code suit checkstyle

* add apache licenses

* change the publish version of new class

* set the char "-->" in interface

* set the char "-->" in interface

* code format

* add unit case of com.alibaba.nacos.core.code.ControllerMethodsCache.getMethod

* code format follow nacos-code-style

* code format follow nacos-code-style
 2020-08-07 10:51:39 +08:00
mai.jh
b1db2be4c1
[ISSUE #3192] replace nacos-core module http client (#3535) 
* core module replace http client

* replace http client
 2020-08-06 22:01:36 +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
sanxun0325
95c8bf242b
[#3368]Cancel empty Long polling thread to improve performance. (#ISSUE3432) 
* update clientWorker

* Upgrade 1.3.1 (#3294)

update clientWorker

* add ClientWorkerTest

* add remove taskFlagMap

* update clientworker

* update taskIdSet ConcurrentHashSet
 2020-08-05 17:20:53 +08:00
qm0123
0ae6669d57
[#3509] Fix address server mode cannot be obtained application.properties (#3516) 
* Fix address server mode cannot be obtained application.properties And synchronize the properties value(#3509)

* format code.

* update mysql default value nacos:nacos
 2020-08-05 16:54:28 +08:00
ZZQ的
816113a7c2
[ISSUE #3500] Make page list of service manager same as config manager (#3511) 
* 配置pageSize列表 #3439

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

* issues#3500 编译之后的代码
 2020-08-05 10:17:02 +08:00
杨翊 SionYang
aa91f3ddc1
Merge pull request #3505 from ljhrot/develop-issue#3397 
[ISSUE #3397]Fix shell syntax error when running in ubuntu
 2020-08-05 09:56:41 +08:00
ljhrot
dd24f564a3 Fix shell syntax error when running in ubuntu 2020-08-04 21:59:03 +08:00
杨翊 SionYang
df4b006b36
Upgrade version to 1.3.2 (#3512) 2020-08-04 12:58:45 +08:00
ZZQ的
e4fdc3820f
[ISSUE #3439] Increment console config page size (#3507) 
* 配置pageSize列表 #3439

* Service List Page Increase the number of pages switching function is the same as the configuration management page #3500
 2020-08-04 11:12:27 +08:00
ljhrot
e3eafda678 Fix shell syntax error when running in ubuntu 2020-08-03 22:40:02 +08:00
ljhrot
b79f048a9b
Fix the UnknownHostException is swallowed (#3495) 2020-08-02 18:59:58 +08:00
ljhrot
4310b3ee47
[ISSUE #3103] Fix can't create properties config (#3483) 
* Fix browser Uncaught TypeError when create a Properties type configuration

* Change Properties content verification method

* Update front end resources
 2020-07-31 19:16:56 +08:00
liaochuntao
43f606519b
[#1839]add ContentType return while getConfig (#3470) 2020-07-31 14:53:49 +08:00
杨翊 SionYang
f377c199d5
[ISSUE#3091] Fix address server can't start up by implement an empty auth manager. (#3456) 
* Fix #3091 by empty auth manager.

* Fix #3091 by empty auth manager.

* Use conditional to solve bean conflict
 2020-07-31 14:53:12 +08:00
杨翊 SionYang
1a22ae4c47
Fix checkstyle error (#3467) 
Fix checkstyle error (#3467)
 2020-07-29 16:09:35 +08:00
wangwei
e4a478a1f9 [#1839]add ContentType return while getConfig 2020-07-29 14:58:28 +08:00
mai.jh
e9152a95df
fix get HttpRequestBase thread safe issues through BaseHttpMethod (#3469) 2020-07-29 13:10:14 +08:00
chuntaojun
e08a6adc49 fix code style 2020-07-29 01:53:44 +08:00
mai.jh
5b76fd0d56
[ISSUE #2858] Unified http client implementation, enhanced async request callback interface (#3452) 
* Enhanced callback interface for asynchronous requests

* change class name

* add license

* change class name

* comment change

* delete AbstractCallback
 2020-07-27 13:15:50 +08:00
chuntaojun
d3ce09bb79 Merge branch 'develop' of https://github.com/alibaba/nacos into jraft_naming 2020-07-27 13:03:50 +08:00
chuntaojun
018ce1441f create error code 2020-07-27 13:03:45 +08:00
杨翊 SionYang
bc3d13f6cb
Update issue templates (#3427) 
* Update issue templates

* Delete duplicate bug report
 2020-07-27 10:14:18 +08:00
yanjunnf
377f778711
[#3388]Reset nacos roles, permissions during reloading role info from database (#3442) 
* Reset nacos roles, permissions during reloading role info from database

* Add volatile to guarantee visibility in threads
 2020-07-27 10:13:56 +08:00
senekis
d19b441540
Fix #3428, Fix token valid go login bug (#3449) 2020-07-27 09:44:53 +08:00
springliao
e90ac7e137 Major logical completion 2020-07-26 23:43:46 +08:00
ljhrot
c3818ff064
Fix bad SQL grammar (#3445) 2020-07-25 23:07:13 +08:00
springliao
3b5365cf1d finish stop old raft run logic 2020-07-25 23:01:39 +08:00
chuntaojun
5bf02123c1 feat: create rocksdb storage 2020-07-24 00:31:44 +08:00
Hu Zongtang
479ef3ff65
[ISSUE#3409]fix Nacos can't start by the startup.cmd script in windows enviroment. (#3416) 2020-07-22 17:48:57 +08:00
mai.jh
75a06834f5
unified implementation of http client package division (#3400) 2020-07-21 14:53:03 +08:00
yangy
2eaed4bcdc
Use PrepareStatement to replace string concatenation (#3393) 2020-07-21 14:50:19 +08:00
GangHuo
5eb7d6a38d
[ISSUE #3370] Issue with executing shell script /bin/sh^M on Unix/Linux (#3371) 
* Replace RuntimeException caused by HealthCheckerFactory with Nacos serialization exception

* 1. Format startup.sh and shutdown.sh. Use Unix/Linux standard newline LF
2. Solve the OS = Windows error when packaging Maven (does not affect packaging)
 2020-07-20 19:41:53 +08:00
Gagharv
75dfd107bb
[#3353]Adjust the value logic of clientBeatInterval (#3377) 2020-07-20 19:40:30 +08:00
chuntaojun
7455f513e3 Merge branch 'develop' of https://github.com/alibaba/nacos into new_develop 2020-07-19 12:11:54 +08:00
杨翊 SionYang
e5f0c368c9
Hotfix client sdk depend jdk7 charset. (#3376) 2020-07-18 23:01:32 +08:00
杨翊 SionYang
cda3f14230
Hotfix client sdk depend jdk7 charset. (#3374) 2020-07-18 16:36:10 +08:00