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 |
|
yinzuomei
|
38d96b725f
|
146大屏查询接口
|
5 years ago |
wxz
|
4ff19ade7e
|
【版本升级】gov-issue
|
5 years ago |
|
wxz
|
45dba7f2ac
|
Merge branch 'dev'
|
5 years ago |
|
yinzuomei
|
5784c39b99
|
146数据采集
|
5 years ago |
|
yinzuomei
|
1485983686
|
epmet_evaluation_index、epmet_data_statistical_display库新增146体系相关表
|
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 |
|
yinzuomei
|
00cf9003c1
|
1、指标计算：IndexCalculateService.indexCalculate方法修改;2、所有指数查询接口添加@RequestHeader中的customerId
|
5 years ago |
|
yinzuomei
|
c12821a47b
|
Merge remote-tracking branch 'origin/dev_resi_header_customerid' into dev_areaCode
|
5 years ago |
|
wxz
|
b7aa1b4613
|
【gateway内部认证】resi/gov同时支持customerId写入header
|
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 |
|
zhaoqifeng
|
123d9f2ee1
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
|
zhaoqifeng
|
90e7ea00fa
|
代码上传
|
5 years ago |
|
zhaoqifeng
|
aa73c5ff9d
|
third服务升级 代码上传
|
5 years ago |
|
zhaoqifeng
|
9da8e39497
|
Merge branch 'dev'
|
5 years ago |
|
zhaoqifeng
|
1d76c7b500
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
|
zhaoqifeng
|
e0af1884fa
|
代码上传
|
5 years ago |
|
wxz
|
23efd3a65c
|
新增系统消息表
|
5 years ago |
|
wxz
|
9c6835bb48
|
请求第三方生成签名，用常量代替魔法值
|
5 years ago |
|
wxz
|
c220fdd269
|
Merge remote-tracking branch 'origin/dev_jcet' into dev_jcet
|
5 years ago |
|
wxz
|
37bac23a5f
|
将jcetApiService的实例化，从@Component改为ThirdplatConfig中统一实例化
|
5 years ago |
|
zxc
|
2fbbe4b4e9
|
login接口
|
5 years ago |
|
zxc
|
4c43dca2ad
|
login接口
|
5 years ago |
|
wxz
|
4de75be633
|
Merge remote-tracking branch 'origin/dev_jcet' into dev_jcet
|
5 years ago |
|
wxz
|
5596bf1bbf
|
修改部分与第三方平台调用相关代码
|
5 years ago |
sunyuchao
|
66c91053f7
|
推送微信消息按客户类型推送
|
5 years ago |
