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
|
427341b8d4
|
Merge branch 'master' into docker_package
|
2022-11-07 17:48:17 +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 |
|
wangliwen
|
143089b44a
|
...
|
2022-11-07 16:43:20 +08:00 |
|
wangliwen
|
c84865ee1f
|
Merge branch 'master' into docker_package
|
2022-11-07 16:33:26 +08:00 |
|
wangliwen
|
94c251a704
|
Merge branch 'dev'
|
2022-11-07 16:33:19 +08:00 |
|
wangliwen
|
df9d9bd901
|
调整Dockerfile java程序启动方式
|
2022-11-07 16:33:02 +08:00 |
|
wangliwen
|
2f804f7379
|
调整更新脚本
|
2022-11-07 16:16:13 +08:00 |
|
wangliwen
|
342b740a12
|
Dockerfile调整启动命令
|
2022-11-07 15:48:40 +08:00 |
|
wangliwen
|
69bf7366c9
|
Merge branch 'master' into docker_package
|
2022-11-07 15:12:38 +08:00 |
|
wangliwen
|
0650428ecd
|
Merge branch 'dev'
|
2022-11-07 15:12:31 +08:00 |
|
wangliwen
|
418c0ce764
|
更新接口初步实现
|
2022-11-07 15:12:08 +08:00 |
|
wangliwen
|
08946ec1b0
|
Merge branch 'master' into docker_package
|
2022-11-07 10:27:46 +08:00 |
|
wangliwen
|
6cdfd3d58e
|
Merge branch 'dev'
|
2022-11-07 10:27:38 +08:00 |
|
wangliwen
|
37bbc5fb7b
|
调整打包、上传更新初步框架搭建
|
2022-11-07 10:27:23 +08:00 |
|
wangliwen
|
b077249b4f
|
Merge branch 'master' into docker_package
|
2022-11-04 16:59:01 +08:00 |
|
wangliwen
|
515c47f989
|
Merge branch 'dev'
|
2022-11-04 16:58:53 +08:00 |
 huangweixiong
|
d86766de4e
|
Merge branch 'dev' of http://192.168.124.50/wangliwen/share-platform into dev
* 'dev' of http://192.168.124.50/wangliwen/share-platform: (26 commits)
部门名称模糊查询、分页数量bug
能力统计详情 资源名称模糊查询与缓存
统计详情增加资源名称筛选
创建show分支
1.个人中心-浏览记录查询条件按组件类型细分 2.全局搜索去除视频资源搜索结果统计
...
导出 与界面内容一致
全局格式化
...
全局数量排序
会议室改为会客厅、首页统计顺序
减少数据资源接口调用超时日志输出
。。。
屮
配置是否发送亚微消息
1.能力使用申请应用系统查询增加查询自己部门上架应用限制 2.能力使用统计时间错误bug 3.部门列表查询bug修复
部门分页、url前缀改为ucs-admin
区域部门管理员只出本区域部门信息
...
...
...
|
2022-11-04 15:29:34 +08:00 |
|
huangweixiong
|
56a0dab87f
|
亚威待办列表
|
2022-11-04 15:29:29 +08:00 |
 dinggang
|
0be4557992
|
jira上的bug
|
2022-11-04 14:53:59 +08:00 |
|
wangliwen
|
1d6ab0af77
|
Merge branch 'master' into docker_package
|
2022-11-04 10:07:41 +08:00 |
|
wangliwen
|
a6468e6464
|
Merge branch 'dev'
|
2022-11-04 10:07:33 +08:00 |
 lizhicheng
|
775ca92c02
|
部门名称模糊查询、分页数量bug
|
2022-11-04 09:55:50 +08:00 |
|
wangliwen
|
10d85c69aa
|
Merge branch 'master' into docker_package
|
2022-11-03 09:42:05 +08:00 |
|
wangliwen
|
05f27eb9e4
|
Merge branch 'dev'
|
2022-11-03 09:41:57 +08:00 |
|
wangliwen
|
82a0b3537b
|
能力统计详情 资源名称模糊查询与缓存
|
2022-11-03 09:41:47 +08:00 |
|
wangliwen
|
1f951738c1
|
Merge branch 'master' into docker_package
|
2022-11-02 18:10:02 +08:00 |
|
wangliwen
|
f4e33e6976
|
Merge branch 'dev'
|
2022-11-02 18:09:55 +08:00 |