From 2812f3423ec97a8e427fe5ef1da3f18c9f732a5e Mon Sep 17 00:00:00 2001
From: lxyer <237809796@qq.com>
Date: Tue, 2 Jan 2018 21:17:02 +0800
Subject: [PATCH] .

---
 conf/application.xml                       | 11 -----------
 conf/persistence.xml                       | 22 ----------------------
 src/com/lxyer/bbs/base/BaseServlet.java    |  5 -----
 src/com/lxyer/bbs/base/EJ.java             |  7 -------
 src/com/lxyer/bbs/servlet/UserServlet.java | 13 -------------
 5 files changed, 58 deletions(-)
 delete mode 100644 src/com/lxyer/bbs/servlet/UserServlet.java

diff --git a/conf/application.xml b/conf/application.xml
index 06e877d..ff81fa9 100644
--- a/conf/application.xml
+++ b/conf/application.xml
@@ -5,9 +5,6 @@
     <!--  详细配置说明见： http://redkale.org/redkale.html#redkale_confxml  -->
     
     <resources>
-        <!--<source name="redis" value="org.redkalex.cache.RedisCacheSource" xxx="16">
-            <node addr="120.24.230.60" port="6379"/>
-        </source>-->
     </resources>
         
     <server protocol="HTTP" host="0.0.0.0" port="6060" root="root">
@@ -28,14 +25,6 @@
 
             <!--<rewrite type="location" match="^/([^-]+)-[^-\.]+\.png(.*)" forward="/$1.png"/>-->
         </resource-servlet>
-
-        <!--<response>
-            <defcookie domain="" path=""/>
-            <addheader name="Access-Control-Allow-Origin" value="request.headers.Origin" />
-            <setheader name="Access-Control-Allow-Headers" value="request.headers.Access-Control-Request-Headers"/>
-            <setheader name="Access-Control-Allow-Credentials" value="true"/>
-            <options auto="true" />
-        </response>-->
     </server>
     
 </application>
diff --git a/conf/persistence.xml b/conf/persistence.xml
index 867d5d5..5e5936c 100644
--- a/conf/persistence.xml
+++ b/conf/persistence.xml
@@ -12,26 +12,4 @@
         </properties>
     </persistence-unit>
     
-    <!--
-    <persistence-unit name="user.read" transaction-type="RESOURCE_LOCAL">
-        <shared-cache-mode>ALL</shared-cache-mode>
-        <properties>
-            <property name="javax.persistence.jdbc.url" value="jdbc:oracle:thin:@localhost:1521:orcl"/>
-            <property name="javax.persistence.jdbc.driver" value="oracle.jdbc.driver.OracleDriver"/>
-            <property name="javax.persistence.jdbc.user" value="system"/>
-            <property name="javax.persistence.jdbc.password" value="1234"/>
-        </properties>
-    </persistence-unit>
-    
-    <persistence-unit name="user.write" transaction-type="RESOURCE_LOCAL">
-        <shared-cache-mode>ALL</shared-cache-mode>
-        <properties>
-            <property name="javax.persistence.jdbc.url" value="jdbc:mysql://localhost:3306/user?autoReconnect=true&amp;characterEncoding=utf8"/>
-            <property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/>
-            <property name="javax.persistence.jdbc.user" value="root"/>
-            <property name="javax.persistence.jdbc.password" value="1234"/>
-        </properties>
-    </persistence-unit>
-    -->
-    
 </persistence>
diff --git a/src/com/lxyer/bbs/base/BaseServlet.java b/src/com/lxyer/bbs/base/BaseServlet.java
index 8177c9f..89674ce 100644
--- a/src/com/lxyer/bbs/base/BaseServlet.java
+++ b/src/com/lxyer/bbs/base/BaseServlet.java
@@ -56,10 +56,6 @@ public class BaseServlet extends HttpServlet {
             _kv.set("mine", request.currentUser());
         }
 
-        /*cache.set("a", "ABC");
-        String a = cache.get("a");
-        System.out.println(a);*/
-
         this.request = request;
         this.response = response;
         String uri = request.getRequestURI();
@@ -80,7 +76,6 @@ public class BaseServlet extends HttpServlet {
             return;
         }*/
 
-
         response.nextEvent();
     }
 
diff --git a/src/com/lxyer/bbs/base/EJ.java b/src/com/lxyer/bbs/base/EJ.java
index 12cb5c1..0a50051 100644
--- a/src/com/lxyer/bbs/base/EJ.java
+++ b/src/com/lxyer/bbs/base/EJ.java
@@ -1,15 +1,8 @@
 package com.lxyer.bbs.base;
 
-import com.jfinal.kit.Kv;
 import org.redkale.net.http.RestService;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Stream;
-
-import static java.util.Arrays.asList;
 
 /**
  * Created by Lxy at 2017/11/26 17:19.
diff --git a/src/com/lxyer/bbs/servlet/UserServlet.java b/src/com/lxyer/bbs/servlet/UserServlet.java
deleted file mode 100644
index 6d3ee30..0000000
--- a/src/com/lxyer/bbs/servlet/UserServlet.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.lxyer.bbs.servlet;
-
-import com.lxyer.bbs.base.BaseServlet;
-import org.redkale.net.http.WebServlet;
-
-/**
- * Created by Lxy at 2017/11/25 21:15.
- */
-
-public class UserServlet extends BaseServlet {
-
-
-}