Commit Graph

2477 Commits

Author SHA1 Message Date
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 b4c2c261c4 Merge branch 'master' into docker_package 2022-11-14 17:06:27 +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 da9b058e65 Merge branch 'master' into docker_package 2022-11-14 14:37:11 +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 d14605826a Merge branch 'master' into docker_package 2022-11-11 17:14:53 +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 df8e6c836c Merge branch 'master' into docker_package 2022-11-11 13:47:43 +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 d67727e5a4 Merge branch 'master' into docker_package 2022-11-11 09:25:48 +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 376eb698f6 Merge branch 'master' into docker_package 2022-11-10 15:26:18 +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 2f6c020f05 Merge branch 'master' into docker_package 2022-11-10 15:24:54 +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 83a24ecc8c Merge branch 'master' into docker_package 2022-11-10 09:16: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 c0764c71a2 Merge branch 'master' into docker_package 2022-11-09 16:54:03 +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 1e07f6ac86 Merge branch 'master' into docker_package 2022-11-09 16:39:37 +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 5f0c3ee7f1 Merge branch 'master' into docker_package 2022-11-09 16:16:52 +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 eaacb026f6 Merge branch 'master' into docker_package 2022-11-09 15:53:33 +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 accc19aff5 Merge branch 'master' into docker_package 2022-11-09 15:41:59 +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