166 Commits (5740561cd382d20ecfe418cad63266d05f81bf08)

Author SHA1 Message Date
疯狂的狮子li f8ab5663ef update 日常字符串校验 统一重构到 StringUtils 便于维护扩展 3 years ago
疯狂的狮子li cfdeada3fd Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	pom.xml
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-admin/src/main/resources/i18n/messages.properties
	ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
	ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
	ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
	ruoyi-generator/src/main/resources/vm/java/controller.java.vm
	ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
	ruoyi-generator/src/main/resources/vm/java/service.java.vm
	ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
	ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
	ruoyi-ui/src/api/login.js
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/utils/zipdownload.js
	ruoyi-ui/src/views/index.vue
	ruoyi-ui/src/views/login.vue
	ruoyi-ui/src/views/system/user/index.vue
3 years ago
RuoYi de33e6ecc8 优化代码生成模板 3 years ago
RuoYi a1cc346aca 优化代码生成模板 3 years ago
疯狂的狮子li 5dbf39beee update service 统一使用 ServicePlusImpl 3 years ago
疯狂的狮子li 11c73d8877 udpate 补全缺失类 3 years ago
疯狂的狮子li 83cc800e97 update 多bo合并 使用分组校验 生成bo代码 3 years ago
疯狂的狮子li 90d4fd8cf1 update [重大改动] 重写VO转换 支持深拷贝 将VO类抽象到 ServicePlus 泛型处理 3 years ago
疯狂的狮子li 3aaf4e2384 fix 回滚代码生成器 批处理优化(字段内容不一致, 不适合批处理) 3 years ago
疯狂的狮子li 1891dbc566 fix 代码生成 queryType 重复勾选数据库无默认值问题 3 years ago
疯狂的狮子li fdd8c65b36 fix 修复接口单参数校验无效问题 3 years ago
疯狂的狮子li d642c08c2e update 优化代码生成器注释格式 3 years ago
Nguyendream 1031ba44b7 fix 未完全解决的代码生成字典问题 3 years ago
疯狂的狮子li 15c45eae11 fix 修复代码生成同步表结构id冲突问题 3 years ago
疯狂的狮子li 45b9acd57b fix 修复代码生成选择字典 无法取消问题 3 years ago
疯狂的狮子li 3b765f3ac9 fix 修复代码生成字典为null问题 3 years ago
疯狂的狮子li ea506de048 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
	ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
	ruoyi-ui/src/directive/index.js
	ruoyi-ui/src/directive/permission/hasPermi.js
	ruoyi-ui/src/directive/permission/hasRole.js
	ruoyi-ui/src/main.js
	ruoyi-ui/src/views/system/notice/index.vue
3 years ago
RuoYi 8321f92d2c 全局注册通用组件 3 years ago
Nguyendream dfb4d9f049 修复 按钮loading卡死的问题 3 years ago
疯狂的狮子li de194880ae update 关闭默认二级缓存 推荐使用 spring-cache 注解手动缓存 3 years ago
疯狂的狮子li d4be4df871 update 优化代码生成器 批量导入 3 years ago
疯狂的狮子li d92560b64b fix 修复 hutool StrUtil.containsAny 传入参数后返回结果不一致问题 3 years ago
疯狂的狮子li a129fafb69 update 更新多数据源与缓存 注意事项 3 years ago
疯狂的狮子li 85ae3a9420 update 对相关代码改动 进行调整 3 years ago
疯狂的狮子li a8c1d02ee1 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	pom.xml
	ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
	ruoyi-ui/.env.development
	ruoyi-ui/.env.production
	ruoyi-ui/.env.staging
	ruoyi-ui/package.json
	ruoyi-ui/src/App.vue
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/components/Pagination/index.vue
	ruoyi-ui/src/layout/components/Settings/index.vue
	ruoyi-ui/src/layout/components/Sidebar/Logo.vue
	ruoyi-ui/src/main.js
	ruoyi-ui/src/permission.js
	ruoyi-ui/src/settings.js
	ruoyi-ui/src/store/modules/settings.js
	ruoyi-ui/src/views/monitor/logininfor/index.vue
	ruoyi-ui/src/views/monitor/operlog/index.vue
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/vue.config.js
3 years ago
CharlieJohn 8bda10c23c !54 fix 生成器生成的 service 和 serviceImpl 中 deleteWithValidByIds 参数字段类型错误
* fix 生成器生成的 service 和 serviceImpl 中 deleteWithValidByIds 参数字段类型错误
3 years ago
疯狂的狮子li bb2ade75a8 update 升级 hutool 5.7.1 适配工具类 3 years ago
疯狂的狮子li 2cdc12055d fix 修复 JsonUtils 参数为空报错 3 years ago
RuoYi 462862ba65 升级commons.io到最新版本v2.10.0 3 years ago
疯狂的狮子li d98faaffee update 移除 fastjson 增加 jackson 工具类 重写相关业务 3 years ago
疯狂的狮子li 5311937b69 update 增加 jackson 配置 默认序列化时间格式 3 years ago
疯狂的狮子li a044519b21 update 移除 基础类 字段生成判断 3 years ago
疯狂的狮子li b3541e9758 update 优化 使用 hutool 替换 ruoyi 自带工具类 解决部分方法过期与高版本JDK不兼容问题 3 years ago
疯狂的狮子li 24da85fea3 update MybatisPlus整合Redis二级缓存 3 years ago
疯狂的狮子li 2103731f10 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	pom.xml
	ruoyi-admin/pom.xml
	ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-ui/src/layout/components/Navbar.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/index.vue
	ruoyi-ui/src/views/tool/swagger/index.vue
3 years ago
疯狂的狮子li ceeac476ec update 优化 代码生成器 增加表单防重注解 3 years ago
疯狂的狮子li 85bf5fbc9b fix 修复主键列表显示 重复生成bug 4 years ago
RuoYi 19924cd184 修复关闭confirm提示框控制台报错问题 4 years ago
kdyzm 6b789e2eb0 优化新增、修改页面的按钮动作loading从页面loading到按钮loading 4 years ago
疯狂的狮子li 329c95196e update 更新测试案例 4 years ago
kdyzm 9590de2c19 优化树生成的代码生成:增加loading、修改删除按钮的回调函数为箭头函数 4 years ago
kdyzm 430addf520 【优化】为代码生成器生成的前端代码添加loading;删除方法回调函数变更为箭头表达式 4 years ago
疯狂的狮子li 6192d42564 update 优化代码生成模板 4 years ago
疯狂的狮子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
4 years ago
RuoYi 7e79c4f249 生成vue模板导出按钮点击后添加遮罩 4 years ago
RuoYi 56a943bf48 升级druid到最新版本v1.2.6 4 years ago
朱杰 69dd3ab639 update 修改bo加入判断是否设置必填再加载必填注解 4 years ago
朱杰 798ffd9065 fix 修复代码生成器中表字段取消必填无法更新问题 4 years ago
刘立伟 d0a4d6b111 修正注释 4 years ago
疯狂的狮子li dab99405c5 update springboot 升级 2.3.10 依赖全面升级适配 4 years ago