FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,435 Commits 1 Branch 0 Tags
bdf1692e62a67fd7410feb592f7c50cebc95cb33
Commit Graph
121 Commits
Author SHA1 Message Date
Superman_Main bdf1692e62 feat: There is no way the 2021-12-08 21:26:20 +08:00
Superman_Main 6cf002a489 Merge branch 'develop_master' into FOTON 
# Conflicts:
#	adc-da-main/src/main/resources/application.properties
 2021-11-27 19:55:06 +08:00
Superman_Main 5c4f8108d7 feat: There is no way the, 2021-11-27 19:50:56 +08:00
Superman_Main ed128e1403 feat: There is no way the 2021-11-20 16:46:00 +08:00
Superman_Main 09ebe8f394 feat: There is no way the 2021-11-20 11:31:26 +08:00
2510220824 6ba96a22ea update:新增拆分图片路径配置 2021-11-19 11:25:57 +08:00
2510220824 da69053af6 Merge remote-tracking branch 'origin/develop_master' into FOTON_RELEASE 
# Conflicts:
#	adc-da-main/src/main/resources/application-dev.properties
 2021-11-19 11:24:00 +08:00
2510220824 9dc1eca724 update:文档拆分图片存储路径入配置文件 2021-11-19 11:19:11 +08:00
2510220824 3b03f7a7ea update:修正线上ocr识别文件存储地址 2021-11-18 17:27:08 +08:00
yuezhihang 2dcb38a066 数据库时间差问题修改 2021-11-10 13:52:36 +08:00
yuezhihang a675e374bc 清单 流程回退 2021-10-27 09:38:56 +08:00
super_liu c604ad2461 feat: There is no way the 2021-10-22 16:04:25 +08:00
2510220824 900bcb9c14 add:福田生产环境配置 2021-10-20 14:36:20 +08:00
super_liu 8317333e96 feat: There is no way the 2021-10-18 10:37:44 +08:00
super_liu 3c3a199a1a feat: There is no way the idm and oa 2021-10-11 17:45:30 +08:00
super_liu 2ec4db856a Merge remote-tracking branch 'origin/develop_master_bak' into dev_wxh_bak 2021-10-09 14:27:14 +08:00
super_liu d7cd16a69c feat: There is no way the 2021-09-30 15:36:39 +08:00
2510220824 8e8bb38d07 add:增加IDM单点登录及修改服务认证 2021-09-28 18:13:27 +08:00
super_liu 2ec116944c feat: There is no way the ocr handle url 2021-09-01 17:01:19 +08:00
super_liu ea473ee500 feat: There is no way the ocr 2021-08-31 18:02:50 +08:00
2510220824 81799abfb1 add:修改ocr回调文件存储 2021-08-25 09:22:45 +08:00
super_liu a242b9ac56 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the Buss and Convert

See merge request !120
 2021-08-20 10:12:39 +00:00
super_liu fe89ba9c60 feat: There is no way the Buss and Convert 2021-08-20 18:12:08 +08:00
super_liu aaa9598735 feat: There is no way the !!! 2021-08-20 15:05:24 +08:00
super_liu 38690f92b6 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-20 12:01:15 +08:00
super_liu 4abeb55cf3 feat: There is no way the scheduled conf 2021-08-20 12:00:56 +08:00
2510220824 b5102e1783 add:更改restTemplate 2021-08-19 16:32:45 +08:00
super_liu 7c7be1065c feat: There is no way the WebMvcConfigurer 2021-08-19 11:35:10 +08:00
yuezhihang 508c292200 配置文件 2021-08-18 15:15:06 +08:00
yuezhihang 39561c91d2 代码部分恢复 2021-08-18 14:38:00 +08:00
2510220824 a45045f61c add:重置mq配置 2021-08-18 09:35:41 +08:00
2510220824 67adf4145a Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-17 16:16:33 +08:00
2510220824 7b28ebb23c add:ocr配置 2021-08-17 16:15:51 +08:00
super_liu 1791877be5 feat: There is no way the 2021-08-17 15:04:17 +08:00
super_liu dbb69c8676 feat: There is no way the 2021-08-17 10:47:27 +08:00
2510220824 17a82cf235 add:恢复es配置 2021-08-16 10:18:15 +08:00
yuezhihang 39c08ecb81 发版配置 2021-08-13 09:15:01 +08:00
yuezhihang 3327223c25 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-08-13 09:06:16 +08:00
super_liu bf800309c4 feat: 新增 convert 转换pdf子项目 MQ 2021-08-12 11:06:42 +08:00
Mr.Z db5ea125fb Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-08-11 23:06:47 +08:00
Mr.Z 1374bc5807 zyh自用 2021-08-11 23:03:40 +08:00
super_liu b7e9cc3061 feat: 新增 convert 转换pdf子项目 2021-08-11 17:40:26 +08:00
yuezhihang 32f7678427 ky 上传文件类型限制！！！ 2021-08-08 10:41:26 +08:00
super_liu 4f6b95a5f2 feat: 发版配置文件 不用替换 2021-08-07 11:48:08 +08:00
super_liu 77bc46b1ba feat:eee 2021-08-06 16:24:42 +08:00
super_liu 0649d3850a feat: 2021-08-06 16:20:31 +08:00
王夏晖 db69ac1f13 Update application.properties 2021-08-05 09:46:55 +00:00
super_liu b3a46bbabc feat: es 2021-08-05 17:18:44 +08:00
yuezhihang 78ec0a08c7 发版配置更新 2021-08-05 09:24:51 +08:00
王夏晖 2344ccfda2 Update application-dev.properties 2021-08-02 05:40:33 +00:00