Commit Graph

256 Commits

Author SHA1 Message Date
dushixiang
21a68926af Merge remote-tracking branch 'origin/dev'
# Conflicts:
#	web/src/components/command/DynamicCommand.js
#	web/src/components/command/DynamicCommandModal.js
#	web/src/components/credential/CredentialModal.js
#	web/src/components/devops/JobModal.js
#	web/src/components/devops/SecurityModal.js
#	web/src/components/user/User.js
#	web/src/components/user/UserGroup.js
2021-04-17 20:04:10 +08:00
dushixiang
6a392debb5 Merge remote-tracking branch 'origin/master' 2021-04-17 20:02:20 +08:00
dushixiang
8f22ecfb76 完成数据库敏感信息的加密 close #127 close #46 2021-04-17 20:00:02 +08:00
dushixiang
bceda9a95c 完成数据库敏感信息的加密 2021-04-17 17:34:48 +08:00
dushixiang
11f2d8a1f4 增加重置totp的命令 2021-04-14 22:27:12 +08:00
dushixiang
5cee2dd50e 增加AES CBC模式工具函数 2021-04-13 23:56:53 +08:00
dushixiang
4f73cd3673 完善原生安装文档 2021-04-12 22:53:21 +08:00
dushixiang
ef9efb7fba 优化文档 2021-04-08 21:48:35 +08:00
dushixiang
60f9289fb1 优化执行指令时选择资产的方式 close #85 2021-04-08 21:19:25 +08:00
dushixiang
c3cdb720e5 优化弹窗位置 2021-04-08 19:34:42 +08:00
dushixiang
fbb996843c 修复原生ssh接入时上传文件弹窗被挡住的bug 2021-04-08 18:57:51 +08:00
dushixiang
ef7a399929 Merge remote-tracking branch 'origin/dev'
# Conflicts:
#	web/src/components/Login.js
#	web/src/components/user/LayoutHeader.js
2021-03-21 16:48:15 +08:00
dushixiang
d6ba971a70 Merge remote-tracking branch 'origin/dev'
# Conflicts:
#	web/src/components/Login.js
#	web/src/components/user/LayoutHeader.js
2021-03-21 16:48:15 +08:00
dushixiang
74f04994f7 release v0.3.4 2021-03-21 16:45:41 +08:00
dushixiang
8a13a1c963 release v0.3.4 2021-03-21 16:45:41 +08:00
dushixiang
1e7b3d3c0e 修改分页返回数据结构体 2021-03-21 16:44:33 +08:00
dushixiang
a4296e3b1c 修改分页返回数据结构体 2021-03-21 16:44:33 +08:00
dushixiang
999cf52e0c 更新截图 2021-03-21 16:26:46 +08:00
dushixiang
060363f5fe 更新截图 2021-03-21 16:26:46 +08:00
dushixiang
308c78a734 修改变量命名 2021-03-21 15:28:21 +08:00
dushixiang
45649ef731 修改变量命名 2021-03-21 15:28:21 +08:00
neverteaser
120307f346 fix(resource-sharer):fix reource sharer repository 2021-03-21 15:25:20 +08:00
teaser
db3ba2518c fix(resource-sharer):fix reource sharer repository 2021-03-21 15:25:20 +08:00
dushixiang
b5f70e6992 优化启动程序时初始化数据的代码逻辑 2021-03-21 15:00:39 +08:00
dushixiang
f3e2f81609 优化启动程序时初始化数据的代码逻辑 2021-03-21 15:00:39 +08:00
neverteaser
970db9277e fix(be):set log format 2021-03-21 14:31:43 +08:00
teaser
fc631d2304 fix(be):set log format 2021-03-21 14:31:43 +08:00
dushixiang
2b61560c1a 增加tcping的兼容性处理代码 2021-03-21 10:28:54 +08:00
dushixiang
d6e227bc93 增加tcping的兼容性处理代码 2021-03-21 10:28:54 +08:00
neverteaser
949e8a7ed5 fix(server):add test file 2021-03-21 10:14:14 +08:00
teaser
2739279448 fix(server):add test file 2021-03-21 10:14:14 +08:00
neverteaser
f3cc22d611 feat(server):支持ipv6资产tcp检测 closed #114 2021-03-21 10:14:14 +08:00
teaser
6c2d8f2401 feat(server):支持ipv6资产tcp检测 closed #114 2021-03-21 10:14:14 +08:00
1mtrue
b064bf5333 Merge pull request #116 from dushixiang/be-fix-useless-code
fix(be):remove duplicate init
2021-03-21 01:53:29 +08:00
1mtrue
af45598194 Merge pull request #116 from dushixiang/be-fix-useless-code
fix(be):remove duplicate init
2021-03-21 01:53:29 +08:00
neverteaser
b92ed7c38e fix(be):remove duplicate init 2021-03-21 01:50:52 +08:00
teaser
909b75306a fix(be):remove duplicate init 2021-03-21 01:50:52 +08:00
neverteaser
d76f782a01 fix(be):使用初始化init 初始化一些参数 2021-03-21 00:00:18 +08:00
teaser
95a50b332c fix(be):使用初始化init 初始化一些参数 2021-03-21 00:00:18 +08:00
neverteaser
caa4ff1ffb build(be):update golangci-lint action config 2021-03-21 00:00:18 +08:00
teaser
0bef7d3040 build(be):update golangci-lint action config 2021-03-21 00:00:18 +08:00
neverteaser
8e7bd69312 style(be):拆分模块目录 2021-03-21 00:00:18 +08:00
teaser
c31b3c8359 style(be):拆分模块目录 2021-03-21 00:00:18 +08:00
dushixiang
d21b8cca60 修改日志根据配置文件判断是否要打印请求日志 2021-03-21 00:00:18 +08:00
dushixiang
86e8e25aac 修改日志根据配置文件判断是否要打印请求日志 2021-03-21 00:00:18 +08:00
dushixiang
58cd678b01 修改日志根据配置文件判断是否要打印请求日志 2021-03-20 21:21:13 +08:00
dushixiang
3d1cb20b03 修改日志根据配置文件判断是否要打印请求日志 2021-03-20 21:21:13 +08:00
neverteaser
b3be0b8e37 fix(repository):fix lint 2021-03-20 00:11:59 +08:00
teaser
eb5d744a31 fix(repository):fix lint 2021-03-20 00:11:59 +08:00
dushixiang
2df65e4f8d 修改用户资源逻辑判断 2021-03-19 23:54:33 +08:00