Commit Graph

932 Commits

Author SHA1 Message Date
疯狂的狮子li a287599c8f update 增加redis空密码兼容性 2021-06-02 10:09:09 +08:00
疯狂的狮子li 0bc71e28a1 update 优化代码书写格式 去除警告 2021-06-02 10:09:08 +08:00
疯狂的狮子li 54d97b53de 发布 v2.3.0 2021-06-01 10:54:23 +08:00
疯狂的狮子li 7437092765 Merge remote-tracking branch 'origin/master' 2021-06-01 10:34:09 +08:00
疯狂的狮子li c90ca8c2a6 发布 v2.3.0 2021-06-01 10:33:57 +08:00
疯狂的狮子Li 4bca89f072 fix 修复数据权限编写错误 2021-05-29 21:48:26 +08:00
疯狂的狮子li fcfc5c85c7 update 还原数据权限修改 2021-05-29 19:51:08 +08:00
疯狂的狮子li 2d53896f92 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
2021-05-29 19:17:58 +08:00
疯狂的狮子li e523764b0f 发布 2.2.1 2021-05-29 19:14:45 +08:00
疯狂的狮子li 8e7d9e1bc7 Merge remote-tracking branch 'origin/master' 2021-05-29 19:03:51 +08:00
疯狂的狮子li 38d2a97582 update 优化参数&字典缓存操作 2021-05-29 19:03:31 +08:00
疯狂的狮子li 01d2b6ded9 update 优化dataScope参数防止注入 2021-05-29 19:03:11 +08:00
疯狂的狮子li 080770a493 update 文档增加演示图例 2021-05-29 19:03:04 +08:00
疯狂的狮子li 3aaa219d5e fix 修复sql符号错误 2021-05-29 19:03:03 +08:00
疯狂的狮子li df8a6bbaa2 remove 删除提交错误文件 2021-05-29 19:03:02 +08:00
疯狂的狮子li 08d82bb12f 配置文件错误 2021-05-29 19:03:01 +08:00
疯狂的狮子li 454a07b775 update 文档增加演示图例 2021-05-26 16:45:17 +08:00
疯狂的狮子li f793ee395d fix 修复sql符号错误 2021-05-26 13:00:48 +08:00
疯狂的狮子li c94756f8a2 remove 删除提交错误文件 2021-05-25 14:33:00 +08:00
疯狂的狮子li 25264faf37 配置文件错误 2021-05-25 14:28:58 +08:00
疯狂的狮子li 9bd78a8c22 !41 发布 v2.2.0
Merge pull request !41 from 疯狂的狮子li/dev
2021-05-25 14:18:21 +08:00
疯狂的狮子li a570589dcc 发布 v2.2.0 2021-05-25 14:11:32 +08:00
疯狂的狮子li 2885ced2c7 add 增加验证码开关 2021-05-25 14:02:50 +08:00
朱杰 5dc873209e add 增加验证码开关 2021-05-25 14:02:34 +08:00
疯狂的狮子li 3131b7ea9d fix redis反序列化异常问题 2021-05-25 13:40:18 +08:00
疯狂的狮子li ca903ebd1f update 更新捐献二维码 2021-05-25 10:32:19 +08:00
疯狂的狮子li a2ca46004b update 更新捐献码 2021-05-25 10:17:43 +08:00
疯狂的狮子li 5795958a18 update 同步升级 ruoyi-vue 3.5.0 2021-05-25 10:14:18 +08:00
疯狂的狮子li 6c195af2a3 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	pom.xml
	ruoyi-admin/pom.xml
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-common/pom.xml
	ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java
	ruoyi-framework/pom.xml
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
	ruoyi-generator/pom.xml
	ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-quartz/pom.xml
	ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
	ruoyi-system/pom.xml
	ruoyi-ui/package.json
	ruoyi-ui/public/index.html
	ruoyi-ui/src/views/index.vue
	ruoyi-ui/src/views/monitor/job/index.vue
	ruoyi-ui/src/views/monitor/logininfor/index.vue
	ruoyi-ui/src/views/monitor/operlog/index.vue
	ruoyi-ui/src/views/system/config/index.vue
	ruoyi-ui/src/views/system/dict/data.vue
	ruoyi-ui/src/views/system/dict/index.vue
	ruoyi-ui/src/views/system/notice/index.vue
	ruoyi-ui/src/views/system/post/index.vue
	ruoyi-ui/src/views/system/role/index.vue
	ruoyi-ui/src/views/system/user/index.vue
2021-05-25 10:00:36 +08:00
RuoYi 5e64a93d11 若依 3.5.0 2021-05-25 09:37:55 +08:00
疯狂的狮子li caa81d1f4d Merge remote-tracking branch 'origin/dev' into dev 2021-05-24 16:12:46 +08:00
疯狂的狮子li 5f584e683a update redis序列化修改为使用jackson 2021-05-24 16:12:40 +08:00
RuoYi 4aabf5d8be Redis设置HashKey序列化 2021-05-24 15:10:55 +08:00
RuoYi cf6254a8d5 用户登录后记录最后登录IP&时间 2021-05-24 14:21:29 +08:00
RuoYi 883cff5de9 新增IE浏览器版本过低提示页面 2021-05-24 14:15:41 +08:00
RuoYi 7e79c4f249 生成vue模板导出按钮点击后添加遮罩 2021-05-24 11:34:03 +08:00
若依 504638eb41 !234 【轻量级 PR】:删去两处冗余代码
Merge pull request !234 from xivLi/master
2021-05-24 11:30:21 +08:00
RuoYi 2adac4a899 升级fastjson到最新版1.2.76 2021-05-24 11:25:17 +08:00
RuoYi 56a943bf48 升级druid到最新版本v1.2.6 2021-05-24 11:24:54 +08:00
RuoYi 77ebca264a 修复请求形参未传值记录日志异常问题 2021-05-23 19:22:30 +08:00
RuoYi 7b94ae3a9a xss校验json条件优化 2021-05-23 19:20:36 +08:00
若依 bd1edc6dcc !233 修正方法名单词拼写错误
Merge pull request !233 from lyqwer/N/A
2021-05-23 17:15:18 +08:00
若依 09d166e97d !231 修正注释
Merge pull request !231 from 刘立伟/N/A
2021-05-23 17:14:52 +08:00
疯狂的狮子li a272ea07a9 !38 修改bo代码生成器,修改无法更新代码生成器是否必填为否问题
Merge pull request !38 from Yjoioooo/master
2021-05-22 23:40:26 +08:00
朱杰 69dd3ab639 update 修改bo加入判断是否设置必填再加载必填注解 2021-05-22 23:30:11 +08:00
朱杰 798ffd9065 fix 修复代码生成器中表字段取消必填无法更新问题 2021-05-22 23:29:15 +08:00
xivLi f3e5d908d6 quartz模块下 domain包中的 SysJob类不需要实现Serializable接口 2021-05-22 16:05:12 +08:00
xivLi 9651a7d7fc 删去utils.uuid下 IdUtils类中 多余的import(同包下的UUID类) 2021-05-22 15:52:19 +08:00
疯狂的狮子li 1d38d51ac1 发布 2.1.2 2021-05-21 17:58:04 +08:00
疯狂的狮子li f80b8f0d42 update springboot 升级 2.3.11
update mybatis-plus 升级 3.4.3 分页Plus对象适配更新
2021-05-21 17:58:03 +08:00