Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 2 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<okhttp.version>4.12.0</okhttp.version>
<polyglot.version>24.2.1</polyglot.version>
<org.eclipse.jgit.version>7.3.0.202506031305-r</org.eclipse.jgit.version>
<lombok.version>1.18.42</lombok.version>
</properties>
<dependencies>

Expand Down Expand Up @@ -58,11 +59,6 @@
<artifactId>hutool-crypto</artifactId>
<version>${hutool.version}</version>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-http</artifactId>
<version>${hutool.version}</version>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-system</artifactId>
Expand All @@ -72,7 +68,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.34</version>
<version>${lombok.version}</version>
<scope>provided</scope>
</dependency>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import com.laker.postman.service.curl.CurlParser;
import com.laker.postman.service.har.HarParser;
import com.laker.postman.service.http.HttpUtil;
import com.laker.postman.service.httpfile.HttpFileParser;
import com.laker.postman.service.postman.PostmanCollectionParser;
import com.laker.postman.util.I18nUtil;
import com.laker.postman.util.MessageKeys;
Expand Down Expand Up @@ -149,12 +150,16 @@ private JPopupMenu getImportMenu() {
JMenuItem importHarItem = new JMenuItem(I18nUtil.getMessage(MessageKeys.COLLECTIONS_IMPORT_HAR),
new FlatSVGIcon("icons/har.svg", 20, 20));
importHarItem.addActionListener(e -> importHarCollection());
JMenuItem importHttpItem = new JMenuItem(I18nUtil.getMessage(MessageKeys.COLLECTIONS_IMPORT_HTTP),
new FlatSVGIcon("icons/http.svg", 20, 20));
importHttpItem.addActionListener(e -> importHttpFile());
JMenuItem importCurlItem = new JMenuItem(I18nUtil.getMessage(MessageKeys.COLLECTIONS_IMPORT_CURL),
new FlatSVGIcon("icons/curl.svg", 20, 20));
importCurlItem.addActionListener(e -> importCurlToCollection(null));
importMenu.add(importEasyToolsItem);
importMenu.add(importPostmanItem);
importMenu.add(importHarItem);
importMenu.add(importHttpItem);
importMenu.add(importCurlItem);
return importMenu;
}
Expand Down Expand Up @@ -254,6 +259,47 @@ private void importHarCollection() {
}
}

// 导入HTTP文件
private void importHttpFile() {
RequestCollectionsLeftPanel leftPanel = SingletonFactory.getInstance(RequestCollectionsLeftPanel.class);
MainFrame mainFrame = SingletonFactory.getInstance(MainFrame.class);
JFileChooser fileChooser = new JFileChooser();
fileChooser.setDialogTitle(I18nUtil.getMessage(MessageKeys.COLLECTIONS_IMPORT_HTTP_DIALOG_TITLE));
// 设置文件过滤器,只显示 .http 文件
javax.swing.filechooser.FileFilter httpFilter = new javax.swing.filechooser.FileFilter() {
@Override
public boolean accept(File f) {
return f.isDirectory() || f.getName().toLowerCase().endsWith(".http");
}

@Override
public String getDescription() {
return "HTTP Files (*.http)";
}
};
fileChooser.setFileFilter(httpFilter);
int userSelection = fileChooser.showOpenDialog(mainFrame);
if (userSelection == JFileChooser.APPROVE_OPTION) {
File fileToOpen = fileChooser.getSelectedFile();
try {
String content = FileUtil.readString(fileToOpen, StandardCharsets.UTF_8);
DefaultMutableTreeNode collectionNode = HttpFileParser.parseHttpFile(content);
if (collectionNode != null) {
leftPanel.getRootTreeNode().add(collectionNode);
leftPanel.getTreeModel().reload();
leftPanel.getPersistence().saveRequestGroups();
leftPanel.getRequestTree().expandPath(new TreePath(collectionNode.getPath()));
NotificationUtil.showSuccess(I18nUtil.getMessage(MessageKeys.COLLECTIONS_IMPORT_SUCCESS));
} else {
NotificationUtil.showError(I18nUtil.getMessage(MessageKeys.COLLECTIONS_IMPORT_HTTP_INVALID));
}
} catch (Exception ex) {
log.error("Import HTTP file error", ex);
NotificationUtil.showError(I18nUtil.getMessage(MessageKeys.COLLECTIONS_IMPORT_FAIL, ex.getMessage()));
}
}
}

private void importCurlToCollection(String defaultCurl) {
MainFrame mainFrame = SingletonFactory.getInstance(MainFrame.class);
String curlText;
Expand Down
Loading
Loading