caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,049 Commits 1 Branch 0 Tags
Commit Graph

55 Commits

Author SHA1 Message Date
misworga831
c73204a828 fix: 增加文件上传类型，video格式支持 2023-07-19 11:10:19 +08:00
paulGao
096ab34ae8 fix: 优化文件上传，删除冗余文件 2022-11-22 15:29:22 +08:00
chc
5a1c6b9e7f v4.2.5 2022-10-21 11:26:55 +08:00
Chopper
27888f503a 去除无效的控制器，规范站点基础设置控制器的规范 2022-09-22 17:51:18 +08:00
fengtianyangyang
26dd8ed13a Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop into fengtianyangyang_clerk 
 Conflicts:
	DB/version4.2.3toMASTER.sql
	common-api/src/main/java/cn/lili/controller/common/SiteController.java
	common-api/src/main/java/cn/lili/controller/common/UploadController.java
	config/application.yml
	framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java
	framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
	framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
	framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java
 2022-08-09 18:54:19 +08:00
paulGao
7b535434ae 代码优化，修复订单投诉问题 2022-07-04 18:31:36 +08:00
Chopper
a22ccbdda5 兼容MINIO 2022-06-07 09:35:58 +08:00
caihongcheng
a540e42460 siteController 2022-05-18 14:35:34 +08:00
caihongcheng
b91c8e34c2 电子面单 2022-05-09 09:27:30 +08:00
paulGao
a988dedfbf 增加根据名称获取地址信息 2022-04-02 18:42:03 +08:00
itheinjury@163.com
a52b672e9b 更新,BUG修改 2022-03-02 15:17:06 +08:00
Chopper
b824ee625e Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 2022-02-21 22:59:59 +08:00
Chopper
961ac20213 更新IM相关 2022-02-21 22:59:55 +08:00
paulGao
631600ab3f 优化rocketmq日志到logback 2022-02-21 12:03:07 +08:00
itheinjury@163.com
5b1b75cbbe 更新 2022-02-15 15:30:33 +08:00
itheinjury@163.com
bf8f8d9382 初始化代码 2022-02-11前 最新版本 2022-02-11 19:30:50 +08:00
paulGao
5c78711d8e merge conflict origin/master 2022-02-11 15:33:28 +08:00
Chopper
3972e0231c api端防重复提交 2022-01-25 10:22:45 +08:00
Chopper
cf0d1378c8 压测相关还原 2022-01-18 11:03:15 +08:00
fengtianyangyang
6409d0dc2d '更新' 2022-01-14 11:47:56 +08:00
Chopper
65e7f9750a 增加获取uuid的方法，为压测环境的同一token购物车重复问题处理 2022-01-12 11:20:27 +08:00
fengtianyangyang
87f637099c '合并master' 2022-01-11 14:50:06 +08:00
Chopper
366d1b8846 对限流暂时关闭 2022-01-10 17:10:19 +08:00
Chopper
f720e00132 验证码验证默认通过 2022-01-10 15:42:32 +08:00
fengtianyangyang
efc4b37782 'RequestMapping请求路径统一处理' 2021-12-15 18:32:59 +08:00
paulGao
90e550934d merge branch "master" 2021-12-11 17:45:25 +08:00
Chopper
8616854e00 消息模块，会员模块，微信模块独立 2021-12-07 05:47:17 +08:00
Chopper
7b98d1d9d0 几个代码编译问题处理 2021-12-07 04:33:51 +08:00
Chopper
00ffd246a9 业务代码模块trade统一更名为order 2021-12-06 17:45:16 +08:00
Chopper
58648c3ece 模块隔离优化 2021-11-24 10:30:21 +08:00
paulGao
6f13218564 修复安全漏洞。优化代码 2021-11-11 18:15:21 +08:00
paulGao
c85caab197 merge origin master 2021-11-03 15:29:48 +08:00
Chopper
956a6e465a 优化验证码模块相关代码，解决一个可能由于并发导致多发短信，或者多生成验证结果的情景。 2021-11-03 09:14:05 +08:00
Chopper
eb6e29fb33 im控制器问题处理 2021-10-09 19:20:21 +08:00
Chopper
9cee1093f4 IM完善 2021-09-17 14:47:25 +08:00
Chopper
a210565387 增加脱敏配置。 
lili:
  system:
    sensitiveLevel: 2
 2021-09-13 10:30:56 +08:00
lifenlong
38124a702a 分类去除图片必填 2021-08-11 21:12:21 +08:00
lifenlong
64e45c10b1 增加店铺企业信息接口 
增加删除商品
修复：修改订单金额售后金额不正确
 2021-08-11 20:14:56 +08:00
Chopper
fdb55bc426 Merge branch 'backup' 
# Conflicts:
#	framework/src/main/java/cn/lili/modules/goods/serviceimpl/DraftGoodsServiceImpl.java
#	framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java
#	framework/src/main/java/cn/lili/modules/order/order/serviceimpl/TradeServiceImpl.java
#	framework/src/main/java/cn/lili/modules/promotion/serviceimpl/FullDiscountServiceImpl.java
 2021-07-22 12:07:22 +08:00
Chopper
bd3aceaeac 完善方法注释 2021-07-21 17:46:46 +08:00
Chopper
fe021f8a11 暂时备份一下代码，准备切换master 2021-07-20 15:44:09 +08:00
Chopper
4b7ab94ba4 批量调整目录结构 2021-07-19 16:07:02 +08:00
Chopper
06212c073d 调整目录结构 2021-07-19 15:01:51 +08:00
Chopper
ac5d04ddc2 调整代码结构 2021-07-16 09:55:38 +08:00
lifenlong
3e73257922 采用阿里代码规约，对代码进行优化 2021-07-09 01:56:24 +08:00
lifenlong
931276f72b 添加ResultCode 2021-07-01 11:17:18 +08:00
Chopper
cdbaed22d9 验证码模块提交 2021-06-21 16:38:29 +08:00
Chopper
c7e4af6175 注释规范 2021-06-21 14:14:07 +08:00
lifenlong
a51e86fd98 去除e.printStackTrace();使用slf4j实现 2021-06-07 16:49:59 +08:00
Chopper
f82fef9f3d 授权返回 readme 修改 2021-05-26 09:28:52 +08:00