hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-10-31 18:28:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,000 Commits 20 Branches 0 Tags
949d5a18151f15d258dc3ef69dacbc7f23fc8585
Commit Graph

472 Commits

Author SHA1 Message Date
YunaiV
92ace031fe 【修复】访问数据库存储的文件，path 多层级时，无法访问的问题 2022-11-12 19:37:21 +08:00
YunaiV
3310b766bc 【修复】工作流程-流程管理-流程模型，在发布完流程后，点击激活状态的按钮，显示“是否确认挂起流程名字为‘xxx’‘的数据项“，点击取消，前端显示的激活状态改变，但是数据库没有更新，报错 2022-11-12 19:09:43 +08:00
YunaiV
ff1379d454 优化 README 说明~ 2022-11-12 18:57:41 +08:00
YunaiV
a8cdf74120 【移除】Apollo 配置中心，简化学习成本 2022-11-12 09:52:36 +08:00
YunaiV
ce3aefadd7 移除 jasypt-spring-boot-starter 依赖，使用 hutool AES 替代 2022-11-12 09:15:02 +08:00
YunaiV
3fbb0b4c54 修复滑块验证码，存在失败的情况 2022-11-11 20:47:45 +08:00
YunaiV
93b8a2b6c1 1. 修复滑块验证码，存在失败的情况 
2. 重新构建 demo 预览项目
 2022-11-11 20:02:11 +08:00
YunaiV
40ba456fde 1. 修复 MenuServiceTest 单元测试 2022-11-11 01:24:39 +08:00
YunaiV
5934d6b029 trade：完成下单时，创建支付单逻辑 2022-11-10 09:27:20 +08:00
xingyu4j
632a132a6a refactor: Date ==> LocalDateTime 2022-11-09 11:14:46 +08:00
YunaiV
873b530652 promotion：增加优惠劵的回收操作 2022-11-04 21:17:37 +08:00
YunaiV
e6acdf7098 将 market 模块，调整成 promotion 模块 2022-10-30 17:37:07 +08:00
YunaiV
829bbf58b5 price：完成优惠劵的价格计算~ 2022-10-30 17:32:59 +08:00
YunaiV
c00ded3ed3 优化商品的 index 界面 2022-10-24 21:27:13 +08:00
YunaiV
2bd2cb56a1 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 
 Conflicts:
	yudao-module-mall/yudao-module-trade-biz/pom.xml
 2022-10-23 22:16:54 +08:00
YunaiV
dc8eb8e362 修复 Redis 地址不正确的问题 2022-10-18 19:57:56 +08:00
YunaiV
f634ecf7c3 完善 pom.xml 的注释 2022-10-02 13:05:19 +08:00
芋道源码
952e6aa4a8 !266 接口实现-交易订单 单元测试 
Merge pull request !266 from LeeYan9/ly_uniapp
 2022-09-30 08:56:13 +00:00
YunaiV
d26c78a0df Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 2022-09-24 12:55:05 +08:00
YunaiV
1be09d092b ♻️优化“通过注解增加多租户缓存”的代码 2022-09-24 12:26:01 +08:00
ex_yang.li@ca-nio.com
f21ce954ec Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into ly_uniapp 
# Conflicts:
#	yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/api/price/PriceApiImpl.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/sku/ProductSkuApiImpl.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/spu/ProductSpuApiImpl.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/sku/ProductSkuConvert.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderItemConvert.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceImpl.java
#	yudao-server/src/main/resources/application.yaml
 2022-09-15 17:09:17 +08:00
ex_yang.li@ca-nio.com
5889093a64 创建交易订单-单元测试 2022-09-15 16:57:04 +08:00
YunaiV
15798cea10 mall：价格计算的 API 简单实现 2022-09-12 21:37:24 +08:00
YunaiV
9632c33d27 mall：优化商品的分类、品牌的代码 2022-09-05 20:03:13 +08:00
YunaiV
37e948cc1b Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 2022-09-04 23:15:36 +08:00
wuxiran
02aede0417 1、修改coupon的页面、以及增加coupon的enum 2022-09-04 22:52:28 +08:00
YunaiV
833fd33844 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 
 Conflicts:
	sql/optional/mall/mall.sql
 2022-09-04 21:06:28 +08:00
芋道源码
dd6dc2ac3d !246 集成aj-captcha 
Merge pull request !246 from xingyu/master
 2022-09-04 09:45:54 +00:00
YunaiV
926c75d29a 优化图片验证码的后端实现 2022-09-04 11:26:37 +08:00
GuoLei
c4f416c7cd 修复dev环境WxMaService 报错 2022-08-27 10:02:27 +08:00
xingyu
020535ab3a Merge branch 'master' of gitee.com:zhijiantianya/ruoyi-vue-pro into master 
Signed-off-by: xingyu <xingyu4j@vip.qq.com>
 2022-08-22 00:57:43 +00:00
芋道源码
83dc4047a9 !229 关于 一键改包 目录问题 
Merge pull request !229 from @C/master
 2022-08-19 12:08:02 +00:00
YunaiV
face9cae76 mall：调整 trade 的接口 2022-08-06 19:10:28 +08:00
xingyu
da0ab98fae revert 2022-08-03 13:38:02 +08:00
xingyu
e477179cd5 refactor: store action name 2022-08-03 13:38:02 +08:00
xingyu
a8ea50a059 update hutool 5.8.5 2022-08-03 13:38:02 +08:00
xingyu
85e21092b8 删除文件 yudao-server/src/main/resources/application-local.yaml 2022-08-03 13:38:02 +08:00
xingyu
5ce8e64369 fix: axios config 2022-08-03 13:38:02 +08:00
xingyu
6b2fbdf8c1 优化行为验证码配置 2022-08-03 13:38:02 +08:00
xingyu
4a92081937 vue2 新增行为验证码 2022-08-03 13:38:01 +08:00
cksspk
c8fcb6d3ed [fix] 代码格式规范 2022-08-01 09:36:57 +08:00
YunaiV
2866b58741 1. 默认不开启 bpm 工作流模块，按需启动，提升启动速度 
2. 完整移除 activiti 遗留的东东
 2022-07-29 22:51:52 +08:00
YunaiV
39ac59efee 默认禁用报表模块， 2022-07-29 20:57:18 +08:00
芋道源码
35413b52c9 !237 集成积木报表 
Merge pull request !237 from 芋道源码/feature/visual
 2022-07-29 04:51:54 +00:00
YunaiV
8a6c48f236 fix: test、stage、prod 不打印日志的问题 2022-07-29 00:41:30 +08:00
YunaiV
e52a966b81 完善积木报表的集成 2022-07-28 23:23:44 +08:00
YunaiV
d872676748 完善积木报表的集成 2022-07-28 09:29:51 +08:00
YunaiV
b2f5900abc Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/visual 2022-07-27 22:45:40 +08:00
@C
b8e5eeb271 update yudao-server/src/test/java/cn/iocoder/yudao/ProjectReactor.java. 
解决 一键改包 可能发生的目录问题。
 2022-07-27 07:24:36 +00:00
xingyu
63877cf475 fix: spring admin prefer-ip 过期 2022-07-22 15:32:34 +00:00