Commit Graph

245 Commits

Author SHA1 Message Date
OTTO ec5a211757 Merge branch 'master' of code.gitlink.org.cn:Gitlink/microservices into dev_PMS_ZPK_merge_master 2024-08-30 13:54:32 +08:00
OTTO 073d3667b5 feat(专区文章功能开发): 增加文章关键词属性 2024-06-27 10:49:51 +08:00
OTTO b2f762e035 feat(完善特色专区权限): 专区管理员增加修改组织权限 2024-06-03 11:40:07 +08:00
wanjia 200de815d7 feat(项目管理):删除sql 2024-05-30 15:57:53 +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 1b8cdccb68 feat(微服务平台重命名): 移除非必要模块 2024-05-27 17:14:52 +08:00
wanjia 58a2d6d376 feat(项目管理-流水线):#3126 创建时新加模板json字段,并在详情返回 2024-05-24 10:54:29 +08:00
wanjia e527e3ceda feat(项目管理-流水线): #3116 流水线模版及图形化流水线接口 2024-05-23 16:30:04 +08:00
OTTO 17a3d639e5 feat(完善项目管理权限): 项目管理新增流水线菜单权限,除客户外其他角色默认添加流水线使用权限 2024-05-21 11:29:52 +08:00
OTTO 310f89aa25 Merge branch 'master' into dev_PMS_Merge_Master
# Conflicts:
#	docker-gitlink/auto_redeploy.sh
#	docker-gitlink/build.sh
#	docker-gitlink/copy.sh
#	docker-gitlink/nginx/conf/default_nginx.conf
#	ruoyi-common/ruoyi-common-httpClient/src/main/java/com/ruoyi/common/httpClient/service/HttpAPIService.java
#	ruoyi-common/ruoyi-common-httpClient/src/main/java/com/ruoyi/common/httpClient/util/GitLinkRequestHelper.java
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserDeptRoleServiceImpl.java
#	ruoyi-modules/ruoyi-zone/src/main/java/com/ruoyi/zone/utils/ZoneGitLinkRequestUrl.java
2024-05-07 15:26:10 +08:00
OTTO 90eea93485 feat(专区数据集功能开发): 专区数据集板块支持可配置
新增sql:专区详情新增数据集板块相关配置
2024-04-11 15:41:44 +08:00
OTTO 2e29a7c6a2 fix(特色专区): 申请专区流程优化
专区申请新增字段:专区id(为空代表未创建)
2024-03-15 17:18:43 +08:00
OTTO c67b3c61eb fix(特色专区): 新增sql
删除板块配置菜单,重命名首页配置为栏目配置
2024-03-15 16:26:59 +08:00
wanjia9506 144e89c62c Merge pull request '流水线优化' (#510) from wanjia9506/ruoyi-gitlink:dev_PMS into dev_PMS 2024-03-07 11:28:06 +08:00
wanjia e2f3214cd8 fix(项目管理-流水线):流水线新增时添加仓库名入参 2024-03-07 11:17:53 +08:00
otto 10346ca4dc Merge pull request '创建通知公告时,设置更新人为创建人' (#509) from otto/ruoyi-gitlink:dev_PMS into dev_PMS 2024-03-07 10:07:21 +08:00
OTTO 0041d719cd feat(离线部署脚本开发): 完善离线部署脚本
新增sql:项目管理-制品库增加字典数据
2024-03-06 10:41:18 +08:00
OTTO b15762bf72 feat(离线部署脚本开发): 完善离线部署脚本
修正SQL错误
2024-03-06 09:06:58 +08:00
wanjia 6c1fb35819 fix(项目管理-流水线):建表sql注释修改 2024-03-05 14:58:47 +08:00
wanjia 7e6acea68b fix(项目管理-流水线):禁用/启用流水线状态变更处理 2024-03-05 14:27:55 +08:00
otto 5855f5f979 Merge pull request '校正离线部署脚本' (#494) from otto/ruoyi-gitlink:dev_PMS into dev_PMS 2024-03-05 09:34:21 +08:00
wanjia 8b42171c21 fix(项目管理-流水线):流水线状态修正 2024-03-04 17:28:49 +08:00
wanjia fd1de8dbd7 Merge remote-tracking branch 'origin/dev_PMS' into dev_PMS 2024-03-04 17:11:34 +08:00
OTTO 683eb2cabd feat(离线部署脚本开发): 完善离线部署脚本
修正SQL错误
2024-03-04 17:10:32 +08:00
wanjia 27508229f7 feat(项目-流水线):流水线建表sql 2024-03-04 16:54:51 +08:00
OTTO 1bff8e37e1 feat(离线部署脚本开发): 完善离线部署脚本
项目管理-创建制品库相关表
2024-03-04 13:45:21 +08:00
OTTO 725b1dd531 feat(项目管理功能完善): 完善数据权限逻辑
新增SQL:项目管理部分角色数据权限设置为与我相关
2024-02-03 11:19:14 +08:00
OTTO 3db2e4ed84 feat(项目管理功能完善): 组织名称长度调整为255 2024-02-02 14:57:51 +08:00
OTTO 60b7242145 feat(项目管理功能完善): 完善权限相关逻辑
新增SQL:初始化默认角色菜单权限
2024-02-02 11:18:42 +08:00
OTTO 42bd724f3e feat(项目管理功能完善): 完善权限相关逻辑
新增SQL:初始化默认角色菜单权限
2024-02-02 11:15:02 +08:00
OTTO 4e75b7b64e feat(项目管理功能完善): 完善知识库相关逻辑
新增SQL:增加知识库管理权限
2024-02-01 11:50:53 +08:00
OTTO 291aa66824 feat(项目管理功能完善): 完善项目相关逻辑
项目管理菜单增加通知公告管理
2024-01-31 10:24:52 +08:00
OTTO fa4badd365 feat(项目管理功能完善): 完善权限相关逻辑
新增SQL:项目管理权限标识名称调整
2024-01-29 14:24:40 +08:00
OTTO b89bfe9b34 feat(项目管理功能完善): 完善产品相关逻辑
1、产品负责人允许选择多个
2、产品负责人可选用户列表调整为拥有产品编辑权限的用户
2024-01-27 14:22:35 +08:00
OTTO f835ef1ef8 feat(项目管理权限梳理): 基于权限需求整合接口权限标识
整合项目下查看权限
2024-01-27 08:36:18 +08:00
OTTO ebffb42000 feat(项目管理权限梳理): 基于权限需求整合接口权限标识
整合项目下查看权限
2024-01-26 17:17:25 +08:00
OTTO 4f3a74bc1a feat(项目管理功能完善): 完善企业相关逻辑
新增两个默认角色:测试人员及客户
2024-01-26 16:10:14 +08:00
OTTO 1fbb585e74 feat(项目管理功能完善): 完善权限相关逻辑
项目数据权限控制:
新增sql:项目管理新增查看我的项目菜单
2024-01-26 14:31:12 +08:00
OTTO 9ea7ab22a1 feat(项目管理权限梳理): 基于权限需求整合接口权限标识
项目管理相关角色数据权限设置为与我相关
2024-01-25 10:58:13 +08:00
OTTO c9e9cb4eed feat(项目管理权限梳理): 基于权限需求整合接口权限标识
新增sql:新增知识库和制品库菜单权限
2024-01-25 09:46:21 +08:00
OTTO 6edf80b9de feat(项目管理权限梳理): 基于权限需求整合接口权限标识
新增sql:初始化项目管理菜单权限
2024-01-25 08:51:55 +08:00
OTTO 9a00466444 Merge branch 'dev_PMS' of code.gitlink.org.cn:Gitlink/ruoyi-gitlink into dev_PMS_auth_refact
# Conflicts:
#	ruoyi-modules/ruoyi-pms/src/main/java/com/ruoyi/pms/project/controller/PmsProjectController.java
#	ruoyi-modules/ruoyi-pms/src/main/java/com/ruoyi/pms/project/controller/PmsProjectIssuesController.java
#	ruoyi-modules/ruoyi-pms/src/main/java/com/ruoyi/pms/project/controller/PmsProjectTestReportSheetController.java
#	ruoyi-modules/ruoyi-pms/src/main/java/com/ruoyi/pms/project/domain/PmsProject.java
#	ruoyi-modules/ruoyi-pms/src/main/resources/mapper/pms/PmsProjectMapper.xml
2024-01-24 14:31:07 +08:00
OTTO 669c02c03d feat(基础功能增强): 改造数据权限
1、菜单表和角色表增加组织类型字段,用于隔离特色专区和项目管理
2、用户仅能查看到相同组织类型下的角色及菜单
2024-01-23 16:03:12 +08:00
wanjia 28c5307c09 feat(项目管理-项目):项目公告 2024-01-23 13:53:18 +08:00
OTTO 86026a5404 Merge branch 'dev_PMS' of code.gitlink.org.cn:Gitlink/ruoyi-gitlink into dev_PMS_auth_refact
# Conflicts:
#	ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java
#	ruoyi-modules/ruoyi-pms/src/main/java/com/ruoyi/pms/project/service/impl/PmsProjectServiceImpl.java
#	ruoyi-modules/ruoyi-pms/src/main/java/com/ruoyi/pms/project/service/impl/PmsProjectTestReportServiceImpl.java
#	ruoyi-modules/ruoyi-pms/src/main/java/com/ruoyi/pms/project/service/impl/PmsProjectTestsheetCasesServiceImpl.java
#	ruoyi-modules/ruoyi-pms/src/main/java/com/ruoyi/pms/project/service/impl/PmsProjectTestsheetServiceImpl.java
2024-01-22 15:15:20 +08:00
OTTO bb45d18c68 feat(项目管理适配多租户逻辑): 接口地址中携带企业标识
改造项目相关接口:
1. 项目成员增加用户Id字段
2. 项目列表列表查询增加数据权限字段
2024-01-22 09:23:00 +08:00
OTTO 728bc36df2 feat(项目管理适配多租户逻辑): 接口地址中携带企业标识
改造项目相关接口:
1. 项目增加组织Id字段
2. 优化mybatis xml代码格式
2024-01-19 11:24:03 +08:00
wanjia 64a62aad09 fix(项目管理-知识库):sql修复 2024-01-18 11:04:08 +08:00
wanjia 4779f951ed feat(项目管理-知识库文档收藏):知识库文档收藏 2024-01-18 09:02:42 +08:00
OTTO 3c4dfad5e9 feat(项目管理适配多租户逻辑): 接口地址中携带组织标识
删除SQL:标识字段仍放在企业中,根据标识获取组织Id可在企业微服务中查询对应组织Id
2024-01-17 15:04:41 +08:00