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

889 Commits

Author SHA1 Message Date
KomachiSion
7f3a17c620 Solve conflict with develop branch. 2020-12-31 14:24:41 +08:00
KomachiSion
bdacd0958d Merge remote-tracking branch 'upstream/develop' into 2.0.0-sync-develop 
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/config/impl/ClientWorker.java
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
#	client/src/main/java/com/alibaba/nacos/client/naming/remote/http/NamingHttpClientProxy.java
#	core/src/main/java/com/alibaba/nacos/core/listener/StartingApplicationListener.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/CatalogController.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/ServiceController.java
 2020-12-31 11:48:52 +08:00
haoyann
374e7e39d8
[ISSUE #3406] fix change self's password fail (#4536) 
* fix change self's password fail

* refactor use util Objects
 2020-12-28 09:53:40 +08:00
Gagharv
ce57b98332
[ISSUE-#3005] fix ClusterController 403 and some display wrong (#4512) 
* fix 3005

* fix 3005
 2020-12-23 19:48:03 +08:00
赵延
638d89b70a
[ISSUE-3917] Enhance service detail console web, add metadata filter (#4439) 
* add metadata filter at back-end of nacos naming console

* code enhance

* 添加input，tag等组件，初步布局

* 实现页面交互，可添加，删除filter

* 更新filter向后端发起请求获取数据

* 实现更新更改过滤条件，刷新表格

* 添加国际化配置

* 输入完后按空格直接添加，没输入的input给出响应

* 提交单元测试，更新打包后的静态资源

* 修改配置 解决生产环境上sourcemap不生效的问题

* 用hook重构组件InstanceFilter

* 多个集群各自使用过滤

* 解决多集群时，元数据过滤无法单独使用的问题

* revert backend code

* revert metadata filter test

* 只从客户端已获取到的实例中过滤

* 变动更新到打包后的mian.js

Co-authored-by: jzhishu <john1994@foxmail.com>
 2020-12-21 10:19:42 +08:00
nov.lzf
caffec2d5b
rsocket parse bugfix; auth bugfix;some checkstyle and basic spell fix. (#4473) 
* rsocket parse bugfix; auth bugfix;some checkstyle and basic spell fix.

* auth bugfix
 2020-12-14 19:31:33 +08:00
杨翊 SionYang
93a3ac7816
Upgrade to 2.0.0-ALPHA.1 (#4410) 
* Add some new server config parameters

* Upgrade to 2.0.0-ALPHA.1
 2020-12-04 18:46:24 +08:00
KomachiSion
d6fcac85c5 Merge remote-tracking branch 'upstream/develop' into feature_support_grpc_core 
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/config/http/ServerHttpAgent.java
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingMaintainService.java
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
#	config/src/main/java/com/alibaba/nacos/config/server/auth/ConfigResourceParser.java
#	config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigController.java
#	config/src/main/java/com/alibaba/nacos/config/server/result/ResultBuilder.java
#	core/src/main/java/com/alibaba/nacos/core/listener/StartingApplicationListener.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/CatalogController.java
#	naming/src/main/java/com/alibaba/nacos/naming/healthcheck/ClientBeatCheckTask.java
#	naming/src/main/java/com/alibaba/nacos/naming/healthcheck/HealthCheckCommon.java
#	naming/src/main/java/com/alibaba/nacos/naming/web/NamingResourceParser.java
#	sys/src/main/java/com/alibaba/nacos/sys/utils/ApplicationUtils.java
#	test/src/test/java/com/alibaba/nacos/test/naming/AutoDeregisterInstance_ITCase.java
 2020-12-03 18:41:41 +08:00
nov.lzf
ad98020770
负载均衡bugfix；监听并发问题bugfix；direct memory泄漏bugfix (#4365) 
* memory gc optimize ; string pool bugfix

* grpc executor

* grpc executor

* 负载均衡bugfix；监听并发问题bugfix；direct memory泄漏bugfix

* check style fix
 2020-11-30 16:17:34 +08:00
孙继峰
c8d46a6046
[ISSUE-#4310] Delete the main function only for testing (#4312) 2020-11-24 13:22:22 +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
KomachiSion
e56eb3680c Merge remote-tracking branch 'upstream/develop' into feature_support_grpc_core 
# Conflicts:
#	api/pom.xml
#	client/src/main/java/com/alibaba/nacos/client/config/NacosConfigService.java
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
#	client/src/main/java/com/alibaba/nacos/client/naming/core/HostReactor.java
#	client/src/main/java/com/alibaba/nacos/client/naming/remote/http/NamingHttpClientProxy.java
#	client/src/test/java/com/alibaba/nacos/client/naming/core/HostReactorTest.java
#	common/src/main/java/com/alibaba/nacos/common/notify/NotifyCenter.java
#	core/pom.xml
#	naming/src/main/java/com/alibaba/nacos/naming/healthcheck/HttpHealthCheckProcessor.java
#	naming/src/main/java/com/alibaba/nacos/naming/web/DistroFilter.java
#	pom.xml
 2020-11-20 17:13:49 +08:00
杨翊 SionYang
d4b2d2f146
Adapt update service metadata api. (#4260) 
* Adapt update service metadata api.

* For checkstyle
 2020-11-18 21:09:47 +08:00
nov.lzf
69c84f1397
pmd ,checkstyle (#4252) 2020-11-18 13:46:27 +08:00
nov.lzf
70d976db18
更新版本；集群整体重新负载均衡功能；变更推送内容；推送SLA日志；常量池改造；启动时长链接优化；删除rpc digest 日志 (#4217) 
* listen context bugfix.

* 更新版本；集群整体重新负载均衡功能；变更推送内容；推送SLA日志；常量池改造；启动时长链接优化；删除rpc digest 日志
 2020-11-12 18:03:07 +08:00
邪影oO
027538ce2e
解决前端目录调整后前端访问不了问题 (#4206) 2020-11-12 09:18:45 +08:00
杨翊 SionYang
164ed33ada
Feature support grpc core (#4204) 
* NacosNamingMetadataManager --> NamingMetadataManager

* Try to add ServiceMetadata consistency

* add catalog api support new data

* Change version to 2.0.0-SNAPSHOT
 2020-11-11 19:50:14 +08:00
杨翊 SionYang
757fc1efeb
Revert "解决前端目录调整后前端访问不了问题 (#4195)" (#4196) 
This reverts commit a0bbd562b0.
 2020-11-11 13:59:50 +08:00
邪影oO
a0bbd562b0
解决前端目录调整后前端访问不了问题 (#4195) 2020-11-11 10:44:43 +08:00
赵延
f808ffdb65
[ISSUE-#4179] Add index for db.user and db.password (#4186) 
* add index for db.user and db.password, to avoid some situation that it contains symbol ','

* add multi data source template

* add line to separate

* Revert "add line to separate"

This reverts commit 390eb6fb

* Revert "add multi data source template"

This reverts commit 4470e633
 2020-11-10 17:53:37 +08:00
邪影oO
f01aae73ee
console\src\main\resources\static\console-fe 挪到根目录并改名为 console-ui (#4174) 2020-11-09 11:53:33 +08:00
sanxun0325
fb616483a2
updates the default time zone for interface results (#4073) 2020-11-09 10:56:29 +08:00
KomachiSion
8829d3c6ed Upgrade to 2.0.0-ALPHA 2020-11-05 19:38:15 +08:00
KomachiSion
9cbc0bfeea Merge branch 'upsteam-develop' into feature_support_grpc_core 
# Conflicts:
#	api/src/main/java/com/alibaba/nacos/api/common/Constants.java
#	client/src/main/java/com/alibaba/nacos/client/naming/remote/http/HttpClient.java
#	common/src/main/java/com/alibaba/nacos/common/utils/VersionUtils.java
#	core/src/main/java/com/alibaba/nacos/core/distributed/distro/DistroProtocol.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/InstanceController.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/ServiceController.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/GlobalExecutor.java
 2020-11-05 19:33:46 +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
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
nov.lzf
336269891e
ak auth support;log optimize; client port aware on server side (#3970) 
* ak auth support on long connection

* server side aware of client port;basic optimize

* cluster config notify bugfix and log optimize

* client rpc log support for rpc

* server side aware of client port;basic optimize

* cluster config notify bugfix and log optimize

* client rpc log support for rpc

* reconnect rate control
 2020-10-12 11:53:43 +08:00
KomachiSion
6e5b09aee7 Merge branch 'upsteam-develop' into feature_support_grpc_core 
# Conflicts:
#	common/src/main/java/com/alibaba/nacos/common/notify/DefaultSharePublisher.java
#	test/src/test/java/com/alibaba/nacos/test/naming/AutoDeregisterInstance_ITCase.java
 2020-09-18 16:16:00 +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
nov.lzf
d83a4b12b3
ak auth support on long connection (#3821) 2020-09-14 16:47:59 +08:00
杨翊 SionYang
9e064b7f92
Add client distro sync logic (#3809) 
* Adapt query service info request with new model

* Remove indexes when client disconnect

* Add distro sync client data

* Add sync delete client

* Add maintain expired cluster connection client
 2020-09-11 20:00:47 +08:00
nov.lzf
721791a41e
optmize rpc client lifecycle ；request timeout to rpc client； some bugfix (#3797) 
* optmize rpc client lifecycle and some bugfix

* get server load optimize； add request timeout to rpc client
 2020-09-10 10:56:36 +08:00
KomachiSion
ee406d5e5e Merge branch 'upsteam-develop' into feature_support_grpc_core 
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/config/http/ServerHttpAgent.java
#	client/src/main/java/com/alibaba/nacos/client/config/impl/ClientWorker.java
#	client/src/main/java/com/alibaba/nacos/client/config/impl/ServerListManager.java
#	client/src/main/java/com/alibaba/nacos/client/naming/core/HostReactor.java
#	client/src/test/java/com/alibaba/nacos/client/ConfigTest.java
#	config/src/main/java/com/alibaba/nacos/config/server/service/notify/AsyncNotifyService.java
#	core/pom.xml
#	naming/src/main/java/com/alibaba/nacos/naming/misc/GlobalExecutor.java
 2020-09-04 17:03:26 +08:00
nov.lzf
682a46d541
loader balance basic support: adjust loader count once and up limit ; switch single (#3752) 2020-09-03 20:29:34 +08:00
nov.lzf
93364734ea
client switch server bugfix ; cluster server connection manage, and loader balance with specific server ip (#3751) 2020-09-03 18:02:55 +08:00
nov.lzf
cf550b9f43
optimize request /header /meta info model, uniform request resolver pattern. (#3749) 
* body string compress and opitimize request and meta info

* optimize request /header /meta info model, uniform request  resolver pattern.

* delete useless code
 2020-09-03 15:00:08 +08:00
nov.lzf
3a5c3cb19f
refactor request/response registry ; server side request push refactor (#3739) 
* limiter support in rpc transport

* get next server optimize; server side notify concurrent bugfix; multi rpc client support in config module.

* toast alibaba repo refer. add client name

* rpc config change beta ips filter

* payload registry submit

* refactor request/response registry ; build response aware of server side in connection level.

* refactor request/response registry ; build response aware of server side in connection level.

* bi stream submit.

* bi stream submit.
 2020-09-02 09:12:53 +08:00
ljhrot
879bfaf7de
Fix revert chunk isn't work in Content Comparison page (#3686) 2020-08-28 10:31:34 +08:00
nov.lzf
3d222268af
as-sk abstract ; simplify server http agent; optimize io netty import; client side server change event aware (#3693) 
* optimize rpc listen notify

* remove cache bugfix

* code optimize

* code optimize

* config client abstract optimize, remove if/else code

* config client abstract optimize, remove if/else code

* as sk abstract ; simplify server http agent; optimize io netty import; client side server change event aware
 2020-08-26 15:52:25 +08:00
nov.lzf
03e58df04f
listen context query support on console ; basic api for lader balance ;server side push retry submit (#3630) 
* listen context query with groupy and ip support long connect

* remove connection on cleint side, server will generate instead.

* connect reset request support appointing ip address.

* server push retry

* basic api for loader balance

* basic api for loader balance
 2020-08-18 20:20:21 +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
nov.lzf
33df55d40a
remote support on servers and optimize connection and client model (#3609) 
* Add gprc support-> optimize rpc listen execute task  notify

* Add gprc support->  add listener optimize.

* Add gprc support-> cluster rpc client support

* cluster rpc client support

* config change notify bettween server long connect support

* server push future refactor.

* server rpc sync compatibility support

* connection labels  support

* code fail fix
 2020-08-14 17:40:00 +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
nov.lzf
a0a1486fa2
rsocket support and optimize client abstract (#3559) 
* Add gprc support-> rpc Rsocket submit

* Add gprc support-> rpc Rsocket submit

* Add gprc support-> rpc Rsocket submit

* Add gprc support-> upgrade api client common jdk compiler to 1.8 for test Rsocket only

* Add gprc support-> rsocket client test code  submit

* Add gprc support-> rpc client factory optimize

* Add gprc support-> config client factory  rename

* Add gprc support-> rsocket submit

* Add gprc support-> rsocket client switch  submit

* Add gprc support-> rsocket support and optimize rpc client
 2020-08-10 09:11:53 +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
nov.lzf
05bd51062d
Add gprc support-> server push ack (#3521) 
* Add gprc support->  server push ack

* Add gprc support-> add lost code

* Add gprc support-> disconnect status change bugfix

* Add gprc support-> optimize rpc port
 2020-08-05 10:21:33 +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
杨翊 SionYang
5f528d8036
[ISSUE #1097] Naming support grpc server forward request (#3480) 
* re subscribe service when reconnect

* change grpc instance maintain by heartbeat

* Add lifecycle for remoting workers

* Refactor naming client redo when reconnect

* Fix checkstyle and PMD

* Implement forward instance request to responsible server

* Implement forward heart beat to servers
 2020-07-30 17:00:57 +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
nov.lzf
50a298c9af
switch server optimize and loader balance base on max client count (#3420) 
* Add gprc support-> authentication on client

* Add gprc support-> optimize switch server and submit loader balance base on up limit clients count.
 2020-07-23 10:26:25 +08:00
杨翊 SionYang
6c8dfd6ed3
Add naming support gRPC for query instance list and service info (#3352) 
* Add naming support gRPC for query instance list and service info

* Update version to 1.4.0-SNAPSHOT
 2020-07-16 18:08:25 +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
chuntaojun
b86f633c8a Merge branch 'develop' of https://github.com/alibaba/nacos into feature_1.3.0_beta_grpc 2020-05-16 14:36:49 +08:00
chuntaojun
afc74da826 build: update version to 1.3.0-BETA 2020-05-15 16:10:38 +08:00
chuntaojun
bc2de3c0ea Merge branch 'develop' of https://github.com/alibaba/nacos into feature_1.3.0_beta_grpc 2020-05-14 19:56:15 +08:00
chuntaojun
0c6a03724a fix: fix grpc-version bug 2020-05-14 16:25:41 +08:00
LoadChange
59d444a4a1 Merge langghaha-fix_2609 2020-05-13 17:32:47 +08:00
water.lyl
54e251da39 release 1.3-beta 2020-05-11 23:06:23 +08:00
chuntaojun
fa5769381c feat: jraft use grpc 2020-05-10 17:14:06 +08:00
chuntaojun
29a6edc8c5 refactor: fix bugs 2020-05-08 14:53:29 +08:00
chuntaojun
272abe6135 fix: fix parameter encode 2020-05-06 18:33:18 +08:00
chuntaojun
60b84a4981 refactor: merge upstream develop 2020-05-05 16:06:02 +08:00
chuntaojun
2526c5d8f2 fix: fix naming request redirect 2020-05-03 20:26:35 +08:00
chuntaojun
eca2aca6bb fix: bug fix 2020-05-01 10:09:08 +08:00
chuntaojun
eb11ff945b fix: fix standalone sync node info bug 2020-04-30 20:02:54 +08:00
chuntaojun
041effebc7 refactor: some code refactor 2020-04-30 13:46:04 +08:00
chuntaojun
a937e3090c fix: fix some bugs 2020-04-30 10:49:34 +08:00
chuntaojun
a025e56b3a fix: fix config dump bug 2020-04-28 15:08:38 +08:00
wfnuser
4baaef4b5a fix: ignore yarn-error log 2020-04-28 11:24:02 +08:00
wfnuser
986b543afd fix: allow empty line in config type preperties 2020-04-28 11:24:02 +08:00
zhenxianyimeng
6c495c045c keep query criteria 2020-04-28 11:20:48 +08:00
chuntaojun
8b4a37724f refactor: address mode adds setting parameters 2020-04-26 16:29:19 +08:00
chuntaojun
41e1f04914 refactor: code refactor 2020-04-24 22:42:02 +08:00
chuntaojun
e4c475295c refactor: remove complex logic, RPC ports can be customized 2020-04-23 15:22:16 +08:00
chuntaojun
853a8f587f refactor: core 
logic optimization
 2020-04-22 22:16:27 +08:00
langghaha
1bef71058f add 'groupName' parameter 2020-04-22 01:10:05 +08:00
chuntaojun
f222dccd3d refactor: code optimization 2020-04-21 17:14:59 +08:00
chuntaojun
a9918f2332 refactor: request forwarding logic adjustment 2020-04-19 09:25:28 +08:00
chuntaojun
0b3b5e83ac refactor(all): code optimization 2020-04-16 23:50:08 +08:00
chuntaojun
7586354476 refactor: bug fix and refactor init logic 2020-04-13 16:13:49 +08:00
chuntaojun
42626c029b docs: 2020-04-03 19:06:55 +08:00
chuntaojun
9f8c19cafb refactor: Change the distributed ID logic 2020-04-02 19:24:11 +08:00
nkorange
fd523b5e53 Build console 2020-03-31 14:38:43 +08:00
chuntaojun
66db5207d3 fix: merge upstream develop 2020-03-30 13:42:55 +08:00
LoadChange
74e34ea58b console fe release 2020-03-30 11:33:02 +08:00
chuntaojun
89a8dddc1c Merge branch 'develop' of https://github.com/alibaba/nacos into feature_consistency 2020-03-28 17:38:26 +08:00
Peter Zhu
f537ece5a4
Merge pull request #2504 from KeRan213539/fixImportAuthorityBug 
修复开启权限后导入失败的BUG
 2020-03-27 16:15:18 +08:00
nkorange
ea2a83c4be Update version to 1.2.1 2020-03-27 15:48:32 +08:00
chuntaojun
418f88d4c6 docs: Configuration file information changes 2020-03-27 12:36:07 +08:00
chuntaojun
16ba537a37 feat: #2530 2020-03-26 12:06:35 +08:00
qq213539
e299eee7a2 修复配制页面切换namespace失效,一直拿public数据的问题 2020-03-23 13:52:19 +08:00
qq213539
22e22124bc 修复克隆后列表不刷新的问题 2020-03-22 12:11:34 +08:00
qq213539
eae965981f 解决开启认证后导入失败的BUG 
导入失败时增加没权限的提示
解决克隆成功后列表不刷新的BUG
 2020-03-21 20:37:54 +08:00
dependabot[bot]
62036f7452 build(deps): bump acorn in /console/src/main/resources/static/console-fe 
Bumps [acorn](https://github.com/acornjs/acorn) from 6.4.0 to 6.4.1.
- [Release notes](https://github.com/acornjs/acorn/releases)
- [Commits](https://github.com/acornjs/acorn/compare/6.4.0...6.4.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-03-17 11:01:54 +08:00
LoadChange
9ce1aef61b fix: closes #2453 2020-03-16 08:44:24 +08:00
LoadChange
be5a5892e9 fix: closes #2451 2020-03-15 22:54:51 +08:00
LoadChange
c22a593396 fix: closes #2443 2020-03-15 21:24:04 +08:00
LoadChange
9c01fd3814 fix: closes #2457 2020-03-15 19:59:12 +08:00
LoadChange
51ce42593b fix: closes #2449 2020-03-15 18:48:21 +08:00
Peter Zhu
994da9cbeb
Merge pull request #2433 from loadchange/bugfix/20200308 
fix: new config add tag
 2020-03-09 17:07:57 +08:00
chuntaojun
f30c5ab757 docs: Uniform configuration format 2020-03-09 16:00:05 +08:00
LoadChange
59c19c442f fix: new config add tag 2020-03-08 22:55:45 +08:00
chuntaojun
0886653a08 feat(naming): Support empty service cleanup task time configurable 2020-03-08 00:00:44 +08:00
chuntaojun
86e3b0dbc9 fix(naming): Fixed a namespace parameter passing error 2020-03-06 19:33:06 +08:00
chuntaojun
f8fb011bd6 fix(naming): Fixed finalizeCnt error count problem 2020-03-06 16:36:50 +08:00
chuntaojun
502e9c7597 feat(naming): Support for automatic removal of empty services 2020-03-06 11:42:05 +08:00
nkorange
842818f4f0 Fix namespace get 403 2020-03-04 14:49:16 +08:00
nkorange
eb754eb62b Fix namespace get 403 2020-03-03 20:40:14 +08:00
nkorange
82d7147a58 Update version to 1.2.0 2020-03-03 16:24:08 +08:00
nkorange
025b1b4980 Fix test case error 2020-03-02 16:47:13 +08:00
nkorange
31e6063209 Update version to 1.2.0-beta.1 2020-02-23 20:02:13 +08:00
nkorange
13126a3af6 Add namespace page access control 2020-02-11 12:26:04 +08:00
LoadChange
94ddff5be5 fix: menu config 2020-02-07 09:09:15 +08:00
nkorange
da4192c4a5 Fix bug 2020-02-06 16:33:23 +08:00
LoadChange
43f3620474 fix: icon font url 2020-02-06 16:17:18 +08:00
LoadChange
abc6a44088 fix: configuration export 2020-02-06 13:41:42 +08:00
LoadChange
b6988b7516 fix: edit configuration 2020-02-06 13:41:42 +08:00
nkorange
1d81a6588d Update version to 1.2.0-beta.0 2020-02-05 14:11:09 +08:00
LoadChange
df9b939071 fix: loading error 2020-02-05 12:26:31 +08:00
LoadChange
7457b04e88 fix: redirect error 2020-02-04 23:12:44 +08:00
nkorange
374c575c79 #1105 fix bug 2020-02-04 17:21:33 +08:00
LoadChange
550faf9c50 fix: namespace value 2020-02-04 10:43:13 +08:00
LoadChange
25eb5580a6 fix: namespace show name join id 2020-02-04 09:46:28 +08:00
nkorange
23a44df512 #1105 fix bug 2020-02-04 09:27:02 +08:00
LoadChange
71ed0571a0 fix: repair resource 2020-02-03 22:35:37 +08:00
LoadChange
03e910ea59 fix: permissions management 2020-01-19 15:33:29 +08:00
LoadChange
093f94e51f Merge branch 'develop_1.2.0' of github.com:alibaba/nacos into develop_1.2.0 2020-01-16 20:11:29 +08:00
nkorange
bc5e3e1cce #1105 Finish auth IT cases 2020-01-15 17:57:01 +08:00
LoadChange
e298b423aa fix: eslint error 2020-01-14 21:15:50 +08:00
LoadChange
0b330c53cb fix: api error 2020-01-14 21:12:53 +08:00
LoadChange
0b41b3d394 feat: password confirmation 2020-01-14 20:18:50 +08:00
nkorange
1fb1f5f3e3 #1105 Add auth test case for config 2020-01-14 18:01:00 +08:00
LoadChange
f29079a411 Merge remote-tracking branch 'upstream/develop' into feature/191226 2020-01-13 11:40:06 +08:00
Peter Zhu
a425f7258e
Merge branch 'develop_1.2.0' into develop 2020-01-10 17:58:30 +08:00
Peter Zhu
13f5810751
Merge pull request #2266 from nkorange/feature_access_control 
Feature access control
 2020-01-10 17:54:29 +08:00
LoadChange
9f7e4f5a60 merge develop 2020-01-10 17:32:05 +08:00
LoadChange
c9b48081f1 feat: fe build 2020-01-10 17:26:03 +08:00
LoadChange
38e5dd9447 fix: authority menu 2020-01-10 16:47:15 +08:00
nkorange
82731985aa #1105 Add integration tests 2020-01-09 19:13:37 +08:00
LoadChange
d3cfcf7738 fix: 老接口加accessToken 2020-01-07 17:37:07 +08:00
LoadChange
df480e537e feat: privilege management i18n 2020-01-07 17:22:17 +08:00
LoadChange
4952172103 feat: roles management i18n 2020-01-07 16:57:45 +08:00
LoadChange
314e7b8cb2 feat: user management i18n 2020-01-07 16:45:18 +08:00
LoadChange
a43f337a5e feat: roles management 2020-01-06 19:50:26 +08:00
LoadChange
c5443dc9a7 feat: user management 2020-01-06 19:47:43 +08:00
nkorange
41dfcf5596 #1105 Read cache instead of accessing DB directly. 2020-01-06 14:35:11 +08:00
nkorange
b415ddaedf #1105 Access control finish 83% 2019-12-26 15:01:43 +08:00
qq213539
29fd50456f Merge branch 'develop' into sameNamespaceClone#2171 
# Conflicts:
#	console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigurationManagement/ConfigurationManagement.js
#	console/src/main/resources/static/css/main.css
#	console/src/main/resources/static/js/main.js
 2019-12-20 15:02:30 +08:00
LoadChange
7fa38b6389 refactor: update configuration && build 2019-12-19 17:40:19 +08:00
WG-Roy
be2ea09871 [优化muti delete config js展示bug] (#2191) 2019-12-19 16:55:04 +08:00
Peter Zhu
83eeeb6a23
Merge pull request #2199 from KeRan213539/RemoveDuplicateMethods 
Remove duplicate methods
 2019-12-19 13:32:28 +08:00
qq213539
0723fa279d tenantInfoCountByTenantId 2019-12-19 12:36:18 +08:00
Peter Zhu
c9fb61b20f
Merge pull request #2169 from zhenxianyimeng/zhenxianyimeng_fix_console_page_enter 
fix page enter bug in configuration Management page
 2019-12-19 11:59:41 +08:00
Peter Zhu
2acd50db1c
Merge pull request #2147 from easyhaloo/pageSize_change 
fix #2092 pageSize change
 2019-12-19 11:45:46 +08:00
Peter Zhu
a44fa8d0d9
Merge pull request #2163 from KeRan213539/customNamespaceId 
Custom namespace id
 2019-12-19 11:38:18 +08:00
nkorange
e2c553cbca #1105 Access control finish 80% 2019-12-18 20:25:10 +08:00
qq213539
52ceeecfa4 #2171 2019-12-18 14:41:03 +08:00
zhenxianyimeng
d457f58869 rebuild main.js and css.js 2019-12-13 10:17:57 +08:00
Peter Zhu
4029dd3d11
Merge pull request #2131 from hykjtt/develop 
issue fix #2093
 2019-12-12 22:47:56 +08:00
nkorange
013125c1ee #1105 Access control finish 60% 2019-12-12 18:57:36 +08:00
zhenxianyimeng
317ff2c0b7 fix page enter bug 2019-12-11 20:41:53 +08:00