 huangweixiong
|
3555b6ca05
|
Merge branch 'master' of http://221.0.232.152:9393/ability-center/share-platform
* 'master' of http://221.0.232.152:9393/ability-center/share-platform:
需求评论通知
...
跨域 屮·
大数据部门负责人的通知
通知重放的事件类型区分处理
文案调整
...
|
2022-06-02 15:47:17 +08:00 |
wangliwen
|
2a21a57ede
|
需求评论通知
|
2022-06-02 15:39:18 +08:00 |
|
huangweixiong
|
d6f61c9fcc
|
【单点登录】临时处理跨域名情况下没有session问题
|
2022-06-02 15:07:36 +08:00 |
|
huangweixiong
|
e7b1b1cfd6
|
【单点登录】不清楚之前怎么处理跨域，先自己加上跨域
|
2022-06-02 15:05:45 +08:00 |
|
wangliwen
|
91b6e7ff8f
|
...
|
2022-06-02 14:15:14 +08:00 |
|
wangliwen
|
641e6ea2d8
|
跨域 屮·
|
2022-06-02 13:53:40 +08:00 |
|
wangliwen
|
5a41ac20c7
|
大数据部门负责人的通知
|
2022-06-02 11:17:40 +08:00 |
|
wangliwen
|
331cfbe3fc
|
通知重放的事件类型区分处理
|
2022-06-02 11:03:14 +08:00 |
|
wangliwen
|
823008f348
|
文案调整
|
2022-06-02 10:42:20 +08:00 |
|
wangliwen
|
1431dbbb47
|
Merge branch 'master' into wangliwen
# Conflicts:
# lib/yawei-pso-2.0.2.jar
# renren-admin/src/main/java/io/renren/AdminApplication.java
# renren-admin/src/main/java/io/renren/modules/security/oauth2/Oauth2Filter.java
|
2022-06-01 19:16:09 +08:00 |
|
wangliwen
|
3734453796
|
...
|
2022-06-01 19:12:31 +08:00 |
|
wangliwen
|
7d69521fa4
|
屮
|
2022-06-01 18:26:21 +08:00 |
|
wangliwen
|
7f8a4f9d43
|
javaCV排除无用依赖
|
2022-06-01 18:19:08 +08:00 |
|
wangliwen
|
83bfde121d
|
根配置文件不要随便改！！！！
|
2022-06-01 17:41:58 +08:00 |
|
wangliwen
|
7924c095ce
|
Merge branch 'wangliwen'
|
2022-06-01 17:13:38 +08:00 |
|
wangliwen
|
a88d8abe1c
|
Merge remote-tracking branch 'origin/monitor'
|
2022-06-01 17:13:30 +08:00 |
|
huangweixiong
|
01f6af921a
|
Merge branch 'master' of http://221.0.232.152:9393/ability-center/share-platform
* 'master' of http://221.0.232.152:9393/ability-center/share-platform:
节点流转通知与文案调整
|
2022-06-01 16:54:54 +08:00 |
|
huangweixiong
|
a69cc1d6e5
|
【视频监控，创城合并】迁移pom依赖包
|
2022-06-01 16:52:51 +08:00 |
|
wangliwen
|
20f3f1077d
|
...
|
2022-06-01 16:30:15 +08:00 |
|
wangliwen
|
5ded243ea9
|
Merge branch 'wangliwen'
|
2022-06-01 16:14:20 +08:00 |
|
wangliwen
|
bf824e6643
|
节点流转通知与文案调整
|
2022-06-01 16:13:44 +08:00 |
|
huangweixiong
|
41eb043a06
|
Merge branch 'master' of http://221.0.232.152:9393/ability-center/share-platform
* 'master' of http://221.0.232.152:9393/ability-center/share-platform: (46 commits)
npe
...
消息通知注解加入执行监听器支持
出通知内容
我的站内信根据阅读状态过滤
开启定时任务，每隔一分钟更新任务列表
站内信消息通知优化
解决调用大数据接口请求返回异常
审核人也接受消息通知
线程安全
重放处理的优化
屮
出现重放 加以解决
消息发送者 显示异常
...
消息通知发起人
调整注解位置
...
审批节点分配审批人时事件注解
告警信息查询信息按时间倒序展示
...
|
2022-06-01 15:53:08 +08:00 |
|
huangweixiong
|
676710f382
|
Merge branch 'monitor'
* monitor:
【视频监控，创城合并】配置文件修改
整合monitor到renren框架
# Conflicts:
# renren-admin/pom.xml
# renren-admin/src/main/java/io/renren/common/config/RestTemplateConfig.java
|
2022-06-01 15:52:45 +08:00 |
|
huangweixiong
|
743b4883ce
|
【单点登录】找不到用户处理
|
2022-06-01 15:20:27 +08:00 |
|
wangliwen
|
b05a371a0a
|
npe
|
2022-06-01 14:00:25 +08:00 |
|
wangliwen
|
73e824fe7d
|
...
|
2022-06-01 11:53:33 +08:00 |
|
wangliwen
|
22391d1fc6
|
消息通知注解加入执行监听器支持
|
2022-06-01 11:38:47 +08:00 |
|
wangliwen
|
71bfdf5faa
|
出通知内容
|
2022-06-01 11:19:53 +08:00 |
|
wangliwen
|
fb6dd0cc35
|
Merge remote-tracking branch 'origin/zhangjunhe'
|
2022-06-01 10:58:59 +08:00 |
|
wangliwen
|
d3acb25a6c
|
我的站内信根据阅读状态过滤
|
2022-06-01 10:56:45 +08:00 |
|
JunheZhang
|
c0b0138ddb
|
开启定时任务，每隔一分钟更新任务列表
|
2022-06-01 10:55:36 +08:00 |
|
huangweixiong
|
d503bba7dd
|
【视频监控，创城合并】配置文件修改
|
2022-06-01 09:53:17 +08:00 |
|
wuweida
|
8647759032
|
添加注释
|
2022-05-31 14:59:52 +08:00 |
|
huangweixiong
|
fead8c3958
|
【监控视频同步】同步自己的监控摄像头
|
2022-05-31 11:33:07 +08:00 |
|
huangweixiong
|
6be1ab699e
|
【单点登录】兼容自己的登录逻辑
|
2022-05-31 11:32:16 +08:00 |
|
wuweida
|
ebd57157c8
|
整合monitor到renren框架
|
2022-05-31 11:11:13 +08:00 |
|
wangliwen
|
425f6d30a6
|
站内信消息通知优化
|
2022-05-31 10:20:20 +08:00 |
 dinggang
|
12dcb9910d
|
解决调用大数据接口请求返回异常
|
2022-05-30 18:59:33 +08:00 |
|
wangliwen
|
10b9bf8906
|
审核人也接受消息通知
|
2022-05-30 18:12:34 +08:00 |
|
wangliwen
|
c4e2427668
|
线程安全
|
2022-05-30 18:04:37 +08:00 |
|
wangliwen
|
b2ab1d5a9e
|
重放处理的优化
|
2022-05-30 15:47:00 +08:00 |
|
wangliwen
|
632ed9a6e3
|
屮
|
2022-05-30 15:26:57 +08:00 |
|
wangliwen
|
abacd77904
|
出现重放 加以解决
|
2022-05-30 15:16:49 +08:00 |
|
wangliwen
|
80a0dbb73b
|
消息发送者 显示异常
|
2022-05-30 14:44:25 +08:00 |
|
wangliwen
|
aa27a8ad5a
|
...
|
2022-05-30 14:22:40 +08:00 |
|
wangliwen
|
b5498b1a80
|
消息通知发起人
|
2022-05-30 14:05:07 +08:00 |
|
wangliwen
|
d714038dfb
|
调整注解位置
|
2022-05-30 11:32:01 +08:00 |
|
wangliwen
|
ca3c963981
|
...
|
2022-05-30 11:15:40 +08:00 |
|
wangliwen
|
4e0e39da8d
|
审批节点分配审批人时事件注解
|
2022-05-30 11:11:02 +08:00 |
|
JunheZhang
|
9eeab30dcf
|
告警信息查询信息按时间倒序展示
|
2022-05-27 14:08:43 +08:00 |
|
wangliwen
|
03db648aee
|
...
|
2022-05-27 14:01:24 +08:00 |
|
wangliwen
|
61db8a5f7d
|
...
|
2022-05-27 11:11:53 +08:00 |
|
wangliwen
|
698576ad9a
|
我的申请模糊查询
|
2022-05-27 10:43:32 +08:00 |
|
wangliwen
|
7f7fadbafc
|
Merge remote-tracking branch 'origin/zhangjunhe'
|
2022-05-26 19:43:56 +08:00 |
|
wangliwen
|
1b67c7865a
|
屮
|
2022-05-26 19:38:54 +08:00 |
|
wangliwen
|
7ba6af7f05
|
分页的处理
|
2022-05-26 19:26:44 +08:00 |
|
wangliwen
|
ecd78da476
|
...
|
2022-05-26 19:18:13 +08:00 |
|
wangliwen
|
68ea4d03a0
|
试一试
|
2022-05-26 19:17:24 +08:00 |
|
wangliwen
|
c49d8ed1ba
|
...
|
2022-05-26 19:10:43 +08:00 |
|
JunheZhang
|
d4b544e1b9
|
增加了任务列表查询，告警信息查询
|
2022-05-26 18:59:34 +08:00 |
|
wangliwen
|
7429fb7a31
|
我的申请模糊查询bug？
|
2022-05-26 18:43:00 +08:00 |
|
wangliwen
|
6d11d96360
|
免批资源的判断
|
2022-05-26 16:17:54 +08:00 |
|
dinggang
|
dabf8dca50
|
能力统计-资源图谱
|
2022-05-26 11:02:57 +08:00 |
|
dinggang
|
90dbf582a4
|
能力统计-资源图谱
|
2022-05-26 10:32:42 +08:00 |
|
wangliwen
|
0b9632fc71
|
...
|
2022-05-25 14:51:49 +08:00 |
|
wangliwen
|
9ff764fd9d
|
...
|
2022-05-25 13:49:37 +08:00 |
|
dinggang
|
3444868612
|
能力统计-资源图谱
|
2022-05-25 11:13:25 +08:00 |
|
wangliwen
|
2a6e4959b3
|
排序优化
|
2022-05-25 10:04:42 +08:00 |
|
wangliwen
|
db8319022e
|
申请应用领域分词
|
2022-05-25 09:53:41 +08:00 |
|
wangliwen
|
05ad116e04
|
资源提供方应用领域分词
|
2022-05-25 09:44:09 +08:00 |
|
wangliwen
|
08bde6f597
|
Merge remote-tracking branch 'origin/master'
|
2022-05-25 08:59:33 +08:00 |
|
wangliwen
|
61ec67c9a1
|
topN按数目逆序
|
2022-05-25 08:56:53 +08:00 |
|
dinggang
|
6e5c80e48f
|
能力统计-资源图谱
|
2022-05-24 21:08:43 +08:00 |
|
dinggang
|
b1e9fd607e
|
能力统计-资源图谱
|
2022-05-24 19:49:37 +08:00 |
|
wangliwen
|
9129b115ff
|
..
|
2022-05-24 18:43:08 +08:00 |
|
wangliwen
|
86b7ecc0e5
|
过滤掉其他
|
2022-05-24 18:39:19 +08:00 |
|
wangliwen
|
bcf940114c
|
部门名
|
2022-05-24 18:14:52 +08:00 |
|
wangliwen
|
381c32fd30
|
Merge branch 'wangliwen'
|
2022-05-24 18:02:24 +08:00 |
|
wangliwen
|
d9026207e1
|
能力共享方-应用领域接口；能力申请方-应用领域；
|
2022-05-24 18:01:31 +08:00 |
|
huangweixiong
|
1ca0606cc3
|
资源统计接口转发
|
2022-05-24 16:04:57 +08:00 |
|
huangweixiong
|
042ed549f5
|
Merge branch 'master' of http://221.0.232.152:9393/ability-center/share-platform
* 'master' of http://221.0.232.152:9393/ability-center/share-platform: (82 commits)
需求接口出评论数目
...
兼容已经重复提交过下架的资源
...
资源重复下线错误提示
资源重复下架
....
被覆盖？
。。。
...
该资源已发起下架，重复发起下架时 抛出异常
...
...
统计资源访问量
...
我的待办查出流转状态
资源下架申请中状态仍然为正常
指定编译目标为jdk1.8
能力申请若为大数据负责人申请，大数据级别申请默认通过；若申请者为资源所属部门审批人，默认通过；
我的待办只出仍然在运行的任务
...
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java
|
2022-05-24 15:33:26 +08:00 |
|
huangweixiong
|
f6e52a5c59
|
资源数据转发
|
2022-05-24 15:29:25 +08:00 |
|
wangliwen
|
da1cc12fe9
|
Merge remote-tracking branch 'origin/master' into wangliwen
|
2022-05-24 09:09:41 +08:00 |
|
wangliwen
|
cea2901afa
|
需求接口出评论数目
|
2022-05-24 09:09:22 +08:00 |
|
dinggang
|
ba372c2386
|
...
|
2022-05-23 18:28:02 +08:00 |
|
wangliwen
|
59d13aadc8
|
兼容已经重复提交过下架的资源
|
2022-05-23 10:47:02 +08:00 |
|
wangliwen
|
e6093fb62a
|
...
|
2022-05-23 10:24:50 +08:00 |
|
wangliwen
|
1c7e2dcdc1
|
资源重复下线错误提示
|
2022-05-23 09:45:53 +08:00 |
|
wangliwen
|
27d692f575
|
资源重复下架
|
2022-05-20 18:35:47 +08:00 |
|
wangliwen
|
07711e2928
|
....
|
2022-05-20 18:29:59 +08:00 |
|
wangliwen
|
1091344da1
|
被覆盖？
|
2022-05-20 18:24:21 +08:00 |
|
wangliwen
|
2d40ab3eb1
|
。。。
|
2022-05-20 18:18:23 +08:00 |
|
wangliwen
|
31a6998a57
|
...
|
2022-05-20 18:12:03 +08:00 |
|
wangliwen
|
e994527810
|
该资源已发起下架，重复发起下架时 抛出异常
|
2022-05-20 18:11:14 +08:00 |
|
wangliwen
|
8cdefe07de
|
...
|
2022-05-20 18:03:16 +08:00 |
|
wangliwen
|
9801eb50f4
|
...
|
2022-05-20 12:03:19 +08:00 |
|
wangliwen
|
8aa344d8a3
|
统计资源访问量
|
2022-05-20 11:30:29 +08:00 |
|
wangliwen
|
46851b85f9
|
...
|
2022-05-20 11:05:35 +08:00 |
|
wangliwen
|
6423f22b42
|
我的待办查出流转状态
|
2022-05-20 10:53:59 +08:00 |
|
wangliwen
|
ab36bb4f77
|
资源下架申请中状态仍然为正常
|
2022-05-20 10:31:37 +08:00 |