 otto
|
a57cd99b0e
|
Merge pull request '知识库直接创建的文档需要能下载' (#863) from otto/microservices:dev into dev
|
2025-04-09 14:30:32 +08:00 |
|
OTTO
|
992a07f154
|
feat(项目管理知识库优化): 知识库直接创建的文档需要能下载
Signed-off-by: OTTO <731554297@qq.com>
|
2025-04-09 14:33:26 +08:00 |
|
OTTO
|
94061dc01c
|
Merge branch 'third-party-tool-forward' of code.gitlink.org.cn:Gitlink/microservices
|
2025-04-07 14:37:52 +08:00 |
|
otto
|
de54dfff7a
|
Merge pull request '项目管理分支合并主干分支' (#862) from otto/microservices:master into master
|
2025-04-07 14:30:19 +08:00 |
|
OTTO
|
09d4401583
|
Merge branch 'product_refact' of code.gitlink.org.cn:Gitlink/microservices into product_refact_merge_master
# Conflicts:
# microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/common/controller/OpenController.java
# microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/specialArea/service/SoftwareFactStatisticsServiceImpl.java
|
2025-04-07 10:14:54 +08:00 |
|
OTTO
|
ec3db48214
|
feat(项目管理总览接口开发): 合并主干分支
Signed-off-by: OTTO <731554297@qq.com>
|
2025-04-07 10:11:15 +08:00 |
|
OTTO
|
75c8d48860
|
Merge branch 'master' of code.gitlink.org.cn:Gitlink/microservices into product_refact
# Conflicts:
# microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/common/controller/OpenController.java
# microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/specialArea/constant/Constant.java
# microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/specialArea/domain/ZonePmsProject.java
# microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/specialArea/domain/vo/ProjectSituationVO.java
# microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/specialArea/mapper/SoftwareFactStatisForgeMapper.java
# microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/specialArea/mapper/SoftwareFactStatisPmsMapper.java
# microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/specialArea/service/SoftwareFactStatisticsServiceImpl.java
# microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/SoftwareFactStatisForgeMapper.xml
# microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/SoftwareFactStatisPmsMapper.xml
|
2025-04-07 09:41:19 +08:00 |
 wanjia9506
|
97a016361d
|
Merge pull request '添加公开上传接口' (#859) from wanjia9506/microservices:kanban_refact into product_refact
|
2025-03-26 11:27:41 +08:00 |
|
wanjia
|
b2d98dabc9
|
fix(产品):添加公开上传接口
|
2025-03-26 11:29:58 +08:00 |
|
wanjia
|
99d58df966
|
fix(产品):添加原始需求公开接口
|
2025-03-26 10:32:13 +08:00 |
|
wanjia9506
|
83fd822d0e
|
Merge pull request '添加原始需求公开接口' (#857) from wanjia9506/microservices:kanban_refact into product_refact
|
2025-03-26 10:28:34 +08:00 |
|
wanjia
|
759922b3db
|
fix(产品):添加用户需求公开接口
|
2025-03-26 10:14:25 +08:00 |
|
wanjia9506
|
7e37ef0a36
|
Merge pull request '添加原始需求公开接口' (#856) from wanjia9506/microservices:kanban_refact into product_refact
|
2025-03-26 10:11:08 +08:00 |
 xxq250
|
e40d9bf5c0
|
Merge remote-tracking branch 'origin/product_refact' into product_refact
|
2025-03-26 09:43:15 +08:00 |
|
xxq250
|
e791a3f02a
|
fixed 流水线分组查询时repo_name变更
|
2025-03-26 09:43:07 +08:00 |
|
wanjia
|
ceca31cb5c
|
fix(产品):添加用户需求公开接口
|
2025-03-26 09:36:45 +08:00 |
|
wanjia9506
|
105ce14327
|
Merge pull request '添加用户需求公开接口' (#855) from wanjia9506/microservices:kanban_refact into product_refact
|
2025-03-26 09:34:10 +08:00 |
|
wanjia
|
6a46e8dfdf
|
fix(组织工作台):看板里程碑按开始时间排序
|
2025-03-26 09:22:46 +08:00 |
|
wanjia
|
e1f73ed177
|
fix(产品):添加用户需求公开接口
|
2025-03-26 09:22:04 +08:00 |
|
wanjia9506
|
1eacfa7e9e
|
Merge pull request '看板里程碑按开始时间排序+添加用户需求公开接口' (#854) from wanjia9506/microservices:kanban_refact into product_refact
|
2025-03-26 09:20:26 +08:00 |
|
xxq250
|
67318f6d0f
|
fixed 流水线分组查询时repo_name变更
|
2025-03-26 09:08:03 +08:00 |
|
wanjia
|
f460559674
|
Merge remote-tracking branch 'main/product_refact' into kanban_refact
|
2025-03-26 08:36:25 +08:00 |
|
wanjia9506
|
5c67195157
|
Merge pull request 'fix(软件工厂): 最多缺陷个人改为最多缺陷解决个人；测试用例执行数统计错误' (#853) from xjy_software_fact_statis into master
|
2025-03-25 11:23:36 +08:00 |
|
wanjia9506
|
24b98366ab
|
Merge pull request 'fix(软件工厂): 最多缺陷个人改为最多缺陷解决个人；测试用例执行数统计错误' (#852) from liuhuazhong/microservices:xjy_software_fact_statis into xjy_software_fact_statis
|
2025-03-25 10:23:48 +08:00 |
liuhuazhong
|
c0a5ff23fe
|
fix(软件工厂): 最多缺陷个人改为最多缺陷解决个人；测试用例执行数统计错误
|
2025-03-25 10:16:49 +08:00 |
|
OTTO
|
8da6005d9f
|
feat(项目管理总览接口开发): 增加项目成员数量属性返回
Signed-off-by: OTTO <731554297@qq.com>
|
2025-03-21 14:29:59 +08:00 |
|
otto
|
b5b228a3da
|
Merge pull request '增加项目成员数量属性返回' (#851) from otto/microservices:product_refact into product_refact
|
2025-03-21 14:26:53 +08:00 |
|
OTTO
|
40b6256204
|
feat(项目管理总览接口开发): 完成项目管理总览接口开发
Signed-off-by: OTTO <731554297@qq.com>
|
2025-03-21 11:20:09 +08:00 |
|
otto
|
08096df571
|
Merge pull request 'feat(项目管理适配线上环境): 打印请求Forge响应异常日志' (#849) from otto/microservices:master into master
|
2025-03-20 14:12:58 +08:00 |
|
OTTO
|
f0e01ecaf6
|
feat(项目管理适配线上环境): 打印请求Forge响应异常日志
Signed-off-by: OTTO <731554297@qq.com>
|
2025-03-20 14:10:32 +08:00 |
|
otto
|
cf9c1b5ade
|
Merge pull request '项目管理产品需求改版' (#848) from otto/microservices:master into master
|
2025-03-20 09:41:54 +08:00 |
|
OTTO
|
03a11ab7df
|
Merge branch 'product_refact' of code.gitlink.org.cn:Gitlink/microservices into product_refact_deliver
|
2025-03-20 09:35:19 +08:00 |
|
OTTO
|
123d967254
|
feat(项目管理适配线上环境): 修复变更时无法删除附件的问题
Signed-off-by: OTTO <731554297@qq.com>
|
2025-03-19 11:11:19 +08:00 |
|
OTTO
|
729cdb8017
|
feat(项目管理适配线上环境): 修复基于产品需求创建项目计划报错的问题
Signed-off-by: OTTO <731554297@qq.com>
|
2025-03-19 10:47:28 +08:00 |
|
OTTO
|
689229801c
|
feat(项目管理适配线上环境): 合并主干分支代码
Signed-off-by: OTTO <731554297@qq.com>
|
2025-03-18 17:07:55 +08:00 |
|
OTTO
|
1498f93a06
|
Merge branch 'master' of code.gitlink.org.cn:Gitlink/microservices into product_refact_deliver
|
2025-03-18 17:07:40 +08:00 |
|
OTTO
|
904a1b551c
|
Merge branch 'master' of code.gitlink.org.cn:otto/microservices into product_refact_deliver
# Conflicts:
# microservices-common/microservices-common-core/src/main/java/com/microservices/common/core/constant/CacheConstants.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/service/IPmsCiPipelinesService.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/utils/PmsGitLinkRequestUrl.java
|
2025-03-18 17:03:23 +08:00 |
|
OTTO
|
06bf1c2910
|
feat(项目管理适配线上环境): 项目计划逻辑调整
1. 若项目未关联产品允许新增项目计划
2. 若项目未关联产品允许编辑项目计划
Signed-off-by: OTTO <731554297@qq.com>
|
2025-03-18 14:12:50 +08:00 |
|
OTTO
|
509de16d62
|
feat(项目管理适配线上环境): 项目若已关联产品不允许取消或修改关联
Signed-off-by: OTTO <731554297@qq.com>
|
2025-03-18 10:20:26 +08:00 |
|
otto
|
17c3882691
|
Merge pull request '软件工厂统计、专区数据统计能力上线' (#843) from xjy_software_fact_statis into master
|
2025-03-14 14:17:18 +08:00 |
|
otto
|
5ae14817fd
|
Merge pull request '软件工程统计接口，移至OpenController' (#842) from liuhuazhong/microservices:xjy_software_fact_statis into xjy_software_fact_statis
|
2025-03-14 09:32:04 +08:00 |
|
liuhuazhong
|
99c029c593
|
软件工程统计接口，移至OpenController
|
2025-03-14 09:22:17 +08:00 |
|
otto
|
e51799addd
|
Merge pull request '专区数据统计能力上线' (#841) from liuhuazhong/microservices:xjy_software_fact_statis into xjy_software_fact_statis
|
2025-03-13 15:03:26 +08:00 |
|
liuhuazhong
|
b8fbf94be6
|
feat(专区数据统计能力上线): 近一周的文章新增发布数、近一周PV数（总访问量）、近一周UV数（点击去重）
|
2025-03-13 14:28:20 +08:00 |
|
otto
|
a86763af9d
|
Merge pull request '软件工厂统计' (#840) from liuhuazhong/microservices:xjy_software_fact_statis into xjy_software_fact_statis
|
2025-03-11 15:50:47 +08:00 |
|
liuhuazhong
|
7a4abfa7e9
|
feat(软件工厂统计): 今日工作态势、周月工作态势、项目研发状态
|
2025-03-11 15:13:29 +08:00 |
|
otto
|
82722dec2c
|
Merge pull request 'Sentinel登录状态默认30分钟失效，将Sentinel Token缓存过期时间调整为28分钟' (#839) from otto/microservices:master into master
|
2025-03-07 17:05:26 +08:00 |
|
OTTO
|
e40d58ae9d
|
feat(微服务治理工具): 优化Sentinel免登录逻辑
Sentinel登录状态默认30分钟失效，将Sentinel Token缓存过期时间调整为28分钟
Signed-off-by: OTTO <731554297@qq.com>
|
2025-03-07 15:33:22 +08:00 |
|
OTTO
|
4c8be09a72
|
feat(微服务治理工具): 优化portainer转发逻辑
修复拦截portainer中URL中携带endpoints的请求时，未考虑endpoints在末尾的情况
Signed-off-by: OTTO <731554297@qq.com>
|
2025-03-07 14:00:16 +08:00 |
|
otto
|
686df768bf
|
Merge pull request '修复拦截portainer中URL中携带endpoints的请求时，未考虑endpoints在末尾的情况' (#838) from otto/microservices:master into master
|
2025-03-07 13:57:05 +08:00 |