wezone
/
Ry-master
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
836 Commits 2 Branches 0 Tags 6 MiB
Commit Graph

836 Commits

Author SHA1 Message Date
yuhong0206@sina.cn 9e6b2a1265 读取excel增加 
if(row == null)
{
    continue;
}
判断。防止有时候Excel表中有空数据行，导致读取时出现空指针异常。
 2021-03-29 08:56:51 +08:00
若依 266a5e844f !193 修复request.getInputStream() 重复读取错误问题 
Merge pull request !193 from MccRay/master
 2021-03-27 13:22:01 +08:00
疯狂的狮子li 06e9feadee Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/views/system/user/profile/userAvatar.vue
 2021-03-26 14:07:53 +08:00
MccRay 0822680158 update ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java. 
修复 getInputStream() has already been called for this request异常问题
 2021-03-25 17:39:51 +08:00
疯狂的狮子li 77ffdf69a1 fix 修复 vo转换 分页bug 2021-03-25 17:01:17 +08:00
疯狂的狮子li e3bcc6b273 fix 查询类模板缺少导入包 2021-03-25 17:00:40 +08:00
疯狂的狮子li 39793318a0 update ruoyi-demo 增加 knife4j 依赖 2021-03-25 16:59:17 +08:00
RuoYi 090e258bf9 显隐列初始默认隐藏列 2021-03-24 15:46:37 +08:00
若依 505fa06dc3 !192 update ruoyi-ui/src/views/system/user/profile/userAvatar.vue. 
Merge pull request !192 from 谢凯/N/A
 2021-03-24 15:32:24 +08:00
若依 6cf53bfacb !191 update ruoyi-ui/src/views/system/user/profile/userAvatar.vue. 
Merge pull request !191 from allworldg/N/A
 2021-03-24 15:31:51 +08:00
疯狂的狮子li 2df675bb01 !12 【BUG】项目启动后配置的定时器任务无法正常启动 
Merge pull request !12 from linCodeTest/quartz_bug
 2021-03-23 16:43:13 +08:00
linjiaru c9e01879ca beanUtil.copy参数顺序反了 2021-03-23 16:22:02 +08:00
谢凯 881dc3fcf0 update ruoyi-ui/src/views/system/user/profile/userAvatar.vue. 2021-03-22 17:52:34 +08:00
疯狂的狮子li 6557f1bdae update pr优化 2021-03-22 13:34:40 +08:00
疯狂的狮子li f156e0a094 update pr优化 2021-03-22 13:32:20 +08:00
疯狂的狮子li 62464cfe45 fix Collection 验证失效问题 2021-03-22 13:31:43 +08:00
疯狂的狮子li 7d47e1e81b fix 表名转换问题 2021-03-22 13:30:59 +08:00
wugh 3d6fbb93f5 !11 [功能] 拆分出Vo,QueryBo,AddBo,EditBo等领域对象 
* [修改] 错误引入的无用导包删除
* [新增] 增加Vo,QueryBo,AddBo,EditBo等视图,并调整controller,service的调用代码
* [新增] 增加CreateAndUpdateMetaObjectHandler,配合fill注解,实现创建和修改人的自动设置,减少重复代码
 2021-03-22 09:32:49 +08:00
疯狂的狮子li 5d1e977442 个人信息添加手机&邮箱重复验证 2021-03-22 09:30:12 +08:00
疯狂的狮子li 8434511e39 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
 2021-03-22 09:29:25 +08:00
allworldg b65c8d4512 update ruoyi-ui/src/views/system/user/profile/userAvatar.vue. 2021-03-21 21:20:23 +08:00
RuoYi 67371a9028 个人信息添加手机&邮箱重复验证 2021-03-21 08:53:11 +08:00
疯狂的狮子li 939d89f0b8 !10 [BUG] 解决只能使用circle干扰的bug 
Merge pull request !10 from wugh/hotfix/captcha
 2021-03-20 10:14:03 +08:00
wugh 1270b056d5 [bug修复] 解决调整验证码干扰的类型无效,只用circle的bug 
[优化] 调整使用那种验证码的逻辑判断,使用switch优化,并减少重复代码
 2021-03-19 19:28:43 +08:00
疯狂的狮子li a7f235164f Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
 2021-03-18 13:08:14 +08:00
RuoYi 01b545e4ab 通用Controller添加响应返回消息 2021-03-16 14:43:55 +08:00
疯狂的狮子li 31ddb2aee3 update swagger 升级为 knife4j 2021-03-16 12:52:09 +08:00
疯狂的狮子li c0186580ba fix 修复代码生成缺少jar异常 2021-03-16 10:57:26 +08:00
疯狂的狮子li 63a582404b update swagger 模板修改为 swagger-bootstrap-ui 2021-03-15 17:51:00 +08:00
疯狂的狮子li 04e1dc351e update 移除无用依赖 2021-03-15 17:50:24 +08:00
疯狂的狮子li 7ae2df1390 update 使用hutool 重写 UserAgent 2021-03-15 17:49:30 +08:00
疯狂的狮子li 9b4b9e0c74 update 删除通用工具 改为使用hutool 2021-03-15 16:38:43 +08:00
疯狂的狮子li 46aa17db9c Merge remote-tracking branch 'origin/master' 2021-03-15 10:00:49 +08:00
疯狂的狮子li 71325b540a Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/resources/application-prod.yml
	ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
 2021-03-15 10:00:14 +08:00
RuoYi c2e9200626 数据监控默认账户密码防止越权访问 2021-03-14 16:37:34 +08:00
若依 9502203bbe !187 【漏洞修复】升级commons-collections版本，解决3.2.1版本的反序列化漏洞问题 
Merge pull request !187 from Delusive/master
 2021-03-14 16:32:07 +08:00
疯狂的狮子li 2509815a4f fix 验证码点击不刷新 bug 2021-03-14 00:15:29 +08:00
疯狂的狮子li 2b8ab9cc4d update 使用hutool重写系统监控 2021-03-12 18:02:23 +08:00
hh44h1144 c0f1569ad9 修复commons-collections引起的反序列化漏洞 2021-03-12 16:59:06 +08:00
疯狂的狮子li 57cfad671f update 使用hutool重写验证码生成 2021-03-12 16:52:55 +08:00
疯狂的狮子li 9a94ab573d !6 update ruoyi-admin/src/main/resources/application.yml. 
Merge pull request !6 from hechieh/N/A
 2021-03-10 13:34:15 +08:00
hechieh 51d942f14c update ruoyi-admin/src/main/resources/application.yml. 2021-03-10 13:27:10 +08:00
疯狂的狮子li 5494ec36e5 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java
	ruoyi-ui/src/components/Editor/index.vue
	ruoyi-ui/src/permission.js
	ruoyi-ui/src/store/modules/user.js
	ruoyi-ui/src/views/monitor/logininfor/index.vue
	ruoyi-ui/src/views/monitor/operlog/index.vue
 2021-03-09 09:32:49 +08:00
RuoYi 61432480c8 删除多余的代码 2021-03-07 11:06:47 +08:00
若依 78deee063d !180 富文本编辑组件支持只读 
Merge pull request !180 from JOSWAY/master
 2021-03-07 10:44:04 +08:00
若依 4ad003649e !182 解决 Byte[] 类型 to string 死循环的问题 
Merge pull request !182 from sproutcat/master
 2021-03-07 10:39:41 +08:00
若依 616f5a6aca !185 update ruoyi-ui/src/views/monitor/logininfor/index.vue. 
Merge pull request !185 from asher/N/A
 2021-03-07 10:39:30 +08:00
若依 fea3ff7b2a !184 update ruoyi-ui/src/views/monitor/operlog/index.vue. 
Merge pull request !184 from asher/N/A
 2021-03-07 10:39:22 +08:00
asher f938a24df0 update ruoyi-ui/src/views/monitor/logininfor/index.vue. 2021-03-04 17:00:07 +08:00
asher 45fa686a64 update ruoyi-ui/src/views/monitor/operlog/index.vue. 2021-03-04 16:58:18 +08:00