jianjun
|
03107adfee
|
Merge remote-tracking branch 'remotes/origin/dev_fegin_concurrent' into pingyin_master
|
3 years ago |
|
jianjun
|
2188e14a4a
|
日志4 - match22222123123123
|
3 years ago |
|
jianjun
|
cd8d40bd13
|
日志4 - match22222
|
3 years ago |
|
jianjun
|
d7685db2e3
|
Merge remote-tracking branch 'remotes/origin/dev_fegin_concurrent' into pingyin_master
|
3 years ago |
|
jianjun
|
fa9836e394
|
日志4 - match
|
3 years ago |
|
jianjun
|
61d97d42ab
|
Merge remote-tracking branch 'remotes/origin/dev_fegin_concurrent' into pingyin_master
# Conflicts:
# epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java
|
3 years ago |
|
jianjun
|
836e629464
|
日志3
|
3 years ago |
|
jianjun
|
9e38c0ec38
|
日志2
|
3 years ago |
zxc
|
d199858637
|
该多条
|
3 years ago |
yinzuomei
|
fcb80f0bd7
|
mini_ding.concat(suiteKey)
|
3 years ago |
|
jianjun
|
fb76917f79
|
日志
|
3 years ago |
|
jianjun
|
8a1aba189e
|
日志
|
3 years ago |
|
yinzuomei
|
fd0e388e43
|
还原
|
3 years ago |
|
yinzuomei
|
6aedb7b9f3
|
还原
|
3 years ago |
|
jianjun
|
6adb956ccc
|
Merge remote-tracking branch 'remotes/origin/dev_fegin_concurrent' into pingyin_master
|
3 years ago |
|
jianjun
|
8b0bc572c2
|
登陆接口 添加缓存 存24小时吧
|
3 years ago |
|
jianjun
|
e5520edf63
|
Merge remote-tracking branch 'remotes/origin/dev_fegin_concurrent' into pingyin_master
|
3 years ago |
|
jianjun
|
13404133d2
|
登陆接口 添加缓存
|
3 years ago |
|
yinzuomei
|
51f1528d25
|
Merge remote-tracking branch 'origin/dev_dingding' into dev_dingding
|
3 years ago |
|
zxc
|
fcb8287333
|
Merge branch 'dev_special_focus_update'
|
3 years ago |
|
yinzuomei
|
97ccebaa52
|
4个钉钉应用token分开存储
|
3 years ago |
|
jianjun
|
53472089b7
|
Revert "Revert "上报事件 客户id 如果没有 从token里取""
This reverts commit b4d19da2
|
3 years ago |
|
jianjun
|
464098258f
|
Revert "Revert "上报事件 客户id 如果没有 从token里取 gateway""
This reverts commit 737865fd
|
3 years ago |
|
zxc
|
5138b5985b
|
a
|
3 years ago |
|
jianjun
|
b4d19da271
|
Revert "上报事件 客户id 如果没有 从token里取"
This reverts commit 853e0f27
|
3 years ago |
|
jianjun
|
737865fd13
|
Revert "上报事件 客户id 如果没有 从token里取 gateway"
This reverts commit a232c131
|
3 years ago |
|
zxc
|
ac7b6637c9
|
导入微调
|
3 years ago |
|
yinzuomei
|
1e4f66b63c
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj'
|
3 years ago |
|
yinzuomei
|
7e6cb446c2
|
事件管理列表查询时间改为发生时间检索
|
3 years ago |
|
yinzuomei
|
dbd6a8a441
|
listProcessAnalysisEvents happen_time desc
|
3 years ago |
|
jianjun
|
d3c8ac31dc
|
Merge remote-tracking branch 'remotes/origin/dev_fegin_concurrent' into pingyin_master
|
3 years ago |
|
zxc
|
fb2e7c326e
|
导入微调
|
3 years ago |
|
jianjun
|
98b22ff8c4
|
登陆接口 添加缓存和线程池执行
|
3 years ago |
|
zxc
|
c3c69f449a
|
导出微调
|
3 years ago |
|
jianjun
|
8e4461a8bf
|
fegin没有线程池的 配上
|
3 years ago |
|
jianjun
|
8c47fb1009
|
crm 也没有
|
3 years ago |
|
jianjun
|
ac2a1a3d30
|
Merge remote-tracking branch 'remotes/origin/dev_fegin_concurrent' into pingyin_master
|
3 years ago |
|
jianjun
|
3307063871
|
通过账号登陆 方法优化
|
3 years ago |
|
yinzuomei
|
4a49e06797
|
加个日志
|
3 years ago |
|
jianjun
|
b2815d7482
|
通过账号登陆 方法优化
|
3 years ago |
|
zxc
|
ef8a8d7feb
|
导入修改+sql脚本
|
3 years ago |
|
jianjun
|
8dc1728d40
|
Merge remote-tracking branch 'remotes/origin/master' into dev_fegin_concurrent
|
3 years ago |
|
jianjun
|
6931ca0841
|
Merge remote-tracking branch 'remotes/origin/feature/py_loginaccount'
|
3 years ago |
|
jianjun
|
dde84a6c3d
|
合并多余方法
|
3 years ago |
|
jianjun
|
e23c7b6a91
|
Merge remote-tracking branch 'remotes/origin/dev_fegin_concurrent' into pingyin_master
# Conflicts:
# epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.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
|
3 years ago |
|
jianjun
|
487536a69e
|
auth fegin添加线程池
|
3 years ago |
|
zxc
|
690784b080
|
a
|
3 years ago |
|
zxc
|
8ebccd13c3
|
a
|
3 years ago |
|
zxc
|
558ecac8cb
|
a
|
3 years ago |
|
zxc
|
ac9cc2f091
|
a
|
3 years ago |
