Commit Graph

109 Commits

Author SHA1 Message Date
e14bbcd2f8 Merge remote-tracking branch 'origin/merge/1' into merge/1 2024-07-05 23:35:56 +08:00
722fb47302 尝试修改User 2024-07-05 23:35:45 +08:00
cdc1cefd85 添加了addUser和deleteUser的方法 2024-07-05 23:08:33 +08:00
1a42273465 Merge remote-tracking branch 'origin/personal/pjq/organization' into merge/1
# Conflicts:
#	src/main/java/org/cmh/backend/authentication/controller/AuthenticationController.java
#	src/main/java/org/cmh/backend/authentication/repository/UserRepository.java
#	src/main/java/org/cmh/backend/authentication/service/UserService.java
2024-07-05 21:02:22 +08:00
18966c0a93 添加了tenant字段 2024-07-05 20:55:02 +08:00
6643a7bdbb 去掉了外键约束 2024-07-05 20:51:13 +08:00
ba638747df 外键约束 2024-07-05 20:21:27 +08:00
ffa9189583 标准化租户表 2024-07-05 19:31:25 +08:00
8b25a92b77 Merge branch 'personal/heshunme/news' into merge 2024-07-05 17:20:47 +08:00
11c548e7bd 临时改名避免冲突 2024-07-05 17:07:54 +08:00
afdcfa60fb Merge branch 'personal/lsd/UserManagement' into merge
# Conflicts:
#	src/main/java/org/cmh/backend/authentication/controller/AuthenticationController.java
#	src/main/java/org/cmh/backend/authentication/repository/UserRepository.java
#	src/main/java/org/cmh/backend/authentication/service/UserService.java
2024-07-05 17:05:31 +08:00
76ca17cf41 删除/移动auth相关内容 2024-07-05 17:04:51 +08:00
7a6d2b5c4b recovery 2024-07-05 16:32:33 +08:00
55e40288df Merge branch 'main' into personal/heshunme/auth-restart-1
# Conflicts:
#	src/main/java/org/cmh/backend/authentication/controller/UserController.java
#	src/main/resources/application.properties
2024-07-05 15:04:06 +08:00
33f811e6b7 GPT牛逼,搜索搞成了 2024-07-05 06:20:30 +08:00
9e03bb3873 能搜了,就是有点问题,范围太广,啥都搜到了 2024-07-05 06:11:11 +08:00
f104c89d08 初步添加了用户权限区别对待。 2024-07-05 02:21:59 +08:00
54f055dea9 只有组织管理模块.新 2024-07-04 17:37:53 +08:00
bdba24dc26 Revert "只有组织管理模块"
This reverts commit 9fb75be5ab.
2024-07-04 17:35:47 +08:00
9fb75be5ab 只有组织管理模块 2024-07-04 17:33:15 +08:00
aa8ca4e274 solve conflict 2024-07-04 17:26:39 +08:00
d2e3443c40 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	src/main/java/org/cmh/backend/authentication/controller/UserController.java
2024-07-04 17:16:30 +08:00
1e874606f3 完成组织管理(测试用) 2024-07-04 17:09:24 +08:00
ecf466716a 完成组织管理 2024-07-04 17:09:24 +08:00
187a5afbc2 基本的组织管理完成 2024-07-04 17:09:24 +08:00
d9f54774bd 登录功能基础完成 2024-07-04 17:09:24 +08:00
bac47d9749 添加了注册功能,但User中username意义不够明确,想改成accout,此版作备份用 2024-07-04 17:09:23 +08:00
bdc19166a3 merge main& solve conflict 2024-07-04 17:09:00 +08:00
2c12fc075f getNewsPage加了jwtVerify 2024-07-04 16:42:06 +08:00
ed0cde6968 添加了漏加的service中保存租户的逻辑 2024-07-04 16:41:36 +08:00
e66695cbff 为了适应前端的列表动态加载,添加了getNewsByRange及其相关内容。 2024-07-04 12:20:04 +08:00
9de8c77764 Merge branch 'main' into personal/heshunme/news 2024-07-04 00:36:19 +08:00
441c984108 全集修改上传文件大小上限,添加验证码路径支持 2024-07-04 00:35:54 +08:00
30344b2162 添加了图片上传的后端支持 2024-07-04 00:33:49 +08:00
431ef62c12 添加了getById的请求方法 2024-07-04 00:33:32 +08:00
9056250574 添加租户字段,在联系上外键之前暂且设为字符串 2024-07-04 00:33:06 +08:00
a15f407c13 全局修改上传文件大小上限 2024-07-04 00:31:58 +08:00
173b507361 删除了service中delete throw exception的message 2024-07-03 14:52:48 +08:00
fdb9dc6daf Merge branch 'main' into personal/heshunme/news 2024-07-03 14:50:24 +08:00
9d6ab53f5f 给HttpMessageNotReadableException和MissingServletRequestParameterException指定了全局错误处理器,现在当前端发送给后端的参数不对的时候也能正确返回401错误了 2024-07-03 14:50:03 +08:00
a58da98dd1 给@JwtVerify添加了校验字符串参数的用法,现在只要有任意一个字符串参数的内容是JWT就也能校验了。 2024-07-03 14:50:03 +08:00
a38fd92801 给HttpMessageNotReadableException和MissingServletRequestParameterException指定了全局错误处理器,现在当前端发送给后端的参数不对的时候也能正确返回401错误了 2024-07-03 14:49:28 +08:00
df34d7cb28 给@JwtVerify添加了校验字符串参数的用法,现在只要有任意一个字符串参数的内容是JWT就也能校验了。 2024-07-03 14:40:25 +08:00
a4713648a2 完成了delete,尝试@JwtVerify校验字符串参数的用法 2024-07-03 14:39:05 +08:00
e4a11a8a53 Merge branch 'main' into personal/heshunme/news 2024-07-03 14:14:06 +08:00
fc2c97b502 bugfix@JwtVerify 2024-07-03 14:13:20 +08:00
a532eaa89c 尝试@JwtVerify的新用法 2024-07-03 14:13:05 +08:00
c4f0b2348f bugfix@JwtVerify 2024-07-03 14:12:42 +08:00
3a7b6ee605 Merge branch 'main' into personal/heshunme/news 2024-07-03 13:58:57 +08:00
df6686fc19 升级了@JwtVerify的能力,现在被修饰的方法的任意一个参数是继承于JwtRequest的对象即可,不再强制为第一个参 2024-07-03 13:58:25 +08:00