abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
645 Commits 4 Branches 22 Tags
Commit Graph

67 Commits

Author SHA1 Message Date
ZHUJB-PC\Administrator
52bcb6669f Merge branch 'master' of https://gitee.com/tottimctj/Hope-Mall 
# Conflicts:
#	hope-winery/src/main/java/com/ruoyi/winery/component/MiniComponent.java
#	hope-winery/src/main/java/com/ruoyi/winery/controller/NewsContentController.java
 2021-01-25 17:34:27 +08:00
ZHUJB-PC\Administrator
1216e561b7 完善了评论功能 2021-01-25 17:33:05 +08:00
mactj
44d8a0c9c1 新商户证书 2021-01-22 18:55:34 +08:00
mactj
0e7d0de1ba 基本完成 2021-01-22 13:25:06 +08:00
mactj
be8f6b7576 增加了退款流程 2021-01-22 10:54:01 +08:00
mactj
f5f13295bb 上线前最终调整 2021-01-21 19:04:31 +08:00
mactj
db6d973592 一些修改 2021-01-21 11:29:21 +08:00
mactj
a423661c5e 修正样式 2021-01-20 16:05:22 +08:00
kino
21bec38537 上传图片 2021-01-20 14:21:27 +08:00
mactj
d59efdfd6b 支付回调bug 2021-01-19 15:06:27 +08:00
kino
d8edac4483 回调 2021-01-19 13:52:28 +08:00
kino
c05c65a4e2 富文本工具类 2021-01-19 10:07:07 +08:00
kino
87a0a83461 验证码 2021-01-18 17:57:11 +08:00
kino
332e8116f8 微信统一下单 退款 2021-01-18 17:55:49 +08:00
kino
dc35283341 新增收货地址管理 2021-01-16 10:35:48 +08:00
mactj
42d3c2c828 拦截器显示ip,完善小程序注册,用户手机号不再唯一 2021-01-12 18:00:15 +08:00
Machengtianjiang
5ea0c5b143 增加字体 2021-01-08 09:38:18 +08:00
Machengtianjiang
29c6f7f24d cos配置 id配置 2020-12-31 14:40:36 +08:00
Machengtianjiang
ec74a2d3de 修改了对象存储 2020-12-31 09:13:13 +08:00
Machengtianjiang
49c6164445 端口配置 2020-12-24 17:25:16 +08:00
Machengtianjiang
ae58cafd81 小程序代码迁移完毕 2020-12-24 16:43:08 +08:00
Machengtianjiang
49c1a18e93 start 2020-12-17 17:50:57 +08:00
疯狂的狮子li
7e476b941e Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
	ruoyi-ui/package.json
	ruoyi-ui/src/main.js
	ruoyi-ui/src/views/index.vue
	ruoyi-ui/src/views/tool/gen/index.vue
 2020-12-14 09:27:27 +08:00
RuoYi
8988d0b4ab 若依 3.3.0 2020-12-14 09:02:10 +08:00
疯狂的狮子li
f56f57a236 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
	ruoyi-ui/package.json
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/assets/styles/sidebar.scss
	ruoyi-ui/src/assets/styles/variables.scss
	ruoyi-ui/src/components/HeaderSearch/index.vue
	ruoyi-ui/src/components/Screenfull/index.vue
	ruoyi-ui/src/layout/components/Settings/index.vue
	ruoyi-ui/src/layout/components/Sidebar/Logo.vue
	ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
	ruoyi-ui/src/layout/components/Sidebar/index.vue
	ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
	ruoyi-ui/src/layout/index.vue
	ruoyi-ui/src/main.js
	ruoyi-ui/src/settings.js
	ruoyi-ui/src/store/modules/settings.js
	ruoyi-ui/src/store/modules/user.js
	ruoyi-ui/src/views/login.vue
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/system/user/profile/resetPwd.vue
	ruoyi-ui/src/views/system/user/profile/userInfo.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue
	ruoyi-ui/src/views/tool/gen/index.vue
	ruoyi-ui/vue.config.js
 2020-12-11 14:27:54 +08:00
RuoYi
9e387dc447 去除用户手机邮箱部门必填验证 2020-12-11 13:26:14 +08:00
疯狂的狮子li
5109eb0e7e 日志输出改回相对路径 解决新版idea 编译user.dir会指定到idea配置目录下 2020-12-09 13:37:04 +08:00
疯狂的狮子li
583738fa65 日志输出改回相对路径 解决新版idea 编译user.dir会指定到idea配置目录下 2020-12-09 13:33:41 +08:00
疯狂的狮子li
5a62019cdd 更新 如何修改为Tomcat相关注释配置与说明 2020-12-08 16:21:30 +08:00
RuoYi
474cca921e 回显数据字典防止空值报错 2020-12-08 16:12:00 +08:00
abbfun
c01eeb8521 update ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java. 2020-12-08 11:11:34 +08:00
疯狂的狮子li
f7f7557d4d 项目修改为 maven多环境配置 2020-12-01 11:44:29 +08:00
疯狂的狮子li
20d7c90515 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java
	ruoyi-ui/src/views/system/user/profile/userAvatar.vue
	sql/ry_20201123.sql
 2020-11-24 10:03:59 +08:00
RuoYi
90ac416e02 新增缓存监控功能 2020-11-23 10:02:50 +08:00
疯狂的狮子li
ff563c44e2 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-ui/package.json
	ruoyi-ui/src/views/index.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue
 2020-11-18 10:41:13 +08:00
RuoYi
8f145bba3a 若依 v3.2.1 2020-11-18 09:32:15 +08:00
RuoYi
6bb166b89f 阻止任意文件下载漏洞 2020-11-17 10:29:52 +08:00
疯狂的狮子li
527decb7fa 更新 undertow 配置 2020-11-16 14:50:05 +08:00
疯狂的狮子li
03f0e3a137 为所有MP插件和配置增加官方链接 2020-11-16 14:12:14 +08:00
疯狂的狮子li
04d1154be0 重磅升级 重写 Mybatis-Plus 配置文件 根据官方文档详细注释 2020-11-13 11:18:37 +08:00
疯狂的狮子li
8747d36b2c 更改日志存储路径 使用项目变量 2020-10-20 16:38:39 +08:00
疯狂的狮子li
1a15c528a2 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
	ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
 2020-10-16 10:27:13 +08:00
abbfun
c6d0b9a9ae update ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java. 
权限字符串修正
 2020-10-14 16:21:43 +08:00
RuoYi
69256940df 若依 3.2 2020-10-10 09:38:21 +08:00
疯狂的狮子li
bd39b971cf Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-ui/package.json
	ruoyi-ui/src/utils/ruoyi.js
	ruoyi-ui/src/views/monitor/job/index.vue
 2020-10-10 09:19:20 +08:00
疯狂的狮子li
cc59e5ad89 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
 2020-10-03 11:57:41 +08:00
RuoYi
d3595cd930 修正菜单提示信息错误 2020-10-03 11:15:18 +08:00
疯狂的狮子li
aefa2095f0 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
	ruoyi-generator/src/main/resources/vm/sql/sql.vm
	ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/views/system/menu/index.vue
	ruoyi-ui/src/views/system/role/index.vue
	ruoyi-ui/src/views/system/user/index.vue
	sql/ry_20200920.sql
 2020-09-22 13:22:30 +08:00
RuoYi
28bceda630 修正文字错误 2020-09-22 11:09:18 +08:00
疯狂的狮子li
a41bc230a1 修改上传文件路径 2020-09-08 14:49:37 +08:00