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

1062 Commits

Author SHA1 Message Date
RuoYi a7eb0f98ac README 2020-08-03 09:02:28 +08:00
疯狂的狮子li c966d9bada Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	pom.xml
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
	ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
	ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
	ruoyi-ui/babel.config.js
	ruoyi-ui/package.json
	ruoyi-ui/src/api/tool/gen.js
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/components/HeaderSearch/index.vue
	ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
	ruoyi-ui/src/main.js
	ruoyi-ui/src/utils/ruoyi.js
	ruoyi-ui/src/views/login.vue
	ruoyi-ui/src/views/monitor/job/index.vue
	ruoyi-ui/src/views/monitor/logininfor/index.vue
	ruoyi-ui/src/views/monitor/online/index.vue
	ruoyi-ui/src/views/monitor/operlog/index.vue
	ruoyi-ui/src/views/system/config/index.vue
	ruoyi-ui/src/views/system/dept/index.vue
	ruoyi-ui/src/views/system/dict/data.vue
	ruoyi-ui/src/views/system/dict/index.vue
	ruoyi-ui/src/views/system/menu/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
	ruoyi-ui/src/views/tool/gen/genInfoForm.vue
	ruoyi-ui/src/views/tool/gen/index.vue
	ruoyi-ui/vue.config.js
	sql/ry_20200724.sql
 2020-08-02 18:31:47 +08:00
疯狂的狮子li a95abff0d3 删除文件 ruoyi-common/src/main/resources 2020-08-02 18:18:35 +08:00
RuoYi 4dcf737db0 表格工具栏右侧添加刷新&显隐查询栏 2020-08-01 15:45:38 +08:00
RuoYi b32d0724b7 升级vue-cli版本到4.4.4 2020-07-31 22:35:30 +08:00
若依 8deacb702e !54 update ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml. 
Merge pull request !54 from yongdaidai/N/A
 2020-07-31 16:50:28 +08:00
若依 5be8d46d05 !51 优化生成vue文件的vm模板文件 
Merge pull request !51 from FungLeo/master
 2020-07-31 16:49:51 +08:00
yongdaidai fb19dd3e4e update ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml. 
解决如果导入多个同名部门dept_name,parent_id相同,但是删除状态(del_flag)不同,导致查询结果为多条,mybatis不能映射为一条数据的问题.
 2020-07-31 14:59:23 +08:00
RuoYi cbf4795fd5 表单类型为Integer/Long设置整形默认值 2020-07-30 21:47:50 +08:00
RuoYi 5d74ed32bd 表单类型为Integer/Long设置整形默认值 2020-07-30 16:03:44 +08:00
若依 6afaced3cf !53 update ruoyi-ui/src/views/system/role/index.vue. 
Merge pull request !53 from abbfun/N/A
 2020-07-30 10:04:11 +08:00
abbfun f3976c0792 update ruoyi-ui/src/views/system/role/index.vue. 
权限修正（角色导出权限）
 2020-07-29 21:16:53 +08:00
RuoYi 22225a5119 HTML过滤器改为将html转义 2020-07-28 17:28:09 +08:00
RuoYi fe030cc022 修改 node-sass 为 dart-sass 2020-07-27 16:55:51 +08:00
fungleo ca657b0482 优化 index-tree.vue.vm 文件，undefined 修改为 null 2020-07-26 17:33:42 +08:00
fungleo c1d1ace36d 优化index.vue.vm模板，!=1修改为严格不等；undefined修改为null 2020-07-26 17:29:40 +08:00
RuoYi 6e7d7aba93 代码生成支持自定义路径 2020-07-24 15:37:57 +08:00
RuoYi 388e36ed4d 优化参数 2020-07-23 21:45:22 +08:00
若依 5d89d0b36a !49 代码生成器默认mapper路径与默认mapperScan路径不一致 
Merge pull request !49 from HaoRan/master
 2020-07-23 21:25:10 +08:00
若依 55095a50b5 !48 ExcelUtil 功能优化 
Merge pull request !48 from soulCoke/master
 2020-07-23 21:25:02 +08:00
HR.Hu ee4b4de7b1 修复 代码生成器默认mapper路径与默认mapperScan路径不一致的bug 2020-07-23 21:01:18 +08:00
RuoYi 92c6301285 Excel支持分割字符串组内容 2020-07-23 18:58:45 +08:00
RuoYi 5c6adb25fc 代码生成支持复选框 2020-07-23 17:02:55 +08:00
soulCoke 8dd3ca5bb6 excel 导入数字不需要格式化 ，导入允许列和属性个数不一致。 2020-07-23 15:54:03 +08:00
Sxile be778ba370 修复参数注释 2020-07-23 14:54:11 +08:00
RuoYi 52d48fa63e 检查字符支持小数点&降级改成异常提醒 2020-07-23 11:29:40 +08:00
RuoYi df3ef54b41 验证码类型支持（数组计算、字符验证） 2020-07-23 11:17:04 +08:00
疯狂的狮子li 8a9a53225a Merge branch 'master' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus 2020-07-23 09:55:40 +08:00
疯狂的狮子li e19e2fd9cc Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
	ruoyi-generator/src/main/resources/vm/sql/sql.vm
	ruoyi-ui/src/utils/index.js
	ruoyi-ui/src/utils/ruoyi.js
	ruoyi-ui/src/views/tool/gen/editTable.vue
	ruoyi-ui/src/views/tool/gen/genInfoForm.vue
	ruoyi-ui/src/views/tool/gen/importTable.vue
 2020-07-23 09:54:57 +08:00
疯狂的狮子li 8e1b8a3a3f 全注入 可能会出现小白乱用的情况 改成@Autowired构造注入 2020-07-22 18:46:34 +08:00
RuoYi 1e40e60dbf 支持CORS跨域请求 2020-07-22 15:25:42 +08:00
若依 133a10ecf2 !47 修复和优化前端 utils 工具函数 
Merge pull request !47 from FungLeo/master
 2020-07-22 13:00:51 +08:00
RuoYi 6a84ae42a5 代码生成支持选择上级菜单 2020-07-21 15:52:11 +08:00
RuoYi b2d79b62d1 代码生成支持选择上级菜单 2020-07-21 11:21:20 +08:00
fungleo a09a342f58 优化 uitls/ruoyi.js 中 selectDictLabel 方法，数组迭代器换为 some 
提高性能
 2020-07-21 10:22:07 +08:00
fungleo 3e1bd8e3bc 修复 utils/index.js 中不包含 parseTime 函数的 bug 2020-07-21 10:18:56 +08:00
RuoYi 8a076e175f Excel导出导入支持dictType字典类型 2020-07-20 15:25:05 +08:00
疯狂的狮子li 6f47310c24 同步升级3.0 端口提交错误 改回8080 2020-07-20 10:47:00 +08:00
疯狂的狮子li 1e79d6f56f 同步升级3.0 2020-07-20 10:41:32 +08:00
RuoYi cee572f237 若依 3.0 2020-07-19 10:25:40 +08:00
RuoYi 0d341f1aaa 代码生成查询条件修正 2020-07-18 16:24:04 +08:00
RuoYi 11ab4b4832 缺少JsonIgnore包路径。 2020-07-18 12:32:22 +08:00
若依 3afa664173 !42 处理代码生成页面中的查询条件“创建时间”未生效的问题 
Merge pull request !42 from 平凡/hmxmylove-master-patch-60881
 2020-07-18 12:23:28 +08:00
若依 1624debefe !41 禁止加密密文返回前端 
Merge pull request !41 from 平凡/hmxmylove-master-patch-79033
 2020-07-18 12:23:20 +08:00
平凡 0238c4ad92 处理代码生成页面中的查询条件“创建时间”未生效的问题 2020-07-18 00:07:17 +08:00
平凡 0d52e11e3d 禁止加密密文返回前端 2020-07-18 00:03:27 +08:00
RuoYi d5cc95fefb 升级element-ui版本到2.13.2 2020-07-17 16:56:03 +08:00
疯狂的狮子li a53a3b3119 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/package.json
	ruoyi-ui/src/views/system/menu/index.vue
	ruoyi/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
	ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
	ruoyi/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java
	ruoyi/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java
	ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
	ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java
	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
 2020-07-17 16:43:47 +08:00
RuoYi d29fe10b93 删除babel，提高编译速度。 2020-07-17 16:20:31 +08:00
RuoYi 086b9cdc23 新增菜单默认主类目 2020-07-17 15:19:06 +08:00