Commit Graph

120 Commits

Author SHA1 Message Date
金海洋
27e272f18e Merge branch 'dev' into 'master'
Dev

See merge request universal/infrastructure/backend/pokonyan!3
2024-04-09 07:04:49 +00:00
李龙
d1d0a95224 Merge branch 'pre' into 'dev'
# Conflicts:
#   src/main/java/cn/axzo/pokonyan/dao/converter/PageConverter.java
2024-04-03 01:51:36 +00:00
lilong
cfe659ca8f feat: 增加获取令牌等待超时方法 2024-04-02 20:59:51 +08:00
lilong
4b0d92cbe9 feat: 解决查询条件string有传""的情况,这种情况直接忽略 2024-04-02 20:59:33 +08:00
lilong
0bfd1ef217 feat: 修改pageNumber为page,因为前端组件是这样定义 2024-04-02 20:59:25 +08:00
lilong
32b866c974 feat: 根据column解析 2024-04-02 20:58:36 +08:00
lilong
e994e7342e feat:去掉根据header的验证 2024-04-02 20:58:35 +08:00
lilong
ead6b9af5f feat:去掉根据header的验证 2024-04-02 20:58:35 +08:00
lilong
2a3e906a1a feat:修改文件解析只支持column 2024-04-02 20:58:35 +08:00
lilong
d52e2cf0fc feat: 增加异常提示 2024-04-02 20:58:25 +08:00
lilong
89d99f0f46 feat: 修改dataSheet的check 2024-04-02 20:58:11 +08:00
lilong
dda80932a7 feat: 修改dataSheet支持根据column或者title来解析excel 2024-04-02 20:58:10 +08:00
lilong
851ec5bf81 feat: 增加dataSheet提供通用的excel import功能 2024-04-02 20:58:10 +08:00
lilong
341c31cb3a feat: 增加异常check 2024-04-02 20:55:22 +08:00
lilong
ea47b8f094 feat:修改ratelimiter的重复创建问题 2024-04-02 19:07:32 +08:00
lilong
99bae07f93 feat:去掉availablePermits 2024-04-02 19:07:32 +08:00
lilong
6d88c0e1c3 feat:增加redissonClient 2024-04-02 19:07:31 +08:00
lilong
74171b683d feat:增加dao-support,RateLimiter 2024-04-02 19:07:30 +08:00
lilong
6f1e398c10 feat: 修改pageNumber为page,因为前端组件是这样定义 2024-04-02 15:18:10 +08:00
lilong
ca0fe8c02c feat: 根据column解析 2024-03-30 09:03:43 +08:00
lilong
4ad3c081be feat:去掉根据header的验证 2024-03-30 08:48:05 +08:00
lilong
2e21b53ca6 feat:去掉根据header的验证 2024-03-30 08:42:23 +08:00
lilong
9711eb6781 feat:修改文件解析只支持column 2024-03-30 08:15:32 +08:00
lilong
ea1ff005e4 feat: 解决查询条件string有传""的情况,这种情况直接忽略 2024-03-26 16:49:41 +08:00
lilong
e719fef563 feat: 增加异常提示 2024-03-25 20:31:37 +08:00
lilong
7edef26ec9 feat: 增加获取令牌等待超时方法 2024-03-21 17:10:06 +08:00
zhansihu
fa47f6c5fd Merge remote-tracking branch 'origin/zhan/fix-RedisUtil' into pre 2024-03-20 11:29:09 +08:00
lilong
d5b3af3a3b feat: 修改dataSheet的check 2024-03-20 10:40:05 +08:00
lilong
bc3bd83a57 feat: 修改dataSheet支持根据column或者title来解析excel 2024-03-20 10:22:43 +08:00
lilong
9af69dbf95 feat: 增加dataSheet提供通用的excel import功能 2024-03-19 18:09:18 +08:00
lilong
d49b863f78 feat: 增加page convert 2024-03-19 14:18:12 +08:00
lilong
f1925adc85 feat: 增加异常check 2024-03-19 10:33:09 +08:00
luofu
e5bf7576e6 Merge branch 'perf/20240314' of axzsource.com:universal/infrastructure/backend/pokonyan into pre 2024-03-19 09:46:18 +08:00
zhansihu
6821b3a45a Merge remote-tracking branch 'origin/zhan/fix-RedisUtil' into dev 2024-03-18 14:17:43 +08:00
lilong
c2a13cabf6 feat:修改ratelimiter的重复创建问题 2024-03-15 18:22:03 +08:00
lilong
10cfb0fc56 feat:去掉availablePermits 2024-03-15 17:58:51 +08:00
lilong
a9764b05c1 feat:增加redissonClient 2024-03-15 17:16:01 +08:00
lilong
2d8706b07b feat:增加dao-support,RateLimiter 2024-03-15 16:52:12 +08:00
zhansihu
a1ca664f54 feat(redisUtil): 扩展一个新的Util工具,使用默认序列化 2024-03-14 18:20:17 +08:00
luofu
e170e83741 Merge branch 'perf/20240314' of axzsource.com:universal/infrastructure/backend/pokonyan into dev 2024-03-14 11:09:20 +08:00
luofu
85e9c53b5e perf(perf/20240314): http请求日志格式优化 2024-03-14 11:08:41 +08:00
6f7b56bbe9 Merge remote-tracking branch 'origin/master' into dev 2024-03-08 10:52:34 +08:00
zhansihu
828527ef7d Merge remote-tracking branch 'origin/feature/20240306' into pre 2024-03-06 10:00:27 +08:00
TanJ
aab99f85a7 Merge remote-tracking branch 'origin/feature/REQ-2046' 2024-03-05 21:55:39 +08:00
TanJ
360feeaf92 Merge remote-tracking branch 'origin/feature/REQ-2046' into feature/20240306 2024-03-05 19:18:49 +08:00
金海洋
71d90854cc Merge branch 'feature/REQ-2010' into dev 2024-03-04 11:09:23 +08:00
金海洋
e554c2126f Merge branch 'feature/REQ-2010' into pre 2024-03-04 11:06:55 +08:00
金海洋
8df0bdcf8d extends 2024-03-04 11:06:45 +08:00
金海洋
be8190b4dc Merge branch 'feature/REQ-2010' into pre 2024-03-04 10:37:16 +08:00
金海洋
eb0c0dc572 fix 2024-03-04 10:36:52 +08:00