TinyAnts
7cf3be989d
Merge branch 'release/1.5.0'
2023-04-03 18:19:13 +08:00
TinyAnts
af661249e6
修复缓存工具读取bug
2023-04-03 18:17:47 +08:00
TinyAnts
ac3680fda8
Merge tag 'v1.5.0' into develop
2023-04-03 17:48:20 +08:00
TinyAnts
add675f5c6
Merge branch 'release/v1.5.0'
2023-04-03 17:48:18 +08:00
TinyAnts
7c31ed57b4
调整版本
2023-04-03 17:45:08 +08:00
TinyAnts
7a6e2a755f
增加图标
2023-04-03 17:19:12 +08:00
Jason
3ea235351d
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2023-04-03 17:08:42 +08:00
Jason
acd1f22dfc
打包
2023-04-03 17:08:31 +08:00
TinyAnts
fe9e4557ab
处理退款状态
2023-04-03 17:00:34 +08:00
TinyAnts
6010b19826
修复退款状态更新问题
2023-04-03 16:56:59 +08:00
TinyAnts
b9f40163ab
调整充值记录
2023-04-03 16:52:44 +08:00
TinyAnts
0ba266804b
处理钱包日志
2023-04-03 16:34:25 +08:00
TinyAnts
36bb1f7b7d
处理钱包日志bug
2023-04-03 16:32:30 +08:00
TinyAnts
e88f113183
优化图标
2023-04-03 16:13:07 +08:00
Jason
c153122e99
打包
2023-04-03 15:15:24 +08:00
Jason
b50df74802
余额充值,支付
2023-04-03 15:13:49 +08:00
TinyAnts
2b890b65f3
增加退款状态描述
2023-04-03 15:10:57 +08:00
TinyAnts
f353f78a04
处理筛选问题
2023-04-03 14:43:46 +08:00
TinyAnts
31f6d5293b
处理日志路径
2023-04-03 14:21:08 +08:00
TinyAnts
c96b3c210b
处理金额变动类型
2023-04-03 11:33:38 +08:00
TinyAnts
d96bd7c3e5
增加退款状态
2023-04-03 11:16:53 +08:00
TinyAnts
bb344261c3
调整日志记录列表返回数据
2023-04-03 11:14:11 +08:00
TinyAnts
7873cdf216
处理退款记录金额统计
2023-04-03 10:00:27 +08:00
TinyAnts
b0a9b4570e
调整H5支付和充值
2023-04-01 11:17:11 +08:00
TinyAnts
adc909db55
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2023-03-31 19:02:34 +08:00
TinyAnts
ca93adfcaf
调整注释
2023-03-31 19:02:29 +08:00
Jason
923c2b1d72
h5支付调试
2023-03-31 19:02:12 +08:00
Jason
3fec3b5922
调试h5支付
2023-03-31 18:56:01 +08:00
Jason
a1e15274e0
调试h5支付
2023-03-31 18:45:26 +08:00
TinyAnts
e470a714b9
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2023-03-31 18:39:49 +08:00
TinyAnts
3a379a2bf4
修改h5链接
2023-03-31 18:39:36 +08:00
Jason
eb266d6877
调试h5支付
2023-03-31 18:32:11 +08:00
Jason
12db298225
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2023-03-31 18:27:02 +08:00
Jason
d2ff42dd32
调试h5支付
2023-03-31 18:26:53 +08:00
TinyAnts
05af28cf4d
调整h5支付链接
2023-03-31 18:25:09 +08:00
TinyAnts
3fcd297979
修改h5支付链接
2023-03-31 18:21:06 +08:00
TinyAnts
4f723d5237
处理H5支付重定向链接
2023-03-31 18:13:35 +08:00
TinyAnts
89598da689
处理H5端支付问题
2023-03-31 18:01:54 +08:00
TinyAnts
9267f497c2
调整H5支付
2023-03-31 17:47:48 +08:00
Jason
e889caf07c
调试公众号支付
2023-03-31 17:00:28 +08:00
Jason
5e5c99dfcd
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2023-03-31 16:52:58 +08:00
Jason
25805ce7dc
调试公众号支付
2023-03-31 16:52:46 +08:00
TinyAnts
5cefba25c2
增加注释
2023-03-31 16:41:37 +08:00
TinyAnts
4ba5f5b1da
删除多余的包
2023-03-31 16:35:21 +08:00
TinyAnts
ffce43ba3e
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2023-03-31 16:33:11 +08:00
TinyAnts
843228d047
修复支付配置修改没有更新问题
2023-03-31 16:33:07 +08:00
Jason
cfa05f6e08
打包
2023-03-31 16:21:29 +08:00
Jason
409e50befd
调试公众号支付
2023-03-31 15:56:47 +08:00
TinyAnts
8004ee15ea
调整接口
2023-03-31 15:34:47 +08:00
TinyAnts
6a977e75e4
增加微信jsConfig
2023-03-31 15:06:49 +08:00
TinyAnts
2cb2bd3cb1
增加退款接口
2023-03-31 12:05:34 +08:00
TinyAnts
649b7f9bcb
增加支付配置详情接口
2023-03-31 09:42:56 +08:00
TinyAnts
fd500bbd0d
调整支付名称
2023-03-30 18:41:06 +08:00
TinyAnts
a20982eabc
增加支付状态接口
2023-03-30 17:53:32 +08:00
TinyAnts
3ca0777ea4
处理日志时间格式
2023-03-30 17:29:52 +08:00
TinyAnts
795b3da57d
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2023-03-30 17:28:31 +08:00
TinyAnts
54184be9c5
增加退款日志记录接口
2023-03-30 17:28:27 +08:00
Jason
8f9b2fc261
打包
2023-03-30 17:17:36 +08:00
TinyAnts
af927ba3ce
修复充值配置保存失败
2023-03-30 14:56:26 +08:00
TinyAnts
252f9cf723
修改支付方式返回订单金额
2023-03-30 14:41:40 +08:00
TinyAnts
a647071d8e
增加充值配置功能
2023-03-30 14:18:13 +08:00
TinyAnts
a1bd8d56be
修改充值下单不用传支付方式
2023-03-30 11:49:33 +08:00
TinyAnts
4ad7a7b785
修复微信公众号登录没有昵称头像问题
2023-03-30 11:35:52 +08:00
TinyAnts
66e4f40bb3
调整公众号登录取用户头像
2023-03-30 11:24:37 +08:00
TinyAnts
e3264ea20e
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2023-03-30 10:24:39 +08:00
TinyAnts
3192c9e193
增加静态图标
2023-03-30 10:24:35 +08:00
Jason
8affe5c501
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2023-03-30 10:17:13 +08:00
Jason
26c9f4d27f
打包h5
2023-03-30 10:17:03 +08:00
TinyAnts
e003d98100
增加:【余额明细,充值记录,余额调整】功能
2023-03-30 10:10:40 +08:00
Jason
93d55c0e22
打包
2023-03-29 16:30:25 +08:00
Jason
4617c65581
微信登录引导头像昵称
2023-03-29 15:52:38 +08:00
mofung1
e6a92a479b
调整个人中心及登录接口
2023-03-29 15:42:56 +08:00
Jason
07c1dd3a72
调整提示
2023-03-29 14:34:53 +08:00
TinyAnts
14b896eee0
优化代码
2023-03-24 19:00:27 +08:00
mofung1
17d527d60a
增加清除系统缓存接口
2023-03-23 16:06:08 +08:00
TinyAnts
e00563d3b5
优化代码
2023-03-23 15:27:16 +08:00
TinyAnts
23e8bc4c91
修复微信登录授权bug
2023-03-23 14:24:18 +08:00
TinyAnts
795a62bf1d
处理充值回调问题
2023-03-23 11:53:44 +08:00
TinyAnts
c1de717eaa
支付回调调试
2023-03-23 11:49:52 +08:00
TinyAnts
a2982000a6
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2023-03-23 11:41:31 +08:00
TinyAnts
4d27c8c84d
优化微信支付
2023-03-23 11:41:16 +08:00
mofung1
80e9a04c14
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin-java into develop
2023-03-23 11:40:27 +08:00
mofung1
f0d35527d9
系统配置增加缓存
2023-03-23 11:38:09 +08:00
TinyAnts
8475dc5324
优化支付代码
2023-03-23 11:36:29 +08:00
TinyAnts
a9549e23c9
修改异常枚举名称
2023-03-23 09:50:41 +08:00
TinyAnts
57053cc0e6
优化代码
2023-03-23 09:50:05 +08:00
TinyAnts
f95e28a2d8
钱包日志
2023-03-23 09:32:53 +08:00
TinyAnts
9a6f8128ac
处理支付日志相关功能
2023-03-22 19:00:55 +08:00
TinyAnts
d8c4799028
处理微信回调
2023-03-22 18:41:53 +08:00
TinyAnts
0b3c9ff267
支付功能
2023-03-22 18:36:53 +08:00
TinyAnts
5f20a09b93
支付调试
2023-03-22 18:26:06 +08:00
TinyAnts
1ac24fbde6
支付调试
2023-03-22 18:21:17 +08:00
TinyAnts
7ca5d1d274
支付调试
2023-03-22 18:13:31 +08:00
TinyAnts
426e6d3225
支付调试
2023-03-22 18:10:47 +08:00
TinyAnts
3a6b81ec61
支付调试
2023-03-22 18:02:54 +08:00
TinyAnts
e5fe98cc54
支付测试
2023-03-22 17:59:28 +08:00
TinyAnts
8fee113169
支付调试
2023-03-22 17:53:01 +08:00
TinyAnts
708931995f
支付调试
2023-03-22 17:49:35 +08:00
TinyAnts
b0bb903643
增加钱包日志记录
2023-03-22 17:43:48 +08:00
TinyAnts
2f854d5a94
增加充值记录列表
2023-03-22 16:42:12 +08:00
TinyAnts
9deb398f92
微信支付
2023-03-22 16:08:40 +08:00
TinyAnts
ba6c0a2849
微信支付
2023-03-22 16:06:04 +08:00
TinyAnts
6d52d34e41
增加支付方式接口
2023-03-22 15:20:44 +08:00
TinyAnts
1088d305c5
支付回调处理
2023-03-22 14:40:23 +08:00
TinyAnts
42928372f6
支付异常
2023-03-22 11:05:00 +08:00
TinyAnts
35e8ed52e6
支付调试
2023-03-22 10:50:29 +08:00
TinyAnts
f5ba7d86f1
支付回调测试
2023-03-22 09:53:02 +08:00
TinyAnts
62e4e9d388
支付回调测试
2023-03-22 09:52:05 +08:00
TinyAnts
ad8063f15b
调整支付回调地址
2023-03-21 19:00:19 +08:00
TinyAnts
18cf595f7f
微信支付回调
2023-03-21 18:54:57 +08:00
TinyAnts
38419d2524
支付回调
2023-03-21 17:47:38 +08:00
TinyAnts
f204e0d54b
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2023-03-21 16:54:40 +08:00
TinyAnts
763f340709
增加支付方式配置
2023-03-21 16:54:35 +08:00
mofung1
694e1ee37f
调整注释
2023-03-21 16:38:31 +08:00
mofung1
55436c011a
调整公众号回调接口注释
2023-03-21 16:13:52 +08:00
mofung1
76ba23188c
调整公众号服务校验接口
2023-03-21 15:37:54 +08:00
mofung1
d5c6226930
去除公众号回调接口登录验证
2023-03-21 15:05:23 +08:00
mofung1
a32d023a8c
调整注解和注释
2023-03-21 14:52:53 +08:00
mofung1
b3b57c13d1
公众号服务器验证回调
2023-03-21 14:51:01 +08:00
TinyAnts
3fc536eb1c
支付功能
2023-03-21 14:25:09 +08:00
TinyAnts
3456eb65d4
支付处理 (未完成)
2023-03-21 12:12:29 +08:00
TinyAnts
c3ede05af0
充值支付 (未完成)
2023-03-20 19:01:18 +08:00
TinyAnts
a8025c2f24
调整微信工具
2023-03-20 18:22:23 +08:00
TinyAnts
07bed0ab0d
充值功能 (未完成)
2023-03-20 18:03:16 +08:00
TinyAnts
9c9db1c79b
实现支付功能 (未完成)
2023-03-20 16:02:32 +08:00
lr
81bdb119d2
Merge branch 'hotfix/lr-20230320'
2023-03-20 14:51:44 +08:00
lr
d1b1317d1f
Merge branch 'master' into develop
2023-03-20 14:51:44 +08:00
lr
aca9f8fc62
调整README文档
2023-03-20 14:51:30 +08:00
lr
d9f17eabab
Merge branch 'hotfix/lr-20230320'
2023-03-20 14:45:25 +08:00
lr
47e14dae53
Merge branch 'master' into develop
2023-03-20 14:45:25 +08:00
lr
65f7d0fd52
调整README文档
2023-03-20 14:45:11 +08:00
mofung1
d6922e31dc
个人中心接口调整
2023-03-20 14:12:34 +08:00
mofung1
7fac900ba1
修改授权绑定bug
2023-03-20 12:01:08 +08:00
mofung1
a3aafaf552
绑定微信小程序或公众号
2023-03-20 10:32:18 +08:00
mofung1
fd8e0d5fc8
增加更新新用户接口
2023-03-17 17:48:30 +08:00
mofung1
05f21a3168
用户引导登录-增加是否为新用户标识
2023-03-17 17:18:32 +08:00
TinyAnts
0c0859ac5b
Merge tag '1.4.2' into develop
2023-03-17 15:33:41 +08:00
TinyAnts
3ace0ac688
Merge branch 'release/1.4.2'
2023-03-17 15:33:40 +08:00
Jason
6ecf919440
打包
2023-03-17 15:27:34 +08:00
TinyAnts
0ea4373167
Merge tag '1.4.2' into develop
2023-03-17 14:41:49 +08:00
TinyAnts
9f31b9ce3d
Merge branch 'release/1.4.2'
2023-03-17 14:41:48 +08:00
TinyAnts
e9b882dd9b
调整sql文件
2023-03-17 11:51:16 +08:00
TinyAnts
787e8edc45
调整个人中心接口登录问题
2023-03-17 11:42:36 +08:00
TinyAnts
638d5865dc
修复用户被删除后拦截的bug
2023-03-17 11:35:24 +08:00
lr
daf6bee8d7
Merge branch 'hotfix/lr-20230317'
2023-03-17 11:13:47 +08:00
lr
3e2dd74717
Merge branch 'master' into develop
2023-03-17 11:13:47 +08:00
lr
80bcf29910
调整README文档
2023-03-17 11:13:27 +08:00
TinyAnts
8a0e675549
增加默认图
2023-03-17 10:56:16 +08:00
TinyAnts
1395beb9d2
修改版本号
2023-03-17 10:52:18 +08:00
Jason
356d83bc91
打包
2023-03-17 10:30:34 +08:00
Jason
d3b5794ce7
重新打包
2023-03-17 10:13:36 +08:00
Jason
d66570d3bb
调整定时任务
2023-03-17 10:00:57 +08:00
TinyAnts
e9bacd433d
代码生成器增加默认作者
2023-03-17 09:52:12 +08:00
TinyAnts
2d74edc701
修复计划任务字段问题
2023-03-17 09:47:15 +08:00
TinyAnts
38a6de13a5
修复定时任务字段参数问题
2023-03-17 09:36:48 +08:00
TinyAnts
b95e43c7ac
修复pc端编辑bug
2023-03-16 18:59:31 +08:00
TinyAnts
f1c9a66127
修复PC端设置bug
2023-03-16 18:53:24 +08:00
TinyAnts
294ddbf4bc
优化登录拦截功能
2023-03-16 18:33:58 +08:00
Jason
06e219d2a1
pc端调整接口路径
2023-03-16 16:44:57 +08:00
TinyAnts
710f20f093
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2023-03-16 15:52:13 +08:00
TinyAnts
5eb9a04d6d
出来登录问题
2023-03-16 15:51:32 +08:00
Jason
74481785fd
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2023-03-16 15:45:55 +08:00
Jason
41b4024fcf
调整收藏相关接口路径
2023-03-16 15:45:39 +08:00
TinyAnts
2166e40352
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2023-03-16 15:43:57 +08:00
TinyAnts
3837d78fce
调整个人中心接口免登录
2023-03-16 15:43:51 +08:00
Jason
d562ddde48
打包
2023-03-16 15:23:28 +08:00
Jason
79bdca1412
调整登录,调整部分接口路径,调整上传图片集合到基本请求中去
2023-03-16 15:22:29 +08:00
TinyAnts
decbccedce
处理登录token问题
2023-03-16 14:52:28 +08:00
TinyAnts
1b56ede827
优化: 系统日志异步写入
2023-03-16 11:26:15 +08:00
TinyAnts
65d10f608c
修复管理员列表角色的分割符号
2023-03-16 11:01:53 +08:00
TinyAnts
932d46c6ee
优化代码格式
2023-03-16 10:24:18 +08:00
TinyAnts
3cb5582b20
增加: 操作日志注解
2023-03-16 10:17:44 +08:00
TinyAnts
d5d397b2e9
调整: 代码生成器支持Swagger生成
2023-03-16 10:11:21 +08:00
TinyAnts
36e4ea6cf1
优化代码
2023-03-15 16:29:40 +08:00
TinyAnts
4bc1e28685
调整Swagger配置
2023-03-15 15:29:47 +08:00
TinyAnts
58999e6fbc
增加: Swagger开关配置项
2023-03-15 15:23:51 +08:00
TinyAnts
c84b597032
优化: 增加Swagger注解
2023-03-15 15:14:00 +08:00
TinyAnts
daf6ba26a4
优化: 实体模型增加Swagger注解
2023-03-15 15:06:37 +08:00
TinyAnts
8c19fc0cb2
优化: 后台增加Swagger实体类的注解
2023-03-15 14:26:03 +08:00
TinyAnts
75eb7f42f3
优化: 前端增加swagger实体类注解
2023-03-15 09:57:06 +08:00
TinyAnts
7bc8d4fce1
增加: 接入Swagger3 [未完成]
2023-03-14 19:00:36 +08:00
TinyAnts
eff789eb82
优化: 升级springboot版本到2.7.5
2023-03-14 16:23:40 +08:00
TinyAnts
6cadf25368
增加注释
2023-03-14 16:13:59 +08:00
TinyAnts
532653107b
调整异常类
2023-03-14 16:02:09 +08:00
TinyAnts
9a9ae9f336
修复: 全局客户端获取null异常
2023-03-14 16:00:49 +08:00
TinyAnts
b63d93364a
优化: 代码格式
2023-03-14 15:02:43 +08:00
TinyAnts
da29c32357
修复: 扫码登录state检测
2023-03-14 14:59:30 +08:00
TinyAnts
a636a36884
优化: 移除未使用到的属性
2023-03-14 14:55:09 +08:00
TinyAnts
e2ec0d6c9a
优化: 修改忽略文件忽略各种开发工具生成的临时文件
2023-03-14 14:13:37 +08:00
TinyAnts
268f46b872
修复: ThreadLocal在高并发下重复获取对象导致put值丢失
2023-03-14 14:10:58 +08:00
TinyAnts
1d0d314aee
优化: 调整前端登录相关接口 (接口分离)
2023-03-14 12:07:40 +08:00
TinyAnts
44975bfd86
处理: 超级管理员不需验证权限
2023-03-14 09:43:27 +08:00
TinyAnts
3a6f6bef97
优化: 移动端接入sa-token权限管理依赖
2023-03-13 18:59:28 +08:00
TinyAnts
546889cf6f
优化: 短信发送 和 验证码验证功能
2023-03-13 17:16:30 +08:00
TinyAnts
1c480b9630
优化: 改用注解方式验证是否登录和权限 【废弃配置文件方式】
2023-03-13 15:36:04 +08:00
TinyAnts
9cc41d2e80
修复通知配置参数保存失败
2023-02-15 16:57:15 +08:00
Jason
970abf6a47
打包
2023-01-18 17:45:53 +08:00
Jason
d6136463bb
文章初始浏览量添加限制
2023-01-18 17:45:03 +08:00
TinyAnts
64815f2f4f
Merge tag '1.4.1' into develop
2023-01-18 17:13:39 +08:00
TinyAnts
bacda99c59
Merge branch 'release/1.4.1'
2023-01-18 17:13:38 +08:00
TinyAnts
8718c22cee
处理代码生成器缺少Date依赖
2023-01-18 16:53:31 +08:00
TinyAnts
c10464d873
后台-文章管理:初始浏览量填写负数时报错
2023-01-18 16:31:59 +08:00
Jason
f6589a8e33
打包
2023-01-18 11:31:55 +08:00
Jason
9223b88a72
新增验证码登录功能
2023-01-18 11:30:13 +08:00
TinyAnts
6cdc2b82e1
增加登录验证码状态
2023-01-17 18:11:53 +08:00
TinyAnts
84cded01f2
增加验证码功能
2023-01-17 18:02:55 +08:00
Jason
f2038fa7af
调整网站链接校验
2023-01-17 17:17:21 +08:00
Jason
ecd5abbd05
打包
2023-01-17 16:22:45 +08:00
Jason
8481c63ef2
添加登录日志
2023-01-17 16:21:15 +08:00
Jason
20b7c760fd
修复tabbar的问题
2023-01-17 15:56:12 +08:00
Jason
9595769d46
修复h5下登录问题
2023-01-17 15:46:07 +08:00
Jason
9e5bd06e37
修复后台菜单管理,按钮类型显示新增按钮的问题
2023-01-17 15:45:41 +08:00
TinyAnts
f51fab1deb
修复登录日志Date类型缺失
2023-01-17 11:23:36 +08:00
TinyAnts
70fb9d4b9b
修改定时任务关键词
2023-01-17 11:09:52 +08:00
TinyAnts
a8559f0d70
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2023-01-16 09:24:18 +08:00
TinyAnts
b2bfaca816
Merge tag '1.4.0' into develop
2023-01-11 10:42:17 +08:00
TinyAnts
f2bbfffe10
Merge branch 'release/1.4.0'
2023-01-11 10:42:16 +08:00
TinyAnts
803a50cf3c
Merge branch 'master' into develop
2023-01-11 10:35:33 +08:00
TinyAnts
c46903a210
Merge branch 'hotfix/article'
2023-01-11 10:35:33 +08:00
TinyAnts
2f161aa3fe
修复获取全部文章问题
2023-01-11 10:35:16 +08:00
TinyAnts
22e7aa77cd
Merge branch 'master' into develop
2023-01-11 10:20:26 +08:00
TinyAnts
18360d43e5
Merge branch 'hotfix/scanLogin'
2023-01-11 10:20:25 +08:00
TinyAnts
b360bb7485
修改PC端扫码登录的问题
2023-01-11 10:19:40 +08:00
TinyAnts
ded1cabf1e
Merge tag '1.4.0' into develop
2023-01-10 18:29:19 +08:00
TinyAnts
f4b6179336
Merge branch 'release/1.4.0'
2023-01-10 18:29:17 +08:00
Jason
35b485c0a7
打包
2023-01-10 18:19:31 +08:00
Jason
f39417f9b9
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2023-01-10 18:08:05 +08:00
Jason
313121b2ab
调整uniapph5基础路径
2023-01-10 18:05:16 +08:00
TinyAnts
a6ad0a2feb
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2023-01-10 18:00:33 +08:00
Jason
e20fe09db4
调整提示
2023-01-10 17:55:48 +08:00
Jason
bf31eff2e0
代码生成器添加提示
2023-01-10 17:55:21 +08:00
TinyAnts
8b450e991f
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2023-01-10 17:31:12 +08:00
TinyAnts
86c8697a0f
修复代码生成器获取别名出错
2023-01-10 17:30:49 +08:00
Jason
16fbaa8b4e
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2023-01-10 17:12:19 +08:00
Jason
0f08a3ec04
indexhtml添加移动端pc端判断
2023-01-10 17:12:01 +08:00
TinyAnts
54fd266103
调整sql文件
2023-01-10 17:11:24 +08:00
Jason
b4dadbee38
pc打包
2023-01-10 16:01:19 +08:00
Jason
45645668ef
后台打包
2023-01-10 15:58:46 +08:00
Jason
79a3959a17
pc端调整
2023-01-10 15:57:36 +08:00
TinyAnts
678c5a5fb6
优化代码
2023-01-10 15:14:51 +08:00
Jason
b081a2b3e5
新增组件示例
2023-01-10 11:09:05 +08:00
TinyAnts
21866eb315
调整PC端底部版权获取信息问题
2023-01-10 10:26:26 +08:00
TinyAnts
5880ea48af
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2023-01-10 09:54:06 +08:00
TinyAnts
ae398bf417
修改文章列表的搜索参数
2023-01-10 09:54:00 +08:00
Jason
96ce0b284c
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2023-01-09 19:02:32 +08:00
Jason
5d056280b0
pc端
2023-01-09 19:02:20 +08:00
TinyAnts
712538213b
修复部分文章数据获取不到分类的问题
2023-01-09 19:00:22 +08:00
TinyAnts
97518d66d3
增加PC资讯中心接口
2023-01-09 18:53:40 +08:00
TinyAnts
570198d9bc
修复开放平台编辑参数不一致bug
2023-01-09 18:15:12 +08:00
TinyAnts
f48116e8d1
增加PC端文章详情接口
2023-01-09 18:11:28 +08:00
TinyAnts
d6bd188203
处理PC端的装修数据问题
2023-01-09 16:00:22 +08:00
Jason
144fe94ecb
后台pc相关设置
2023-01-09 15:33:09 +08:00
Jason
667b92265f
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2023-01-09 10:13:12 +08:00
Jason
964e9c5bd7
调整代码生成器
2023-01-09 10:12:49 +08:00
TinyAnts
0daebef757
修复代码生成器字段缺失问题
2023-01-09 10:08:47 +08:00
TinyAnts
691786b478
修复代码生成器字段缺失
2023-01-09 10:07:11 +08:00
TinyAnts
93aafd2dbe
init
2023-01-06 23:41:15 +08:00
TinyAnts
8f936f2df4
init
2023-01-06 23:40:16 +08:00
TinyAnts
27bcde0da0
调整安装sql
2023-01-06 17:51:02 +08:00
TinyAnts
1f193e7850
代码生成器构建菜单权限
2023-01-06 17:47:21 +08:00
TinyAnts
55ee7d8a47
代码生成器构建菜单的参数处理
2023-01-06 16:50:01 +08:00
TinyAnts
c45df35bd9
调整sql安装文件
2023-01-06 16:17:42 +08:00
TinyAnts
853e64fee5
增加扫码登录功能
2023-01-06 16:13:46 +08:00
TinyAnts
f2450bc615
优化代码
2023-01-03 19:00:27 +08:00
TinyAnts
ed6b24c677
处理代码生成器关联查询
2022-12-30 12:10:07 +08:00
Jason
7a71bcf238
Merge tag 'wjx202212301141' into develop
...
no message
2022-12-30 11:42:09 +08:00
Jason
22bebdf804
Merge branch 'hotfix/wjx202212301141'
2022-12-30 11:42:08 +08:00
Jason
6f8e8442c0
重新打包
2022-12-30 11:41:58 +08:00
Jason
b693e829f9
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2022-12-30 11:40:23 +08:00
Jason
8d37e36395
代码生成器调整
2022-12-30 11:40:08 +08:00
lr
7419ceb502
Merge branch 'hotfix/uploads'
2022-12-30 11:20:01 +08:00
lr
f6491d1ba0
Merge tag 'uploads' into develop
...
no message
2022-12-30 11:20:01 +08:00
lr
84c4b305d1
增加uploads目录
2022-12-30 11:18:55 +08:00
TinyAnts
5f3260c586
增加根据表名获取字段
2022-12-30 11:11:36 +08:00
TinyAnts
c5781cd796
处理代码生成器关联查询
2022-12-30 10:35:58 +08:00
TinyAnts
9d4964af1b
Merge tag '1.3.6' into develop
2022-12-30 10:02:14 +08:00
TinyAnts
56de8a32f1
Merge branch 'release/1.3.6'
2022-12-30 10:02:13 +08:00
TinyAnts
dbdeed946e
调整SQL文件
2022-12-30 09:53:07 +08:00
Jason
42892bcb8b
Merge tag 'wjx202212300933' into develop
...
no message
# Conflicts:
# frontend/assets/403.f0c419d0.js
# frontend/assets/404.a1c8cef0.js
# frontend/assets/add-nav.78e0236c.js
# frontend/assets/add-nav.vue_vue_type_script_setup_true_lang.856419ed.js
# frontend/assets/article.74bca9b5.js
# frontend/assets/attr-setting.vue_vue_type_script_setup_true_lang.3f964a14.js
# frontend/assets/attr.049f48d5.js
# frontend/assets/attr.0b7b7c99.js
# frontend/assets/attr.303c1d3b.js
# frontend/assets/attr.80ca5719.js
# frontend/assets/attr.a9a313fb.js
# frontend/assets/attr.vue_vue_type_script_setup_true_lang.6d0a5dbb.js
# frontend/assets/attr.vue_vue_type_script_setup_true_lang.8e9dd23e.js
# frontend/assets/attr.vue_vue_type_script_setup_true_lang.9aec2f99.js
# frontend/assets/attr.vue_vue_type_script_setup_true_lang.ab98fda4.js
# frontend/assets/attr.vue_vue_type_script_setup_true_lang.b7d84074.js
# frontend/assets/auth.f2a07a12.js
# frontend/assets/auth.vue_vue_type_script_setup_true_lang.7ef0ba85.js
# frontend/assets/cache.4c254d80.js
# frontend/assets/code-preview.326ed395.js
# frontend/assets/code-preview.vue_vue_type_script_setup_true_lang.136e5f05.js
# frontend/assets/code.e8685cc5.js
# frontend/assets/config.a5e3522c.js
# frontend/assets/consumer.7aec82d3.js
# frontend/assets/content.3563b530.js
# frontend/assets/content.3f7be8fd.js
# frontend/assets/content.54b8d1d4.js
# frontend/assets/content.6bac01bd.js
# frontend/assets/content.a0ce4144.js
# frontend/assets/content.b9dac3a5.js
# frontend/assets/content.d207a2aa.js
# frontend/assets/content.ddf02ef6.js
# frontend/assets/content.vue_vue_type_script_setup_true_lang.3bb51b7a.js
# frontend/assets/content.vue_vue_type_script_setup_true_lang.afe6098d.js
# frontend/assets/content.vue_vue_type_script_setup_true_lang.b304c701.js
# frontend/assets/data-table.17275e70.js
# frontend/assets/data-table.vue_vue_type_script_setup_true_lang.4be18121.js
# frontend/assets/decoration-img.480c1d38.js
# frontend/assets/decoration.c4bfe19f.js
# frontend/assets/default_reply.30cc1448.js
# frontend/assets/department.05a11643.js
# frontend/assets/detail.0f743553.js
# frontend/assets/dict.ce868610.js
# frontend/assets/edit.2dbf5ac2.js
# frontend/assets/edit.2e9c7282.js
# frontend/assets/edit.4baeb334.js
# frontend/assets/edit.6d9ae951.js
# frontend/assets/edit.95929423.js
# frontend/assets/edit.96767b58.js
# frontend/assets/edit.9ccb2ea8.js
# frontend/assets/edit.9ed6b70f.js
# frontend/assets/edit.aeab9105.js
# frontend/assets/edit.b84537ff.js
# frontend/assets/edit.c7f85044.js
# frontend/assets/edit.d2275167.js
# frontend/assets/edit.d460b056.js
# frontend/assets/edit.fcd83473.js
# frontend/assets/edit.vue_vue_type_script_setup_true_lang.0af81f90.js
# frontend/assets/edit.vue_vue_type_script_setup_true_lang.113cbdf9.js
# frontend/assets/edit.vue_vue_type_script_setup_true_lang.2b98166e.js
# frontend/assets/edit.vue_vue_type_script_setup_true_lang.4905cd93.js
# frontend/assets/edit.vue_vue_type_script_setup_true_lang.4f65e8a1.js
# frontend/assets/edit.vue_vue_type_script_setup_true_lang.59ff2825.js
# frontend/assets/edit.vue_vue_type_script_setup_true_lang.74776acb.js
# frontend/assets/edit.vue_vue_type_script_setup_true_lang.7ea5a852.js
# frontend/assets/edit.vue_vue_type_script_setup_true_lang.8b4e0ec3.js
# frontend/assets/edit.vue_vue_type_script_setup_true_lang.f8f78045.js
# frontend/assets/edit.vue_vue_type_script_setup_true_lang.f8f974df.js
# frontend/assets/environment.da0e74f3.js
# frontend/assets/error.8fb57bb2.js
# frontend/assets/filing.9c47550a.js
# frontend/assets/follow_reply.107a5ac7.js
# frontend/assets/h5.fea75e1a.js
# frontend/assets/index.16ada191.js
# frontend/assets/index.1771e9d1.js
# frontend/assets/index.1fb47746.js
# frontend/assets/index.5eb7e5c4.js
# frontend/assets/index.6c6f898a.js
# frontend/assets/index.75023305.js
# frontend/assets/index.77862a69.js
# frontend/assets/index.79dd911d.js
# frontend/assets/index.848577dc.js
# frontend/assets/index.84d368ba.js
# frontend/assets/index.8982a748.js
# frontend/assets/index.92011b5f.js
# frontend/assets/index.9a6fb272.js
# frontend/assets/index.a5822411.js
# frontend/assets/index.aa44aaf7.js
# frontend/assets/index.b7bb2d87.js
# frontend/assets/index.bd5146fc.js
# frontend/assets/index.beff7283.js
# frontend/assets/index.c7812cea.js
# frontend/assets/index.dc901e48.js
# frontend/assets/index.ef519870.js
# frontend/assets/index.f11ab1e9.js
# frontend/assets/index.f66054e9.js
# frontend/assets/index.f667cbcd.js
# frontend/assets/index.fe3d9dae.js
# frontend/assets/index.vue_vue_type_style_index_0_lang.c87a51a3.js
# frontend/assets/information.28b9a11e.js
# frontend/assets/journal.af99cc6e.js
# frontend/assets/keyword_reply.1fe852e8.js
# frontend/assets/login.f0fef830.js
# frontend/assets/login_register.c80d9ed9.js
# frontend/assets/menu.09d42840.js
# frontend/assets/menu.0ae9ccbc.js
# frontend/assets/menu.eae2d8fc.js
# frontend/assets/message.1e9ad99e.js
# frontend/assets/oa-attr.7c3cd5f4.js
# frontend/assets/oa-menu-form-edit.d931b7f0.js
# frontend/assets/oa-menu-form-edit.vue_vue_type_script_setup_true_lang.2af5db4a.js
# frontend/assets/oa-menu-form.fff01e76.js
# frontend/assets/oa-menu-form.vue_vue_type_script_setup_true_lang.f8a3c660.js
# frontend/assets/oa-phone.85104509.js
# frontend/assets/picker.6266f853.js
# frontend/assets/picker.bb543009.js
# frontend/assets/post.01f561c3.js
# frontend/assets/preview.7ce5d1df.js
# frontend/assets/protocol.64ac74bd.js
# frontend/assets/role.eef9faf9.js
# frontend/assets/setting.be7e8445.js
# frontend/assets/setup.d2d0d2bc.js
# frontend/assets/system.fd9f3942.js
# frontend/assets/tabbar.777ec1ab.js
# frontend/assets/useDictOptions.15dee2f9.js
# frontend/assets/useMenuOa.192cb686.js
# frontend/assets/user.4c0b4415.js
# frontend/assets/weapp.1dfe0168.js
# frontend/assets/website.0825f59c.js
# frontend/assets/wx_dev.01a9b978.js
# frontend/assets/wx_oa.1210c1af.js
# frontend/index.html
# public/admin/assets/403.be75ce33.js
# public/admin/assets/403.c7652e24.js
# public/admin/assets/404.dc53075e.js
# public/admin/assets/404.ff366785.js
# public/admin/assets/add-nav.71c25bc4.js
# public/admin/assets/add-nav.8ff08431.js
# public/admin/assets/add-nav.vue_vue_type_script_setup_true_lang.215ec6d4.js
# public/admin/assets/add-nav.vue_vue_type_script_setup_true_lang.8851ce0d.js
# public/admin/assets/article.38714de2.js
# public/admin/assets/article.51338dfb.js
# public/admin/assets/attr-setting.b26b2685.js
# public/admin/assets/attr-setting.vue_vue_type_script_setup_true_lang.84e61532.js
# public/admin/assets/attr-setting.vue_vue_type_script_setup_true_lang.c0a78b81.js
# public/admin/assets/attr.0bf07d6c.js
# public/admin/assets/attr.1105345f.js
# public/admin/assets/attr.1a24a3b1.js
# public/admin/assets/attr.39b6c6f4.js
# public/admin/assets/attr.65290945.js
# public/admin/assets/attr.6c55da6b.js
# public/admin/assets/attr.805fa21f.js
# public/admin/assets/attr.98b102e5.js
# public/admin/assets/attr.ac5be732.js
# public/admin/assets/attr.bc1c3a6a.js
# public/admin/assets/attr.vue_vue_type_script_setup_true_lang.1024ff07.js
# public/admin/assets/attr.vue_vue_type_script_setup_true_lang.2e693200.js
# public/admin/assets/attr.vue_vue_type_script_setup_true_lang.610eeb03.js
# public/admin/assets/attr.vue_vue_type_script_setup_true_lang.68317d75.js
# public/admin/assets/attr.vue_vue_type_script_setup_true_lang.7c96b670.js
# public/admin/assets/attr.vue_vue_type_script_setup_true_lang.9aa3d580.js
# public/admin/assets/attr.vue_vue_type_script_setup_true_lang.9d5db47c.js
# public/admin/assets/attr.vue_vue_type_script_setup_true_lang.a51cc6d0.js
# public/admin/assets/attr.vue_vue_type_script_setup_true_lang.c2c86fa3.js
# public/admin/assets/attr.vue_vue_type_script_setup_true_lang.dc504eeb.js
# public/admin/assets/auth.58436929.js
# public/admin/assets/auth.72ce47e2.js
# public/admin/assets/auth.vue_vue_type_script_setup_true_lang.9144d151.js
# public/admin/assets/auth.vue_vue_type_script_setup_true_lang.f2e0efdb.js
# public/admin/assets/cache.1411bd71.js
# public/admin/assets/cache.eaaa3b01.js
# public/admin/assets/code-preview.b3fbdb96.js
# public/admin/assets/code-preview.cbbe484e.js
# public/admin/assets/code-preview.vue_vue_type_script_setup_true_lang.417cad3e.js
# public/admin/assets/code-preview.vue_vue_type_script_setup_true_lang.dece62bb.js
# public/admin/assets/code.1b609fc8.js
# public/admin/assets/code.70be45c9.js
# public/admin/assets/config.67eec5e0.js
# public/admin/assets/config.72957399.js
# public/admin/assets/consumer.ac2027e1.js
# public/admin/assets/consumer.d53e90aa.js
# public/admin/assets/content.0331f6f6.js
# public/admin/assets/content.06cd617c.js
# public/admin/assets/content.0abc6fd8.js
# public/admin/assets/content.3eb29ea6.js
# public/admin/assets/content.4392d29d.js
# public/admin/assets/content.4b82873f.js
# public/admin/assets/content.4f3df2a4.js
# public/admin/assets/content.6d4b870e.js
# public/admin/assets/content.7be5491b.js
# public/admin/assets/content.7dbaf50d.js
# public/admin/assets/content.8770db05.js
# public/admin/assets/content.c073f4f9.js
# public/admin/assets/content.c942e0cc.js
# public/admin/assets/content.d57a1119.js
# public/admin/assets/content.ea750dee.js
# public/admin/assets/content.f103064c.js
# public/admin/assets/content.vue_vue_type_script_setup_true_lang.217e9a8e.js
# public/admin/assets/content.vue_vue_type_script_setup_true_lang.35dd01b2.js
# public/admin/assets/content.vue_vue_type_script_setup_true_lang.64d77af9.js
# public/admin/assets/content.vue_vue_type_script_setup_true_lang.96010cac.js
# public/admin/assets/content.vue_vue_type_script_setup_true_lang.a2c85d60.js
# public/admin/assets/content.vue_vue_type_script_setup_true_lang.e873fa0c.js
# public/admin/assets/data-table.07e93a3a.js
# public/admin/assets/data-table.fb9b752a.js
# public/admin/assets/data-table.vue_vue_type_script_setup_true_lang.7f9e9084.js
# public/admin/assets/data-table.vue_vue_type_script_setup_true_lang.f66dc883.js
# public/admin/assets/decoration-img.4dec7bca.js
# public/admin/assets/decoration-img.9d7f6da2.js
# public/admin/assets/decoration.7912193e.js
# public/admin/assets/decoration.815a1b2b.js
# public/admin/assets/default_reply.6fdb7d94.js
# public/admin/assets/default_reply.cf5a89f4.js
# public/admin/assets/department.48a04152.js
# public/admin/assets/department.86e3365f.js
# public/admin/assets/detail.de7ed10a.js
# public/admin/assets/detail.e67949b0.js
# public/admin/assets/dict.68f4cb01.js
# public/admin/assets/dict.7598c3e1.js
# public/admin/assets/edit.04acf599.js
# public/admin/assets/edit.1058ab87.js
# public/admin/assets/edit.19542373.js
# public/admin/assets/edit.195b6c37.js
# public/admin/assets/edit.1efad864.js
# public/admin/assets/edit.2353d155.js
# public/admin/assets/edit.2c45ecc3.js
# public/admin/assets/edit.32c4d425.js
# public/admin/assets/edit.363d1c9c.js
# public/admin/assets/edit.4a9641ad.js
# public/admin/assets/edit.4b2283de.js
# public/admin/assets/edit.4cadd5f2.js
# public/admin/assets/edit.559ac486.js
# public/admin/assets/edit.5da54424.js
# public/admin/assets/edit.66fa646d.js
# public/admin/assets/edit.68731657.js
# public/admin/assets/edit.6b367aca.js
# public/admin/assets/edit.743f4c0c.js
# public/admin/assets/edit.872eb840.js
# public/admin/assets/edit.886d9084.js
# public/admin/assets/edit.8d7da4aa.js
# public/admin/assets/edit.9a168e9e.js
# public/admin/assets/edit.b78cf684.js
# public/admin/assets/edit.c581b19c.js
# public/admin/assets/edit.c5a5e1ec.js
# public/admin/assets/edit.dec130d9.js
# public/admin/assets/edit.e30c9927.js
# public/admin/assets/edit.e44bdfb6.js
# public/admin/assets/edit.ee60daaf.js
# public/admin/assets/edit.f67b0c7d.js
# public/admin/assets/edit.vue_vue_type_script_setup_true_lang.1e2b9cbb.js
# public/admin/assets/edit.vue_vue_type_script_setup_true_lang.2026007c.js
# public/admin/assets/edit.vue_vue_type_script_setup_true_lang.20c72cd4.js
# public/admin/assets/edit.vue_vue_type_script_setup_true_lang.21beb4c8.js
# public/admin/assets/edit.vue_vue_type_script_setup_true_lang.309dc4b4.js
# public/admin/assets/edit.vue_vue_type_script_setup_true_lang.35c06c20.js
# public/admin/assets/edit.vue_vue_type_script_setup_true_lang.401606cd.js
# public/admin/assets/edit.vue_vue_type_script_setup_true_lang.4e0b8a6b.js
# public/admin/assets/edit.vue_vue_type_script_setup_true_lang.4fbfad27.js
# public/admin/assets/edit.vue_vue_type_script_setup_true_lang.4feed0c9.js
# public/admin/assets/edit.vue_vue_type_script_setup_true_lang.6e4cbbd1.js
# public/admin/assets/edit.vue_vue_type_script_setup_true_lang.71edccc3.js
# public/admin/assets/edit.vue_vue_type_script_setup_true_lang.735deee1.js
# public/admin/assets/edit.vue_vue_type_script_setup_true_lang.8031e87f.js
# public/admin/assets/edit.vue_vue_type_script_setup_true_lang.8a9d92ef.js
# public/admin/assets/edit.vue_vue_type_script_setup_true_lang.8ee65651.js
# public/admin/assets/edit.vue_vue_type_script_setup_true_lang.95b7f706.js
# public/admin/assets/edit.vue_vue_type_script_setup_true_lang.964927cf.js
# public/admin/assets/edit.vue_vue_type_script_setup_true_lang.9734ead4.js
# public/admin/assets/edit.vue_vue_type_script_setup_true_lang.a2645652.js
# public/admin/assets/edit.vue_vue_type_script_setup_true_lang.bc00cb19.js
# public/admin/assets/edit.vue_vue_type_script_setup_true_lang.dec3e455.js
# public/admin/assets/environment.a1f39ebd.js
# public/admin/assets/environment.a824f3db.js
# public/admin/assets/error.3245b397.js
# public/admin/assets/error.ad96ad67.js
# public/admin/assets/filing.a511c649.js
# public/admin/assets/filing.eccc076c.js
# public/admin/assets/follow_reply.b676d4ee.js
# public/admin/assets/follow_reply.e30a481b.js
# public/admin/assets/h5.2a7add8f.js
# public/admin/assets/h5.afd9020f.js
# public/admin/assets/index.011bede3.js
# public/admin/assets/index.04d77970.js
# public/admin/assets/index.0d2f02aa.js
# public/admin/assets/index.136be2f4.js
# public/admin/assets/index.1530a00e.js
# public/admin/assets/index.16fe56fd.js
# public/admin/assets/index.1866acee.js
# public/admin/assets/index.1f81f8b5.js
# public/admin/assets/index.21b73b19.js
# public/admin/assets/index.22f8ab12.js
# public/admin/assets/index.2539f5ae.js
# public/admin/assets/index.28c53d29.js
# public/admin/assets/index.2c0a48a6.js
# public/admin/assets/index.3257f813.js
# public/admin/assets/index.3745546a.js
# public/admin/assets/index.3b91d655.js
# public/admin/assets/index.3fbb5f30.js
# public/admin/assets/index.4fd20bc9.js
# public/admin/assets/index.50bcf3eb.js
# public/admin/assets/index.523e1856.js
# public/admin/assets/index.565fa41f.js
# public/admin/assets/index.588358a2.js
# public/admin/assets/index.58d92e59.js
# public/admin/assets/index.5a304e0e.js
# public/admin/assets/index.5cc34703.js
# public/admin/assets/index.5f24c449.js
# public/admin/assets/index.64e62b67.js
# public/admin/assets/index.65cfc9bc.js
# public/admin/assets/index.6d47c9ed.js
# public/admin/assets/index.6f04b646.js
# public/admin/assets/index.73a26a62.js
# public/admin/assets/index.783c022e.js
# public/admin/assets/index.7b48eeb3.js
# public/admin/assets/index.8bcf72cb.js
# public/admin/assets/index.942364fe.js
# public/admin/assets/index.963c9b05.js
# public/admin/assets/index.9ab195d2.js
# public/admin/assets/index.a80222dc.js
# public/admin/assets/index.a885a6ae.js
# public/admin/assets/index.b348b281.js
# public/admin/assets/index.b7299661.js
# public/admin/assets/index.c93a1529.js
# public/admin/assets/index.cdb9f716.js
# public/admin/assets/index.d1b8bb0d.js
# public/admin/assets/index.e66cf170.js
# public/admin/assets/index.eeba4956.js
# public/admin/assets/index.f040d64d.js
# public/admin/assets/index.f6838d76.js
# public/admin/assets/index.fd4cf356.js
# public/admin/assets/index.fdde7276.js
# public/admin/assets/index.vue_vue_type_style_index_0_lang.26fd2700.js
# public/admin/assets/index.vue_vue_type_style_index_0_lang.8a5b07f4.js
# public/admin/assets/information.5f67d768.js
# public/admin/assets/information.aef5fed0.js
# public/admin/assets/journal.64e725be.js
# public/admin/assets/journal.c7bb9e85.js
# public/admin/assets/keyword_reply.55add9d3.js
# public/admin/assets/keyword_reply.57eeee16.js
# public/admin/assets/login.3e20fdbc.js
# public/admin/assets/login.dfb02019.js
# public/admin/assets/login_register.f086e958.js
# public/admin/assets/login_register.fce39c20.js
# public/admin/assets/menu.00ecf38c.js
# public/admin/assets/menu.1480198a.js
# public/admin/assets/menu.5f3f4c47.js
# public/admin/assets/menu.7368e3d7.js
# public/admin/assets/menu.77a3989d.js
# public/admin/assets/menu.b1b1aaa6.js
# public/admin/assets/message.15ef96dc.js
# public/admin/assets/message.8743f2b4.js
# public/admin/assets/oa-attr.98d5d599.js
# public/admin/assets/oa-attr.e543aa62.js
# public/admin/assets/oa-menu-form-edit.045f9ab6.js
# public/admin/assets/oa-menu-form-edit.6d6a7d14.js
# public/admin/assets/oa-menu-form-edit.vue_vue_type_script_setup_true_lang.4a94d8c8.js
# public/admin/assets/oa-menu-form-edit.vue_vue_type_script_setup_true_lang.e36a043a.js
# public/admin/assets/oa-menu-form.57debade.js
# public/admin/assets/oa-menu-form.5af7d29e.js
# public/admin/assets/oa-menu-form.vue_vue_type_script_setup_true_lang.67bb8ea5.js
# public/admin/assets/oa-menu-form.vue_vue_type_script_setup_true_lang.e41e7bd3.js
# public/admin/assets/oa-phone.48a76668.js
# public/admin/assets/oa-phone.66424cfe.js
# public/admin/assets/picker.0b96d088.js
# public/admin/assets/picker.5d8eed0a.js
# public/admin/assets/picker.7fdea6ff.js
# public/admin/assets/picker.dbcd437c.js
# public/admin/assets/post.09fddbe1.js
# public/admin/assets/post.ef78bb4b.js
# public/admin/assets/preview.02e7bf70.js
# public/admin/assets/preview.26af8dc8.js
# public/admin/assets/protocol.1a7d013b.js
# public/admin/assets/protocol.8e267222.js
# public/admin/assets/role.86090770.js
# public/admin/assets/role.b25c198c.js
# public/admin/assets/setting.2f03e550.js
# public/admin/assets/setting.5ca7d662.js
# public/admin/assets/setup.684d6202.js
# public/admin/assets/setup.e44fd5fe.js
# public/admin/assets/system.2ead1522.js
# public/admin/assets/system.35951c5a.js
# public/admin/assets/tabbar.34f74b99.js
# public/admin/assets/tabbar.bdd89062.js
# public/admin/assets/useDictOptions.5cafb1f4.js
# public/admin/assets/useDictOptions.b34b37f1.js
# public/admin/assets/useMenuOa.870ab9e1.js
# public/admin/assets/useMenuOa.d7923d98.js
# public/admin/assets/user.4d5749bd.js
# public/admin/assets/user.a9344a7d.js
# public/admin/assets/weapp.57fd07ba.js
# public/admin/assets/weapp.7765716e.js
# public/admin/assets/website.4c8013dc.js
# public/admin/assets/website.e8828dd2.js
# public/admin/assets/wx_dev.146ac4c9.js
# public/admin/assets/wx_dev.649507e0.js
# public/admin/assets/wx_oa.4f05f86f.js
# public/admin/assets/wx_oa.bdf9a81f.js
2022-12-30 09:39:13 +08:00
Jason
a7d6b7ce61
Merge branch 'hotfix/wjx202212300933'
2022-12-30 09:38:20 +08:00
Jason
d9f6b66c56
重新打包,移除打包文件
2022-12-30 09:38:09 +08:00
Jason
373bd551d7
Merge tag 'wjx202212291606' into develop
...
no message
2022-12-29 16:27:16 +08:00
Jason
e5f1ac1231
Merge branch 'hotfix/wjx202212291606'
2022-12-29 16:27:15 +08:00
Jason
c3e0a81b31
打包
2022-12-29 16:27:02 +08:00
Jason
df513e47ec
调整代码生成器设置
2022-12-29 16:04:32 +08:00
TinyAnts
62a3606169
修复代码生成关联表前缀问题
2022-12-29 14:16:54 +08:00
TinyAnts
97202201a2
优化定时任务
2022-12-29 11:59:10 +08:00
TinyAnts
088fffe836
调整获取所有库表不分页
2022-12-29 11:10:54 +08:00
TinyAnts
d59c9de38a
增加所有库表接口
2022-12-29 10:08:03 +08:00
TinyAnts
d63947856b
增加查询所有表接口
2022-12-29 09:43:05 +08:00
全栈程序员钟哥
36b6540a60
修改readme
...
Signed-off-by: 全栈程序员钟哥 <294687409@qq.com >
2022-12-28 07:34:22 +00:00
Jason
49fd6d3639
后台打包
2022-12-28 10:13:50 +08:00
Jason
3fd832d9e6
代码生成器配置调整
2022-12-28 10:12:33 +08:00
TinyAnts
aabc6205fb
增加返回字段
2022-12-28 10:05:35 +08:00
TinyAnts
4a7fd71da7
增加演示环境 ***** 敏感数据处理
2022-12-27 17:16:40 +08:00
TinyAnts
d7b6dc992f
移除多余代码
2022-12-23 18:11:10 +08:00
TinyAnts
2998041bde
移除多余代码
2022-12-23 17:52:20 +08:00
TinyAnts
2304922b8a
修复公众号授权登录bug
2022-12-23 16:13:30 +08:00
Jason
049209bfca
调整代码生成器模板
2022-12-23 14:50:25 +08:00
TinyAnts
dc5ed4b14b
修改包
2022-12-21 12:06:38 +08:00
TinyAnts
9beff48e28
增加演示环境拦截
2022-12-21 11:21:54 +08:00
TinyAnts
173640af07
微信扫码登录
2022-12-20 17:56:19 +08:00
TinyAnts
919cdc243c
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2022-12-20 17:33:08 +08:00
TinyAnts
670ac0208c
扫码登录
2022-12-20 17:33:01 +08:00
caijianhao
869c444fa5
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2022-12-20 17:09:01 +08:00
caijianhao
8b6b0e5257
调整网站信息设置接口
2022-12-20 17:08:38 +08:00
TinyAnts
8fed83cd15
优化用户端登录代码
2022-12-20 16:13:45 +08:00
caijianhao
864b54951a
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
...
# Conflicts:
# server/like-front/src/main/java/com/mdd/front/config/FrontConfig.java
2022-12-20 15:50:21 +08:00
caijianhao
9e89783add
pc端首页接口
2022-12-20 15:49:29 +08:00
TinyAnts
3b8e501a0b
优化登录代码
2022-12-20 15:22:17 +08:00
TinyAnts
3e97c2201b
增加开放平台渠道设置管理
2022-12-20 14:53:08 +08:00
TinyAnts
3b5a8ae197
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
...
# Conflicts:
# server/like-front/src/main/java/com/mdd/front/config/FrontConfig.java
2022-12-20 11:56:17 +08:00
TinyAnts
43983deb48
扫码登录二维码
2022-12-20 11:55:21 +08:00
caijianhao
2022859769
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2022-12-20 11:36:29 +08:00
DESKTOP-9BP5159\XY-003
bdf79ccb84
pc端配置接口
2022-12-20 11:36:20 +08:00
DESKTOP-9BP5159\XY-003
2a1d803c5f
调整接口
2022-12-20 11:23:26 +08:00
TinyAnts
444ea6b4cb
修复代码生成器bug
2022-12-12 18:03:59 +08:00
TinyAnts
f76a83b918
增加描述
2022-12-08 14:55:06 +08:00
TinyAnts
6e7292b97c
Merge branch 'release/1.3.5'
2022-12-07 14:58:33 +08:00
TinyAnts
4281a0f5bc
Merge tag '1.3.5' into develop
2022-12-07 14:58:33 +08:00
TinyAnts
933ea5a3dd
bug处理
2022-12-07 10:10:54 +08:00
TinyAnts
75c8b03969
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2022-12-06 10:20:56 +08:00
TinyAnts
a22fe53275
修复附件管理名称超长问题
2022-12-06 09:40:00 +08:00
TinyAnts
85ba64cd2f
处理日志功能时间线程问题
2022-12-06 09:39:33 +08:00
Jason
1d83523405
定时任务列表添加最后执行时间
2022-12-06 09:32:43 +08:00
xinjie
1ab2ca6b4e
打包
2022-12-02 17:03:56 +08:00
xinjie
5c043df578
完成定时任务对接
2022-12-02 17:01:30 +08:00
TinyAnts
f7a1b14500
修复定时任务新增没有分组
2022-12-02 16:54:46 +08:00
TinyAnts
a1a70346c9
init
2022-12-02 15:01:39 +08:00
TinyAnts
edfbe6ab4c
开放权限
2022-12-02 14:49:01 +08:00
TinyAnts
d593391f62
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2022-12-02 14:42:31 +08:00
TinyAnts
5f5026d40c
优化工具类的命名
2022-12-02 14:42:20 +08:00
xinjie
2453b0fc3b
修复上传文件请求头参数错误问题
2022-12-02 14:40:25 +08:00
TinyAnts
0077e75e85
修复管理员搜索bug
2022-12-02 14:18:29 +08:00
TinyAnts
327f0df6a9
增加定时任务管理
2022-12-02 14:14:34 +08:00
TinyAnts
03d09ca7d7
增加定时任务管理
2022-12-01 14:27:19 +08:00
TinyAnts
621e7916dc
计划任务管理
2022-11-30 22:09:27 +08:00
TinyAnts
c2a64e30f5
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2022-11-30 15:57:27 +08:00
TinyAnts
698d44696e
接入EasyExel依赖
2022-11-30 15:54:10 +08:00
xinjie
ef350201ca
调整管理员支持多部门多角色
2022-11-29 19:05:29 +08:00
TinyAnts
06bc994b42
修复管理员报错
2022-11-29 18:52:47 +08:00
windy
2c5310ca21
调整 多角色 多部门 多岗位
2022-11-29 16:57:15 +08:00
全栈程序员钟哥
0c5d7641b0
修改文档内容
...
Signed-off-by: 全栈程序员钟哥 <294687409@qq.com >
2022-11-22 06:21:47 +00:00
xinjie
af92e6209c
微信小程序头像,昵称调整
2022-11-21 15:52:00 +08:00
lr
cab7c3af39
Merge branch 'hotfix/lr-20221120'
2022-11-20 23:23:20 +08:00
lr
c38c46c09f
Merge branch 'master' into develop
2022-11-20 23:23:20 +08:00
lr
1805cb1515
调整README信息
2022-11-20 23:23:01 +08:00
TinyAnts
0d086f6198
Merge tag '1.3.4' into develop
2022-11-17 18:55:44 +08:00
TinyAnts
4d43d7cdcc
Merge branch 'release/1.3.4'
2022-11-17 18:55:42 +08:00
TinyAnts
8105c877af
安装sql
2022-11-17 18:28:16 +08:00
TinyAnts
ff5b649969
修复管理员编辑bug
2022-11-17 18:07:11 +08:00
Jason
c64d0151b3
打包,调整文件接口路径
2022-11-17 17:45:49 +08:00
Jason
98328e1bb1
打包
2022-11-17 17:33:22 +08:00
TinyAnts
402321fe3c
系统管理员编辑限制
2022-11-17 17:32:29 +08:00
TinyAnts
830c10ea73
增加系统管理员校验
2022-11-17 17:31:13 +08:00
TinyAnts
728a0f6ec5
调整注释
2022-11-17 17:03:25 +08:00
TinyAnts
40df111da7
修复通知设置bug
2022-11-17 16:40:28 +08:00
Jason
1d7c2383c1
调整素材中心按钮权限相关
2022-11-17 16:38:59 +08:00
Jason
3137a59566
Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop
2022-11-17 16:25:37 +08:00
Jason
339f63c0c0
调整素材相关接口
2022-11-17 16:25:28 +08:00
TinyAnts
edc5357b8c
调整素材接口
2022-11-17 16:14:51 +08:00
TinyAnts
e22508240d
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2022-11-17 16:09:06 +08:00
TinyAnts
8480f98f28
调整登录异常监控
2022-11-17 16:09:01 +08:00
Jason
45b11402ce
调整管理员
2022-11-17 16:06:23 +08:00
TinyAnts
ef53643368
修复用户忘记密码bug
2022-11-17 15:42:26 +08:00
TinyAnts
41d372da5f
修复用户修改密码依然是密码错误bug
2022-11-17 15:40:47 +08:00
TinyAnts
aa4ba06be0
修复用户修改密码bug
2022-11-17 15:30:06 +08:00
TinyAnts
aa92623d7c
调整登录时效读配置
2022-11-17 15:27:11 +08:00
TinyAnts
b13523ca5e
优化登录时效配置
2022-11-17 15:18:45 +08:00
TinyAnts
522c698f6c
修复uniapp端更新手机号后createTime被更新
2022-11-17 15:07:32 +08:00
TinyAnts
b1fe1d9d47
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2022-11-17 14:59:48 +08:00
TinyAnts
25a85adf9e
处理编辑管理员
2022-11-17 14:59:32 +08:00
Jason
54c58d6ee1
调整后台底部导航,上传文件接口
2022-11-17 14:57:35 +08:00
TinyAnts
52615d1646
sa-token异常拦截
2022-11-17 14:53:29 +08:00
TinyAnts
2cd73748bb
修复底部导航编辑bug
2022-11-17 12:18:53 +08:00
TinyAnts
e23cb64f32
调整上传目录配置
2022-11-17 12:02:04 +08:00
TinyAnts
c639499fbc
修复静态图片404问题
2022-11-17 11:50:27 +08:00
TinyAnts
bd97df6f7b
优化代码
2022-11-17 11:39:14 +08:00
TinyAnts
e211426c1a
优化404拦截写法
2022-11-16 23:21:59 +08:00
TinyAnts
dafaf09011
修复json响应工具
2022-11-16 23:09:33 +08:00
TinyAnts
97b8f7016d
调整代码生成器
2022-11-16 22:59:16 +08:00
TinyAnts
3247a5f7d0
调整代码生成器
2022-11-16 22:06:21 +08:00
TinyAnts
57c88cf773
调整代码生成器
2022-11-16 19:01:45 +08:00
TinyAnts
329734b332
代码生成器
2022-11-16 18:17:59 +08:00
TinyAnts
c622781003
代码生成器调整
2022-11-16 17:54:01 +08:00
xinjie
e89f22cd8c
调整接口的一些字段及接口名称
2022-11-16 16:18:59 +08:00
TinyAnts
6db7255ed3
优化通知驱动类
2022-11-16 16:11:38 +08:00
TinyAnts
7a37ac18ac
修复通知设置bug
2022-11-16 15:01:40 +08:00
TinyAnts
ca9a251176
修复管理员编辑bug
2022-11-16 12:08:09 +08:00
TinyAnts
798d12c16f
修复登录问题
2022-11-16 12:00:43 +08:00
TinyAnts
124b1ff5dd
调整json转换工具
2022-11-16 11:49:39 +08:00
TinyAnts
a5d63d6c96
接入sa-token
2022-11-16 11:35:52 +08:00
TinyAnts
956bf841b3
整体优化代码结构
2022-11-15 22:25:17 +08:00
xinjie
e685304616
移动端-资讯中心下拉导航栏消失问题
2022-11-15 14:59:23 +08:00
xinjie
abbd23e332
可视化装修能拖拽排序
2022-11-15 14:46:12 +08:00
xinjie
37d39503bd
修改工作台二维码图片
2022-11-15 14:30:34 +08:00
xinjie
8055572f19
设置添加面包屑,logo配置
2022-11-15 14:23:03 +08:00
xinjie
7383a145b4
设置添加面包屑,logo配置
2022-11-15 14:18:24 +08:00
TinyAnts
1ab009544f
Merge tag '13.3' into develop
2022-10-14 17:09:06 +08:00
TinyAnts
fb9e5c3d49
Merge branch 'release/13.3'
2022-10-14 17:09:06 +08:00
TinyAnts
32232cb604
修改安装SQL
2022-10-14 16:16:20 +08:00
TinyAnts
bd5f7bcad0
修改版本号
2022-10-14 16:14:02 +08:00
Jason
8e5d515e4c
调整版本号
2022-10-14 15:49:14 +08:00
Jason
abf98ee5e7
修复代码生成的页面无法缓存的问题
2022-10-14 15:39:02 +08:00
Jason
61a9a453f4
调整dictvalue组件
2022-10-14 15:28:44 +08:00
Jason
3dd371161b
打包
2022-10-14 14:54:18 +08:00
TinyAnts
88af20071b
修复代码生成器导入小数报错问题
2022-10-14 11:40:10 +08:00
TinyAnts
514b0108a5
修复代码生成器新增bug
2022-10-14 11:33:14 +08:00
TinyAnts
8c2729493d
修复代码生成存在小数的问题
2022-10-14 11:26:40 +08:00
Jason
47e968ddf9
部分输入框添加长度限制
2022-10-14 11:15:47 +08:00
TinyAnts
4d5615f90d
去除调试的注释
2022-10-14 11:09:29 +08:00
TinyAnts
8283695735
调整参数校验
2022-10-14 10:49:37 +08:00
Jason
8432eef4cf
调整所有排序的最大值
2022-10-14 10:47:21 +08:00
TinyAnts
e0407759d4
优化部门排序限制
2022-10-14 10:14:38 +08:00
TinyAnts
2eae8d9e94
优化统一时间写法
2022-10-14 10:00:25 +08:00
Ants
6efc39f902
!24 更新登录信息
...
Merge pull request !24 from 也曾为你、像超人/N/A
2022-10-14 01:58:27 +00:00
TinyAnts
0a708b79f0
修复登录重复更新信息bug
2022-10-14 09:55:52 +08:00
也曾为你、像超人
36e4725565
更新登录信息
...
Signed-off-by: 也曾为你、像超人 <1553592282@qq.com >
2022-10-13 13:07:38 +00:00
Jason
5029618235
!21 修复I5TUL1问题
...
Merge pull request !21 from 2014520/develop
2022-10-13 09:24:45 +00:00
Jason
1595d987ed
路由验权调整
2022-10-13 17:00:50 +08:00
Jason
35cec2a64c
登录页面跳转
2022-10-13 16:59:59 +08:00
Jason
6ee54646a8
调整微信公众号回复管理弹窗点击空白关闭问题
2022-10-13 16:59:34 +08:00
Jason
3deaa814a4
调整后台文案
2022-10-13 16:08:31 +08:00
Jason
4c458aeeac
管理员弹窗因类型问题警告
2022-10-13 15:48:05 +08:00
Jason
a99227d2ef
修复富文本编辑器全屏层级问题
2022-10-13 15:47:31 +08:00
Jason
10c95a0dee
修复h5协议跳转问题
2022-10-13 15:03:11 +08:00
Jason
3094503b17
调整图片选择器
2022-10-13 15:01:12 +08:00
TinyAnts
0e7944bd37
Merge tag '13.2' into develop
2022-09-30 16:32:41 +08:00
TinyAnts
83f57ad01d
Merge branch 'release/13.2'
2022-09-30 16:32:37 +08:00
TinyAnts
e05348206e
修复底部导航错误
2022-09-30 16:26:39 +08:00
TinyAnts
f4e4130cab
调整安装SQL
2022-09-30 15:36:20 +08:00
TinyAnts
0817b16615
调整素材
2022-09-30 14:53:46 +08:00
zhangliang
e16fc88e81
修复I5TUL1问题-编辑用户信息字段超长
2022-09-30 14:52:11 +08:00
Jason
f3b10f07b1
打包
2022-09-30 14:13:20 +08:00
Jason
e191fc8d26
公众号回复调整
2022-09-30 14:05:38 +08:00
TinyAnts
8052475e40
修复公众号回复管理
2022-09-30 11:49:03 +08:00
Jason
0cc7c8e7b9
修改环境变量配置,app目录-->uniapp
2022-09-30 10:23:58 +08:00
TinyAnts
9b5b625680
调整SQL文件
2022-09-29 17:11:40 +08:00
Jason
5d06003895
修改代码生气器模板
2022-09-29 15:23:46 +08:00
Jason
061543a191
热门搜索排除空值
2022-09-29 15:18:41 +08:00
Jason
c073cc65a7
只展开一个一级菜单开关
2022-09-29 14:55:04 +08:00
Jason
5b9af90590
修复保存图片错误
2022-09-29 14:41:46 +08:00
Jason
61ef48d446
修复登录账号没有任何权限时跳转到403页面错误
2022-09-29 14:39:56 +08:00
Jason
331997e1e9
上传文件优化
2022-09-29 10:41:33 +08:00
Jason
a4b6b2d6c8
修改搜索栏input框宽度
2022-09-29 10:26:49 +08:00
Jason
140249aca8
修复通知提示bug
2022-09-29 10:26:11 +08:00
Jason
6719e1b4f1
素材中心优化
2022-09-29 10:19:03 +08:00
likeshop技术社区
6bf572a01a
add LICENSE.
...
Signed-off-by: likeshop技术社区 <419339937@qq.com >
2022-09-29 02:17:21 +00:00
Jason
b74724084e
富文本优化
2022-09-29 10:16:59 +08:00
likeshop技术社区
580c06686a
删除文件 LICENSE
2022-09-29 02:16:58 +00:00
TinyAnts
235ab92413
优化代码
2022-09-28 09:38:52 +08:00
TinyAnts
4b58de936c
init
2022-09-28 09:25:54 +08:00
TinyAnts
611f59941f
优化代码规范
2022-09-27 19:01:50 +08:00
TinyAnts
8db1cff376
优化代码
2022-09-27 18:54:07 +08:00
TinyAnts
6cb4ad95a7
优化代码
2022-09-27 18:25:24 +08:00
TinyAnts
5e9db85f86
优化调整代码规范
2022-09-27 17:47:32 +08:00
TinyAnts
11c06ec81e
代码生成器
2022-09-26 11:14:36 +08:00
TinyAnts
551a042582
修复代码生成器bug
2022-09-26 11:11:58 +08:00
TinyAnts
eb0ab251d5
优化代码生成器注释生成
2022-09-26 10:43:48 +08:00
TinyAnts
19e2d1c03b
优化代码生成器注释生成
2022-09-26 10:42:34 +08:00
TinyAnts
71066b6d83
修复代码生成器主键有下划线错误
2022-09-26 10:22:02 +08:00
TinyAnts
6f11895f70
修复AOP上传文件记录日志错误
2022-09-26 09:29:31 +08:00
Ants
909b4f03a0
!18 处理文件类型上传导致日志收集失败: I5SYLB
...
Merge pull request !18 from mlzhang/cherry-pick-1664048747
2022-09-26 01:27:07 +00:00
TinyAnts
48e39fa4f9
阿里云存储文案调整
2022-09-26 09:21:23 +08:00
mlzhang
b20738061e
fixed 1d998d1 from https://gitee.com/zmldaniu/likeadmin_java/pulls/17
...
🐛 增加日志类型、判断文件类型记录文件名称 #I5SYLB
2022-09-24 19:45:49 +00:00
Ants
808cda3277
回退 'Pull Request !8 : 处理iss 优化建议'
2022-09-23 07:00:25 +00:00
Ants
42c7936f40
!8 处理iss 优化建议
...
Merge pull request !8 from mlzhang/master
2022-09-23 06:10:22 +00:00
Ants
dacded0e7a
!15 修复代码生成器导入数据表,编辑字段问题,兼容mysql8
...
Merge pull request !15 from hawk/master
2022-09-23 06:08:37 +00:00
hawk
b2cf624380
取消更新javaType
2022-09-23 09:40:01 +08:00
hawk
5faf6aa301
Revert "不更新配置"
...
This reverts commit a70c5f6fc3 .
2022-09-23 09:36:26 +08:00
hawk
b66eb35abb
Merge branch 'javaType修复'
...
* javaType修复:
修复代码生成器编辑数据表,不能保存java类型
2022-09-23 08:49:08 +08:00
hawk
ee8636ec54
修复代码生成器编辑数据表,不能保存java类型
2022-09-23 08:31:46 +08:00
hawk
a6d3ffb016
Revert "修复代码生成器编辑数据表,不能保存java类型"
...
This reverts commit 04a5d121a8 .
2022-09-23 08:11:23 +08:00
hawk
04a5d121a8
修复代码生成器编辑数据表,不能保存java类型
2022-09-23 07:56:15 +08:00
hawk
a70c5f6fc3
不更新配置
2022-09-23 07:55:01 +08:00
TinyAnts
6dc8cc78a2
调整SQL文件
2022-09-22 09:39:24 +08:00
hawk
78db1ace6d
修复代码生成器导入数据表,编辑字段问题,兼容mysql8
2022-09-21 23:20:13 +08:00
TinyAnts
158125c3d0
Merge tag '1.3.1' into develop
2022-09-21 17:42:28 +08:00
TinyAnts
abc001b76b
Merge branch 'release/1.3.1'
2022-09-21 17:42:27 +08:00
TinyAnts
4574db504a
调整SQL文件
2022-09-21 17:38:49 +08:00
TinyAnts
dfc50e2623
调整版本号
2022-09-21 17:33:24 +08:00
Jason
04290c78de
打包
2022-09-21 17:24:38 +08:00
Jason
a717ee326c
code lint
2022-09-21 16:44:00 +08:00
Jason
5e844a1d38
后台页面调整
2022-09-21 16:42:53 +08:00
Jason
cbdb12f5d7
修改搜索页面样式问题
2022-09-21 14:11:23 +08:00
TinyAnts
a8e08053be
修复素材移动bug
2022-09-21 11:59:22 +08:00
TinyAnts
a70ec891d7
增加基类继承
2022-09-21 11:35:51 +08:00
TinyAnts
d12cae1937
调整验证器增加基类
2022-09-21 11:29:36 +08:00
TinyAnts
78726b8373
增加验证器基类
2022-09-21 11:21:15 +08:00
TinyAnts
5dfea2ad46
修复文章分类删除bug
2022-09-21 10:32:17 +08:00
TinyAnts
6e0f1ade38
修复文章分类删除bug
2022-09-21 10:29:58 +08:00
TinyAnts
f89d34915b
忽略文件
2022-09-21 10:26:42 +08:00
TinyAnts
8db154f01d
增加idea注释
2022-09-21 10:24:50 +08:00
TinyAnts
878f740bda
修复系统管理员账号被可被慕改bug
2022-09-21 10:07:24 +08:00
TinyAnts
1df98b147a
优化配置和静态资源
2022-09-21 09:59:51 +08:00
Jason
cadad25176
菜单调整,资讯图标预览调整
2022-09-20 18:50:08 +08:00
Jason
73984d52c0
Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop
2022-09-20 18:49:02 +08:00
Jason
c3ea44292f
视频播放
2022-09-20 18:48:47 +08:00
TinyAnts
02317bee8e
调整视频上传大小限制
2022-09-20 18:43:48 +08:00
Jason
61dc2bf16d
调整登录页面样式
2022-09-20 16:23:29 +08:00
Jason
db45652f28
打包
2022-09-20 15:44:27 +08:00
Jason
51b35b664d
调整备注
2022-09-20 12:15:36 +08:00
Jason
29999f4e4a
调整登录,注册
2022-09-20 12:15:08 +08:00
Jason
77fb6acc2d
个人中心账号复制,切换tab页面时报错
2022-09-20 11:36:41 +08:00
Jason
b512eac708
调整工具函数
2022-09-20 11:06:54 +08:00
Jason
654c7b3c11
后台打包
2022-09-20 11:00:40 +08:00
Jason
fe5522dc2d
多标签tabs 调整
2022-09-20 10:58:38 +08:00
Jason
aee93d81b4
修改部门验证
2022-09-19 15:26:00 +08:00
Jason
56da1c18dd
部分多行文本框添加字数限制
2022-09-19 15:20:43 +08:00
Jason
ccd4747203
修复富文本编辑器样式问题
2022-09-19 14:52:45 +08:00
Jason
5240b89b35
后台打包
2022-09-19 14:04:54 +08:00
Jason
db7a0e3161
后台-岗位-文案错误
2022-09-19 12:13:58 +08:00
Jason
8f52978021
后台-热搜-删除搜索的id
2022-09-19 12:13:26 +08:00
Jason
83469090dd
字典数据无法访问bug
2022-09-19 12:12:40 +08:00
Jason
fa4de3214d
Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop
2022-09-19 12:12:03 +08:00
Jason
65da3d4a3a
素材中心优化
2022-09-19 12:11:54 +08:00
TinyAnts
a7e50bf511
修复后台上传视频获取不到名称bug
2022-09-19 11:57:35 +08:00
TinyAnts
e40689135f
修复前端默认logo与后台不一致bug
2022-09-19 10:10:43 +08:00
TinyAnts
3560cd45c5
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2022-09-19 10:07:44 +08:00
TinyAnts
8d75e4c934
修复微信授权登录都是同一个账号bug
2022-09-19 10:07:27 +08:00
lr
9393de9063
Merge branch 'hotfix/lr-20220818-redeme'
2022-09-18 16:29:40 +08:00
lr
e0f11a53e2
Merge branch 'master' into develop
2022-09-18 16:29:40 +08:00
lr
b142dee20f
调整REMDME信息
2022-09-18 16:29:18 +08:00
lr
3d83b85588
Merge branch 'hotfix/lr-20220818'
2022-09-18 16:27:04 +08:00
lr
18cbb4374c
Merge branch 'master' into develop
2022-09-18 16:27:04 +08:00
lr
ba7560b9e2
调整README信息
2022-09-18 16:26:42 +08:00
Jason
b7e010b634
Merge tag 'wjx202209160658' into develop
...
no message
2022-09-16 18:59:59 +08:00
Jason
8167380abe
Merge branch 'hotfix/wjx202209160658'
2022-09-16 18:59:59 +08:00
Jason
c69c104cd6
打包
2022-09-16 18:59:46 +08:00
Jason
370cde09c4
Merge tag 'wjx202209160657' into develop
...
no message
2022-09-16 18:58:25 +08:00
Jason
5ae19337d9
Merge branch 'hotfix/wjx202209160657'
2022-09-16 18:58:25 +08:00
Jason
387b38a009
删除h5打包
2022-09-16 18:58:10 +08:00
Jason
8ee7d03ce2
Merge tag 'wjx202209160652' into develop
...
no message
# Conflicts:
# h5/assets/account.304e4c09.js
# h5/assets/index.5ddae38f.js
# h5/assets/news-card.cacc1bdf.js
# h5/assets/pages-bind_mobile-bind_mobile.1e39d2a7.js
# h5/assets/pages-change_password-change_password.5516de7d.js
# h5/assets/pages-collection-collection.5d101da7.js
# h5/assets/pages-customer_service-customer_service.35e5d1d2.js
# h5/assets/pages-forget_pwd-forget_pwd.0cebded6.js
# h5/assets/pages-index-index.e7cbfcb8.js
# h5/assets/pages-login-login.3d278588.js
# h5/assets/pages-news-news.e71c4738.js
# h5/assets/pages-news_detail-news_detail.32038bef.js
# h5/assets/pages-register-register.07ea7f19.js
# h5/assets/pages-search-search.fb4812e5.js
# h5/assets/pages-user-user.97ccd207.js
# h5/assets/pages-user_data-user_data.1a85e802.js
# h5/assets/pages-user_set-user_set.a86f2f01.js
# h5/assets/pages-webview-webview.320ac922.js
# h5/assets/tabbar.3ac4b4ec.js
# h5/assets/u-avatar.aaafa077.js
# h5/assets/u-button.f89bd070.js
# h5/assets/u-checkbox.e15726da.js
# h5/assets/u-form-item.f2bc17f6.js
# h5/assets/u-form.e908a5a2.js
# h5/assets/u-icon.947d1557.js
# h5/assets/u-image.f03d2bad.js
# h5/assets/u-parse.466924cc.js
# h5/assets/u-popup.c389a818.js
# h5/assets/u-search.939c3f7f.js
# h5/assets/u-verification-code.8f91217a.js
# h5/assets/uni.fb5f5659.css
# h5/assets/uni_modules-vk-uview-ui-components-u-avatar-cropper-u-avatar-cropper.e582869e.js
# h5/assets/z-paging.34848bf3.js
# h5/index.html
2022-09-16 18:55:34 +08:00
Jason
915b989e7b
Merge branch 'hotfix/wjx202209160652'
2022-09-16 18:54:43 +08:00
Jason
a2e1541538
h5-打包
2022-09-16 18:54:32 +08:00
TinyAnts
849335def9
Merge branch 'master' of https://gitee.com/likeadmin/likeadmin_java
2022-09-16 18:49:39 +08:00
Jason
9be1caf811
Merge tag 'wjx202209160644' into develop
...
no message
# Conflicts:
# h5/assets/account.461df912.js
# h5/assets/index.4cc19f69.js
# h5/assets/news-card.f9659a05.js
# h5/assets/news.7d996083.js
# h5/assets/pages-as_us-as_us.8bc9b466.js
# h5/assets/pages-bind_mobile-bind_mobile.34dd4d4a.js
# h5/assets/pages-change_password-change_password.16c95aef.js
# h5/assets/pages-collection-collection.7f1501b9.js
# h5/assets/pages-customer_service-customer_service.bd6a8b1f.js
# h5/assets/pages-forget_pwd-forget_pwd.ed85d829.js
# h5/assets/pages-index-index.19c7f55a.js
# h5/assets/pages-login-login.432b5d68.js
# h5/assets/pages-news-news.b7c7c850.js
# h5/assets/pages-register-register.b6b6ae54.js
# h5/assets/pages-search-search.26e01199.js
# h5/assets/pages-user-user.3fd280ce.js
# h5/assets/pages-user_data-user_data.6cd74f38.js
# h5/assets/pages-user_set-user_set.5b8235ee.js
# h5/assets/pages-webview-webview.d074f33b.js
# h5/assets/tabbar.32c15533.js
# h5/assets/u-avatar.40df6bc2.js
# h5/assets/u-button.eb2fc020.js
# h5/assets/u-checkbox.a3de132d.js
# h5/assets/u-form-item.80dd7f49.js
# h5/assets/u-form.9f54964a.js
# h5/assets/u-icon.adf02ff2.js
# h5/assets/u-image.554b827f.js
# h5/assets/u-parse.a2aa510a.js
# h5/assets/u-popup.2aaf05d4.js
# h5/assets/u-search.18076790.js
# h5/assets/u-verification-code.a41295d0.js
# h5/assets/uni_modules-vk-uview-ui-components-u-avatar-cropper-u-avatar-cropper.8be1cad8.js
# h5/assets/z-paging.ae4248a3.js
# h5/index.html
2022-09-16 18:48:08 +08:00
Jason
2f8194e93b
Merge branch 'hotfix/wjx202209160644'
2022-09-16 18:46:33 +08:00
Jason
c6dd43762f
打包
2022-09-16 18:46:22 +08:00
Jason
53071be070
Merge tag 'wjx202209160640' into develop
...
no message
# Conflicts:
# h5/assets/account.304e4c09.js
# h5/assets/account.9ecc88ea.js
# h5/assets/account.e236fd55.js
# h5/assets/index.24de5888.js
# h5/assets/index.5ddae38f.js
# h5/assets/index.9d01590f.js
# h5/assets/news-card.0f53c999.js
# h5/assets/news-card.c91540ca.js
# h5/assets/news-card.cacc1bdf.js
# h5/assets/news.5c5bd132.js
# h5/assets/news.7d996083.js
# h5/assets/news.eb80f754.js
# h5/assets/pages-as_us-as_us.27714390.js
# h5/assets/pages-as_us-as_us.8bc9b466.js
# h5/assets/pages-as_us-as_us.a75e6bf4.js
# h5/assets/pages-bind_mobile-bind_mobile.1e39d2a7.js
# h5/assets/pages-bind_mobile-bind_mobile.3d1ff6fd.js
# h5/assets/pages-bind_mobile-bind_mobile.b0b2132a.js
# h5/assets/pages-change_password-change_password.3e609524.js
# h5/assets/pages-change_password-change_password.5516de7d.js
# h5/assets/pages-change_password-change_password.7fcdae1a.js
# h5/assets/pages-collection-collection.14907c26.js
# h5/assets/pages-collection-collection.53abd56e.js
# h5/assets/pages-collection-collection.5d101da7.js
# h5/assets/pages-customer_service-customer_service.0e4773a4.js
# h5/assets/pages-customer_service-customer_service.35e5d1d2.js
# h5/assets/pages-customer_service-customer_service.c942a0bb.js
# h5/assets/pages-forget_pwd-forget_pwd.0c22cfa7.js
# h5/assets/pages-forget_pwd-forget_pwd.0cebded6.js
# h5/assets/pages-forget_pwd-forget_pwd.41860f0c.js
# h5/assets/pages-index-index.21b55a1c.js
# h5/assets/pages-index-index.697592e8.js
# h5/assets/pages-index-index.e7cbfcb8.js
# h5/assets/pages-login-login.3d278588.js
# h5/assets/pages-login-login.583742c3.js
# h5/assets/pages-login-login.cc17b6ae.js
# h5/assets/pages-news-news.6e6dfc74.js
# h5/assets/pages-news-news.e71c4738.js
# h5/assets/pages-news-news.f27837dc.js
# h5/assets/pages-register-register.07ea7f19.js
# h5/assets/pages-register-register.127a8342.js
# h5/assets/pages-register-register.707197f6.js
# h5/assets/pages-search-search.5bd1eb0e.js
# h5/assets/pages-search-search.c9a4fc47.js
# h5/assets/pages-search-search.fb4812e5.js
# h5/assets/pages-user-user.29445b03.js
# h5/assets/pages-user-user.97ccd207.js
# h5/assets/pages-user-user.e6fd2164.js
# h5/assets/pages-user_data-user_data.1a85e802.js
# h5/assets/pages-user_data-user_data.2a0211b5.js
# h5/assets/pages-user_data-user_data.65619aff.js
# h5/assets/pages-user_set-user_set.9387105d.js
# h5/assets/pages-user_set-user_set.a86f2f01.js
# h5/assets/pages-user_set-user_set.d71e173b.js
# h5/assets/pages-webview-webview.183e0d8c.js
# h5/assets/pages-webview-webview.320ac922.js
# h5/assets/pages-webview-webview.c3fa2ff9.js
# h5/assets/shop.067e3a04.js
# h5/assets/tabbar.1370a2f3.js
# h5/assets/tabbar.3ac4b4ec.js
# h5/assets/tabbar.5a261344.js
# h5/assets/u-avatar.0975a40c.js
# h5/assets/u-avatar.665749d0.js
# h5/assets/u-avatar.aaafa077.js
# h5/assets/u-button.4291cf3a.js
# h5/assets/u-button.6324a944.js
# h5/assets/u-button.f89bd070.js
# h5/assets/u-checkbox.4a48075d.js
# h5/assets/u-checkbox.a9e5c7b5.js
# h5/assets/u-checkbox.e15726da.js
# h5/assets/u-form-item.8b18cdc2.js
# h5/assets/u-form-item.e8316076.js
# h5/assets/u-form-item.f2bc17f6.js
# h5/assets/u-form.718bda0a.js
# h5/assets/u-form.9d11b0a8.js
# h5/assets/u-form.e908a5a2.js
# h5/assets/u-icon.947d1557.js
# h5/assets/u-icon.b22654a8.js
# h5/assets/u-icon.b511ef4e.js
# h5/assets/u-image.2abefbca.js
# h5/assets/u-image.dcffbc78.js
# h5/assets/u-image.f03d2bad.js
# h5/assets/u-parse.2b02a1d4.js
# h5/assets/u-parse.466924cc.js
# h5/assets/u-parse.cd76eaa8.js
# h5/assets/u-popup.0657d28e.js
# h5/assets/u-popup.6fa83f64.js
# h5/assets/u-popup.c389a818.js
# h5/assets/u-search.939c3f7f.js
# h5/assets/u-search.9f49742b.js
# h5/assets/u-search.dad6632d.js
# h5/assets/u-verification-code.419886b4.js
# h5/assets/u-verification-code.8f91217a.js
# h5/assets/u-verification-code.9a7d2ff4.js
# h5/assets/uni_modules-vk-uview-ui-components-u-avatar-cropper-u-avatar-cropper.75f62b2e.js
# h5/assets/uni_modules-vk-uview-ui-components-u-avatar-cropper-u-avatar-cropper.859f9abd.js
# h5/assets/uni_modules-vk-uview-ui-components-u-avatar-cropper-u-avatar-cropper.e582869e.js
# h5/assets/util.7b793930.js
# h5/assets/z-paging.34848bf3.js
# h5/assets/z-paging.51f9fb6d.js
# h5/assets/z-paging.9a4d68b6.js
# h5/index.html
2022-09-16 18:43:18 +08:00
Jason
08bea98b36
Merge branch 'hotfix/wjx202209160640'
2022-09-16 18:42:53 +08:00
Jason
c0405ebaab
H5打包
2022-09-16 18:41:58 +08:00
TinyAnts
7a0b4259c2
Merge branch 'hotfix/default'
2022-09-16 18:39:48 +08:00
TinyAnts
769c1c0ff6
Merge branch 'master' into develop
2022-09-16 18:39:48 +08:00
TinyAnts
43da5265ff
调整获取微信手机号接口
2022-09-16 18:39:16 +08:00
TinyAnts
7cfb55124c
调整默认头像
2022-09-16 18:39:02 +08:00
TinyAnts
b660028a6c
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2022-09-16 18:33:51 +08:00
TinyAnts
4ee067a1f7
Merge tag '1.3.0' into develop
2022-09-16 18:25:36 +08:00
TinyAnts
859f52708c
Merge branch 'release/1.3.0'
2022-09-16 18:25:34 +08:00
Jason
3f699d3c7c
打包
2022-09-16 18:23:03 +08:00
Jason
652dc05993
Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop
2022-09-16 18:15:46 +08:00
Jason
117584acba
保存二维码
2022-09-16 18:15:41 +08:00
TinyAnts
4753a299cb
调整sql文件
2022-09-16 18:15:28 +08:00
TinyAnts
fb8ffb9845
增加静态文件
2022-09-16 18:11:05 +08:00
Jason
855f6ca3e6
资讯内容样式
2022-09-16 18:04:30 +08:00
Jason
83df0dc001
Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop
2022-09-16 17:58:28 +08:00
Jason
85e8d2d390
资讯收藏调整
2022-09-16 17:58:08 +08:00
TinyAnts
b324c745c8
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2022-09-16 17:53:11 +08:00
TinyAnts
e5ad20dda3
增加静态资源
2022-09-16 17:52:58 +08:00
Jason
8c48b47cf4
打包
2022-09-16 17:50:39 +08:00
TinyAnts
7a36b5116b
增加静态资源图片
2022-09-16 17:44:22 +08:00
TinyAnts
2fae4ce8a6
fastjson版本调整
2022-09-16 17:38:20 +08:00
Jason
50aeb20502
修改路由
2022-09-16 17:13:56 +08:00
Jason
3ce89c21cf
修改密码bug
2022-09-16 17:13:12 +08:00
TinyAnts
91ea925413
修改版本号
2022-09-16 16:37:08 +08:00
Jason
f8a6fb6429
Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop
2022-09-16 16:32:03 +08:00
Jason
0dfb4050bc
代码格式化
2022-09-16 16:31:24 +08:00
TinyAnts
32babb3e15
调整sql文件
2022-09-16 16:31:23 +08:00
TinyAnts
9feb2e8a16
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2022-09-16 16:30:18 +08:00
TinyAnts
b799f7c244
调整sql文件
2022-09-16 16:30:04 +08:00
Jason
2dfb13a694
后台打包
2022-09-16 16:29:27 +08:00
Jason
5eb0efe53e
【小程序-登录:后台修改用户账号后,用户再用原账号进行登录操作,提示语展示时间太短】 https://www.tapd.cn/56509124/bugtrace/bugs/view?bug_id=1156509124001003526
2022-09-16 16:28:56 +08:00
TinyAnts
36c2089316
修改管理员默认头像
2022-09-16 16:26:41 +08:00
TinyAnts
264b5ad609
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2022-09-16 16:20:42 +08:00
TinyAnts
898daf418c
修复增加文章浏览量
2022-09-16 16:20:32 +08:00
Jason
4b8ab76a32
输入框添加清空符号,查询输入框添加回车
2022-09-16 16:17:08 +08:00
TinyAnts
97b3da1f37
替换logo默认图
2022-09-16 15:38:48 +08:00
Jason
0cabdb18b9
后台-按钮权限控制
2022-09-16 15:35:38 +08:00
Jason
2361b79548
修改密码调整
2022-09-16 15:35:04 +08:00
Jason
32963b1ab0
Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop
2022-09-16 15:32:24 +08:00
Jason
e34248893d
图标库调整
2022-09-16 15:32:14 +08:00
TinyAnts
a9e1ff42cc
调整用户修改密码
2022-09-16 15:27:48 +08:00
Jason
0d5444342d
Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop
2022-09-16 15:18:09 +08:00
TinyAnts
ba3c608e6d
处理最后登录时间
2022-09-16 15:16:04 +08:00
TinyAnts
7b99dc1806
处理微信登录问题
2022-09-16 15:10:55 +08:00
TinyAnts
b88815e496
调试小程序登录
2022-09-16 15:07:29 +08:00
TinyAnts
11aac78bdf
调试微信登录
2022-09-16 14:48:00 +08:00
TinyAnts
88f58f2be3
调试微信登录
2022-09-16 14:46:02 +08:00
TinyAnts
9275db50bb
调整sql文件
2022-09-16 14:23:40 +08:00
zhangml
2db501d36d
✨ 优化部门级联和默认 #I5R3QL
2022-09-16 13:42:11 +08:00
Jason
2ffa018c18
Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop
2022-09-16 12:08:25 +08:00
Jason
95830aefa5
图标库调整
2022-09-16 12:08:10 +08:00
TinyAnts
a9600cfc83
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2022-09-16 12:06:08 +08:00
TinyAnts
aaa5faf279
处理菜单发布
2022-09-16 12:05:59 +08:00
Jason
30bc224c1c
后台-修改css配置
2022-09-16 12:05:15 +08:00
Jason
9e4a224cbf
Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop
2022-09-16 11:58:31 +08:00
Jason
dbebfcc29a
后台-复制提示问题
2022-09-16 11:58:25 +08:00
TinyAnts
8791ba6b15
调整sql文件
2022-09-16 11:54:37 +08:00
TinyAnts
1eba0759da
调整sql文件
2022-09-16 11:46:41 +08:00
TinyAnts
d13444aed8
调整微信用户修改密码需要原密码的问题
2022-09-16 11:42:50 +08:00
TinyAnts
075e439d49
调整短信驱动
2022-09-16 11:35:07 +08:00
TinyAnts
a25478e2d9
修复图标问题
2022-09-16 11:28:14 +08:00
Jason
956b883e42
h5渠道去除访问链接
2022-09-16 11:18:09 +08:00
Jason
20dbff10bc
图标选择器优化
2022-09-16 11:16:13 +08:00
Jason
237b44e7ce
Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop
2022-09-16 10:25:40 +08:00
Jason
aeb6a7b47b
【小程序-轮播图:跳转至指定链接失败】 https://www.tapd.cn/56509124/bugtrace/bugs/view?bug_id=1156509124001003513
2022-09-16 10:25:04 +08:00
TinyAnts
f4d1344bd3
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2022-09-16 10:23:20 +08:00
TinyAnts
33ba157244
处理角色禁用问题
2022-09-16 10:23:08 +08:00
Jason
ee2b143aee
【后台-用户管理:用户头像错误】 https://www.tapd.cn/56509124/bugtrace/bugs/view?bug_id=1156509124001003511
2022-09-16 10:19:07 +08:00
Jason
5b1c032353
新增复制自定义指令
2022-09-16 10:18:51 +08:00
Jason
e92db41bea
素材中心 分组bug
2022-09-16 10:18:01 +08:00
TinyAnts
bdf1303854
修复H5关闭后跳转页面404问题
2022-09-16 10:09:56 +08:00
TinyAnts
61eec8bb1c
修复文章类目状态编辑问题
2022-09-16 10:04:44 +08:00
TinyAnts
0f55e3f808
处理分类新增
2022-09-16 10:02:15 +08:00
TinyAnts
c99bf5d950
修复文章浏览量编辑初始值问题
2022-09-16 09:55:22 +08:00
TinyAnts
aa2d35123d
修复文章类目删除错误问题
2022-09-16 09:51:55 +08:00
TinyAnts
ee3e851304
处理文章排序问题
2022-09-16 09:49:42 +08:00
TinyAnts
26106cc215
处理文章排序问题
2022-09-16 09:48:03 +08:00
TinyAnts
8958f19acb
处理部门排序问题
2022-09-16 09:31:13 +08:00
TinyAnts
b86a06fc08
处理部门排序问题
2022-09-16 09:29:38 +08:00
TinyAnts
e412999ac2
处理部门排序问题
2022-09-16 09:28:08 +08:00
TinyAnts
a26cb456f2
处理排序问题
2022-09-16 09:25:04 +08:00
TinyAnts
e1719bd1fa
处理管理员校验问题
2022-09-16 09:20:49 +08:00
TinyAnts
bad3c391b4
处理多处登录的问题
2022-09-16 09:12:38 +08:00
TinyAnts
e1b6eaf2ba
处理多端登录问题
2022-09-15 19:04:26 +08:00
Jason
b550755d32
装修页面权限按钮处理
2022-09-15 19:02:09 +08:00
Jason
5c4e0f4266
【Java后台-文章管理:发布文章时,部分字段提示语错误】 https://www.tapd.cn/56509124/bugtrace/bugs/view?bug_id=1156509124001003500
2022-09-15 18:57:07 +08:00
Jason
0d9e58f8ff
【后台-用户列表:部分搜索字段名称错误】 https://www.tapd.cn/56509124/bugtrace/bugs/view?bug_id=1156509124001003512
2022-09-15 18:56:33 +08:00
Jason
7adcc9bd60
网站名称添加悬浮显示全部
2022-09-15 18:55:45 +08:00
TinyAnts
79749e28ea
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2022-09-15 18:11:21 +08:00
TinyAnts
7c6bbbbbfd
修复修改密码后登录提示密码错误的bug
2022-09-15 18:11:17 +08:00
Jason
d2e6836450
打包
2022-09-15 17:52:47 +08:00
Jason
c48768d32a
Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop
2022-09-15 17:52:20 +08:00
Jason
b00cf5bf6c
打包
2022-09-15 17:47:19 +08:00
TinyAnts
c8a940b6e1
调整权限控制
2022-09-15 17:43:27 +08:00
Jason
05fdcfd368
打包
2022-09-15 17:43:03 +08:00
Jason
092a69b52d
修复h5正式环境新闻资讯报错问题
2022-09-15 16:54:44 +08:00
Jason
4d3b0adb5e
公众号登录调试
2022-09-15 15:54:12 +08:00
Jason
e71a5ab805
h5登录调试
2022-09-15 15:44:34 +08:00
Jason
354e07adf1
公众号登录调试
2022-09-15 15:38:54 +08:00
Jason
786559a12b
公众号登录调试
2022-09-15 15:27:07 +08:00
Jason
991734a41f
公众号登录调试
2022-09-15 15:21:43 +08:00
Jason
486deb6150
h5登录调试
2022-09-15 15:14:10 +08:00
Jason
2abccd483e
公众号登录调试
2022-09-15 15:03:12 +08:00
Jason
867845a2dd
编辑弹窗点击门窗消失问题处理
2022-09-15 14:17:58 +08:00
Jason
b23ce97102
样式文件调整
2022-09-15 14:16:35 +08:00
Jason
220bd45e51
Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop
2022-09-15 14:15:24 +08:00
Jason
eea37ebba2
公众号微信登录调试
2022-09-15 14:15:12 +08:00
TinyAnts
76e7623643
修复新增角色时排序号无效
2022-09-15 11:58:14 +08:00
TinyAnts
2121ab6db9
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2022-09-15 11:50:00 +08:00
TinyAnts
5bc7a8c52a
处理文章分类排序问题
2022-09-15 11:49:56 +08:00
Jason
2316105322
修改线上请求域名
2022-09-15 11:49:12 +08:00
Jason
75bbd25560
Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop
2022-09-15 11:40:27 +08:00
Jason
0c5bf7959c
tabbar 跳转问题
2022-09-15 11:40:20 +08:00
TinyAnts
f9a0f87f35
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2022-09-15 11:38:53 +08:00
TinyAnts
060739454a
修复部门删除问题
2022-09-15 11:38:40 +08:00
Jason
5bbfb04114
打包
2022-09-15 11:31:37 +08:00
TinyAnts
193470d4ac
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2022-09-15 11:25:16 +08:00
TinyAnts
d933d88290
系统日志模糊搜索
2022-09-15 11:25:06 +08:00
Jason
e190aa68c9
Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop
2022-09-15 11:14:39 +08:00
Jason
e7ed627af0
h5打包
2022-09-15 11:14:30 +08:00
TinyAnts
b5ed94f9e1
修复用户列表按时间搜索bug
2022-09-15 11:08:39 +08:00
Jason
c3462df82c
公众号登录
2022-09-15 10:53:31 +08:00
Jason
de81fd983a
h5打包
2022-09-15 10:52:10 +08:00
TinyAnts
2dc69f2453
修复权限菜单bug
2022-09-15 10:35:19 +08:00
linjinyuan
a5d34a3dc5
【后台管理】-- 渠道-公众号回复管理
2022-09-15 09:38:04 +08:00
TinyAnts
208e942e09
修复公众号回复状态切换bug
2022-09-15 09:35:13 +08:00
TinyAnts
e624ab8380
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2022-09-15 09:28:40 +08:00
TinyAnts
71728aeea1
调整公众号回复状态bug
2022-09-15 09:27:48 +08:00
Jason
8d6fd9f22c
文章调整
2022-09-15 09:25:46 +08:00
Jason
345b3bb81a
管理员密码验证问题
2022-09-15 09:18:44 +08:00
TinyAnts
9c85b1e6a5
修复文章分类新增
2022-09-14 18:55:16 +08:00
TinyAnts
49fce741eb
公众号登录
2022-09-14 18:48:51 +08:00
TinyAnts
c6c7e77adc
微信公众号登录
2022-09-14 18:11:10 +08:00
TinyAnts
65fbd8a3dc
修复全局配置获取
2022-09-14 18:03:21 +08:00
TinyAnts
c6026abb9b
微信公众号登录
2022-09-14 17:56:02 +08:00
TinyAnts
b7b7b56a2f
微信公众号登录
2022-09-14 17:53:24 +08:00
TinyAnts
324c95ca14
微信公众号登录
2022-09-14 17:49:03 +08:00
linjinyuan
21c9509a12
【后台管理】-- 渠道-菜单管理
2022-09-14 17:29:57 +08:00
TinyAnts
2aabcc5968
增加h5全局配置
2022-09-14 17:21:47 +08:00
TinyAnts
b7f2a4dcba
修复公众号菜单保存失败bug
2022-09-14 17:14:21 +08:00
Jason
681e4eaa9c
修复登录组册的bug
2022-09-14 16:59:45 +08:00
Jason
cf99b35b79
修复bug ,底部导航,装修优化
2022-09-14 16:41:39 +08:00
TinyAnts
a1fc2fed1c
增加免登录接口
2022-09-14 16:37:42 +08:00
TinyAnts
c8b23a181f
公众号登录
2022-09-14 16:13:00 +08:00
TinyAnts
535cf29350
公众号登录
2022-09-14 15:30:30 +08:00
TinyAnts
959b3d84dc
调整代码格式
2022-09-14 14:49:38 +08:00
TinyAnts
266ba03e30
Merge branch 'master' into develop
2022-09-14 14:48:27 +08:00
Ants
66b1158d6e
!2 处理issues
...
Merge pull request !2 from mlzhang/master
2022-09-14 06:47:25 +00:00
TinyAnts
978580a005
修复菜单删除bug
2022-09-14 14:27:58 +08:00
TinyAnts
6905fd4fea
修复系统日志搜索错误
2022-09-14 14:24:36 +08:00
TinyAnts
ba912956a2
修复系统日志搜索错误
2022-09-14 14:20:07 +08:00
TinyAnts
8d778d94c5
调整获取文章列表接口
2022-09-14 11:50:32 +08:00
TinyAnts
dcfa5bcf36
调整小程序登录
2022-09-14 11:30:37 +08:00
TinyAnts
11bf25156f
调整微信工具封装
2022-09-14 11:30:06 +08:00
TinyAnts
0817050b1b
增加公众号登录
2022-09-14 11:22:43 +08:00
TinyAnts
30e6033b02
增加菜单发布功能
2022-09-14 11:08:12 +08:00
TinyAnts
fb54c489fe
调整获取文章数据接口
2022-09-14 10:43:02 +08:00
TinyAnts
1596c077c4
增加装修数据
2022-09-14 10:40:07 +08:00
TinyAnts
4113967539
公众号菜单
2022-09-14 09:25:54 +08:00
Jason
3fe17fae5a
登录配置相关,调整登录逻辑,底部导航配置相关
2022-09-13 19:07:36 +08:00
linjinyuan
b47fc4219e
【后台管理】-- 渠道-菜单管理(未完成
2022-09-13 19:05:21 +08:00
TinyAnts
e5560889fc
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2022-09-13 19:02:18 +08:00
TinyAnts
3cd11784e4
增加公众号菜单管理
2022-09-13 19:02:15 +08:00
Jason
b8895342ac
登录相关配置
2022-09-13 17:41:24 +08:00
TinyAnts
f4eca5bc13
回复状态
2022-09-13 17:14:07 +08:00
TinyAnts
fc6c7ca9e7
增加是否绑定手机字段
2022-09-13 16:53:52 +08:00
TinyAnts
8b4a2fa41a
新增公众号回复详情列表
2022-09-13 16:47:23 +08:00
TinyAnts
502c44850f
增加公众号回复删除
2022-09-13 16:18:10 +08:00
TinyAnts
71998ed2f1
公众号回复管理功能
2022-09-13 16:06:50 +08:00
TinyAnts
8ea0b037b6
修复注册账号问题
2022-09-13 15:37:40 +08:00
TinyAnts
21431d751a
公众号回复
2022-09-13 15:32:53 +08:00
TinyAnts
ca8fc2dfae
修复全局配置错误
2022-09-13 14:10:56 +08:00
TinyAnts
065c5c065c
公众号
2022-09-13 12:07:46 +08:00
Jason
d506a9619a
打包
2022-09-13 11:43:59 +08:00
Jason
ed22fdbb8f
去掉图片组件默认背景
2022-09-13 11:42:21 +08:00
TinyAnts
52ee8bd1f4
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2022-09-13 11:15:24 +08:00
TinyAnts
289653ec5a
处理管理员编辑bug
2022-09-13 11:15:07 +08:00
Jason
943a96ade6
个人中心装修图片问题
2022-09-13 11:07:24 +08:00
洪树泽
5ecd0ef668
【小程序】个人设置-增加退出按钮,样式调整
2022-09-13 10:54:36 +08:00
Jason
77b2b5ccb9
后台打包
2022-09-13 10:23:33 +08:00
洪树泽
301dd7c3ea
【小程序】个人设置样式调整,去除无用代码
2022-09-13 10:13:26 +08:00
mlzhang
4945f57d15
🐛 issues #I5QLRL
2022-09-10 22:41:18 +08:00
mlzhang
4d5f9cee32
✨ issues #I5QLRV
2022-09-10 22:38:00 +08:00
mlzhang
609d4a60a1
🐛 issues #I5QLRX
2022-09-10 22:37:06 +08:00
mlzhang
707180427d
:fix: #I5QLSA
2022-09-10 22:35:06 +08:00
mlzhang
fcb7773889
✨ #I5QLCI
2022-09-10 22:34:08 +08:00
windy
5956513c0e
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2022-09-09 18:45:13 +08:00
windy
7a97610ca9
调整修改密码接口
2022-09-09 18:45:00 +08:00
Jason
29febf427b
lint 代码
2022-09-09 18:42:41 +08:00
windy
b7b87d406c
处理小程序登录问题
2022-09-09 18:25:24 +08:00
Jason
43b9a54b6a
修改密码
2022-09-09 17:58:18 +08:00
windy
33e4cd45f3
修复绑定手机号问题
2022-09-09 17:06:44 +08:00
linjinyuan
18bb453f04
Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop
...
* 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java :
修改pages.json
【移动端】修复头像上传bug
个人中心及注册页面跳转
2022-09-09 17:00:10 +08:00
linjinyuan
bc927846c1
【小程序】-- 咨询中心tabs调整
2022-09-09 16:59:32 +08:00
Jason
a4ed4f187d
修改pages.json
2022-09-09 16:22:08 +08:00
洪树泽
caea6872a6
【移动端】修复头像上传bug
2022-09-09 16:06:58 +08:00
Jason
f1a80f7c5e
个人中心及注册页面跳转
2022-09-09 15:59:18 +08:00
洪树泽
0a1cf3fb1a
【移动端】个人资料页面调整
2022-09-09 15:51:52 +08:00
Jason
2f272503a6
修改头像截取
2022-09-09 15:19:08 +08:00
Jason
ca5a931254
Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop
...
# Conflicts:
# app/src/utils/util.ts
2022-09-09 14:46:46 +08:00
Jason
cc8fa61bea
页面跳转,跳转拦截
2022-09-09 14:44:55 +08:00
洪树泽
145f85edf7
【小程序】个人资料
2022-09-09 14:27:52 +08:00
TinyAnts
a54756e081
修复编辑用户
2022-09-09 11:31:57 +08:00
linjinyuan
c382edbdc2
【后台管理】-- 文章栏目switch显示错误
2022-09-09 11:20:54 +08:00
Jason
cda8b3e3b3
首页页面跳转
2022-09-09 11:06:58 +08:00
linjinyuan
5b1da086ba
Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop
...
* 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java :
修改pages.json
2022-09-09 10:48:03 +08:00
linjinyuan
5b33f47641
【小程序】-- 请求异常处理
2022-09-09 10:47:19 +08:00
Jason
12bf186e55
Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop
...
# Conflicts:
# app/src/pages.json
2022-09-09 10:46:37 +08:00
Jason
6c7e918c52
修改pages.json
2022-09-09 10:45:16 +08:00
linjinyuan
5db6380252
【小程序】-- 解决下拉加载无法下拉&图片路径调整
2022-09-09 10:43:31 +08:00
linjinyuan
1a50e1ed5e
【后台管理】-- 文章管理编辑bug
2022-09-09 10:40:03 +08:00
TinyAnts
41393afa69
Merge tag '1.2.1' into develop
2022-09-09 10:34:50 +08:00
TinyAnts
3868962b1e
Merge branch 'release/1.2.1'
2022-09-09 10:34:48 +08:00
TinyAnts
7dfc0d997a
增加静态资源
2022-09-09 10:30:46 +08:00
洪树泽
ee86e5dbf1
Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop
...
# Conflicts:
# app/src/pages.json
2022-09-09 10:14:29 +08:00
洪树泽
59f508d70f
Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop
...
部分调整
2022-09-09 10:11:33 +08:00
linjinyuan
c9bf4ed561
【小程序】-- pages.json 添加搜索页面
2022-09-09 09:59:06 +08:00
linjinyuan
f5204f0e9d
【小程序】-- 搜索文章
2022-09-09 09:58:29 +08:00
Jason
e0b6bab788
忘记密码
2022-09-09 09:50:39 +08:00
洪树泽
2193193df9
Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop
...
部分调整页面链接
2022-09-09 09:50:31 +08:00
TinyAnts
cb239727e7
优化代码
2022-09-09 09:26:57 +08:00
洪树泽
4eb5ec6118
【小程序】增加个人资料,修改密码页面。协议页面调整
2022-09-09 09:18:31 +08:00
洪树泽
d992e9bed0
协议页面对接
2022-09-09 09:06:21 +08:00
洪树泽
961ec0b967
增加协议枚举
2022-09-09 08:36:14 +08:00
洪树泽
42af47b620
Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop
2022-09-09 08:35:24 +08:00
TinyAnts
fffcddfede
调整通知接口
2022-09-08 19:57:33 +08:00
TinyAnts
53b167f2f0
修复热门搜素获取接口
2022-09-08 19:42:57 +08:00
TinyAnts
65c7b8d3a3
修复通知列表报错
2022-09-08 19:29:01 +08:00
TinyAnts
85bb0630b6
增加搜索接口
2022-09-08 19:17:21 +08:00
Jason
41ba4227e9
打包
2022-09-08 19:11:31 +08:00
Jason
0f47284235
网站信息,登录,用户
2022-09-08 19:09:53 +08:00
洪树泽
f1872f53ba
Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop
2022-09-08 18:58:17 +08:00
TinyAnts
669b91a99e
增加版本号返回
2022-09-08 18:51:37 +08:00
洪树泽
11f85bd955
【小程序】关于我们页面切图
2022-09-08 18:46:32 +08:00
洪树泽
6a5623e11d
【小程序】关于我们页面
2022-09-08 18:39:19 +08:00
洪树泽
89f58728cc
Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop
...
# Conflicts:
# app/src/pages.json
2022-09-08 18:35:59 +08:00
洪树泽
c873f109ff
【小程序】个人设置页面切图
2022-09-08 18:34:30 +08:00
TinyAnts
67c57a5d08
调整用户信息编辑字段
2022-09-08 18:34:14 +08:00
TinyAnts
54b5d76d01
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2022-09-08 18:32:29 +08:00
TinyAnts
b4be4a1e86
调整用户信息编辑接口
2022-09-08 18:32:26 +08:00
linjinyuan
30d46a37fc
【小程序】-- 新增我的收藏
2022-09-08 18:20:32 +08:00
TinyAnts
cc481438df
修复取消收藏接口
2022-09-08 18:03:17 +08:00
TinyAnts
db5588577b
修复取消收藏接口
2022-09-08 18:02:13 +08:00
洪树泽
32eeafdb33
Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop
2022-09-08 17:59:42 +08:00
洪树泽
db84c5bed5
【小程序】个人设置页面
2022-09-08 17:59:05 +08:00
TinyAnts
ff167a56b3
修复小程序端免登录无法获取id的问题
2022-09-08 17:57:36 +08:00
TinyAnts
394793710d
增加详情里的收藏接口
2022-09-08 17:39:56 +08:00
TinyAnts
7d3398387c
优化默认头像
2022-09-08 17:23:46 +08:00
TinyAnts
ef795de84d
优化代码
2022-09-08 17:19:58 +08:00
TinyAnts
e0e880e812
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2022-09-08 17:10:50 +08:00
TinyAnts
2039a317a9
修复文章列表问题
2022-09-08 17:10:46 +08:00
linjinyuan
c8ca9c83cb
【小程序】-- 新增咨询详情页面
2022-09-08 16:58:01 +08:00
linjinyuan
e796f2662b
【小程序】-- 咨询列表
2022-09-08 16:55:00 +08:00
Jason
b7499b24c3
底部导航配置
2022-09-08 16:40:36 +08:00
Jason
04fad4b18c
登录,个人中心,联系客服
2022-09-08 16:28:56 +08:00
TinyAnts
fca4c24a8e
调整网站设置接口
2022-09-08 15:51:08 +08:00
TinyAnts
3a641675e3
增加用户编辑功能
2022-09-08 15:41:29 +08:00
Jason
a40d4c8986
重复请求的问题
2022-09-08 15:28:51 +08:00
TinyAnts
810ac4caa8
调整增加素材相对路径
2022-09-08 14:59:13 +08:00
TinyAnts
027fc078cb
增加修改密码
2022-09-08 14:53:01 +08:00
TinyAnts
fb86e38040
增加绑定手机号接口
2022-09-08 14:22:18 +08:00
TinyAnts
5a0043fcd2
增加绑定手机号接口
2022-09-08 12:12:41 +08:00
TinyAnts
1cde7463fe
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2022-09-08 11:43:30 +08:00
TinyAnts
ca2f5ee6a2
增加用户信息编辑
2022-09-08 11:40:57 +08:00
linjinyuan
c59f86c698
【小程序】-- 新增tab,tbs组件,可以左右滑动切换tab
2022-09-08 11:27:26 +08:00
TinyAnts
177907dfe6
增加获取微信手机号码
2022-09-08 11:15:56 +08:00
TinyAnts
e258f2097a
增加上传接口
2022-09-08 10:55:55 +08:00
TinyAnts
d042c12a31
调整用户管理接口
2022-09-08 10:43:23 +08:00
TinyAnts
ce877ff7f1
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2022-09-08 09:56:21 +08:00
TinyAnts
4529f969ea
处理微信登录问题
2022-09-08 09:56:10 +08:00
Jason
95e1c837ed
首页
2022-09-07 21:00:03 +08:00
Jason
5c0105e786
登录
2022-09-07 20:58:01 +08:00
TinyAnts
67ccf1b607
增加首页文章
2022-09-07 20:45:30 +08:00
TinyAnts
caed4541f4
处理微信登录问题
2022-09-07 20:36:50 +08:00
TinyAnts
47aad30c42
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2022-09-07 18:43:50 +08:00
TinyAnts
d018ffb2d0
调整全局配置接口
2022-09-07 18:43:39 +08:00
linjinyuan
b96c43e051
Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop
...
* 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java :
增加注册时的客户端
增加文章收藏处理
增加收藏
调整接口
2022-09-07 18:37:29 +08:00
linjinyuan
d330a40296
【后台管理】-- 热门搜索
2022-09-07 18:37:01 +08:00
TinyAnts
15e20646c2
增加注册时的客户端
2022-09-07 18:28:14 +08:00
TinyAnts
42a0d891bc
增加文章收藏处理
2022-09-07 18:08:40 +08:00
TinyAnts
706a53193f
增加收藏
2022-09-07 17:09:50 +08:00
TinyAnts
d31a70d3d8
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2022-09-07 16:29:32 +08:00
TinyAnts
7968e41aa8
调整接口
2022-09-07 16:29:20 +08:00
linjinyuan
e31942371a
【后台管理】-- 用户设置
2022-09-07 16:24:24 +08:00
TinyAnts
88ac6114ba
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2022-09-07 16:19:57 +08:00
TinyAnts
fcb356e17e
增加政策协议接口 / 个人中心接口 / 热搜接口
2022-09-07 16:19:54 +08:00
Jason
f8803898c4
字体大小配置
2022-09-07 16:19:23 +08:00
Jason
81fe969176
uview切换为1.
2022-09-07 16:10:28 +08:00
Jason
5dbc93a1bc
图标选择器优化,底部导航
2022-09-07 15:30:03 +08:00
TinyAnts
18eb788ac9
调整验证码
2022-09-07 15:21:18 +08:00
TinyAnts
82f2a92dfd
调整接口
2022-09-07 14:43:07 +08:00
Jason
4dc75a0459
修改vite配置
2022-09-07 14:30:47 +08:00
TinyAnts
fe4e936b2d
增加登录校验功能
2022-09-07 14:21:24 +08:00
TinyAnts
c6534f3ab4
增加热门搜索
2022-09-07 11:40:43 +08:00
TinyAnts
c006488a4a
增加登录设置接口
2022-09-07 10:34:01 +08:00
TinyAnts
b87ea37bb3
增加设置方法
2022-09-07 09:47:30 +08:00
TinyAnts
60455a7227
修改底部导航装修接口
2022-09-07 09:28:24 +08:00
TinyAnts
81224c4013
装修
2022-09-06 19:16:08 +08:00
linjinyuan
c6a1e5924a
【后台管理】-- 系统设置--->用户设置&登录注册
2022-09-06 19:02:02 +08:00
Jason
116d6d5eff
装修,底部导航
2022-09-06 18:42:24 +08:00
TinyAnts
aed9b43d5e
处理编译问题
2022-09-06 18:30:44 +08:00
TinyAnts
3425d1e649
修改编译版本
2022-09-06 18:24:24 +08:00
TinyAnts
d78a3b74e4
修改编译版本
2022-09-06 18:22:21 +08:00
TinyAnts
a9a94157c4
修复渠道编辑问题
2022-09-06 18:10:35 +08:00
linjinyuan
30e84b2570
渠道对接
2022-09-06 16:36:15 +08:00
TinyAnts
03f388cb4c
增加收藏
2022-09-06 16:25:21 +08:00
TinyAnts
a437c1564f
实现短信通知功能
2022-09-06 15:36:13 +08:00
Jason
7c666c7bd6
Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop
2022-09-06 14:17:27 +08:00
Jason
d40b706457
取消vscode配置忽略
2022-09-06 14:17:20 +08:00
TinyAnts
010818855a
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2022-09-06 14:07:34 +08:00
TinyAnts
88ead65e73
处理装修详情问题
2022-09-06 14:07:30 +08:00
Jason
45a31db37f
装修相关
2022-09-06 11:51:36 +08:00
TinyAnts
9ec547d9f4
调整渠道设置接口
2022-09-06 10:17:35 +08:00
TinyAnts
458b675ddb
消息通知功能
2022-09-05 19:01:54 +08:00
TinyAnts
252ff34bc5
增加忘记密码接口
2022-09-05 17:50:31 +08:00
TinyAnts
48735eec10
登录功能实现
2022-09-05 17:28:49 +08:00
TinyAnts
ee6fe3c37a
登录功能实现
2022-09-05 17:09:48 +08:00
TinyAnts
006978a484
登录与注册
2022-09-05 16:49:04 +08:00
lr
1768127ea0
Merge branch 'master' into develop
2022-09-04 22:54:36 +08:00
lr
0bcb40c158
Merge branch 'hotfix/docker-mysql'
2022-09-04 22:54:35 +08:00
lr
9d066fc717
调整Mysql容器配置
2022-09-04 22:54:09 +08:00
lr
b6cdcc8598
Merge branch 'master' into develop
2022-09-04 00:08:10 +08:00
lr
6041ae8d1e
Merge branch 'hotfix/lr-20220903'
2022-09-04 00:08:10 +08:00
lr
54d6533e4f
调整容器名称
2022-09-04 00:07:49 +08:00
lr
16d30d94bb
调整README信息
2022-09-04 00:07:36 +08:00
lr
7a8be7a23b
Merge tag 'lr-20220902' into develop
...
no message
2022-09-02 23:33:32 +08:00
lr
7cdf936062
Merge branch 'hotfix/lr-20220902'
2022-09-02 23:33:32 +08:00
lr
fa3f16aff6
调整演示环境
2022-09-02 23:33:17 +08:00
lr
e926748f59
Merge branch 'master' into develop
2022-09-02 17:41:40 +08:00
lr
5362660ed5
Merge branch 'hotfix/docker'
2022-09-02 17:41:40 +08:00
lr
1d06f0659d
增加docker快速部署
2022-09-02 17:41:05 +08:00
lr
cbe09b5b8c
调整README信息
2022-09-02 17:37:46 +08:00
lr
e853d0a3f8
增加docker配置
2022-09-02 12:06:52 +08:00
TinyAnts
5d3c3425ef
调整文章接口
2022-09-02 09:54:54 +08:00
TinyAnts
15c0cc66b9
增加文章资讯接口
2022-08-31 15:04:53 +08:00
TinyAnts
746236e545
增加微信驱动
2022-08-31 12:14:06 +08:00
Jason
61aa2980d0
菜单调整,用户,消息通知,渠道
2022-08-30 19:08:17 +08:00
TinyAnts
2f98e62840
修改通知列表
2022-08-30 17:39:50 +08:00
Jason
ceff438fcb
文章,渠道
2022-08-29 19:06:52 +08:00
Jason
479fae0430
修复bug
2022-08-29 19:06:22 +08:00
TinyAnts
729a63deca
增加前端服务
2022-08-29 19:00:20 +08:00
TinyAnts
6f95683e6f
增加装修接口
2022-08-29 16:23:46 +08:00
Jason
04f9d7eb36
uniapp 底层
2022-08-26 17:52:43 +08:00
TinyAnts
00a9b9ede0
增加渠道设置
2022-08-26 14:43:27 +08:00
TinyAnts
f5814b242a
增加微信开放平台配置接口
2022-08-25 18:36:46 +08:00
TinyAnts
77c4ef41ae
增加渠道设置接口
2022-08-25 16:31:25 +08:00
TinyAnts
896c06c657
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2022-08-25 15:01:53 +08:00
Jason
819ab8427a
修复图片上传bug
2022-08-25 11:09:43 +08:00
Jason
4e1307b00e
修复菜单提示问题
2022-08-25 10:51:43 +08:00
likeadmin
a56239b398
调整redeme信息
...
Signed-off-by: likeadmin <11287291+likeadmin@user.noreply.gitee.com >
2022-08-24 11:18:10 +00:00
likeadmin
2fb01f847e
调整redeme信息
...
Signed-off-by: likeadmin <11287291+likeadmin@user.noreply.gitee.com >
2022-08-24 11:17:08 +00:00
lr
fed7641590
Merge branch 'master' into develop
2022-08-24 19:12:59 +08:00
lr
792014ab4c
Merge branch 'hotfix/lr-20220824'
2022-08-24 19:12:59 +08:00
lr
c8fafbf151
调整readme信息
2022-08-24 19:12:26 +08:00
lr
0bb3ee3454
Merge branch 'master' into develop
2022-08-24 19:09:57 +08:00
lr
ce594785e8
Merge branch 'hotfix/lr-20220824'
2022-08-24 19:09:57 +08:00
lr
a2518393ae
调整readme信息
2022-08-24 19:09:43 +08:00
lr
9f05a8a755
Merge branch 'master' into develop
2022-08-24 19:06:43 +08:00
lr
97737a030f
Merge branch 'hotfix/lr-20220824'
2022-08-24 19:06:42 +08:00
lr
161fa279c8
调整README信息
2022-08-24 19:06:27 +08:00
TinyAnts
5e88c2ea5a
增加通知设置接口
2022-08-24 18:01:51 +08:00
TinyAnts
0d644bb957
增加通知设置接口
2022-08-24 17:48:57 +08:00
TinyAnts
0d09cbfd0e
增加华为云短信驱动
2022-08-23 18:24:19 +08:00
TinyAnts
45d2717313
增加短信实现
2022-08-23 17:30:50 +08:00
TinyAnts
9efdbf96a6
短信引擎保存
2022-08-23 14:58:02 +08:00
TinyAnts
2c434f8c90
增加短信引擎配置功能
2022-08-23 14:56:49 +08:00
TinyAnts
6cf24fc93e
增加通知设置/短信设置基础控制器
2022-08-23 10:56:51 +08:00
TinyAnts
e8bcc62d4b
增加文章/分类的状态切换接口
2022-08-23 10:18:14 +08:00
TinyAnts
f7c1eb85f5
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
2022-08-23 09:27:30 +08:00
TinyAnts
7d74c116d9
增加文章作者
2022-08-23 09:27:14 +08:00
lr
5936fd369f
Merge branch 'hotfix/20220822'
2022-08-22 23:13:26 +08:00
lr
8c17fcd94b
Merge branch 'master' into develop
2022-08-22 23:13:26 +08:00
lr
aa46da73e2
调整README信息
2022-08-22 23:13:10 +08:00
lr
f6007fdb52
Merge branch 'hotfix/20220822'
2022-08-22 23:09:02 +08:00
lr
4de4f08746
Merge branch 'master' into develop
2022-08-22 23:09:02 +08:00
lr
34322caa6c
调整README文档
2022-08-22 23:08:17 +08:00
TinyAnts
061f4f6f40
init
2022-08-22 18:57:30 +08:00
TinyAnts
09b19615df
增加用户管理功能
2022-08-22 17:05:13 +08:00
TinyAnts
992d987c01
增加用户管理功能
2022-08-22 17:04:16 +08:00
TinyAnts
2350e786c1
处理菜单排序和默认头像
2022-08-19 09:46:40 +08:00
TinyAnts
6352e12427
修改项目包名称为mdd
2022-08-19 09:39:25 +08:00
TinyAnts
ac835fb2e1
优化代码格式
2022-08-18 15:15:11 +08:00
TinyAnts
dd4a57377b
调整免登录权限接口
2022-08-18 14:57:13 +08:00
TinyAnts
a44faa79f1
Merge branch 'master' into develop
2022-08-17 19:06:48 +08:00
TinyAnts
1ab31dd7a6
Merge branch 'hotfix/avatar'
2022-08-17 19:06:47 +08:00
TinyAnts
b2c75ff0f9
增加默认头像
2022-08-17 19:06:10 +08:00
TinyAnts
a78b9c6f7d
Merge branch 'master' into develop
2022-08-17 18:53:27 +08:00
TinyAnts
48ecdc33e4
Merge branch 'hotfix/limit002'
2022-08-17 18:53:27 +08:00
TinyAnts
3a9aa46118
修改生产环境拦截问题
2022-08-17 18:52:31 +08:00
TinyAnts
55e75fba7e
Merge branch 'master' into develop
2022-08-17 18:29:02 +08:00
TinyAnts
24ce27cf6c
Merge branch 'hotfix/limit001'
2022-08-17 18:29:02 +08:00
TinyAnts
5e5a2f5afb
增加演示环境校验
2022-08-17 18:28:45 +08:00
TinyAnts
d0478a8fc4
增加演示环境校验
2022-08-17 18:25:45 +08:00
TinyAnts
d0848acf72
Merge tag '1.2.0' into develop
2022-08-17 17:47:19 +08:00