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

98 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tortoise
266f87f7c6 需求3 2024-09-09 10:48:39 +08:00
tortoise
2d66f086b9 需求3 2024-09-09 01:14:33 +08:00
tortoise
a2659cb192 1. 普通成员可以向管理员申请撤销某一个奖惩记录 
2. 管理员可查看所有成员的申请撤销记录，同样需分页展示
 2024-09-09 00:48:24 +08:00
tortoise
5308e05c80 gai 2024-09-08 18:50:53 +08:00
tortoise
a8718f87ae 1 2024-09-08 17:44:44 +08:00
tortoise
459f04168b Merge remote-tracking branch 'origin/main' into wr 2024-09-08 17:30:31 +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
dd4ba94d61 调整获取userId的方式 2024-09-07 17:49:56 +08:00
suyiiyii
394156a639 Merge remote-tracking branch 'origin/main' into wr 
# Conflicts:
#	src/main/java/top/suyiiyii/sims/controller/UserController.java
#	src/main/java/top/suyiiyii/sims/service/UserService.java
 2024-09-07 17:34:02 +08:00
tortoise
a0e6cb87a3 1 2024-09-06 18:33:21 +08:00
tortoise
32e3a3d96f 1 2024-09-06 18:30:32 +08:00
tortoise
c9d3fd8cca 1 2024-09-06 18:09:58 +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
tortoise
39d1510b3a 无 2024-09-06 17:32:11 +08:00
tortoise
6d0fa3bb65 那个record的id 2024-09-06 17:30:33 +08:00
tortoise
cf4bf35d66 Merge remote-tracking branch 'origin/main' into wr 2024-09-06 09:46:50 +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
tortoise
cfa089f671 改了那个 2024-09-03 16:25:10 +08:00
suyiiyii
b9ca333958 添加文件上传功能及S3集成 
新版本中添加了文件上传功能，并集成了S3进行文件存储。这包括控制器、服务和工具类的更新，以及配置S3客户端的bean配置。
 2024-09-03 16:13:00 +08:00
suyiiyii
01fe90b0d3 jwt: token有效期两周，便于调试 2024-09-02 16:57:44 +08:00
tortoise
a21aadf283 管理员查找所用用户加上角色 2024-09-01 15:51:11 +08:00
tortoise
9209413483 定义对象 2024-09-01 15:22:56 +08:00
tortoise
2b3f5ccbd7 筛选查询 2024-09-01 13:11:50 +08:00
tortoise
e48adf67c3 调整个人查询无法出现类别类型 2024-09-01 12:39:38 +08:00
tortoise
471079f68c 调整个人查询无法出现类别类型 2024-08-30 20:14:49 +08:00
tortoise
8767c5c554 调整个人查询 2024-08-30 12:28:02 +08:00
tortoise
df55f364b0 Merge remote-tracking branch 'origin/main' into wr 2024-08-29 21:57:45 +08:00
tortoise
2822ef2469 调整个人查询 2024-08-29 21:57:42 +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
tortoise
ded0c9939f 模糊查询 2024-08-26 22:22:47 +08:00
tortoise
a7052ec87a 改成main的 2024-08-26 19:49:40 +08:00
tortoise
cc053a6834 模糊查询 2024-08-26 19:33:28 +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