EricZeng
10a27bc29c
Merge pull request #443 from lucasun/master
...
V2.6.0 FE
2022-01-18 14:24:17 +08:00
Hu.Yue
542e5d3c2d
Merge branch 'didi-dev' into devLookUserName
2022-01-18 14:09:05 +08:00
lucasun
7372617b14
Merge branch 'didi:master' into master
2022-01-18 14:07:44 +08:00
Hu.Yue
89735a130b
Merge branch 'dev' of https://github.com/didi/LogiKM into didi-dev
2022-01-18 14:07:34 +08:00
孙超
859cf74bd6
2.6.0问题修复
2022-01-18 14:05:32 +08:00
zengqiao
e2744ab399
bump version to 2.6.0
2022-01-18 14:00:20 +08:00
Hu.Yue
16bd065098
Merge branch 'dev' of https://github.com/didi/LogiKM into didi-dev
2022-01-18 13:58:16 +08:00
zengqiao
71c52e6dd7
bump springboot version to 2.1.18 and ignore springframework version config
2022-01-17 21:18:06 +08:00
EricZeng
a7f8c3ced3
Merge pull request #440 from didi/dev
...
1.安装部署脚本LogiKM可配置; 2.增加网关接口及第三方接口可直接调用的开关;
2022-01-17 21:08:55 +08:00
zengqiao
f3f0432c65
1.安装部署脚本LogiKM可配置; 2.增加网关接口及第三方接口可直接调用的开关;
2022-01-17 20:41:53 +08:00
EricZeng
426ba2d150
Merge pull request #439 from didi/dev
...
1、修复swagger抛出的NumberFormatException问题； 2、Swagger提示版本和POM中版本通过配置保持一致； 3、梳理Task模块任务-BrokerMetrics任务梳理；
2022-01-17 20:39:10 +08:00
zengqiao
2790099efa
梳理Task模块任务-BrokerMetrics任务梳理
2022-01-17 15:28:36 +08:00
zengqiao
f6ba8bc95e
Swagger提示版本和POM中版本通过配置保持一致
2022-01-17 13:17:07 +08:00
zengqiao
d6181522c0
修复swagger抛出的NumberFormatException问题
2022-01-17 11:42:30 +08:00
EricZeng
04cf071ca6
Merge pull request #437 from didi/dev
...
增加简单回退工具类，增加Jmx连接失败回退功能机制，优化Jmx连接失败日志
2022-01-15 13:56:44 +08:00
zengqiao
e4371b5d02
修正注释
2022-01-14 14:28:45 +08:00
zengqiao
52c52b2a0d
增加简单回退工具类，增加Jmx连接失败回退功能机制，优化Jmx连接失败日志
2022-01-14 14:24:04 +08:00
EricZeng
8f40f10575
Merge pull request #436 from didi/dev
...
1. 增加对BrokerMetadata中endpoints为internal|External方式的解析; 2. 增加线程池、客户端池可配置; 3. fix config incorrectly comment
2022-01-13 16:28:34 +08:00
zengqiao
fe0f6fcd0b
fix config incorrectly comment
2022-01-13 16:02:33 +08:00
EricZeng
31b1ad8bb4
Merge pull request #435 from kingdomrushing/dev_v2.6.0
...
增加线程池、客户端池可配置 & 增加对BrokerMetadata中endpoints为internal|External方式的解析
2022-01-13 15:51:54 +08:00
xuguang
373680d854
线程池 & BrokerMetadata 问题修复
2022-01-13 15:39:39 +08:00
xuguang
9e3bc80495
线程池 & BrokerMetadata 问题修复
2022-01-13 15:35:11 +08:00
EricZeng
89405fe003
Merge pull request #434 from didi/fix_2.5.0
...
修复console模块关闭问题及前端文件名错误问题
2022-01-13 14:00:01 +08:00
shirenchuang
b9ea3865a5
升级到2.5版本
...
(cherry picked from commit 5bc6eb6774
2022-01-13 13:47:21 +08:00
孙超
b5bd643814
修复图片名称大小写问题
...
(cherry picked from commit ada2718b5e
2022-01-13 13:46:06 +08:00
xuguang
52ccaeffd5
解决依赖冲突
2022-01-13 11:48:43 +08:00
kingdomrushing
18136c12fd
Merge branch 'didi:master' into dev_v2.6.0
2022-01-13 11:41:20 +08:00
EricZeng
dec3f9e75e
Merge pull request #429 from didi/dev
...
ldap config add default value
2022-01-13 11:40:46 +08:00
EricZeng
ccc0ee4d18
Merge pull request #432 from didi/master
...
merge master to dev
2022-01-13 11:40:17 +08:00
kingdomrushing
69e9708080
Merge branch 'dev' into dev_v2.6.0
2022-01-13 11:39:50 +08:00
lucasun
5944ba099a
Merge pull request #431 from lucasun/hotfix/2.5.0_fe
...
修复图片名称大小写问题
2022-01-13 11:17:25 +08:00
孙超
ada2718b5e
修复图片名称大小写问题
2022-01-13 11:13:26 +08:00
lucasun
1f87bd63e7
Merge pull request #416 from potaaaaaato/master
...
update echarts from v4 to v5
2022-01-13 10:55:34 +08:00
xuguang
c0f3259cf6
增加线程池、客户端池可配置
2022-01-12 19:56:37 +08:00
EricZeng
e1d5749a40
Merge pull request #428 from didi/dev
...
Dockerfile mv application.yml to fix start failed problem
2022-01-12 18:14:20 +08:00
zengqiao
a8d7eb27d9
ldap config add default value
2022-01-12 18:03:16 +08:00
zengqiao
1eecdf3829
Dockerfile mv application.yml to fix start failed problem
2022-01-12 17:45:40 +08:00
EricZeng
be8b345889
Merge pull request #427 from didi/dev
...
del unused jmx_prometheus_javaagent-0.14.0.jar
2022-01-12 17:40:48 +08:00
zengqiao
074da389b3
del unused jmx_prometheus_javaagent-0.14.0.jar
2022-01-12 17:32:13 +08:00
xuguang
4df2dc09fe
增加对BrokerMetadata中endpoints为internal|External方式的解析
2022-01-12 16:15:46 +08:00
EricZeng
e8d42ba074
Merge pull request #425 from didi/dev
...
1. optimize reeassign task-name; 2. ignore read kafka-controller data when znode not exist; 3.add region created event and handle it to cal region capacity immediately;
2022-01-12 11:44:22 +08:00
zengqiao
c036483680
add region created event and handle it to cal region capacity immediately
2022-01-11 17:49:17 +08:00
zengqiao
2818584db6
ignore read kafka-controller data when znode not exist
2022-01-11 17:19:14 +08:00
zengqiao
37585f760d
optimize reeassign task-name
2022-01-11 16:57:24 +08:00
EricZeng
f5477a03a1
Merge pull request #364 from Huyueeer/devConfig
...
平台配置EXPIRED_TOPIC_CONFIG新增正则过滤Topic
2022-01-11 16:33:21 +08:00
EricZeng
50388425b2
Merge pull request #424 from didi/dev
...
1.add lombok; 2.support change delete metrics rate;
2022-01-11 16:29:43 +08:00
zengqiao
725c59eab0
support change delete metrics rate
2022-01-11 16:03:22 +08:00
zengqiao
7bf1de29a4
add lombok
2022-01-11 14:04:48 +08:00
EricZeng
d90c3fc7dd
Merge pull request #423 from didi/dev
...
1. bump swagger version; 2. fix NPE when flush logical cluster and physical cluster not in cache or not exist; 3. JmxConnectorWrap's log add cluster and broker info;
2022-01-11 13:16:46 +08:00
zengqiao
80785ce072
JmxConnectorWrap's log add cluster and broker info
2022-01-11 11:45:28 +08:00
