Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update master #1

Merged
merged 91 commits into from
Nov 29, 2023
Merged

update master #1

merged 91 commits into from
Nov 29, 2023

Conversation

pengkang1991
Copy link
Owner

No description provided.

LeoQuote and others added 30 commits January 12, 2023 16:14
* use 3.10 instead of 3.10.0

* fix yaml error

* no python-dev needed

* update pyodps version

* add pandas

* add coverage django plugin

* revert

* update coverage command
Bumps [django](https://github.com/django/django) from 4.1.1 to 4.1.2.
- [Release notes](https://github.com/django/django/releases)
- [Commits](django/django@4.1.1...4.1.2)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* 优化mongo的method取值逻辑

* 支持显示DML影响行数

* 修复执行报错仍显示正常结束的bug

* 补充单元测试
* ✨ 增加OIDC登入功能

* ✨ added init_user and use username to identify the user instead of email

* ✨ added well-known url for oidc config discovery

* 🔥 remove default values for required oidc variables

* 🎨 added response.raise_for_status()

* 🎨 format

* 🎨 add mozilla_django_oidc.middleware.SessionRefresh in condition

* ✨ 增加OIDC登入功能

* ✨ added init_user and use username to identify the user instead of email

* ✨ added well-known url for oidc config discovery

* 🔥 remove default values for required oidc variables

* 🎨 added response.raise_for_status()

* 🎨 format

* 🎨 add mozilla_django_oidc.middleware.SessionRefresh in condition

* 🎨 conditional import mozilla_django_oidc

Co-authored-by: Leo Q <[email protected]>
* 变更dockerfile-base

* 变更dockerfile-base

* 更新dockerfile

精简镜像体积

* 增加pip软件源

* Update Dockerfile
* fix black check
Add files via upload

Add files via upload

Add files via upload

Co-authored-by: Leo Q <[email protected]>
* feat(mysql): 添加ddl_dml不能同时提交的逻辑

Signed-off-by: summing.yu <[email protected]>

* format: black format

Signed-off-by: summingyu <[email protected]>

---------

Signed-off-by: summing.yu <[email protected]>
Signed-off-by: summingyu <[email protected]>
Co-authored-by: summing.yu <[email protected]>
Bumps [django](https://github.com/django/django) from 4.1.2 to 4.1.7.
- [Release notes](https://github.com/django/django/releases)
- [Commits](django/django@4.1.2...4.1.7)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* fix: 支持使用create or replace创建函数、存储过程、视图以及包等语句

原来代码只支持使用create创建函数、存储过程、视图以及包,使用create or replace创建时获取不到对象名导致报错,实际运维中上线SQL大多使用create or replace方式,修改后同时支持使用create 和 create or replace两个方式。

* Update oracle.py

fix-支持Oracle创建存储过程、函数、包等,使用create or replace方式

* Update oracle.py

优化使用正则提取SQL语句中 object name 部分的代码逻辑

* Update oracle.py

优化获取object name部分代码

* Update oracle.py

优化代码

* Update oracle.py

修复lint报错(代码规范)

* Update oracle.py

处理lint报错(代码规范)

* Update oracle.py

* Update oracle.py

调整代码规范
…2062)

* add parameters in clickhouse and mysql engine to avoid sql injection

* black
…jection" (#2077)

Revert "add parameters in clickhouse and mysql engine to avoid sql injection (#2062)"

This reverts commit 69c78c0.
* 修复mongo会话管理报错

* 补充类型
Revert "engine增加escape_string用于处理字符串参数转义 (#2107)"

This reverts commit e2573b7.
* add mongo db type management support

* 更新功能清单支持MongoDB账号管理

* refomat code by black

* add unittest for MySQL&MongoDB management function

---------

Co-authored-by: 小圈圈 <[email protected]>
mongo、oracle支持会话管理
* engine增加escape_string用于处理字符串参数转义

* engine查询增加参数化选项,修改sql参数化方式
* Update oracle.py

fix:解决从SQL执行计划中获取影响行数,原代码直接从Oracle系统全局临时表SYS.PLAN_TABLE$获取数据在特定情况下(登录的Oracle用户生成了自己的PLAN_TABLE表)可能为空,从而导致Archery平台报错:'NoneType' object is not subscriptable的问题。

* Update oracle.py

调整代码格式

* Update oracle.py
Bumps [django](https://github.com/django/django) from 4.1.7 to 4.1.9.
- [Commits](django/django@4.1.7...4.1.9)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* add mongo db type management support

* 更新功能清单支持MongoDB账号管理

* refomat code by black

* add unittest for MySQL&MongoDB management function

* add dingding login

* add comment for setting dingding auth

* add log info for authentication

* fixed

* fixed

---------

Co-authored-by: 小圈圈 <[email protected]>
LeoQuote and others added 29 commits October 23, 2023 15:44
* 用 WorkflowType 和 WorkflowStatus 两个 enum 替换WorkflowDict

* black
* 修改脱敏不区分大小写

* 如果脱敏规则配置时大小写混用转成小写匹配
* 针对性修复 sql_analyze 读取文件的 bug

* 针对性修复 sql_analyze 读取文件的 bug

* add strip
* 重构 audit 相关代码, 改为面向对象实现

* 使用 pytst 运行测试

* fix tests

* fix coverage generation

* more coverage

* 修复 audit_groups 的类型错误

* 不抛错给用户, 改为输出日志
* 初始化 notify 时自动根据 workflow audit 取 workflow

* 新增初始化时不传 workflow 的初始化
* 新增cas登录

* 新增cas登录

* 新增cas登录

* 新增cas登录

* 新增cas登录

* black格式化

* 修改模块引用错误

* 修改模块引用错误

* 修改模块引用错误

* 新增最大SQL提交数

* Update mssql.py

格式化代码

* black 代码

---------

Co-authored-by: lanjiaxuan <[email protected]>
* 正常设置自动通过的工单

* 补充自动通过的单元测试

* black
* 修复sql query 审核回调

* 新增 query privilege 审核单元测试

* black

* 删除无用函数
Bumps [django](https://github.com/django/django) from 4.1.10 to 4.1.13.
- [Commits](django/django@4.1.10...4.1.13)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* 示例建表语句优化

* 去除bom,恢复首行渲染
Revert "新增sql执行行数限制 (#2366)"

This reverts commit d32d7bc.
1. 修复工单自动驳回时的工单状态未修改的bug
2. 将 is_auto_review 改为 AuditV2 的方法, 防止审批流还未创建时调用出错
* 待审批的查询和上线工单, 都显示审批人用户名

* black

* 补充工单详情的单元测试

* 补充工单详情的单元测试
* 在不启用 oidc, dingding 认证时, 不include 对应的路由

* add no cover marker (没有必要做测试)

* add no cover marker (没有必要做测试)

* black

* fix marker

* fix marker
Update Dockerfile-base with Python 3.11-bullseye
and other dependencies
* use debian as base

* update base
* 实例账号管理功能兼容 mariadb

* black
* feat:support mongodb commit sql with comments

* feat:support mongodb commit sql with comments

* fix:black code

---------

Co-authored-by: linhui <[email protected]>
* 修复 notify 的bug

* notify_for_execute 之前没有正确设置 event type, 导致逻辑错误
* 有些推送的 send 方法会需要 audit 对象, 所以在初始化对象时尝试获取一下 audit 对象
* 把根据 workflow 取 audit 对象的方法挪到 model 层

* 增加一行覆盖

* f

* f
* 修复表结构显示不正确的 bug

* f
* #2410
修复页面实例选项空白问题

* #2410
修复页面实例选项空白问题

* #2410
修复页面实例选项空白问题

---------

Co-authored-by: lanjiaxuan <[email protected]>
修复最新基础镜像mssql连接问题
* 补充遗漏的企业微信自建应用的通知

* Update settings.py

* 增加企业微信个人推送的简单测试

* 再加点测试通过检查

* 再加点测试通过检查
* 修复查询 tab 随意跳转的 bug

* fix syntax

* 恢复大部分针对引擎的自定义代码, 整理为配置-渲染的模式, 方便复用

* 优化 redis 帮助手册的代码风格

* 禁用 cassandra 的 explain

* 修复"相同表结构查看没有复用结果tab" bug
@pengkang1991 pengkang1991 merged commit 64d12dd into pengkang1991:master Nov 29, 2023
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.