wxz
|
2e008442b7
|
Merge remote-tracking branch 'origin/dev' into dev_openapi
|
4 years ago |
|
wxz
|
24cbcb3f95
|
Merge branch 'dev_thirdplatform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform
|
4 years ago |
|
wxz
|
686d42b4cd
|
修改：
1.第三方平台接入，AccessToken缓存动作从具体的子类提取到了ApiService中，子类只需要调用ApiService提供的addAccessTokenToCache()/getAccessTokenFromCache()方法即可
|
4 years ago |
zhaoqifeng
|
15e2b8d896
|
Merge branch 'dev_thirdplatform' into dev_temp
|
4 years ago |
|
zhaoqifeng
|
e1dfc04a5c
|
项目发送到第三方平台 detail
|
4 years ago |
|
wxz
|
ed2e3ff8e2
|
修改：ApiService基类中的一些方法的异常文案
修改：放开了调用网格化平台的代码，开始正式调用
调通了对网格化平台的事件上报
|
4 years ago |
wangchao
|
63e480b6ef
|
Merge branch 'dev_bugfix_0324_difficulty' into dev_temp
|
4 years ago |
|
wangchao
|
2a6bf3cf8e
|
难点赌点不用单独更新dataEndTime
|
4 years ago |
|
wangchao
|
c1652c3704
|
Merge branch 'dev_bugfix_0324_difficulty' into dev_temp
|
4 years ago |
|
wangchao
|
12a5d22435
|
筛选符合难点赌点的项目sql修改
|
4 years ago |
|
wangchao
|
88ac6d948f
|
项目引用标签更新时的计算修改
|
4 years ago |
|
wxz
|
0e0f3142e4
|
新增：
验签注解和AOP
|
4 years ago |
sunyuchao
|
2986a786a5
|
Merge branch 'dev_issue_category' into dev_temp
|
4 years ago |
jianjun
|
84f01bd7c6
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_ljj' into dev
|
4 years ago |
|
jianjun
|
1832b8982e
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_ljj' into dev_temp
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
|
4 years ago |
|
jianjun
|
5905f69f4a
|
不从缓存取 了因为麻烦 不见得效率高
|
4 years ago |
|
sunyuchao
|
58a6d5c5b6
|
议题分类表添加字段 sql调整
|
4 years ago |
|
wxz
|
9cc61899a0
|
补充提交
|
4 years ago |
|
wxz
|
604c78541a
|
新增：
接口手动验签
|
4 years ago |
|
sunyuchao
|
4808c5fd10
|
Merge branch 'dev_issue_category' into dev_temp
# Conflicts:
# epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
|
4 years ago |
|
sunyuchao
|
8aea84d02d
|
解决议题转项目bug问题
|
4 years ago |
|
jianjun
|
a1fb34627a
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_ljj' into dev_temp
|
5 years ago |
|
jianjun
|
ebd8b16c9c
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_ljj' into dev
|
5 years ago |
|
jianjun
|
23c3c414c4
|
因为数据库不一致导致的bug
|
5 years ago |
|
wangchao
|
17d4db86d5
|
①修改默认标签的排序方法
②修改搜索标签时查询为null时的补偿方法
③新增批量修改二级分类下的标签在缓存中的"是否禁用"属性
|
5 years ago |
|
jianjun
|
348d9459ab
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_ljj' into dev
|
5 years ago |
|
jianjun
|
ca2ef72f15
|
垃圾代码清理-注释的代码已经挪到其他方法里，无需在这放着了
|
5 years ago |
|
jianjun
|
5604868acf
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_ljj' into dev_temp
|
5 years ago |
|
jianjun
|
3cd831408c
|
替换feign的client端使用okhttp
|
5 years ago |
|
jianjun
|
92df82d855
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_ljj' into dev_temp
|
5 years ago |
|
jianjun
|
03c1760144
|
替换feign的client端-测试
|
5 years ago |
|
jianjun
|
5522dfbaf4
|
Merge remote-tracking branch 'remotes/origin/dev_ljj' into dev_temp
|
5 years ago |
|
jianjun
|
6c44ba2e45
|
Revert "分析下登陆接口 各个阶段耗时"
This reverts commit e0161568
|
5 years ago |
|
jianjun
|
6467aada61
|
Revert "分析下登陆接口 各个阶段耗时"
This reverts commit 32dbd62d
|
5 years ago |
|
wangchao
|
2dcdbd172a
|
Merge remote-tracking branch 'origin/dev_issue_category' into dev_issue_category
|
5 years ago |
|
sunyuchao
|
a3c55ef3f5
|
Merge branch 'dev_issue_category' into dev_temp
|
5 years ago |
|
sunyuchao
|
abbba792a9
|
接口自测问题修改
|
5 years ago |
|
jianjun
|
b7d9e22f95
|
Merge remote-tracking branch 'remotes/origin/dev_ljj' into dev_temp
|
5 years ago |
|
jianjun
|
32dbd62d36
|
分析下登陆接口 各个阶段耗时
|
5 years ago |
|
jianjun
|
5822cdf028
|
Merge remote-tracking branch 'remotes/origin/dev_ljj' into dev_temp
|
5 years ago |
|
jianjun
|
e01615689e
|
分析下登陆接口 各个阶段耗时
|
5 years ago |
zhangyongzhangyong
|
cfe0913cb0
|
客户分类列表
|
5 years ago |
|
zhangyongzhangyong
|
87868161ca
|
一级、二级分类新增/修改
|
5 years ago |
yinzuomei
|
72bfff720e
|
Merge remote-tracking branch 'origin/dev_issue_category' into dev_temp
|
5 years ago |
|
yinzuomei
|
25f34e8c97
|
项目分类采集api
|
5 years ago |
|
yinzuomei
|
b6be4490a3
|
Merge remote-tracking branch 'origin/dev_longwan0323' into dev_temp
|
5 years ago |
|
yinzuomei
|
4945189426
|
龙湾项目分布接口默认按照转项目时间降序返回前20
|
5 years ago |
|
wangchao
|
7b4aee8032
|
Merge remote-tracking branch 'origin/dev_issue_category' into dev_issue_category
|
5 years ago |
|
sunyuchao
|
cb28719d7c
|
Merge branch 'dev_issue_category' into dev_temp
|
5 years ago |
|
sunyuchao
|
3227011268
|
代码逻辑调整
|
5 years ago |
