Merge pull request #18 from ogcs/dev

修改pom.xml
ogcs · Jul 31, 2016 · 2c36704 · 2c36704
2 parents 4b6dda5 + d85ffad
commit 2c36704
Show file tree

Hide file tree

Showing 11 changed files with 61 additions and 29 deletions.
diff --git 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">
     <parent>
-        <artifactId>ogcs_okra</artifactId>
-        <groupId>ogcs</groupId>
+        <artifactId>okra</artifactId>
+        <groupId>org.ogcs</groupId>
         <version>1.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>okra_core</artifactId>
+    <artifactId>core</artifactId>
 
     <dependencies>
         <dependency>

diff --git 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
@@ -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">
     <parent>
-        <artifactId>ogcs_okra</artifactId>
-        <groupId>ogcs</groupId>
+        <artifactId>okra</artifactId>
+        <groupId>org.ogcs</groupId>
         <version>1.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git 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">
     <parent>
-        <artifactId>ogcs_okra</artifactId>
-        <groupId>ogcs</groupId>
+        <artifactId>okra</artifactId>
+        <groupId>org.ogcs</groupId>
         <version>1.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>okra_demo</artifactId>
+    <artifactId>okra-demo</artifactId>
 
 
     <dependencies>

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
@@ -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
@@ -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
@@ -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">
     <parent>
-        <artifactId>ogcs_okra</artifactId>
-        <groupId>ogcs</groupId>
+        <artifactId>okra</artifactId>
+        <groupId>org.ogcs</groupId>
         <version>1.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>okra_examples</artifactId>
+    <artifactId>okra-examples</artifactId>
     <dependencies>
         <dependency>
             <groupId>ogcs</groupId>

diff --git 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">
     <parent>
-        <artifactId>ogcs_okra</artifactId>
-        <groupId>ogcs</groupId>
+        <artifactId>okra</artifactId>
+        <groupId>org.ogcs</groupId>
         <version>1.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git 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">
     <parent>
-        <artifactId>ogcs_okra</artifactId>
-        <groupId>ogcs</groupId>
+        <artifactId>okra</artifactId>
+        <groupId>org.ogcs</groupId>
         <version>1.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>okra_spring</artifactId>
+    <artifactId>okra-spring</artifactId>
 
 
     <dependencies>

diff --git 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">
     <parent>
-        <artifactId>ogcs_okra</artifactId>
-        <groupId>ogcs</groupId>
+        <artifactId>okra</artifactId>
+        <groupId>org.ogcs</groupId>
         <version>1.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>okra_utilities</artifactId>
+    <artifactId>okra-utilities</artifactId>
 
 
     <dependencies>

diff --git 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">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>ogcs</groupId>
-    <artifactId>ogcs_okra</artifactId>
+    <groupId>org.ogcs</groupId>
+    <artifactId>okra</artifactId>
     <packaging>pom</packaging>
     <version>1.0.1</version>
 
@@ -53,4 +53,34 @@
         </dependencies>
 
     </dependencyManagement>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.5.1</version>
+            </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.4</version>
+                <configuration>
+                    <!-- not append assembly id in release file name -->
+                    <appendAssemblyId>false</appendAssemblyId>
+                    <descriptors>
+                        <descriptor>assembly.xml</descriptor>
+                    </descriptors>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>