ssyg/SIMS
2
0
Fork 0
mirror of https://github.com/suyiiyii/SIMS.git synced 2025-05-30 11:06:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
90 Commits 5 Branches 0 Tags
Commit Graph

90 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
suyiiyii
0eee7b6862
Merge pull request #29 from suyiiyii/wr3
Some checks failed
Docker Build and Publish / build (push) Has been cancelled
Details
Gitea Sync / trigger-gitea-sync (push) Has been cancelled
Details
Java CI with Maven / build (push) Has been cancelled
Details 
Wr3
 2024-09-10 10:28:23 +08:00
suyiiyii
f17b969573 更新了RevokedController中的操作注释和响应消息 
以更清晰地传达管理员处理撤销申请的流程。修改了批准状态下的返回消息，将其从"申请成功"更改为"修改成功"，以准确描述该操作的结果。同时，通过添加description属性，增强了端点文档的清晰度，指明了status字段的可接受值及其含义。
 2024-09-10 00:20:57 +08:00
tortoise
61864419ab 漏了一个sql 2024-09-09 23:17:11 +08:00
tortoise
3a1f5c8000 添加一个备注 2024-09-09 22:36:14 +08:00
suyiiyii
92de93aae2
Merge pull request #27 from suyiiyii/hierarchy
Some checks failed
Docker Build and Publish / build (push) Has been cancelled
Details
Gitea Sync / trigger-gitea-sync (push) Has been cancelled
Details
Java CI with Maven / build (push) Has been cancelled
Details 
上下级增删改查以及防止成环
 2024-09-09 20:43:49 +08:00
tortoise
a67a6c77df 筛选 2024-09-09 20:30:52 +08:00
tortoise
181a98ea57 cherry 2024-09-09 11:40:17 +08:00
tortoise
58219a84c8 cherry 2024-09-09 11:39:28 +08:00
tortoise
17c3e251f2 cherry 2024-09-09 11:34:12 +08:00
tortoise
31dbdd57e4 cherry 2024-09-09 11:31:56 +08:00
tortoise
8f83ee268a cherry 2024-09-09 11:29:11 +08:00
tortoise
199d4010e5 cherry 2024-09-09 11:25:16 +08:00
suyiiyii
39cfd99bad
Merge pull request #26 from suyiiyii/cat
Some checks failed
Docker Build and Publish / build (push) Has been cancelled
Details
Gitea Sync / trigger-gitea-sync (push) Has been cancelled
Details
Java CI with Maven / build (push) Has been cancelled
Details 
实现记录类别的增删改查以及查询记录的过滤
 2024-09-09 00:46:44 +08:00
suyiiyii
9c9b925299 上下级增删改查以及防止成环 2024-09-09 00:43:10 +08:00
suyiiyii
9b95c1b70a stash 2024-09-08 21:33:20 +08:00
suyiiyii
ec0c8b20ce 实现记录的替换 2024-09-08 21:15:17 +08:00
suyiiyii
df4230a5d2 实现记录的增加和删除 2024-09-08 20:44:26 +08:00
suyiiyii
b8b14f7af9 实现记录的过滤 2024-09-08 20:21:18 +08:00
suyiiyii
b04a347c33 奖惩类型实现分页查询 2024-09-08 19:52:05 +08:00
tortoise014
efc2aa97cb
奖惩记录增删改查 (#17)
Some checks are pending
Docker Build and Publish / build (push) Waiting to run
Details
Gitea Sync / trigger-gitea-sync (push) Waiting to run
Details
Java CI with Maven / build (push) Waiting to run
Details 
* 模糊查询

* 模糊查询

* 模糊查询

* 调整个人查询

* 调整个人查询

* 调整个人查询无法出现类别类型

* 调整个人查询无法出现类别类型

* 筛选查询

* 定义对象

* 管理员查找所用用户加上角色

* jwt: token有效期两周，便于调试

* 改了那个

* 那个record的id

* 无

* 1

* 1

* 调整获取userId的方式

* gai

---------

Co-authored-by: suyiiyii <suyiiyii@gmail.com>
 2024-09-08 18:52:44 +08:00
suyiiyii
665fae6d32 添加cors允许的方法范围
Some checks are pending
Docker Build and Publish / build (push) Waiting to run
Details
Gitea Sync / trigger-gitea-sync (push) Waiting to run
Details
Java CI with Maven / build (push) Waiting to run
Details
2024-09-08 15:36:23 +08:00
suyiiyii
2024c5e07f
实现获取用户基本信息 (#25)
Some checks failed
Docker Build and Publish / build (push) Has been cancelled
Details
Gitea Sync / trigger-gitea-sync (push) Has been cancelled
Details
Java CI with Maven / build (push) Has been cancelled
Details 
* Reapply "refactor(sims): 重构JwtInterceptor并修复用户角色加载"

This reverts commit 4579dbda81299d207de88db0f073bc48301e931a.

* 给注册添加参数校验
 2024-09-06 17:42:12 +08:00
suyiiyii
4579dbda81 Revert "refactor(sims): 重构JwtInterceptor并修复用户角色加载"
Some checks are pending
Docker Build and Publish / build (push) Waiting to run
Details
Gitea Sync / trigger-gitea-sync (push) Waiting to run
Details
Java CI with Maven / build (push) Waiting to run
Details 
This reverts commit 8ee13b5f8f06a34f8c7f1fc41ae9d38169b25183.
 2024-09-05 18:27:30 +08:00
suyiiyii
8ee13b5f8f refactor(sims): 重构JwtInterceptor并修复用户角色加载
Some checks are pending
Docker Build and Publish / build (push) Waiting to run
Details
Gitea Sync / trigger-gitea-sync (push) Waiting to run
Details
Java CI with Maven / build (push) Waiting to run
Details 
- 在JwtInterceptor中新增getUserIdFromReq方法，用于从请求中获取用户ID。
- 在UserController的getSelf方法中使用新方法获取当前用户ID并修复。
- 重构UserService中关于用户角色加载的代码，消除不必要的循环，提高执行效率。
- 修复了在UserService中findUser方法传入空值的问题，并增加用户不存在时的异常处理。
 2024-09-05 18:24:59 +08:00
suyiiyii
28f5b146d8 增强JWT拦截器异常处理
Some checks failed
Docker Build and Publish / build (push) Has been cancelled
Details
Gitea Sync / trigger-gitea-sync (push) Has been cancelled
Details
Java CI with Maven / build (push) Has been cancelled
Details 
新增异常处理，专门针对无法识别的token异常，提升错误提示的准确性。当token验证失败时，现在将抛出一个具体的"token验证失败，请重新登录"错误，以区别于登录过期错误。
 2024-09-03 17:32:26 +08:00
tortoise014
94bf792cd2
Merge pull request #24 from suyiiyii/suyiiyii-s3
Some checks are pending
Docker Build and Publish / build (push) Waiting to run
Details
Gitea Sync / trigger-gitea-sync (push) Waiting to run
Details
Java CI with Maven / build (push) Waiting to run
Details 
添加文件上传功能及S3集成
 2024-09-03 16:43:43 +08:00
suyiiyii
d353304f3a 在测试中mock S3Client，避免报错 2024-09-03 16:34:35 +08:00
suyiiyii
b9ca333958 添加文件上传功能及S3集成 
新版本中添加了文件上传功能，并集成了S3进行文件存储。这包括控制器、服务和工具类的更新，以及配置S3客户端的bean配置。
 2024-09-03 16:13:00 +08:00
suyiiyii
f113c341e5 Revert "feat(cors): 允许option请求通过"
Some checks failed
Docker Build and Publish / build (push) Has been cancelled
Details
Gitea Sync / trigger-gitea-sync (push) Has been cancelled
Details
Java CI with Maven / build (push) Has been cancelled
Details 
This reverts commit f867d7b7bc9fd2a809fc725f401a42542659368c.
 2024-08-29 17:53:30 +08:00
suyiiyii
6a0812b836 Revert "feat(cors): 暴力允许option请求通过" 
This reverts commit 0fea9664f9bf7415085345419644ef3134806b3c.
 2024-08-29 17:53:29 +08:00
suyiiyii
fb37c59810 feat(cors): 使用CorsFilter来处理跨域问题 2024-08-29 17:53:26 +08:00
suyiiyii
0fea9664f9 feat(cors): 暴力允许option请求通过
Some checks are pending
Docker Build and Publish / build (push) Waiting to run
Details
Gitea Sync / trigger-gitea-sync (push) Waiting to run
Details
Java CI with Maven / build (push) Waiting to run
Details
2024-08-29 17:15:28 +08:00
suyiiyii
f867d7b7bc feat(cors): 允许option请求通过
Some checks are pending
Docker Build and Publish / build (push) Waiting to run
Details
Gitea Sync / trigger-gitea-sync (push) Waiting to run
Details
Java CI with Maven / build (push) Waiting to run
Details
2024-08-29 16:54:37 +08:00
suyiiyii
b7afe430d3
ci(docker-publish): 确保仅在push事件时提交标签更新 (#22)
Some checks are pending
Docker Build and Publish / build (push) Waiting to run
Details
Gitea Sync / trigger-gitea-sync (push) Waiting to run
Details
Java CI with Maven / build (push) Waiting to run
Details 
* ci(docker-publish): 确保仅在push事件时提交标签更新

* refactor(github-workflows): 标准化Gitea Sync workflow名称

* feat(cors): 全局启用CORS支持

在Spring应用中通过配置CORS实现跨域请求支持，允许所有来源、方法和头。
此变更有助于解决前端应用在不同域上运行时的跨域问题。
 2024-08-28 21:13:59 +08:00
suyiiyii
2c51b04381
feat(user): 为用户表添加唯一索引 (#23)
Some checks failed
Docker Build and Publish / build (push) Failing after 2m16s
Details
gitea-sync.yml / trigger-gitea-sync (push) Successful in 4s
Details
Java CI with Maven / build (push) Failing after 5m48s
Details
2024-08-26 10:21:01 +08:00
suyiiyii
6e3ffa092b
reformat 格式化代码 (#21)
Some checks are pending
Docker Build and Publish / build (push) Waiting to run
Details
gitea-sync.yml / trigger-gitea-sync (push) Waiting to run
Details
Java CI with Maven / build (push) Waiting to run
Details 
* reformat 格式化代码

* 为依赖图的生成添加写权限
 2024-08-25 20:21:15 +08:00
suyiiyii
8d10add577 feat(docker-publish): 从meta输出中提取版本用于镜像标签
Some checks are pending
Docker Build and Publish / build (push) Waiting to run
Details
gitea-sync.yml / trigger-gitea-sync (push) Waiting to run
Details
2024-08-25 20:00:59 +08:00
suyiiyii
6185381753 fix(github-actions):将权限从read更改为write
Some checks are pending
Docker Build and Publish / build (push) Waiting to run
Details
gitea-sync.yml / trigger-gitea-sync (push) Waiting to run
Details
2024-08-25 19:41:39 +08:00
suyiiyii
95e1173849 refactor(github-actions): 使用yq-action替换直接wget和优化依赖图提交
Some checks are pending
Docker Build and Publish / build (push) Waiting to run
Details
gitea-sync.yml / trigger-gitea-sync (push) Waiting to run
Details 
- 在docker-publish.yml中使用mikefarah/yq-action直接替换繁琐的wget和chmod命令，用于更新manifest。
-通过精确的路径监听在maven.yml中优化依赖图提交动作，以响应pom.xml和src/更改，提高效率。
 2024-08-25 19:37:02 +08:00
suyiiyii
8a9612bcb3 refactor(github-actions): 自动化提交镜像更新和Gitea同步工作流
Some checks are pending
Docker Build and Publish / build (push) Waiting to run
Details
gitea-sync.yml / trigger-gitea-sync (push) Waiting to run
Details
Java CI with Maven / build (push) Waiting to run
Details 
- 在docker-publish.yml中引入yq Linux二进制文件并设置权限，用于在'push'事件中自动更新部署镜像标签。
- 用git-auto-commit-action自动化提交更新到GitHub，使用机器用户凭据。- 在gitea-sync.yml中增加workflow_run事件的类型限定，仅在'Docker Build and Publish'工作流完成时触发。
 2024-08-25 19:32:28 +08:00
suyiiyii
6bffefee2e feat(cicd):增加Workflow来更新部署镜像标签
Some checks are pending
Docker Build and Publish / build (push) Waiting to run
Details
gitea-sync.yml / trigger-gitea-sync (push) Waiting to run
Details
Java CI with Maven / build (push) Waiting to run
Details
2024-08-25 19:13:28 +08:00
suyiiyii
437b23022c fix(JwtInterceptor): 解决登录过期问题 
增加对过期JWT令牌的异常处理，以在访问受限时强制重新认证。在验证失败时抛出服务异常前，捕获并处理TokenExpiredException。
 2024-08-25 19:12:28 +08:00
suyiiyii
f5efdf8bf4
Update gitea-sync.yml
Some checks are pending
Docker / build (push) Waiting to run
Details
gitea-sync.yml / trigger-gitea-sync (push) Waiting to run
Details
Java CI with Maven / build (push) Waiting to run
Details
2024-08-25 11:45:24 +08:00
suyiiyii
2734fb2227
Update gitea-sync.yml
Some checks are pending
Docker / build (push) Waiting to run
Details
gitea-sync.yml / trigger-gitea-sync (push) Waiting to run
Details
Java CI with Maven / build (push) Waiting to run
Details
2024-08-25 11:42:46 +08:00
suyiiyii
8fab21bc25
Merge pull request #20 
* feat(github): 创建gitea-sync.yml工作流
 2024-08-25 11:39:21 +08:00
suyiiyii
7a4e9adb29
fix: Dockerfile 2024-08-25 02:35:47 +08:00
suyiiyii
1a53ffd83c
自动化构建docker镜像 (#19) 
* feat(build): add Dockerfile

* feat(github-actions): 添加 Docker 镜像构建和发布工作流

* 删除maven的镜像配置
 2024-08-25 02:09:50 +08:00
suyiiyii
c00d979e91
RBAC 优化 (#18) 
* refactor(common): 整理拦截器配置和JWT拦截器实现

* feat(auth): 将权限信息使用注解的形式固定在接口上

* feat(rbac): stash

* fix(GlobalException): 在ServiceException处理中添加日志记录

在全局异常处理器中为ServiceException添加错误日志记录，以提高错误跟踪的可观察性。现在，当捕获到ServiceException时，将记录错误消息。

更改包含：
- 导入lombok.extern.slf4j.Slf4j注解以启用日志记录功能。
- 使用@Slf4j注解GlobalException类。- 在ServiceException的@ExceptionHandler方法中添加日志记录语句。

* feat(auth): 实现RBAC，调整JWT验证，更新用户服务和控制器

* 为所有接口添加权限注解

* 删除没有必要的接口

* 删除过期的测试

* refactor(entity): 使用MyBatis-Plus和AutoTable注解重新定义主键和注释

- 重构`Role`, `RolePermission`, `User`, 和`UserRole`实体类，统一使用`@ColumnId`注解代替`@TableId`，并为各实体类的字段添加了相应的注释。- 为`Role`实体类的`roleId`和`roleName`字段，`RolePermission`的`roleId`和`permissionId`字段，`User`实体类的`studentId`, `username`, `password`, `email`, `grade`, 和`userGroup`字段，以及`UserRole`的`userId`和`roleId`字段添加了`@ColumnNotNull`注解，以强化字段的非空约束。

* refactor(jwt-interceptor):精简无效的JWT，提高检查效率

调整JwtInterceptor以精简无效的JWT检查逻辑。实现对JWT效验和用户ID提取的优化，避免不必要的数据库查询。refactor(role): 使用自定义注解替换MyBatis Plus注解并移除冗余字段

通过自定义注解替换MyBatis Plus注解，以整理和优化实体类定义。删除了Role类中的冗余字段，如'tag'，以及未使用的imports。

refactor(user-service): 使用ModelMapper简化对象映射，重构注册逻辑引入ModelMapper以简化User对象和DTO之间的映射操作。重构UserService中的用户注册逻辑，使用ModelMapper进行对象转换，减少手动设置属性的需求。

fix(user-controller):调整用户注册请求参数，统一数据类型

调整UserController中的注册请求参数，将'studentId'和'userGroup'的类型与现有代码库保持一致，以便正确进行参数传递和处理。

feat(user-service): 实现rbacService集成，增强用户注册流程

在UserService中集成rbacService，以在用户注册时为新用户分配默认角色。优化了用户注册流程，并简化了权限和角色的管理。

BREAKING CHANGE: 对UserRole逻辑的改动可能会影响现有的用户权限和角色分配。请确保在更新代码后进行

* 修复测试配置
 2024-08-25 01:42:40 +08:00
tortoise014
5b9e835108
Merge pull request #16 from suyiiyii/wr 
Record 增删改查
 2024-08-21 22:25:56 +08:00
tortoise
68ef028a1b 实现权限校验 2024-08-21 21:21:48 +08:00