wxz
							
						 | 
						
							
							
							
								
							
								f7fac8e15c
								
							
								
							
						 | 
						
							
							
								
								版本升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								6411f12f6f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								83a7b6b5d1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_jcet' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								27b44593a2
								
							
								
							
						 | 
						
							
							
								
								增加请求酒城e通后台的日志
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								165fc03c80
								
							
								
							
						 | 
						
							
							
								
								部署heart 添加发送消息时 404重试一次
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								e6c87975c1
								
							
								
							
						 | 
						
							
							
								
								发送mq消息 如果失败重试1次
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								88900a3235
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								5fee231303
								
							
								
							
						 | 
						
							
							
								
								修改发送消息网关消息日志级别
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								13db6951cd
								
							
								
							
						 | 
						
							
							
								
								版本升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								50b5ca3e0c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_init_syc' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								19dc19c458
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								8ac0c4cea7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_jcet' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								c548d2e4ca
								
							
								
							
						 | 
						
							
							
								
								新增生产环境的jcet配置
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ecb2078cce
								
							
								
							
						 | 
						
							
							
								
								user、gov-mine、gov-org、resi-group +1
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e3dfdeede4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ed86f3f24d
								
							
								
							
						 | 
						
							
							
								
								机器人报警群日志降级、空指针修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								be0c17d670
								
							
								
							
						 | 
						
							
							
								
								撤回修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								b5037d315b
								
							
								
							
						 | 
						
							
							
								
								epmet_evaluation_index库,不存在customerId的表,添加字段,对应DTO和Entity修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								116ae9c353
								
							
								
							
						 | 
						
							
							
								
								客户初始化新增积分规则和指标计算初始化方法
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								34c90c35d4
								
							
								
							
						 | 
						
							
							
								
								先锋模范,bug修复发布
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								dd041dff2b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								547dced5b5
								
							
								
							
						 | 
						
							
							
								
								先锋模范bug修复
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a0c80e1588
								
							
								
							
						 | 
						
							
							
								
								群链接日志降级warn ,fabu
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ee2bc6359f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								20ce4d5548
								
							
								
							
						 | 
						
							
							
								
								群链接日志降级warn
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								4ff19ade7e
								
							
								
							
						 | 
						
							
							
								
								【版本升级】gov-issue
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								45dba7f2ac
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								f33bbc03ba
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_zxc_bug' into dev_jcet
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-commons/pom.xml
#	epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
#	epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
#	epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								261c05104c
								
							
								
							
						 | 
						
							
							
								
								issue-process
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								4883b64455
								
							
								
							
						 | 
						
							
							
								
								已转项目列表分页
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								4de7a3a272
								
							
								
							
						 | 
						
							
							
								
								【sso登录】将配置放到pom中
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								44e1f4e79e
								
							
								
							
						 | 
						
							
							
								
								【sso登录】根据customerid查询apiService接口,crm服务增加redis缓存
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								3b2f78a0fd
								
							
								
							
						 | 
						
							
							
								
								修改sso登录,使更灵活...
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								ee2afc5f86
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_jcet' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_jcet
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								65558cd14f
								
							
								
							
						 | 
						
							
							
								
								修改sso登录,使更灵活...
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								cf4c1d02e7
								
							
								
							
						 | 
						
							
							
								
								login接口
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								9ae6528aaa
								
							
								
							
						 | 
						
							
							
								
								login接口
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								1cb0bc2ec9
								
							
								
							
						 | 
						
							
							
								
								/sso 获取用户最近访问的网格请求类型修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								2be4cf270a
								
							
								
							
						 | 
						
							
							
								
								mq初始化客户
							
							
							
							
							
							
								
							
							
							版本升级 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								526eebc660
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								edd0c3760d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_mq_init_customer' into dev
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java
#	epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java
#	epmet-module/epmet-message/epmet-message-server/pom.xml 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								60b3184fea
								
							
								
							
						 | 
						
							
							
								
								login接口
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								3d1a571cd3
								
							
								
							
						 | 
						
							
							
								
								login接口
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								e8e885c02e
								
							
								
							
						 | 
						
							
							
								
								删除错误提交的SSOLoginController
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								0d4c800432
								
							
								
							
						 | 
						
							
							
								
								login接口
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								4a94e86dbd
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_jcet' into dev_jcet
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								facda9c629
								
							
								
							
						 | 
						
							
							
								
								第三方平台:修改查询用户byTicket方法
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								9d7b1cfff2
								
							
								
							
						 | 
						
							
							
								
								login接口
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								a859518545
								
							
								
							
						 | 
						
							
							
								
								third服务升级 代码上传
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								6fa63ecd54
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev'
							
							
							
							
								
							
							
						 | 
						5 years ago |