test/Jpom
1
0
Fork 0
mirror of https://gitee.com/dromara/Jpom.git synced 2024-12-01 19:38:09 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

🐞 fix(agent): 添加数据记录修改人

Browse Source
This commit is contained in:
bwcx_jzy 2024-04-26 15:00:51 +08:00
parent 6b8fb27fab
commit 5de51be7db
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG-BETA.md
View File

@ -5,10 +5,11 @@
### 🐞 解决BUG、优化功能
1. 【server】修复 资产管理 SSH 配置禁用命令无法回显（感谢@zhangw）
2. 【server】修复 资产管理 SSH 未配置授权目录时 NPE （感谢[@Anley](https://gitee.com/MrAnley) [Gitee issues I9J17G](https://gitee.com/dromara/Jpom/issues/I9J17G) ）
2. 【server】修复 资产管理 SSH 未配置授权目录时 NPE （感谢[@Anley](https://gitee.com/MrAnley) [Gitee issues I9J17G](https://gitee.com/dromara/Jpom/issues/I9J17G) ）
3. 【agent】优化 监控机器网络流程支持配置排除网卡或者仅统计对应的网卡
4. 【server】修复 退出登录时页面会提示需要登录相关信息
5. 【server】优化 页面检测新版本判断是否加入 beta
6. 【agent】优化 添加数据记录修改人（感谢[@陈旭](https://gitee.com/chenxu8989) [Gitee issues I9JSY7](https://gitee.com/dromara/Jpom/issues/I9JSY7) ）
------

3
modules/agent-transport/agent-transport-http/src/main/java/org/dromara/jpom/transport/HttpTransportServer.java
View File

@ -40,6 +40,9 @@ public class HttpTransportServer implements TransportServer {
UrlBuilder urlBuilder = UrlBuilder.of(url).addPath(urlItem.path());
HttpRequest httpRequest = HttpRequest.of(urlBuilder);
httpRequest.setMethod(method);
// 添加请求头
Map<String, String> header = urlItem.header();
httpRequest.headerMap(header, true);
Optional.ofNullable(urlItem.timeout()).ifPresent(integer -> httpRequest.timeout(integer * 1000));

5
modules/agent/src/main/java/org/dromara/jpom/service/BaseWorkspaceOptService.java
View File

@ -30,6 +30,7 @@ public abstract class BaseWorkspaceOptService<T extends BaseWorkspaceModel> exte
String userName = BaseAgentController.getNowUserName();
if (!StrUtil.DASHED.equals(userName)) {
t.setCreateUser(userName);
t.setModifyUser(userName);
}
super.addItem(t);
}
@ -52,6 +53,10 @@ public abstract class BaseWorkspaceOptService<T extends BaseWorkspaceModel> exte
@Override
public void updateById(T updateData, String id) {
updateData.setModifyTime(DateUtil.now());
String userName = BaseAgentController.getNowUserName();
if (!StrUtil.DASHED.equals(userName)) {
updateData.setModifyUser(userName);
}
super.updateById(updateData, id);
}
}