jianjun
|
00591cd10e
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
e03de9c6d8
|
线程池不够用问题
|
4 years ago |
|
jianjun
|
54f84ec71e
|
id生成重复问题 up
|
4 years ago |
|
jianjun
|
52b2034261
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into pingyin_master
Conflicts:
epmet-user/epmet-user-server/src/main/java/com/epmet/util/MySequence.java
|
4 years ago |
|
jianjun
|
ba6d4d4d29
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
2dd4f1b220
|
id生成重复问题
|
4 years ago |
|
jianjun
|
6625dd2adf
|
测试下
|
4 years ago |
|
jianjun
|
ae52800029
|
打印下worerId up3
|
4 years ago |
|
jianjun
|
d6f7b66fd3
|
打印下worerId up2
|
4 years ago |
|
jianjun
|
e318a525b3
|
打印下worerId up2
|
4 years ago |
|
jianjun
|
febaafe717
|
打印下worerId up
|
4 years ago |
|
jianjun
|
4c901f8d44
|
stats 配置driud连接池 修改up
|
4 years ago |
|
jianjun
|
729db7858e
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into pingyin_master
|
4 years ago |
|
jianjun
|
77c7703c2e
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
09d19f519b
|
stats 配置driud连接池 修改
|
4 years ago |
|
jianjun
|
dcca44196a
|
stats 配置driud连接池 up
|
4 years ago |
|
jianjun
|
15d09202fe
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into pingyin_master
|
4 years ago |
|
jianjun
|
238ffa6181
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
26e7db0ca0
|
stats 配置driud连接池
|
4 years ago |
|
jianjun
|
1473c9e353
|
超时打印日志 up
|
4 years ago |
|
jianjun
|
3e40096ea3
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into pingyin_master
|
4 years ago |
|
jianjun
|
d5ea391a19
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
ce0eb794e2
|
超时打印日志
|
4 years ago |
|
jianjun
|
c5901e4e37
|
id 重复 试下 up
|
4 years ago |
|
jianjun
|
b174434cd4
|
Merge branches 'dev' and 'pingyin_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into pingyin_master
|
4 years ago |
|
jianjun
|
d3de5f684c
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
33661f258e
|
id 重复 试下
|
4 years ago |
|
jianjun
|
a19622ca07
|
消费巡查消息调整 up
|
4 years ago |
|
jianjun
|
d3aabe8375
|
Merge remote-tracking branch 'remotes/origin/dev' into pingyin_master
|
4 years ago |
|
jianjun
|
118c930d89
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
7e41369e96
|
消费巡查消息调整
|
4 years ago |
wangxianzhang
|
ab9f6b5102
|
open-data服务直连中间库即可
|
4 years ago |
|
wangxianzhang
|
71f6971e63
|
open-data服务直连中间库即可
|
4 years ago |
|
wangxianzhang
|
24d09741df
|
版本升级
|
4 years ago |
|
wangxianzhang
|
b320942758
|
修复flyway脚本版本
|
4 years ago |
|
wangxianzhang
|
694201b84f
|
mariadb不支持innodb全文索引，暂时用like代替
|
4 years ago |
|
wangxianzhang
|
da2a9301c5
|
mysql数据源改为平阴正式数据源
|
4 years ago |
|
wangxianzhang
|
4c968acd56
|
版本升级
|
4 years ago |
|
wangxianzhang
|
f08574611d
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into pingyin_master
|
4 years ago |
|
jianjun
|
454714c4c1
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
fd6135acc1
|
代码微调
|
4 years ago |
|
wangxianzhang
|
c321a272ee
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into pingyin_master
Conflicts:
epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml
|
4 years ago |
|
jianjun
|
3950bc94db
|
导入小区时 更新楼宇的房间数
|
4 years ago |
|
jianjun
|
b5a53e8bdf
|
合并错误
|
4 years ago |
yinzuomei
|
51be467c63
|
Merge branch 'wxz_resiimport_temp' into dev
|
4 years ago |
|
jianjun
|
403777271d
|
Merge remote-tracking branch 'remotes/origin/dev_abandon_grid' into dev
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonAggFeignClient.java
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonAggFeignClientFallback.java
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerOrgRedis.java
# epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
|
4 years ago |
|
jianjun
|
583868b14d
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into wxz_resiimport_temp
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java
|
4 years ago |
|
jianjun
|
b74a7d5ab1
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
ca40bfca12
|
grid缓存不对添加组织名称
|
4 years ago |
|
jianjun
|
f8d9e871fb
|
grid缓存不对
|
4 years ago |
