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

904 Commits

Author SHA1 Message Date
Karson
4bd5b7c85a
support prometheus sd (#9518) 2022-11-17 11:13:51 +08:00
The-Gamer-01
b14cc257bf
[ISSUE #9510]Add sql log print function. (#9511) 
* [ISSUE #9510]Add sql log print function.

* [ISSUE #9510]Remove AspectJ and add sql proxy.

* [ISSUE #9510]Update data source plugin log.

* [ISSUE #9510]Update args log.

* [ISSUE #9510]Add unit test.
 2022-11-11 11:28:22 +08:00
李晓双 Li Xiao Shuang
0348014c17
[ISSUE #9490] Optimize datasource name configuration reading (#9491) 
* Optimize data source name configuration reading

* Optimize data source name configuration reading

* Compatible with old and new datasource platform read

* Compatible with old and new datasource platform read

* Compatible with old and new datasource platform read

* Compatible with old and new datasource platform read

* fix unit test

* fix unit test
 2022-11-08 09:22:33 +08:00
David-wu91
e5bbfe704d
resolve issue #9318 add ldap filter config:caseSensitive (#9444) 
* resolve issue #9318 add ldap filter config:caseSensitive

* resolve issue #9318 change code style

* resolve issue #9318 add unit test
 2022-11-07 17:24:53 +08:00
Weizhan Yun
c3c7e1ba1c
[ISSUE #9367] fix auth plugin's property 'token.secret.key' base64 decode error. (#9380) 
* 1. 修复密钥编码问题--为了避免歧义，密钥必须为base64编码的字符串；不再支持原始明文密钥。
2. JwtParser是线程安全的，重构为成员变量。

* 配置项保持明文字符串
 2022-11-03 13:40:26 +08:00
KomachiSion
469c43dddc Add console default resource server.port as 8848. 2022-10-24 20:06:53 +08:00
KomachiSion
f4438ac202 Follow 2.2.0 branch. 2022-10-21 15:33:04 +08:00
KomachiSion
aa6816b69f Merge remote-tracking branch 'upstream/2.2.0' into summer2022_issue#8308 
# Conflicts:
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/v2/InstanceControllerV2.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/v2/ServiceControllerV2.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/UtilsAndCommons.java
 2022-10-21 14:16:18 +08:00
KomachiSion
22169055ed Merge remote-tracking branch 'upstream/develop' into 2.2.0 
# Conflicts:
#	naming/src/main/java/com/alibaba/nacos/naming/core/Cluster.java
 2022-10-17 19:17:31 +08:00
zhouchunhai
3ca75cdc7f
fix bug #9263, lost page condition in configuration management page. (#9290) 2022-10-11 09:24:31 +08:00
DongYafei
94d812a269
fix api result (#9237) 2022-09-29 10:39:23 +08:00
zhouchunhai
1d8e5d9443
Feature #8941 Support Fuzzy Query in Authority Control--for ui change. (#9127) 2022-09-26 10:33:45 +08:00
阿魁
9a474a0ec5
Fix wrong and duplicate mysql connection configuration. (#9208) 2022-09-26 10:08:37 +08:00
DongYafei
0032b8cfc1
Add ClientInfoControllerV2 (#9197) 
* add ClientInfoControllerV2

* rename tenant to namespaceId
 2022-09-23 14:11:59 +08:00
karsonto
8d75c28151 resolve issue #9175 add ldap filter config 2022-09-20 11:56:44 +08:00
DongYafei
02b7280b69
[fix] rename ConfigVo, ConfigRequestInfoVo and NamespaceVo to ConfigForm, ConfigRequestInfo and NamespaceForm respectively (#9077) 2022-09-05 17:38:32 +08:00
DongYafei
f9824c8acb
fix NacosApiException (#9059) 2022-09-01 10:06:43 +08:00
onewe
c505a3f1f5
set server.error.include-message to ALWAYS (#9045) 2022-08-30 10:21:29 +08:00
KomachiSion
976f8a6729 Remove some old properties. 2022-08-29 20:19:04 +08:00
DongYafei
429d2bb5ee
for #8308, add namespace api v2.0 (#9012) 
* Add NamespaceControllerV2 and UT

* add api [query namespace by namespaceId]
 2022-08-26 09:51:58 +08:00
yjqg6666
cb3c78b93b
[#344] rename initialization sql files (#8969) 2022-08-25 16:54:18 +08:00
DongYafei
0df376afd5
for issue#8308, add config and config history api v2.0 (#8953) 
* Add ConfigV2Controller and HistoryV2Controller

* fix ConfigControllerV2 and HistoryControllerV2

* fix ConfigControllerV2Test and HistoryControllerV2Test

* add ConfigService and HistoryService

* fix HistoryControllerV2 and HistoryControllerV2Test

* rename ConfigService to ConfigOperationService
 2022-08-22 09:37:40 +08:00
chenhao26
bdf9d04ead
remove namespaceShowName uniqueness check (#8989) 2022-08-18 11:11:52 +08:00
@xiaochangbai
8c43096171
optimize: internationalization of product description content on landing pages (#8956) 2022-08-15 10:09:06 +08:00
chenhao26
b9609b365f
add some junit test (#8966) 
* add some junit test

* fix some junit

* add license
 2022-08-15 10:08:28 +08:00
heimanba
8cede1cf84
refactor: 💡 update console-ui theme (#8951) 
✅ Closes: https://github.com/alibaba/nacos/issues/8950
 2022-08-11 21:40:54 +08:00
onewe
54a3b9ebe3
[ISSUE #8880] add a request exception handler (#8881) 
* [ISSUE #8880] add a request exception handler

Close #8880

* [ISSUE #8880] retry ci
 2022-08-05 14:55:19 +08:00
chenhao26
de5ec356cc
import config file auth fail (#8844) 
* import config file auth fail

* run ci

* run ci2
 2022-08-01 16:48:55 +08:00
onewe
29d472e94a
[ISSUE #8784] fix some bugs for Console UI (#8787) 
* [ISSUE #8784] fix some bugs for Console UI

- add server.error.include-message property
- add no permission tip when push config
- use addAllowedOriginPattern instead of addAllowedOrigin
- remove RAM logic in the lib.js
- fix button type error and mode value error in NewConfig.js
- fix the password reset dialog can't show

Close #8784

* [ISSUE #8784] fix translate error

* [ISSUE #8784] user ON_PARAM instead of ALWAYS

* [ISSUE #8784] fix user reset password in the Header.js
 2022-07-25 09:56:20 +08:00
onewe
29b2fa4302
[ISSUE #8602] fix display error after delete current namespace (#8609) 
- fix some warnings, such as use rowProps instead of getRowProps etc
- MainLayout keeps namespace param

Close #8602
 2022-06-24 15:01:08 +08:00
Cherish 蔡梦缘
703925a84f
feat(#8472): [Dependency Governance] Remove useless dependencies. (#8472) (#8473) 2022-06-13 10:31:11 +08:00
onewe
b6db08bdd4
[ISSUE #8528] update server.tomcat.basedir default value (#8529) 
Close #8528
 2022-06-07 15:22:16 +08:00
onewe
d6f27409a6
[ISSUES #8417] throw a HttpSessionRequiredException when sessions expired (#8419) 
* [ISSUE #8417] throw a HttpSessionRequiredException when sessions expired

* [ISSUE #8417] add unit test

* [ISSUE #8417] repackage

Close #8417

* [ISSUE #8417] retry ci

* [ISSUE #8417] retry ci
 2022-05-23 15:17:51 +08:00
onewe
5926c67062
[ISSUE #8150] Add the namespace description item to the namespace list page (#8155) 
* [ISSUE #8150] Add the namespace description item to the namespace list page

Close #8150

* [ISSUE #8150] resolve conflict

Close #8150

* [ISSUE #8150] Rebuild console-ui
 2022-04-29 11:36:07 +08:00
onewe
eda178f27b
[ISSUE #8217] Rebuild console-ui (#8224) 
Close #8217
 2022-04-22 15:40:40 +08:00
onewe
af90533c8e
[ISSUE #8156] Add hash-tag for js and css (#8157) 
* [ISSUE #8156] Add hash-tag for js and css

- add index.html to copyList
- use index.ejs instead of index.html
- webpack enable hash

Close #8156

* [ISSUE #8156] Fix context-path error in development environment

Close #8156
 2022-04-20 10:20:26 +08:00
onewe
19185cb338
[ISSUE #8161] Icon-font-path and font-custom-path use relative path instead of absolute path (#8172) 
- banner.txt use `server.servlet.contextPath` instead of nacos

Close #8161
 2022-04-18 11:27:39 +08:00
Karson
fa09c65a30
Fix issue #7924 (#8062) 
* Fix issue#7924

* reformat code style
 2022-04-11 10:29:45 +08:00
杨翊 SionYang
9fbc7a1426
Keep actuator default close. (#8103) 2022-04-08 13:00:57 +08:00
chenhao26
d4edd011e6
clean NamespaceController code (#8097) 2022-04-08 10:15:02 +08:00
李晓双 Li Xiao Shuang
88fb26cfc6
[ISSUE #5695] Add config encrypt spi for nacos server. (#7934) 
* [ISSUE#5695] Add a plugin SPI for configuration encryption and decryption for Nacos 2.0 (#6655)

* Defines the interface

* 增加aes实现

* 客户端、服务端加解密实现

* 客户端、服务端加解密实现

* fix code quality (#6727)

* [ISSUE#5695] Add a plugin SPI for configuration encryption and decryption for Nacos 2.0, EncryptedDataKey is persisted (#6740)

* Defines the interface

* 增加aes实现

* 客户端、服务端加解密实现

* 客户端、服务端加解密实现

* 秘钥持久化

* 秘钥持久化

* [ISSUE#5695] Summer2021 Cache encryptedDataKey  (#6878)

* Defines the interface

* 增加aes实现

* 客户端、服务端加解密实现

* 客户端、服务端加解密实现

* 秘钥持久化

* 秘钥持久化

* 秘钥缓存到内存中

* 解决冲突

* 修改filter继承AbstractConfigFilter (#6879)

* [ISSUE#5695] Summer2021   EncryptedDataKey is persisted to Derby (#6882)

* [ISSUE#5695] Add a plugin SPI for configuration encryption and decryption for Nacos 2.0 (#6655)

* Defines the interface

* 增加aes实现

* 客户端、服务端加解密实现

* 客户端、服务端加解密实现

* fix code quality (#6727)

* # This is a combination of 6 commits.tree cf7a399f99c4d81b8667c8de06f5ceb8c79fb6f0
parent 8024ecf31bf23a9edab416be8a3bfd1c0e48ce5e
author 李晓双 Li Xiao Shuang <644968328@qq.com> 1630028256 +0800
committer lixiaoshuang <644968328@qq.com> 1631804378 +0800

# This is a combination of 3 commits.
# This is the 1st commit message:

[ISSUE#5695] Add a plugin SPI for configuration encryption and decryption for Nacos 2.0, EncryptedDataKey is persisted (#6740)

* Defines the interface

* 增加aes实现

* 客户端、服务端加解密实现

* 客户端、服务端加解密实现

* 秘钥持久化

* 秘钥持久化
# This is the commit message #2:

[ISSUE#5695] Summer2021 Cache encryptedDataKey  (#6878)

* Defines the interface

* 增加aes实现

* 客户端、服务端加解密实现

* 客户端、服务端加解密实现

* 秘钥持久化

* 秘钥持久化

* 秘钥缓存到内存中

* 解决冲突
# This is the commit message #3:

修改filter继承AbstractConfigFilter (#6879)


# This is the commit message #6:

客户端、服务端加解密实现

* parent 8024ecf31bf23a9edab416be8a3bfd1c0e48ce5e
author 李晓双 Li Xiao Shuang <644968328@qq.com> 1630028256 +0800
committer lixiaoshuang <644968328@qq.com> 1631805204 +0800

parent 8024ecf31bf23a9edab416be8a3bfd1c0e48ce5e
author 李晓双 Li Xiao Shuang <644968328@qq.com> 1630028256 +0800
committer lixiaoshuang <644968328@qq.com> 1631804378 +0800

[ISSUE#5695] Add a plugin SPI for configuration encryption and decryption for Nacos 2.0, EncryptedDataKey is persisted (#6740)

* 配置加解密插件

* derby支持秘钥存储

* 克隆功能兼容配置加解密 (#6913)

* [ISSUE#5695] Summer2021 Import/export compatible with configuration encryption and decryption (#6956)

* 克隆功能兼容配置加解密

* 导入导出兼容配置加解密

* 秘钥base64编码、更换AES加密模式 (#6974)

* [ISSUE#5695] Summer2021 add unit test for ConfigCryptoFilter (#6991)

* add unit test for ConfigCryptoFilter

* add unit test for ConfigCryptoFilter

* [ISSUE#5695] Summer2021 add unit test for CryptoExecutor (#6990)

* add unit test for CryptoExecutor

* add Copyright

* [ISSUE#5695] Summer2021  add unit test for CryptoManager (#6989)

* add unit test for CryptoManager

* add unit test for CryptoManager

* [ISSUE#5695] Summer2021 add unit test for AesCrypto (#6988)

* add unit test for AesCrypto

* update AesCryptoTest

* Increased iv randomness

* add default Iv

* fix javadoc

* fix unit test

* defining plugin intergace

* Replace the client encryption and decryption actuator

* Replace the server encryption and decryption actuator

* add unit test

* add unit test

* remove old code

* fix NacosConfigServiceTest

* Encryption and decryption to achieve migration

Co-authored-by: 杨翊 SionYang <263976490@qq.com>
 2022-03-16 10:54:11 +08:00
onewe
cd6d7e33b9
[ISSUE #7359] Add xss filter (#7364) 
- Set response header 'Content-Security-Policy'
 2022-03-14 10:34:16 +08:00
KomachiSion
1b5e422c6f Fix compile problem. 2022-01-26 13:58:29 +08:00
KomachiSion
9020bb9d6e Move plugin config to nacos-auth-plugin-impl module. 2022-01-26 11:54:52 +08:00
KomachiSion
4e4255a824 Move user controller to nacos-plugin-default-impl module. 2022-01-25 14:10:23 +08:00
KomachiSion
6a4ecc1323 Move default auth impl from console to nacos-plugin-default-impl module. 2022-01-24 17:47:54 +08:00
KomachiSion
89cc6caade Add plugin and auth-plugin module, and move class into module. 2022-01-21 15:06:09 +08:00
KomachiSion
be9516d037 Remove AuthManager.java 2022-01-21 13:49:30 +08:00
KomachiSion
80a6821bb7 Http request use new plugin. 2022-01-20 17:59:05 +08:00
KomachiSion
88818d0816 Http request use new plugin. 2022-01-20 16:04:20 +08:00
KomachiSion
d2e11a3de7 Add new ProtocolAuthService to replace AuthManager. 2022-01-20 14:22:43 +08:00
KomachiSion
dc1c05d2dc Repackage some auth classes. 2022-01-17 16:32:23 +08:00
KomachiSion
956df153d6 Add resource parser 2022-01-14 16:52:21 +08:00
KomachiSion
4e98013f8e Solve conflicts. 2022-01-12 17:02:20 +08:00
KomachiSion
78de31dbdd Merge remote-tracking branch 'upstream/develop' into issue#5696-merge-develop 
# Conflicts:
#	auth/src/main/java/com/alibaba/nacos/auth/common/AuthConfigs.java
#	client/src/main/java/com/alibaba/nacos/client/config/impl/ClientWorker.java
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingMaintainService.java
#	client/src/main/java/com/alibaba/nacos/client/naming/remote/AbstractNamingClientProxy.java
#	client/src/main/java/com/alibaba/nacos/client/naming/remote/NamingClientProxyDelegate.java
#	client/src/test/java/com/alibaba/nacos/client/naming/remote/AbstractNamingClientProxyTest.java
 2022-01-12 16:52:14 +08:00
杨翊 SionYang
b7910a6219
[ISSUE#5696] revert nacos server plugin implementation moved operation (#7636) 
* Revert "[ISSUE#5696] Fix auth server type (#7004)"

This reverts commit e3b7f0e7

* Revert "add derby database (#6996)"

This reverts commit fea9d727

* Revert "Add MySQL DataBase (#6968)"

This reverts commit 3c0508d2

* Revert "[ISSUE #5696] Add auth server implement (#6901)"

This reverts commit 76ac8434

* Move JwtAuthenticationTokenFilter to security package.

* refactor constants about auth.
 2022-01-12 16:45:18 +08:00
MajorHe1
c05f52ccb6
[ISSUE #7481] add user and role info to memory after db queried. (#7486) 2022-01-07 18:09:12 +08:00
rui.zhang
d05dff5139
fix: 在请求中保存用户信息到 httpsession 修复issue:#7141 (#7252) 2021-11-24 11:18:50 +08:00
onewe
d0b2c69d5e
fix: AuthConfigs illegal base64 character: '$' (#7209) 
- Add catch block, return getBytes result if base64 decode failed
- Add JwtTokenManager unit test

Closes #7203
 2021-11-12 11:02:45 +08:00
杨翊 SionYang
0719200c38
[ISSUE#7210] Add service rest api for v2. (#7211) 
* Add service rest api for v2.

* For PMD.
 2021-11-11 10:14:14 +08:00
brotherlu-xcq
3960beb869
[ISSUE #7006] remove the unnecessary popup when delete namespace. (#7007) 2021-10-08 09:27:17 +08:00
Wuyunfan-BUPT
e3b7f0e79f
[ISSUE#5696] Fix auth server type (#7004) 
* Add MySQL DataBase

* Add Derby Database

* Replace Auth Server

* Revise: change to AuthSystemType
 2021-09-28 19:30:20 +08:00
Wuyunfan-BUPT
af8d04f59b
Revise Auth server plugin (#6890) 2021-09-16 14:11:28 +08:00
brotherlu-xcq
3c95021c24
[ISSUE #6793] synchronize the betaIps in header and form data. (#6799) 2021-09-07 11:32:09 +08:00
brotherlu-xcq
05b0116b1b
[ISSUE #6749] fix the batch delete has no permission problem. (#6754) 2021-08-27 09:41:39 +08:00
brotherlu-xcq
ba6e161353
[ISSUE #6301] [TASK 2] change the UI and startup shell to support custom selector config. (#6691) 2021-08-20 09:32:31 +08:00
Wuyunfan-BUPT
ac878582e4
[ISSUE#5696] Add auth plugin interface. (#6593) 
* define plugin

* add User model

* add authContext

* add SPI

* add resource, modify request, reformat code

* copyright, Serverloader, IdentityContext

* add unit test

* modify ClassLoader, and delete GrantType

* delete redundancy code

* remove authservice default name

* Change to StringUtils
 2021-08-13 13:43:58 +08:00
brotherlu-xcq
fa2d4d0eb4
[ISSUE #6551] fix the console log and the dismiss word. (#6590) 2021-08-09 09:48:45 +08:00
brotherlu-xcq
561b0e6f71
[ISSUE #6510] fix the F1 cannot full screen. (#6513) 2021-08-02 09:42:43 +08:00
brotherlu-xcq
4dc87b4b25
[ISSUE #6296] optimize the new config page, when create the config successfully skip to list page. (#6496) 2021-07-29 10:52:10 +08:00
杨翊 SionYang
0e5c270aeb
Add Enterprise (#6472) 2021-07-27 15:40:30 +08:00
mask
414e2fa272
[ISSUE #6280] Fix word spell error. (#6281) 2021-07-06 09:42:54 +08:00
ZZQ的
3d000cf878
[ISSUE #6266] [console module] replace "*commons.lang3*.*Utils" to "com.alibaba.nacos.common.utils.*Utils" (#6267) 2021-07-05 17:07:25 +08:00
孙继峰
f36556657f
[ISSUE #6197] Use java.util.Objects instead of com.alibaba.nacos.common.utils.Objects (#6218) 2021-07-01 11:32:34 +08:00
MajorHe1
f4cf28afba
[ISSUE #6204] Get data from database if user or role info not found in cache. (#6206) 2021-06-30 15:11:18 +08:00
andotorg
1c85051e0b
add ldap print error log (#6068) 2021-06-15 20:16:38 +08:00
杨翊 SionYang
a5f1a5c2fd
Fix #5835, remove global params username. (#6014) 2021-06-09 14:49:50 +08:00
brotherlu-xcq
8e353b2561
[FOR #5843 controller/model/enums] improve the code quality of nacos-console. (#5846) 
* [code quality] [nacos-console] [controller/enums/model] fix the ResponseEntity, the if nest optimize, the constants export, the enum create.

* [code quality] [nacos-console] [controller/enums/model] add the javadoc for enums

* [code quality] [nacos-console] [controller/enums/model] license problem
 2021-05-27 10:59:06 +08:00
如梦技术
56404f7b13
Add automatic cleaning accesslog days. (#5848) 2021-05-26 10:11:41 +08:00
brotherlu-xcq
6fccc34bc9
[code quality] [nacos-console] [filter/security] the if nest optimize, the constants export, the Chinese doc fix (#5847) 2021-05-26 10:11:05 +08:00
brotherlu-xcq
6bc7c33188
[fix-#5713] fix the query param lost when use enter press to search (#5791) 2021-05-21 11:02:38 +08:00
KomachiSion
cf5a171ac5 Merge remote-tracking branch 'upstream/develop' into feature_support_grpc_core 
# Conflicts:
#	NOTICE
#	api/pom.xml
#	common/src/main/java/com/alibaba/nacos/common/notify/DefaultPublisher.java
#	config/src/main/java/com/alibaba/nacos/config/server/service/LongPollingService.java
#	naming/src/test/java/com/alibaba/nacos/naming/consistency/persistent/impl/NamingSnapshotOperationTest.java
#	naming/src/test/java/com/alibaba/nacos/naming/core/DomainsManagerTest.java
#	naming/src/test/java/com/alibaba/nacos/naming/healthcheck/ClientBeatCheckTaskTest.java
#	pom.xml
#	test/src/test/java/com/alibaba/nacos/test/core/JacksonUtils.java
 2021-05-14 11:04:52 +08:00
brotherlu-xcq
9300c39375
Fix the locales of field Action Type don't take effect in config history detail page (#5664) 
* fix #5623, the locale issue in config rollback page

* build the change
 2021-05-11 09:18:34 +08:00
plusmancn
7e57b90160
[ISSUE #3548] The srcUser fills with username when auth is disabled (console case) (#5566) 
* feat: srcUser fills with username (console case)

* fix: code sytle of Constants.java

* fix: code style of the remaining files

* fix: the back button of HistoryDetail.js won't work

* fix: change '源 IP' to '来源 IP'

* fix: undo changes of goList
 2021-05-10 20:41:35 +08:00
brotherlu-xcq
7165036362
change the Chinese notes to English (#5591) 2021-05-10 11:38:50 +08:00
孙继峰
818d37b71c
delete duplicated dependency (#5622) 2021-05-10 10:43:58 +08:00
brothelul
ae83b9b3d5
enhance the rollback message when it will delete the config. (#5529) 2021-04-30 18:04:37 +08:00
drgnchan
3aae93d523
fix #5517,invoke reQuery after change queryType (#5525) 2021-04-29 19:06:55 +08:00
KomachiSion
92da848375 Merge remote-tracking branch 'upstream/develop' into merge-1.X-to-2.0 
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/config/NacosConfigService.java
#	client/src/main/java/com/alibaba/nacos/client/config/impl/CacheData.java
#	client/src/main/java/com/alibaba/nacos/client/config/impl/ClientWorker.java
#	client/src/main/java/com/alibaba/nacos/client/naming/core/PushReceiver.java
#	console/src/main/resources/static/css/main.css
#	console/src/main/resources/static/js/main.js
#	naming/src/main/java/com/alibaba/nacos/naming/core/SubscribeManager.java
#	naming/src/test/java/com/alibaba/nacos/naming/core/SubscribeManagerTest.java
#	test/src/test/java/com/alibaba/nacos/test/BaseTest.java
 2021-04-27 15:57:24 +08:00
brothelul
3070bb8ffc
fix the press F1 to full screen issue in new config page (#5507) 2021-04-27 15:15:59 +08:00
brothelul
b148d4b503
fix the press F1 to full screen issue (#5505) 2021-04-27 14:07:12 +08:00
brothelul
72e5da6baf
[ISSUE #4770] Beta publish: change the way of select betaIps, from input to select (#5493) 
* change the way of select betaIps, from input to select

* solve the conflict and change the Select from mutiple to tag
 2021-04-27 09:41:51 +08:00
brothelul
81c1e53ac6
fix the tag remove error. (#5457) 2021-04-26 13:46:30 +08:00
TouchZZZ
4b4d21d54f
support ldap login (#5225) 2021-04-12 10:09:16 +08:00
ShawnSiao
f22b93cac3
fix #5234 (#5266) 2021-04-12 10:04:24 +08:00
邪影oO
5146fad227
fix #4852: main.js too large (#5199) 2021-03-26 13:43:06 +08:00
杨翊 SionYang
fb9300d87f
Nacos2.0 adapt batch instance metadata operate (#5141) 
* Rebuild ui

* Nacos2.0 adapt batch instance metadata operate
 2021-03-19 11:48:06 +08:00
KomachiSion
6cda5ad55a Merge remote-tracking branch 'upstream/develop' into develop-merge-to-2.0 
# Conflicts:
#	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/config/impl/YmlChangeParserTest.java
#	common/src/main/java/com/alibaba/nacos/common/http/param/Header.java
#	common/src/main/java/com/alibaba/nacos/common/utils/ConcurrentHashSet.java
#	config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigController.java
#	console/src/main/resources/static/js/main.js
#	core/src/main/java/com/alibaba/nacos/core/cluster/ServerMemberManager.java
#	core/src/main/java/com/alibaba/nacos/core/utils/Loggers.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/InstanceController.java
#	naming/src/main/java/com/alibaba/nacos/naming/healthcheck/HealthCheckReactor.java
#	pom.xml
 2021-03-18 12:08:45 +08:00
邪影oO
3a86bd1020
登录框增加提示信息 (#4903) 
* 登陆框增加提示信息

* 前端编译
 2021-02-08 11:41:56 +08:00
nov.lzf
0449fbc707
move server loader controller from console to core; modify common server scheduler count to solve large cpu usage (#4872) 
* move server loader controll from  console to core

* modify common server scheduler count to solve large cpu usage
 2021-02-04 14:09:08 +08:00