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.

Sign up for GitHub

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

build(deps): bump pycryptodome from 3.12.0 to 3.19.1 in /cmdb-api #367

Open
wants to merge 327 commits into
base: master
Choose a base branch
from
Open

build(deps): bump pycryptodome from 3.12.0 to 3.19.1 in /cmdb-api #367

Changes from 1 commit
Commits
Show all changes
327 commits
Select commit Hold shift + click to select a range
ece2408
fix MyJSONEncoder
pycook Aug 16, 2023
b16bfdf
fix(acl): g user issue
EvanSung Aug 17, 2023
4cc2e47
Merge pull request #157 from EvanSung/fix_20230817_guser_issue
pycook Aug 17, 2023
0ebd52f
lint
pycook Aug 19, 2023
4abe4d7
version: 2.3.1
pycook Aug 19, 2023
7547b67
fix g.user
pycook Aug 21, 2023
9e2bf3d
fix merge conflict
pycook Aug 21, 2023
590565b
Register api and commands with absolute paths
pycook Aug 21, 2023
8296e9a
fix update ci
pycook Aug 22, 2023
dd1c783
add config CACHE_REDIS_PASSWORD and fix delete ci_type
pycook Aug 23, 2023
23fd56c
vxe-table-plugin-export-xlsx==2.0.0
pycook Aug 24, 2023
cb3a9d9
docker-compose add flask db-setup
pycook Aug 24, 2023
ceacc0a
perf(ad_ci_relation): optimize ad_ci relation
EvanSung Aug 24, 2023
093466e
Merge pull request #158 from EvanSung/perf_20230824_optimize_ad_ci_re…
pycook Aug 24, 2023
95d3b02
fix 新增类型回车键发送两次请求
wang-liang0615 Aug 25, 2023
320dc07
fix 新增类型回车键发送两次请求
wang-liang0615 Aug 25, 2023
5044af5
Merge pull request #160 from veops/dev_ui
wang-liang0615 Aug 25, 2023
2a98c00
update ad_ci when deleting ci
pycook Aug 25, 2023
cd70b16
Merge branch 'master' of github.com:veops/cmdb
pycook Aug 25, 2023
3382195
fix: company info create
simontigers Aug 29, 2023
17c851f
Merge pull request #161 from simontigers/common_setting_format
pycook Aug 29, 2023
08f9bd9
The default value of USE_ACL is set to True
pycook Aug 29, 2023
a99ecb9
Merge branch 'master' of github.com:veops/cmdb
pycook Aug 29, 2023
6356200
fix update attribute
pycook Aug 30, 2023
f41873d
支持上传自定义图标
wang-liang0615 Aug 31, 2023
d1af0eb
feat: add cmdb custom icon manage
simontigers Aug 31, 2023
b1cfb88
Merge pull request #163 from veops/dev_ui
pycook Aug 31, 2023
3e6955f
Merge pull request #162 from simontigers/cmdb_icon_manage
pycook Aug 31, 2023
f215e88
proxy
wang-liang0615 Aug 31, 2023
04fc588
Merge pull request #165 from veops/dev_ui
wang-liang0615 Aug 31, 2023
ff9af51
fix delete choice values
pycook Aug 31, 2023
03f2ff9
fix delete choice values
pycook Aug 31, 2023
366311e
format
pycook Sep 1, 2023
3664994
import format
pycook Sep 2, 2023
ec9b5a0
sidebar
wang-liang0615 Sep 4, 2023
61e8c61
Merge branch 'master' of github.com:veops/cmdb into dev_ui
wang-liang0615 Sep 4, 2023
6594863
Merge pull request #166 from veops/dev_ui
wang-liang0615 Sep 4, 2023
78c542e
sub menu color
wang-liang0615 Sep 4, 2023
b8fa68e
Merge pull request #167 from veops/dev_ui
wang-liang0615 Sep 4, 2023
d823564
move Dockerfile to docs
pycook Sep 5, 2023
0fa95ae
Merge branch 'master' of github.com:veops/cmdb
pycook Sep 5, 2023
d8646f8
模型关联 展示反向关系
wang-liang0615 Sep 5, 2023
6758b99
Merge branch 'master' of github.com:veops/cmdb into dev_ui
wang-liang0615 Sep 5, 2023
f0467c3
Merge pull request #168 from veops/dev_ui
wang-liang0615 Sep 5, 2023
9e5c926
feat: support docker deploy mysql and redis
ronething Sep 5, 2023
00fbe15
add document link
ivonGwy Sep 5, 2023
33313b6
Merge pull request #169 from veops/doc
ivonGwy Sep 5, 2023
c3b55c2
Merge pull request #170 from ronething/feat/xx
pycook Sep 5, 2023
b826de4
optimize: makefile help
ronething Sep 5, 2023
eb9c20a
fix: review
ronething Sep 5, 2023
32227d3
fix: review
ronething Sep 5, 2023
c0c05bc
fix: review
ronething Sep 5, 2023
0155eb9
Merge pull request #171 from ronething/fix/makefile
pycook Sep 5, 2023
1660139
Add CI relationship when creating CI, the text value removes the escape
pycook Sep 7, 2023
198ecad
Merge branch 'master' of github.com:veops/cmdb
pycook Sep 7, 2023
6d50a13
新建ci及批量导入时，新建关系
wang-liang0615 Sep 7, 2023
0585855
Merge pull request #172 from veops/dev_ui
pycook Sep 7, 2023
99e5a93
release 2.3.2
pycook Sep 7, 2023
976cac6
计算属性 触发计算
wang-liang0615 Sep 11, 2023
3170048
Merge branch 'master' of github.com:veops/cmdb into dev_ui
wang-liang0615 Sep 11, 2023
ebce839
fix upload template and add /api/v0.1/attributes/<int:attr_id>/calc_c…
pycook Sep 11, 2023
3cb78f3
计算属性 触发计算 (#174)
wang-liang0615 Sep 11, 2023
6890528
Detect circular dependencies when adding CIType relationships
pycook Sep 12, 2023
881b8cc
cmdb-api/api/lib/resp_format.py
pycook Sep 12, 2023
25ad219
enhance dashboard
pycook Sep 15, 2023
7f66f76
feat: init resource for backend (#176)
simontigers Sep 15, 2023
606be7f
dashboard ui update
pycook Sep 15, 2023
1a7c3fc
release v2.3.3
pycook Sep 15, 2023
79f5dac
fix dashboard compute
pycook Sep 18, 2023
82d4c4f
fix date search
pycook Sep 18, 2023
cd45106
fix: icon svg support (#177)
simontigers Sep 20, 2023
deabebb
refactor: CI triggers
pycook Sep 22, 2023
2420631
Merge branch 'master' of github.com:veops/cmdb into dev_ui
wang-liang0615 Sep 25, 2023
b1d0bdb
pref:仪表盘优化
wang-liang0615 Sep 25, 2023
43c5d74
Merge pull request #178 from veops/dev_ui
wang-liang0615 Sep 25, 2023
dca8781
fix: ci_cache
pycook Sep 25, 2023
ff1626f
feat:新增api&适配
wang-liang0615 Sep 26, 2023
7181f28
feat:触发器
wang-liang0615 Sep 26, 2023
e0a0113
add packages & 注释代码
wang-liang0615 Sep 26, 2023
968ef93
feat: webhook tips
wang-liang0615 Sep 26, 2023
b8d93bc
feat: UI更新 触发器 (#179)
wang-liang0615 Sep 26, 2023
8e6ce05
feat: common notice config (#180)
simontigers Sep 26, 2023
b58230f
delete:删除getwx
wang-liang0615 Sep 26, 2023
9f5979c
feat:wangeditor 注册自定义组件
wang-liang0615 Sep 26, 2023
9bb787d
fix:topo图相同节点出现两次的bug
wang-liang0615 Sep 26, 2023
2b1b033
Merge branch 'master' into dev_ui
wang-liang0615 Sep 26, 2023
718fca5
Merge pull request #181 from veops/dev_ui
wang-liang0615 Sep 26, 2023
983cb40
fix:add package (#182)
wang-liang0615 Sep 26, 2023
373346e
feat: ci triggers
pycook Sep 26, 2023
42c506d
前端更新 (#183)
wang-liang0615 Sep 27, 2023
f57d640
feat: add api get_notice_by_ids (#184)
simontigers Sep 27, 2023
388134b
release 2.3.4
pycook Sep 27, 2023
c0541b7
Dev UI (#186)
wang-liang0615 Sep 28, 2023
ef90506
feat: The definition of attribute choice values supports webhook and …
pycook Oct 9, 2023
63ed73f
fix: delete user role
pycook Oct 9, 2023
8c6389b
feat: notice_config access messenger (#190)
simontigers Oct 9, 2023
d501436
前端更新 (#189)
wang-liang0615 Oct 9, 2023
dd8f66a
fix: init company structure resource (#191)
simontigers Oct 9, 2023
17b27d4
前端更新 (#192)
wang-liang0615 Oct 9, 2023
40b9bec
feat: get messenger url from common setting
pycook Oct 9, 2023
4cbf70e
release: v2.3.5
pycook Oct 9, 2023
f629558
pref:用户密钥非必填 (#193)
wang-liang0615 Oct 10, 2023
59d9f2c
docs: update (#194)
pycook Oct 10, 2023
f9ee895
Dev UI 231009 (#195)
wang-liang0615 Oct 11, 2023
c8a68bd
Dev api (#196)
pycook Oct 11, 2023
ea13432
change wechat pic
ivonGwy Oct 11, 2023
b269ef8
change wechat pic size
ivonGwy Oct 11, 2023
4fcddd1
Merge pull request #197 from veops/doc
ivonGwy Oct 11, 2023
0cd5c02
pref:批量上传&资源管理小优化 (#199)
wang-liang0615 Oct 12, 2023
30477f7
fix: common perms (#200)
simontigers Oct 12, 2023
3d05cef
feat(db): support flask migrate (#201)
EvanSung Oct 13, 2023
f8fee77
Feature db migrate 20231013 (#202)
EvanSung Oct 13, 2023
413c0df
feat:webhook body 支持非json (#203)
wang-liang0615 Oct 17, 2023
cc7570a
docs: api doc
pycook Oct 17, 2023
430308a
fix: ci relation statistics
pycook Oct 18, 2023
424cad2
fix:ci relation add type filter (#208)
wang-liang0615 Oct 18, 2023
42d870e
Dev api 20231019 (#210)
pycook Oct 19, 2023
8d17726
feat: python-ldap 更新到 ldap3 (#214)
kdyq007 Oct 20, 2023
2e85a99
fix(ci_cache): ci cache async args (#215)
EvanSung Oct 20, 2023
f5607d9
fix(common): fix 'ACLManager' object has no attribute 'create_app' (#…
EvanSung Oct 21, 2023
44b6f2b
fix: acl cache
pycook Oct 23, 2023
7556dfe
feat: add cryptography to requirements
pycook Oct 23, 2023
fff5679
fix:acl新增用户展示异常问题 (#223)
wang-liang0615 Oct 23, 2023
b6c41c0
fix:关系视图删除关系接口传参修改 (#224)
wang-liang0615 Oct 23, 2023
7d53180
fix: add_employee_from_acl (#225)
simontigers Oct 24, 2023
779cd1e
feat: Predefined values support executing scripts (#227)
pycook Oct 24, 2023
55ca2d5
关闭前端密码加密；加强 ldap 用户验证 (#216)
kdyq007 Oct 24, 2023
691b50a
Doc (#229)
ivonGwy Oct 25, 2023
a308268
fix(api): add ci (#230)
pycook Oct 25, 2023
9b050fa
Update issue templates
ivonGwy Oct 25, 2023
8ad98f4
Update issue templates
ivonGwy Oct 25, 2023
fc27dc6
Doc (#231)
ivonGwy Oct 25, 2023
321372f
Update issue templates
ivonGwy Oct 25, 2023
363b890
Doc (#232)
ivonGwy Oct 25, 2023
142b8c9
Doc (#234)
ivonGwy Oct 25, 2023
9791a18
Doc (#235)
ivonGwy Oct 25, 2023
3d716ef
feat:预定义值支持脚本&&密码存储&&一些bugfix (#239)
wang-liang0615 Oct 27, 2023
b342258
feat(cmdb-api): CI password data store (#242)
pycook Oct 28, 2023
d5c479f
feat(cmdb-api): ci password
pycook Oct 28, 2023
b090a88
release: v2.3.6
pycook Oct 28, 2023
1aeb9a2
fix(cmdb-ui): CI update password
pycook Oct 28, 2023
89e492c
fix: delete CI password data (#243)
pycook Oct 29, 2023
2db41dd
Dev api password (#244)
pycook Oct 29, 2023
c9f0de9
Dev UI 231030 (#247)
wang-liang0615 Oct 30, 2023
5b314aa
feat: add inner password storage and optimize flask command about inn…
pycook Oct 30, 2023
c0726b2
fix(api): secrets
pycook Oct 30, 2023
9d5bdf1
style(common-setting): clean warning (#246)
simontigers Oct 30, 2023
0172206
fix(api commands): cmdb-password-data-migrate (#249)
pycook Nov 2, 2023
8ef4edb
fix(api): search sort misses cache (#251)
pycook Nov 3, 2023
b1528ec
build(deps): bump browserify-sign from 4.2.1 to 4.2.2 in /cmdb-ui (#241)
dependabot[bot] Nov 6, 2023
46238b8
Dev api 1103 (#252)
pycook Nov 6, 2023
2ae4aee
fix(api): Code scanning alerts (#254)
pycook Nov 6, 2023
c711c3d
feat(api): encrypting webhook configurations (#255)
pycook Nov 7, 2023
45d3f57
Dev UI 231108 (#256)
wang-liang0615 Nov 8, 2023
c2c11b3
Revert "Dev UI 231108 (#256)" (#260)
wang-liang0615 Nov 8, 2023
422e89c
ui package update (#261)
wang-liang0615 Nov 8, 2023
af254dd
Dev api 1107 (#263)
pycook Nov 8, 2023
01fcd7f
Dev api 231108 (#264)
pycook Nov 9, 2023
cc599d4
feat(acl-ui):resources table resizable (#267)
wang-liang0615 Nov 14, 2023
837aabf
fix: Solving the timezone issue in Redis, as well as the problem of M…
fxiang21 Nov 15, 2023
213bda6
docs: local install (#270)
pycook Nov 16, 2023
981f8b0
Fix deploy 1700028675 (#272)
fxiang21 Nov 22, 2023
2933bf1
feature: add a new management script, such as install,start,pause,del…
fxiang21 Nov 23, 2023
62a6691
doc: change content in readme_en (#278)
fxiang21 Nov 23, 2023
0924b88
feat(cmdb-ui):多对多关系&&仪表盘色卡调整 (#271)
wang-liang0615 Nov 24, 2023
5fe27f8
feat(api): issue #212 (#279)
pycook Nov 24, 2023
05453be
release: 2.3.7
pycook Nov 24, 2023
91c49b6
fix(api): get relation history
pycook Nov 28, 2023
d525e1e
feat(api): only the role cmdb_admin can modify the CIType group (#280)
pycook Nov 29, 2023
edde467
fix(api): common_data delele (#282)
simontigers Nov 30, 2023
0414121
docs: update local install
pycook Nov 30, 2023
10527bf
pref(cmdb-ui):ci upload&delete concurrent 6 (#286)
wang-liang0615 Dec 6, 2023
a4f65e7
fix(api): Common create employee (#287)
simontigers Dec 6, 2023
d3c87ee
feat: Handle '/dev/stdout' in Logger Configuration
gmailnovo Dec 7, 2023
6ff942c
feat(api): upload file save db (#292)
simontigers Dec 11, 2023
275e8b1
Dev api 231211 (#294)
pycook Dec 11, 2023
e0c8263
feat(api): cas is compatible with casdoor
pycook Dec 11, 2023
cf0ad7b
fix(cmdb-ui):set localstorage '' after unsubscribe ci (#296)
wang-liang0615 Dec 12, 2023
c918d54
perf(api): ci delete (#297)
pycook Dec 12, 2023
cd31942
pref(cmdb-ui):batch upload for date type (#298)
wang-liang0615 Dec 12, 2023
03a3b8b
Revert "pref(cmdb-ui):batch upload for date type (#298)" (#299)
wang-liang0615 Dec 12, 2023
2b69217
fix(api): time data format
pycook Dec 12, 2023
a06599c
pref(cmdb-ui):batch upload for date type (#301)
wang-liang0615 Dec 12, 2023
21c9d9a
feat(api): support OAuth2.0 and OIDC authentication, it has been test…
pycook Dec 12, 2023
faed3fe
fix(api): get_employee_notice check data None (#305)
simontigers Dec 13, 2023
e03849b
fix(cmdb-ui):batch upload cancel bug && download error (#306)
wang-liang0615 Dec 13, 2023
d4a37af
feat(api): auth config api (#309)
simontigers Dec 14, 2023
73d53f0
pref(api): authentication and login log (#308)
pycook Dec 14, 2023
1d253d7
feat(ui):auth setting (#310)
wang-liang0615 Dec 15, 2023
5320ecf
fix(api): common_data (#311)
simontigers Dec 15, 2023
b45fd0c
fix:is_list edit bug (#312)
wang-liang0615 Dec 15, 2023
092a8b9
pref(api): A CIType allows repeated binding of auto-discovery rules (…
pycook Dec 16, 2023
6e9ce08
pref(cmdb-ui):change adt key & add adt alias (#314)
wang-liang0615 Dec 18, 2023
76c939f
fix(ui):401 redirect && feat(ui):add auth ldap test (#315)
wang-liang0615 Dec 18, 2023
5581fa8
lint(ui) (#316)
wang-liang0615 Dec 18, 2023
e5ab2c2
fix: auth config (#317)
simontigers Dec 18, 2023
4ea947f
fix: auth config (#318)
simontigers Dec 18, 2023
9894c77
feat(ui): lint
pycook Dec 18, 2023
2d2fb6e
release: v2.3.8
pycook Dec 18, 2023
fe22e36
fix(api): ldap authentication
pycook Dec 18, 2023
aa98a30
feat:add auth common api_host (#319)
wang-liang0615 Dec 19, 2023
0900074
fix(api): oauth2.0 authentication
pycook Dec 19, 2023
f1f86ce
feat(ui):api_host annotation (#320)
wang-liang0615 Dec 19, 2023
6eb8ae1
fix(api): CAS authentication
pycook Dec 20, 2023
920295d
feat: Fixed db volume name
pycook Dec 21, 2023
4beece5
fix:open triggerForm from attributeCard (#322)
wang-liang0615 Dec 21, 2023
f143e30
feat(ui):批量导入模型根据create权限过滤&&模型配置页面权限 (#323)
wang-liang0615 Dec 21, 2023
dbc44a8
fix(ui):common double menu (#324)
wang-liang0615 Dec 21, 2023
18313b7
fix(acl_ui):permission (#325)
wang-liang0615 Dec 21, 2023
a6e2aca
fix(api): svg upload (#321)
simontigers Dec 21, 2023
c430515
fix(api): add CI (#326)
pycook Dec 22, 2023
20f3e91
pref(api): import and export of CIType templates
pycook Dec 22, 2023
72b2f8b
fix(api): refresh rid after create and import employee (#328)
simontigers Dec 22, 2023
9ed1108
feat(api): add get_file_binary_str and save (#329)
simontigers Dec 22, 2023
ffae576
fix(api): ci relation search
pycook Dec 22, 2023
855cb91
feat(cmdb-ui):ci type import&export，pref(cmdb-ui):download ci xlsx na…
wang-liang0615 Dec 22, 2023
10b273e
feat(api): add update_last_login_by_uid (#333)
simontigers Dec 22, 2023
c143d6a
fix(api): role grant
pycook Dec 23, 2023
3d5c2ec
Merge branch 'master' of github.com:veops/cmdb
pycook Dec 23, 2023
ef85ba2
feat(api): update cmdb-init-acl commands (#335)
pycook Dec 23, 2023
3919dfd
release: 2.3.9
pycook Dec 23, 2023
b093569
[更新] 修复 LDAP 登录失败的问题 (#336)
kdyq007 Dec 25, 2023
100a889
fix(api): CI revoke permission (#337)
pycook Dec 25, 2023
7a79a8b
feat(api): i18n
pycook Dec 25, 2023
bee0a3a
feat(api): common i18n (#340)
simontigers Dec 26, 2023
5883c16
feat:Batch import and download templates support predefined values (#…
wang-liang0615 Dec 27, 2023
341f5db
fix(cmdb-ui):model relation table (#343)
wang-liang0615 Dec 27, 2023
7036fe0
style(ui):global.less (#344)
wang-liang0615 Dec 28, 2023
ace160a
Dev api 231229 (#345)
pycook Dec 29, 2023
e429ad5
feat(ui):i18n (#347)
wang-liang0615 Jan 2, 2024
bff45d0
i18n (#348)
wang-liang0615 Jan 2, 2024
0a99643
feat(ui):add packages (#349)
wang-liang0615 Jan 3, 2024
7186bda
fix(api): common_i18n wide (#350)
simontigers Jan 3, 2024
9ee2776
fix(api): common i18n wide (#351)
simontigers Jan 3, 2024
ec884c9
feat(ui):i18n (#352)
wang-liang0615 Jan 3, 2024
ec8f626
docs: update install (#354)
pycook Jan 3, 2024
995e581
fix(api): common department edit method (#355)
simontigers Jan 3, 2024
82ea1dd
fix(api): common department edit method (#356)
simontigers Jan 3, 2024
c98199e
feat(ui):i18n (#357)
wang-liang0615 Jan 3, 2024
4261f6f
fix(api): common department allow parent (#358)
simontigers Jan 3, 2024
3faefbe
feat(ui):i18n (#360)
wang-liang0615 Jan 3, 2024
00b276d
format(ui) (#361)
wang-liang0615 Jan 3, 2024
f56378e
fix(api): common edit department return (#359)
simontigers Jan 3, 2024
0372459
fix(ui) (#362)
wang-liang0615 Jan 3, 2024
27854d4
fix(acl-ui):operation history (#363)
wang-liang0615 Jan 3, 2024
ed41a72
release: v2.3.10
pycook Jan 3, 2024
0b3cad8
feat: update docker-compose
pycook Jan 4, 2024
1e1c92a
refactor(ui):extract pager components (#364)
wang-liang0615 Jan 4, 2024
9ec105c
fix(ui):logout (#365)
wang-liang0615 Jan 4, 2024
e5fe2bf
build(deps): bump pycryptodome from 3.12.0 to 3.19.1 in /cmdb-api
dependabot[bot] Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix(ui):logout (#365)
  • Loading branch information
@wang-liang0615
wang-liang0615 authored Jan 4, 2024
commit 9ec105ca37ac4e6446dc68a3d5fac1c3275b592b
2 changes: 0 additions & 2 deletions cmdb-ui/src/components/tools/UserMenu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,6 @@ export default {
title: this.$t('tip'),
content: this.$t('topMenu.confirmLogout'),
onOk() {
// localStorage.removeItem('ops_cityps_currentId')
localStorage.clear()
return that.Logout()
},
onCancel() {},
Expand Down
Loading