zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,789 Commits
3 Branches
0 Tags
162 MiB
Commit Graph

142 Commits (d415963aa30d196a01e66e5d75ada999483b42bb)

Author SHA1 Message Date
YunaiV 1e63198f4a mp：完善【发布功能】的相关代码 2023-01-13 07:33:25 +08:00
YunaiV 9f7b646f6c mp：增加发送【图文】消息 2023-01-13 00:07:13 +08:00
YunaiV 02ccf52d6c mp：增加发送【图文】消息 2023-01-12 23:57:17 +08:00
YunaiV 5901ab6664 mp：增加 server 草稿箱的分页、添加；已发布的分页、提交 2023-01-12 22:49:55 +08:00
YunaiV 188d880239 mp：增加【图片】素材的选择 2023-01-12 13:51:46 +08:00
YunaiV 541ee81300 mp：前端接入发送消息 2023-01-10 23:24:08 +08:00
YunaiV 9ec2f8b60f mp：梳理 message 的前端和后端代码 2023-01-08 18:57:36 +08:00
YunaiV 2ac2af64d4 mp：实现 user 的 ui 界面 2023-01-08 17:33:11 +08:00
YunaiV a341c44c4d mp：实现 tag 模块的前端界面 2023-01-08 12:12:31 +08:00
YunaiV d6de233a47 mp：完成公众号的数据统计前端界面 2023-01-08 00:36:25 +08:00
YunaiV d0934510af mp：完成公众号统计的用户累计数据、消息概况数据 2023-01-07 23:49:50 +08:00
YunaiV 09e200c364 mp：完成公众号统计的用户增减数据 2023-01-07 22:35:30 +08:00
YunaiV 39b2afd506 mp：完成的公众号的管理界面 2023-01-07 18:31:04 +08:00
YunaiV 627cb39517 mp：完善公众号的账号管理 2023-01-01 20:39:47 +08:00
YunaiV 48520a456b Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/wechat-mp 
# Conflicts:
#	pom.xml
#	sql/mysql/ruoyi-vue-pro.sql
#	yudao-dependencies/pom.xml
#	yudao-framework/yudao-spring-boot-starter-biz-weixin/pom.xml
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsCallbackController.java
#	yudao-server/pom.xml
#	yudao-server/src/main/resources/admin-ui/static/js/4.js
#	yudao-server/src/main/resources/admin-ui/static/js/chunk-vendors.js
#	yudao-server/src/main/resources/application-local.yaml
#	yudao-ui-admin/yarn.lock
 2023-01-01 18:11:23 +08: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
luowenfeng 826a564abd 站内信开发 2022-12-17 16:41:14 +08:00
YunaiV 4a2cb33cd7 product：优化商品属性值的代码 2022-12-12 23:40:23 +08:00
YunaiV 98ca807d4b product：优化商品属性项的代码 2022-12-12 22:25:31 +08:00
YunaiV c5408965eb trade：增加管理后台的订单详情接口 2022-12-10 17:53:44 +08:00
YunaiV fac3e7c726 product：商品规格，调整成商品属性，避免和 sku 概念冲突 2022-12-08 21:12:35 +08:00
halfninety 61c4053cbb 前端修改秒杀相关文件存放地址 2022-11-29 23:25:01 +08:00
halfninety 7bc1ae5f35 秒杀活动增删改查 2022-11-29 23:25:00 +08:00
halfninety cd62c4d220 秒杀时段相关 2022-11-29 23:25:00 +08:00
halfninety 83ee1c6129 秒杀活动，添加商品，分页查询 2022-11-29 23:24:59 +08:00
YunaiV 00e66216c5 trade：【交易售后】查询分页列表的前端 2022-11-20 01:05:03 +08:00
xingyu4j 7083d991fe refactor: verify 2022-11-17 10:37:23 +08:00
YunaiV 6d48bd1ed8 promotion：完善限时折扣的添加逻辑 2022-11-06 00:48:07 +08:00
YunaiV d4b7f4aaa0 promotion：增加限时折扣的基础代码 2022-11-05 19:13:43 +08:00
YunaiV 00f90e75d9 promotion：增加满减送活动的关闭功能 2022-11-05 10:52:09 +08:00
YunaiV 86b6b85934 promotion：增加优惠劵的前端分页界面 80% 2022-11-04 00:27:37 +08:00
YunaiV 8ae8a4a652 promotion：完善优惠劵模板的单元测试、禁用功能 2022-11-02 22:44:37 +08:00
YunaiV bd661296c0 promotion：完善优惠劵模板的功能 2022-11-02 22:19:33 +08:00
YunaiV 3c10058dbd promotion：实现部分优惠劵模板的前端逻辑 2022-11-01 00:37:07 +08:00
luowenfeng e1e55dc841 feature(商品添加): 规格调整连带商品调整 2022-09-14 11:57:30 +08:00
YunaiV 1bd1c79ff3 mall：code review 商品模块的代码 2022-09-05 00:14:17 +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
luowenfeng 4207b2b61d feature(uniapp商品): 商品加载 2022-08-31 18:52:26 +08:00
wuxiran c8ec5c8952 mall:上传enum类，做后端模板添加判定、前端页面添加 2022-08-16 00:26:44 +08:00
xingyu b78378ce44 AJ-Captcha vue2 增加验证码二次校验 2022-08-03 13:38:02 +08:00
xingyu 4a92081937 vue2 新增行为验证码 2022-08-03 13:38:01 +08:00
YunaiV bf5df656ed 初始化管理后台的 uniapp 版本 2022-08-03 11:52:35 +08:00
YunaiV 969c387764 mall：完善商品分类的管理后台界面 2022-07-30 20:28:01 +08:00
YunaiV 2372c25e8d 完善 Redis 缓存的查询 2022-07-08 20:39:34 +08:00
芋道源码 a0f7f0ff12
!211 Redis 监控添加缓存列表 
Merge pull request !211 from 圆梦巨人/feature/cache-list
 2022-07-08 11:15:03 +00:00
luowenfeng c0b1f62afd fix(Redis监控): fix review 2022-07-08 11:47:02 +08:00
YunaiV 9270924597 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm-back 
 Conflicts:
	README.md
	yudao-framework/pom.xml
	yudao-framework/yudao-spring-boot-starter-biz-error-code/pom.xml
	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/YudaoSwaggerAutoConfiguration.java
	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/security/config/SecurityConfiguration.java
 2022-07-08 09:41:50 +08:00
luowenfeng a7067ea6fd feature(Redis监控): 添加缓存列表 2022-07-07 14:50:58 +08:00
luowenfeng 40954e4e46 feature(Redis监控): 添加缓存列表 2022-07-07 12:38:06 +08:00
YunaiV 8751471aa1 优化管理后台的社交登录 2022-07-05 22:00:23 +08:00
fengdan 59624531b6 fix(公众号账号管理): 增、删、改、查 2022-06-23 15:29:12 +08:00
fengdan 372b4a70aa fix(粉丝标签管理): 增、删、改、查 2022-06-23 15:26:31 +08:00
亚洲 70adfe8fe5 公众号开发 2022-06-03 09:42:26 +08:00
亚洲 1d935f58f8 微信公众号对接 2022-05-31 21:59:03 +08:00
xiaxiaoYY 247d299cca Banner模块 for review 2022-05-31 16:08:10 +08:00
YunaiV bb26bc4012 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 
 Conflicts:
	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/UserController.java
	yudao-ui-admin/src/components/ImageUpload/index.vue
 2022-05-29 11:05:33 +08:00
YunaiV 741dda8d75 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm-back 2022-05-26 19:19:48 +08:00
YunaiV d18463866e 新增 sso 页面 2022-05-24 00:01:30 +08:00
shuaidawang bd944c4a8b 商品规格和spu前端代码生成 2022-05-18 17:12:03 +08:00
YunaiV aa8fb4acf0 搭建 oauth/authorize 的初步逻辑 2022-05-14 20:10:06 +08:00
YunaiV ce60ec0815 修改 OAuth2ClientDO 实体，支持自动授权的范围的设置 2022-05-14 15:11:58 +08:00
YunaiV f46d81dab5 增加 OAuth2 客户端 2022-05-11 00:43:03 +08:00
YunaiV 5cf68961e1 1. 修改在线会话的实现 
2. 接入到会员管理 OAuth2.0
 2022-05-10 23:20:15 +08:00
YunaiV a3687132b6 增加 refresh token 接口，并接入到前端项目 2022-05-09 22:46:52 +08:00
YunaiV 3351ebbbb4 去除 Spring Security 的 logout handler，使用自己定义的 logout 接口 2022-05-08 00:38:55 +08:00
YunaiV a233ab1395 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 
 Conflicts:
	sql/ruoyi-vue-pro.sql
	yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm
 2022-05-04 23:44:11 +08:00
YunaiV 7753bd4c44 1. code review 后台的短信验证码登陆 
2. 解决 SQL Server LIMIT 1 存在报错的问题
 2022-05-02 22:57:45 +08:00
YunaiV 4453ac27ff Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.6.2-smsLogin 
 Conflicts:
	sql/ruoyi-vue-pro.sql
	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/auth/AuthConvert.java
	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/security/config/SecurityConfiguration.java
	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthService.java
	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java
	yudao-ui-admin/src/api/login.js
	yudao-ui-admin/src/store/modules/user.js
 2022-05-02 21:36:51 +08:00
cuicui 4015724417 Merge remote-tracking branch 'origin/master' into feature/bpm-back 2022-04-30 20:52:46 +08:00
YunaiV b34e2691f8 支持主流数据库的代码生成 2022-04-29 23:14:34 +08:00
YunaiV 7ce7baa2d2 增加数据源管理 2022-04-27 23:15:43 +08:00
酱包 5139117b13 更新登录模板 
支持短信验证码登录
 2022-04-27 11:31:18 +08:00
YunaiV c402077961 进一步重构社交登陆的实现 2022-04-27 00:35:59 +08:00
YunaiV 7227664f77 进一步重构社交登陆的实现 2022-04-26 23:36:26 +08:00
JeromeSoar cc6c3d2759 品牌代码生成 2022-04-25 16:11:30 +08:00
JeromeSoar d3edaec2b1 商品分类维护 2022-04-24 17:01:10 +08:00
JeromeSoar 4e67b6bbcf 商品分类代码生成 2022-04-24 14:42:51 +08:00
YunaiV 696756b3c8 实现 SensitiveWord API 实现类 2022-04-09 10:48:47 +08:00
cuicui20210817 9bf9cf7fe9 Merge remote-tracking branch 'origin/master' into feature/bpm-back 2022-03-25 11:47:48 +08:00
YunaiV 659023bb35 完成 FileConfig 的前端模块 2022-03-16 00:21:49 +08:00
cuicui20210817 56eedfd147 回退-任务 2022-03-15 17:39:16 +08:00
YunaiV 5a2169b688 将 tool 合并到 infra 模块 2022-03-11 00:39:34 +08:00
YunaiV 2598c033a9 【新增】【优化】新建租户时，自动创建对应的管理员账号、角色等基础信息 2022-02-20 23:59:23 +08:00
YunaiV 6b6d676a6b 【新增】租户套餐的管理，可配置每个租户的可使用的功能 2022-02-20 12:24:47 +08:00
YunaiV e1e749d8a4 v3.7.0 验证码默认20s超时（请求) 2022-02-17 09:23:08 +08:00
YunaiV 8b31b65ac1 v3.6.0 自定义弹窗拖拽指令 2022-02-16 22:01:37 +08:00
YunaiV c844c7ef19 v3.6.0 FileUpload组件支持多文件上传 2022-02-16 21:34:17 +08:00
YunaiV f2f36bd617 多模块重构 11：修复代码生成的 BaseDO 模板不正确 2022-02-03 11:30:19 +08:00
YunaiV 0773a4c4d7 多模块重构 12：修改项目名字，按照新的规则 2022-02-02 22:33:39 +08:00