Code

Develop#2690

Code

Merged

nannan00 merged 186 commits intomasterTencentBlueKing/bk-iam-saas:masterfrom developTencentBlueKing/bk-iam-saas:developCopy head branch name to clipboardJun 4, 2024

+4,768-778

Commits

Commits on Apr 7, 2024

• feat: add super manger notification config api

  zhu327

  committed
  c8bdd5d

• Merge pull request #2595 from zhu327/feat_notification

  Show description for f0dc28a
  zhu327

  authored
  f0dc28a

• feature: 提交续期通知部分代码

  lhzzforever

  committed
  2ab8489

• Merge pull request #2596 from lhzzforever/dev/develop_ci_renewal_notice

  Show description for 4506511
  ielgnaw

  authored
  4506511

• fix: 添加漏缺的路由文件

  lhzzforever

  committed
  97e8f4b

• Merge branch 'ft_renewal_notice' into dev/develop_ci_renewal_notice

  lhzzforever

  authored
  736fd38

• Merge pull request #2597 from lhzzforever/dev/develop_ci_renewal_notice

  Show description for 70c2291
  ielgnaw

  authored
  70c2291

• Merge branch 'upstream/ft_renewal_notice' into dev/develop_ci_renewal_notice

  lhzzforever

  committed
  a8930f2

• Merge branch 'dev/develop_ci_renewal_notice' of https://github.com/lhzzforever/bk-iam-saas into dev/develop_ci_renewal_notice

  lhzzforever

  committed
  d0e2795

• Merge branch 'upstream/ft_renewal_notice' into dev/develop_ci_renewal_notice

  lhzzforever

  committed
  d84fc45

• fix: fix expired_at_before

  zhu327

  committed
  e8fb308

• Merge pull request #2598 from zhu327/feat_notification

  Show description for 0f8f8de
  zhu327

  authored
  0f8f8de

• fix: fix init permission_expire_remind task

  zhu327

  committed
  958b503

• Merge pull request #2599 from zhu327/feat_notification

  Show description for 141749f
  zhu327

  authored
  141749f

Commits on Apr 8, 2024

• build: update requirements (#2601)

  zhu327

  authored
  25b806a

• feature: 完成续期通知模块需求前端开发(待联调)

  lhzzforever

  committed
  f5f27a1

• Merge branch 'upstream/develop' into dev/develop_ci_renewal_notice

  lhzzforever

  committed
  2c1ad52

• Merge branch 'upstream/ft_renewal_notice' into dev/develop_ci_renewal_notice

  lhzzforever

  committed
  0d7a4a6

Commits on Apr 9, 2024

• feature: 添加续期通知重置功能

  lhzzforever

  committed
  0c2c7d1

Commits on Apr 10, 2024

• Feat notification (#2607)

  zhu327

  authored
  c8431bb

Commits on Apr 12, 2024

• fix: 合并develop分支代码

  lhzzforever

  committed
  6e17cfa

• feature: 续期通知模块全部代码

  lhzzforever

  committed
  f0a247d

• Merge branch 'upstream/ft_renewal_notice' into dev/develop_ci_renewal_notice

  lhzzforever

  committed
  b6b9871

Commits on Apr 15, 2024

• Merge pull request #2602 from lhzzforever/dev/develop_ci_renewal_notice

  Show description for 4aff073
  ielgnaw

  authored
  4aff073

• fix: 提交漏缺的续期api文件

  lhzzforever

  committed
  0cbe95d

• Merge pull request #2617 from lhzzforever/dev/develop_ci_renewal_notice

  Show description for eedeecb
  ielgnaw

  authored
  eedeecb

• fix: 整改重置按钮交互，限制通知范围过期前和过期后最大天数范围

  lhzzforever

  committed
  5f2815f

• fix: 重置和恢复默认增加非空校验

  lhzzforever

  committed
  bba8fd9

• Merge branch 'upstream/ft_renewal_notice' into dev/develop_ci_renewal_notice

  lhzzforever

  committed
  888c9c0

• fix: 修改通知范围tip

  lhzzforever

  committed
  c78d519

• Merge pull request #2619 from lhzzforever/dev/develop_ci_renewal_notice

  Show description for 1959dee
  ielgnaw

  authored
  1959dee

Commits on Apr 16, 2024

• Merge branch 'upstream/develop' into dev/develop_ci_renewal_notice

  lhzzforever

  committed
  70c90ec

Commits on Apr 17, 2024

• fix: 去掉恢复默认值功能

  lhzzforever

  committed
  73fd12b

• Merge branch 'upstream/develop' into dev/develop_ci_renewal_notice

  lhzzforever

  committed
  027a3cd

• Merge pull request #2624 from lhzzforever/dev/develop_ci_renewal_notice

  Show description for 2059a4f
  ielgnaw

  authored
  2059a4f

• Merge remote-tracking branch 'upstream/develop' into ft_renewal_notice

  zhu327

  committed
  a931501

• feat: update periodic task config

  zhu327

  committed
  dca760f

• feature: 续期邮件通知模板增加过期成员、管理空间、资源实例等数据展示

  lhzzforever

  committed
  0f8ac5d

• Merge branch 'upstream/ft_renewal_notice' into dev/develop_ci_renewal_notice

  lhzzforever

  committed
  f45a42c

• Merge pull request #2626 from lhzzforever/dev/develop_ci_renewal_notice

  Show description for 370e95f
  ielgnaw

  authored
  370e95f

• feature: 增加最大15天，最小7天的时间限制

  lhzzforever

  committed
  770e1f9

• fix: update role notice config permission

  zhu327

  committed
  ddfb31a

• Merge remote-tracking branch 'upstream/ft_renewal_notice' into ft_renewal_notice

  zhu327

  committed
  a17b5c5

• fix: update role notice config permission

  zhu327

  committed
  5d05cd9

• fix: 优化不同导航栏下同名路由刷新时候切换其他管理身份会刷新不在授权范围内的接口

  lhzzforever

  committed
  efeda24

• Merge branch 'upstream/ft_renewal_notice' into dev/develop_ci_renewal_notice

  lhzzforever

  committed
  e429641

• Merge pull request #2627 from lhzzforever/dev/develop_ci_renewal_notice

  Show description for 048efbd
  ielgnaw

  authored
  048efbd

• fix: update expire remind expired_at_before range

  zhu327

  committed
  36075fc

• fix: update role renew group list

  zhu327

  committed
  8cc1b7d

• fix: 修改用户续期通知模板班样式

  lhzzforever

  committed
  8fa8266

• fix: 修复首次加载刷新页面后续期成员勾选总数量计算错误

  lhzzforever

  committed
  1e01c32

• Merge branch 'upstream/ft_renewal_notice' into dev/develop_ci_renewal_notice

  lhzzforever

  committed
  ad29e08

• fix: 优化数字输入框为空时，点击自增按钮会出现负数

  lhzzforever

  committed
  d2b9649

• Merge pull request #2629 from lhzzforever/dev/develop_ci_renewal_notice

  Show description for 111b302
  ielgnaw

  authored
  111b302

Commits on Apr 18, 2024

• feat: add bk_apigateway management api white list

  zhu327

  committed
  757751b

• feat(role): add role config update permission and audit data

  zhu327

  committed
  4c68cb7

Commits on Apr 19, 2024

• feature: 续期通知增加关闭邮件通知功能

  lhzzforever

  committed
  82abfba

• fix: 同步更新续期通知状态

  lhzzforever

  committed
  7bbbff2

• fix: 默认状态为false

  lhzzforever

  committed
  d777dec

• Merge pull request #2630 from lhzzforever/dev/develop_ci_renewal_notice

  Show description for aa9327d
  ielgnaw

  authored
  aa9327d

• fix: 申请加入用户组其他类型的错误也需要提示

  lhzzforever

  committed
  1be8800

• Merge branch 'upstream/develop' into dev/develop_ci

  lhzzforever

  committed
  2092e5a

Commits on Apr 22, 2024

• fix: 去掉信息提示

  lhzzforever

  committed
  690570b

• fix: 修复全屏下空状态位置规范

  lhzzforever

  committed
  5259dd4

• feat: add rtx notification

  zhu327

  committed
  907abda

• Merge remote-tracking branch 'upstream/ft_renewal_notice' into ft_renewal_notice

  zhu327

  committed
  6653a45

• fix: sentry sdk

  zhu327

  committed
  2764fd1

• fix: fix rtx notification

  zhu327

  committed
  6142714

• Merge branch 'upstream/ft_renewal_notice' into dev/develop_ci_renewal_notice

  lhzzforever

  committed
  1747996

• fix: 用户组成员续期处理无用户组织数据有人员模板数据情况下，自动定位到人员模板选项

  lhzzforever

  committed
  f09767d

• fix: 修复偶现切换staff角色的菜单会出现无权限访问

  lhzzforever

  committed
  b0dae3e

• fix: fix rtx notification

  zhu327

  committed
  2ec9b35

• fix: 在mouted钩子添加销毁事件

  lhzzforever

  committed
  1b4d702

• Merge pull request #2632 from lhzzforever/dev/develop_ci_renewal_notice

  Show description for 06da449
  ielgnaw

  authored
  06da449

Commits on Apr 23, 2024

• fix: 提交漏缺代码

  lhzzforever

  committed
  87d30a8

• Merge branch 'upstream/ft_renewal_notice' into dev/develop_ci_renewal_notice

  lhzzforever

  committed
  11709d1

• Merge pull request #2633 from lhzzforever/dev/develop_ci_renewal_notice

  Show description for a728f9b
  ielgnaw

  authored
  a728f9b

• fix: fix celery beat

  zhu327

  committed
  e093d42

• fix: add need_run_expired_remind function

  zhu327

  committed
  68df6d5

• fix: fix celery expired remind

  zhu327

  committed
  a4ae048

• fix: fix expired remind celery task

  zhu327

  committed
  0a76a78

Commits on Apr 25, 2024

• fix: 修复用户组添加权限无法显示面包屑标题

  lhzzforever

  committed
  98e6bc0

• Merge branch 'upstream/ft_renewal_notice' into dev/develop_ci_renewal_notice

  lhzzforever

  committed
  c221b69

Commits on Apr 26, 2024

• fix: fix celery app import

  zhu327

  committed
  36b16cd

• fix: update remind info role type display

  zhu327

  committed
  26967f0

Commits on Apr 28, 2024

• Merge branch 'upstream/ft_renewal_notice' into dev/develop_ci_renewal_notice

  lhzzforever

  committed
  f0ca418

• Merge branch 'upstream/develop' into dev/develop_ci_renewal_notice

  lhzzforever

  committed
  5616bf5

Commits on May 6, 2024

• feature: 用户 —>同步记录同步中的状态增加删除同步记录功能

  lhzzforever

  committed
  e8828f9

• Merge pull request #2635 from lhzzforever/dev/develop_ci_renewal_notice

  Show description for deb6b7a
  ielgnaw

  authored
  deb6b7a

• feature: 升级人员选择器npm包版本

  lhzzforever

  committed
  b053659

• Merge branch 'upstream/ft_renewal_notice' into dev/develop_ci_renewal_notice

  lhzzforever

  committed
  eb674a8

• Merge pull request #2641 from lhzzforever/dev/develop_ci_renewal_notice

  Show description for 2ef1c61
  ielgnaw

  authored
  2ef1c61

• feature: 新建邮件通知模板、企业微信通知模板侧边栏

  lhzzforever

  committed
  79b3129

Commits on May 7, 2024

• fix: 处理刷新后从storage获取设置定时器状态

  lhzzforever

  committed
  18e29ee

• feature: 企业微信、邮件通知方式下的通知模板需求

  lhzzforever

  committed
  9b015f2

• Merge branch 'upstream/ft_renewal_notice' into dev/develop_ci_renewal_notice

  lhzzforever

  committed
  2c7a4c7

Commits on May 8, 2024

• feature: 添加邮件类型的通知模板

  lhzzforever

  committed
  0afbed7

• fix: 处理小屏幕下文字层级

  lhzzforever

  committed
  6693614

Commits on May 9, 2024

• fix: 统一通知模板不同通知方式的设计交互

  lhzzforever

  committed
  278e1b9

• fix: 测试反向资源拉取不同父级下相同id数据会存在数据丢失情况

  lhzzforever

  committed
  3385d27

• fix: 打印log日志排查

  lhzzforever

  committed
  1ffea61

• Merge pull request #2645 from lhzzforever/dev/develop_ci

  Show description for a237995
  ielgnaw

  authored
  a237995

• Merge branch 'upstream/develop' into dev/develop_ci_renewal_notice

  lhzzforever

  committed
  68f288a

• fix: 处理type为空的情况

  lhzzforever

  committed
  c6fe124

• fix: 处理type为空的情况

  lhzzforever

  committed
  c5b1c8c

• Merge pull request #2646 from lhzzforever/dev/develop_ci

  Show description for aa48d9c
  ielgnaw

  authored
  aa48d9c

• fix: 修复全平台ip选择器不同拓扑下相同类型的子集数据会被去重遗漏

  lhzzforever

  committed
  0f3d70b

• Merge branch 'upstream/develop' into dev/develop_ci

  lhzzforever

  committed
  414bd30

• Merge branch 'upstream/develop' into dev/develop_ci_renewal_notice

  lhzzforever

  committed
  c00002b

• feature: 处理通知模板rules和event校验

  lhzzforever

  committed
  cfb5a38

• Merge pull request #2647 from lhzzforever/dev/develop_ci

  Show description for 989d0d1
  ielgnaw

  authored
  989d0d1

Commits on May 10, 2024

• fix: util文件统一参数说明

  lhzzforever

  committed
  271c0ef

• Merge branch 'upstream/develop' into dev/develop_ci_renewal_notice

  lhzzforever

  committed
  87827bb

• fearetue； 设置popover-confirm关闭的默认高度为0

  lhzzforever

  committed
  788a44a

• Merge pull request #2643 from lhzzforever/dev/develop_ci_renewal_notice

  Show description for e2bb546
  ielgnaw

  authored
  e2bb546

• feat: 新增的超管类接口对接apigateway #2648 (#2649)

  Canway-shiisa

  authored
  c42cf08

• feature: 测试小窗登录由iframe方式变更为window.open

  lhzzforever

  committed
  ed0bbb5

• feature: 修改小窗登录默认宽度值

  lhzzforever

  committed
  3c8847d

• Merge branch 'upstream/develop' into dev/develop_ci

  lhzzforever

  committed
  0765b8c

• feature: 注释通知模板入口

  lhzzforever

  committed
  f46980d

• Merge branch 'upstream/ft_renewal_notice' into dev/develop_ci_renewal_notice

  lhzzforever

  committed
  08013ac

Commits on May 11, 2024

• fix: 处理保存会有loading闪一下问题

  lhzzforever

  committed
  df84706

• fix: 去掉样式

  lhzzforever

  committed
  824e445

• feature: 登录小窗修改为使用window.open

  lhzzforever

  committed
  4034a4c

• fix: 注释多余iframe代码

  lhzzforever

  committed
  55b5c74

• fix: 去掉多余log

  lhzzforever

  committed
  73f408e

• fix: 组件库升级后cascade组件样式出现滚动条

  lhzzforever

  committed
  26d3655

• fix: 提交漏缺字段

  lhzzforever

  committed
  a079425

• Merge pull request #2650 from lhzzforever/dev/develop_ci

  Show description for be03880
  ielgnaw

  authored
  be03880

• fix: 修改登录后重定向地址

  lhzzforever

  committed
  43d982c

• Merge branch 'upstream/develop' into dev/develop_ci

  lhzzforever

  committed
  5f570c5

• Merge pull request #2653 from lhzzforever/dev/develop_ci

  Show description for cc3b2ac
  ielgnaw

  authored
  cc3b2ac

• fix: 修改回调地址

  lhzzforever

  committed
  a96edf5

• Merge branch 'upstream/develop' into dev/develop_ci

  lhzzforever

  committed
  49c8e7f

• feature： 修改地址

  lhzzforever

  committed
  2ddf619

• Merge pull request #2654 from lhzzforever/dev/develop_ci

  Show description for 49126c2
  ielgnaw

  authored
  49126c2

• feature: 添加静态目录文件login_succes.html

  lhzzforever

  committed
  1344335

• Merge branch 'upstream/develop' into dev/develop_ci

  lhzzforever

  committed
  524f927

• Merge pull request #2655 from lhzzforever/dev/develop_ci

  Show description for d7d1839
  ielgnaw

  authored
  d7d1839

• feat: window.open 登录 (#2656)

  ielgnaw

  authored
  e1a87c9

• feat: window.open 登录 (#2658)

  ielgnaw

  authored
  fe06807

• feat: update role/user rtx notification

  zhu327

  committed
  cb17142

• Merge branch 'upstream/ft_renewal_notice' into dev/develop_ci_renewal_notice

  lhzzforever

  committed
  98e6b71

• feature: 合并develop分支代码

  lhzzforever

  committed
  2f9c399

• Merge pull request #2651 from lhzzforever/dev/develop_ci_renewal_notice

  Show description for 2363bab
  ielgnaw

  authored
  2363bab

Commits on May 13, 2024

• fix: update user rtx nitifaction template

  zhu327

  committed
  f9d4cea

• docs: v1.10.28

  zhu327

  committed
  44fde25

• Merge pull request #2659 from TencentBlueKing/ft_renewal_notice

  Show description for 99040c5
  zhu327

  authored
  99040c5

• fix: 修复资源实例ip选择器多层级输入关键词进行搜索返回的数据有缺失

  lhzzforever

  committed
  c5b532a

• Merge pull request #2661 from lhzzforever/dev/develop_ci

  Show description for 179f2fd
  ielgnaw

  authored
  179f2fd

Commits on May 15, 2024

• fix: 去掉catch拦截

  lhzzforever

  committed
  937e564

• Merge branch 'upstream/ft_renewal_notice' into dev/develop_ci_renewal_notice

  lhzzforever

  committed
  3d994fd

• fix: fix get_user_expired_groups_policies (#2664)

  zhu327

  authored
  166195b

Commits on May 16, 2024

• Merge branch 'upstream/develop' into dev/develop_ci_renewal_notice

  lhzzforever

  committed
  abd55c0

• fix: 管理空间、用户组详情页链接直接访问会重定向到对应列表页

  lhzzforever

  committed
  569b234

• Merge pull request #2663 from lhzzforever/dev/develop_ci_renewal_notice

  Show description for 6ec6cee
  ielgnaw

  authored
  6ec6cee

Commits on May 20, 2024

• feature: 退出登录重定向地址增加is_from_logout字段

  lhzzforever

  committed
  02c6d94

• Merge pull request #2666 from lhzzforever/dev/develop_ci

  Show description for 43e612f
  ielgnaw

  authored
  43e612f

Commits on May 21, 2024

• feature; 审计模块增加续期通知类型业务

  lhzzforever

  committed
  4b47265

• fix: 去掉log

  lhzzforever

  committed
  7e18c90

• Merge pull request #2667 from lhzzforever/dev/develop_ci_renewal_notice

  Show description for 7832d4f
  ielgnaw

  authored
  7832d4f

Commits on May 22, 2024

• fix: 邮件模板表格文字修改 (#2671)

  lhzzforever

  authored
  f62e26e

• Merge pull request #2672 from TencentBlueKing/ft_renewal_notice

  Show description for c376541
  zhu327

  authored
  c376541

Commits on May 28, 2024

• fix: 修复管理员—>超级管理员删除后无法关闭弹窗

  lhzzforever

  committed
  1f54810

Commits on May 30, 2024

• fix: 优化产品侧提出的系统体验问题

  lhzzforever

  committed
  a4efe05

• fix: 修复申请续—>自定义权限所属系统筛选无法自定义分页

  lhzzforever

  committed
  793d338

• Merge pull request #2674 from lhzzforever/dev/develop_ci

  Show description for 38ba2cc
  ielgnaw

  authored
  38ba2cc

• fix: 提交漏缺代码样式

  lhzzforever

  committed
  0b561d7

• Merge branch 'develop' into dev/develop_ci

  lhzzforever

  authored
  51cb8d0

• fix: 模板关联用户组页面下拉到底部后翻页按钮显示异常

  lhzzforever

  committed
  56a0a33

• fix: 用户组页面删除用户组后，用户组数量展示消失

  lhzzforever

  committed
  95caf53

• Merge pull request #2675 from lhzzforever/dev/develop_ci

  Show description for cebfd4c
  ielgnaw

  authored
  cebfd4c

• fix: 修复非超管身份有限制实例存在无限制的场景

  lhzzforever

  committed
  7bce58e

• fix: 测试只有一层拓扑且展开无数据时资源类型错误问题

  lhzzforever

  committed
  4821698

• Merge pull request #2678 from lhzzforever/dev/develop_ci

  Show description for 9445f02
  ielgnaw

  authored
  9445f02

Commits on May 31, 2024

• fix: 去掉mock数据

  lhzzforever

  committed
  b4b7234

• Merge pull request #2679 from lhzzforever/dev/develop_ci

  Show description for 326a5b2
  ielgnaw

  authored
  326a5b2

• fix: update email notification source (#2680)

  zhu327

  authored
  e6eb630

• feature: 变更邮件续期source值

  lhzzforever

  committed
  37aa149

• Merge branch 'upstream/develop' into dev/develop_ci

  lhzzforever

  committed
  611ee5d

• Merge pull request #2681 from lhzzforever/dev/develop_ci

  Show description for 26778ad
  ielgnaw

  authored
  26778ad

Commits on Jun 3, 2024

• fix: 已关联用户组的人员模板在批量删除的时候可以成功被删除

  lhzzforever

  committed
  be657fc

• fix: 添加漏缺国际化

  lhzzforever

  committed
  4e5f41e

• Merge pull request #2684 from lhzzforever/dev/develop_ci

  Show description for 8e8ebd4
  ielgnaw

  authored
  8e8ebd4

Commits on Jun 4, 2024

• feat(open api): apply policy support custom ticket (#2685) (#2686)

  Show description for 7d1c102
  nannan00

  authored
  7d1c102

• docs(version log): v1.10.28 (#2689)

  nannan00

  authored
  6aea390