fuhouyin/dillon-admin-pro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改siwng版退出操作

Browse Source
This commit is contained in:
wenli 2024-07-24 22:08:42 +08:00
parent fa6aaa96ee
commit 9f928d4f75
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/request/Request.java
View File

@ -84,7 +84,7 @@ public class Request {
.decoder(GSON_DECODER) .decoder(GSON_DECODER)
.encoder(GSON_ENCODER) .encoder(GSON_ENCODER)
.logger(new Slf4jLogger()) .logger(new Slf4jLogger())
.logLevel(Logger.Level.FULL) .logLevel(Logger.Level.BASIC)
.client(new OkHttpClient(OK_HTTP_CLIENT)) .client(new OkHttpClient(OK_HTTP_CLIENT))
.requestInterceptor(new ForwardedForInterceptor()) .requestInterceptor(new ForwardedForInterceptor())
.retryer(new Retryer.Default()); // 默认重试策略 .retryer(new Retryer.Default()); // 默认重试策略

33
dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/MainFrame.java
View File

@ -26,9 +26,7 @@ import javax.swing.*;
import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener; import javax.swing.event.ChangeListener;
import java.awt.*; import java.awt.*;
import java.awt.event.ActionEvent; import java.awt.event.*;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
@ -72,6 +70,14 @@ public class MainFrame extends JFrame {
rootPane.putClientProperty(FlatClientProperties.TITLE_BAR_BACKGROUND, UIManager.getColor("App.titleBarBackground")); rootPane.putClientProperty(FlatClientProperties.TITLE_BAR_BACKGROUND, UIManager.getColor("App.titleBarBackground"));
rootPane.putClientProperty(FlatClientProperties.TITLE_BAR_FOREGROUND, UIManager.getColor("App.titleBarForeground")); rootPane.putClientProperty(FlatClientProperties.TITLE_BAR_FOREGROUND, UIManager.getColor("App.titleBarForeground"));
addWindowListener(new WindowAdapter() {
@Override
public void windowClosed(WindowEvent e) {
super.windowClosed(e);
loginOut(true);
System.exit(0);
}
});
installRepaintManager(); installRepaintManager();
@ -130,8 +136,8 @@ public class MainFrame extends JFrame {
protected void paintComponent(Graphics g) { protected void paintComponent(Graphics g) {
Graphics2D g2 = (Graphics2D) g.create(); Graphics2D g2 = (Graphics2D) g.create();
if (StrUtil.equals(UIManager.getLookAndFeel().getName(), DarkTheme.NAME)) { if (StrUtil.equals(UIManager.getLookAndFeel().getName(), DarkTheme.NAME)) {
g2.setColor(UIManager.getColor("App.background")); g2.setColor(UIManager.getColor("App.background"));
g2.fillRect(0,0,getWidth(),getHeight()); g2.fillRect(0, 0, getWidth(), getHeight());
} else if (StrUtil.equals(UIManager.getLookAndFeel().getName(), LightTheme.NAME)) { } else if (StrUtil.equals(UIManager.getLookAndFeel().getName(), LightTheme.NAME)) {
g2.drawImage(getBackgroundImageLight(), 0, 0, getWidth(), getHeight(), this); g2.drawImage(getBackgroundImageLight(), 0, 0, getWidth(), getHeight(), this);
} else if (StrUtil.equals(UIManager.getLookAndFeel().getName(), GlazzedTheme.NAME)) { } else if (StrUtil.equals(UIManager.getLookAndFeel().getName(), GlazzedTheme.NAME)) {
@ -421,7 +427,7 @@ public class MainFrame extends JFrame {
} }
default: { default: {
UIManager.setLookAndFeel(LightTheme.class.getName()); UIManager.setLookAndFeel(LightTheme.class.getName());
break; break;
} }
@ -477,7 +483,7 @@ public class MainFrame extends JFrame {
JMenuItem menuItem11 = new JMenuItem("退出"); JMenuItem menuItem11 = new JMenuItem("退出");
menuItem11.setIcon(new FlatSVGIcon("icons/logout.svg", 25, 25)); menuItem11.setIcon(new FlatSVGIcon("icons/logout.svg", 25, 25));
menuItem11.addActionListener(e1 -> loginOut()); menuItem11.addActionListener(e1 -> loginOut(false));
menuItem9.addActionListener(e1 -> { menuItem9.addActionListener(e1 -> {
int tabIndex = MainFrame.getInstance().getTabbedPane().indexOfTab("个人信息"); int tabIndex = MainFrame.getInstance().getTabbedPane().indexOfTab("个人信息");
@ -514,10 +520,10 @@ public class MainFrame extends JFrame {
getTitleLabel().setText(title); getTitleLabel().setText(title);
} }
public void loginOut(){ public void loginOut(boolean exit) {
SwingWorker<CommonResult<Boolean>,Object> swingWorker=new SwingWorker< CommonResult<Boolean>, Object>() { SwingWorker<CommonResult<Boolean>, Object> swingWorker = new SwingWorker<CommonResult<Boolean>, Object>() {
@Override @Override
protected CommonResult<Boolean> doInBackground() throws Exception { protected CommonResult<Boolean> doInBackground() throws Exception {
return Request.connector(AuthFeign.class).logout(); return Request.connector(AuthFeign.class).logout();
} }
@ -527,7 +533,12 @@ public class MainFrame extends JFrame {
try { try {
if (get().isSuccess()) { if (get().isSuccess()) {
SSLWebSocketClient.getInstance().loginOut(); SSLWebSocketClient.getInstance().loginOut();
showLogin(); if (exit) {
System.exit(0);
} else {
showLogin();
}
} }
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw new RuntimeException(e); throw new RuntimeException(e);