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
|
5d6dcba4f5
|
Merge branch 'master' into docker_package
|
2022-11-08 15:22:08 +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 |