疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						a63abbf268
					 | 
					
						
						
							
							update 优化 hikari 参数顺序 最常用的放上面 删除无用 druid 监控页面
						
						
						
						
						
						
					 | 
					
						2022-11-07 22:27:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MichelleChung
							
						 
					 | 
					
						
						
							
						
						1f42bd3d22
					 | 
					
						
						
							
							!245 数据源由 Druid 修改为 Hikari
						
						
						
						
						
						
						
						* update 更新 dataSource 数据源, 由 druid 修改为 hikari, 更新相关配置 ; 
						
						
					 | 
					
						2022-11-07 14:10:52 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						93c4cc2cd1
					 | 
					
						
						
							
							!244 【轻量级Pr】修正oss日志错误
						
						
						
						
						
						
						
						Merge pull request !244 from 陈賝/dev 
						
						
					 | 
					
						2022-11-07 09:01:46 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								chenchen
							
						 
					 | 
					
						
						
							
						
						ab4b21ff58
					 | 
					
						
						
							
							update oss相关
						
						
						
						
						
						
					 | 
					
						2022-11-07 16:54:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						83a09c475d
					 | 
					
						
						
							
							update 优化 桶权限类型标签 使用el-tag简化写法
						
						
						
						
						
						
					 | 
					
						2022-11-03 16:23:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						9d99afd159
					 | 
					
						
						
							
							update 优化 桶权限类型字段 写法与vue3版本不兼容问题
						
						
						
						
						
						
					 | 
					
						2022-11-03 16:18:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						1858ac6b25
					 | 
					
						
						
							
							reset 回滚错误提交 并不能解决问题
						
						
						
						
						
						
					 | 
					
						2022-11-03 11:58:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						78290128e7
					 | 
					
						
						
							
							add 增加 4.3-4.4 更新 sql 文件
						
						
						
						
						
						
					 | 
					
						2022-11-03 11:38:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						68193fd37f
					 | 
					
						
						
							
							add 增加 sys_oss_config access_policy 桶权限类型字段
						
						
						
						
						
						
					 | 
					
						2022-11-03 11:38:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						cd9c3c3f4f
					 | 
					
						
						
							
							!243 合并 oss 私有库功能
						
						
						
						
						
						
						
						update 优化 支持 oss 私有库功能 
						
						
					 | 
					
						2022-11-03 03:13:27 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						8bd023b49f
					 | 
					
						
						
							
							fix 修复 sqlserver 分页问题
						
						
						
						
						
						
					 | 
					
						2022-11-02 10:34:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						57daef9ced
					 | 
					
						
						
							
							update satoken 1.31.0 => 1.32.0
						
						
						
						
						
						
					 | 
					
						2022-10-31 10:45:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						fb134da091
					 | 
					
						
						
							
							update springboot-admin 2.7.6 => 2.7.7
						
						
						
						
						
						
					 | 
					
						2022-10-31 10:42:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						c1a3eaaffb
					 | 
					
						
						
							
							Merge remote-tracking branch 'ruoyi-vue/master' into dev
						
						
						
						
						
						
						
						# Conflicts:
#	pom.xml
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
#	ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java
#	ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
#	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
#	ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
#	ruoyi-generator/src/main/resources/vm/java/controller.java.vm
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java
#	ruoyi-ui/src/assets/icons/svg/system.svg
#	ruoyi-ui/src/views/monitor/job/index.vue
#	ruoyi-ui/src/views/system/role/index.vue
#	ruoyi-ui/src/views/system/user/index.vue
#	ruoyi-ui/src/views/system/user/profile/userAvatar.vue 
						
						
					 | 
					
						2022-10-31 10:35:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						b6dbe7b5a5
					 | 
					
						
						
							
							update 优化 新增返回警告消息提示
						
						
						
						
						
						
					 | 
					
						2022-10-31 10:33:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						8138063bfe
					 | 
					
						
						
							
							fix 修复 菜单激活无法修改其填充颜色 去除某些svg图标的fill="#bfbfbf"属性
						
						
						
						
						
						
					 | 
					
						2022-10-31 10:32:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						4c8dc500c7
					 | 
					
						
						
							
							fix 修复 table中更多按钮切换主题色未生效修复问题
						
						
						
						
						
						
					 | 
					
						2022-10-31 10:24:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						85247991b6
					 | 
					
						
						
							
							fix 修复 上传png透明图片 生成头像透明部分变成黑色
						
						
						
						
						
						
					 | 
					
						2022-10-31 10:22:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						a127eaa0e9
					 | 
					
						
						
							
							update 优化 重置时取消部门选中
						
						
						
						
						
						
					 | 
					
						2022-10-31 10:19:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						ebb9f15a75
					 | 
					
						
						
							
							新增返回警告消息提示
						
						
						
						
						
						
					 | 
					
						2022-10-30 12:02:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						cd137bd9fc
					 | 
					
						
						
							
							升级fastjson到最新版2.0.16
						
						
						
						
						
						
					 | 
					
						2022-10-30 09:58:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								若依
							
						 
					 | 
					
						
						
							
						
						07bde5f88a
					 | 
					
						
						
							
							!610 pagehelper-boot更新1.4.5
						
						
						
						
						
						
						
						Merge pull request !610 from abbfun/N/A 
						
						
					 | 
					
						2022-10-30 01:57:27 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								abbfun
							
						 
					 | 
					
						
						
							
						
						6fffa02acf
					 | 
					
						
						
							
							pagehelper-boot更新1.4.5
						
						
						
						
						
						
						
						Signed-off-by: abbfun <819589789@qq.com> 
						
						
					 | 
					
						2022-10-29 14:45:55 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						5830c3c96d
					 | 
					
						
						
							
							!242 优化调用toAjax时的冗余三元操作符。
						
						
						
						
						
						
						
						Merge pull request !242 from scmiot/dev 
						
						
					 | 
					
						2022-10-29 09:35:25 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								scmiot
							
						 
					 | 
					
						
						
							
						
						9f2dc5c233
					 | 
					
						
						
							
							删除几个Controller和代码生成模板中冗余的三元表达式。
						
						
						
						
						
						
						
						Signed-off-by: scmiot <scmiot@qq.com> 
						
						
					 | 
					
						2022-10-29 08:23:09 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						ec076c1e0d
					 | 
					
						
						
							
							update 优化 单元测试乱码问题 指定运行编码
						
						
						
						
						
						
					 | 
					
						2022-10-29 00:00:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						6e8ef308ed
					 | 
					
						
						
							
							add 增加 junit5 单元测试案例
						
						
						
						
						
						
					 | 
					
						2022-10-28 23:21:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						dc48f9858b
					 | 
					
						
						
							
							修复table中更多按钮切换主题色未生效修复问题
						
						
						
						
						
						
					 | 
					
						2022-10-28 20:59:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						a6b2ac5dcd
					 | 
					
						
						
							
							升级oshi到最新版本6.3.0
						
						
						
						
						
						
					 | 
					
						2022-10-28 19:57:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								若依
							
						 
					 | 
					
						
						
							
						
						c0685b7f7f
					 | 
					
						
						
							
							!608 编辑头像时生成为透明png图片
						
						
						
						
						
						
						
						Merge pull request !608 from BlossomWave/N/A 
						
						
					 | 
					
						2022-10-28 11:48:22 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								若依
							
						 
					 | 
					
						
						
							
						
						fb2d616c57
					 | 
					
						
						
							
							!609 优化代码
						
						
						
						
						
						
						
						Merge pull request !609 from lihy2021/N/A 
						
						
					 | 
					
						2022-10-28 11:44:27 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								若依
							
						 
					 | 
					
						
						
							
						
						6ff6853082
					 | 
					
						
						
							
							!606 重置时取消部门选中
						
						
						
						
						
						
						
						Merge pull request !606 from 也曾为你像超人/N/A 
						
						
					 | 
					
						2022-10-28 11:42:26 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								若依
							
						 
					 | 
					
						
						
							
						
						f8014ae969
					 | 
					
						
						
							
							!602 去除某些svg图标的fill="#bfbfbf"属性,避免菜单激活无法修改其填充颜色
						
						
						
						
						
						
						
						Merge pull request !602 from 清溪先生/master 
						
						
					 | 
					
						2022-10-28 11:39:13 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						88ed6e25ca
					 | 
					
						
						
							
							update 优化 切换 maven 仓库到 华为云
						
						
						
						
						
						
					 | 
					
						2022-10-27 11:55:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lihy2021
							
						 
					 | 
					
						
						
							
						
						1de2b7a57e
					 | 
					
						
						
							
							优化代码
						
						
						
						
						
						
					 | 
					
						2022-10-27 01:25:39 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						95f7ba0080
					 | 
					
						
						
							
							update 优化 oss 云厂商增加 华为obs关键字
						
						
						
						
						
						
					 | 
					
						2022-10-26 14:30:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						bb73b31e6b
					 | 
					
						
						
							
							fix 修复 sqlserver 特定情况下报 ssl 证书问题 默认关闭 ssl 认证
						
						
						
						
						
						
					 | 
					
						2022-10-25 17:56:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						9ecc4475dd
					 | 
					
						
						
							
							fix 修复 sqlserver sql文件 重复主键数据问题
						
						
						
						
						
						
					 | 
					
						2022-10-25 17:56:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								BlossomWave
							
						 
					 | 
					
						
						
							
						
						f01aa37394
					 | 
					
						
						
							
							update ruoyi-ui/src/views/system/user/profile/userAvatar.vue.
						
						
						
						
						
						
						
						默认修改头像时如果上传的图片为png透明图片,生成的头像透明部分会变成黑色,修改了生成头像为png格式。可正常显示图片透明部分。
Signed-off-by: BlossomWave <316975215@qq.com> 
						
						
					 | 
					
						2022-10-24 08:25:33 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						efa2f23510
					 | 
					
						
						
							
							🐬发布 4.3.1 修复了一些问题建议升级
						
						
						
						
						
						
					 | 
					
						2022-10-24 14:22:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						408155ff5c
					 | 
					
						
						
							
							fix 修复 内链域名特殊字符替换 合并错误导致问题
						
						
						
						
						
						
					 | 
					
						2022-10-24 13:44:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						785c7495c1
					 | 
					
						
						
							
							Merge remote-tracking branch 'ruoyi-vue/master' into dev
						
						
						
						
						
						
						
						# Conflicts:
#	pom.xml
#	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
#	ruoyi-ui/src/App.vue
#	ruoyi-ui/src/assets/styles/ruoyi.scss
#	ruoyi-ui/src/views/system/user/index.vue
#	ruoyi-ui/src/views/system/user/profile/userAvatar.vue 
						
						
					 | 
					
						2022-10-24 09:43:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								也曾为你、像超人
							
						 
					 | 
					
						
						
							
						
						4517dea98d
					 | 
					
						
						
							
							重置时取消部门选中
						
						
						
						
						
						
						
						Signed-off-by: 也曾为你、像超人 <1553592282@qq.com> 
						
						
					 | 
					
						2022-10-21 23:24:35 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						0358dc233a
					 | 
					
						
						
							
							update springboot 2.7.4 => 2.7.5
						
						
						
						
						
						
						
						update springboot-admin 2.7.5 => 2.7.6
update springdoc 1.6.11 => 1.6.12
update poi 5.2.2 => 5.2.3
update hutool 5.8.7=>5.8.8
update aws-s3 1.12.300 => 1.12.324
update aliyun-sms 2.0.18 => 2.0.22
update tencent-sms 3.1.591 => 3.1.611 
						
						
					 | 
					
						2022-10-21 13:02:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						e21396870f
					 | 
					
						
						
							
							修正菜单状态注释信息
						
						
						
						
						
						
					 | 
					
						2022-10-21 11:56:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								若依
							
						 
					 | 
					
						
						
							
						
						b67f6a0fec
					 | 
					
						
						
							
							!604 修复小屏幕上修改头像界面布局错位的问题
						
						
						
						
						
						
						
						Merge pull request !604 from 也曾为你、像超人/master 
						
						
					 | 
					
						2022-10-21 03:50:16 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								若依
							
						 
					 | 
					
						
						
							
						
						42d8104505
					 | 
					
						
						
							
							!603 update ruoyi-ui/src/views/system/user/index.vue.
						
						
						
						
						
						
						
						Merge pull request !603 from kknd97/N/A 
						
						
					 | 
					
						2022-10-21 03:46:49 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								若依
							
						 
					 | 
					
						
						
							
						
						f40a0eab23
					 | 
					
						
						
							
							!601 swagger-ui静态资源缓存
						
						
						
						
						
						
						
						Merge pull request !601 from abbfun/N/A 
						
						
					 | 
					
						2022-10-21 03:41:22 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								刘元博
							
						 
					 | 
					
						
						
							
						
						b6153d1aef
					 | 
					
						
						
							
							修正选择按钮宽度
						
						
						
						
						
						
					 | 
					
						2022-10-21 11:21:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								若依
							
						 
					 | 
					
						
						
							
						
						a2c585daa4
					 | 
					
						
						
							
							!605 升级fastjson到最新版2.0.15
						
						
						
						
						
						
						
						Merge pull request !605 from Rain/N/A 
						
						
					 | 
					
						2022-10-21 03:11:58 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |