hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-10-30 01:38:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,499 Commits 20 Branches 0 Tags
28884ee638ca84c3bde6bdd5b8e5b08a659c9d4e
Commit Graph

262 Commits

Author SHA1 Message Date
YunaiV
d6de233a47 mp：完成公众号的数据统计前端界面 2023-01-08 00:36:25 +08:00
YunaiV
7912a54ebd 【修复】没有数据权限时，添加/修改用户的唯一手机、账号等字段的校验不正确 2022-12-31 17:31:06 +08:00
YunaiV
a83b8e8fbc 修复报错的单元测试 2022-12-30 00:27:14 +08:00
芋道源码
8690f2dddd !341 修改注释中的错别字 
Merge pull request !341 from 王添翼/master
 2022-12-29 12:20:56 +00:00
YunaiV
1aee4ad00f 【修复】DeptService 的 getDeptsByParentIdFromCache 在获取部门列表时，未处理多租户场景 2022-12-29 20:18:59 +08:00
YunaiV
5a4cc55917 【修复】字典类型逻辑删除时，唯一索引冲突的问题 2022-12-29 12:52:37 +08:00
YunaiV
2c3aaa8d7e 修复字典数据(system_dict_data)查询操作有问题，会查出不属于本字典类型(dict_type)的数据 2022-12-29 00:16:32 +08:00
YunaiV
3443aa6f5f 优化本地缓存的刷新实现，数据变更时，强制刷新 2022-12-29 00:09:58 +08:00
芋道源码
30a4d7d954 !342 同步最新版本的商城进度 
Merge pull request !342 from 芋道源码/feature/1.8.0-uniapp
 2022-12-27 13:39:56 +00:00
王添翼
84b0f33944 update yudao-module-system-biz/system/controller/admin/user/UserController.java. 
修改注释中的错别字“  // 获用户门列表，只要开启状态的”改为“  // 获取用户列表，只要开启状态的”

Signed-off-by: 王添翼 <2100022743@stu.pku.edu.cn>
 2022-12-25 13:16:38 +00:00
王添翼
c0b8000dee 修复yudao-module-system-api/ErrorCodeConstants.java中错误码重复的问题 
// ========== OAuth2 授权 1002022000 =========
ErrorCode OAUTH2_CODE_NOT_EXISTS = new ErrorCode(1002022000, "code 不存在");
ErrorCode OAUTH2_CODE_EXPIRE = new ErrorCode(1002022000, "code 已过期");
二者错误码重复，现将OAUTH2_CODE_EXPIRE的错误码改为1002022001。

Signed-off-by: 王添翼 <2100022743@stu.pku.edu.cn>
 2022-12-25 02:20:50 +00:00
YunaiV
92632c046c Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/PayNotifyServiceImpl.java
#	yudao-ui-admin/src/views/mall/trade/order/index.vue
 2022-12-23 19:12:45 +08:00
YunaiV
7a4a6a3046 product：优化管理后台相关的接口 
area：增加地区列表界面
 2022-12-23 18:47:59 +08:00
xingyu
c8f4ba66d1 fix: 部门更新 log 错误 2022-12-23 16:23:40 +08:00
YunaiV
7f131a3853 trade：增加用户 App 的订单分页和详情接口 2022-12-10 23:06:53 +08:00
gaibu
a5ec334e53 fix: 逻辑删除唯一索引冲突的问题 2022-12-10 12:02:49 +08:00
gaibu
9e3ed75772 fix: 逻辑删除唯一索引冲突的问题 2022-12-10 11:59:21 +08:00
gaibu
67435648b2 fix: 逻辑删除唯一索引冲突的问题 2022-12-10 11:32:46 +08:00
YunaiV
ffab0b1d6a 1. 优化 menu 本地缓存的刷新策略，在修改或删除菜单时，强制刷新缓存 
2. 修复 pub/sub 未初始化的问题
3. 优化 Job 定时的 mybatis 日志输出，避免一直打印
 2022-12-06 20:38:05 +08:00
xingyu4j
a43b884c73 fix: warn 2022-11-30 10:30:58 +08:00
xingyu
693288d33d Merge remote-tracking branch 'origin/master' into feature/vue3 
# Conflicts:
#	yudao-dependencies/pom.xml
 2022-11-26 13:07:51 +08:00
YunaiV
2d78b02086 移除云片短信渠道，解决云片的安全风险 2022-11-25 21:04:40 +08:00
YunaiV
ea95115ffd 移除云片短信渠道，解决云片的安全风险 2022-11-25 20:22:04 +08:00
xingyu
0d0f64e30a feat: 删除过期方法 2022-11-23 22:54:44 +08:00
YunaiV
afc76973ce Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 
# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/DateUtils.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponBaseVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExcelVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExportReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponPageReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponRespVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteBaseVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExcelVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExportReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempletePageReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteRespVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/CouponTemplete/CouponTempleteDO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/coupon/CouponDO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuPageReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuRespVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/discount/DiscountProductDO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/reward/RewardActivityDO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/cart/TradeCartItemDO.java
#	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/UserInfoDTO.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
#	yudao-server/pom.xml
#	yudao-server/src/main/resources/application-local.yaml
#	yudao-server/src/main/resources/application.yaml
#	yudao-ui-admin/src/views/mall/CouponTemplete/index.vue
#	yudao-ui-admin/src/views/mall/product/property/index.vue
#	yudao-ui-admin/src/views/mall/product/spu/index.vue
#	yudao-ui-admin/src/views/mall/product/spu/save.vue
#	yudao-ui-admin/src/views/system/role/index.vue
 2022-11-13 12:07:59 +08:00
YunaiV
c5b547e0f3 优化，使用 @Configuration(proxyBeanMethods = false) 提升启动速度 2022-11-12 20:22:09 +08:00
YunaiV
3cd256f7f2 【修复】跨部门审核，当申请人与审批人不在同一部门，并且审批人的数据权限为“本部门数据权限”时，审批时有异常“手机号不存在” 2022-11-12 12:16:42 +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
芋道源码
fb237423b8 !294 修复单元测试报错 
Merge pull request !294 from 芋道源码/dev
 2022-11-11 01:22:17 +00:00
YunaiV
123617a9af 1. 修复 OAuth2OpenControllerTest 单元测试 2022-11-11 08:42:33 +08:00
YunaiV
b2e6e36fc5 1. 修复 LoginLogServiceImplTest 
2. 修复 OperateLogServiceImplTest
3. 修复 SmsLogServiceTest
 2022-11-11 01:39:50 +08:00
YunaiV
40ba456fde 1. 修复 MenuServiceTest 单元测试 2022-11-11 01:24:39 +08:00
YunaiV
413656c043 修复 SocialUserServiceTest 单测报错 2022-11-11 00:35:19 +08:00
YunaiV
83295a10aa 1. 修复 SmsSendServiceTest 单测的报错 2022-11-11 00:28:40 +08:00
芋道源码
5a3823fb79 !280 短信接收报告回调处理小Bug 
Merge pull request !280 from Macro/N/A
 2022-11-10 13:17:32 +00:00
xingyu4j
9c033d0104 DateUtils ==> LocalDateTime 2022-11-09 12:43:54 +08:00
xingyu4j
632a132a6a refactor: Date ==> LocalDateTime 2022-11-09 11:14:46 +08:00
YunaiV
8ae8a4a652 promotion：完善优惠劵模板的单元测试、禁用功能 2022-11-02 22:44:37 +08:00
Macro
fc76a67c73 短信接收报告回调处理小Bug 
receiveSmsStatus() 方法中最后调用 updateSmsReceiveResult() 方法传参错误，第二个 result.getErrorCode()  应改为 result.getErrorMsg()

Signed-off-by: Macro <8676847+hibernate2021@user.noreply.gitee.com>
 2022-10-19 10:28:03 +00:00
YunaiV
a13fb61359 优化 pom.xml 文件，减少无用的多租户引用 2022-10-18 23:32:42 +08:00
xingyu
1f4e3d6bbe Merge remote-tracking branch 'origin/master' into dev 2022-10-07 17:03:55 +08:00
YunaiV
6b79788b5a 完善 oauth2.0 的注释 2022-10-06 20:00:38 +08:00
xingyu
0143749988 Merge remote-tracking branch 'origin/master' into dev 2022-10-05 14:53:55 +08:00
YunaiV
ff54f16907 完成 yudao-sso-demo-by-code 刷新访问令牌 2022-10-01 20:49:11 +08:00
YunaiV
eef233644c 1. 增加 yudao-sso-demo-by-code 项目，实现基于授权码模式的单点登录 
2. 完成 yudao-sso-demo-by-code 的跳转 SSO 流程
 2022-09-29 21:26:31 +08:00
xingyu
9054a772b0 feat: 升级依赖 2022-09-20 18:00:43 +08:00
芋道源码
dd6dc2ac3d !246 集成aj-captcha 
Merge pull request !246 from xingyu/master
 2022-09-04 09:45:54 +00:00
YunaiV
9715087b54 管理后台的 uniapp 验证码，增加开关 2022-09-04 17:44:26 +08:00
YunaiV
926c75d29a 优化图片验证码的后端实现 2022-09-04 11:26:37 +08:00