FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,461 Commits 1 Branch 0 Tags
d60bc2c9daf81f154e6b677c9ffc0eaed160ea39
Commit Graph
73 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
zyd 2883eb1418 Merge branch 'develop_master' into FOTON 2022-10-26 22:47:10 +08:00
zhangyanduan fa99114ce1 fix: 修复BUG 2022-10-26 16:54:05 +08:00
zyd b9afd7ff0c Merge branch 'develop_master' into FOTON 2022-10-24 22:32:24 +08:00
zyd 5a01009cf8 Merge branch 'develop_master' of http://gitlab.91isoft.com:90/LiuChao/foton-slrs-system-rest into develop_master 2022-10-24 22:31:08 +08:00
zyd 991c299c10 fix: 修复BUG 2022-10-24 16:10:01 +08:00
zyd 8c01b11d18 fix:修复再处理被代替标准号数据补全时，数据补充错误导致无法更新状态的BUG 2022-10-24 11:04:46 +08:00
zhangyanduan 5f1b490954 fix:增加日志输出以及输出的内容 2022-10-21 10:20:06 +08:00
zhangyanduan 979f1631fc Merge branch 'develop_master' of http://gitlab.91isoft.com:90/LiuChao/foton-slrs-system-rest into develop_master 2022-10-21 09:47:15 +08:00
zhangyanduan 9542200d13 fix: 新增手动启动定时任务接口 2022-10-21 09:47:06 +08:00
zhangyanduan 14c3354739 Merge branch 'develop_master' into FOTON 2022-10-20 17:26:24 +08:00
zyd 768c64e209 Merge branch 'develop_master' into FOTON 2022-10-19 22:14:32 +08:00
zhangyanduan 730a3e153f Merge branch 'develop_master' of http://gitlab.91isoft.com:90/LiuChao/foton-slrs-system-rest into develop_master 2022-10-13 18:09:32 +08:00
zhangyanduan 12635bbdc4 fix: 修复文件检查错误的BUG 2022-10-13 18:09:17 +08:00
zhangyanduan 91e26a51c5 fix: 修复代码错误 2022-10-13 11:06:15 +08:00
zyd 452ed1920b add:解决加密文件问题 2022-10-13 00:53:48 +08:00
zyd 65b66cc38c fix: 修复BUG 2022-10-12 23:52:39 +08:00
zyd d67bfea609 Merge branch 'develop_master' into FOTON 2022-10-12 23:44:28 +08:00
zyd d6771eabe1 fix: 修复BUG 2022-10-12 23:43:55 +08:00
zyd f96370df40 Merge branch 'develop_master' into FOTON 2022-10-12 23:10:47 +08:00
zyd 3c89f8bdbd add: 更新swagger接口配置参数 2022-10-12 23:10:35 +08:00
zyd 522e1e1416 Merge branch 'develop_master' into FOTON 
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java
 2022-10-12 23:00:26 +08:00
zyd c266ddc4a1 add:检查文件是否为加密文件的判断代码逻辑 2022-10-12 22:58:48 +08:00
zyd 5e4ca83210 Merge branch 'develop_master' into FOTON 2022-10-11 22:51:55 +08:00
zyd 9793e7bb65 Merge branch 'develop_master' into FOTON 2022-10-10 21:47:01 +08:00
zhangyanduan bd93dc1d44 fix:提交未同步到生产环境得表结构 2022-10-10 17:15:53 +08:00
zhangyanduan 585b7d6b75 fix:修复企标体系数据挂靠目录关系逻辑优化 2022-10-10 16:37:21 +08:00
zyd af42065586 Merge branch 'develop_master' into FOTON 2022-10-09 23:06:55 +08:00
zhangyanduan 36c94e2aaf fix: 修复导入模板时按照上传解密后的文件进行解析 2022-10-08 13:54:05 +08:00
zyd 6702be7464 Merge branch 'develop_master' into FOTON 2022-10-01 19:08:24 +08:00
zyd 8a77f17b43 update:自启动定时任务增加参数主机管控 2022-10-01 19:08:12 +08:00
zyd 72e59f25a7 Merge branch 'develop_master' into FOTON 2022-10-01 18:21:41 +08:00
zyd 8ff7b4b8ac fix: 错误日志全部输出到日志文件中 2022-09-30 02:08:40 +08:00
zhangyanduan 83cbe979bb Merge branch 'develop_master' of http://gitlab.91isoft.com:90/LiuChao/foton-slrs-system-rest into develop_master 2022-09-29 17:14:05 +08:00
zhangyanduan 822437e364 fix: 修复搜索中心颜色显示 2022-09-29 17:13:53 +08:00
zhangyanduan 42c8e7e100 fix: 优化代码中的废弃逻辑以及名称标记 2022-09-29 09:17:06 +08:00
zyd e6ab230f88 fix:修复国内标准中GB和非GB类在自动变更状态时查询逻辑错误的BUG 2022-09-28 22:35:37 +08:00
zyd 45e2d9766f Merge branch 'develop_master' into FOTON 2022-09-22 00:44:57 +08:00
zyd 1de8e48996 fix: 更新带水印下载代码逻辑 2022-09-22 00:44:10 +08:00
zyd 89f6240481 fix:优化机构查询用户速度慢的问题 2022-09-21 22:59:52 +08:00
zhangyanduan 2cf172938d Merge branch 'develop_master' into FOTON 2022-09-21 17:09:46 +08:00
zhangyanduan ca3f48c207 add: 增加过滤忽略白名单 syncModelDto 2022-09-21 17:08:43 +08:00
zhangyanduan 1d83907924 add: 添加模块单元数据接收推送接口 2022-09-21 17:06:26 +08:00
zyd 0f3e60feb8 fix: 修复关联表查询速度慢的问题 2022-09-21 00:26:09 +08:00
zyd 386bcac55c Merge branch 'develop_master' into FOTON 2022-09-19 07:40:12 +08:00
zyd f47962e26c fix: 修复权限查询逻辑，并且提交最新的权限表数据字段内容 2022-09-16 00:20:44 +08:00
DESKTOP-JNBCTEI\Edison ea3dcbc04e Merge branch 'develop_master' into FOTON 2022-09-08 22:09:03 +08:00
zhangyanduan 3f616818b8 fix: 优化对比数据的对比差异内容的显示效果 2022-09-05 16:28:49 +08:00
zhangyanduan 101fb1a063 fix: 修复项目清单更新流程中企标状态没有显示的BUG 2022-09-01 14:13:49 +08:00
zhangyanduan 0276ca92aa Merge branch 'develop_master' into FOTON 2022-08-25 18:58:06 +08:00
zhangyanduan 84c941612b fix: 修改文件名时，文件中包含.的时候导致文件名不对的BUG 2022-08-25 16:07:39 +08:00
zhangyanduan bc11581770 fix: 福田AWC系统对接接口中VPPS编码只识别到第三级 2022-08-18 13:40:58 +08:00
zhangyanduan 1080014451 fix: 修复企标编辑后没有做任何修改的情况下，实施日期和发布日期显示log日志有变更 2022-07-29 13:41:59 +08:00
zhangyanduan cbab7bbb89 fix: 修复组织机构及用户数据在同步时接口报错导致用户数据无法正常处理，直接将数据库中的数据全部删除的BUG 2022-07-28 11:56:23 +08:00
zhangyanduan cc39b4f1fb fix: 修复数据描述文字问题 2022-07-26 17:35:01 +08:00
zhangyanduan f3544694e2 Merge branch 'develop_master' of http://gitlab.91isoft.com:90/LiuChao/foton-slrs-system-rest into develop_master 2022-07-13 14:44:53 +08:00
zhangyanduan e42fbce67e fix: 修复线上BUG 2022-07-13 14:44:43 +08:00
zhangyanduan 788483b2ba fix: AWC查询接口中优化返回的文件类型内容 2022-07-06 18:04:53 +08:00
zhangyanduan 2b9a977204 fix:优化文档转换组件的消息队列 2022-07-06 09:23:47 +08:00
zhangyanduan 902e595ad0 fix: AWC系统对接去掉VPPSName对接查询 2022-06-29 11:50:30 +08:00
zhangyanduan 06dcff99af Merge branch 'develop_master' of http://gitlab.91isoft.com:90/LiuChao/foton-slrs-system-rest into develop_master 2022-06-27 14:57:22 +08:00
zhangyanduan 7584a3cc51 fix: 修复当登录的TOKEN认证失败后，抛出的异常中无法被识别到导致前端无法捕获此类异常数据导致无法正确返回页面 2022-06-27 14:57:07 +08:00
zhangyanduan 611db02e6e Merge branch 'develop_master' of http://gitlab.91isoft.com:90/LiuChao/foton-slrs-system-rest into develop_master 2022-06-23 15:27:01 +08:00
zhangyanduan e3a5fa808f fix: 修复定时预警代码BUG 2022-06-23 15:26:51 +08:00
zhangyanduan 29f6374474 fix: 改造标准预警模块定时执行的逻辑 2022-06-23 14:27:53 +08:00
zhangyanduan 652b3fc499 fix: 临时切换到测试环境地址，后续注意需要将地址切换回来 2022-06-14 18:22:14 +08:00
zhangyanduan 4029ea18e2 fix: 修复体系数据新增时，父级ID集合中缺少前后逗号导致查询不出来的BUG 2022-06-08 17:56:00 +08:00
zhangyanduan d7da01a447 fix: 修复BUG 2022-06-02 14:53:11 +08:00
zhangyanduan 692907904d mybatisPlus 增加乐观锁机制 2022-06-02 14:10:01 +08:00
zhangyanduan 577c6c5a82 fix: 基础数据更新增加事务控制 2022-06-02 14:08:09 +08:00
zhangyanduan 9687fbcd19 fix; 补充数据 2022-05-26 19:12:51 +08:00
zhangyanduan 5da14f0d54 fix： 提交新老系统绑定关系 2022-05-12 18:38:49 +08:00
zhangyanduan d624be9903 Merge branch 'develop_master' of http://gitlab.91isoft.com:90/LiuChao/foton-slrs-system-rest into develop_master 2022-04-18 18:17:12 +08:00
zhangyanduan be1b67fe72 add: 添加根据文件ID将文件转换为PDF文件接口，用于其他处理文件转换逻辑 2022-04-18 18:17:03 +08:00