zhangzhikang
|
28f4558fa6
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-08-31 18:27:44 +08:00 |
|
zhangzhikang
|
9c7470a123
|
0831会议室禅道问题修改
|
2022-08-31 18:27:31 +08:00 |
|
wangliwen
|
658f773dfe
|
Merge branch 'master' into docker_package
|
2022-08-31 16:54:38 +08:00 |
|
wangliwen
|
e251ae518f
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-08-31 16:54:09 +08:00 |
|
wangliwen
|
be6968c78f
|
发送消息到亚微
|
2022-08-31 16:53:43 +08:00 |
 yitonglei
|
82ca10d9eb
|
no message
|
2022-08-31 16:19:43 +08:00 |
|
wangliwen
|
ed29d6e0fb
|
Merge branch 'master' into docker_package
|
2022-08-31 16:11:37 +08:00 |
|
yitonglei
|
cdca90474d
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-08-31 15:48:50 +08:00 |
|
yitonglei
|
aa9f756f2c
|
添加注释，并删掉无用的注释
|
2022-08-31 15:48:15 +08:00 |
|
wangliwen
|
a2f3c79cee
|
Merge branch 'master' into docker_package
|
2022-08-31 15:39:07 +08:00 |
|
Koi-tsk
|
c62cfc25a6
|
自动审批通过的节点不发消息
|
2022-08-31 15:31:01 +08:00 |
|
wangliwen
|
9f78638ab7
|
Merge branch 'master' into docker_package
|
2022-08-31 15:19:57 +08:00 |
|
yitonglei
|
d452ddb4fb
|
修改从金宏网获取用户的方法，增加自动任务调度功能
|
2022-08-31 13:50:46 +08:00 |
|
wangliwen
|
a7489a8033
|
Merge branch 'master' into docker_package
|
2022-08-31 09:48:08 +08:00 |
|
wangliwen
|
ce1bce47c5
|
...
|
2022-08-31 09:47:46 +08:00 |
|
wangliwen
|
b015025c40
|
Merge branch 'master' into docker_package
|
2022-08-30 15:21:12 +08:00 |
|
wangliwen
|
c7adca34bd
|
使用索引替换
|
2022-08-30 15:20:35 +08:00 |
|
wangliwen
|
c002b0c0c5
|
Merge branch 'master' into docker_package
|
2022-08-30 13:30:47 +08:00 |
|
wangliwen
|
f95d2d0157
|
...
|
2022-08-30 13:30:28 +08:00 |
|
wangliwen
|
ae906d2331
|
Merge branch 'master' into docker_package
|
2022-08-30 13:03:51 +08:00 |
|
wangliwen
|
35f004a75d
|
...
|
2022-08-30 13:03:34 +08:00 |
|
wangliwen
|
0701c6fa67
|
Merge branch 'master' into docker_package
|
2022-08-30 12:55:16 +08:00 |
|
wangliwen
|
b3074d25ad
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-30 12:54:56 +08:00 |
|
wangliwen
|
77099bd434
|
是否申请的状态
|
2022-08-30 12:54:42 +08:00 |
|
Koi-tsk
|
795d890cd6
|
1.停用用户不分配审批
2.连续重复只审批一次
|
2022-08-30 11:50:40 +08:00 |
|
wangliwen
|
7f08cb7922
|
Merge branch 'master' into docker_package
|
2022-08-30 11:30:43 +08:00 |
|
wangliwen
|
fb95b0cfa7
|
...
|
2022-08-30 11:30:24 +08:00 |
|
wangliwen
|
f45492ee70
|
Merge branch 'master' into docker_package
|
2022-08-30 10:41:24 +08:00 |
|
wangliwen
|
d8e44a1f49
|
...
|
2022-08-30 10:41:01 +08:00 |
|
wangliwen
|
5f4118997f
|
Merge branch 'master' into docker_package
|
2022-08-30 10:08:49 +08:00 |
|
wangliwen
|
b835ce3f73
|
知识库左边树数据异常
|
2022-08-30 10:08:30 +08:00 |
|
wangliwen
|
afabcc911b
|
Merge branch 'master' into docker_package
|
2022-08-29 11:36:04 +08:00 |
|
Koi-tsk
|
13934c1da9
|
融合服务-数据资源bug修复
|
2022-08-29 10:08:10 +08:00 |
|
wangliwen
|
1a538c24c3
|
Merge remote-tracking branch 'origin/dev' into docker_package
|
2022-08-26 18:35:32 +08:00 |
|
yitonglei
|
0f20088c46
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-08-26 18:29:47 +08:00 |
|
yitonglei
|
664a22ce4b
|
no message
|
2022-08-26 18:28:08 +08:00 |
|
Koi-tsk
|
c2a949ad13
|
融合服务-数据资源暂时注释
|
2022-08-26 18:16:34 +08:00 |
|
yitonglei
|
246bc4b4df
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-08-26 17:59:37 +08:00 |
|
yitonglei
|
0bfef296ab
|
从金宏获取用户增加更新能力
|
2022-08-26 17:59:02 +08:00 |
 huangweixiong
|
73b02e3ce6
|
视频token失效重试
|
2022-08-26 17:56:13 +08:00 |
|
wangliwen
|
a53c7b615f
|
Merge branch 'master' into docker_package
|
2022-08-26 17:53:18 +08:00 |
|
huangweixiong
|
12861d1c24
|
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:
v3审批：当前审批与申请人一样，默认通过
融合服务修改
删除不需要的注释
。。。
|
2022-08-26 17:39:32 +08:00 |
|
huangweixiong
|
1e321145ac
|
视频流token失效重试
|
2022-08-26 17:39:19 +08:00 |
|
wangliwen
|
85a65c9167
|
Merge branch 'master' into docker_package
|
2022-08-26 16:33:16 +08:00 |
|
Koi-tsk
|
fdc9019a4b
|
v3审批：当前审批与申请人一样，默认通过
|
2022-08-26 16:26:18 +08:00 |
|
Koi-tsk
|
ffe1b86a28
|
融合服务修改
|
2022-08-26 14:47:55 +08:00 |
|
wangliwen
|
d38ed565a5
|
Merge branch 'master' into docker_package
|
2022-08-26 14:12:44 +08:00 |
|
wangliwen
|
2590638c22
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-08-26 14:12:23 +08:00 |
|
wangliwen
|
8ce17a5601
|
。。。
|
2022-08-26 14:12:13 +08:00 |
|
huangweixiong
|
951923b551
|
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:
同步知识库问题
。。。
user表新增字段
融合服务修改
修改获从金宏网获取用户信息，但是还是获取不到guid
同步知识库的优化
能力申请v3-bug fix
...
...
调整跨区判断
更新能力申请模型v3
接口开启gzip压缩
区、市监听器:修改表单字段获取逻辑
applyState 字段返回值不一致的问题fix
npe fix
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/sys/entity/SysUserEntity.java
|
2022-08-26 13:47:12 +08:00 |
|
huangweixiong
|
bf8a701e57
|
金宏待办推送对接
|
2022-08-26 13:44:04 +08:00 |
|
wangliwen
|
32eb5b2c8c
|
Merge branch 'master' into docker_package
|
2022-08-26 13:42:55 +08:00 |
|
wangliwen
|
841cb32035
|
同步知识库问题
|
2022-08-26 11:36:42 +08:00 |
|
wangliwen
|
5727a36b3f
|
。。。
|
2022-08-26 11:27:37 +08:00 |
|
wangliwen
|
5c3649f8bd
|
Merge branch 'master' into docker_package
|
2022-08-26 11:05:48 +08:00 |
|
yitonglei
|
1f6438086c
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-08-26 11:03:23 +08:00 |
|
yitonglei
|
e7ce6d3a1c
|
user表新增字段
|
2022-08-26 11:02:03 +08:00 |
|
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 |