Commit Graph

2160 Commits

Author SHA1 Message Date
wangliwen f17e8be5cc Merge branch 'master' into docker_package 2022-08-26 10:48:29 +08:00
Koi-tsk 1336f6d5e4 融合服务修改 2022-08-26 10:37:20 +08:00
yitonglei 2d403dcc9e 修改获从金宏网获取用户信息,但是还是获取不到guid 2022-08-26 09:05:38 +08:00
wangliwen cc4049e777 Merge branch 'master' into docker_package 2022-08-25 17:55:44 +08:00
wangliwen 70c706ba73 同步知识库的优化 2022-08-25 17:55:27 +08:00
wangliwen 04ed31cd91 Merge branch 'master' into docker_package 2022-08-25 15:15:36 +08:00
Koi-tsk 30b5ee12f0 能力申请v3-bug fix 2022-08-25 14:52:20 +08:00
wangliwen 9c01ddfa23 Merge branch 'master' into docker_package 2022-08-25 14:00:35 +08:00
wangliwen f4939b34f4 ... 2022-08-25 14:00:11 +08:00
wangliwen a080184d70 Merge branch 'master' into docker_package 2022-08-25 13:31:51 +08:00
wangliwen a87bb573e9 ... 2022-08-25 13:31:30 +08:00
wangliwen 26f551c61e Merge branch 'master' into docker_package 2022-08-25 10:00:28 +08:00
wangliwen 6a306a8a13 调整跨区判断 2022-08-25 10:00:13 +08:00
wangliwen 2d18bcbe58 Merge branch 'master' into docker_package 2022-08-25 09:00:43 +08:00
wangliwen 12393ec5cc 更新能力申请模型v3 2022-08-25 09:00:21 +08:00
wangliwen cf513627b2 Merge branch 'master' into docker_package 2022-08-24 18:54:37 +08:00
wangliwen 94c012ee44 Merge branch 'dev' 2022-08-24 18:54:11 +08:00
wangliwen 515ad62bd6 接口开启gzip压缩 2022-08-24 18:53:52 +08:00
lizhicheng e1d1d964ab 区、市监听器:修改表单字段获取逻辑 2022-08-24 18:10:21 +08:00
wangliwen 9747d50be0 Merge branch 'master' into docker_package 2022-08-24 17:13:46 +08:00
wangliwen 738208ba2e applyState 字段返回值不一致的问题fix 2022-08-24 17:13:10 +08:00
wangliwen 6da1b5b6b1 npe fix 2022-08-24 16:22:02 +08:00
wangliwen be82f34ad1 Merge branch 'master' into docker_package 2022-08-24 15:57:49 +08:00
huangweixiong 9b2d222ebf 修改日志输出级别 2022-08-24 15:30:56 +08:00
huangweixiong 16c0d2ad69 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform: (32 commits)
  编目更新
  ...
  ...
  能力申请v3 未查到审批人时,使用配置文件预设默认审核人
  ...
  区、市审批流程监听器完善
  能力申请模型更新
  ...
  能力申请v3 新增监听器
  ...
  npe
  java.lang.NumberFormatException
  修改getImgServices的子查询sql语句为兼容mysql5.7
  修改sql
  。。
  增加能力申请V3 模型
  整理代码
  ...
  cim 根据应用领域查询图层服务 和 查询智能算法组件
  1.cim模块统计查询及列表查询 2.编目及字典更新
  ...
2022-08-24 15:01:16 +08:00
huangweixiong 4c7df1cfb4 监控视频失效重试 2022-08-24 15:00:59 +08:00
huangweixiong 55e3b4a44e 网关重启适配 2022-08-24 15:00:40 +08:00
wangliwen 0d63eec758 Merge branch 'master' into docker_package 2022-08-24 13:39:50 +08:00
dinggang 0ac54c1207 编目更新 2022-08-24 10:37:25 +08:00
wangliwen b83db53c6a Merge branch 'master' into docker_package 2022-08-24 09:33:43 +08:00
wangliwen b41e48528d ... 2022-08-24 09:33:27 +08:00
wangliwen 8b182edada Merge branch 'master' into docker_package 2022-08-23 11:50:45 +08:00
wangliwen 2e79af48c1 ... 2022-08-23 11:50:28 +08:00
wangliwen 5aa5ac0e37 Merge branch 'master' into docker_package 2022-08-23 10:32:54 +08:00
wangliwen 6e7f17b48a 能力申请v3 未查到审批人时,使用配置文件预设默认审核人 2022-08-23 10:32:38 +08:00
wangliwen 1bca2163f3 Merge branch 'master' into docker_package 2022-08-22 18:21:29 +08:00
wangliwen 09e2c34e31 ... 2022-08-22 18:21:16 +08:00
wangliwen e77bd6fa11 Merge branch 'master' into docker_package 2022-08-22 18:08:45 +08:00
Koi-tsk c5ab16e7f9 区、市审批流程监听器完善 2022-08-22 17:59:18 +08:00
wangliwen 5ed9fdba9e Merge branch 'master' into docker_package 2022-08-22 16:44:44 +08:00
wangliwen d4c88b8d20 能力申请模型更新 2022-08-22 16:44:30 +08:00
wangliwen 95152006e7 Merge branch 'master' into docker_package 2022-08-22 13:59:55 +08:00
wangliwen e88e596699 ... 2022-08-22 13:59:40 +08:00
wangliwen 2c063fb813 Merge branch 'master' into docker_package 2022-08-22 11:33:29 +08:00
wangliwen 183a64c7ac 能力申请v3 新增监听器 2022-08-22 11:32:47 +08:00
huangweixiong c51e335f9f 网关重启适配 2022-08-22 11:11:02 +08:00
wangliwen 31367f9789 Merge branch 'master' into docker_package 2022-08-22 10:38:12 +08:00
wangliwen 9abb064ece ... 2022-08-22 10:37:58 +08:00
wangliwen 3e18ec9b8e Merge branch 'master' into docker_package 2022-08-22 10:14:36 +08:00
wangliwen 81db400dec npe 2022-08-22 10:14:22 +08:00