From d85ffad4c0faa2c75500c6f8208b87e502e43fec Mon Sep 17 00:00:00 2001 From: tinyz Date: Sun, 24 Jul 2016 21:07:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9pom.xml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/pom.xml | 6 ++-- .../org/ogcs/service/SimpleTaskService.java | 8 +++-- okra-all/pom.xml | 4 +-- okra-demo/pom.xml | 6 ++-- .../game/command/impl/GAME_CREATE.java | 2 +- .../example/game/command/impl/GAME_LOGIN.java | 8 ++--- okra-examples/pom.xml | 6 ++-- okra-flex/pom.xml | 4 +-- okra-spring/pom.xml | 6 ++-- okra-utilities/pom.xml | 6 ++-- pom.xml | 34 +++++++++++++++++-- 11 files changed, 61 insertions(+), 29 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 49481cc..563181c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ogcs_okra - ogcs + okra + org.ogcs 1.0.1 4.0.0 - okra_core + core diff --git a/core/src/main/java/org/ogcs/service/SimpleTaskService.java b/core/src/main/java/org/ogcs/service/SimpleTaskService.java index dec3ffb..f223f17 100644 --- a/core/src/main/java/org/ogcs/service/SimpleTaskService.java +++ b/core/src/main/java/org/ogcs/service/SimpleTaskService.java @@ -20,13 +20,16 @@ import java.util.concurrent.ThreadFactory; /** - * @author TinyZ on 2016/5/12. + * + * @author TinyZ + * @since 1.0 */ public class SimpleTaskService extends ScheduledThreadPoolExecutor { + private static final int COOL_POOL_SIZE = 2; public SimpleTaskService() { - super(4); + super(COOL_POOL_SIZE); } public SimpleTaskService(int corePoolSize) { @@ -37,5 +40,4 @@ public SimpleTaskService(int corePoolSize, ThreadFactory threadFactory) { super(corePoolSize, threadFactory); } - } diff --git a/okra-all/pom.xml b/okra-all/pom.xml index 1f231a9..a6a048e 100644 --- a/okra-all/pom.xml +++ b/okra-all/pom.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ogcs_okra - ogcs + okra + org.ogcs 1.0.1 4.0.0 diff --git a/okra-demo/pom.xml b/okra-demo/pom.xml index ad836f3..3bef67a 100644 --- a/okra-demo/pom.xml +++ b/okra-demo/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ogcs_okra - ogcs + okra + org.ogcs 1.0.1 4.0.0 - okra_demo + okra-demo diff --git a/okra-demo/src/main/java/org/ogcs/okra/example/game/command/impl/GAME_CREATE.java b/okra-demo/src/main/java/org/ogcs/okra/example/game/command/impl/GAME_CREATE.java index 371dd99..dd39fe9 100644 --- a/okra-demo/src/main/java/org/ogcs/okra/example/game/command/impl/GAME_CREATE.java +++ b/okra-demo/src/main/java/org/ogcs/okra/example/game/command/impl/GAME_CREATE.java @@ -44,7 +44,7 @@ public void execute(Session session, Request request) throws Exception { memRole.setAccount(msgRegister.getAccount()); memRole.setName(msgRegister.getName()); memRole.setUid(ServerProperties.id()); - memRole.setPsw(msgRegister.getPsw()); +// memRole.setPsw(msgRegister.getPsw()); // roleMapper.insert(memRole); diff --git a/okra-demo/src/main/java/org/ogcs/okra/example/game/command/impl/GAME_LOGIN.java b/okra-demo/src/main/java/org/ogcs/okra/example/game/command/impl/GAME_LOGIN.java index 5712e15..e50511b 100644 --- a/okra-demo/src/main/java/org/ogcs/okra/example/game/command/impl/GAME_LOGIN.java +++ b/okra-demo/src/main/java/org/ogcs/okra/example/game/command/impl/GAME_LOGIN.java @@ -35,10 +35,10 @@ public void execute(Session session, Request request) throws Exception { // Get role by account. Also we can cache role in memory. MemRole memRole = roleMapper.select(msgLogin.getAccount()); - if (!msgLogin.getPsw().equals(memRole.getPsw())) { - // TODO: password is wrong - return; - } +// if (!msgLogin.getPsw().equals(memRole.getPsw())) { +// // TODO: password is wrong 验证登录 +// return; +// } // TODO: do some logic content diff --git a/okra-examples/pom.xml b/okra-examples/pom.xml index 77861cf..4e6c096 100644 --- a/okra-examples/pom.xml +++ b/okra-examples/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ogcs_okra - ogcs + okra + org.ogcs 1.0.1 4.0.0 - okra_examples + okra-examples ogcs diff --git a/okra-flex/pom.xml b/okra-flex/pom.xml index 7d1cb41..ace4efd 100644 --- a/okra-flex/pom.xml +++ b/okra-flex/pom.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ogcs_okra - ogcs + okra + org.ogcs 1.0.1 4.0.0 diff --git a/okra-spring/pom.xml b/okra-spring/pom.xml index 0a33dfa..a1212d2 100644 --- a/okra-spring/pom.xml +++ b/okra-spring/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ogcs_okra - ogcs + okra + org.ogcs 1.0.1 4.0.0 - okra_spring + okra-spring diff --git a/okra-utilities/pom.xml b/okra-utilities/pom.xml index 5d0fdd2..e17d09b 100644 --- a/okra-utilities/pom.xml +++ b/okra-utilities/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ogcs_okra - ogcs + okra + org.ogcs 1.0.1 4.0.0 - okra_utilities + okra-utilities diff --git a/pom.xml b/pom.xml index d2f0fa4..b4f2cad 100644 --- a/pom.xml +++ b/pom.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - ogcs - ogcs_okra + org.ogcs + okra pom 1.0.1 @@ -53,4 +53,34 @@ + + + + + maven-compiler-plugin + 3.5.1 + + + maven-assembly-plugin + 2.4 + + + false + + assembly.xml + + + + + make-assembly + package + + single + + + + + + + \ No newline at end of file