From 927f0f3fe85325687a84711a4f4a87ca61149ded Mon Sep 17 00:00:00 2001 From: owpk Date: Sun, 9 Aug 2020 23:23:25 +0900 Subject: [PATCH] fix --- client.properties | 4 ++-- .../java/org/owpk/IODataHandler/IONetworkServiceImpl.java | 5 +---- .../main/java/org/owpk/IODataHandler/InputDataHandler.java | 4 +--- .../src/main/java/org/owpk/{app => controller}/Callback.java | 2 +- .../main/java/org/owpk/controller/ClientPanelController.java | 1 - .../main/java/org/owpk/controller/CloudPanelController.java | 2 -- .../main/java/org/owpk/controller/TreeViewController.java | 1 - client/src/main/java/org/owpk/network/NetworkServiceInt.java | 2 +- server/src/main/java/org/owpk/core/AuthHandler.java | 1 + 9 files changed, 7 insertions(+), 15 deletions(-) rename client/src/main/java/org/owpk/{app => controller}/Callback.java (64%) diff --git a/client.properties b/client.properties index d1c49a2..fbf8a81 100644 --- a/client.properties +++ b/client.properties @@ -1,7 +1,7 @@ #root_directory -#Sun Aug 09 16:00:07 YAKT 2020 +#Sun Aug 09 19:23:22 YAKT 2020 default_server=localhost -port=8190 download_directory=./client/downloads/ +port=8190 connect_on_startup=false root_directory=C\:\\Users\\vzvz4\\Desktop\\PAPKA\\cloudStorageProject\\engine\\CloudStorage\\.\\client\\downloads diff --git a/client/src/main/java/org/owpk/IODataHandler/IONetworkServiceImpl.java b/client/src/main/java/org/owpk/IODataHandler/IONetworkServiceImpl.java index 108276a..29f8cf2 100644 --- a/client/src/main/java/org/owpk/IODataHandler/IONetworkServiceImpl.java +++ b/client/src/main/java/org/owpk/IODataHandler/IONetworkServiceImpl.java @@ -2,10 +2,9 @@ import io.netty.handler.codec.serialization.ObjectDecoderInputStream; import io.netty.handler.codec.serialization.ObjectEncoderOutputStream; -import javafx.application.Platform; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.owpk.app.Callback; +import org.owpk.controller.Callback; import org.owpk.app.ClientConfig; import org.owpk.network.NetworkServiceInt; @@ -28,7 +27,6 @@ public class IONetworkServiceImpl implements NetworkServiceInt { private Socket socket; private ObjectDecoderInputStream in; private ObjectEncoderOutputStream out; - private boolean run; private InputDataHandler inputDataHandler; private AuthHandler authHandler; @@ -62,7 +60,6 @@ public void connect() throws IOException, InterruptedException, ClassNotFoundExc log.info("connected : " + socket.getRemoteSocketAddress()); out = new ObjectEncoderOutputStream(socket.getOutputStream()); in = new ObjectDecoderInputStream(socket.getInputStream()); - run = true; authHandler.showDialog(); //sync authHandler.tryToAuth(); //sync new Thread(inputDataHandler).start(); diff --git a/client/src/main/java/org/owpk/IODataHandler/InputDataHandler.java b/client/src/main/java/org/owpk/IODataHandler/InputDataHandler.java index 14ae830..59d59a4 100644 --- a/client/src/main/java/org/owpk/IODataHandler/InputDataHandler.java +++ b/client/src/main/java/org/owpk/IODataHandler/InputDataHandler.java @@ -1,9 +1,8 @@ package org.owpk.IODataHandler; -import io.netty.handler.codec.serialization.ObjectDecoderInputStream; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.owpk.app.Callback; +import org.owpk.controller.Callback; import org.owpk.app.ClientConfig; import org.owpk.message.DataInfo; import org.owpk.message.Message; @@ -11,7 +10,6 @@ import org.owpk.util.FileInfo; import org.owpk.util.FileUtility; -import javax.security.sasl.AuthenticationException; import java.io.File; import java.io.IOException; import java.nio.file.Path; diff --git a/client/src/main/java/org/owpk/app/Callback.java b/client/src/main/java/org/owpk/controller/Callback.java similarity index 64% rename from client/src/main/java/org/owpk/app/Callback.java rename to client/src/main/java/org/owpk/controller/Callback.java index 0b57b1e..e6ad851 100644 --- a/client/src/main/java/org/owpk/app/Callback.java +++ b/client/src/main/java/org/owpk/controller/Callback.java @@ -1,4 +1,4 @@ -package org.owpk.app; +package org.owpk.controller; public interface Callback { void call(T s); diff --git a/client/src/main/java/org/owpk/controller/ClientPanelController.java b/client/src/main/java/org/owpk/controller/ClientPanelController.java index 33c4c48..3368826 100644 --- a/client/src/main/java/org/owpk/controller/ClientPanelController.java +++ b/client/src/main/java/org/owpk/controller/ClientPanelController.java @@ -13,7 +13,6 @@ import lombok.SneakyThrows; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.owpk.app.Callback; import org.owpk.util.FileInfo; import org.owpk.util.FileUtility; diff --git a/client/src/main/java/org/owpk/controller/CloudPanelController.java b/client/src/main/java/org/owpk/controller/CloudPanelController.java index 34b5676..ee8ee9c 100644 --- a/client/src/main/java/org/owpk/controller/CloudPanelController.java +++ b/client/src/main/java/org/owpk/controller/CloudPanelController.java @@ -13,8 +13,6 @@ import javafx.scene.input.Dragboard; import javafx.scene.input.TransferMode; import org.owpk.IODataHandler.AuthException; -import org.owpk.IODataHandler.AuthHandler; -import org.owpk.app.Callback; import org.owpk.app.ClientConfig; import org.owpk.message.DataInfo; import org.owpk.message.MessageType; diff --git a/client/src/main/java/org/owpk/controller/TreeViewController.java b/client/src/main/java/org/owpk/controller/TreeViewController.java index 5d58e2b..99d935e 100644 --- a/client/src/main/java/org/owpk/controller/TreeViewController.java +++ b/client/src/main/java/org/owpk/controller/TreeViewController.java @@ -7,7 +7,6 @@ import javafx.scene.control.TreeView; import javafx.scene.image.Image; import javafx.scene.image.ImageView; -import org.owpk.app.Callback; import org.owpk.util.FileInfo; import java.io.File; diff --git a/client/src/main/java/org/owpk/network/NetworkServiceInt.java b/client/src/main/java/org/owpk/network/NetworkServiceInt.java index e03a839..716d82b 100644 --- a/client/src/main/java/org/owpk/network/NetworkServiceInt.java +++ b/client/src/main/java/org/owpk/network/NetworkServiceInt.java @@ -1,7 +1,7 @@ package org.owpk.network; import org.owpk.IODataHandler.AuthException; -import org.owpk.app.Callback; +import org.owpk.controller.Callback; import java.io.IOException; import java.io.InputStream; diff --git a/server/src/main/java/org/owpk/core/AuthHandler.java b/server/src/main/java/org/owpk/core/AuthHandler.java index 2dad649..3dac4b0 100644 --- a/server/src/main/java/org/owpk/core/AuthHandler.java +++ b/server/src/main/java/org/owpk/core/AuthHandler.java @@ -24,6 +24,7 @@ public class AuthHandler extends SimpleChannelInboundHandler> { private String hash(String input) { return DigestUtils.sha256Hex(input); } + @Override public void channelActive(ChannelHandlerContext ctx) throws Exception { userDAO = new UserDAO();