yystopf
/
microservices
forked from Gitlink/microservices
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,810 Commits 4 Branches 1 Tag 184 MiB
Commit Graph

3810 Commits

Author SHA1 Message Date
wanjia9506 7e237ce650 Merge pull request '从gitlink获取文件entries接口改为需要授权请求' (#585) from wanjia9506/microservices:dev_PMS into dev_PMS 2024-06-26 17:28:58 +08:00
wanjia f57cd3152a fix(gitlink请求方式):从gitlink获取文件entries接口改为需要授权请求 2024-06-26 17:24:45 +08:00
wanjia 3328335a91 fix(流水线):新增流水线-模版json判空处理 2024-06-21 09:10:36 +08:00
wanjia9506 3e93dde5f1 Merge pull request '#4197 新加流水线类型' (#584) from wanjia9506/microservices:dev_PMS into dev_PMS 2024-06-21 08:52:56 +08:00
wanjia e216f06938 Merge remote-tracking branch 'main/dev_PMS' into dev_PMS 2024-06-21 08:49:19 +08:00
wanjia 70e6153680 fix(流水线):新加流水线类型筛选完善 2024-06-21 08:47:29 +08:00
otto 0a291267a1 Merge pull request 'feat(完善系统微服务): 获取gitlink用户列表时，若该用户为当前组织成员则返回该成员角色' (#583) from otto/microservices:dev_PMS_bugfix into dev_PMS 2024-06-21 08:38:14 +08:00
OTTO 4c84628db0 Merge branch 'dev_PMS' of code.gitlink.org.cn:Gitlink/microservices into dev_PMS_bugfix 2024-06-21 08:35:01 +08:00
OTTO 6c12d5e082 feat(完善系统微服务): 获取gitlink用户列表时，若该用户为当前组织成员则返回该成员角色 2024-06-21 08:34:38 +08:00
otto af728c26c0 Merge pull request 'feat(完善系统微服务): 获取gitlink用户列表时，若该用户局以为当前组织成员返回该成员角色' (#582) from otto/microservices:dev_PMS_bugfix into dev_PMS 2024-06-20 16:27:55 +08:00
OTTO b0f6291263 feat(完善系统微服务): 获取gitlink用户列表时，若该用户局以为当前组织成员返回该成员角色 2024-06-20 16:24:10 +08:00
wanjia 2c5211541d feat(流水线):#4197 新加流水线类型 2024-06-20 16:19:33 +08:00
wanjia9506 bcd19895bc Merge pull request '#2952 关联缺陷根据状态排序' (#581) from wanjia9506/microservices:dev_PMS into dev_PMS 2024-06-14 09:46:51 +08:00
wanjia 2dacecaabf fix(测试报告):#2952 关联缺陷根据状态排序 2024-06-14 09:42:58 +08:00
wanjia9506 d7ab4f2e81 Merge pull request '优化' (#580) from wanjia9506/microservices:dev_PMS into dev_PMS 2024-06-14 09:08:13 +08:00
wanjia e577d7059e Merge remote-tracking branch 'origin/dev_PMS' into dev_PMS 2024-06-13 17:24:57 +08:00
wanjia 3ec97ab6a2 fix(测试报告):关联缺陷根据状态排序 2024-06-13 17:24:16 +08:00
wanjia b69d8f5ef3 fix(流水线):保存图形化流水线时文件名加后缀 2024-06-13 17:21:46 +08:00
otto 041fa04f23 Merge pull request 'fix(项目管理): 代码库列表未展示私有代码库' (#579) from otto/microservices:dev_PMS into dev_PMS 2024-06-12 15:44:31 +08:00
OTTO 8f3c3e42ab fix(项目管理): 代码库列表未展示私有代码库 2024-06-12 15:30:18 +08:00
otto 29d0ddada9 Merge pull request 'fix(项目管理): 创建组织工作台使用的线程池未传递上下文，导致Token一直未更新' (#578) from otto/microservices:dev_PMS into dev_PMS 2024-06-06 17:47:11 +08:00
OTTO 8528c517b5 fix(项目管理): 创建组织工作台使用的线程池未传递上下文，导致Token一直未更新 
新增线程池包装类，将用户上下文信息进行传递
 2024-06-06 17:44:02 +08:00
wanjia e0f775ac82 fix(wiki):导出图片链接优化 2024-06-04 17:01:20 +08:00
otto 1ddc99ac33 Merge pull request '项目管理红山裁剪' (#576) from otto/microservices:dev_PMS into dev_PMS 2024-05-31 16:03:58 +08:00
OTTO 6d96d90432 feat(项目管理红山裁剪): 隐藏掉流水线、制品库模块 
1. 通过Nacos增加配置项，可设置需屏蔽的菜单标识
2. 菜单被屏蔽则用户在菜单栏及权限分配时屏蔽相关菜单
3. 在权限判断时对被屏蔽菜单进行拦截
 2024-05-31 15:52:51 +08:00
otto ba782e9fcd Merge pull request '删除企业时清理对应的redis缓存' (#575) from otto/microservices:dev_PMS into dev_PMS 2024-05-31 11:07:41 +08:00
OTTO 696778a515 fix(完善企业逻辑): 删除企业时清理对应的redis缓存 2024-05-31 10:37:42 +08:00
otto fe4e06e33f Merge pull request 'Bug修复' (#574) from otto/microservices:dev_PMS into dev_PMS 2024-05-31 09:21:48 +08:00
OTTO 2eb3d75d66 fix(测试用例): 不同级父模块，无法创建同名的子模块 2024-05-31 08:56:53 +08:00
OTTO e1dc51db05 fix(测试单): 删除测试单内用例关联的缺陷后，该测试用例关联缺陷未被解绑 2024-05-31 08:35:20 +08:00
otto 5ab2cae398 Merge pull request '删除ruoyi相关标识' (#573) from otto/microservices:dev_PMS into dev_PMS 2024-05-30 17:06:16 +08:00
OTTO e6f3fa122d feat(微服务平台重命名): 删除ruoyi相关标识 2024-05-30 17:03:08 +08:00
OTTO 486a04ab07 feat(微服务部署脚本拆分成独立项目): 删除微服务部署子模块 2024-05-30 16:39:06 +08:00
OTTO 2b8772de06 Merge commit '26750190a9f575c06f486e0051bfcf1a4cd710d3' into dev_PMS 2024-05-30 16:33:03 +08:00
OTTO 26750190a9 Squashed 'microservices-deploy/' changes from f2841058..5e2f23bf 
5e2f23bf Merge pull request '清理无效文件' (#32) from otto/microservices-deploy:master into master
dcfc8942 feat(微服务部署脚本优化): 清理无效文件

git-subtree-dir: microservices-deploy
git-subtree-split: 5e2f23bff17c0c95ce193a0abeff3af1b041f757
 2024-05-30 16:33:03 +08:00
OTTO 0b5d051ea3 Merge commit '3ff282a0971e16d8e495fb5e5018446296a96aa4' as 'microservices-deploy' 2024-05-30 16:25:38 +08:00
OTTO 3ff282a097 Squashed 'microservices-deploy/' content from commit f2841058 
git-subtree-dir: microservices-deploy
git-subtree-split: f284105832c3dabfac9aa7b05e0e4afac7a453c4
 2024-05-30 16:25:38 +08:00
OTTO 7f96696a26 feat(微服务部署脚本拆分成独立项目): 删除微服务部署子模块 2024-05-30 16:15:19 +08:00
OTTO 8b48c9972e Merge remote-tracking branch 'origin/dev_PMS' into dev_PMS 2024-05-30 16:01:49 +08:00
wanjia 200de815d7 feat(项目管理):删除sql 2024-05-30 15:57:53 +08:00
OTTO d28aace470 feat(微服务部署脚本拆分成独立项目): 微服务部署作为微服务平台子模块 2024-05-30 15:51:40 +08:00
OTTO a03e926e06 feat(微服务平台重命名): 删除ruoyi相关标识 2024-05-30 14:17:59 +08:00
OTTO 3d9848372b Merge branch 'dev_PMS_rename' of code.gitlink.org.cn:otto/ruoyi-gitlink into dev_PMS 2024-05-30 11:51:23 +08:00
OTTO 7ed1e801d8 Merge branch 'dev_PMS' of code.gitlink.org.cn:Gitlink/ruoyi-gitlink into dev_PMS 2024-05-30 11:51:11 +08:00
OTTO 39b101aff0 Merge branch 'dev_PMS' of code.gitlink.org.cn:Gitlink/ruoyi-gitlink into dev_PMS_rename 2024-05-30 11:49:47 +08:00
OTTO 532a73e173 feat(微服务平台重命名): 解决合并冲突 2024-05-30 11:48:57 +08:00
wanjia e6f7e320af fix(项目管理-流水线):创建图形化流水线时传入分支参数 2024-05-30 11:47:24 +08:00
OTTO 99a9f5db54 Merge branch 'dev_PMS' of code.gitlink.org.cn:Gitlink/ruoyi-gitlink into dev_PMS_osredm 
# Conflicts:
#	microservices-common/microservices-common-httpClient/src/main/java/com/microservices/common/httpClient/util/GitLinkRequestHelper.java
#	microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/controller/PmsCiPipelinesController.java
#	microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/domain/PmsCiPipelineGraphics.java
#	microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/domain/vo/PmsCiPipelineBuildYamlInputVo.java
#	microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/domain/vo/PmsCiPipelinesUpdateVo.java
#	microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/mapper/PmsCiPipelineGraphicsMapper.java
#	microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/service/IPmsCiPipelineGraphicsService.java
#	microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/service/impl/PmsCiPipelineGraphicsServiceImpl.java
#	microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/service/impl/PmsCiPipelinesServiceImpl.java
#	microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/controller/PmsProjectController.java
#	microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectServiceImpl.java
#	microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsCiPipelineGraphicsMapper.xml
#	ruoyi-modules/ruoyi-wiki/src/main/java/com/ruoyi/wiki/WikiApiApplication.java
 2024-05-30 11:42:46 +08:00
OTTO e28d9fd8d5 feat(完善数据权限): 进行数据权限过滤时先判断当前是否忽略数据权限 2024-05-30 11:07:07 +08:00
wanjia 357ea74fe8 fix(项目管理-流水线):删除流水线时同时删除流水线图形化数据 2024-05-29 14:34:16 +08:00