Commit Graph

698 Commits

Author SHA1 Message Date
chuntaojun
8ad399a4aa feat: merge upstream develop 2020-09-30 17:00:39 +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
chuntaojun
4e8936b8a7 fix: fix conflict 2020-09-14 22:30:22 +08:00
chuntaojun
acbd5bfa36 feat: merge upstream develop 2020-09-04 01:12:51 +08:00
ljhrot
879bfaf7de
Fix revert chunk isn't work in Content Comparison page (#3686) 2020-08-28 10:31:34 +08:00
liaochuntao
c617afeaa4
Jraft naming (#3660)
* fix-#3595, delete the unnecessary code (#3596)

* [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

* [ISSUE #3592] Fix incorrect prompt when accessing the restricted namespace (#3603)

* Fix incorrect prompt when accessing the restricted namespace

* Modify variable name

* [ISSUE #3600] Replace the deprecated api of jwt (#3616)

* replace the deprecated api of jwt

* transfer secretKey to byte array just using String encode with utf-8

* [ISSUE #3613]  Fix `unit test method not be static` & update publish config listener  in `ConfigTest.java` (#3614)

* fix `unit test method not be static` & update publish config listener in `ConfigTest.java`

* fix `unit test method not be static` & update publish config listener in `ConfigTest.java`

* move jwt dependency from console,core to auth. (#3624)

* fix: create kvstorage

* refactor: create kv storage]

Co-authored-by: 赵延 <1060026287@qq.com>
Co-authored-by: mai.jh <maijh97@gmail.com>
Co-authored-by: ljhrot <296093710@qq.com>
Co-authored-by: Xarrow <zhangjian12424@gmail.com>
2020-08-21 12:58:36 +08:00
赵延
e7c269a2f5
move jwt dependency from console,core to auth. (#3624) 2020-08-18 13:38:07 +08:00
赵延
a041c8ef58
[ISSUE #3600] Replace the deprecated api of jwt (#3616)
* replace the deprecated api of jwt

* transfer secretKey to byte array just using String encode with utf-8
2020-08-18 09:23:04 +08:00
ljhrot
c7251a144a
[ISSUE #3592] Fix incorrect prompt when accessing the restricted namespace (#3603)
* Fix incorrect prompt when accessing the restricted namespace

* Modify variable name
2020-08-14 17:07:13 +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
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
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
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
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
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
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
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
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
杨翊 SionYang
7ddba00865
Upgrade 1.3.1 (#3294) 2020-07-10 18:05:07 +08:00
杨翊 SionYang
fce01b1457
Remove default test mysql config (#3279) 2020-07-08 17:10:05 +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
liwen2555376
82efc57017
移除NacosAuthConfig类上冗余注解@Configuration (#3149) 2020-06-28 10:09:09 +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
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
KomachiSion
89406abc23 For #2873, unified copyrights for nacos-console. 2020-06-12 15:55:04 +08:00
yangy
bf74511a82 simplify code 2020-06-07 10:06:00 +08:00
water.lyl
7f541a9a67 update version to 1.3.0 2020-06-05 09:02:17 +08:00
liaochuntao
184141fc57
Merge pull request #2923 from jintonghuoya/feature_maven_version_unity
[ISSUE #2860]Maven dependency optimizations, where only one version of each dependency exists
2020-06-02 14:47:26 +08:00
chuntaojun
3169424605 refactor: optimize old version information synchronization logic 2020-06-01 21:54:29 +08:00
Jack Dai
1a7264d9b6 解决和develop的冲突 2020-06-01 18:41:03 +08:00
Jack Dai
83e6451acc 统一修改子项目中的url为nacos官网地址 2020-06-01 18:35:20 +08:00
chuntaojun
5fceafac3f refactor: optimize the error message prompt 2020-05-30 17:28:25 +08:00
jintonghuoya
6aa395979a 回滚dependency和plugin的version无关的修改 2020-05-29 20:45:45 +08:00
Jack Dai
9692cd1b8c 合并和origin/develop的冲突 2020-05-29 19:01:48 +08:00
Jack Dai
27a257c84e 合并origin/develop的变更 2020-05-29 18:41:00 +08:00
Jack Dai
594eac42b3 整理每个module的plugin和dependency的版本号 2020-05-29 16:35:48 +08:00
KomachiSion
0b1a58e29b Remove all dependency except nacos-test 2020-05-27 15:41:07 +08:00
KomachiSion
4eb4e11184 Replace fastjson with jackson for nacos-console 2020-05-27 09:35:00 +08:00