Commit Graph

379 Commits

Author SHA1 Message Date
381de9d54b
patch: 漏洞修补,规范化
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 20s
2024-04-11 20:22:42 +08:00
061d469c17
Merge branch 'refs/heads/develop' into feature-zrx
# Conflicts:
#	src/main/java/com/jsl/oa/aspect/AnnotationsAspect.java
#	src/main/java/com/jsl/oa/common/constant/SafeConstants.java
#	src/main/java/com/jsl/oa/controllers/PermissionController.java
#	src/main/java/com/jsl/oa/controllers/ProjectController.java
#	src/main/java/com/jsl/oa/controllers/RoleController.java
#	src/main/java/com/jsl/oa/controllers/UserController.java
#	src/main/java/com/jsl/oa/dao/ProjectDAO.java
#	src/main/java/com/jsl/oa/dao/RoleDAO.java
#	src/main/java/com/jsl/oa/dao/UserDAO.java
#	src/main/java/com/jsl/oa/mapper/ProjectMapper.java
#	src/main/java/com/jsl/oa/mapper/RoleMapper.java
#	src/main/java/com/jsl/oa/mapper/UserMapper.java
#	src/main/java/com/jsl/oa/services/ProjectService.java
#	src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java
#	src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java
#	src/main/java/com/jsl/oa/services/impl/RoleServiceImpl.java
#	src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java
#	src/main/java/com/jsl/oa/utils/Processing.java
2024-04-11 20:17:32 +08:00
a375bdee78 Merge: 代码规约,Message 部分(消息部分)
Reviewed-on: #11
Reviewed-by: 筱锋xiao_lfeng <gm@x-lf.cn>
2024-04-11 20:04:11 +08:00
5f0e58ab06
feat: 代码规约修改,BUG 补丁
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 19s
2024-04-11 19:31:16 +08:00
176yunxuan
b994aeefd8 feat:定时查找快到期项目提醒
Some checks failed
代码检查 / 代码检查 (pull_request) Failing after 21s
2024-04-11 19:10:07 +08:00
xiangZr-hhh
365f2dfa67 feat:增加新业务功能获取审核列表
Some checks failed
代码检查 / 代码检查 (pull_request) Failing after 21s
2024-04-11 17:27:34 +08:00
176yunxuan
3e0652034e feat:消息模块
Some checks failed
代码检查 / 代码检查 (pull_request) Failing after 19s
2024-04-10 21:10:39 +08:00
176yunxuan
3ca0bed1e1 feat:消息模块
Some checks failed
代码检查 / 代码检查 (pull_request) Failing after 19s
2024-04-10 20:51:48 +08:00
fb5a8c06f6
feat: 代码风格规约调整
Some checks failed
代码检查 / 代码检查 (pull_request) Failing after 27s
2024-04-10 10:34:55 +08:00
f49b9db4d7 Merge pull request 'feat: 代码风格调整' (#7) from feature-xiaolfeng into master
Some checks failed
代码检查 / 代码检查 (push) Failing after 26s
Reviewed-on: #7
2024-04-10 09:53:00 +08:00
c273913442
feat: 代码风格调整
Some checks failed
代码检查 / 代码检查 (pull_request) Failing after 19s
2024-04-10 09:37:39 +08:00
13270ed1b6
feat: 修改为错误
All checks were successful
代码检查 / 代码检查 (push) Successful in 14s
2024-04-10 09:19:29 +08:00
6574d8a12e
feat: 重新处理 codecheck
All checks were successful
代码检查 / 代码检查 (push) Successful in 13s
2024-04-10 09:09:15 +08:00
ccac929478
feat: 重新处理 codecheck
All checks were successful
代码检查 / 代码检查 (push) Successful in 14s
2024-04-10 09:05:57 +08:00
767d9f75e1
feat: 重新处理 codecheck
All checks were successful
代码检查 / 代码检查 (push) Successful in 22s
2024-04-10 09:04:58 +08:00
fe4dfb77e6
patch: 符合开发规约
Some checks failed
代码检查 / 代码检查 (pull_request) Failing after 54s
代码检查 / 代码检查 (push) Failing after 1m11s
2024-04-10 01:22:55 +08:00
06bb45ba5d
patch: 符合开发规约 2024-04-10 01:22:31 +08:00
78da5c90c4
patch: 注释内容修改,代码规范化 2024-04-10 00:36:57 +08:00
34c6ea1a8b
debug: 去除 qodana,添加 检查
Some checks failed
代码检查 / 代码检查 (pull_request) Failing after 51s
代码检查 / 代码检查 (push) Failing after 1m17s
2024-04-09 23:56:39 +08:00
7d680aeb87
Merge branch 'refs/heads/master' into feature-xiaolfeng 2024-04-09 23:56:30 +08:00
d2d761deb5 更新 .github/workflows/code-check.yaml
Some checks failed
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head This commit looks good
代码检查 / 代码检查 (push) Failing after 1m3s
2024-04-09 23:02:58 +08:00
f4ef0ce63b 测试
Some checks failed
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head This commit looks good
代码检查 / 代码检查 (push) Failing after 34s
Signed-off-by: 筱锋xiao_lfeng <gm@x-lf.cn>
2024-04-09 20:56:36 +08:00
c324ce2bca
debug: 去除 Jenkinsfile 2024-04-09 20:50:55 +08:00
b48d89f22e
debug: 内容 Debug 测试提交
All checks were successful
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head This commit looks good
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/pr-master This commit looks good
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/pr-develop This commit looks good
2024-04-09 20:46:54 +08:00
c700ab5a5c
上传测试
All checks were successful
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head This commit looks good
2024-04-09 20:45:02 +08:00
1993eba4e2
上传测试
All checks were successful
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head This commit looks good
2024-04-09 20:41:12 +08:00
a8ccce2eed
Upload
All checks were successful
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head This commit looks good
2024-04-09 20:39:24 +08:00
176yunxuan
5d046f4a04 分页查询和删除
All checks were successful
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head This commit looks good
2024-03-21 21:58:57 +08:00
176yunxuan
e16dc1f745 分页查询和删除
All checks were successful
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head This commit looks good
2024-03-21 20:56:07 +08:00
xiangZr-hhh
da70993593 /project/getwork/id接口增加负责人id返回信息;/module/get/min新增负责人名称与子系统名称返回信息
Some checks failed
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
2024-03-17 17:11:45 +08:00
xiangZr-hhh
6c9a81ebf7 模块/系统详细信息接口,返回信息调整,增加projectId
All checks were successful
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head This commit looks good
2024-03-17 15:39:05 +08:00
86fe04a895 Upload
All checks were successful
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head This commit looks good
2024-03-17 12:45:19 +08:00
176yunxuan
21eed05bcc 查询bug
All checks were successful
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head This commit looks good
2024-03-17 09:56:40 +08:00
176yunxuan
479d3bb421 查询bug
All checks were successful
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head This commit looks good
2024-03-17 09:46:18 +08:00
176yunxuan
5e1da6b079 查询bug
All checks were successful
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head This commit looks good
2024-03-17 08:35:33 +08:00
176yunxuan
14c726cb9a 返回信息调整
Some checks failed
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
2024-03-16 18:26:37 +08:00
176yunxuan
55aa2640cf 返回信息调整
All checks were successful
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head This commit looks good
2024-03-16 18:00:54 +08:00
176yunxuan
2c90fcd053 返回信息调整
Some checks failed
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
2024-03-16 16:42:34 +08:00
176yunxuan
11c0349282 返回信息调整
Some checks failed
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
2024-03-16 10:24:14 +08:00
176yunxuan
61a4e2e592 返回信息调整
Some checks failed
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
2024-03-16 10:19:56 +08:00
176yunxuan
ea457a6604 增加标签字段
Some checks failed
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
2024-03-15 21:19:23 +08:00
176yunxuan
d05c6141dc Merge branch 'feature'
All checks were successful
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head This commit looks good
2024-03-15 20:40:27 +08:00
176yunxuan
25e16c4264 id查询项目/系统
Some checks failed
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
2024-03-15 20:39:39 +08:00
176yunxuan
746ddee34a 查询逻辑更改
All checks were successful
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head This commit looks good
2024-03-15 18:47:52 +08:00
424fddd2ed Upload
All checks were successful
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head This commit looks good
2024-03-15 17:39:06 +08:00
176yunxuan
5075426bcf 查询逻辑更改
Some checks failed
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
2024-03-15 17:07:30 +08:00
fb9820be31 Upload
All checks were successful
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head This commit looks good
2024-03-15 17:06:29 +08:00
176yunxuan
0de184db59 Merge branch 'feature'
All checks were successful
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head This commit looks good
# Conflicts:
#	src/main/java/com/jsl/oa/dao/ProjectDAO.java
2024-03-14 21:45:10 +08:00
176yunxuan
06c3be33e2 子系统子模块
Some checks failed
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
2024-03-14 21:43:27 +08:00
176yunxuan
3101ed371b 子系统子模块
Some checks failed
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
2024-03-14 20:54:04 +08:00