wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,670 Commits 6 Branches 12 Tags 25 MiB
Commit Graph

2555 Commits

Author SHA1 Message Date
wangliwen 72339c1f9c 异步处理待办任务内详情，大幅减少计算时间 2022-12-10 16:45:56 +08:00
dinggang e331fffaa5 Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev 2022-12-10 16:10:45 +08:00
dinggang a52ecdaeca 1.云资源和云视频申请查询接口 
2.ucs与浪潮部门对应表
 2022-12-10 16:10:20 +08:00
wangliwen 5b86609369 Merge branch 'dev' 2022-12-10 16:10:05 +08:00
wangliwen 14bbde1103 配置是否开启恩科组会功能 2022-12-10 16:09:53 +08:00
wangliwen 1f72d75871 Merge branch 'dev' 2022-12-10 15:46:12 +08:00
wangliwen ac188e41eb 增加审核任务是否为审核组内其它组员任务 2022-12-10 15:46:04 +08:00
wangliwen 1f549b5659 Merge branch 'dev' 2022-12-10 15:02:45 +08:00
wangliwen 07c73216dd ... 2022-12-10 15:00:43 +08:00
wangliwen 07bb9d1ed9 使用activiti NativeTaskQuery查询待办分页，为审核组互助审核做查询基础 2022-12-10 15:00:28 +08:00
wangliwen c59d6ca71c Merge branch 'dev' 2022-12-09 14:27:50 +08:00
wangliwen 80cbecc6e0 公告修改接口 2022-12-09 14:27:40 +08:00
wangliwen cb9fa3f0ab Merge branch 'dev' 2022-12-09 11:42:37 +08:00
wangliwen 4425851bed ... 2022-12-09 11:42:30 +08:00
wangliwen 0c9f3247c1 Merge branch 'dev' 2022-12-09 11:32:04 +08:00
wangliwen 511772b051 ... 2022-12-09 11:31:55 +08:00
wangliwen 8cac26fbc2 Merge branch 'dev' 2022-12-09 10:44:22 +08:00
wangliwen e229eacfdb 工作台 已办任务加入会客厅已办数量 2022-12-09 10:44:13 +08:00
wangliwen 2d12110d7c Merge branch 'dev' 2022-12-09 10:19:33 +08:00
wangliwen e490ff7a25 npe 2022-12-09 10:19:24 +08:00
wangliwen a1279b5085 Merge branch 'dev' 2022-12-09 09:36:04 +08:00
wangliwen d56d2aa99b fix 557 2022-12-09 09:35:56 +08:00
wangliwen 5d14228215 Merge branch 'dev' 2022-12-08 16:32:02 +08:00
wangliwen 66e13c0f50 减少一些日志输出 2022-12-08 16:11:01 +08:00
wangliwen 91eea8e787 Merge branch 'dev' 2022-12-08 16:05:06 +08:00
wangliwen 6c636ce311 催办配置失效问题 2022-12-08 16:04:56 +08:00
wangliwen 6e2ba70c84 Merge branch 'dev' 2022-12-08 09:20:18 +08:00
wangliwen c8a5e0450c Merge remote-tracking branch '备份/dev' into dev 2022-12-08 09:20:08 +08:00
wangliwen 63c979057f fix 474 2022-12-08 09:19:59 +08:00
dinggang aa31a7bd43 1.浪潮政务云视频和云资源申请相关接口 
2.全局搜索统计增加政务云资源搜索结果
3.后台管理-能力统计-能力上架统计-明细页面SQL调整
 2022-12-08 09:12:24 +08:00
wangliwen 6c5559e0ab Merge branch 'dev' 2022-12-06 18:09:12 +08:00
dinggang 1289bfc619 Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev 
# Conflicts:
#	renren-admin/src/main/java/io/renren/modules/activiti/controller/ActTaskController.java
 2022-12-06 18:08:42 +08:00
dinggang 948c1d2d55 1.全局搜索增加政务云资源搜索结果 
2.后台管理-通知管理-我的通知增加按通知类型筛选
3.对接浪潮政务云资源和云视频
 2022-12-06 18:01:51 +08:00
wangliwen 9d0b6d4d4c Merge branch 'dev' 2022-12-06 17:57:29 +08:00
wangliwen b6de83347a ... 2022-12-06 17:57:17 +08:00
wangliwen c57003e31c Merge branch 'dev' 2022-12-06 10:06:41 +08:00
wangliwen e1abfa6e5d 批量驳回接口 2022-12-06 10:06:31 +08:00
wangliwen 9874820779 Merge branch 'dev' 2022-12-05 16:59:41 +08:00
wangliwen 9832a37e2c ... 2022-12-05 16:59:30 +08:00
wangliwen dbc8759760 Merge branch 'dev' 2022-12-05 16:09:08 +08:00
wangliwen 386478aa76 Merge remote-tracking branch '备份/dev' into dev 2022-12-05 16:08:56 +08:00
wangliwen 19e6f7d5a4 能力申请每个任务节点加入催办信息与状态 2022-12-05 16:08:46 +08:00
dinggang b2b21f6442 漏提交 2022-12-05 15:56:27 +08:00
dinggang c4e43ff5ef 资金大屏统计修改 2022-12-05 15:55:44 +08:00
wangliwen b5995b1d26 Merge branch 'dev' 2022-12-05 15:26:22 +08:00
wangliwen 7e332201c4 从未催办过的任务 判断是否已超过预置天数 2022-12-05 15:26:13 +08:00
wangliwen 1bb9540e86 Merge branch 'dev' 2022-12-05 14:17:35 +08:00
wangliwen 9e618c75cc 催办信息保存前判断 2022-12-05 14:17:27 +08:00
wangliwen 7ecfad7e81 Merge branch 'dev' 2022-12-05 11:58:34 +08:00
wangliwen 8d62701756 ... 2022-12-05 11:58:23 +08:00
wangliwen c8f603df6a Merge branch 'dev' 2022-12-05 10:28:42 +08:00
wangliwen 4b724593c6 。。。 2022-12-05 10:26:16 +08:00
wangliwen b1989791b0 Merge branch 'dev' 2022-12-05 09:53:06 +08:00
wangliwen 77185be5c1 能力申请的催办判断 2022-12-05 09:52:54 +08:00
wangliwen 570cfd0d5c Merge branch 'dev' 2022-12-05 09:20:47 +08:00
wangliwen 1a2d443bc0 查看能力申请详情时返回催办相关信息 2022-12-05 09:20:37 +08:00
wangliwen 4268e557a5 Merge branch 'dev' 2022-12-02 18:16:49 +08:00
dinggang 5c3f32f313 用户角色消失问题 2022-12-02 16:50:29 +08:00
wangliwen 0b572a1e8b Merge branch 'dev' 2022-12-02 15:46:12 +08:00
wangliwen 4789a3cb60 批量审核通过接口 2022-12-02 15:14:40 +08:00
wangliwen 7703c6d6cf Merge branch 'dev' 2022-12-02 14:19:48 +08:00
wangliwen f39a9e473e 市局数据资源按照上线部门出数据资源列表 2022-12-02 14:18:54 +08:00
wangliwen 230664910c Merge branch 'dev' 2022-12-01 18:18:40 +08:00
dinggang f8088fb2f9 Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev 2022-12-01 18:17:07 +08:00
dinggang fee19d8f17 1.公告相关接口 
2.建表sql
3.我的待办-能力申请增加资源类型及提供部门字段
4.减少无用日志输出
 2022-12-01 18:16:43 +08:00
wangliwen d0fbaee7ba Merge branch 'dev' 2022-12-01 17:30:38 +08:00
wangliwen 0a174de50a 数据资源左侧树 2022-12-01 17:30:28 +08:00
wangliwen 9f9ff3fd27 Merge branch 'dev' 2022-12-01 15:47:53 +08:00
wangliwen 3a87c7381d 增加能力申请 是否存在子单驳回的情况 2022-12-01 15:47:08 +08:00
wangliwen 37ca5ade65 Merge branch 'dev' 2022-12-01 15:17:31 +08:00
wangliwen bf684bacbb 能力申请催办相关 2022-12-01 15:17:16 +08:00
wangliwen 1bccf11ddb Merge branch 'dev' 2022-12-01 14:22:12 +08:00
wangliwen 49d94eda9d Merge remote-tracking branch '备份/dev' into dev 2022-12-01 14:21:56 +08:00
wangliwen 86c0f106ff 流程内催办条件的判断 2022-12-01 14:21:44 +08:00
dinggang 82faf95eff 1.西海岸审批逻辑修改 
2.资源汇聚总量统计区分西海岸和市局环境
 2022-12-01 09:12:54 +08:00
wangliwen e437a6819d Merge branch 'dev' 2022-11-30 18:54:58 +08:00
wangliwen 43441e4212 ... 2022-11-30 18:54:51 +08:00
wangliwen 92213dccd5 Merge branch 'dev' 2022-11-30 18:45:12 +08:00
wangliwen 57a6014249 sql字段缺失补充 2022-11-30 18:45:05 +08:00
wangliwen ecf908b5bf Merge branch 'dev' 2022-11-30 18:31:16 +08:00
wangliwen 091e18e6c4 npe的处理 2022-11-30 18:31:09 +08:00
wangliwen 89b16b4ddf Merge branch 'dev' 2022-11-30 18:25:28 +08:00
wangliwen e96b6f864c 补充全 2022-11-30 18:25:20 +08:00
wangliwen 81d7b6dff3 Merge branch 'dev' 2022-11-30 18:15:14 +08:00
wangliwen d32dc84539 ... 2022-11-30 18:15:07 +08:00
wangliwen 96426b2189 Merge branch 'dev' 2022-11-30 17:57:51 +08:00
wangliwen ca9c670032 发起催办业务 2022-11-30 17:57:42 +08:00
wangliwen a9128a99c3 Merge branch 'dev' 2022-11-30 17:31:44 +08:00
wangliwen 58b14ce45e 催办 框架代码与催办消息通知实现 2022-11-30 17:31:03 +08:00
wangliwen 7bb0c3997d Merge branch 'dev' 2022-11-30 12:55:51 +08:00
wangliwen 2fbc050fa8 sql文件调整 2022-11-30 12:55:38 +08:00
wangliwen f4714a6dd1 Merge branch 'dev' 2022-11-30 12:41:43 +08:00
wangliwen a809e23874 催办表的创建与配置项的加入 2022-11-30 12:41:35 +08:00
wangliwen efb2d71a55 Merge branch 'dev' 2022-11-29 18:07:28 +08:00
dinggang 03f37f2083 1.错误修复 
2.用户信息修改增加日志记录
 2022-11-29 18:06:26 +08:00
wangliwen e4b3caeb0c Merge branch 'dev' 2022-11-29 13:17:35 +08:00
dinggang 476b88a806 统计修改 
sql错误修复
 2022-11-29 13:16:12 +08:00
wangliwen 2719a1aa6c Merge branch 'dev' 2022-11-29 08:58:28 +08:00
dinggang 2d152dd94d .. 2022-11-29 08:57:32 +08:00
wangliwen cfe4c79d5e Merge branch 'dev' 2022-11-29 08:57:04 +08:00
wangliwen baceca0471 Merge branch 'dev' 2022-11-29 08:56:15 +08:00
dinggang 6c82631bf9 . 2022-11-28 19:11:57 +08:00
dinggang 624140d67a 统计错误修复 
用户表增加索引
 2022-11-28 19:10:38 +08:00
dinggang 85e3c58cf8 金额转为万元 2022-11-28 16:47:25 +08:00
dinggang 246494c9cf . 2022-11-28 11:19:44 +08:00
wangliwen a789733f6a Merge branch 'dev' 2022-11-28 10:58:41 +08:00
dinggang fc6aa27ad4 西海岸bug 2022-11-28 10:15:27 +08:00
wangliwen bd3cb9eb40 Merge branch 'dev' 2022-11-28 09:37:22 +08:00
dinggang d2c3f885ed sql修改 2022-11-28 09:36:44 +08:00
wangliwen e74212ea27 Merge branch 'dev' 2022-11-28 09:03:12 +08:00
dinggang 76780e2eda 1.重复申请判断逻辑错误，暂时改回原逻辑 
2.资金报表大屏相关接口
 2022-11-26 18:07:39 +08:00
wangliwen 1fcde01778 Merge branch 'dev' 2022-11-25 17:16:18 +08:00
dinggang e64b5952ca Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev 2022-11-25 16:45:31 +08:00
dinggang 8342c4b978 sql修改 2022-11-25 16:45:11 +08:00
wangliwen 5b5bf2f3c7 Merge branch 'dev' 2022-11-25 16:25:01 +08:00
huangweixiong efaba0980d Merge branch 'dev' of http://192.168.124.50/wangliwen/share-platform into dev 
* 'dev' of http://192.168.124.50/wangliwen/share-platform: (22 commits)
  1.新增查询部门及区市未配置审核人员列表接口 2.角色用户关联表新增修改时间，修改人及删除标志字段 3.修改用户数据变更时角色信息修改逻辑，关联数据由物理删除变为逻辑删除 4.调整其他设计用户角色关联表查询sql，增加删除标志条件
  能力使用导出表头调整
  统计删除知识库数据
  统计小数位数保留错误问题
  1.资金报表增加申请状态
  .
  1.资金报表新增按审核状态查询条件 2.能力统计-能力使用统计明细增加按提供部门查询
  。。。
  统计错误修复
  npe
  申请时增加价格字段
  1.资源重复申请判断逻辑修改 2.新增资金报表需求 3.西海岸已申请列表需求
  1.sql文件命名错误修改
  1.西海岸-已申请列表查询 2.token过期时间改为可配置 3.亚伟通知消息bug修复
  西海岸基础设施新需求-待申请列表增删改查接口 已申请查询，删除接口 超级管理员删除能力数据未删除下架流程相关数据bug修复
  金宏版本不支持，想其他办法
  政务云增加 类型 查询
  ...
  政务云服务资源 本地数据接口
  后台管理能力统计-能力使用统计查询申请部门列表接口修改-只查询有申请记录的部门
  ...
 2022-11-25 16:23:32 +08:00
huangweixiong b5cb7d8441 去掉后台写cookie 2022-11-25 16:22:44 +08:00
dinggang 0d3d6f61ec 1.新增查询部门及区市未配置审核人员列表接口 
2.角色用户关联表新增修改时间，修改人及删除标志字段
3.修改用户数据变更时角色信息修改逻辑，关联数据由物理删除变为逻辑删除
4.调整其他设计用户角色关联表查询sql，增加删除标志条件
 2022-11-25 14:30:52 +08:00
wangliwen ca8713ab50 Merge branch 'dev' 2022-11-25 09:48:31 +08:00
wangliwen 02d01ad170 能力使用导出表头调整 2022-11-25 09:48:19 +08:00
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