xiaozhi/xiaozhi-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
785 Commits 1 Branch 0 Tags
e3ea16d020ff0904056c4baf90eb07e7a68b094e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
疯狂的狮子li e3ea16d020 update 修改MP验证策略 NOT_NULL -> NOT_EMPTY 2021-04-25 10:38:20 +08:00
疯狂的狮子li c0e5e9cb24 update 同步ruoyi 2021-04-25 09:45:45 +08:00
疯狂的狮子li 4e723f4936 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
 2021-04-25 09:27:07 +08:00
疯狂的狮子li 251547e79e update 重写MP注入器 2021-04-25 09:19:38 +08:00
疯狂的狮子li 734073019f update 屏蔽用户密码返回 2021-04-23 15:59:46 +08:00
疯狂的狮子li 9a26a3c4e8 !22 同步 master 
Merge pull request !22 from 疯狂的狮子li/master
 2021-04-22 21:14:48 +08:00
疯狂的狮子li 1bef814c51 update 补全实体类 注入注解 2021-04-22 21:07:18 +08:00
疯狂的狮子li 6dc791c34f !21 同步dev分支 
Merge pull request !21 from 疯狂的狮子li/dev
 2021-04-22 15:42:00 +08:00
疯狂的狮子li 5fcef39a2e add 集成 spring-boot-admin 全方位监控 2021-04-22 15:04:35 +08:00
疯狂的狮子li 7ae9f21f82 !20 fix 问题 
Merge pull request !20 from 疯狂的狮子li/dev
 2021-04-22 10:08:12 +08:00
疯狂的狮子li 5b4e9ef4db Merge branch 'master' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus into dev 2021-04-22 09:50:03 +08:00
疯狂的狮子li 39e9df47bc !19 修改添加用户获取到密码为null 
Merge pull request !19 from 再见亦是路人/master
 2021-04-22 09:49:38 +08:00
疯狂的狮子li 9173f9c9cb fix feign熔断问题 2021-04-22 09:32:28 +08:00
疯狂的狮子li db43f678d8 !18 fix 代码生成器编辑问题 
Merge pull request !18 from 疯狂的狮子li/dev
 2021-04-19 19:02:51 +08:00
疯狂的狮子li a4f2aa1981 fix 代码生成器编辑问题 2021-04-19 19:01:26 +08:00
疯狂的狮子li 78149e19dc !17 同步 ruoyi 
Merge pull request !17 from 疯狂的狮子li/dev
 2021-04-19 17:54:33 +08:00
疯狂的狮子li 046b0bc98a 同步 ruoyi 2021-04-19 17:44:22 +08:00
疯狂的狮子li 97873a7b2b Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/components/ThemePicker/index.vue
	ruoyi-ui/src/layout/components/Settings/index.vue
	ruoyi-ui/src/store/modules/settings.js
 2021-04-19 17:43:32 +08:00
疯狂的狮子li f8633f8c4e fix Feign 熔断不生效 bug 2021-04-19 17:38:47 +08:00
疯狂的狮子li ef27ee0a28 !15 同步 ruoyi 
Merge pull request !15 from 疯狂的狮子li/dev
 2021-04-16 11:36:47 +08:00
疯狂的狮子li bf5315d306 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 2021-04-16 11:34:39 +08:00
疯狂的狮子li 9c7efa8e0e !14 fix 表名上传错误 
Merge pull request !14 from 疯狂的狮子li/dev
 2021-04-16 11:32:07 +08:00
疯狂的狮子li a1c44b4987 fix 表名上传错误 2021-04-16 11:30:51 +08:00
疯狂的狮子li 55f8624388 !13 同步dev分支 
Merge pull request !13 from 疯狂的狮子li/dev
 2021-04-14 14:38:29 +08:00
疯狂的狮子li 927777291e update 导出 Excel 工作表的名称修改 2021-04-14 14:36:27 +08:00
疯狂的狮子li 3fc3818231 update 完成所有原生功能使用 Mybatis-Plus 与 Lombok 重写 2021-04-14 13:27:27 +08:00
疯狂的狮子li f093da99ec Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-admin/src/main/resources/application-prod.yml
	ruoyi-generator/src/main/resources/vm/java/controller.java.vm
	ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/assets/styles/sidebar.scss
	ruoyi-ui/src/layout/components/Navbar.vue
	ruoyi-ui/src/layout/components/Settings/index.vue
	ruoyi-ui/src/layout/components/TagsView/index.vue
	ruoyi-ui/src/settings.js
	ruoyi-ui/src/store/getters.js
	ruoyi-ui/src/store/modules/permission.js
	ruoyi-ui/src/store/modules/settings.js
	ruoyi-ui/src/store/modules/tagsView.js
	ruoyi-ui/src/views/monitor/druid/index.vue
 2021-04-14 13:22:31 +08:00
疯狂的狮子li adeaa77864 update mp化 2021-04-14 12:01:26 +08:00
疯狂的狮子li 48d61a3cdf update mp化 2021-04-14 11:19:46 +08:00
疯狂的狮子li 876a06a9cd update mp化 2021-04-13 17:14:50 +08:00
疯狂的狮子li 20d40ea691 update mp化 2021-04-13 15:29:05 +08:00
疯狂的狮子li d69d1fbfe8 update 更新任务调度模块 与 代码生成模块 MP lombok 化 2021-04-12 17:49:56 +08:00
疯狂的狮子li 323fe960bd update 更新基础包与核心包 lombok 化 2021-04-12 17:26:47 +08:00
疯狂的狮子li 938ca5c451 fix 补全缺包 2021-04-12 17:09:05 +08:00
疯狂的狮子li 4500db395f update ruoyi原生改为 MP lombok 格式 
update SysConfig 模块代码
 2021-04-12 17:02:55 +08:00
疯狂的狮子li d48946ab90 fix bo缺包问题 2021-04-12 10:34:50 +08:00
疯狂的狮子li 88841ac01f update Date参数接收Bo实体格式转换 2021-04-09 11:47:51 +08:00
疯狂的狮子li 8b37eca241 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/utils/zipdownload.js
 2021-04-08 17:12:13 +08:00
疯狂的狮子li 1d3a361a66 fix 字节转换 bug 2021-04-08 16:40:10 +08:00
疯狂的狮子li c862484f00 update 默认增加editBo主键生成 2021-04-08 16:29:35 +08:00
疯狂的狮子li ccd48965a8 fix controller 接口路径问题 2021-04-04 20:01:36 +08:00
疯狂的狮子li b6472f3469 Merge branch 'master' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus 2021-04-04 11:27:42 +08:00
疯狂的狮子li 866c69e706 fix 代码生成器问题 2021-04-04 11:27:08 +08:00
疯狂的狮子li a50df84a72 fix 生成 remove 方法参数类型错误 2021-04-03 17:00:47 +08:00
疯狂的狮子li 6760942218 fix Page 路径导入 2021-04-02 23:05:44 +08:00
疯狂的狮子li b71e74927e add 添加单模块分支 2021-04-02 16:14:58 +08:00
疯狂的狮子li 7e50364244 add 添加单模块分支 2021-04-02 16:14:21 +08:00
疯狂的狮子li b82fa6534b add 添加多模块分支 2021-04-02 16:12:09 +08:00
疯狂的狮子li 74a4848205 add 添加单模块分支 2021-04-02 16:11:23 +08:00
疯狂的狮子li 4e58887b9a add 增加单模块项目 2021-04-02 16:01:07 +08:00
疯狂的狮子li dfcd84c2bc fix 数据权限语句null bug 2021-04-02 15:44:02 +08:00
疯狂的狮子li 3012bf0a31 add 增加数据权限注入 2021-04-02 14:22:27 +08:00
疯狂的狮子li 85e9534fae add 增加数据权限注入 2021-04-02 14:15:10 +08:00
疯狂的狮子li 4a1ff5a5ac update 修改controller生成模板 规范代码结构 2021-04-01 17:57:54 +08:00
疯狂的狮子li 222dfd1fe1 update 修改xml生成模板 附加domain类路径 2021-04-01 17:57:24 +08:00
疯狂的狮子li c1964b934f update 简化queryById代码生成器 2021-03-31 16:51:24 +08:00
疯狂的狮子li b16fe5e263 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/views/tool/build/index.vue
 2021-03-31 16:49:45 +08:00
疯狂的狮子li fdacc04582 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java
 2021-03-30 17:21:22 +08:00
疯狂的狮子li 96d10126b2 修复request.getInputStream() 重复读取错误问题 2021-03-30 11:41:24 +08:00
疯狂的狮子li a29ebef202 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java
 2021-03-30 11:38:56 +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
疯狂的狮子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
疯狂的狮子li 2df675bb01 !12 【BUG】项目启动后配置的定时器任务无法正常启动 
Merge pull request !12 from linCodeTest/quartz_bug
 2021-03-23 16:43:13 +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
疯狂的狮子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
疯狂的狮子li 939d89f0b8 !10 [BUG] 解决只能使用circle干扰的bug 
Merge pull request !10 from wugh/hotfix/captcha
 2021-03-20 10:14:03 +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
疯狂的狮子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
疯狂的狮子li 2509815a4f fix 验证码点击不刷新 bug 2021-03-14 00:15:29 +08:00
疯狂的狮子li 2b8ab9cc4d update 使用hutool重写系统监控 2021-03-12 18:02:23 +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
疯狂的狮子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
疯狂的狮子li 2c2deced02 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 2021-03-03 17:14:21 +08:00
疯狂的狮子li 0638f3c1fe Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	README.md
	ruoyi-ui/src/views/index.vue
 2021-02-28 14:39:53 +08:00
疯狂的狮子li 9b136e76bb update 3.4.0 2021-02-22 10:06:18 +08:00
疯狂的狮子li ac99fddfe6 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/views/index.vue
 2021-02-22 10:04:43 +08:00
疯狂的狮子li 66899c4c96 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	sql/ry_20210210.sql
 2021-02-18 09:12:32 +08:00
疯狂的狮子li 2c40a892f8 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/store/modules/permission.js
	ruoyi-ui/src/views/system/role/index.vue
 2021-02-07 09:18:17 +08:00
疯狂的狮子li 6f0dfa850a Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/views/system/role/index.vue
 2021-02-03 13:38:43 +08:00
疯狂的狮子li 8ba1266b6a 修改 页面生成模板 适配后端时间格式 2021-01-28 09:22:25 +08:00
疯狂的狮子li 118c02144f 集成 Feign 接口化管理 Http请求(如短信,支付,推送等) 2021-01-27 15:15:03 +08:00
疯狂的狮子li a4756004f8 删除过时配置 2021-01-27 13:10:05 +08:00
疯狂的狮子li 6e6933bb25 支持树表生成 增加生成树表说明 2021-01-25 13:35:07 +08:00
疯狂的狮子li 2925f28255 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/package.json
 2021-01-25 09:54:49 +08:00
疯狂的狮子li b5e8fa2b98 统一校验配置类名称 2021-01-21 09:31:37 +08:00
疯狂的狮子li 09acac4caf 更新readme 2021-01-18 16:13:05 +08:00