Tree: 135d19e77f

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '135d19e77f'

${ noResults }

Commit Graph

11813 Commits (135d19e77f6db180d1dfa623cda2f05d607aa02b)

 

All Branches   

Search

Author	SHA1	Message	Date
wxz	a1a9f853a2	Merge branch 'wxz_feign_exception_show' into develop	4 years ago
wxz	b3cc5c0be8	gov-access开始改用FallbackFactory	4 years ago
sunyuchao	bd3a18a0cf	Merge branch 'dev_special_topic' into develop	4 years ago
sunyuchao	9d27eca645	小组总数热议话题单独拆除定时任务，凌晨三点执行	4 years ago
wxz	19619c886c	Merge branch 'wxz_feign_exception_show' into develop # Conflicts: # epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/ExceptionUtils.java	4 years ago
wxz	9eecb70e18	尝试使用FeignCLientFallbackFactory方式调用datastatistical	4 years ago
wxz	a230c99dea	Merge branch 'wxz_rocketmq_reg' into develop	4 years ago
wxz	0d80338dc5	Merge branch 'wxz_rocketmq_reg' into release_temp	4 years ago
wxz	533ec4e4d0	Merge branches 'dev' and 'release_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp	4 years ago
jianjun	3618a10648	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev	4 years ago
wxz	5250dba0c9	给当前用到mq的服务 ，修改mq注册方式	4 years ago
wxz	c06fa4cff9	修改：抽取rocketmq主要注册逻辑到rocketmq通用模块，各服务只做最简单的调用即可	4 years ago
jianjun	037b0ef1d8	Merge remote-tracking branch 'remotes/origin/dev_index_explain_fix' into dev	4 years ago
wxz	c5aa48918a	修改：抽取rocketmq主要注册逻辑到rocketmq通用模块，各服务只做最简单的调用即可	4 years ago
zhaoqifeng	b0f704ecc3	Merge branch 'dev_patrol_end' into dev	4 years ago
jianjun	c435431a97	Merge remote-tracking branch 'remotes/origin/develop' into release_temp	4 years ago
jianjun	8125d58ba8	Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
jianjun	4e7612b059	Merge branch 'dev_index_explain_fix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
jianjun	d3612f1d33	得分说明	4 years ago
wxz	07a8f41cc6	Merge branch 'wxz_project_changed_stats_consum' into develop	4 years ago
wxz	0cb9df24d3	Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop Conflicts: epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/GovernRankDataExtractServiceImpl.java epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml	4 years ago
wxz	3ef982b5d4	修改：项目变动rocketmq消费者，限制消费率逻辑微调	4 years ago
yinzuomei	4f979b5c91	大屏工作日志组织次数、总参与人次，接口按照组织次数降序排列	4 years ago
jianjun	5a021b192d	Merge remote-tracking branch 'remotes/origin/develop' into release_temp	4 years ago
jianjun	a19813560f	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop # Conflicts: # epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java	4 years ago
jianjun	49f1d0074f	月度得分 返回权重和原始值	4 years ago
yinzuomei	a1c5ca0581	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev # Conflicts: # epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java	4 years ago
yinzuomei	e3e40f60eb	Merge remote-tracking branch 'origin/develop' into release_temp	4 years ago
yinzuomei	c35333ddb8	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop	4 years ago
yinzuomei	848003b31a	一个错误包路径引发的xa	4 years ago
zhaoqifeng	1a540e2ab4	Merge branch 'dev_patrol_end' into develop	4 years ago
zhaoqifeng	e8de20b4c0	自动结束巡查定时任务	4 years ago
yinzuomei	13443f1af8	Merge remote-tracking branch 'origin/develop' into release_temp	4 years ago
yinzuomei	69a08e61fd	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop # Conflicts: # epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java	4 years ago
yinzuomei	63ca74ab2c	zancun	4 years ago
yinzuomei	10aeedb037	zancun	4 years ago
jianjun	931cfc2b2e	Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp	4 years ago
jianjun	7fa783bc3b	Merge remote-tracking branch 'remotes/origin/dev_index_explain_fix' into develop	4 years ago
jianjun	d6ce456ed8	得分说明 补充下下区县级的得分说明	4 years ago
yinzuomei	ad84f3d618	zancun	4 years ago
sunyuchao	eb9880d32c	Merge branch 'dev_gridmember_fusion' into dev	4 years ago
zxc	bac441ebac	Merge remote-tracking branch 'origin/dev_bug_auth_badge' into develop	4 years ago
zxc	8fbbfb7433	emm ，修改	4 years ago
yinzuomei	3ac1a523b5	工作日志插件数据采集增加pid,pids。	4 years ago
sunyuchao	8459293e38	Merge branch 'develop' into release_temp	4 years ago
sunyuchao	2fe214dcac	Merge branch 'release_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp	4 years ago
sunyuchao	3171689e16	Merge branch 'dev_gridmember_fusion' into develop	4 years ago
sunyuchao	760e0bed70	误删代码 人才的不行	4 years ago
zhaoqifeng	85c2ba3fa4	Merge branch 'dev_patrol_end' into develop	4 years ago
zhaoqifeng	53d6b3a571	自动结束巡查定时任务	4 years ago