Merge branch 'master' of http://www.leanwo.com:3000/ShangHaiLeanwo/ServerManagement.git

src/main/java/com/leanwo/management/DataSourceSettingFrame.java

@@ -429,7 +429,7 @@ public class DataSourceSettingFrame extends JFrame {
 	private void deleteYml(DataSourceConfig dataSourceConfig) throws Exception {
 		// 根据dataSourceConfigs修改yml
 		Yaml yaml = new Yaml();
-	    File file = new File("src/main/resources/Application.yml");
+	    File file = new File("resources/Application.yml");
 	    String path = file.getAbsolutePath();
 	    if(file.exists()) {
 	    	try {

src/main/java/com/leanwo/management/console/LogConsole.java

@@ -1,6 +1,10 @@
 package com.leanwo.management.console;
 
 import java.awt.BorderLayout;
+import java.awt.Rectangle;
+import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.StringSelection;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.Date;
@@ -19,6 +23,7 @@ public class LogConsole extends JPanel{
 	private JTextArea textArea;
 	private JCheckBox autoScrollCheckBox;
 	private JButton clearButton;
+	private JButton copyButton;
 	
 	private Process process;
 	
@@ -34,6 +39,8 @@ public class LogConsole extends JPanel{
 	/** 自动滚动 */
 	private boolean autoScroll;
 	
+	Clipboard clipboard;
+	
 	public LogConsole(String name) {
 		this.name = name;		
 		initData();
@@ -101,14 +108,33 @@ public class LogConsole extends JPanel{
 		autoScrollCheckBox = new JCheckBox("自动滚动");
 		autoScrollCheckBox.setSelected(autoScroll);
 		bottomPanel.add(autoScrollCheckBox, BorderLayout.WEST);
+
+		copyButton=new JButton("复制日志");
+		bottomPanel.add(copyButton, BorderLayout.EAST);
 		
 		clearButton=new JButton("清空");
 		bottomPanel.add(clearButton);
+
 		
 		setLayout(new BorderLayout());
 		add(new JScrollPane(textArea),BorderLayout.CENTER);
 		add(bottomPanel,BorderLayout.SOUTH);
 		
+		copyButton.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				//创建能传输指定 String 的 Transferable。
+				StringSelection editText = 
+				     new StringSelection(textArea.getText());
+				 /**
+				   将剪贴板的当前内容设置到指定的 transferable 对象，
+				   并将指定的剪贴板所有者作为新内容的所有者注册。
+				   */
+				clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
+			    clipboard.setContents(editText,editText);
+			}
+		});
+		
 		clearButton.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {

src/main/resources/Application.yml

@@ -14,6 +14,10 @@ data-source:
       url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=ProdogSiemens
       username: sa
       password: Sitp123123
+    - beanId: dataSource4
+      url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=ProdogAppGuangMai
+      username: sa
+      password: Sitp123123
 spring:
   application:
     # 应用名称，会在Eureka中作为服务的id标识（serviceId）