From 85a8c09b24ce5cc4e90ba1294884f47787e2eac6 Mon Sep 17 00:00:00 2001
From: lyf666 <lyf666@gmail.com>
Date: Thu, 23 Nov 2017 20:14:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9pom,=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=90=AF=E5=8A=A8=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?,=E6=94=B9=E4=B8=BA=E4=BB=A3=E7=A0=81=E8=80=8C=E4=B8=8D?=
 =?UTF-8?q?=E6=98=AFweb.xml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                  | 37 ++++++++++++++++++++----
 src/main/java/cn/cloudowr/dict/Main.java | 37 +++++++++++++++++++-----
 webDir/WEB-INF/web.xml                   | 18 ++++++++++++
 3 files changed, 79 insertions(+), 13 deletions(-)
 create mode 100644 webDir/WEB-INF/web.xml

diff --git a/pom.xml b/pom.xml
index 62c4e32..d96e3ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,8 +7,13 @@
     <groupId>cn.cloudowr</groupId>
     <artifactId>dict</artifactId>
     <version>1.0-SNAPSHOT</version>
-    <packaging>war</packaging>
+    <packaging>jar</packaging>
     <build>
+        <resources>
+            <resource>
+                <directory>${basedir}/src/main/webapp</directory>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -53,6 +58,19 @@
                     <mainClass>cn.cloudowr.dict.Main</mainClass>
                 </configuration>
             </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>cn.cloudowr.dict.Main</mainClass>
+                        </manifest>
+                    </archive>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <dependencies>
@@ -62,10 +80,21 @@
             <version>3.0</version>
         </dependency>
         <dependency>
-            <groupId>com.jfinal</groupId>
+            <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>
-            <version>8.1.8</version>
+            <version>9.4.1.v20170120</version>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-servlet</artifactId>
+            <version>9.4.1.v20170120</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-webapp</artifactId>
+            <version>9.4.1.v20170120</version>
+        </dependency>
+
         <!--<dependency>-->
         <!--<groupId>mysql</groupId>-->
         <!--<artifactId>mysql-connector-java</artifactId>-->
@@ -85,8 +114,6 @@
             <groupId>cn.cloudowr</groupId>
             <artifactId>sdk</artifactId>
             <version>1.4.16</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/lib/sdk-1.4.16.jar</systemPath>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/src/main/java/cn/cloudowr/dict/Main.java b/src/main/java/cn/cloudowr/dict/Main.java
index 3f21634..bd018a9 100644
--- a/src/main/java/cn/cloudowr/dict/Main.java
+++ b/src/main/java/cn/cloudowr/dict/Main.java
@@ -1,7 +1,13 @@
 package cn.cloudowr.dict;
 
-import com.jfinal.core.JFinal;
+import com.jfinal.core.JFinalFilter;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.servlet.FilterHolder;
+import org.eclipse.jetty.webapp.WebAppContext;
 
+import javax.servlet.DispatcherType;
+import java.io.*;
+import java.util.EnumSet;
 import java.util.Properties;
 
 /**
@@ -15,21 +21,36 @@ public class Main {
     public static int port;
     public static String dabaseName;
     private static int AppPort;
-    public static void main(String[] args) {
+
+    public static void main(String[] args) throws IOException {
         read();
-        JFinal.start("src/main/webapp", AppPort, "/");
+        EnumSet<DispatcherType> all = EnumSet.of(DispatcherType.ASYNC, DispatcherType.ERROR,
+                DispatcherType.FORWARD, DispatcherType.INCLUDE, DispatcherType.REQUEST);
+        final Server server = new Server(AppPort);
+        try {
+            WebAppContext context = new WebAppContext("/", "/");
+            FilterHolder filter = new FilterHolder(new JFinalFilter());
+            filter.setInitParameter("configClass", "cn.cloudowr.dict.Config");
+            context.addFilter(filter, "/*", all);
+            server.setHandler(context);
+            server.start();
+            server.join();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
-    public static void read(){
-        try{
+
+    public static void read() {
+        try {
             Properties pro = new Properties();
             pro.load(Config.class.getResourceAsStream("/config.properties"));
             username = pro.getProperty("username");
             database = pro.getProperty("database");
             password = pro.getProperty("password");
-            host     = pro.getProperty("host");
-            port     = Integer.parseInt(pro.getProperty("port"));
+            host = pro.getProperty("host");
+            port = Integer.parseInt(pro.getProperty("port"));
             dabaseName = pro.getProperty("dabaseName");
-            AppPort  = Integer.parseInt(pro.getProperty("AppPort"));
+            AppPort = Integer.parseInt(pro.getProperty("AppPort"));
         } catch (Exception e) {
             e.printStackTrace();
             System.exit(0);
diff --git a/webDir/WEB-INF/web.xml b/webDir/WEB-INF/web.xml
new file mode 100644
index 0000000..2e5bc01
--- /dev/null
+++ b/webDir/WEB-INF/web.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+         version="3.1">
+    <filter>
+        <filter-name>cn.cloudowr.dict</filter-name>
+        <filter-class>com.jfinal.core.JFinalFilter</filter-class>
+        <init-param>
+            <param-name>configClass</param-name>
+            <param-value>cn.cloudowr.dict.Config</param-value>
+        </init-param>
+    </filter>
+    <filter-mapping>
+        <filter-name>cn.cloudowr.dict</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+</web-app>
\ No newline at end of file