diff --git a/pom.xml b/pom.xml index b382bb8..31efe1e 100644 --- a/pom.xml +++ b/pom.xml @@ -9,10 +9,10 @@ com.goeing - printServer + zipship 0.0.1-SNAPSHOT - goeingPrintServer - goeingPrintServer + goeingPrintService + goeingPrintService diff --git a/src/main/java/com/goeing/printserver/main/gui/PrintTaskSearchPanel.java b/src/main/java/com/goeing/printserver/main/gui/PrintTaskSearchPanel.java index 78f4202..e7c466f 100644 --- a/src/main/java/com/goeing/printserver/main/gui/PrintTaskSearchPanel.java +++ b/src/main/java/com/goeing/printserver/main/gui/PrintTaskSearchPanel.java @@ -69,7 +69,7 @@ public class PrintTaskSearchPanel extends JPanel implements LocaleChangeListener gbc.gridx = 1; gbc.weightx = 1.0; - printerComboBox = new JComboBox<>(new String[]{MessageUtils.getMessage("common.all"), "打印机1", "打印机2", "打印机3"}); + printerComboBox = new JComboBox<>(new String[]{MessageUtils.getMessage("common.all")}); searchPanel.add(printerComboBox, gbc); // 状态选择 diff --git a/src/main/java/com/goeing/printserver/main/sse/PrinterClient.java b/src/main/java/com/goeing/printserver/main/sse/PrinterClient.java index e35082b..99460c5 100644 --- a/src/main/java/com/goeing/printserver/main/sse/PrinterClient.java +++ b/src/main/java/com/goeing/printserver/main/sse/PrinterClient.java @@ -70,12 +70,12 @@ public class PrinterClient implements ApplicationRunner { // 发送任务已接收的确认消息 Map map = new HashMap<>(); - map.put("status", "queued"); + map.put("status", "success"); map.put("msg", "打印任务已加入队列,等待处理"); map.put("queueSize", String.valueOf(printQueueService.getQueueSize())); WebSocketMessageDTO queuedResponse = new WebSocketMessageDTO(); - queuedResponse.setType("QUEUED"); + queuedResponse.setType("RESPONSE"); queuedResponse.setRequestId(webSocketMessageDTO.getRequestId()); queuedResponse.setPayload(JSONUtil.toJsonStr(map));