wangliwen
|
0909f09bac
|
Merge branch 'dev'
|
2022-11-24 17:59:54 +08:00 |
 dinggang
|
6fa748b834
|
统计删除知识库数据
|
2022-11-24 17:59:14 +08:00 |
|
wangliwen
|
477064167c
|
Merge branch 'dev'
|
2022-11-24 09:05:40 +08:00 |
|
dinggang
|
6dbe768720
|
统计小数位数保留错误问题
|
2022-11-23 18:25:14 +08:00 |
|
wangliwen
|
91da0ab040
|
Merge branch 'dev'
|
2022-11-23 17:48:58 +08:00 |
|
dinggang
|
4ffae6f944
|
1.资金报表增加申请状态
|
2022-11-23 17:47:35 +08:00 |
|
wangliwen
|
35ff5a2acc
|
Merge branch 'dev'
|
2022-11-23 17:02:18 +08:00 |
|
dinggang
|
e7b8188f36
|
.
|
2022-11-23 16:33:05 +08:00 |
|
dinggang
|
3bdec35655
|
1.资金报表新增按审核状态查询条件
2.能力统计-能力使用统计明细增加按提供部门查询
|
2022-11-23 16:32:35 +08:00 |
|
dinggang
|
c94f0513b4
|
。。。
|
2022-11-23 09:41:56 +08:00 |
|
wangliwen
|
f4ee5ebd0e
|
Merge branch 'dev'
|
2022-11-23 09:18:14 +08:00 |
|
dinggang
|
e8d2ea9df7
|
统计错误修复
|
2022-11-23 09:12:52 +08:00 |
|
dinggang
|
9a440727f9
|
npe
|
2022-11-22 17:55:23 +08:00 |
|
dinggang
|
1ac9bdd772
|
申请时增加价格字段
|
2022-11-22 17:23:45 +08:00 |
|
dinggang
|
7eac8dd1c2
|
1.资源重复申请判断逻辑修改
2.新增资金报表需求
3.西海岸已申请列表需求
|
2022-11-22 17:01:31 +08:00 |
|
wangliwen
|
2c0feef452
|
Merge branch 'dev'
|
2022-11-22 13:37:36 +08:00 |
|
wangliwen
|
43d202fcf5
|
Merge branch 'dev'
|
2022-11-22 13:36:39 +08:00 |
|
dinggang
|
16c77f7686
|
1.sql文件命名错误修改
|
2022-11-21 18:31:11 +08:00 |
|
dinggang
|
ffa2e6d93e
|
1.西海岸-已申请列表查询
2.token过期时间改为可配置
3.亚伟通知消息bug修复
|
2022-11-21 17:58:19 +08:00 |
|
dinggang
|
8573da35eb
|
Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev
|
2022-11-21 10:04:47 +08:00 |
|
dinggang
|
d891593c4b
|
西海岸基础设施新需求-待申请列表增删改查接口
已申请查询，删除接口
超级管理员删除能力数据未删除下架流程相关数据bug修复
|
2022-11-21 09:39:24 +08:00 |
|
dinggang
|
d0682ef97d
|
金宏版本不支持，想其他办法
|
2022-11-18 18:49:49 +08:00 |
|
wangliwen
|
bd46f31eac
|
Merge branch 'dev'
|
2022-11-18 13:06:13 +08:00 |
|
wangliwen
|
d3b3c4181f
|
政务云增加 类型 查询
|
2022-11-18 13:06:05 +08:00 |
|
wangliwen
|
88ef8c1e36
|
Merge branch 'dev'
|
2022-11-18 12:41:52 +08:00 |
|
wangliwen
|
5668ae110d
|
...
|
2022-11-18 12:41:45 +08:00 |
|
wangliwen
|
04e8e01ec4
|
Merge branch 'dev'
|
2022-11-18 11:12:31 +08:00 |
|
wangliwen
|
89de07eac0
|
政务云服务资源 本地数据接口
|
2022-11-18 11:12:12 +08:00 |
|
wangliwen
|
22600ddedc
|
Merge branch 'dev'
|
2022-11-18 08:59:22 +08:00 |
|
dinggang
|
5e403b6ae6
|
后台管理能力统计-能力使用统计查询申请部门列表接口修改-只查询有申请记录的部门
|
2022-11-17 14:52:55 +08:00 |
|
wangliwen
|
09274487bd
|
Merge remote-tracking branch 'origin/dev'
|
2022-11-16 19:04:35 +08:00 |
|
dinggang
|
7e54dcebba
|
漏提了...
|
2022-11-15 16:52:20 +08:00 |
|
dinggang
|
acdcf5b25c
|
1.增加允许账号多地同时在线功能
2.去除无用注入
3.云资源和云视频调用失败异常处理
4.菜单管理新增按名称模糊查询
5.同步字典表新增数据
|
2022-11-15 16:50:24 +08:00 |
|
wangliwen
|
e572bd54fc
|
Merge branch 'dev'
|
2022-11-15 15:33:51 +08:00 |
|
wangliwen
|
3199f917e7
|
后台能力统计部门级别排序调节 所有部门接口
|
2022-11-15 15:33:39 +08:00 |
|
wangliwen
|
c2af9bb8fc
|
Merge branch 'dev'
|
2022-11-14 18:02:54 +08:00 |
|
wangliwen
|
e644199843
|
...
|
2022-11-14 18:02:46 +08:00 |
|
wangliwen
|
88acd9814d
|
Merge branch 'dev'
|
2022-11-14 17:19:45 +08:00 |
|
dinggang
|
68c88a10f7
|
1.关于登录的新增配置
|
2022-11-14 17:18:16 +08:00 |
|
dinggang
|
0bf4b305c2
|
1.关于登录的新增配置
|
2022-11-14 17:17:07 +08:00 |
|
wangliwen
|
d0c84a5c1a
|
Merge branch 'dev'
|
2022-11-14 17:06:20 +08:00 |
|
dinggang
|
c844000ff1
|
1.用户表新增字段
|
2022-11-14 17:02:14 +08:00 |
|
dinggang
|
a14ba472eb
|
1.第三方检测问题修复-登录时用户信息明文传输
2.第三方检测问题修复-未对用户登录次数进行限制
|
2022-11-14 16:29:00 +08:00 |
|
wangliwen
|
d19fad286a
|
Merge branch 'dev'
|
2022-11-14 14:37:04 +08:00 |
|
dinggang
|
7f224cf1a3
|
用户账号状态枚举新增锁定状态
|
2022-11-14 10:05:34 +08:00 |
|
dinggang
|
1ee2482cb3
|
用户表新增字段-密码错误次数
|
2022-11-14 10:04:44 +08:00 |
|
wangliwen
|
0943e68d21
|
Merge branch 'dev'
|
2022-11-11 17:14:45 +08:00 |
 huangweixiong
|
09becdf80d
|
Merge branch 'dev' of http://192.168.124.50/wangliwen/share-platform into dev
* 'dev' of http://192.168.124.50/wangliwen/share-platform:
。。。
|
2022-11-11 14:18:29 +08:00 |
|
huangweixiong
|
35fe09a3e4
|
添加山东通单点登录
|
2022-11-11 14:18:14 +08:00 |
|
wangliwen
|
2cd626ddda
|
Merge branch 'dev'
|
2022-11-11 13:47:34 +08:00 |
|
wangliwen
|
547c128b2c
|
。。。
|
2022-11-11 13:47:25 +08:00 |
|
huangweixiong
|
4ed920651a
|
Merge branch 'dev' of http://192.168.124.50/wangliwen/share-platform into dev
* 'dev' of http://192.168.124.50/wangliwen/share-platform:
全局resttemp配置项
调整亚微的详情接口
1.对接政务云资源和云视频列表查询接口 2.全局搜索会客厅统计错误bug修复
运行日志文件按时间逆序，下载运行日志无需认证
...
屮
。。。
调整上传限制大小
1.我的收藏列表查询增加融合服务查询 2.增加超级管理员删除能力和流程实例接口 3.删除区划标识修改
yawei待办详情
...
导出失败的处理
...
jira上的bug
|
2022-11-11 09:50:45 +08:00 |
|
huangweixiong
|
2760c891e8
|
山东通单点登录
|
2022-11-11 09:50:19 +08:00 |
|
wangliwen
|
eb09e240ab
|
Merge branch 'dev'
|
2022-11-11 09:25:40 +08:00 |
|
wangliwen
|
718689b223
|
全局resttemp配置项
|
2022-11-11 09:25:32 +08:00 |
|
wangliwen
|
3bcb645b9c
|
Merge branch 'dev'
|
2022-11-10 15:26:11 +08:00 |
|
wangliwen
|
20dbf5753a
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-11-10 15:25:59 +08:00 |
|
wangliwen
|
e2a937810e
|
Merge branch 'dev'
|
2022-11-10 15:24:46 +08:00 |
|
wangliwen
|
951b251e21
|
调整亚微的详情接口
|
2022-11-10 15:24:37 +08:00 |
|
dinggang
|
dff21f73e8
|
1.对接政务云资源和云视频列表查询接口
2.全局搜索会客厅统计错误bug修复
|
2022-11-10 15:22:57 +08:00 |
|
wangliwen
|
02592e7b72
|
Merge branch 'dev'
|
2022-11-10 09:16:41 +08:00 |
|
wangliwen
|
89355fd5ec
|
运行日志文件按时间逆序，下载运行日志无需认证
|
2022-11-10 09:16:31 +08:00 |
|
wangliwen
|
351667b4c1
|
Merge branch 'dev'
|
2022-11-09 16:53:57 +08:00 |
|
wangliwen
|
9fe3d20864
|
...
|
2022-11-09 16:53:49 +08:00 |
|
wangliwen
|
2523cb139b
|
Merge branch 'dev'
|
2022-11-09 16:39:30 +08:00 |
|
wangliwen
|
0b27181f37
|
屮
|
2022-11-09 16:39:08 +08:00 |
|
wangliwen
|
3ae9d2a51c
|
Merge branch 'dev'
|
2022-11-09 16:16:42 +08:00 |
|
wangliwen
|
05ddeec478
|
。。。
|
2022-11-09 16:16:32 +08:00 |
|
wangliwen
|
e9c110b30b
|
Merge branch 'dev'
|
2022-11-09 15:53:26 +08:00 |
|
wangliwen
|
1d798bb76f
|
调整上传限制大小
|
2022-11-09 15:53:17 +08:00 |
|
wangliwen
|
d516aee7e0
|
Merge branch 'dev'
|
2022-11-09 15:34:36 +08:00 |
|
wangliwen
|
85e9e5acad
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-11-09 15:34:23 +08:00 |
|
dinggang
|
d8e306efc4
|
1.我的收藏列表查询增加融合服务查询
2.增加超级管理员删除能力和流程实例接口
3.删除区划标识修改
|
2022-11-09 15:32:13 +08:00 |
|
dinggang
|
8d36ad1e56
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-11-09 15:07:32 +08:00 |
 lizhicheng
|
37dc9e7223
|
yawei待办详情
|
2022-11-09 14:59:54 +08:00 |
|
wangliwen
|
87db58af6a
|
Merge branch 'dev'
|
2022-11-09 12:44:29 +08:00 |
|
wangliwen
|
8763e4c6f6
|
...
|
2022-11-09 12:44:23 +08:00 |
|
wangliwen
|
9aec520986
|
Merge branch 'dev'
|
2022-11-09 12:42:15 +08:00 |
|
wangliwen
|
09cbaa8248
|
导出失败的处理
|
2022-11-09 12:41:43 +08:00 |
|
wangliwen
|
3425cec2f6
|
Merge branch 'master' into docker_package
|
2022-11-09 12:13:15 +08:00 |
|
wangliwen
|
c53d5706cb
|
Merge branch 'dev'
|
2022-11-09 12:13:07 +08:00 |
|
wangliwen
|
28f842f126
|
Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev
|
2022-11-09 12:12:54 +08:00 |
|
wangliwen
|
89eb8ec48b
|
Merge branch 'master' into docker_package
|
2022-11-09 12:12:33 +08:00 |
|
wangliwen
|
fc9bff33a8
|
Merge branch 'dev'
|
2022-11-09 12:12:26 +08:00 |
|
wangliwen
|
8352283f71
|
...
|
2022-11-09 12:12:16 +08:00 |
|
huangweixiong
|
88915f7dcc
|
Merge branch 'dev' of http://192.168.124.50/wangliwen/share-platform into dev
* 'dev' of http://192.168.124.50/wangliwen/share-platform:
资源无所属部门时 默认所属部门为 平台设置大数据局
|
2022-11-09 10:35:13 +08:00 |
|
huangweixiong
|
1cb952fe61
|
url修改
|
2022-11-09 10:34:54 +08:00 |
|
wangliwen
|
3af7f42da1
|
Merge branch 'master' into docker_package
|
2022-11-09 10:19:05 +08:00 |
|
wangliwen
|
f6c275a31e
|
Merge branch 'dev'
|
2022-11-09 10:18:57 +08:00 |
|
wangliwen
|
292ec95d3c
|
资源无所属部门时 默认所属部门为 平台设置大数据局
|
2022-11-09 10:18:49 +08:00 |
|
huangweixiong
|
6f04dc91bc
|
Merge branch 'dev' of http://192.168.124.50/wangliwen/share-platform into dev
* 'dev' of http://192.168.124.50/wangliwen/share-platform:
...
导出能力挂接内资源
下载运行日志文件
列出日志文件与提供下载日志文件接口
TODO 列出日志文件
屮
启动脚本
500
屮
。。。
下载更新包失败的处理
调整更新接口
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java
|
2022-11-09 10:14:24 +08:00 |
|
huangweixiong
|
2bf3d0b73d
|
亚威资源申请列表参数动态化
|
2022-11-09 10:07:39 +08:00 |
|
wangliwen
|
2d722cbb68
|
Merge branch 'master' into docker_package
|
2022-11-09 09:47:28 +08:00 |
|
wangliwen
|
95cabbde6b
|
Merge branch 'dev'
|
2022-11-09 09:47:21 +08:00 |
|
wangliwen
|
8a4e11430e
|
...
|
2022-11-09 09:47:09 +08:00 |
|
wangliwen
|
184950d030
|
导出能力挂接内资源
|
2022-11-09 09:46:16 +08:00 |
|
dinggang
|
9f9e3b7e5f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-11-09 09:14:07 +08:00 |
|
wangliwen
|
ca4ce09aae
|
Merge branch 'master' into docker_package
|
2022-11-08 15:55:57 +08:00 |
|
wangliwen
|
342e06226a
|
Merge branch 'dev'
|
2022-11-08 15:55:50 +08:00 |
|
wangliwen
|
bf342a70ae
|
下载运行日志文件
|
2022-11-08 15:55:41 +08:00 |
|
wangliwen
|
78c11c3671
|
Merge branch 'master' into docker_package
|
2022-11-08 15:39:00 +08:00 |
|
wangliwen
|
a957859114
|
Merge branch 'dev'
|
2022-11-08 15:38:53 +08:00 |
|
wangliwen
|
d56742d9a0
|
列出日志文件与提供下载日志文件接口
|
2022-11-08 15:38:43 +08:00 |
|
wangliwen
|
76d99d2a83
|
Merge branch 'dev'
|
2022-11-08 15:21:58 +08:00 |
|
wangliwen
|
f876e75763
|
Merge branch 'dev' into docker_package
|
2022-11-08 15:21:49 +08:00 |
|
wangliwen
|
0d1f1cfd39
|
。。。
|
2022-11-08 15:21:42 +08:00 |
|
wangliwen
|
dfe77f31a2
|
TODO 列出日志文件
|
2022-11-08 15:20:43 +08:00 |
|
wangliwen
|
88b178f49f
|
调整Dockerfile内启动方式
|
2022-11-08 15:07:58 +08:00 |
|
wangliwen
|
c7a132eb9d
|
Merge branch 'master' into docker_package
|
2022-11-08 15:01:40 +08:00 |
|
wangliwen
|
e602da0be5
|
Merge branch 'dev'
|
2022-11-08 15:01:34 +08:00 |
|
wangliwen
|
45a8f3f6cb
|
屮
|
2022-11-08 15:01:26 +08:00 |
|
wangliwen
|
2778887a61
|
Merge branch 'master' into docker_package
|
2022-11-08 14:02:21 +08:00 |
|
wangliwen
|
04c0c75ad4
|
Merge branch 'dev'
|
2022-11-08 14:02:15 +08:00 |
|
wangliwen
|
40c6cd37a7
|
启动脚本
|
2022-11-08 14:02:08 +08:00 |
|
wangliwen
|
cad1176216
|
Merge branch 'master' into docker_package
|
2022-11-08 13:07:56 +08:00 |
|
wangliwen
|
1b7332ce1d
|
Merge branch 'dev'
|
2022-11-08 13:07:49 +08:00 |
|
wangliwen
|
9b66fa7b21
|
500
|
2022-11-08 13:07:42 +08:00 |
|
wangliwen
|
740d820be9
|
Merge branch 'master' into docker_package
|
2022-11-08 12:55:05 +08:00 |
|
wangliwen
|
2fdd59e379
|
Merge branch 'dev'
|
2022-11-08 12:54:58 +08:00 |
|
wangliwen
|
5b8f4b56ff
|
屮
|
2022-11-08 12:54:30 +08:00 |
|
wangliwen
|
67e92b6576
|
Merge branch 'master' into docker_package
|
2022-11-08 12:33:19 +08:00 |
|
wangliwen
|
6865512b69
|
Merge branch 'dev'
|
2022-11-08 12:32:59 +08:00 |
|
wangliwen
|
6335d7c5c6
|
。。。
|
2022-11-08 12:32:50 +08:00 |
|
wangliwen
|
2462ce3b65
|
Merge branch 'master' into docker_package
|
2022-11-08 10:47:54 +08:00 |
|
wangliwen
|
ac7f94f4f0
|
Merge branch 'dev'
|
2022-11-08 10:47:47 +08:00 |
|
wangliwen
|
59a2ad1fe6
|
下载更新包失败的处理
|
2022-11-08 10:47:33 +08:00 |
|
wangliwen
|
6528698751
|
Merge branch 'master' into docker_package
# Conflicts:
# renren-admin/src/main/java/io/renren/common/controller/AdminController.java
|
2022-11-08 10:23:17 +08:00 |
|
wangliwen
|
ff844bc432
|
Merge branch 'dev'
|
2022-11-08 10:22:37 +08:00 |
|
wangliwen
|
393d45fd74
|
调整更新接口
|
2022-11-08 10:22:28 +08:00 |
|
wangliwen
|
b2d6161dc9
|
...
|
2022-11-08 10:08:18 +08:00 |
|
wangliwen
|
af73808a3e
|
调整
|
2022-11-08 09:56:34 +08:00 |
|
wangliwen
|
96b9733fdb
|
容器脚本启动试一试
|
2022-11-08 09:07:54 +08:00 |
|
wangliwen
|
4f7f31e5c0
|
Merge branch 'master' into docker_package
|
2022-11-07 18:04:06 +08:00 |
|
wangliwen
|
76217ab23d
|
Merge branch 'dev'
|
2022-11-07 18:03:59 +08:00 |
|
wangliwen
|
01ba9b232a
|
屮
|
2022-11-07 18:03:53 +08:00 |
|
wangliwen
|
418a268915
|
Merge branch 'master' into docker_package
|
2022-11-07 17:50:03 +08:00 |
|
wangliwen
|
c5366e0b87
|
Merge branch 'dev'
|
2022-11-07 17:49:58 +08:00 |
|
wangliwen
|
471e1bce6b
|
...
|
2022-11-07 17:49:45 +08:00 |
|
wangliwen
|
958e1ff798
|
Merge branch 'dev'
|
2022-11-07 17:48:05 +08:00 |
|
wangliwen
|
4b540393a9
|
增加docker启动脚本
|
2022-11-07 17:47:56 +08:00 |
|
wangliwen
|
6d09d42182
|
删除docker启动指令
|
2022-11-07 17:44:55 +08:00 |
|
wangliwen
|
f6ce0ecf90
|
...
|
2022-11-07 17:31:39 +08:00 |
|
wangliwen
|
cd334ca109
|
权限问题
|
2022-11-07 17:21:20 +08:00 |
|
wangliwen
|
04be3b22a6
|
启动不了？
|
2022-11-07 17:12:40 +08:00 |
|
wangliwen
|
a734dcdd04
|
屮
|
2022-11-07 17:02:35 +08:00 |
|
wangliwen
|
61d9c00bda
|
屮
|
2022-11-07 16:55:12 +08:00 |
|
wangliwen
|
94fe2ac5b8
|
chmod 755 启动脚本
|
2022-11-07 16:48:32 +08:00 |
|
wangliwen
|
cb1d7600f8
|
Merge branch 'master' into docker_package
|
2022-11-07 16:45:26 +08:00 |
|
wangliwen
|
930e4fd472
|
Merge branch 'dev'
|
2022-11-07 16:45:19 +08:00 |
|
wangliwen
|
c1bfb201e2
|
调整docker启动
|
2022-11-07 16:45:12 +08:00 |