diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..249d5b2
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,72 @@
+# Created by .ignore support plugin (hsz.mobi)
+### JetBrains template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff:
+.idea
+.idea/**/tasks.xml
+.idea/dictionaries
+
+# Sensitive or high-churn files:
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.xml
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+# Gradle:
+.idea/**/gradle.xml
+# CMake
+cmake-build-debug/
+
+# Mongo Explorer plugin:
+.idea/**/mongoSettings.xml
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+### Java template
+# Compiled class file
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+# custom
+*.iml
+
+**/target
diff --git a/Dubbo-Demo/Service-Client/pom.xml b/Dubbo-Demo/Service-Client/pom.xml
new file mode 100644
index 0000000..bac9551
--- /dev/null
+++ b/Dubbo-Demo/Service-Client/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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>
+        <groupId>cn.mrdear.dubbo</groupId>
+        <artifactId>Dubbo-Demo</artifactId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>Service-Client</artifactId>
+
+
+</project>
\ No newline at end of file
diff --git a/Dubbo-Demo/Service-Client/src/main/java/cn/mrdear/client/dto/UserDTO.java b/Dubbo-Demo/Service-Client/src/main/java/cn/mrdear/client/dto/UserDTO.java
new file mode 100644
index 0000000..72dd1ce
--- /dev/null
+++ b/Dubbo-Demo/Service-Client/src/main/java/cn/mrdear/client/dto/UserDTO.java
@@ -0,0 +1,31 @@
+package cn.mrdear.client.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 用户DTO,用于Service层传输
+ * @author Niu Li
+ * @since 2017/6/12
+ */
+@Data
+public class UserDTO implements Serializable{
+
+  private static final long serialVersionUID = 4086492518942464226L;
+
+  private Long id;
+
+  private String username;
+
+  private String password;
+
+  private Integer age;
+
+  private String nickname;
+
+  private String mail;
+
+  private String memo;
+
+}
diff --git a/Dubbo-Demo/Service-Client/src/main/java/cn/mrdear/client/service/IUserService.java b/Dubbo-Demo/Service-Client/src/main/java/cn/mrdear/client/service/IUserService.java
new file mode 100644
index 0000000..1edd92f
--- /dev/null
+++ b/Dubbo-Demo/Service-Client/src/main/java/cn/mrdear/client/service/IUserService.java
@@ -0,0 +1,37 @@
+package cn.mrdear.client.service;
+
+import cn.mrdear.client.dto.UserDTO;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 用户服务,一般都会在返回层再包裹一层,这里简而化之
+ * @author Niu Li
+ * @since 2017/6/12
+ */
+public interface IUserService {
+
+  /**
+   * 根据id查找
+   */
+  UserDTO findById(Long id);
+
+  /**
+   * 根据id批量查询
+   */
+  List<UserDTO> queryByIds(Collection<Long> ids);
+
+  /**
+   * 更新用户
+   * @return 返回更新后的实体
+   */
+  UserDTO updateById(UserDTO userDTO);
+
+  /**
+   * 根据id删除用户
+   */
+  Boolean deleteById(Long id);
+
+
+}
diff --git a/Dubbo-Demo/Service-Consumer/pom.xml b/Dubbo-Demo/Service-Consumer/pom.xml
new file mode 100644
index 0000000..c8ba829
--- /dev/null
+++ b/Dubbo-Demo/Service-Consumer/pom.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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>
+        <groupId>cn.mrdear.dubbo</groupId>
+        <artifactId>Dubbo-Demo</artifactId>
+        <version>1.0.0</version>
+    </parent>
+    <packaging>war</packaging>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>Service-Consumer</artifactId>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.mrdear.dubbo</groupId>
+            <artifactId>Service-Client</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.netflix.hystrix</groupId>
+            <artifactId>hystrix-javanica</artifactId>
+            <version>1.5.12</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>2.8.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.8.6</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.8.6</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>4.3.2.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>4.3.2.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+            <version>1.2</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>4.3.2.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>4.3.2.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>dubbo</artifactId>
+            <version>2.5.3</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>spring</artifactId>
+                    <groupId>org.springframework</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.101tec</groupId>
+            <artifactId>zkclient</artifactId>
+            <version>0.10</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file
diff --git a/Dubbo-Demo/Service-Consumer/src/main/java/cn/mrdear/consumer/controller/UserController.java b/Dubbo-Demo/Service-Consumer/src/main/java/cn/mrdear/consumer/controller/UserController.java
new file mode 100644
index 0000000..9593c2d
--- /dev/null
+++ b/Dubbo-Demo/Service-Consumer/src/main/java/cn/mrdear/consumer/controller/UserController.java
@@ -0,0 +1,27 @@
+package cn.mrdear.consumer.controller;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RestController;
+
+import cn.mrdear.client.dto.UserDTO;
+import cn.mrdear.consumer.manager.UserManager;
+
+import javax.annotation.Resource;
+
+/**
+ * @author Niu Li
+ * @since 2017/6/14
+ */
+@RestController
+public class UserController {
+
+  @Resource
+  private UserManager userManager;
+
+  @GetMapping("/user/{id}")
+  public UserDTO getUserById(@PathVariable Long id) {
+    UserDTO userDTO = userManager.findById(id);
+    return userDTO;
+  }
+}
diff --git a/Dubbo-Demo/Service-Consumer/src/main/java/cn/mrdear/consumer/manager/UserManager.java b/Dubbo-Demo/Service-Consumer/src/main/java/cn/mrdear/consumer/manager/UserManager.java
new file mode 100644
index 0000000..900368e
--- /dev/null
+++ b/Dubbo-Demo/Service-Consumer/src/main/java/cn/mrdear/consumer/manager/UserManager.java
@@ -0,0 +1,17 @@
+package cn.mrdear.consumer.manager;
+
+import cn.mrdear.client.dto.UserDTO;
+
+/**
+ * manager
+ * @author Niu Li
+ * @since 2017/6/13
+ */
+
+public interface UserManager {
+
+  UserDTO findById(Long id);
+
+  UserDTO findByIdBack(Long id);
+
+}
diff --git a/Dubbo-Demo/Service-Consumer/src/main/java/cn/mrdear/consumer/manager/impl/UserManagerImpl.java b/Dubbo-Demo/Service-Consumer/src/main/java/cn/mrdear/consumer/manager/impl/UserManagerImpl.java
new file mode 100644
index 0000000..572c407
--- /dev/null
+++ b/Dubbo-Demo/Service-Consumer/src/main/java/cn/mrdear/consumer/manager/impl/UserManagerImpl.java
@@ -0,0 +1,51 @@
+package cn.mrdear.consumer.manager.impl;
+
+import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
+
+import org.springframework.stereotype.Service;
+
+import cn.mrdear.client.dto.UserDTO;
+import cn.mrdear.client.service.IUserService;
+import cn.mrdear.consumer.manager.UserManager;
+
+import javax.annotation.Resource;
+
+import java.util.Objects;
+
+/**
+ * manager调用远程RPC组装数据,此处调试只是再加一层封装
+ * @author Niu Li
+ * @since 2017/6/13
+ */
+@Service
+public class UserManagerImpl implements UserManager {
+
+  @Resource
+  private IUserService userService;
+
+  @Override
+  @HystrixCommand(groupKey = "user", fallbackMethod = "findByIdBack")
+  public UserDTO findById(Long id) {
+    if (Objects.equals(id, 1L)) {
+      try {
+        Thread.sleep(1000000);
+      } catch (InterruptedException e) {
+        // do nothing
+      }
+    }
+    if (Objects.equals(id, 2L)) {
+      throw new RuntimeException("熔断测试");
+    }
+    return userService.findById(id);
+  }
+
+  public UserDTO findByIdBack(Long id) {
+    System.err.println("findByIdBack");
+    UserDTO userDTO = new UserDTO();
+    userDTO.setAge(1);
+    userDTO.setUsername("备用用户");
+    return userDTO;
+  }
+
+
+}
diff --git a/Dubbo-Demo/Service-Consumer/src/main/resources/applicationContext.xml b/Dubbo-Demo/Service-Consumer/src/main/resources/applicationContext.xml
new file mode 100644
index 0000000..4ddd015
--- /dev/null
+++ b/Dubbo-Demo/Service-Consumer/src/main/resources/applicationContext.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:task="http://www.springframework.org/schema/task"
+       xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"
+       xmlns:aop="http://www.springframework.org/schema/aop"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd   http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd     http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd">
+
+    <!-- 启用注解 -->
+    <context:annotation-config/>
+    <!--启动定时器-->
+    <task:annotation-driven/>
+
+    <context:component-scan base-package="cn.mrdear.consumer"/>
+
+    <!--断路器配置-->
+    <aop:aspectj-autoproxy/>
+    <bean id="hystrixAspect"
+          class="com.netflix.hystrix.contrib.javanica.aop.aspectj.HystrixCommandAspect"/>
+
+    <!-- 提供方应用信息，用于计算依赖关系 -->
+    <dubbo:application name="user_consumer" />
+
+    <!-- 使用zookeeper注册中心暴露服务地址 -->
+    <dubbo:registry address="zookeeper://127.0.0.1:2181" />
+
+    <!--配置本地地址-->
+    <dubbo:protocol host="127.0.0.1"/>
+
+    <!-- 声明需要暴露的服务接口 -->
+    <dubbo:reference interface="cn.mrdear.client.service.IUserService" id="userService"
+                     check="false" retries="2" cluster="failover" loadbalance="roundrobin"
+                     cache="lru" version="1.0.0"/>
+
+</beans>
\ No newline at end of file
diff --git a/Dubbo-Demo/Service-Consumer/src/main/resources/dispatcher-servlet.xml b/Dubbo-Demo/Service-Consumer/src/main/resources/dispatcher-servlet.xml
new file mode 100644
index 0000000..9b9a484
--- /dev/null
+++ b/Dubbo-Demo/Service-Consumer/src/main/resources/dispatcher-servlet.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mvc="http://www.springframework.org/schema/mvc"
+       xmlns:contents="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+
+    <!-- 自动扫描该包，使SpringMVC认为包下用了@controller注解的类是控制器 -->
+    <contents:component-scan base-package="cn.mrdear.consumer.controller"/>
+
+    <!-- 启用默认配置 -->
+    <mvc:annotation-driven/>
+
+    <!-- 对模型视图名称的解析，即在模型视图名称添加前后缀(如果最后一个还是表示文件夹,则最后的斜杠不要漏了) 使用JSP-->
+    <!-- 默认的视图解析器 在上边的解析错误时使用 (默认使用html)- -->
+    <bean id="defaultViewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+        <!--可以使用jstl标签-->
+        <property name="viewClass" value="org.springframework.web.servlet.view.JstlView"/>
+        <property name="prefix" value="/WEB-INF/view/"/><!--设置JSP文件的目录位置-->
+        <property name="suffix" value=".jsp"/>
+    </bean>
+</beans>
\ No newline at end of file
diff --git a/Dubbo-Demo/Service-Consumer/src/main/webapp/WEB-INF/view/error.jsp b/Dubbo-Demo/Service-Consumer/src/main/webapp/WEB-INF/view/error.jsp
new file mode 100644
index 0000000..e9ea535
--- /dev/null
+++ b/Dubbo-Demo/Service-Consumer/src/main/webapp/WEB-INF/view/error.jsp
@@ -0,0 +1,16 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: niuli
+  Date: 2017/4/19
+  Time: 09:45
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>Title</title>
+</head>
+<body>
+<h1>Error 页面</h1>
+</body>
+</html>
diff --git a/Dubbo-Demo/Service-Consumer/src/main/webapp/WEB-INF/web.xml b/Dubbo-Demo/Service-Consumer/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000..f1339a6
--- /dev/null
+++ b/Dubbo-Demo/Service-Consumer/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,65 @@
+<?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">
+
+  <!--配置获取项目的根路径,java类中使用System.getProperty("web.root")-->
+  <context-param>
+    <param-name>webAppRootKey</param-name>
+    <param-value>web.root</param-value>
+  </context-param>
+  <context-param>
+    <param-name>contextConfigLocation</param-name>
+    <param-value>classpath:applicationContext.xml</param-value>
+  </context-param>
+
+  <!--配置spring编码-->
+  <!-- 配置字符编码过滤器，编码格式设为UTF-8，避免中文乱码 -->
+  <filter>
+    <filter-name>encodingFilter</filter-name>
+    <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
+    <init-param>
+      <param-name>encoding</param-name>
+      <param-value>UTF-8</param-value> <!--设置你想用的字符集，我这里用的是UTF-8-->
+    </init-param>
+    <!--强制使用该编码-->
+    <init-param>
+      <param-name>forceEncoding</param-name>
+      <param-value>true</param-value>
+    </init-param>
+  </filter>
+  <filter-mapping>
+    <filter-name>encodingFilter</filter-name>
+    <url-pattern>/*</url-pattern> <!--设置你想过滤的页面或者是Servlet，根据自己的需要配置-->
+  </filter-mapping>
+
+  <listener>
+    <listener-class>org.springframework.web.util.WebAppRootListener</listener-class>
+  </listener>
+  <listener>
+    <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+  </listener>
+  <!-- 主要负责处理由　JavaBeans Introspector的使用而引起的缓冲泄露。spring中对它的描述如下：它是一个在web应用关闭的时候,清除JavaBeans Introspector的监听器.web.xml中注册这个listener.可以保证在web 应用关闭的时候释放与掉这个web 应用相关的class loader 和由它管理的类如果你使用了JavaBeans Introspector来分析应用中的类,Introspector 缓冲中会保留这些类的引用.结果在你的应用关闭的时候,这些类以及web 应用相关的class loader没有被垃圾回收.不幸的是,清除Introspector的唯一方式是刷新整个缓冲. -->
+  <listener>
+    <listener-class>org.springframework.web.util.IntrospectorCleanupListener</listener-class>
+  </listener>
+
+
+  <!--配置springMVC-->
+  <servlet>
+    <servlet-name>dispatcher</servlet-name>
+    <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+    <init-param>
+      <param-name>contextConfigLocation</param-name>
+      <!--配置文件的路径-->
+      <param-value>classpath:dispatcher-servlet.xml</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>dispatcher</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+
+</web-app>
diff --git a/Dubbo-Demo/Service-Consumer/src/main/webapp/index.jsp b/Dubbo-Demo/Service-Consumer/src/main/webapp/index.jsp
new file mode 100644
index 0000000..fa47f72
--- /dev/null
+++ b/Dubbo-Demo/Service-Consumer/src/main/webapp/index.jsp
@@ -0,0 +1,17 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: NL
+  Date: 2017/1/23
+  Time: 9:09
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title></title>
+</head>
+<body>
+<h2>Hello World!</h2>
+<h3>请访问/user/{id}测试</h3>
+</body>
+</html>
diff --git a/Dubbo-Demo/Service-Consumer/src/test/java/cn/mrdear/test/UserManagerTest.java b/Dubbo-Demo/Service-Consumer/src/test/java/cn/mrdear/test/UserManagerTest.java
new file mode 100644
index 0000000..bfe506b
--- /dev/null
+++ b/Dubbo-Demo/Service-Consumer/src/test/java/cn/mrdear/test/UserManagerTest.java
@@ -0,0 +1,31 @@
+package cn.mrdear.test;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import cn.mrdear.client.dto.UserDTO;
+import cn.mrdear.consumer.manager.UserManager;
+
+import javax.annotation.Resource;
+
+/**
+ * @author Niu Li
+ * @since 2017/6/13
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath:applicationContext.xml")
+public class UserManagerTest {
+
+  @Resource
+  private UserManager userManager;
+
+
+  @Test
+  public void testFindById() {
+    UserDTO userDTO = userManager.findById(1L);
+    Assert.assertNotNull(userDTO);
+  }
+}
diff --git a/Dubbo-Demo/Service-Consumer/src/test/resources/applicationContext.xml b/Dubbo-Demo/Service-Consumer/src/test/resources/applicationContext.xml
new file mode 100644
index 0000000..5a693f6
--- /dev/null
+++ b/Dubbo-Demo/Service-Consumer/src/test/resources/applicationContext.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:task="http://www.springframework.org/schema/task"
+       xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd   http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd     http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd">
+
+    <!-- 启用注解 -->
+    <context:annotation-config/>
+    <!--启动定时器-->
+    <task:annotation-driven/>
+
+    <context:component-scan base-package="cn.mrdear.consumer"/>
+
+
+    <!-- 提供方应用信息，用于计算依赖关系 -->
+    <dubbo:application name="user_consumer" />
+
+    <!-- 使用zookeeper注册中心暴露服务地址 -->
+    <dubbo:registry address="zookeeper://127.0.0.1:2181" />
+
+    <!-- 声明需要暴露的服务接口 -->
+    <dubbo:reference interface="cn.mrdear.client.service.IUserService" id="userService"
+                     check="false" version="1.0.0"/>
+
+</beans>
\ No newline at end of file
diff --git a/Dubbo-Demo/Service-Provider/pom.xml b/Dubbo-Demo/Service-Provider/pom.xml
new file mode 100644
index 0000000..97f5cb5
--- /dev/null
+++ b/Dubbo-Demo/Service-Provider/pom.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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>
+        <groupId>cn.mrdear.dubbo</groupId>
+        <artifactId>Dubbo-Demo</artifactId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>Service-Provider</artifactId>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.mrdear.dubbo</groupId>
+            <artifactId>Service-Client</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>dubbo</artifactId>
+            <version>2.5.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.javassist</groupId>
+                    <artifactId>javassist</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.101tec</groupId>
+            <artifactId>zkclient</artifactId>
+            <version>0.10</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>1.4.187</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>4.3.2.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>4.3.2.RELEASE</version>
+        </dependency>
+        <!--aspectj start-->
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjweaver</artifactId>
+            <version>1.8.6</version>
+        </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjrt</artifactId>
+            <version>1.8.6</version>
+        </dependency>
+        <!--aspectj end-->
+        <!--cglib start-->
+        <dependency>
+            <groupId>cglib</groupId>
+            <artifactId>cglib</artifactId>
+            <version>3.2.2</version>
+        </dependency>
+        <!--cglib end-->
+        <!--hibernate start-->
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>5.1.0.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-entitymanager</artifactId>
+            <version>5.1.0.Final</version>
+        </dependency>
+        <!--hibernate end-->
+        <!--mysql start-->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>5.1.34</version>
+        </dependency>
+        <!--mysql end-->
+        <!--alibaba start-->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid</artifactId>
+            <version>1.0.19</version>
+        </dependency>
+        <!--alibaba end-->
+
+        <!--JPA start-->
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-jpa</artifactId>
+            <version>1.10.4.RELEASE</version>
+        </dependency>
+        <!--JPA end-->
+
+    </dependencies>
+</project>
\ No newline at end of file
diff --git a/Dubbo-Demo/Service-Provider/src/main/java/cn/mrdear/provider/Application.java b/Dubbo-Demo/Service-Provider/src/main/java/cn/mrdear/provider/Application.java
new file mode 100644
index 0000000..cbebadb
--- /dev/null
+++ b/Dubbo-Demo/Service-Provider/src/main/java/cn/mrdear/provider/Application.java
@@ -0,0 +1,17 @@
+package cn.mrdear.provider;
+
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+import java.io.IOException;
+
+/**
+ * @author Niu Li
+ * @since 2017/6/12
+ */
+public class Application {
+  public static void main(String[] args) throws IOException {
+    ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("applicationContext.xml");
+    context.start();
+    System.in.read(); // 为保证服务一直开着，利用输入流的阻塞来模拟
+  }
+}
diff --git a/Dubbo-Demo/Service-Provider/src/main/java/cn/mrdear/provider/convert/UserConvert.java b/Dubbo-Demo/Service-Provider/src/main/java/cn/mrdear/provider/convert/UserConvert.java
new file mode 100644
index 0000000..67ae9ca
--- /dev/null
+++ b/Dubbo-Demo/Service-Provider/src/main/java/cn/mrdear/provider/convert/UserConvert.java
@@ -0,0 +1,42 @@
+package cn.mrdear.provider.convert;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.util.CollectionUtils;
+
+import cn.mrdear.client.dto.UserDTO;
+import cn.mrdear.provider.domain.User;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author Niu Li
+ * @since 2017/6/12
+ */
+public class UserConvert {
+
+  public static UserDTO toDTO(User user) {
+    UserDTO userDTO = new UserDTO();
+    BeanUtils.copyProperties(user,userDTO);
+    return userDTO;
+  }
+
+
+  public static List<UserDTO> toDTOS(List<User> users) {
+    if (CollectionUtils.isEmpty(users)) {
+      return new ArrayList<>(1);
+    }
+    List<UserDTO> results = new ArrayList<>();
+    return users.stream().map(UserConvert::toDTO)
+        .collect(Collectors.toList());
+  }
+
+
+  public static User toDO(UserDTO userDTO) {
+    User user = new User();
+    BeanUtils.copyProperties(userDTO,user);
+    return user;
+  }
+
+}
diff --git a/Dubbo-Demo/Service-Provider/src/main/java/cn/mrdear/provider/dao/UserRepository.java b/Dubbo-Demo/Service-Provider/src/main/java/cn/mrdear/provider/dao/UserRepository.java
new file mode 100644
index 0000000..6b068b4
--- /dev/null
+++ b/Dubbo-Demo/Service-Provider/src/main/java/cn/mrdear/provider/dao/UserRepository.java
@@ -0,0 +1,24 @@
+package cn.mrdear.provider.dao;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+
+import cn.mrdear.provider.domain.User;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * JPA repo层
+ * @author Niu Li
+ * @since 2017/6/12
+ */
+public interface UserRepository extends JpaRepository<User,Long>{
+
+  User findById(Long id);
+
+  @Query("select p from User p where id in (?1)")
+  List<User> queryByIds(Collection<Long> ids);
+
+
+}
diff --git a/Dubbo-Demo/Service-Provider/src/main/java/cn/mrdear/provider/domain/User.java b/Dubbo-Demo/Service-Provider/src/main/java/cn/mrdear/provider/domain/User.java
new file mode 100644
index 0000000..81849e5
--- /dev/null
+++ b/Dubbo-Demo/Service-Provider/src/main/java/cn/mrdear/provider/domain/User.java
@@ -0,0 +1,39 @@
+package cn.mrdear.provider.domain;
+
+import lombok.Data;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import java.io.Serializable;
+
+/**
+ * 用户实体类,对应数据库
+ * @author Niu Li
+ * @since 2017/6/12
+ */
+@Data
+@Entity
+@Table(name = "user")
+public class User implements Serializable{
+
+  private static final long serialVersionUID = 1793488098966504793L;
+  @Id
+  @GeneratedValue
+  private Long id;
+
+  private String username;
+
+  private String password;
+
+  private Integer age;
+
+  private String nickname;
+
+  private String mail;
+
+  private String memo;
+
+}
diff --git a/Dubbo-Demo/Service-Provider/src/main/java/cn/mrdear/provider/service/UserServiceImpl.java b/Dubbo-Demo/Service-Provider/src/main/java/cn/mrdear/provider/service/UserServiceImpl.java
new file mode 100644
index 0000000..082f809
--- /dev/null
+++ b/Dubbo-Demo/Service-Provider/src/main/java/cn/mrdear/provider/service/UserServiceImpl.java
@@ -0,0 +1,51 @@
+package cn.mrdear.provider.service;
+
+import com.alibaba.dubbo.config.annotation.Service;
+
+import cn.mrdear.client.dto.UserDTO;
+import cn.mrdear.client.service.IUserService;
+import cn.mrdear.provider.convert.UserConvert;
+import cn.mrdear.provider.dao.UserRepository;
+import cn.mrdear.provider.domain.User;
+
+import javax.annotation.Resource;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 用户服务的具体实现,作为服务提供方提供出去
+ * @author Niu Li
+ * @since 2017/6/12
+ */
+@Service(version = "1.0.0")
+public class UserServiceImpl implements IUserService {
+
+  @Resource
+  private UserRepository userRepository;
+
+  @Override
+  public UserDTO findById(Long id) {
+    User user = userRepository.findById(id);
+    return UserConvert.toDTO(user);
+  }
+
+  @Override
+  public List<UserDTO> queryByIds(Collection<Long> ids) {
+    List<User> users = userRepository.queryByIds(ids);
+    return UserConvert.toDTOS(users);
+  }
+
+  @Override
+  public UserDTO updateById(UserDTO userDTO) {
+    User user = UserConvert.toDO(userDTO);
+    userRepository.save(user);
+    return this.findById(userDTO.getId());
+  }
+
+  @Override
+  public Boolean deleteById(Long id) {
+    userRepository.delete(id);
+    return true;
+  }
+}
diff --git a/Dubbo-Demo/Service-Provider/src/main/resources/applicationContext.xml b/Dubbo-Demo/Service-Provider/src/main/resources/applicationContext.xml
new file mode 100644
index 0000000..c811fad
--- /dev/null
+++ b/Dubbo-Demo/Service-Provider/src/main/resources/applicationContext.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:task="http://www.springframework.org/schema/task"
+       xmlns:cache="http://www.springframework.org/schema/cache"
+       xmlns:jpa="http://www.springframework.org/schema/data/jpa"
+       xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"
+       xmlns:jdbc="http://www.springframework.org/schema/jdbc"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd   http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd     http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache.xsd http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd">
+
+    <!-- 启用注解 -->
+    <context:annotation-config />
+    <!--启动定时器-->
+    <task:annotation-driven/>
+
+    <context:component-scan base-package="cn.mrdear.provider" />
+
+    <!-- 加载数据库配置文件 -->
+    <context:property-placeholder location="classpath:db.properties"/>
+    <!--配置数据库连接池Druid-->
+    <!--<bean id="dataSource" class="com.alibaba.druid.pool.DruidDataSource" destroy-method="close">-->
+        <!--&lt;!&ndash; 数据库基本信息配置 &ndash;&gt;-->
+        <!--<property name="url" value="${jdbc.url}" />-->
+        <!--<property name="username" value="${jdbc.username}" />-->
+        <!--<property name="password" value="${jdbc.password}" />-->
+        <!--<property name="driverClassName" value="${jdbc.driver}" />-->
+        <!--<property name="filters" value="${filters}" />-->
+        <!--&lt;!&ndash; 最大并发连接数 &ndash;&gt;-->
+        <!--<property name="maxActive" value="${maxActive}" />-->
+        <!--&lt;!&ndash; 初始化连接数量 &ndash;&gt;-->
+        <!--<property name="initialSize" value="${initialSize}" />-->
+        <!--&lt;!&ndash; 配置获取连接等待超时的时间 &ndash;&gt;-->
+        <!--<property name="maxWait" value="${maxWait}" />-->
+        <!--&lt;!&ndash; 最小空闲连接数 &ndash;&gt;-->
+        <!--<property name="minIdle" value="${minIdle}" />-->
+        <!--&lt;!&ndash; 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 &ndash;&gt;-->
+        <!--<property name="timeBetweenEvictionRunsMillis" value="${timeBetweenEvictionRunsMillis}" />-->
+        <!--&lt;!&ndash; 配置一个连接在池中最小生存的时间，单位是毫秒 &ndash;&gt;-->
+        <!--<property name="minEvictableIdleTimeMillis" value="${minEvictableIdleTimeMillis}" />-->
+        <!--<property name="validationQuery" value="SELECT 1" />-->
+        <!--<property name="testWhileIdle" value="${testWhileIdle}" />-->
+        <!--<property name="testOnBorrow" value="${testOnBorrow}" />-->
+        <!--<property name="testOnReturn" value="${testOnReturn}" />-->
+        <!--<property name="maxOpenPreparedStatements" value="${maxOpenPreparedStatements}" />-->
+        <!--&lt;!&ndash; 打开removeAbandoned功能 &ndash;&gt;-->
+        <!--<property name="removeAbandoned" value="${removeAbandoned}" />-->
+        <!--&lt;!&ndash; 1800秒，也就是30分钟 &ndash;&gt;-->
+        <!--<property name="removeAbandonedTimeout" value="${removeAbandonedTimeout}" />-->
+        <!--&lt;!&ndash; 关闭abanded连接时输出错误日志 &ndash;&gt;-->
+        <!--<property name="logAbandoned" value="${logAbandoned}" />-->
+    <!--</bean>-->
+
+    <bean id="dataSource" class="org.h2.jdbcx.JdbcConnectionPool"
+          destroy-method="dispose">
+        <constructor-arg>
+            <bean class="org.h2.jdbcx.JdbcDataSource">
+                <!-- 内存模式 -->
+                <property name="URL" value="jdbc:h2:mem:test;MODE=MySql;DB_CLOSE_DELAY=-1" />
+                <!-- 文件模式 -->
+                 <!--<property name="URL" value="jdbc:h2:testRestDB" /> -->
+                <property name="user" value="sa" />
+                <property name="password" value="sa" />
+            </bean>
+        </constructor-arg>
+    </bean>
+
+    <!-- 初始化数据表结构 -->
+    <jdbc:initialize-database data-source="dataSource"
+                              ignore-failures="ALL">
+        <jdbc:script location="classpath:/h2/schema.sql" />
+        <jdbc:script location="classpath:/h2/data.sql" />
+    </jdbc:initialize-database>
+
+    <!--第二步-->
+    <!--定义实体的工厂bean-->
+    <bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
+        <property name="dataSource" ref="dataSource"/>
+        <!--实体类位置-->
+        <property name="packagesToScan" value="cn.mrdear.provider.domain"/>
+        <!--持久化单元名-->
+        <property name="persistenceUnitName" value="TestJPA" />
+        <!--JPA提供者-->
+        <property name="persistenceProviderClass" value="org.hibernate.ejb.HibernatePersistence"/>
+        <!--JPA属性-->
+        <property name="jpaProperties">
+            <props>
+                <!--配置方言-->
+                <prop key="hibernate.dialect">org.hibernate.dialect.MySQL5Dialect</prop>
+                <!--激活查询日志功能-->
+                <prop key="hibernate.show_sql">false</prop>
+                <!--优雅地输出Sql-->
+                <prop key="hibernate.format_sql">false</prop>
+                <!--添加一条解释型标注-->
+                <prop key="hibernate.use_sql_comments">false</prop>
+                <!--配置如何根据java模型生成数据库表结构,常用update,validate-->
+                <prop key="hibernate.hbm2ddl.auto">none</prop>
+            </props>
+        </property>
+    </bean>
+
+
+    <!--第三步-->
+    <!--定义事务管理器-->
+    <bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
+        <property name="dataSource" ref="dataSource"/>
+        <property name="entityManagerFactory" ref="entityManagerFactory"/>
+    </bean>
+
+    <!--第四步-->
+    <!--定义repository接口的存放目录-->
+    <!--定义接口实现的后缀，通常用Impl-->
+    <!--定义实体工厂的引用-->
+    <!--定义事务管理器的引用-->
+    <jpa:repositories base-package="cn.mrdear.provider.dao"
+                      repository-impl-postfix="Impl"
+                      entity-manager-factory-ref="entityManagerFactory"
+                      transaction-manager-ref="transactionManager"/>
+
+    <!-- 具体的实现bean -->
+    <bean id="userService" class="cn.mrdear.provider.service.UserServiceImpl" />
+
+    <!-- 提供方应用信息，用于计算依赖关系 -->
+    <dubbo:application name="user_provider" />
+
+    <!-- 使用zookeeper注册中心暴露服务地址,即zookeeper的所在服务器ip地址和端口号 -->
+    <dubbo:registry address="zookeeper://127.0.0.1:2181" />
+
+    <!-- 用dubbo协议在20880端口暴露服务 -->
+    <dubbo:protocol name="dubbo" host="192.168.137.78" port="20881" />
+
+    <!-- 声明需要暴露的服务接口 -->
+    <dubbo:service interface="cn.mrdear.client.service.IUserService"
+                   ref="userService" version="1.0.0"/>
+</beans>
\ No newline at end of file
diff --git a/SSM--Demo/src/main/resources/db.properties b/Dubbo-Demo/Service-Provider/src/main/resources/db.properties
similarity index 77%
rename from SSM--Demo/src/main/resources/db.properties
rename to Dubbo-Demo/Service-Provider/src/main/resources/db.properties
index e0ed7fc..2228684 100644
--- a/SSM--Demo/src/main/resources/db.properties
+++ b/Dubbo-Demo/Service-Provider/src/main/resources/db.properties
@@ -1,5 +1,6 @@
 jdbc.driver=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://localhost:3306/austoj?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+jdbc.url=jdbc:mysql://127.0.0.1:3306/ssm?useUnicode=true&characterEncoding=utf8&characterSetResults\
+  =utf8
 jdbc.username=root
 jdbc.password=7946521
 
diff --git a/Dubbo-Demo/Service-Provider/src/main/resources/h2/data.sql b/Dubbo-Demo/Service-Provider/src/main/resources/h2/data.sql
new file mode 100644
index 0000000..a09f7a8
--- /dev/null
+++ b/Dubbo-Demo/Service-Provider/src/main/resources/h2/data.sql
@@ -0,0 +1,6 @@
+INSERT INTO user (username, password, age, nickname, mail, memo) VALUES ('zhangsan',
+ '123456', 18, '张三', '1111@qq.com', 'hahahah');
+INSERT INTO user (username, password, age, nickname, mail, memo) VALUES ('lis',
+'123456', 19, '李四', '123131@qq.com', 'xixiixxi');
+INSERT INTO user (username, password, age, nickname, mail, memo) VALUES ('wanger',
+'123456', 29, '王二', '12131984@qq.com', 'dqdh');
\ No newline at end of file
diff --git a/Dubbo-Demo/Service-Provider/src/main/resources/h2/schema.sql b/Dubbo-Demo/Service-Provider/src/main/resources/h2/schema.sql
new file mode 100644
index 0000000..8de82c2
--- /dev/null
+++ b/Dubbo-Demo/Service-Provider/src/main/resources/h2/schema.sql
@@ -0,0 +1,10 @@
+DROP TABLE user if exist;
+create table user (
+  id INT(11) AUTO_INCREMENT PRIMARY KEY ,
+  username VARCHAR(255),
+  password VARCHAR(255),
+  age INT(3),
+  nickname VARCHAR(255),
+  mail VARCHAR(255),
+  memo VARCHAR(255),
+  );
\ No newline at end of file
diff --git a/Dubbo-Demo/Service-Provider/src/main/resources/logback.xml b/Dubbo-Demo/Service-Provider/src/main/resources/logback.xml
new file mode 100644
index 0000000..d68cd15
--- /dev/null
+++ b/Dubbo-Demo/Service-Provider/src/main/resources/logback.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+    <property name="LOG_HOME" value="logs" />
+
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>%d{HH:mm:ss} [%t] %logger{5} [%line] %p - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <!-- project level -->
+    <logger name="cn.mrdear" level="DEBUG" />
+
+    <root level="DEBUG" >
+        <appender-ref ref="console" />
+    </root>
+
+</configuration>
\ No newline at end of file
diff --git a/Dubbo-Demo/Service-Provider/src/test/java/cn/mrdear/test/UserServiceTest.java b/Dubbo-Demo/Service-Provider/src/test/java/cn/mrdear/test/UserServiceTest.java
new file mode 100644
index 0000000..3a50744
--- /dev/null
+++ b/Dubbo-Demo/Service-Provider/src/test/java/cn/mrdear/test/UserServiceTest.java
@@ -0,0 +1,31 @@
+package cn.mrdear.test;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import cn.mrdear.client.dto.UserDTO;
+import cn.mrdear.provider.service.UserServiceImpl;
+
+import javax.annotation.Resource;
+
+/**
+ * @author Niu Li
+ * @since 2017/6/13
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath:applicationContext.xml")
+public class UserServiceTest {
+
+  @Resource
+  private UserServiceImpl userService;
+
+  @Test
+  public void testFindById() {
+    UserDTO userDTO = userService.findById(1L);
+    Assert.assertNotNull(userDTO);
+  }
+
+}
diff --git a/Dubbo-Demo/Service-Provider/src/test/resources/applicationContext.xml b/Dubbo-Demo/Service-Provider/src/test/resources/applicationContext.xml
new file mode 100644
index 0000000..0192b9b
--- /dev/null
+++ b/Dubbo-Demo/Service-Provider/src/test/resources/applicationContext.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:task="http://www.springframework.org/schema/task"
+       xmlns:cache="http://www.springframework.org/schema/cache"
+       xmlns:jpa="http://www.springframework.org/schema/data/jpa"
+       xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"
+       xmlns:jdbc="http://www.springframework.org/schema/jdbc"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd   http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd     http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache.xsd http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd">
+
+    <!-- 启用注解 -->
+    <context:annotation-config />
+    <!--启动定时器-->
+    <task:annotation-driven/>
+
+    <context:component-scan base-package="cn.mrdear.provider" />
+
+    <!-- 加载数据库配置文件 -->
+    <context:property-placeholder location="classpath:db.properties"/>
+    <!--配置数据库连接池Druid-->
+    <!--<bean id="dataSource" class="com.alibaba.druid.pool.DruidDataSource" destroy-method="close">-->
+        <!--&lt;!&ndash; 数据库基本信息配置 &ndash;&gt;-->
+        <!--<property name="url" value="${jdbc.url}" />-->
+        <!--<property name="username" value="${jdbc.username}" />-->
+        <!--<property name="password" value="${jdbc.password}" />-->
+        <!--<property name="driverClassName" value="${jdbc.driver}" />-->
+        <!--<property name="filters" value="${filters}" />-->
+        <!--&lt;!&ndash; 最大并发连接数 &ndash;&gt;-->
+        <!--<property name="maxActive" value="${maxActive}" />-->
+        <!--&lt;!&ndash; 初始化连接数量 &ndash;&gt;-->
+        <!--<property name="initialSize" value="${initialSize}" />-->
+        <!--&lt;!&ndash; 配置获取连接等待超时的时间 &ndash;&gt;-->
+        <!--<property name="maxWait" value="${maxWait}" />-->
+        <!--&lt;!&ndash; 最小空闲连接数 &ndash;&gt;-->
+        <!--<property name="minIdle" value="${minIdle}" />-->
+        <!--&lt;!&ndash; 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 &ndash;&gt;-->
+        <!--<property name="timeBetweenEvictionRunsMillis" value="${timeBetweenEvictionRunsMillis}" />-->
+        <!--&lt;!&ndash; 配置一个连接在池中最小生存的时间，单位是毫秒 &ndash;&gt;-->
+        <!--<property name="minEvictableIdleTimeMillis" value="${minEvictableIdleTimeMillis}" />-->
+        <!--<property name="validationQuery" value="SELECT 1" />-->
+        <!--<property name="testWhileIdle" value="${testWhileIdle}" />-->
+        <!--<property name="testOnBorrow" value="${testOnBorrow}" />-->
+        <!--<property name="testOnReturn" value="${testOnReturn}" />-->
+        <!--<property name="maxOpenPreparedStatements" value="${maxOpenPreparedStatements}" />-->
+        <!--&lt;!&ndash; 打开removeAbandoned功能 &ndash;&gt;-->
+        <!--<property name="removeAbandoned" value="${removeAbandoned}" />-->
+        <!--&lt;!&ndash; 1800秒，也就是30分钟 &ndash;&gt;-->
+        <!--<property name="removeAbandonedTimeout" value="${removeAbandonedTimeout}" />-->
+        <!--&lt;!&ndash; 关闭abanded连接时输出错误日志 &ndash;&gt;-->
+        <!--<property name="logAbandoned" value="${logAbandoned}" />-->
+    <!--</bean>-->
+
+    <bean id="dataSource" class="org.h2.jdbcx.JdbcConnectionPool"
+          destroy-method="dispose">
+        <constructor-arg>
+            <bean class="org.h2.jdbcx.JdbcDataSource">
+                <!-- 内存模式 -->
+                <property name="URL" value="jdbc:h2:mem:test" />
+                <!-- 文件模式 -->
+                 <!--<property name="URL" value="jdbc:h2:testRestDB" /> -->
+                <property name="user" value="sa" />
+                <property name="password" value="sa" />
+            </bean>
+        </constructor-arg>
+    </bean>
+
+    <!-- 初始化数据表结构 -->
+    <jdbc:initialize-database data-source="dataSource"
+                              ignore-failures="ALL">
+        <jdbc:script location="classpath:/h2/schema.sql" />
+        <jdbc:script location="classpath:/h2/data.sql" />
+    </jdbc:initialize-database>
+
+    <!--第二步-->
+    <!--定义实体的工厂bean-->
+    <bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
+        <property name="dataSource" ref="dataSource"/>
+        <!--实体类位置-->
+        <property name="packagesToScan" value="cn.mrdear.provider.domain"/>
+        <!--持久化单元名-->
+        <property name="persistenceUnitName" value="TestJPA" />
+        <!--JPA提供者-->
+        <property name="persistenceProviderClass" value="org.hibernate.ejb.HibernatePersistence"/>
+        <!--JPA属性-->
+        <property name="jpaProperties">
+            <props>
+                <!--配置方言-->
+                <prop key="hibernate.dialect">org.hibernate.dialect.MySQL5Dialect</prop>
+                <!--激活查询日志功能-->
+                <prop key="hibernate.show_sql">false</prop>
+                <!--优雅地输出Sql-->
+                <prop key="hibernate.format_sql">false</prop>
+                <!--添加一条解释型标注-->
+                <prop key="hibernate.use_sql_comments">false</prop>
+                <!--配置如何根据java模型生成数据库表结构,常用update,validate-->
+                <prop key="hibernate.hbm2ddl.auto">none</prop>
+            </props>
+        </property>
+    </bean>
+
+
+    <!--第三步-->
+    <!--定义事务管理器-->
+    <bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
+        <property name="dataSource" ref="dataSource"/>
+        <property name="entityManagerFactory" ref="entityManagerFactory"/>
+    </bean>
+
+    <!--第四步-->
+    <!--定义repository接口的存放目录-->
+    <!--定义接口实现的后缀，通常用Impl-->
+    <!--定义实体工厂的引用-->
+    <!--定义事务管理器的引用-->
+    <jpa:repositories base-package="cn.mrdear.provider.dao"
+                      repository-impl-postfix="Impl"
+                      entity-manager-factory-ref="entityManagerFactory"
+                      transaction-manager-ref="transactionManager"/>
+
+
+
+    <!-- 具体的实现bean -->
+    <bean id="userService" class="cn.mrdear.provider.service.UserServiceImpl" />
+
+    <!-- 提供方应用信息，用于计算依赖关系 -->
+    <dubbo:application name="user_provider" />
+
+    <!-- 使用multicast广播注册中心暴露服务地址 -->
+    <!--<dubbo:registry address="multicast://224.5.6.7:1234" /> -->
+
+    <!-- 使用zookeeper注册中心暴露服务地址,即zookeeper的所在服务器ip地址和端口号 -->
+    <dubbo:registry address="zookeeper://127.0.0.1:2181" />
+
+    <!-- 用dubbo协议在20880端口暴露服务 -->
+    <dubbo:protocol name="dubbo" host="192.168.137.78" port="20880" />
+
+    <!-- 声明需要暴露的服务接口 -->
+    <dubbo:service interface="cn.mrdear.client.service.IUserService"
+                   ref="userService" />
+</beans>
\ No newline at end of file
diff --git a/Dubbo-Demo/Service-Provider/src/test/resources/db.properties b/Dubbo-Demo/Service-Provider/src/test/resources/db.properties
new file mode 100644
index 0000000..2228684
--- /dev/null
+++ b/Dubbo-Demo/Service-Provider/src/test/resources/db.properties
@@ -0,0 +1,24 @@
+jdbc.driver=com.mysql.jdbc.Driver
+jdbc.url=jdbc:mysql://127.0.0.1:3306/ssm?useUnicode=true&characterEncoding=utf8&characterSetResults\
+  =utf8
+jdbc.username=root
+jdbc.password=7946521
+
+filters:stat
+
+maxActive:20
+initialSize:1
+maxWait:60000
+minIdle:10
+
+timeBetweenEvictionRunsMillis:60000
+minEvictableIdleTimeMillis:300000
+
+testWhileIdle:true
+testOnBorrow:false
+testOnReturn:false
+
+maxOpenPreparedStatements:20
+removeAbandoned:true
+removeAbandonedTimeout:1800
+logAbandoned:true
diff --git a/Dubbo-Demo/Service-Provider/src/test/resources/h2/data.sql b/Dubbo-Demo/Service-Provider/src/test/resources/h2/data.sql
new file mode 100644
index 0000000..a09f7a8
--- /dev/null
+++ b/Dubbo-Demo/Service-Provider/src/test/resources/h2/data.sql
@@ -0,0 +1,6 @@
+INSERT INTO user (username, password, age, nickname, mail, memo) VALUES ('zhangsan',
+ '123456', 18, '张三', '1111@qq.com', 'hahahah');
+INSERT INTO user (username, password, age, nickname, mail, memo) VALUES ('lis',
+'123456', 19, '李四', '123131@qq.com', 'xixiixxi');
+INSERT INTO user (username, password, age, nickname, mail, memo) VALUES ('wanger',
+'123456', 29, '王二', '12131984@qq.com', 'dqdh');
\ No newline at end of file
diff --git a/Dubbo-Demo/Service-Provider/src/test/resources/h2/schema.sql b/Dubbo-Demo/Service-Provider/src/test/resources/h2/schema.sql
new file mode 100644
index 0000000..8de82c2
--- /dev/null
+++ b/Dubbo-Demo/Service-Provider/src/test/resources/h2/schema.sql
@@ -0,0 +1,10 @@
+DROP TABLE user if exist;
+create table user (
+  id INT(11) AUTO_INCREMENT PRIMARY KEY ,
+  username VARCHAR(255),
+  password VARCHAR(255),
+  age INT(3),
+  nickname VARCHAR(255),
+  mail VARCHAR(255),
+  memo VARCHAR(255),
+  );
\ No newline at end of file
diff --git a/Dubbo-Demo/Service-Provider/src/test/resources/logback.xml b/Dubbo-Demo/Service-Provider/src/test/resources/logback.xml
new file mode 100644
index 0000000..d68cd15
--- /dev/null
+++ b/Dubbo-Demo/Service-Provider/src/test/resources/logback.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+    <property name="LOG_HOME" value="logs" />
+
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>%d{HH:mm:ss} [%t] %logger{5} [%line] %p - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <!-- project level -->
+    <logger name="cn.mrdear" level="DEBUG" />
+
+    <root level="DEBUG" >
+        <appender-ref ref="console" />
+    </root>
+
+</configuration>
\ No newline at end of file
diff --git a/Dubbo-Demo/doc/readme.md b/Dubbo-Demo/doc/readme.md
new file mode 100644
index 0000000..47335f0
--- /dev/null
+++ b/Dubbo-Demo/doc/readme.md
@@ -0,0 +1,7 @@
+
+1. 启动需要先下载zk,然后启动
+2. Provider中spring配置文件host改成本机ip地址,然后启动
+3. 启动Consumer
+4. 可下载Simple-monitor   http://download.csdn.net/detail/liweifengwf/7864009
+5. 可下载dubbo-admin    http://download.csdn.net/detail/leiyong0326/9548973
+6. dubbo的调用基本就是这样,大多数规则都可以在admin中配置也可以在spring注册服务和引用的时候配置
\ No newline at end of file
diff --git a/Dubbo-Demo/pom.xml b/Dubbo-Demo/pom.xml
new file mode 100644
index 0000000..bd21a12
--- /dev/null
+++ b/Dubbo-Demo/pom.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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>cn.mrdear.dubbo</groupId>
+    <artifactId>Dubbo-Demo</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0.0</version>
+    <name>Dubbo-demo</name>
+    <modules>
+        <module>Service-Client</module>
+        <module>Service-Consumer</module>
+        <module>Service-Provider</module>
+    </modules>
+
+    <!--配置依赖-->
+    <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.16.14</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>21.0</version>
+        </dependency>
+        <!--logger start-->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.7</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <version>1.7.7</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>1.1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.logback-extensions</groupId>
+            <artifactId>logback-ext-spring</artifactId>
+            <version>0.1.4</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.1.2</version>
+        </dependency>
+        <!--logger end-->
+    </dependencies>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <configuration>
+                        <source>1.8</source>
+                        <target>1.8</target>
+                        <encoding>UTF-8</encoding>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+</project>
\ No newline at end of file
diff --git a/Excel-Demo/pom.xml b/Excel-Demo/pom.xml
new file mode 100644
index 0000000..241336c
--- /dev/null
+++ b/Excel-Demo/pom.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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>cn.mrdear.poi</groupId>
+    <artifactId>Excel-Demo</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <name>Excel-Demo</name>
+    <dependencies>
+        <!--poi start-->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>3.15</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>3.15</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.10</version>
+        </dependency>
+
+        <!--logger依赖-->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <version>1.7.2</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>1.1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.1.2</version>
+        </dependency>
+    </dependencies>
+
+
+    <build>
+        <plugins>
+            <!--编译版本-->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/Excel-Demo/src/main/java/cn/mrdear/excel/constant/ExcelType.java b/Excel-Demo/src/main/java/cn/mrdear/excel/constant/ExcelType.java
new file mode 100644
index 0000000..45018ae
--- /dev/null
+++ b/Excel-Demo/src/main/java/cn/mrdear/excel/constant/ExcelType.java
@@ -0,0 +1,10 @@
+package cn.mrdear.excel.constant;
+
+/**
+ * 定义excel格式
+ * @author Niu Li
+ * @since 2017/3/17
+ */
+public enum  ExcelType {
+  XLS, XLSX;
+}
diff --git a/Excel-Demo/src/main/java/cn/mrdear/excel/core/ExcelExtractor.java b/Excel-Demo/src/main/java/cn/mrdear/excel/core/ExcelExtractor.java
new file mode 100644
index 0000000..0c8bfd5
--- /dev/null
+++ b/Excel-Demo/src/main/java/cn/mrdear/excel/core/ExcelExtractor.java
@@ -0,0 +1,115 @@
+package cn.mrdear.excel.core;
+
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import cn.mrdear.excel.constant.ExcelType;
+import cn.mrdear.excel.util.BeanUtils;
+
+/**
+ * excel解析
+ *
+ * @author Niu Li
+ * @since 2017/3/17
+ */
+public class ExcelExtractor {
+
+  private static Logger logger = LoggerFactory.getLogger(ExcelFormat.class);
+
+  /**
+   * 解析excel,默认第一行为表头
+   *
+   * @param type         excel类型
+   * @param excel        excel输入流
+   * @param tClass       要生成的实体类
+   * @param headerMapper 对应解析表格
+   * @return 解析后集合
+   * @throws IllegalArgumentException 解析错误
+   */
+  public static <T> List<T> extractFrom(ExcelType type, InputStream excel, Class<T> tClass,
+      Map<String, String> headerMapper, Integer sheetIndex) throws IllegalArgumentException, IOException {
+    Workbook workbook;
+    try {
+      workbook = type.equals(ExcelType.XLS) ? new HSSFWorkbook(excel) : new XSSFWorkbook(excel);
+    } catch (IOException e) {
+      throw new IllegalArgumentException("未知的表格类型");
+    }
+    //解析表头.默认第一行为表头
+    Sheet sheet = workbook.getSheetAt(sheetIndex);
+    Iterator<Row> rowIterator = sheet.rowIterator();
+    //第一行
+    Row firstRow = rowIterator.next();
+    Iterator<Cell> firstCell = firstRow.cellIterator();
+
+    Set<String> existHeaderSet = new HashSet<>();
+    List<String> existHeader = new ArrayList<>(headerMapper.size());
+    firstCell.forEachRemaining(cell -> {
+      if (cell.getCellType() != Cell.CELL_TYPE_STRING) {
+        throw new IllegalArgumentException("第一行必须全部为字符串,第" + cell.getColumnIndex() + 1 + "有问题");
+      }
+      existHeaderSet.add(cell.getStringCellValue());
+      existHeader.add(cell.getStringCellValue());
+    });
+    //查询出不存在的表头
+    for (String s : headerMapper.keySet()) {
+      if (!existHeaderSet.contains(s)) {
+        throw new IllegalArgumentException("不存在的表头:" + s);
+      }
+    }
+    //开始解析表单
+    Integer lineNumber = 0;
+    List<T> result = new ArrayList<T>();
+    try {
+      while (rowIterator.hasNext()){
+        Row x = rowIterator.next();
+        lineNumber++;
+        Map<String, Object> tempMap = new HashMap<>();
+        Iterator<Cell> cellIterator = x.cellIterator();
+        cellIterator.forEachRemaining(y -> {
+          Object value = null;
+          switch (y.getCellType()) {
+            case Cell.CELL_TYPE_STRING:
+              value = y.getStringCellValue();
+              break;
+            case Cell.CELL_TYPE_BOOLEAN:
+              value = y.getBooleanCellValue();
+              break;
+            case Cell.CELL_TYPE_NUMERIC:
+              value = y.getNumericCellValue();
+              break;
+            case Cell.CELL_TYPE_ERROR:
+              value = "";
+              break;
+            case Cell.CELL_TYPE_BLANK:
+              value = "";
+              break;
+            default:
+              value = "";
+          }
+          String key = headerMapper.get(existHeader.get(y.getColumnIndex()));
+          tempMap.put(key, value);
+        });
+        result.add(BeanUtils.map2Bean(tempMap, tClass));
+      }
+    } catch (Exception e) {
+      logger.error("第{}行解析错误",lineNumber);
+    }
+    return result;
+  }
+}
diff --git a/Excel-Demo/src/main/java/cn/mrdear/excel/core/ExcelFormat.java b/Excel-Demo/src/main/java/cn/mrdear/excel/core/ExcelFormat.java
new file mode 100644
index 0000000..39b05b9
--- /dev/null
+++ b/Excel-Demo/src/main/java/cn/mrdear/excel/core/ExcelFormat.java
@@ -0,0 +1,172 @@
+package cn.mrdear.excel.core;
+
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import cn.mrdear.excel.constant.ExcelType;
+import cn.mrdear.excel.util.BeanUtils;
+
+/**
+ * 工具类入口
+ * @author Niu Li
+ * @since 2017/2/23
+ */
+public class ExcelFormat {
+
+    private static Logger logger = LoggerFactory.getLogger(ExcelFormat.class);
+    //该表格的工作本
+    private Workbook workbook;
+
+    /**
+     * 控制表头,其中键为对应DTO的字段,值为表头显示内容
+     */
+    private LinkedHashMap<String,String> headers;
+    /**
+     * 具体表内容,只接受DTO
+     */
+    private List<?> contents;
+
+    /**
+     * 入口函数
+     * @param headers 表单头部
+     * @param content 表单内容DTO
+     * @return this表单对象
+     */
+    public static ExcelFormat from(LinkedHashMap<String,String> headers,List<?> content){
+        return new ExcelFormat(headers,content);
+    }
+
+    /**
+     * 在此workbook中增加另一个sheet
+     * @param headers 新sheet的表头
+     * @param content 新sheet的内容
+     * @return this
+     */
+    public ExcelFormat andForm(LinkedHashMap<String,String> headers,List<?> content){
+        this.headers = headers;
+        this.contents = content;
+        return this;
+    }
+
+
+    /**
+     * 端点方法,生成最终的表单
+     * @return this
+     */
+    public ExcelFormat build(String sheetName){
+        //创建字表
+        Sheet sheet = sheetName == null ? workbook.createSheet() : workbook.createSheet(sheetName);
+        //创建表头
+        int rowNum = 0;
+        Row headerRow = sheet.createRow(rowNum++);
+        List<String> headers = new ArrayList<>(this.headers.keySet());//表头
+        List<String> values = new ArrayList<>(this.headers.values());//对应值
+        for (int i = 0; i < headers.size(); i++) {
+            Cell cell = headerRow.createCell(i);
+            cell.setCellValue(values.get(i)==null?headers.get(i):values.get(i));
+        }
+        //构造表单内容
+        try {
+            for (Object content : contents) {
+                Map<String,Object> contentMap = BeanUtils.bean2Map(content);
+                Row current = sheet.createRow(rowNum++);
+                for (int i = 0; i < headers.size(); i++) {
+                    Cell cell = current.createCell(i);
+                    Object obj = contentMap.get(headers.get(i));
+                    if (obj == null) {
+                        obj = "";
+                    }
+                    if (obj instanceof String) {
+                        cell.setCellValue((String) obj);
+                    } else if (obj instanceof Integer) {
+                        cell.setCellValue((Integer) obj);
+                    } else if (obj instanceof Long) {
+                        cell.setCellValue((Long) obj);
+                    } else if (obj instanceof Double) {
+                        cell.setCellValue((Double) obj);
+                    } else if (obj instanceof Date) {
+                        cell.setCellValue((Date) obj);
+                    } else if (obj instanceof Boolean) {
+                        cell.setCellValue((Boolean) obj);
+                    } else {
+                        throw new IllegalArgumentException("unsupported cell type");
+                    }
+                }
+            }
+        } catch (IllegalAccessException e) {
+            logger.error("parse excel fail ",e);
+        }
+        //设置样式
+
+        return this;
+    }
+    /**
+     * 私有化构造函数
+     */
+    private ExcelFormat(LinkedHashMap<String, String> headers, List<?> contents) {
+        this.headers = headers;
+        this.contents = contents;
+    }
+
+    /**
+     * 调用该方法后,此workbook则写入关闭
+     * @param dirIncludedFileName 最终生成文件名称
+     */
+    public void write(String dirIncludedFileName){
+        try {
+            File file = new File(dirIncludedFileName);
+            FileOutputStream os = new FileOutputStream(file);
+            workbook.write(os);
+            os.close();
+        } catch (IOException e) {
+            logger.error("write excel fail ",e);
+        }finally {
+            try {
+                if (workbook != null) workbook.close();
+            } catch (IOException e) {
+                logger.error("write excel fail ",e);
+            }
+        }
+    }
+
+    /**
+     * 结果写到一个输出流中
+     * @param os 目标流
+     */
+    public void write(OutputStream os) {
+        try {
+            workbook.write(os);
+            workbook.close();
+        } catch (IOException e) {
+            logger.error("write excel fail ",e);
+        }
+    }
+
+
+    /**
+     * 链式调用设置生成文档格式
+     * @param type 指定格式
+     * @return this
+     */
+    public ExcelFormat excelType(ExcelType type){
+        workbook = type == ExcelType.XLS?new HSSFWorkbook():new XSSFWorkbook();
+        return this;
+    }
+
+}
diff --git a/Excel-Demo/src/main/java/cn/mrdear/excel/util/BeanUtils.java b/Excel-Demo/src/main/java/cn/mrdear/excel/util/BeanUtils.java
new file mode 100644
index 0000000..814dd87
--- /dev/null
+++ b/Excel-Demo/src/main/java/cn/mrdear/excel/util/BeanUtils.java
@@ -0,0 +1,68 @@
+package cn.mrdear.excel.util;
+
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 对bean一些转换方法
+ *
+ * @author Niu Li
+ * @since 2017/2/23
+ */
+public class BeanUtils {
+
+  /**
+   * 转换bean为map
+   *
+   * @param source 要转换的bean
+   * @param <T>    bean类型
+   * @return 转换结果
+   */
+  public static <T> Map<String, Object> bean2Map(T source) throws IllegalAccessException {
+    Map<String, Object> result = new HashMap<>();
+
+    Class<?> sourceClass = source.getClass();
+    //拿到所有的字段,不包括继承的字段
+    Field[] sourceFiled = sourceClass.getDeclaredFields();
+    for (Field field : sourceFiled) {
+      field.setAccessible(true);//设置可访问,不然拿不到private
+      //配置了注解的话则使用注解名称,作为header字段
+      FieldName fieldName = field.getAnnotation(FieldName.class);
+      if (fieldName == null) {
+        result.put(field.getName(), field.get(source));
+      } else {
+        if (fieldName.Ignore()) continue;
+        result.put(fieldName.value(), field.get(source));
+      }
+    }
+    return result;
+  }
+
+  /**
+   * map转bean
+   * @param source   map属性
+   * @param instance 要转换成的备案
+   * @return 该bean
+   */
+  public static <T> T map2Bean(Map<String, Object> source, Class<T> instance) {
+    try {
+      T object = instance.newInstance();
+      Field[] fields = object.getClass().getDeclaredFields();
+      for (Field field : fields) {
+        field.setAccessible(true);
+        FieldName fieldName = field.getAnnotation(FieldName.class);
+        if (fieldName != null){
+          field.set(object,source.get(fieldName.value()));
+        }else {
+          field.set(object,source.get(field.getName()));
+        }
+      }
+      return object;
+    } catch (InstantiationException | IllegalAccessException e) {
+      e.printStackTrace();
+    }
+    return null;
+  }
+}
+
diff --git a/Excel-Demo/src/main/java/cn/mrdear/excel/util/FieldName.java b/Excel-Demo/src/main/java/cn/mrdear/excel/util/FieldName.java
new file mode 100644
index 0000000..61ed7ea
--- /dev/null
+++ b/Excel-Demo/src/main/java/cn/mrdear/excel/util/FieldName.java
@@ -0,0 +1,24 @@
+package cn.mrdear.excel.util;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 自定义字段名
+ * @author Niu Li
+ * @since 2017/2/23
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER})
+public @interface FieldName {
+    /**
+     * 字段名
+     */
+    String value() default "";
+    /**
+     * 是否忽略
+     */
+    boolean Ignore() default false;
+}
diff --git a/Excel-Demo/src/test/java/cn/mrdear/excel/BeanUtilTest.java b/Excel-Demo/src/test/java/cn/mrdear/excel/BeanUtilTest.java
new file mode 100644
index 0000000..211150a
--- /dev/null
+++ b/Excel-Demo/src/test/java/cn/mrdear/excel/BeanUtilTest.java
@@ -0,0 +1,27 @@
+package cn.mrdear.excel;
+
+import org.junit.Test;
+
+import java.util.Map;
+
+import cn.mrdear.excel.util.BeanUtils;
+
+/**
+ * @author Niu Li
+ * @since 2017/2/23
+ */
+public class BeanUtilTest {
+
+
+    @Test
+    public void test() throws IllegalAccessException {
+        Demo demo = new Demo();
+        demo.setUserName("111");
+        demo.setPassWord("222");
+        Map<String, Object> map = BeanUtils.bean2Map(demo);
+        System.out.println(map);
+        Demo demo1 = BeanUtils.map2Bean(map,Demo.class);
+        System.out.println(demo1);
+    }
+
+}
diff --git a/Excel-Demo/src/test/java/cn/mrdear/excel/Demo.java b/Excel-Demo/src/test/java/cn/mrdear/excel/Demo.java
new file mode 100644
index 0000000..dba64d2
--- /dev/null
+++ b/Excel-Demo/src/test/java/cn/mrdear/excel/Demo.java
@@ -0,0 +1,45 @@
+package cn.mrdear.excel;
+
+import cn.mrdear.excel.util.FieldName;
+
+/**
+ * @author Niu Li
+ * @since 2017/2/23
+ */
+public class Demo {
+
+    public Demo(String username, String password) {
+        this.userName = username;
+        this.passWord = password;
+    }
+    public Demo() {
+    }
+    //fildName字段需要和header对应
+    @FieldName(value = "username")
+    private String userName;
+    private String passWord;
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getPassWord() {
+        return passWord;
+    }
+
+    public void setPassWord(String passWord) {
+        this.passWord = passWord;
+    }
+
+    @Override
+    public String toString() {
+        return "Demo{" +
+            "userName='" + userName + '\'' +
+            ", passWord='" + passWord + '\'' +
+            '}';
+    }
+}
diff --git a/Excel-Demo/src/test/java/cn/mrdear/excel/ExcelFormatTest.java b/Excel-Demo/src/test/java/cn/mrdear/excel/ExcelFormatTest.java
new file mode 100644
index 0000000..735894c
--- /dev/null
+++ b/Excel-Demo/src/test/java/cn/mrdear/excel/ExcelFormatTest.java
@@ -0,0 +1,65 @@
+package cn.mrdear.excel;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+
+import cn.mrdear.excel.constant.ExcelType;
+import cn.mrdear.excel.core.ExcelExtractor;
+import cn.mrdear.excel.core.ExcelFormat;
+
+/**
+ * @author Niu Li
+ * @since 2017/2/23
+ */
+public class ExcelFormatTest {
+    LinkedHashMap<String,String> headers;
+    LinkedHashMap<String,String> extractorHeaders;
+
+    @Before
+    public void init() {
+        headers = new LinkedHashMap<>();
+        extractorHeaders = new LinkedHashMap<>();
+        headers.put("username","用户名");
+        headers.put("passWord", "密码");
+        extractorHeaders.put("用户名","username");
+        extractorHeaders.put("密码", "passWord");
+    }
+
+    @Test
+    public void testMake() {
+        List<Demo> content = new ArrayList<>();
+        Demo demo1 = new Demo("1","1");
+        Demo demo2 = new Demo("2","2");
+        Demo demo3 = new Demo("3","3");
+        Demo demo4 = new Demo("4","4");
+        content.add(demo1);
+        content.add(demo2);
+        content.add(demo3);
+        content.add(demo4);
+
+        //写入
+        ExcelFormat.from(headers,content)
+                .excelType(ExcelType.XLS)
+                .build("niuli")
+                .write("/tmp/niuli.xls");
+        System.out.println("写入成功");
+        //读取
+        try {
+            InputStream in = new FileInputStream(new File("/tmp/niuli.xls"));
+            List<Demo> result = ExcelExtractor.extractFrom(ExcelType.XLS,in,Demo.class,
+                extractorHeaders,0);
+            System.out.println(result);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        System.out.println("读取成功");
+    }
+}
diff --git a/HtmlUnit-Demo/.idea/compiler.xml b/HtmlUnit-Demo/.idea/compiler.xml
deleted file mode 100644
index fd9d725..0000000
--- a/HtmlUnit-Demo/.idea/compiler.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-      <entry name="!?*.aj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-      <profile default="false" name="Maven default annotation processors profile" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <processorPath useClasspath="true" />
-        <module name="爬虫项目" />
-      </profile>
-    </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="爬虫项目" target="1.8" />
-    </bytecodeTargetLevel>
-  </component>
-</project>
\ No newline at end of file
diff --git a/HtmlUnit-Demo/.idea/copyright/profiles_settings.xml b/HtmlUnit-Demo/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/HtmlUnit-Demo/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/HtmlUnit-Demo/.idea/deployment.xml b/HtmlUnit-Demo/.idea/deployment.xml
deleted file mode 100644
index 25a0408..0000000
--- a/HtmlUnit-Demo/.idea/deployment.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PublishConfigData">
-    <serverData>
-      <paths name="172.18.0.91">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-    </serverData>
-  </component>
-</project>
\ No newline at end of file
diff --git a/HtmlUnit-Demo/.idea/encodings.xml b/HtmlUnit-Demo/.idea/encodings.xml
deleted file mode 100644
index 247aa7f..0000000
--- a/HtmlUnit-Demo/.idea/encodings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="file://$PROJECT_DIR$/doc/SS账号密码.bat" charset="GBK" />
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__com_alibaba_fastjson_1_2_14.xml b/HtmlUnit-Demo/.idea/libraries/Maven__com_alibaba_fastjson_1_2_14.xml
deleted file mode 100644
index 3888159..0000000
--- a/HtmlUnit-Demo/.idea/libraries/Maven__com_alibaba_fastjson_1_2_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.alibaba:fastjson:1.2.14">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.14/fastjson-1.2.14.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.14/fastjson-1.2.14-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.14/fastjson-1.2.14-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml b/HtmlUnit-Demo/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml
deleted file mode 100644
index 27424a1..0000000
--- a/HtmlUnit-Demo/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: commons-codec:commons-codec:1.10">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.10/commons-codec-1.10.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.10/commons-codec-1.10-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.10/commons-codec-1.10-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__commons_io_commons_io_2_5.xml b/HtmlUnit-Demo/.idea/libraries/Maven__commons_io_commons_io_2_5.xml
deleted file mode 100644
index 67c2ad2..0000000
--- a/HtmlUnit-Demo/.idea/libraries/Maven__commons_io_commons_io_2_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: commons-io:commons-io:2.5">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.5/commons-io-2.5.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.5/commons-io-2.5-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.5/commons-io-2.5-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml b/HtmlUnit-Demo/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml
deleted file mode 100644
index eab40b3..0000000
--- a/HtmlUnit-Demo/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: commons-logging:commons-logging:1.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__net_sourceforge_cssparser_cssparser_0_9_20.xml b/HtmlUnit-Demo/.idea/libraries/Maven__net_sourceforge_cssparser_cssparser_0_9_20.xml
deleted file mode 100644
index 69204fd..0000000
--- a/HtmlUnit-Demo/.idea/libraries/Maven__net_sourceforge_cssparser_cssparser_0_9_20.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: net.sourceforge.cssparser:cssparser:0.9.20">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/cssparser/cssparser/0.9.20/cssparser-0.9.20.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/cssparser/cssparser/0.9.20/cssparser-0.9.20-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/cssparser/cssparser/0.9.20/cssparser-0.9.20-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__net_sourceforge_htmlunit_htmlunit_2_23.xml b/HtmlUnit-Demo/.idea/libraries/Maven__net_sourceforge_htmlunit_htmlunit_2_23.xml
deleted file mode 100644
index 18afd08..0000000
--- a/HtmlUnit-Demo/.idea/libraries/Maven__net_sourceforge_htmlunit_htmlunit_2_23.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: net.sourceforge.htmlunit:htmlunit:2.23">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/htmlunit/htmlunit/2.23/htmlunit-2.23.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/htmlunit/htmlunit/2.23/htmlunit-2.23-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/htmlunit/htmlunit/2.23/htmlunit-2.23-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__net_sourceforge_htmlunit_htmlunit_core_js_2_23.xml b/HtmlUnit-Demo/.idea/libraries/Maven__net_sourceforge_htmlunit_htmlunit_core_js_2_23.xml
deleted file mode 100644
index 85f6b10..0000000
--- a/HtmlUnit-Demo/.idea/libraries/Maven__net_sourceforge_htmlunit_htmlunit_core_js_2_23.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: net.sourceforge.htmlunit:htmlunit-core-js:2.23">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/htmlunit/htmlunit-core-js/2.23/htmlunit-core-js-2.23.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/htmlunit/htmlunit-core-js/2.23/htmlunit-core-js-2.23-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/htmlunit/htmlunit-core-js/2.23/htmlunit-core-js-2.23-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__net_sourceforge_htmlunit_neko_htmlunit_2_23.xml b/HtmlUnit-Demo/.idea/libraries/Maven__net_sourceforge_htmlunit_neko_htmlunit_2_23.xml
deleted file mode 100644
index dc921d3..0000000
--- a/HtmlUnit-Demo/.idea/libraries/Maven__net_sourceforge_htmlunit_neko_htmlunit_2_23.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: net.sourceforge.htmlunit:neko-htmlunit:2.23">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/htmlunit/neko-htmlunit/2.23/neko-htmlunit-2.23.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/htmlunit/neko-htmlunit/2.23/neko-htmlunit-2.23-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/htmlunit/neko-htmlunit/2.23/neko-htmlunit-2.23-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml b/HtmlUnit-Demo/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml
deleted file mode 100644
index 78cfcd3..0000000
--- a/HtmlUnit-Demo/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.commons:commons-lang3:3.4">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_2.xml b/HtmlUnit-Demo/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_2.xml
deleted file mode 100644
index fdb7ead..0000000
--- a/HtmlUnit-Demo/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.httpcomponents:httpclient:4.5.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.2/httpclient-4.5.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.2/httpclient-4.5.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.2/httpclient-4.5.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_4.xml b/HtmlUnit-Demo/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_4.xml
deleted file mode 100644
index 3a5aa19..0000000
--- a/HtmlUnit-Demo/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.httpcomponents:httpcore:4.4.4">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.4/httpcore-4.4.4.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.4/httpcore-4.4.4-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.4/httpcore-4.4.4-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_2.xml b/HtmlUnit-Demo/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_2.xml
deleted file mode 100644
index 4b2025a..0000000
--- a/HtmlUnit-Demo/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.httpcomponents:httpmime:4.5.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpmime/4.5.2/httpmime-4.5.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpmime/4.5.2/httpmime-4.5.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpmime/4.5.2/httpmime-4.5.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_2_18_v20160721.xml b/HtmlUnit-Demo/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_2_18_v20160721.xml
deleted file mode 100644
index eb77d34..0000000
--- a/HtmlUnit-Demo/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_2_18_v20160721.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.eclipse.jetty:jetty-io:9.2.18.v20160721">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-io/9.2.18.v20160721/jetty-io-9.2.18.v20160721.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-io/9.2.18.v20160721/jetty-io-9.2.18.v20160721-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-io/9.2.18.v20160721/jetty-io-9.2.18.v20160721-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_2_18_v20160721.xml b/HtmlUnit-Demo/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_2_18_v20160721.xml
deleted file mode 100644
index dadc591..0000000
--- a/HtmlUnit-Demo/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_2_18_v20160721.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.eclipse.jetty:jetty-util:9.2.18.v20160721">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-util/9.2.18.v20160721/jetty-util-9.2.18.v20160721.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-util/9.2.18.v20160721/jetty-util-9.2.18.v20160721-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-util/9.2.18.v20160721/jetty-util-9.2.18.v20160721-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_api_9_2_18_v20160721.xml b/HtmlUnit-Demo/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_api_9_2_18_v20160721.xml
deleted file mode 100644
index 01ec5bd..0000000
--- a/HtmlUnit-Demo/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_api_9_2_18_v20160721.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.eclipse.jetty.websocket:websocket-api:9.2.18.v20160721">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/websocket/websocket-api/9.2.18.v20160721/websocket-api-9.2.18.v20160721.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/websocket/websocket-api/9.2.18.v20160721/websocket-api-9.2.18.v20160721-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/websocket/websocket-api/9.2.18.v20160721/websocket-api-9.2.18.v20160721-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_client_9_2_18_v20160721.xml b/HtmlUnit-Demo/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_client_9_2_18_v20160721.xml
deleted file mode 100644
index 8a37d8d..0000000
--- a/HtmlUnit-Demo/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_client_9_2_18_v20160721.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.eclipse.jetty.websocket:websocket-client:9.2.18.v20160721">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/websocket/websocket-client/9.2.18.v20160721/websocket-client-9.2.18.v20160721.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/websocket/websocket-client/9.2.18.v20160721/websocket-client-9.2.18.v20160721-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/websocket/websocket-client/9.2.18.v20160721/websocket-client-9.2.18.v20160721-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_common_9_2_18_v20160721.xml b/HtmlUnit-Demo/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_common_9_2_18_v20160721.xml
deleted file mode 100644
index 74968e1..0000000
--- a/HtmlUnit-Demo/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_common_9_2_18_v20160721.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.eclipse.jetty.websocket:websocket-common:9.2.18.v20160721">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/websocket/websocket-common/9.2.18.v20160721/websocket-common-9.2.18.v20160721.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/websocket/websocket-common/9.2.18.v20160721/websocket-common-9.2.18.v20160721-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/websocket/websocket-common/9.2.18.v20160721/websocket-common-9.2.18.v20160721-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__org_w3c_css_sac_1_3.xml b/HtmlUnit-Demo/.idea/libraries/Maven__org_w3c_css_sac_1_3.xml
deleted file mode 100644
index af3d414..0000000
--- a/HtmlUnit-Demo/.idea/libraries/Maven__org_w3c_css_sac_1_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.w3c.css:sac:1.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/w3c/css/sac/1.3/sac-1.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/w3c/css/sac/1.3/sac-1.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/w3c/css/sac/1.3/sac-1.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__xalan_serializer_2_7_2.xml b/HtmlUnit-Demo/.idea/libraries/Maven__xalan_serializer_2_7_2.xml
deleted file mode 100644
index 8fd4cc9..0000000
--- a/HtmlUnit-Demo/.idea/libraries/Maven__xalan_serializer_2_7_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: xalan:serializer:2.7.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/xalan/serializer/2.7.2/serializer-2.7.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/xalan/serializer/2.7.2/serializer-2.7.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/xalan/serializer/2.7.2/serializer-2.7.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__xalan_xalan_2_7_2.xml b/HtmlUnit-Demo/.idea/libraries/Maven__xalan_xalan_2_7_2.xml
deleted file mode 100644
index c806972..0000000
--- a/HtmlUnit-Demo/.idea/libraries/Maven__xalan_xalan_2_7_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: xalan:xalan:2.7.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/xalan/xalan/2.7.2/xalan-2.7.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/xalan/xalan/2.7.2/xalan-2.7.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/xalan/xalan/2.7.2/xalan-2.7.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__xerces_xercesImpl_2_11_0.xml b/HtmlUnit-Demo/.idea/libraries/Maven__xerces_xercesImpl_2_11_0.xml
deleted file mode 100644
index 285d5e8..0000000
--- a/HtmlUnit-Demo/.idea/libraries/Maven__xerces_xercesImpl_2_11_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: xerces:xercesImpl:2.11.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/xerces/xercesImpl/2.11.0/xercesImpl-2.11.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/xerces/xercesImpl/2.11.0/xercesImpl-2.11.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/xerces/xercesImpl/2.11.0/xercesImpl-2.11.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml b/HtmlUnit-Demo/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml
deleted file mode 100644
index 9aadd29..0000000
--- a/HtmlUnit-Demo/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: xml-apis:xml-apis:1.4.01">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/HtmlUnit-Demo/.idea/misc.xml b/HtmlUnit-Demo/.idea/misc.xml
deleted file mode 100644
index 8cd8b9b..0000000
--- a/HtmlUnit-Demo/.idea/misc.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
-  <component name="MavenProjectsManager">
-    <option name="originalFiles">
-      <list>
-        <option value="$PROJECT_DIR$/pom.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8 " project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/HtmlUnit-Demo/.idea/modules.xml b/HtmlUnit-Demo/.idea/modules.xml
deleted file mode 100644
index 9177726..0000000
--- a/HtmlUnit-Demo/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/爬虫项目.iml" filepath="$PROJECT_DIR$/爬虫项目.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/HtmlUnit-Demo/.idea/uiDesigner.xml b/HtmlUnit-Demo/.idea/uiDesigner.xml
deleted file mode 100644
index e96534f..0000000
--- a/HtmlUnit-Demo/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
\ No newline at end of file
diff --git a/HtmlUnit-Demo/.idea/workspace.xml b/HtmlUnit-Demo/.idea/workspace.xml
deleted file mode 100644
index 7a55cba..0000000
--- a/HtmlUnit-Demo/.idea/workspace.xml
+++ /dev/null
@@ -1,1477 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="367681f7-a657-406b-981d-d00c7bbc7962" name="Default" comment="" />
-    <ignored path="爬虫项目.iws" />
-    <ignored path=".idea/workspace.xml" />
-    <ignored path="$PROJECT_DIR$/out/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="TRACKING_ENABLED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
-  <component name="FavoritesManager">
-    <favorites_list name="爬虫项目" />
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pom.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="132">
-              <caret line="6" column="32" selection-start-line="6" selection-start-column="32" selection-end-line="6" selection-end-column="32" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="MianVpn.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/core/MianVpn.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="171">
-              <caret line="28" column="35" selection-start-line="28" selection-start-column="35" selection-end-line="28" selection-end-column="35" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Main.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/core/Main.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="50">
-              <caret line="47" column="35" selection-start-line="47" selection-start-column="35" selection-end-line="47" selection-end-column="35" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="setting.json" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/setting.json">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="225">
-              <caret line="9" column="23" selection-start-line="9" selection-start-column="23" selection-end-line="9" selection-end-column="23" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Setting.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/Setting.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="21" column="36" selection-start-line="21" selection-start-column="36" selection-end-line="21" selection-end-column="36" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#490#491#0" expanded="true" />
-                <element signature="e#518#519#0" expanded="true" />
-                <element signature="e#571#572#0" expanded="true" />
-                <element signature="e#605#606#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="GradleLocalSettings">
-    <option name="externalProjectsViewState">
-      <projects_view />
-    </option>
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/test/java/abc.js" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/model/ConfigBean.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/util/ModelUtil.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/util/WebClientUtil.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/model/SSModel.java" />
-        <option value="$PROJECT_DIR$/pom.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/util/WEBUtil.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/core/TutorialVpn.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/util/SystemUtil.java" />
-        <option value="$PROJECT_DIR$/doc/SS账号密码.bat" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/core/MianVpn.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/Setting.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/model/ConfigsBean.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/core/Main.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/setting.json" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/develop/maven/apache-maven-3.3.9" />
-        <option name="userSettingsFile" value="D:\develop\maven\apache-maven-3.3.9\conf\settings.xml" />
-      </MavenGeneralSettings>
-    </option>
-    <option name="importingSettings">
-      <MavenImportingSettings>
-        <option name="importAutomatically" value="true" />
-      </MavenImportingSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="" />
-          <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$RootNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="mrdear" />
-          <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$ProjectNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="" />
-          <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$RootNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="mrdear" />
-          <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$ProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="Lifecycle" />
-          <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$LifecycleNode" />
-        </PATH_ELEMENT>
-      </PATH>
-    </treeState>
-  </component>
-  <component name="MavenRunner">
-    <option name="jreName" value="1.8 " />
-    <option name="vmOptions" value="-DarchetypeCatalog=internal" />
-  </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-9" />
-    <option name="y" value="-9" />
-    <option name="width" value="1860" />
-    <option name="height" value="1098" />
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectView">
-    <navigator currentView="ProjectPane" proportions="" version="1">
-      <flattenPackages />
-      <showMembers />
-      <showModules />
-      <showLibraryContents />
-      <hideEmptyPackages />
-      <abbreviatePackageNames />
-      <autoscrollToSource />
-      <autoscrollFromSource />
-      <sortByType />
-      <manualOrder />
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="HtmlUnit-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="HtmlUnit-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="HtmlUnit-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="HtmlUnit-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="HtmlUnit-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="HtmlUnit-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="HtmlUnit-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="resources" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="HtmlUnit-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="HtmlUnit-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="mrdear" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="HtmlUnit-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="HtmlUnit-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="mrdear" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="model" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="HtmlUnit-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="HtmlUnit-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="mrdear" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="core" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
-      <pane id="Scratches" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="settings.editor.selected.configurable" value="com.zeroturnaround.javarebel.idea.plugin.settings.JRebelSettingsComponent" />
-    <property name="settings.editor.splitter.proportion" value="0.2" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="true" />
-    <property name="js-jscs-nodeInterpreter" value="D:\develop\nodejs\node.exe" />
-    <property name="project.structure.last.edited" value="Project" />
-    <property name="project.structure.proportion" value="0.0" />
-    <property name="project.structure.side.proportion" value="0.2" />
-  </component>
-  <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="F:\Git\爬虫项目\doc" />
-    </key>
-  </component>
-  <component name="RunManager" selected="Application.Main">
-    <configuration default="false" name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
-        <pattern>
-          <option name="PATTERN" value="cn.mrdear.core.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <option name="MAIN_CLASS_NAME" value="cn.mrdear.core.Main" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="爬虫项目" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="false" name="MianVpn" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
-        <pattern>
-          <option name="PATTERN" value="cn.mrdear.core.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <option name="MAIN_CLASS_NAME" value="cn.mrdear.core.MianVpn" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="爬虫项目" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="false" name="TutorialVpn" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
-        <pattern>
-          <option name="PATTERN" value="cn.mrdear.core.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <option name="MAIN_CLASS_NAME" value="cn.mrdear.core.TutorialVpn" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="爬虫项目" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
-      <module name="" />
-      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
-      <option name="PROGRAM_PARAMETERS" />
-      <method />
-    </configuration>
-    <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
-      <module name="" />
-      <option name="DEPLOY" value="true" />
-      <option name="ARTIFACT_NAME" value="" />
-      <option name="PM_INSTALL_OPTIONS" value="" />
-      <option name="ACTIVITY_EXTRA_FLAGS" value="" />
-      <option name="MODE" value="default_activity" />
-      <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-      <option name="PREFERRED_AVD" value="" />
-      <option name="CLEAR_LOGCAT" value="false" />
-      <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
-      <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
-      <option name="FORCE_STOP_RUNNING_APP" value="true" />
-      <option name="DEBUGGER_TYPE" value="Java" />
-      <option name="USE_LAST_SELECTED_DEVICE" value="false" />
-      <option name="PREFERRED_AVD" value="" />
-      <Java />
-      <Profilers>
-        <option name="GAPID_DISABLE_PCS" value="false" />
-      </Profilers>
-      <option name="DEEP_LINK" value="" />
-      <option name="ACTIVITY_CLASS" value="" />
-      <method />
-    </configuration>
-    <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
-      <module name="" />
-      <option name="TESTING_TYPE" value="0" />
-      <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
-      <option name="METHOD_NAME" value="" />
-      <option name="CLASS_NAME" value="" />
-      <option name="PACKAGE_NAME" value="" />
-      <option name="EXTRA_OPTIONS" value="" />
-      <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-      <option name="PREFERRED_AVD" value="" />
-      <option name="CLEAR_LOGCAT" value="false" />
-      <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
-      <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
-      <option name="FORCE_STOP_RUNNING_APP" value="true" />
-      <option name="DEBUGGER_TYPE" value="Java" />
-      <option name="USE_LAST_SELECTED_DEVICE" value="false" />
-      <option name="PREFERRED_AVD" value="" />
-      <Java />
-      <Profilers>
-        <option name="GAPID_DISABLE_PCS" value="false" />
-      </Profilers>
-      <method />
-    </configuration>
-    <configuration default="true" type="Applet" factoryName="Applet">
-      <option name="HTML_USED" value="false" />
-      <option name="WIDTH" value="400" />
-      <option name="HEIGHT" value="300" />
-      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
-      <module />
-      <method />
-    </configuration>
-    <configuration default="true" type="Application" factoryName="Application">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="ArquillianJUnit" factoryName="">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="arquillianRunConfiguration">
-        <value>
-          <option name="containerStateName" value="" />
-        </value>
-      </option>
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="true" type="ArquillianTestNG" factoryName="">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="arquillianRunConfiguration">
-        <value>
-          <option name="containerStateName" value="" />
-        </value>
-      </option>
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="ANNOTATION_TYPE" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
-      <envs />
-      <properties />
-      <listeners />
-      <method />
-    </configuration>
-    <configuration default="true" type="Cold Fusion runner description" factoryName="Cold Fusion" custom_browser="" web_path="">
-      <method />
-    </configuration>
-    <configuration default="true" type="CucumberJavaRunConfigurationType" factoryName="Cucumber java">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="myFilePath" />
-      <option name="GLUE" />
-      <option name="myNameFilter" />
-      <option name="myGeneratedName" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="FlashRunConfigurationType" factoryName="Flash App">
-      <option name="BCName" value="" />
-      <option name="IOSSimulatorSdkPath" value="" />
-      <option name="adlOptions" value="" />
-      <option name="airProgramParameters" value="" />
-      <option name="appDescriptorForEmulator" value="Android" />
-      <option name="debugTransport" value="USB" />
-      <option name="debuggerSdkRaw" value="BC SDK" />
-      <option name="emulator" value="NexusOne" />
-      <option name="emulatorAdlOptions" value="" />
-      <option name="fastPackaging" value="true" />
-      <option name="fullScreenHeight" value="0" />
-      <option name="fullScreenWidth" value="0" />
-      <option name="launchUrl" value="false" />
-      <option name="launcherParameters">
-        <LauncherParameters>
-          <option name="browser" value="a7bb68e0-33c0-4d6f-a81a-aac1fdb870c8" />
-          <option name="launcherType" value="OSDefault" />
-          <option name="newPlayerInstance" value="false" />
-          <option name="playerPath" value="FlashPlayerDebugger.exe" />
-        </LauncherParameters>
-      </option>
-      <option name="mobileRunTarget" value="Emulator" />
-      <option name="moduleName" value="" />
-      <option name="overriddenMainClass" value="" />
-      <option name="overriddenOutputFileName" value="" />
-      <option name="overrideMainClass" value="false" />
-      <option name="runTrusted" value="true" />
-      <option name="screenDpi" value="0" />
-      <option name="screenHeight" value="0" />
-      <option name="screenWidth" value="0" />
-      <option name="url" value="http://" />
-      <option name="usbDebugPort" value="7936" />
-      <method />
-    </configuration>
-    <configuration default="true" type="FlexUnitRunConfigurationType" factoryName="FlexUnit" appDescriptorForEmulator="Android" class_name="" emulatorAdlOptions="" method_name="" package_name="" scope="Class">
-      <option name="BCName" value="" />
-      <option name="launcherParameters">
-        <LauncherParameters>
-          <option name="browser" value="a7bb68e0-33c0-4d6f-a81a-aac1fdb870c8" />
-          <option name="launcherType" value="OSDefault" />
-          <option name="newPlayerInstance" value="false" />
-          <option name="playerPath" value="FlashPlayerDebugger.exe" />
-        </LauncherParameters>
-      </option>
-      <option name="moduleName" value="" />
-      <option name="trusted" value="true" />
-      <method />
-    </configuration>
-    <configuration default="true" type="GradleRunConfiguration" factoryName="Gradle">
-      <ExternalSystemSettings>
-        <option name="executionName" />
-        <option name="externalProjectPath" />
-        <option name="externalSystemIdString" value="GRADLE" />
-        <option name="scriptParameters" />
-        <option name="taskDescriptions">
-          <list />
-        </option>
-        <option name="taskNames">
-          <list />
-        </option>
-        <option name="vmOptions" />
-      </ExternalSystemSettings>
-      <method />
-    </configuration>
-    <configuration default="true" type="GrailsRunConfigurationType" factoryName="Grails">
-      <setting name="vmparams" value="" />
-      <setting name="cmdLine" value="run-app" />
-      <setting name="passParentEnv" value="true" />
-      <setting name="launchBrowser" value="true" />
-      <setting name="depsClasspath" value="false" />
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <method />
-    </configuration>
-    <configuration default="true" type="JUnit" factoryName="JUnit">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="true" type="JUnitTestDiscovery" factoryName="JUnit Test Discovery" changeList="All">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="true" type="JarApplication" factoryName="JAR Application">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="Java Scratch" factoryName="Java Scratch">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="SCRATCH_FILE_ID" value="0" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
-      <method />
-    </configuration>
-    <configuration default="true" type="JetRunConfigurationType" factoryName="Kotlin">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="爬虫项目" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="KotlinStandaloneScriptRunConfigurationType" factoryName="Kotlin script">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="filePath" />
-      <option name="vmParameters" />
-      <option name="alternativeJrePath" />
-      <option name="programParameters" />
-      <option name="passParentEnvs" value="true" />
-      <option name="workingDirectory" />
-      <option name="isAlternativeJrePathEnabled" value="false" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="MavenRunConfiguration" factoryName="Maven">
-      <MavenSettings>
-        <option name="myGeneralSettings" />
-        <option name="myRunnerSettings" />
-        <option name="myRunnerParameters">
-          <MavenRunnerParameters>
-            <option name="profiles">
-              <set />
-            </option>
-            <option name="goals">
-              <list />
-            </option>
-            <option name="profilesMap">
-              <map />
-            </option>
-            <option name="resolveToWorkspace" value="false" />
-            <option name="workingDirPath" value="" />
-          </MavenRunnerParameters>
-        </option>
-      </MavenSettings>
-      <method />
-    </configuration>
-    <configuration default="true" type="Remote" factoryName="Remote">
-      <option name="USE_SOCKET_TRANSPORT" value="true" />
-      <option name="SERVER_MODE" value="false" />
-      <option name="SHMEM_ADDRESS" value="javadebug" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="5005" />
-      <method />
-    </configuration>
-    <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="TestNG" factoryName="TestNG">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="ANNOTATION_TYPE" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
-      <envs />
-      <properties />
-      <listeners />
-      <method />
-    </configuration>
-    <configuration default="true" type="TestNGTestDiscovery" factoryName="TestNG Test Discovery" changeList="All">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="ANNOTATION_TYPE" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
-      <envs />
-      <properties />
-      <listeners />
-      <method />
-    </configuration>
-    <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
-      <node-interpreter>project</node-interpreter>
-      <node-options />
-      <gulpfile />
-      <tasks />
-      <arguments />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="js.build_tools.npm" factoryName="npm">
-      <command value="run-script" />
-      <scripts />
-      <node-interpreter value="project" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="osgi.bnd.run" factoryName="Run Launcher">
-      <method />
-    </configuration>
-    <configuration default="true" type="osgi.bnd.run" factoryName="Test Launcher (JUnit)">
-      <method />
-    </configuration>
-    <list size="3">
-      <item index="0" class="java.lang.String" itemvalue="Application.Main" />
-      <item index="1" class="java.lang.String" itemvalue="Application.MianVpn" />
-      <item index="2" class="java.lang.String" itemvalue="Application.TutorialVpn" />
-    </list>
-    <recent_temporary>
-      <list size="3">
-        <item index="0" class="java.lang.String" itemvalue="Application.Main" />
-        <item index="1" class="java.lang.String" itemvalue="Application.TutorialVpn" />
-        <item index="2" class="java.lang.String" itemvalue="Application.MianVpn" />
-      </list>
-    </recent_temporary>
-  </component>
-  <component name="ShelveChangesManager" show_recycled="false">
-    <option name="remove_strategy" value="false" />
-  </component>
-  <component name="SvnConfiguration">
-    <configuration>C:\Users\牛李\AppData\Roaming\Subversion</configuration>
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="367681f7-a657-406b-981d-d00c7bbc7962" name="Default" comment="" />
-      <created>1475907637491</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1475907637491</updated>
-      <workItem from="1475907638924" duration="11185000" />
-      <workItem from="1475919272761" duration="563000" />
-      <workItem from="1475989975955" duration="65000" />
-      <workItem from="1475990211374" duration="1343000" />
-      <workItem from="1476061472191" duration="2164000" />
-      <workItem from="1476063773355" duration="733000" />
-      <workItem from="1476089667740" duration="573000" />
-      <workItem from="1476104430644" duration="7736000" />
-      <workItem from="1476148405826" duration="920000" />
-      <workItem from="1476167366801" duration="801000" />
-      <workItem from="1477137830906" duration="51000" />
-      <workItem from="1477138072929" duration="987000" />
-      <workItem from="1479862749283" duration="743000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="27864000" />
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="-9" y="-9" width="1860" height="1098" extended-state="7" />
-    <editor active="false" />
-    <layout>
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="FindBugs-IDEA" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="17" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32719395" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32475883" sideWeight="0.50503355" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="JRebel Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="18" side_tool="true" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.19183445" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="JRebel Executor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2620321" sideWeight="0.49496645" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3965702" sideWeight="0.49440715" order="12" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32941177" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Remote Host" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18232661" sideWeight="0.49624866" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="JRebel" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16722596" sideWeight="0.50375134" order="5" side_tool="true" content_ui="tabs" />
-      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32997763" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.17469205" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.42122185" sideWeight="0.49328858" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16722596" sideWeight="0.50375134" order="6" side_tool="true" content_ui="tabs" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.724622" sideWeight="0.49776036" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="SVN Properties" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3290461" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3290461" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
-      <window_info id="JRebel remote servers log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="15" side_tool="true" content_ui="tabs" />
-      <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32937366" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-    </layout>
-  </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <option name="time" value="17" />
-    </breakpoint-manager>
-    <watches-manager />
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="46" column="32" selection-start-line="46" selection-start-column="32" selection-end-line="46" selection-end-column="32" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/core/Main.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/model/SSModel.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1188">
-          <caret line="54" column="33" selection-start-line="54" selection-start-column="33" selection-end-line="54" selection-end-column="33" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/core/TutorialVpn.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="13" column="0" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="46" column="32" selection-start-line="46" selection-start-column="32" selection-end-line="46" selection-end-column="32" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/core/Main.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/model/SSModel.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1188">
-          <caret line="54" column="33" selection-start-line="54" selection-start-column="33" selection-end-line="54" selection-end-column="33" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/core/TutorialVpn.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="13" column="0" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="726">
-          <caret line="33" column="31" selection-start-line="33" selection-start-column="31" selection-end-line="33" selection-end-column="31" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/core/Main.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/core/TutorialVpn.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="13" column="0" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/core/MianVpn.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="660">
-          <caret line="40" column="48" selection-start-line="40" selection-start-column="48" selection-end-line="40" selection-end-column="48" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/model/ConfigsBean.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2024">
-          <caret line="146" column="50" selection-start-line="146" selection-start-column="50" selection-end-line="146" selection-end-column="50" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/util/ModelUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="462">
-          <caret line="21" column="116" selection-start-line="21" selection-start-column="116" selection-end-line="21" selection-end-column="116" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="726">
-          <caret line="33" column="31" selection-start-line="33" selection-start-column="31" selection-end-line="33" selection-end-column="31" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/core/Main.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/core/TutorialVpn.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="13" column="0" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/core/MianVpn.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="21" column="0" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/model/ConfigsBean.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2024">
-          <caret line="146" column="50" selection-start-line="146" selection-start-column="50" selection-end-line="146" selection-end-column="50" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/util/ModelUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="462">
-          <caret line="21" column="116" selection-start-line="21" selection-start-column="116" selection-end-line="21" selection-end-column="116" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="726">
-          <caret line="33" column="31" selection-start-line="33" selection-start-column="31" selection-end-line="33" selection-end-column="31" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/core/Main.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/core/TutorialVpn.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="13" column="0" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/core/MianVpn.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="21" column="0" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/model/ConfigsBean.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2024">
-          <caret line="146" column="50" selection-start-line="146" selection-start-column="50" selection-end-line="146" selection-end-column="50" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/util/ModelUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="462">
-          <caret line="21" column="116" selection-start-line="21" selection-start-column="116" selection-end-line="21" selection-end-column="116" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="726">
-          <caret line="33" column="31" selection-start-line="33" selection-start-column="31" selection-end-line="33" selection-end-column="31" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/core/Main.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="352">
-          <caret line="22" column="40" selection-start-line="22" selection-start-column="40" selection-end-line="22" selection-end-column="40" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/core/TutorialVpn.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/core/MianVpn.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="21" column="0" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/model/ConfigsBean.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2024">
-          <caret line="146" column="50" selection-start-line="146" selection-start-column="50" selection-end-line="146" selection-end-column="50" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/util/ModelUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="462">
-          <caret line="21" column="116" selection-start-line="21" selection-start-column="116" selection-end-line="21" selection-end-column="116" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/abc.js" />
-    <entry file="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.14/fastjson-1.2.14-sources.jar!/com/alibaba/fastjson/JSON.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="19">
-          <caret line="428" column="24" selection-start-line="428" selection-start-column="24" selection-end-line="428" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/util/ModelUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="20" column="19" selection-start-line="20" selection-start-column="19" selection-end-line="20" selection-end-column="19" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_77/src.zip!/java/util/Map.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="617" column="17" selection-start-line="617" selection-start-column="17" selection-end-line="617" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/util/WEBUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="803">
-          <caret line="64" column="29" selection-start-line="64" selection-start-column="29" selection-end-line="64" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_77/src.zip!/java/lang/Object.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="222">
-          <caret line="445" column="22" selection-start-line="445" selection-start-column="22" selection-end-line="445" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_77/src.zip!/java/util/Collection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="222">
-          <caret line="408" column="20" selection-start-line="408" selection-start-column="20" selection-end-line="408" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_77/src.zip!/java/lang/Iterable.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="71" column="17" selection-start-line="71" selection-start-column="17" selection-end-line="71" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/util/SystemUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="20" column="30" selection-start-line="20" selection-start-column="30" selection-end-line="20" selection-end-column="30" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/util/WebClientUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="12" column="0" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/doc/SS账号密码.bat">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="13" column="0" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="132">
-          <caret line="6" column="32" selection-start-line="6" selection-start-column="32" selection-end-line="6" selection-end-column="32" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/core/MianVpn.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="171">
-          <caret line="28" column="35" selection-start-line="28" selection-start-column="35" selection-end-line="28" selection-end-column="35" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/core/TutorialVpn.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="721">
-          <caret line="38" column="0" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/model/SSModel.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="35">
-          <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/model/ConfigsBean.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="125">
-          <caret line="11" column="29" selection-start-line="11" selection-start-column="29" selection-end-line="11" selection-end-column="29" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/Setting.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="21" column="36" selection-start-line="21" selection-start-column="36" selection-end-line="21" selection-end-column="36" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#490#491#0" expanded="true" />
-            <element signature="e#518#519#0" expanded="true" />
-            <element signature="e#571#572#0" expanded="true" />
-            <element signature="e#605#606#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/core/Main.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="50">
-          <caret line="47" column="35" selection-start-line="47" selection-start-column="35" selection-end-line="47" selection-end-column="35" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/setting.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="9" column="23" selection-start-line="9" selection-start-column="23" selection-end-line="9" selection-end-column="23" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>No facets are configured</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>app</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>爬虫项目</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-                <option value="0.6" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectJDKs.UI">
-        <settings>
-          <last-edited>IntelliJ IDEA IU-162.2032.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: com.alibaba:fastjson:1.2.14</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/HtmlUnit-Demo/pom.xml b/HtmlUnit-Demo/pom.xml
index 915ef7b..9f80981 100644
--- a/HtmlUnit-Demo/pom.xml
+++ b/HtmlUnit-Demo/pom.xml
@@ -5,9 +5,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>cn.mrdear</groupId>
-    <artifactId>mrdear</artifactId>
+    <artifactId>HtmlUnit-Demo</artifactId>
     <version>1.0</version>
     <packaging>jar</packaging>
+    <name>HtmlUnit-Demo</name>
 
     <dependencies>
 
diff --git "a/HtmlUnit-Demo/\347\210\254\350\231\253\351\241\271\347\233\256.iml" "b/HtmlUnit-Demo/\347\210\254\350\231\253\351\241\271\347\233\256.iml"
deleted file mode 100644
index 461add1..0000000
--- "a/HtmlUnit-Demo/\347\210\254\350\231\253\351\241\271\347\233\256.iml"
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: net.sourceforge.htmlunit:htmlunit:2.23" level="project" />
-    <orderEntry type="library" name="Maven: xalan:xalan:2.7.2" level="project" />
-    <orderEntry type="library" name="Maven: xalan:serializer:2.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
-    <orderEntry type="library" name="Maven: net.sourceforge.htmlunit:htmlunit-core-js:2.23" level="project" />
-    <orderEntry type="library" name="Maven: net.sourceforge.htmlunit:neko-htmlunit:2.23" level="project" />
-    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.11.0" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
-    <orderEntry type="library" name="Maven: net.sourceforge.cssparser:cssparser:0.9.20" level="project" />
-    <orderEntry type="library" name="Maven: org.w3c.css:sac:1.3" level="project" />
-    <orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-client:9.2.18.v20160721" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.2.18.v20160721" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.2.18.v20160721" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-common:9.2.18.v20160721" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-api:9.2.18.v20160721" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.14" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.4" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/artifacts/TestJPA_war.xml b/JPA-Demo/.idea/artifacts/TestJPA_war.xml
deleted file mode 100644
index aa2cab2..0000000
--- a/JPA-Demo/.idea/artifacts/TestJPA_war.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="war" name="TestJPA:war">
-    <output-path>$PROJECT_DIR$/target</output-path>
-    <root id="archive" name="testjpa.war">
-      <element id="artifact" artifact-name="TestJPA:war exploded" />
-    </root>
-  </artifact>
-</component>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/artifacts/TestJPA_war_exploded.xml b/JPA-Demo/.idea/artifacts/TestJPA_war_exploded.xml
deleted file mode 100644
index dc70e59..0000000
--- a/JPA-Demo/.idea/artifacts/TestJPA_war_exploded.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="exploded-war" name="TestJPA:war exploded">
-    <output-path>$PROJECT_DIR$/target/testjpa</output-path>
-    <root id="root">
-      <element id="directory" name="WEB-INF">
-        <element id="directory" name="classes">
-          <element id="module-output" name="TestJPA" />
-        </element>
-        <element id="directory" name="lib">
-          <element id="library" level="project" name="Maven: org.springframework:spring-beans:4.3.0.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-core:4.3.0.RELEASE" />
-          <element id="library" level="project" name="Maven: commons-logging:commons-logging:1.2" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-context-support:4.3.0.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-context:4.3.0.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-aop:4.3.0.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-expression:4.3.0.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-jdbc:4.3.0.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-tx:4.3.0.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-orm:4.3.0.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-web:4.3.0.RELEASE" />
-          <element id="library" level="project" name="Maven: com.alibaba:druid:1.0.19" />
-          <element id="library" level="project" name="Maven: com.alibaba:fastjson:1.2.14" />
-          <element id="library" level="project" name="Maven: org.springframework.data:spring-data-jpa:1.10.4.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework.data:spring-data-commons:1.12.4.RELEASE" />
-          <element id="library" level="project" name="Maven: org.slf4j:slf4j-api:1.7.7" />
-          <element id="library" level="project" name="Maven: org.slf4j:jcl-over-slf4j:1.7.7" />
-          <element id="library" level="project" name="Maven: org.aspectj:aspectjrt:1.8.9" />
-          <element id="library" level="project" name="Maven: org.hibernate:hibernate-core:5.1.0.Final" />
-          <element id="library" level="project" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" />
-          <element id="library" level="project" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final" />
-          <element id="library" level="project" name="Maven: org.javassist:javassist:3.20.0-GA" />
-          <element id="library" level="project" name="Maven: antlr:antlr:2.7.7" />
-          <element id="library" level="project" name="Maven: org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1.1" />
-          <element id="library" level="project" name="Maven: org.jboss:jandex:2.0.0.Final" />
-          <element id="library" level="project" name="Maven: com.fasterxml:classmate:1.3.0" />
-          <element id="library" level="project" name="Maven: dom4j:dom4j:1.6.1" />
-          <element id="library" level="project" name="Maven: xml-apis:xml-apis:1.0.b2" />
-          <element id="library" level="project" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.0.1.Final" />
-          <element id="library" level="project" name="Maven: org.hibernate:hibernate-entitymanager:5.1.0.Final" />
-          <element id="library" level="project" name="Maven: mysql:mysql-connector-java:5.1.34" />
-          <element id="library" level="project" name="Maven: ch.qos.logback:logback-core:1.1.2" />
-          <element id="library" level="project" name="Maven: ch.qos.logback:logback-classic:1.1.2" />
-          <element id="library" level="project" name="Maven: org.apache.commons:commons-lang3:3.3.2" />
-        </element>
-      </element>
-      <element id="directory" name="META-INF">
-        <element id="file-copy" path="$PROJECT_DIR$/target/testjpa/META-INF/MANIFEST.MF" />
-      </element>
-      <element id="javaee-facet-resources" facet="TestJPA/web/Web" />
-    </root>
-  </artifact>
-</component>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/compiler.xml b/JPA-Demo/.idea/compiler.xml
deleted file mode 100644
index fdebc2f..0000000
--- a/JPA-Demo/.idea/compiler.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-      <entry name="!?*.aj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-      <profile default="false" name="Maven default annotation processors profile" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <processorPath useClasspath="true" />
-        <module name="TestJPA" />
-      </profile>
-    </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="TestJPA" target="1.8" />
-    </bytecodeTargetLevel>
-  </component>
-</project>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/copyright/profiles_settings.xml b/JPA-Demo/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/JPA-Demo/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/dataSources.local.xml b/JPA-Demo/.idea/dataSources.local.xml
deleted file mode 100644
index 4cbfbfb..0000000
--- a/JPA-Demo/.idea/dataSources.local.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="dataSourceStorageLocal">
-    <data-source name="MySQL - pcard@172.18.0.13" uuid="9b9d41a7-087f-4d48-b6f5-6a32ff67416e">
-      <database-info product="MySQL" version="5.6.19-log" jdbc-version="4.0" driver-name="MySQL Connector Java" driver-version="mysql-connector-java-5.1.38 ( Revision: fe541c166cec739c74cc727c5da96c1028b4834a )">
-        <extra-name-characters>#@</extra-name-characters>
-        <identifier-quote-string>`</identifier-quote-string>
-      </database-info>
-      <case-sensitivity plain-identifiers="lower" quoted-identifiers="lower" />
-      <secret-storage>master_key</secret-storage>
-      <user-name>pcard_ap</user-name>
-      <resolve-scope>pcard:</resolve-scope>
-    </data-source>
-  </component>
-</project>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/dataSources.xml b/JPA-Demo/.idea/dataSources.xml
deleted file mode 100644
index 98da451..0000000
--- a/JPA-Demo/.idea/dataSources.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
-    <data-source source="LOCAL" name="MySQL - pcard@172.18.0.13" uuid="9b9d41a7-087f-4d48-b6f5-6a32ff67416e">
-      <driver-ref>mysql</driver-ref>
-      <synchronize>true</synchronize>
-      <jdbc-driver>com.mysql.jdbc.Driver</jdbc-driver>
-      <jdbc-url>jdbc:mysql://172.18.0.13:60001/pcard</jdbc-url>
-      <driver-properties>
-        <property name="autoReconnect" value="true" />
-        <property name="zeroDateTimeBehavior" value="convertToNull" />
-        <property name="tinyInt1isBit" value="false" />
-        <property name="characterEncoding" value="utf8" />
-        <property name="characterSetResults" value="utf8" />
-        <property name="yearIsDateType" value="false" />
-      </driver-properties>
-    </data-source>
-  </component>
-</project>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/dataSources/9b9d41a7-087f-4d48-b6f5-6a32ff67416e.xml b/JPA-Demo/.idea/dataSources/9b9d41a7-087f-4d48-b6f5-6a32ff67416e.xml
deleted file mode 100644
index d99b5f6..0000000
--- a/JPA-Demo/.idea/dataSources/9b9d41a7-087f-4d48-b6f5-6a32ff67416e.xml
+++ /dev/null
@@ -1,5359 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dataSource name="MySQL - pcard@172.18.0.13">
-  <database-model serializer="dbm" rdbms="MYSQL" format-version="2.6">
-    <schema id="1" name="pcard">
-      <visible>1</visible>
-    </schema>
-    <schema id="2" name="information_schema"/>
-    <schema id="3" name="mysql"/>
-    <schema id="4" name="performance_schema"/>
-    <schema id="5" name="projecthu"/>
-    <schema id="6" name="risk"/>
-    <schema id="7" name="settlement"/>
-    <schema id="8" name="test"/>
-    <table id="9" parent="1" name="tbl_card_delivery"/>
-    <table id="10" parent="1" name="tbl_pcard_acct"/>
-    <table id="11" parent="1" name="tbl_pcard_acct_change"/>
-    <table id="12" parent="1" name="tbl_pcard_acct_uuid"/>
-    <table id="13" parent="1" name="tbl_pcard_acct_vcard_bind"/>
-    <table id="14" parent="1" name="tbl_pcard_acq_acct"/>
-    <table id="15" parent="1" name="tbl_pcard_acq_channel"/>
-    <table id="16" parent="1" name="tbl_pcard_api"/>
-    <table id="17" parent="1" name="tbl_pcard_api_list"/>
-    <table id="18" parent="1" name="tbl_pcard_api_type"/>
-    <table id="19" parent="1" name="tbl_pcard_audit_log"/>
-    <table id="20" parent="1" name="tbl_pcard_bank_cardbin"/>
-    <table id="21" parent="1" name="tbl_pcard_card"/>
-    <table id="22" parent="1" name="tbl_pcard_card_activation"/>
-    <table id="23" parent="1" name="tbl_pcard_card_change"/>
-    <table id="24" parent="1" name="tbl_pcard_card_delivery"/>
-    <table id="25" parent="1" name="tbl_pcard_card_extend"/>
-    <table id="26" parent="1" name="tbl_pcard_card_operate"/>
-    <table id="27" parent="1" name="tbl_pcard_card_order"/>
-    <table id="28" parent="1" name="tbl_pcard_card_recharge"/>
-    <table id="29" parent="1" name="tbl_pcard_card_recharge_file"/>
-    <table id="30" parent="1" name="tbl_pcard_card_recharge_file_formal"/>
-    <table id="31" parent="1" name="tbl_pcard_card_recharge_file_formal_detail"/>
-    <table id="32" parent="1" name="tbl_pcard_card_trans_amt"/>
-    <table id="33" parent="1" name="tbl_pcard_cardbin"/>
-    <table id="34" parent="1" name="tbl_pcard_cardlog"/>
-    <table id="35" parent="1" name="tbl_pcard_cardnum_rule"/>
-    <table id="36" parent="1" name="tbl_pcard_cart"/>
-    <table id="37" parent="1" name="tbl_pcard_cart_item"/>
-    <table id="38" parent="1" name="tbl_pcard_customer_information"/>
-    <table id="39" parent="1" name="tbl_pcard_gift_log"/>
-    <table id="40" parent="1" name="tbl_pcard_institution"/>
-    <table id="41" parent="1" name="tbl_pcard_invented_card_make"/>
-    <table id="42" parent="1" name="tbl_pcard_mcht_card"/>
-    <table id="43" parent="1" name="tbl_pcard_menu_item"/>
-    <table id="44" parent="1" name="tbl_pcard_menu_resource"/>
-    <table id="45" parent="1" name="tbl_pcard_merchant"/>
-    <table id="46" parent="1" name="tbl_pcard_merchant_tmp"/>
-    <table id="47" parent="1" name="tbl_pcard_mnt_trans_amt"/>
-    <table id="48" parent="1" name="tbl_pcard_order"/>
-    <table id="49" parent="1" name="tbl_pcard_order_temp"/>
-    <table id="50" parent="1" name="tbl_pcard_order_type"/>
-    <table id="51" parent="1" name="tbl_pcard_pay_log"/>
-    <table id="52" parent="1" name="tbl_pcard_pay_method"/>
-    <table id="53" parent="1" name="tbl_pcard_pay_type"/>
-    <table id="54" parent="1" name="tbl_pcard_porder"/>
-    <table id="55" parent="1" name="tbl_pcard_porder_item"/>
-    <table id="56" parent="1" name="tbl_pcard_resource"/>
-    <table id="57" parent="1" name="tbl_pcard_role"/>
-    <table id="58" parent="1" name="tbl_pcard_role_menu"/>
-    <table id="59" parent="1" name="tbl_pcard_role_resource"/>
-    <table id="60" parent="1" name="tbl_pcard_store_inf"/>
-    <table id="61" parent="1" name="tbl_pcard_store_sum"/>
-    <table id="62" parent="1" name="tbl_pcard_sys_para"/>
-    <table id="63" parent="1" name="tbl_pcard_sys_usr"/>
-    <table id="64" parent="1" name="tbl_pcard_theme"/>
-    <table id="65" parent="1" name="tbl_pcard_token_log"/>
-    <table id="66" parent="1" name="tbl_pcard_tps_mapper"/>
-    <table id="67" parent="1" name="tbl_pcard_vcard"/>
-    <table id="68" parent="1" name="tbl_pcard_vcard_make"/>
-    <table id="69" parent="1" name="tbl_pcard_vtype"/>
-    <table id="70" parent="1" name="tbl_pcard_vtype_rule"/>
-    <table id="71" parent="1" name="tbl_pcard_vtype_rule_tmp"/>
-    <table id="72" parent="1" name="tbl_pcard_vtype_tmp"/>
-    <table id="73" parent="1" name="tmp_cardbin"/>
-    <routine id="74" parent="1" name="func_get_split_string">
-      <routine-kind>FUNCTION</routine-kind>
-    </routine>
-    <routine id="75" parent="1" name="func_get_split_string_total">
-      <routine-kind>FUNCTION</routine-kind>
-    </routine>
-    <routine id="76" parent="1" name="getChildList">
-      <routine-kind>FUNCTION</routine-kind>
-    </routine>
-    <routine id="77" parent="1" name="getInstChildList">
-      <routine-kind>FUNCTION</routine-kind>
-    </routine>
-    <routine id="78" parent="1" name="getInstParentList">
-      <routine-kind>FUNCTION</routine-kind>
-    </routine>
-    <routine id="79" parent="1" name="getParentList">
-      <routine-kind>FUNCTION</routine-kind>
-    </routine>
-    <routine id="80" parent="1" name="getRootParentList">
-      <routine-kind>FUNCTION</routine-kind>
-    </routine>
-    <routine id="81" parent="1" name="splitString">
-      <routine-kind>PROCEDURE</routine-kind>
-    </routine>
-    <column id="82" parent="9" name="dy_id">
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="83" parent="9" name="card_quantity">
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="84" parent="9" name="dy_acpt_inst">
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="85" parent="9" name="dy_dt">
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="86" parent="9" name="dy_inst_nm">
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="87" parent="9" name="dy_issuing_nm">
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="88" parent="9" name="dy_make_id">
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="89" parent="9" name="dy_memo">
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="90" parent="9" name="dy_num">
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="91" parent="9" name="dy_st">
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="92" parent="9" name="dy_tp">
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="93" parent="9" name="dy_user">
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="94" parent="9" name="dy_cm_dt">
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="95" parent="9" name="end_card_num">
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="96" parent="9" name="st_card_num">
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <key id="97" parent="9" name="PRIMARY">
-      <columns>dy_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="98" parent="10" name="acct_id">
-      <comment>账户ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="99" parent="10" name="acct_code">
-      <comment>账户代码</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="100" parent="10" name="mnt_id">
-      <comment>所属商户(权限隔离，统计用)</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="101" parent="10" name="acct_mnt_code">
-      <comment>再所属商户账户代码(追踪对账用)</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="102" parent="10" name="acct_amt">
-      <comment>账户金额,单位为分</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="103" parent="10" name="acct_bal_amt">
-      <comment>账户余额（包含账户充值和关联虚拟卡总额）,单位为分</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="104" parent="10" name="acct_forzen_amt">
-      <comment>账户冻结金额,单位为分</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="105" parent="10" name="curr_cd">
-      <comment>币别（默认CNY）</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-      <default-expression>&apos;CNY&apos;</default-expression>
-    </column>
-    <column id="106" parent="10" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="107" parent="10" name="last_modify_time">
-      <comment>最后修改时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="108" parent="10" name="st">
-      <comment>状态(0:可用,1:不可用)</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="109" parent="10" name="acct_passwd">
-      <comment>支付密码</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="110" parent="10" name="isset_passwd">
-      <comment>&apos;0&apos;已设置 支付密码  ‘1’未设置支付密码</comment>
-      <mandatory>1</mandatory>
-      <data-type>char(1)|0</data-type>
-      <default-expression>&apos;1&apos;</default-expression>
-    </column>
-    <column id="111" parent="10" name="version">
-      <data-type>int(20)|0</data-type>
-      <default-expression>&apos;0&apos;</default-expression>
-    </column>
-    <column id="112" parent="10" name="query_passwd">
-      <comment>查询密码</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="113" parent="10" name="webchat_id">
-      <comment>微信绑定ID</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="114" parent="10" name="mobile">
-      <comment>手机号</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="115" parent="10" name="acct_nm">
-      <comment>账户姓名</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="116" parent="10" name="unpasswd_amt">
-      <comment>免密金额</comment>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="117" parent="10" name="isset_orders">
-      <data-type>char(1)|0</data-type>
-      <default-expression>&apos;N&apos;</default-expression>
-    </column>
-    <column id="118" parent="10" name="cert_nm">
-      <comment>证件名称</comment>
-      <data-type>char(20)|0</data-type>
-    </column>
-    <column id="119" parent="10" name="cert_no">
-      <comment>证件号</comment>
-      <data-type>char(30)|0</data-type>
-    </column>
-    <column id="120" parent="10" name="cert_tp">
-      <comment>01：身份证 02：军官证 03：护照 04：回乡证 05：台胞证 06：警官证 07：士兵证 99：其它证件</comment>
-      <data-type>char(2)|0</data-type>
-    </column>
-    <column id="121" parent="10" name="is_locked">
-      <comment>是否锁定 0未锁定,1锁定</comment>
-      <data-type>bit(1)|0</data-type>
-      <default-expression>b&apos;0&apos;</default-expression>
-    </column>
-    <column id="122" parent="10" name="locked_date">
-      <comment>锁定时间</comment>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="123" parent="10" name="login_failure_count">
-      <comment>登录失败次数</comment>
-      <data-type>int(11)|0</data-type>
-      <default-expression>&apos;0&apos;</default-expression>
-    </column>
-    <key id="124" parent="10" name="PRIMARY">
-      <columns>acct_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="125" parent="11" name="change_id">
-      <comment>变动流水</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="126" parent="11" name="order_id">
-      <comment>订单号</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="127" parent="11" name="change_amt">
-      <comment>在不同交易类型下，账户变动金额（注意有正负号）</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="128" parent="11" name="pre_acct_amt">
-      <comment>交易前账户金额，精确到分</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="129" parent="11" name="pre_acct_bal_amt">
-      <comment>交易前账户余额，精确到分</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="130" parent="11" name="pre_acct_forzen_amt">
-      <comment>交易前冻结资金，精确到分</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="131" parent="11" name="aft_acct_amt">
-      <comment>交易后账户金额，精确到分</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="132" parent="11" name="aft_acct_bal_amt">
-      <comment>交易后账户余额，精确到分</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="133" parent="11" name="aft_acct_forzen_amt">
-      <comment>交易后冻结资金，精确到分</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="134" parent="11" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="135" parent="11" name="last_modify_time">
-      <comment>最后修改时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="136" parent="11" name="acct_id">
-      <comment>账户号</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="137" parent="11" name="memo">
-      <comment>备注</comment>
-      <data-type>varchar(512)|0</data-type>
-    </column>
-    <key id="138" parent="11" name="PRIMARY">
-      <columns>change_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="139" parent="12" name="acct_id">
-      <comment>账号</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="140" parent="12" name="uuid">
-      <comment>第三方标识</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(128)|0</data-type>
-    </column>
-    <column id="141" parent="12" name="st">
-      <comment>0 可用 1不可用</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="142" parent="12" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="143" parent="12" name="last_modify_time">
-      <comment>更新时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="144" parent="12" name="demo">
-      <comment>备注</comment>
-      <data-type>varchar(256)|0</data-type>
-    </column>
-    <column id="145" parent="12" name="app_id">
-      <comment>应用ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(128)|0</data-type>
-    </column>
-    <column id="146" parent="12" name="mcht_id">
-      <comment>机构号或者商户号</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <key id="147" parent="12" name="PRIMARY">
-      <columns>uuid
-app_id
-mcht_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="148" parent="13" name="acct_id">
-      <comment>账号ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="149" parent="13" name="vcard_id">
-      <comment>虚拟卡ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="150" parent="13" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="151" parent="13" name="last_modify_time">
-      <comment>最后修改时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="152" parent="13" name="card_type">
-      <comment>01实体卡  02 虚拟卡</comment>
-      <data-type>varchar(2)|0</data-type>
-      <default-expression>&apos;02&apos;</default-expression>
-    </column>
-    <column id="153" parent="13" name="card_order">
-      <data-type>int(11)|0</data-type>
-      <default-expression>&apos;0&apos;</default-expression>
-    </column>
-    <column id="154" parent="13" name="custom_type">
-      <comment>自定义类型,0正常虚拟卡,1充值虚拟卡,2转赠虚拟卡</comment>
-      <data-type>varchar(2)|0</data-type>
-      <default-expression>&apos;0&apos;</default-expression>
-    </column>
-    <key id="155" parent="13" name="PRIMARY">
-      <columns>acct_id
-vcard_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="156" parent="14" name="acq_acct_id">
-      <comment>用户ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="157" parent="14" name="acq_acct_code">
-      <comment>收单代码</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="158" parent="14" name="acq_acct_nm">
-      <comment>收单姓名</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="159" parent="14" name="acq_acct_des">
-      <comment>收单描述</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(500)|0</data-type>
-    </column>
-    <column id="160" parent="14" name="acq_acct_no">
-      <comment>收单账号</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="161" parent="14" name="acq_acct_bank">
-      <comment>收单银行</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="162" parent="14" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="163" parent="14" name="last_modify_time">
-      <comment>最后修改时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="164" parent="14" name="st">
-      <comment>状态(0:可用,1:不可用)</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <key id="165" parent="14" name="PRIMARY">
-      <columns>acq_acct_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="166" parent="15" name="acq_channel_id">
-      <comment>渠道ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="167" parent="15" name="acq_channel_code">
-      <comment>渠道代码</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="168" parent="15" name="acq_channel_nm">
-      <comment>渠道姓名</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="169" parent="15" name="acq_channel_des">
-      <comment>渠道描述</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(500)|0</data-type>
-    </column>
-    <column id="170" parent="15" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="171" parent="15" name="last_modify_time">
-      <comment>最后修改时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="172" parent="15" name="st">
-      <comment>状态(0:可用,1:不可用)</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <key id="173" parent="15" name="PRIMARY">
-      <columns>acq_channel_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="174" parent="16" name="id">
-      <comment>主键</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="175" parent="16" name="app_id">
-      <comment>开放应用ID 唯一</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(12)|0</data-type>
-    </column>
-    <column id="176" parent="16" name="app_secret">
-      <comment>开放应用密钥</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(512)|0</data-type>
-    </column>
-    <column id="177" parent="16" name="inst_id">
-      <comment>机构号</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="178" parent="16" name="inst_publickey">
-      <comment>商户公钥 base64加密值&#xd;
-</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1024)|0</data-type>
-    </column>
-    <column id="179" parent="16" name="inst_ip">
-      <comment>机构白名单 ip或者域名 非白名单地址不允许做请求访问</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1024)|0</data-type>
-    </column>
-    <column id="180" parent="16" name="create_time">
-      <comment>创建时间&#xd;
-</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="181" parent="16" name="update_time">
-      <comment>更新时间&#xd;
-</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="182" parent="16" name="authority">
-      <comment>交易权限&#xd;
-</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(512)|0</data-type>
-    </column>
-    <column id="183" parent="16" name="app_secret_encrypt">
-      <comment>公钥加密app_secret&#xd;
-</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1024)|0</data-type>
-    </column>
-    <column id="184" parent="16" name="app_st">
-      <comment>0可用 1待审核   9 禁用&#xd;
-</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="185" parent="16" name="app_type">
-      <comment>预付费卡应用</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(3)|0</data-type>
-    </column>
-    <index id="186" parent="16" name="APP_ID_SEQ">
-      <columns>app_id</columns>
-      <desc-columns></desc-columns>
-      <unique>1</unique>
-    </index>
-    <key id="187" parent="16" name="PRIMARY">
-      <columns>id</columns>
-      <primary>1</primary>
-    </key>
-    <key id="188" parent="16" name="APP_ID_SEQ">
-      <columns>app_id</columns>
-      <underlying-index>APP_ID_SEQ</underlying-index>
-    </key>
-    <column id="189" parent="17" name="api_list_id">
-      <comment>主键&#xd;
-</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="190" parent="17" name="api_list_code">
-      <comment>api唯一编号</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(4)|0</data-type>
-    </column>
-    <column id="191" parent="17" name="app_type_code">
-      <comment>应用编号</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(3)|0</data-type>
-    </column>
-    <column id="192" parent="17" name="api_list_name">
-      <comment>api名称&#xd;
-</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(128)|0</data-type>
-    </column>
-    <column id="193" parent="17" name="api_st">
-      <comment>0 可用 9 禁用</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="194" parent="17" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="195" parent="17" name="update_time">
-      <comment>最后更新时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="196" parent="17" name="api_demo">
-      <comment>备注</comment>
-      <data-type>varchar(512)|0</data-type>
-    </column>
-    <column id="197" parent="17" name="api_url">
-      <comment>api地址&#xd;
-</comment>
-      <data-type>varchar(512)|0</data-type>
-    </column>
-    <key id="198" parent="17" name="PRIMARY">
-      <columns>api_list_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="199" parent="18" name="app_type_code">
-      <comment>应用编号,唯一</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(3)|0</data-type>
-    </column>
-    <column id="200" parent="18" name="app_type_nm">
-      <comment>应用名称</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(128)|0</data-type>
-    </column>
-    <column id="201" parent="18" name="app_type_st">
-      <comment>0 可用 9 禁用</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="202" parent="18" name="create_time">
-      <comment>创建时间</comment>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="203" parent="18" name="update_time">
-      <comment>最后更新时间</comment>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="204" parent="18" name="app_type_demo">
-      <comment>备注</comment>
-      <data-type>varchar(512)|0</data-type>
-    </column>
-    <index id="205" parent="18" name="app_type_code_seq">
-      <columns>app_type_code</columns>
-      <desc-columns></desc-columns>
-      <unique>1</unique>
-    </index>
-    <key id="206" parent="18" name="app_type_code_seq">
-      <columns>app_type_code</columns>
-      <underlying-index>app_type_code_seq</underlying-index>
-    </key>
-    <column id="207" parent="19" name="log_id">
-      <comment>日志ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="208" parent="19" name="log_usr">
-      <comment>操作员</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="209" parent="19" name="log_oper">
-      <comment>操作描述</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(500)|0</data-type>
-    </column>
-    <column id="210" parent="19" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="211" parent="19" name="last_modify_time">
-      <comment>最后修改时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="212" parent="19" name="inst_id">
-      <comment>操作人机构</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(50)|0</data-type>
-    </column>
-    <column id="213" parent="19" name="create_month">
-      <comment>操作月</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(20)|0</data-type>
-    </column>
-    <column id="214" parent="19" name="create_day">
-      <comment>操作日</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(20)|0</data-type>
-    </column>
-    <key id="215" parent="19" name="PRIMARY">
-      <columns>log_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="216" parent="20" name="id">
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-      <sequence-identity>1</sequence-identity>
-    </column>
-    <column id="217" parent="20" name="chnl_id">
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="218" parent="20" name="mcht_type">
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="219" parent="20" name="card_bin">
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="220" parent="20" name="bank_name">
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="221" parent="20" name="card_no_len">
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="222" parent="20" name="version_no">
-      <data-type>varchar(4)|0</data-type>
-    </column>
-    <column id="223" parent="20" name="stat">
-      <data-type>varchar(2)|0</data-type>
-      <default-expression>&apos;0&apos;</default-expression>
-    </column>
-    <column id="224" parent="20" name="ad_flag">
-      <data-type>varchar(2)|0</data-type>
-    </column>
-    <column id="225" parent="20" name="logo">
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="226" parent="20" name="create_date">
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="227" parent="20" name="modify_date">
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="228" parent="20" name="version">
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="229" parent="20" name="card_type">
-      <comment>卡类型</comment>
-      <data-type>char(20)|0</data-type>
-    </column>
-    <column id="230" parent="20" name="issue_info">
-      <comment>发卡行信息</comment>
-      <data-type>char(128)|0</data-type>
-    </column>
-    <key id="231" parent="20" name="PRIMARY">
-      <columns>id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="232" parent="21" name="cd_id">
-      <comment>主键</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="233" parent="21" name="cd_code">
-      <comment>卡号</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(20)|0</data-type>
-    </column>
-    <column id="234" parent="21" name="cd_act">
-      <comment>卡账号</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="235" parent="21" name="cd_issuing_inst">
-      <comment>发卡机构</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="236" parent="21" name="cd_issuing_nm">
-      <comment>发卡名称</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(128)|0</data-type>
-    </column>
-    <column id="237" parent="21" name="cd_type">
-      <comment>卡种 00 磁条卡 01 M1卡 02 CPU卡03:4442 卡</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(2)|0</data-type>
-    </column>
-    <column id="238" parent="21" name="cd_rh_sn">
-      <comment>充值序列号</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="239" parent="21" name="cd_istest">
-      <comment>测试卡标志 0 是 1否</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="240" parent="21" name="cd_isvip">
-      <comment>是否为会员 0 是 1 否</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="241" parent="21" name="cd_isencrypt">
-      <comment>是否加密 0 是 1 否</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="242" parent="21" name="cd_isrealnm">
-      <comment>是否实名 0 是 1 否</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="243" parent="21" name="cd_custom_nm">
-      <comment>客户名称</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="244" parent="21" name="cd_store_inst">
-      <comment>库存机构</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="245" parent="21" name="cd_sell_inst">
-      <comment>售卡机构</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="246" parent="21" name="cd_initpwd">
-      <comment>初始卡密码</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="247" parent="21" name="cd_pwd">
-      <comment>卡密码</comment>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="248" parent="21" name="cd_query_initpwd">
-      <comment>初始查询密码</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="249" parent="21" name="cd_query_pwd">
-      <comment>查询密码</comment>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="250" parent="21" name="cd_amt">
-      <comment>卡余额（不含押金）</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="251" parent="21" name="cd_gift_amt">
-      <comment>赠送金额</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-      <default-expression>&apos;0&apos;</default-expression>
-    </column>
-    <column id="252" parent="21" name="cd_point">
-      <comment>积分余额</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="253" parent="21" name="cd_al_amt">
-      <comment>可用余额</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="254" parent="21" name="cd_yd_amt">
-      <comment>上日余额</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="255" parent="21" name="cd_fz_amt">
-      <comment>冻结金额</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="256" parent="21" name="cd_qc_amt">
-      <comment>圈存金额</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="257" parent="21" name="cd_min_amt">
-      <comment>最低账户金额</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="258" parent="21" name="cd_max_amt">
-      <comment>最大账户金额</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="259" parent="21" name="cd_max_od_amt">
-      <comment>最大透支金额</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="260" parent="21" name="cd_ct_dm">
-      <comment>开户时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="261" parent="21" name="cd_at_dm">
-      <comment>激活时间</comment>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="262" parent="21" name="cd_lt_dm">
-      <comment>最后更新时间</comment>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="263" parent="21" name="cd_ft_dm">
-      <comment>首次交易时间</comment>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="264" parent="21" name="cd_st">
-      <comment>00正常，01挂失，02初始，03坏卡，04预售卡，05回收，06作废卡，07冻结，08锁定，09换卡，10已到期，11 退卡</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(2)|0</data-type>
-    </column>
-    <column id="265" parent="21" name="cd_fw_st">
-      <comment>卡流通状态00正常，01开卡，02总部入库，03在途，04验卡，05库存，06售卡未激活，07遗失，08作废，09异常 10待制卡（用于生成模拟数据）</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(2)|0</data-type>
-    </column>
-    <column id="266" parent="21" name="cd_rh_cnt">
-      <comment>充值次数</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-      <default-expression>&apos;0&apos;</default-expression>
-    </column>
-    <column id="267" parent="21" name="cd_tf_cnt">
-      <comment>交易次数</comment>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="268" parent="21" name="cd_rh_amt">
-      <comment>充值累计金额</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="269" parent="21" name="cd_valicode">
-      <comment>卡校验码</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="270" parent="21" name="cd_memo">
-      <comment>备注</comment>
-      <data-type>varchar(512)|0</data-type>
-    </column>
-    <column id="271" parent="21" name="cd_track_inf">
-      <comment>磁道信息1</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="272" parent="21" name="cd_track2_inf">
-      <comment>磁道信息2</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="273" parent="21" name="cd_track3_inf">
-      <comment>磁道信息3</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="274" parent="21" name="cd_ic_data">
-      <comment>255</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="275" parent="21" name="cd_ic_data2">
-      <comment>IC卡信息2</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="276" parent="21" name="cd_ic_data3">
-      <comment>IC卡信息3</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="277" parent="21" name="cd_vd_dt">
-      <comment>有效期YYmm,不存在则按，磁道中的有效期来判断</comment>
-      <data-type>varchar(4)|0</data-type>
-    </column>
-    <column id="278" parent="21" name="cd_vcard_make_id">
-      <comment>制卡流程ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(30)|0</data-type>
-    </column>
-    <column id="279" parent="21" name="cd_initamt">
-      <comment>卡初始金额</comment>
-      <data-type>bigint(20)|0</data-type>
-      <default-expression>&apos;0&apos;</default-expression>
-    </column>
-    <column id="280" parent="21" name="vtype_id">
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="281" parent="21" name="apply_range">
-      <comment>应用范围</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="282" parent="21" name="support_recharge">
-      <comment>是佛支持充值 0 支持 1不支持</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-      <default-expression>&apos;1&apos;</default-expression>
-    </column>
-    <column id="283" parent="21" name="cd_order">
-      <data-type>int(11)|0</data-type>
-      <default-expression>&apos;0&apos;</default-expression>
-    </column>
-    <column id="284" parent="21" name="customer_information_id">
-      <comment>绑定客户的Id</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="285" parent="21" name="cd_bind_dm">
-      <comment>绑定时间</comment>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="286" parent="21" name="is_custom">
-      <comment>是否为自定义卡 0 是 1否</comment>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="287" parent="21" name="card_image">
-      <comment>卡片图片</comment>
-      <data-type>varchar(512)|0</data-type>
-    </column>
-    <column id="288" parent="21" name="recharge_amount">
-      <comment>充值金额</comment>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="289" parent="21" name="version">
-      <comment>版本</comment>
-      <data-type>bigint(20)|0</data-type>
-      <default-expression>&apos;0&apos;</default-expression>
-    </column>
-    <column id="290" parent="21" name="order_id">
-      <comment>交易订单号</comment>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <index id="291" parent="21" name="uq_cd_code">
-      <columns>cd_code</columns>
-      <desc-columns></desc-columns>
-      <unique>1</unique>
-    </index>
-    <key id="292" parent="21" name="PRIMARY">
-      <columns>cd_id</columns>
-      <primary>1</primary>
-    </key>
-    <key id="293" parent="21" name="uq_cd_code">
-      <columns>cd_code</columns>
-      <underlying-index>uq_cd_code</underlying-index>
-    </key>
-    <column id="294" parent="22" name="act_id">
-      <comment>id</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="295" parent="22" name="st">
-      <comment>状态 0 待审核   1审核通过  2 审核不通过</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="296" parent="22" name="st_card_no">
-      <comment>起始卡号</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="297" parent="22" name="end_card_no">
-      <comment>结束卡号</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="298" parent="22" name="seq_step">
-      <comment>步长</comment>
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="299" parent="22" name="act_num">
-      <comment>数量</comment>
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="300" parent="22" name="act_way">
-      <comment>激活途径 01 现金 02银行卡 03微信 04 支付宝</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(2)|0</data-type>
-    </column>
-    <column id="301" parent="22" name="inst_id">
-      <comment>归属机构</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="302" parent="22" name="creator">
-      <comment>录入员</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(256)|0</data-type>
-    </column>
-    <column id="303" parent="22" name="check_usr">
-      <comment>审核员</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(256)|0</data-type>
-    </column>
-    <column id="304" parent="22" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="305" parent="22" name="last_modify_time">
-      <comment>更新时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="306" parent="22" name="card_amt">
-      <comment>面值</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="307" parent="22" name="make_id">
-      <comment>制卡流程</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="308" parent="22" name="memo">
-      <comment>备注</comment>
-      <data-type>varchar(512)|0</data-type>
-    </column>
-    <key id="309" parent="22" name="PRIMARY">
-      <columns>act_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="310" parent="23" name="change_id">
-      <comment>主键</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="311" parent="23" name="old_card_id">
-      <comment>旧卡号</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="312" parent="23" name="old_card_type">
-      <comment>旧卡类型  3实体卡 4 虚拟卡</comment>
-      <mandatory>1</mandatory>
-      <data-type>char(1)|0</data-type>
-    </column>
-    <column id="313" parent="23" name="old_card_material">
-      <comment> 卡介质  卡介质  00 磁条卡 01 M1卡 02 CPU卡，03:4442 卡 99虚拟卡</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(2)|0</data-type>
-    </column>
-    <column id="314" parent="23" name="old_card_amt">
-      <comment>卡内总金额</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="315" parent="23" name="old_card_point">
-      <comment>卡类总积分</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="316" parent="23" name="new_card_id">
-      <comment>旧卡号</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="317" parent="23" name="new_card_type">
-      <comment>旧卡类型  3实体卡 4 虚拟卡</comment>
-      <mandatory>1</mandatory>
-      <data-type>char(1)|0</data-type>
-    </column>
-    <column id="318" parent="23" name="new_card_material">
-      <comment> 卡介质  卡介质  00 磁条卡 01 M1卡 02 CPU卡，03:4442 卡 99虚拟卡</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(2)|0</data-type>
-    </column>
-    <column id="319" parent="23" name="ct_dm">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="320" parent="23" name="change_st">
-      <comment>0 换卡成功  1待换卡  9换卡失败</comment>
-      <mandatory>1</mandatory>
-      <data-type>char(1)|0</data-type>
-    </column>
-    <column id="321" parent="23" name="register_user">
-      <comment>登记人员  POS交易登记为CHMPAY_SERVICE,其他用户不允许注册为CHMAPY_SERVICE</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="322" parent="23" name="check_user">
-      <comment>处理用户POS交易登记为CHMPAY_SERVICE,其他用户不允许注册为CHMAPY_SERVICE</comment>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="323" parent="23" name="lt_dm">
-      <comment>最后更新时间</comment>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="324" parent="23" name="demo">
-      <comment>备注</comment>
-      <data-type>varchar(512)|0</data-type>
-    </column>
-    <key id="325" parent="23" name="PRIMARY">
-      <columns>change_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="326" parent="24" name="dy_id">
-      <comment>主键</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="327" parent="24" name="dy_make_id">
-      <comment>制卡单号</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="328" parent="24" name="dy_acpt_inst">
-      <comment>接收机构</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(30)|0</data-type>
-    </column>
-    <column id="329" parent="24" name="dy_issuing_nm">
-      <comment>发卡方名称</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(128)|0</data-type>
-    </column>
-    <column id="330" parent="24" name="st_card_num">
-      <comment>起始卡号</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(20)|0</data-type>
-    </column>
-    <column id="331" parent="24" name="end_card_num">
-      <comment>结束卡号</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(20)|0</data-type>
-    </column>
-    <column id="332" parent="24" name="card_quantity">
-      <comment>卡数量</comment>
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="333" parent="24" name="dy_st">
-      <comment>配送状态  1 正在配送 2 已收到  7拒收 8 退回 9 遗失</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="334" parent="24" name="dy_user">
-      <comment>配送登记人员</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="335" parent="24" name="dy_num">
-      <comment>配送单号</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="336" parent="24" name="dy_dt">
-      <comment>配送时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="337" parent="24" name="dy_inst_nm">
-      <comment>配送机构名称  顺丰 申通  邮政等</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(128)|0</data-type>
-    </column>
-    <column id="338" parent="24" name="dy_cm_dt">
-      <comment>收货完成时间</comment>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="339" parent="24" name="dy_memo">
-      <comment>备注</comment>
-      <data-type>varchar(512)|0</data-type>
-    </column>
-    <column id="340" parent="24" name="dy_tp">
-      <comment>配送类型 00 卡商配送给超市 01 超市配送给地区 02 地区配送给门店 03 卡商配送到地区 04 卡商配送到门店 05 门店配送给用户</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(2)|0</data-type>
-    </column>
-    <key id="341" parent="24" name="PRIMARY">
-      <columns>dy_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="342" parent="25" name="extend_id">
-      <mandatory>1</mandatory>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="343" parent="25" name="st_card_no">
-      <comment>起始卡号</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="344" parent="25" name="end_card_no">
-      <comment>结束卡号</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="345" parent="25" name="card_num">
-      <comment>卡数量</comment>
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="346" parent="25" name="card_validate">
-      <comment>新有效期时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="347" parent="25" name="ct_dm">
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="348" parent="25" name="register_user">
-      <comment>登记员</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="349" parent="25" name="check_user">
-      <comment>审核员</comment>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="350" parent="25" name="lt_dm">
-      <comment>最后更新信息</comment>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="351" parent="25" name="extend_st">
-      <comment>0 展期成功 1 待审核   9 审核失败</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="352" parent="25" name="demo">
-      <comment>备注</comment>
-      <data-type>varchar(512)|0</data-type>
-    </column>
-    <key id="353" parent="25" name="PRIMARY">
-      <columns>extend_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="354" parent="26" name="card_operate_id">
-      <comment>id</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="355" parent="26" name="card_operate_type">
-      <comment>操作类型  01挂失 ;02 解挂  ;03冻结；04解冻 05退卡 06密码重置 07卡片展期 08卡卡出账 09 卡卡入账,10充值,11绑卡，12解绑</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(2)|0</data-type>
-    </column>
-    <column id="356" parent="26" name="card_operate_time">
-      <comment>操作时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="357" parent="26" name="card_operate_creator">
-      <comment>操作人</comment>
-      <data-type>varchar(256)|0</data-type>
-    </column>
-    <column id="358" parent="26" name="card_operate_inst_id">
-      <comment>操作人机构</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="359" parent="26" name="cd_code">
-      <comment>卡号</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="360" parent="26" name="cd_code_inst_id">
-      <comment>卡片被操作是所在机构</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="361" parent="26" name="card_operate_memo">
-      <comment>备注</comment>
-      <data-type>varchar(512)|0</data-type>
-    </column>
-    <column id="362" parent="26" name="certificates_num">
-      <comment>证件号</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="363" parent="26" name="certificates_type">
-      <comment>证件类型 01、身份证 02、护照 03、驾驶证</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="364" parent="26" name="check_inst_id">
-      <comment>审核人机构</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <key id="365" parent="26" name="PRIMARY">
-      <columns>card_operate_id
-card_operate_time</columns>
-      <primary>1</primary>
-    </key>
-    <column id="366" parent="27" name="cord_id">
-      <comment>主键</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="367" parent="27" name="make_id">
-      <comment>制卡主键ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="368" parent="27" name="st_card_no">
-      <comment>起始卡号</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="369" parent="27" name="end_card_no">
-      <comment>结束卡号</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="370" parent="27" name="step_no">
-      <comment>偏移量，步长</comment>
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-      <default-expression>&apos;1&apos;</default-expression>
-    </column>
-    <column id="371" parent="27" name="card_num">
-      <comment>卡数量</comment>
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="372" parent="27" name="cord_st">
-      <comment>0 配送完成  1待确认制卡  2正在制卡 3 设置配送   9 拒绝制卡</comment>
-      <mandatory>1</mandatory>
-      <data-type>char(1)|0</data-type>
-    </column>
-    <column id="373" parent="27" name="ct_dm">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="374" parent="27" name="dy_dm">
-      <comment>配送时间</comment>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="375" parent="27" name="lt_dm">
-      <comment>配送确认时间，拒绝时间</comment>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="376" parent="27" name="register_user">
-      <comment>登记用户（创建用户）</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="377" parent="27" name="check_user">
-      <comment>配送确认用户或者拒绝制卡设置用户</comment>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="378" parent="27" name="dy_user">
-      <comment>配送用户</comment>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="379" parent="27" name="card_mcht_msg">
-      <comment>卡商留言</comment>
-      <data-type>varchar(512)|0</data-type>
-    </column>
-    <column id="380" parent="27" name="sys_msg">
-      <comment>运营者留言</comment>
-      <data-type>varchar(512)|0</data-type>
-    </column>
-    <column id="381" parent="27" name="demo">
-      <comment>订单备注</comment>
-      <data-type>varchar(512)|0</data-type>
-    </column>
-    <column id="382" parent="27" name="apply_inst_id">
-      <comment>申请机构</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="383" parent="27" name="appoint_mchtcard">
-      <comment>所属卡商</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="384" parent="27" name="receive_inst">
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <key id="385" parent="27" name="PRIMARY">
-      <columns>cord_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="386" parent="28" name="rec_id">
-      <comment>充值Id</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="387" parent="28" name="st">
-      <comment>状态 0 待审核   1审核通过  2 审核不通过</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="388" parent="28" name="st_card_no">
-      <comment>起始卡号</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="389" parent="28" name="end_card_no">
-      <comment>结束卡号</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="390" parent="28" name="seq_step">
-      <comment>步长</comment>
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="391" parent="28" name="rec_num">
-      <comment>数量</comment>
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="392" parent="28" name="rec_way">
-      <comment>充值途径 01 现金 02银行卡 03微信 04 支付宝</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(2)|0</data-type>
-    </column>
-    <column id="393" parent="28" name="inst_id">
-      <comment>归属机构</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="394" parent="28" name="creator">
-      <comment>录入员</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="395" parent="28" name="check_usr">
-      <comment>审核人</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="396" parent="28" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="397" parent="28" name="last_modify_time">
-      <comment>最后修改时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="398" parent="28" name="single_card_amt">
-      <comment>单张卡面金额金额</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="399" parent="28" name="all_card_amt">
-      <comment>充值总金额</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="400" parent="28" name="memo">
-      <comment>备注</comment>
-      <data-type>varchar(512)|0</data-type>
-    </column>
-    <column id="401" parent="28" name="check_inst_id">
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <key id="402" parent="28" name="PRIMARY">
-      <columns>rec_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="403" parent="29" name="rec_id">
-      <comment>ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="404" parent="29" name="all_card_amt">
-      <comment>充值总额</comment>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="405" parent="29" name="check_usr">
-      <comment>审核人</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="406" parent="29" name="create_time">
-      <comment>创建时间</comment>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="407" parent="29" name="creator">
-      <comment>创建人</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="408" parent="29" name="file_url">
-      <comment>文件地址</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="409" parent="29" name="inst_id">
-      <comment>上送机构</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="410" parent="29" name="last_modify_time">
-      <comment>最后操作时间</comment>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="411" parent="29" name="memo">
-      <comment>备注</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="412" parent="29" name="rec_num">
-      <comment>充值数量</comment>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="413" parent="29" name="st">
-      <comment>审核 0 待审核 1审核通 2审核不通过</comment>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="414" parent="29" name="check_inst_id">
-      <comment>审核人机构</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <key id="415" parent="29" name="PRIMARY">
-      <columns>rec_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="416" parent="30" name="rec_id">
-      <comment>ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="417" parent="30" name="all_card_amt">
-      <comment>充值总额</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="418" parent="30" name="check_usr">
-      <comment>审核人</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="419" parent="30" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="420" parent="30" name="creator">
-      <comment>创建人</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="421" parent="30" name="file_url">
-      <comment>文件地址</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="422" parent="30" name="inst_id">
-      <comment>上送机构</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="423" parent="30" name="last_modify_time">
-      <comment>最后操作时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="424" parent="30" name="memo">
-      <comment>备注</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="425" parent="30" name="rec_num">
-      <comment>充值数量</comment>
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="426" parent="30" name="st">
-      <comment>审核 0 待审核 1审核通 2审核不通过</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="427" parent="30" name="check_inst_id">
-      <comment>审核人机构</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="428" parent="30" name="rec_way">
-      <comment>充值途径 1 现金 2银行卡 3微信 4 支付宝</comment>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <key id="429" parent="30" name="PRIMARY">
-      <columns>rec_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="430" parent="31" name="id">
-      <comment>主键</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="431" parent="31" name="rec_id">
-      <comment>文件充值记录Id</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="432" parent="31" name="cd_code">
-      <comment>卡号</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(30)|0</data-type>
-    </column>
-    <column id="433" parent="31" name="before_card_recharge_amt">
-      <comment>充值前的卡片金额</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="434" parent="31" name="after_card_recharge_amt">
-      <comment>充值后的卡片金额</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="435" parent="31" name="recharge_amt">
-      <comment>充值金额</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="436" parent="31" name="memo">
-      <comment>备注</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="437" parent="31" name="file_url">
-      <comment>文件路径</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(256)|0</data-type>
-    </column>
-    <column id="438" parent="31" name="inst_id">
-      <comment>操作机构</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="439" parent="31" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="440" parent="31" name="rec_way">
-      <comment>充值途径 1 现金 2银行卡 3微信 4 支付宝</comment>
-      <data-type>varchar(2)|0</data-type>
-    </column>
-    <key id="441" parent="31" name="PRIMARY">
-      <columns>id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="442" parent="32" name="trans_id">
-      <comment>id</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="443" parent="32" name="check_usr">
-      <comment>审核人</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="444" parent="32" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="445" parent="32" name="creator">
-      <comment>创建人</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="446" parent="32" name="in_card_all_amt">
-      <comment>转入卡全部金额</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="447" parent="32" name="in_card_max_amt">
-      <comment>转入卡最大限额</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="448" parent="32" name="in_card_no">
-      <comment>转入卡号卡</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="449" parent="32" name="inst_id">
-      <comment>创建机构</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="450" parent="32" name="last_modify_time">
-      <comment>最后修改时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="451" parent="32" name="memo">
-      <comment>备注</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="452" parent="32" name="out_amt">
-      <comment>转账金额</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="453" parent="32" name="out_card_amt">
-      <comment>转出卡可用金额</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="454" parent="32" name="out_card_no">
-      <comment>转出卡卡号</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="455" parent="32" name="st">
-      <comment>状态 0 待审核   1审核通过  2 审核不通过</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="456" parent="32" name="trans_time">
-      <comment>转账日期（审核通过日期）</comment>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="457" parent="32" name="check_inst_id">
-      <comment>审核人所在机构</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <key id="458" parent="32" name="PRIMARY">
-      <columns>trans_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="459" parent="33" name="bin_id">
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="460" parent="33" name="inst_id">
-      <comment>机构号</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="461" parent="33" name="inst_name">
-      <comment>机构名称</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(128)|0</data-type>
-    </column>
-    <column id="462" parent="33" name="card_name">
-      <comment>卡名称</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(128)|0</data-type>
-    </column>
-    <column id="463" parent="33" name="apply_amt">
-      <comment>是否支持ATM机 0支持 1不支持</comment>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="464" parent="33" name="apply_pos">
-      <comment>是否支持POS机 0支持 1不支持</comment>
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="465" parent="33" name="track_inf_1_a">
-      <comment>a是否存在磁道1    0 存在 1 不存在</comment>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="466" parent="33" name="track_inf_1_b">
-      <comment>磁道1起始字节</comment>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="467" parent="33" name="track_inf_1_c">
-      <comment>磁道1长度</comment>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="468" parent="33" name="track_inf_2_a">
-      <comment>是否存在磁道2   0 存在 1 不存在</comment>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="469" parent="33" name="track_inf_2_b">
-      <comment>磁道2起始字节</comment>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="470" parent="33" name="track_inf_2_c">
-      <comment>磁道2长度</comment>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="471" parent="33" name="track_inf_3_a">
-      <comment>是否存在磁道3   0 存在 1 不存在</comment>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="472" parent="33" name="track_inf_3_b">
-      <comment>磁道3起始字节</comment>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="473" parent="33" name="track_inf_3_c">
-      <comment>磁道3长度</comment>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="474" parent="33" name="acct_inf_1">
-      <comment>主账号读取磁道</comment>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="475" parent="33" name="acct_inf_2">
-      <comment>主账号起始字节</comment>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="476" parent="33" name="acct_inf_3">
-      <comment>卡号长度</comment>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="477" parent="33" name="acct_inf_4">
-      <comment>主账号范例</comment>
-      <data-type>varchar(20)|0</data-type>
-    </column>
-    <column id="478" parent="33" name="card_bin_1">
-      <comment>卡BIN发卡机构读取磁道</comment>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="479" parent="33" name="card_bin_2">
-      <comment>卡BIN读取磁道起始字节</comment>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="480" parent="33" name="card_bin_3">
-      <comment>卡BIN发卡机构长度</comment>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="481" parent="33" name="card_bin">
-      <comment>卡BIN值</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(12)|0</data-type>
-    </column>
-    <column id="482" parent="33" name="card_type">
-      <comment>卡种 3实体卡 4虚拟  01借记卡 02 贷记卡</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="483" parent="33" name="card_st">
-      <comment>状态 0 正常  8 黑名单 9 注销</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="484" parent="33" name="create_time">
-      <comment>创建日期</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="485" parent="33" name="last_modify_time">
-      <comment>最后修改日期</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="486" parent="33" name="support_recharge">
-      <comment>是否支持充值 0 支持 1不支持</comment>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="487" parent="33" name="apply_range">
-      <comment>应用范围，组织机构</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="488" parent="33" name="bin_card_material">
-      <comment>卡介质    00 CPU卡 01 M1卡 02 磁条卡，03:4442 卡</comment>
-      <data-type>varchar(2)|0</data-type>
-    </column>
-    <column id="489" parent="33" name="st">
-      <comment>0 待审核 1审核通过 2 审核不过</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <index id="490" parent="33" name="UNQ_CARD_BIN">
-      <columns>card_bin</columns>
-      <desc-columns></desc-columns>
-      <unique>1</unique>
-    </index>
-    <key id="491" parent="33" name="PRIMARY">
-      <columns>bin_id</columns>
-      <primary>1</primary>
-    </key>
-    <key id="492" parent="33" name="UNQ_CARD_BIN">
-      <columns>card_bin</columns>
-      <underlying-index>UNQ_CARD_BIN</underlying-index>
-    </key>
-    <column id="493" parent="34" name="log_id">
-      <comment>主键</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="494" parent="34" name="card_id">
-      <comment>卡号</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="495" parent="34" name="card_val_amt">
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="496" parent="34" name="card_frz_amt">
-      <comment>冻结金额</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="497" parent="34" name="afcard_val_amt">
-      <comment>交易后金额</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="498" parent="34" name="afcard_frz_amt">
-      <comment>交易后冻结金额</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="499" parent="34" name="trans_amt">
-      <comment>交易金额 -为消费 +为充值</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="500" parent="34" name="refid">
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="501" parent="34" name="memo">
-      <comment>备注</comment>
-      <data-type>varchar(512)|0</data-type>
-    </column>
-    <column id="502" parent="34" name="log_dt">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="503" parent="34" name="card_type">
-      <comment>01实体卡  02  虚拟卡</comment>
-      <data-type>varchar(2)|0</data-type>
-      <default-expression>&apos;01&apos;</default-expression>
-    </column>
-    <column id="504" parent="34" name="acct_id">
-      <comment>账户号</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <key id="505" parent="34" name="PRIMARY">
-      <columns>log_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="506" parent="35" name="cn_id">
-      <comment>主键</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="507" parent="35" name="cn_code">
-      <comment>规则代码</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="508" parent="35" name="cn_nm">
-      <mandatory>1</mandatory>
-      <data-type>varchar(128)|0</data-type>
-    </column>
-    <column id="509" parent="35" name="cn_cd_type">
-      <comment>卡种位数</comment>
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="510" parent="35" name="cn_nm_lth">
-      <comment>卡号长度</comment>
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="511" parent="35" name="cn_card_bin">
-      <comment>卡BIN值</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(20)|0</data-type>
-    </column>
-    <column id="512" parent="35" name="cn_fv_pst_lth">
-      <comment>面值位数</comment>
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="513" parent="35" name="cn_seq_lth">
-      <comment>序号位数</comment>
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="514" parent="35" name="cn_chk">
-      <comment>校验证</comment>
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-      <default-expression>&apos;1&apos;</default-expression>
-    </column>
-    <column id="515" parent="35" name="cn_memo">
-      <comment>备注</comment>
-      <data-type>varchar(256)|0</data-type>
-    </column>
-    <column id="516" parent="35" name="cn_dt">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="517" parent="35" name="cn_st">
-      <comment>0启用 1禁用</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <index id="518" parent="35" name="code_seq">
-      <columns>cn_code</columns>
-      <desc-columns></desc-columns>
-      <unique>1</unique>
-    </index>
-    <key id="519" parent="35" name="PRIMARY">
-      <columns>cn_id</columns>
-      <primary>1</primary>
-    </key>
-    <key id="520" parent="35" name="code_seq">
-      <columns>cn_code</columns>
-      <underlying-index>code_seq</underlying-index>
-    </key>
-    <column id="521" parent="36" name="id">
-      <comment>主键</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="522" parent="36" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="523" parent="36" name="last_modify_time">
-      <comment>最后修改时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="524" parent="36" name="expire">
-      <comment>失效时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="525" parent="36" name="cart_key">
-      <comment>购物车ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="526" parent="36" name="acct_id">
-      <comment>账户ID</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <index id="527" parent="36" name="UQ_PCARD_CART_KEY">
-      <columns>cart_key</columns>
-      <desc-columns></desc-columns>
-      <unique>1</unique>
-    </index>
-    <key id="528" parent="36" name="PRIMARY">
-      <columns>id</columns>
-      <primary>1</primary>
-    </key>
-    <key id="529" parent="36" name="UQ_PCARD_CART_KEY">
-      <columns>cart_key</columns>
-      <underlying-index>UQ_PCARD_CART_KEY</underlying-index>
-    </key>
-    <column id="530" parent="37" name="id">
-      <comment>主键</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="531" parent="37" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="532" parent="37" name="last_modify_time">
-      <comment>最后修改时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="533" parent="37" name="vcard_num">
-      <comment>数量</comment>
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="534" parent="37" name="cart_key">
-      <comment>购物车ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="535" parent="37" name="vcard_type_id">
-      <comment>卡类型ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <index id="536" parent="37" name="FK_COM">
-      <columns>cart_key</columns>
-      <desc-columns></desc-columns>
-    </index>
-    <key id="537" parent="37" name="PRIMARY">
-      <columns>id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="538" parent="38" name="customer_information_id">
-      <comment>Id</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="539" parent="38" name="customer_name">
-      <comment>客户名称</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="540" parent="38" name="customer_english_name">
-      <comment>客户英文名称</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="541" parent="38" name="customer_gender">
-      <comment>客户性别   01、男  02、女</comment>
-      <data-type>varchar(2)|0</data-type>
-    </column>
-    <column id="542" parent="38" name="customer_born_date">
-      <comment>出生日期</comment>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="543" parent="38" name="customer_type">
-      <comment>客户类型 01、个人 02、集团   03、家庭</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(2)|0</data-type>
-    </column>
-    <column id="544" parent="38" name="customer_email">
-      <comment>邮箱</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(50)|0</data-type>
-    </column>
-    <column id="545" parent="38" name="customer_mobile_phone">
-      <comment>手机</comment>
-      <data-type>varchar(20)|0</data-type>
-    </column>
-    <column id="546" parent="38" name="customer_tele_phone">
-      <comment>电话</comment>
-      <data-type>varchar(30)|0</data-type>
-    </column>
-    <column id="547" parent="38" name="customer_certificate_type">
-      <comment>证件类型    01、身份证  02、护照   03、驾驶证</comment>
-      <data-type>varchar(2)|0</data-type>
-    </column>
-    <column id="548" parent="38" name="customer_certificate_num">
-      <comment>证件号码</comment>
-      <data-type>varchar(30)|0</data-type>
-    </column>
-    <column id="549" parent="38" name="creator">
-      <comment>录入员</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="550" parent="38" name="memo">
-      <comment>备注</comment>
-      <data-type>varchar(512)|0</data-type>
-    </column>
-    <column id="551" parent="38" name="customer_province">
-      <comment>客户省份</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="552" parent="38" name="customer_city">
-      <comment>客户城市</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="553" parent="38" name="customer_addres">
-      <comment>客户详细地址</comment>
-      <data-type>varchar(512)|0</data-type>
-    </column>
-    <column id="554" parent="38" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="555" parent="38" name="last_modify_time">
-      <comment>最后修改时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="556" parent="38" name="legal_name">
-      <comment>法人代表姓名</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="557" parent="38" name="legal_certificate_num">
-      <comment>法人证件号</comment>
-      <data-type>varchar(30)|0</data-type>
-    </column>
-    <column id="558" parent="38" name="legal_certificate_expiry_date">
-      <comment>法人证件有效期</comment>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="559" parent="38" name="business_license_num">
-      <comment>营业执照号码</comment>
-      <data-type>varchar(30)|0</data-type>
-    </column>
-    <key id="560" parent="38" name="PRIMARY">
-      <columns>customer_information_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="561" parent="39" name="gift_id">
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="562" parent="39" name="giver_acct_id">
-      <comment>赠送者账户ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="563" parent="39" name="accepter_acct_id">
-      <comment>接收者账户ID</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="564" parent="39" name="vcard_id">
-      <comment>卡ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="565" parent="39" name="vcard_bal_amt">
-      <comment>卡余额</comment>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="566" parent="39" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="567" parent="39" name="last_modify_time">
-      <comment>更新时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="568" parent="39" name="st">
-      <comment>0有效记录 1无效记录</comment>
-      <mandatory>1</mandatory>
-      <data-type>char(1)|0</data-type>
-    </column>
-    <column id="569" parent="39" name="version">
-      <comment>版本</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="570" parent="39" name="gift_message">
-      <comment>赠送留言</comment>
-      <data-type>varchar(500)|0</data-type>
-    </column>
-    <column id="571" parent="39" name="accepter_mobile">
-      <comment>收卡人手机号</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="572" parent="39" name="accepter_nm">
-      <comment>收卡人姓名</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="573" parent="39" name="giver_nm">
-      <comment>赠送者姓名</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="574" parent="39" name="is_agree">
-      <comment>0 待接收 1已接收 2拒绝接收</comment>
-      <mandatory>1</mandatory>
-      <data-type>char(1)|0</data-type>
-      <default-expression>&apos;0&apos;</default-expression>
-    </column>
-    <column id="575" parent="39" name="giver_mobile">
-      <comment>赠送者手机号</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="576" parent="39" name="vtype_nm">
-      <comment>卡类型名称</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="577" parent="39" name="vtype_image">
-      <comment>卡图片</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="578" parent="39" name="use_acct_id">
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="579" parent="39" name="vtype_amt">
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="580" parent="39" name="inst_id">
-      <comment>商户组织机构Id(数据隔离)</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="581" parent="39" name="invalid_time">
-      <comment>失效时间</comment>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="582" parent="39" name="order_id">
-      <comment>订单id</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <key id="583" parent="39" name="PRIMARY">
-      <columns>gift_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="584" parent="40" name="inst_id">
-      <comment>主键</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-      <default-expression>&apos;0&apos;</default-expression>
-    </column>
-    <column id="585" parent="40" name="inst_code">
-      <comment>组织结构代码</comment>
-      <data-type>varchar(8)|0</data-type>
-    </column>
-    <column id="586" parent="40" name="inst_name">
-      <comment>组织结构名称</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(128)|0</data-type>
-    </column>
-    <column id="587" parent="40" name="inst_sort">
-      <comment>组织结构排序</comment>
-      <mandatory>1</mandatory>
-      <data-type>decimal(5)|0</data-type>
-      <default-expression>&apos;0&apos;</default-expression>
-    </column>
-    <column id="588" parent="40" name="inst_parent_id">
-      <comment>上级组织结构ID</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="589" parent="40" name="inst_memo">
-      <comment>备注</comment>
-      <data-type>varchar(512)|0</data-type>
-    </column>
-    <column id="590" parent="40" name="is_merchant">
-      <comment>0:组织机构 1商户</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-      <default-expression>&apos;0&apos;</default-expression>
-    </column>
-    <index id="591" parent="40" name="UNQ_inst_code">
-      <columns>inst_code</columns>
-      <desc-columns></desc-columns>
-      <unique>1</unique>
-    </index>
-    <key id="592" parent="40" name="PRIMARY">
-      <columns>inst_id</columns>
-      <primary>1</primary>
-    </key>
-    <key id="593" parent="40" name="UNQ_inst_code">
-      <columns>inst_code</columns>
-      <underlying-index>UNQ_inst_code</underlying-index>
-    </key>
-    <column id="594" parent="41" name="invented_card_make_id">
-      <comment>Id</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="595" parent="41" name="invented_card_make_vtype_id">
-      <comment>虚拟卡卡类型</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="596" parent="41" name="invented_card_make_des">
-      <comment>描述</comment>
-      <data-type>varchar(512)|0</data-type>
-    </column>
-    <column id="597" parent="41" name="invented_card_make_num">
-      <comment>制卡数量</comment>
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="598" parent="41" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="599" parent="41" name="last_modify_time">
-      <comment>最后修改时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="600" parent="41" name="creator">
-      <comment>创建人</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(128)|0</data-type>
-    </column>
-    <column id="601" parent="41" name="check_usr">
-      <comment>审核人</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(128)|0</data-type>
-    </column>
-    <column id="602" parent="41" name="st">
-      <comment>状态0:待审核,1:审核通过</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="603" parent="41" name="institution_id">
-      <comment>所属机构</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="604" parent="41" name="seq_step">
-      <comment>步长</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="605" parent="41" name="begin_cd_code">
-      <comment>起始卡号</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="606" parent="41" name="end_cd_code">
-      <comment>结束卡号</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="607" parent="41" name="invented_card_make_type">
-      <comment>卡种类 01：实体卡，02：虚拟卡</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(2)|0</data-type>
-    </column>
-    <column id="608" parent="41" name="apply_inst_id">
-      <comment>申请机构Id</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="609" parent="41" name="creator_name">
-      <comment>操作人姓名</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(128)|0</data-type>
-    </column>
-    <column id="610" parent="41" name="receive_inst">
-      <comment>接收机构</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="611" parent="41" name="seq_begin">
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <key id="612" parent="41" name="PRIMARY">
-      <columns>invented_card_make_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="613" parent="42" name="cm_id">
-      <comment>卡商ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="614" parent="42" name="cm_nm">
-      <comment>商户名称</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="615" parent="42" name="cm_addr">
-      <comment>商户地址</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(500)|0</data-type>
-    </column>
-    <column id="616" parent="42" name="cm_tel">
-      <comment>商户电话</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="617" parent="42" name="cm_fax">
-      <comment>商户传真</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="618" parent="42" name="cm_url">
-      <comment>商户主页</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="619" parent="42" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="620" parent="42" name="last_modify_time">
-      <comment>最后修改时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="621" parent="42" name="creator">
-      <comment>创建人</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="622" parent="42" name="check_usr">
-      <comment>审核人</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="623" parent="42" name="st">
-      <comment>状态(0:待审核,1:审核通过2:审核失败)</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="624" parent="42" name="cm_st">
-      <comment>0正常  1禁用</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-      <default-expression>&apos;0&apos;</default-expression>
-    </column>
-    <column id="625" parent="42" name="cm_contact">
-      <comment>联系人</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="626" parent="42" name="cm_short_nm">
-      <comment>商户简称</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="627" parent="42" name="cm_type">
-      <comment>01 事业单位 ,02 企业单位 03个体工商户</comment>
-      <data-type>varchar(4)|0</data-type>
-    </column>
-    <column id="628" parent="42" name="cm_regnm">
-      <comment>工商注册名称</comment>
-      <data-type>varchar(256)|0</data-type>
-    </column>
-    <column id="629" parent="42" name="cm_scope">
-      <comment>经营范围</comment>
-      <data-type>varchar(256)|0</data-type>
-    </column>
-    <column id="630" parent="42" name="cm_legal">
-      <comment>法人名称</comment>
-      <data-type>varchar(36)|0</data-type>
-    </column>
-    <column id="631" parent="42" name="cm_legal_cert_type">
-      <comment>法人证件类型 01身份证 02台胞证 02港澳居民通行证</comment>
-      <data-type>varchar(36)|0</data-type>
-    </column>
-    <column id="632" parent="42" name="cm_legal_cert_no">
-      <comment>法人证件号</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="633" parent="42" name="cm_about">
-      <comment>商户简介</comment>
-      <data-type>varchar(512)|0</data-type>
-    </column>
-    <column id="634" parent="42" name="cm_zipcode">
-      <comment>邮编</comment>
-      <data-type>varchar(12)|0</data-type>
-    </column>
-    <column id="635" parent="42" name="cm_bus_no">
-      <comment>营业执照号</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="636" parent="42" name="cm_tax_no">
-      <comment>税务登记证号</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="637" parent="42" name="cm_org_no">
-      <comment>组织机构代码</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="638" parent="42" name="cm_reg_fund">
-      <comment>注册资金</comment>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="639" parent="42" name="cm_act_name">
-      <comment>主账户开户名</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="640" parent="42" name="cm_act_openid">
-      <comment>主账户开户行</comment>
-      <data-type>varchar(256)|0</data-type>
-    </column>
-    <column id="641" parent="42" name="cm_act_no">
-      <comment>主账户开户账号</comment>
-      <data-type>varchar(20)|0</data-type>
-    </column>
-    <column id="642" parent="42" name="cm_email">
-      <comment>商户邮箱</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(100)|0</data-type>
-    </column>
-    <column id="643" parent="42" name="cm_qq">
-      <comment>商户QQ/MSN</comment>
-      <data-type>varchar(100)|0</data-type>
-    </column>
-    <column id="644" parent="42" name="cm_province">
-      <comment>商户省份</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(80)|0</data-type>
-    </column>
-    <column id="645" parent="42" name="cm_city">
-      <comment>商户城市</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(80)|0</data-type>
-    </column>
-    <column id="646" parent="42" name="cm_bus_year">
-      <comment>经营年限</comment>
-      <data-type>decimal(10)|0</data-type>
-    </column>
-    <column id="647" parent="42" name="cm_bus_place">
-      <comment>租赁房，自主房</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="648" parent="42" name="cm_clear_rate">
-      <comment>结算扣率</comment>
-      <data-type>decimal(10)|0</data-type>
-    </column>
-    <column id="649" parent="42" name="cm_clear_bond">
-      <comment>交易保证金</comment>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="650" parent="42" name="cm_clear_date">
-      <comment>清算日</comment>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="651" parent="42" name="cm_clear_cycle">
-      <comment>结算周期 日结1，周结2，月节3</comment>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="652" parent="42" name="cm_buscode_photo">
-      <comment>企业营业执照复印件照片</comment>
-      <data-type>varchar(256)|0</data-type>
-    </column>
-    <column id="653" parent="42" name="cm_taxcode_photo">
-      <comment>税务登记证照片</comment>
-      <data-type>varchar(256)|0</data-type>
-    </column>
-    <column id="654" parent="42" name="cm_busplace_photo">
-      <comment>营业场所照片</comment>
-      <data-type>varchar(256)|0</data-type>
-    </column>
-    <column id="655" parent="42" name="cm_orgcode_photo">
-      <comment>组织机构代码照片</comment>
-      <data-type>varchar(256)|0</data-type>
-    </column>
-    <column id="656" parent="42" name="cm_legalcert_photo">
-      <comment>法人身份证照片</comment>
-      <data-type>varchar(256)|0</data-type>
-    </column>
-    <column id="657" parent="42" name="cm_openbank_photo">
-      <comment>开户许可证照片</comment>
-      <data-type>varchar(256)|0</data-type>
-    </column>
-    <column id="658" parent="42" name="cm_legalbank_photo">
-      <comment>法人或者公司银行卡照片</comment>
-      <data-type>varchar(256)|0</data-type>
-    </column>
-    <key id="659" parent="42" name="PRIMARY">
-      <columns>cm_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="660" parent="43" name="menu_id">
-      <comment>菜单ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="661" parent="43" name="menu_code">
-      <comment>菜单代码(包含排序)</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="662" parent="43" name="menu_url">
-      <comment>菜单对应url</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="663" parent="43" name="menu_des">
-      <comment>菜单对应url</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="664" parent="43" name="parent_menu_id">
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-      <default-expression>&apos;-1&apos;</default-expression>
-    </column>
-    <column id="665" parent="43" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="666" parent="43" name="last_modify_time">
-      <comment>最后修改时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="667" parent="43" name="st">
-      <comment>状态(0:可用,1:不可用)</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="668" parent="43" name="menu_icon">
-      <comment>菜单图标</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="669" parent="43" name="menu_level">
-      <comment>菜单级数</comment>
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="670" parent="43" name="menu_sort">
-      <comment>排序字段</comment>
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <key id="671" parent="43" name="PRIMARY">
-      <columns>menu_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="672" parent="44" name="menu_id">
-      <comment>菜单ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="673" parent="44" name="resource_id">
-      <comment>资源ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="674" parent="44" name="create_time">
-      <data-type>timestamp|0</data-type>
-    </column>
-    <column id="675" parent="44" name="last_modify_time">
-      <data-type>timestamp|0</data-type>
-    </column>
-    <key id="676" parent="44" name="PRIMARY">
-      <columns>menu_id
-resource_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="677" parent="45" name="mnt_id">
-      <comment>商户ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="678" parent="45" name="mnt_cd">
-      <comment>商户代码</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="679" parent="45" name="mnt_nm">
-      <comment>商户名称</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="680" parent="45" name="mnt_addr">
-      <comment>商户地址</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(500)|0</data-type>
-    </column>
-    <column id="681" parent="45" name="mnt_tel">
-      <comment>商户电话</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="682" parent="45" name="mnt_fax">
-      <comment>商户传真</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="683" parent="45" name="mnt_url">
-      <comment>商户主页</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="684" parent="45" name="mnt_token">
-      <comment>商户token(特定商户调用接口凭证)</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="685" parent="45" name="mnt_pub_key">
-      <comment>商户公钥（PDM格式），发消息时候用</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(2000)|0</data-type>
-    </column>
-    <column id="686" parent="45" name="mnt_pri_key">
-      <comment>商户私钥（PDM格式），收消息时候用（包含我们自己的公私钥）</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(2000)|0</data-type>
-    </column>
-    <column id="687" parent="45" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="688" parent="45" name="last_modify_time">
-      <comment>最后修改时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="689" parent="45" name="st">
-      <comment>状态(0:可用,1:不可用)</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="690" parent="45" name="mnt_contact">
-      <comment>联系人</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="691" parent="45" name="mnt_short_nm">
-      <comment>商户简称</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="692" parent="45" name="mnt_type">
-      <comment>01 事业单位 ,02 企业单位 03个体工商户</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(4)|0</data-type>
-    </column>
-    <column id="693" parent="45" name="mnt_regnm">
-      <comment>工商注册名称</comment>
-      <data-type>varchar(256)|0</data-type>
-    </column>
-    <column id="694" parent="45" name="mnt_scope">
-      <comment>经营范围</comment>
-      <data-type>varchar(256)|0</data-type>
-    </column>
-    <column id="695" parent="45" name="mnt_legal">
-      <comment>法人名称</comment>
-      <data-type>varchar(36)|0</data-type>
-    </column>
-    <column id="696" parent="45" name="mnt_legal_cert_type">
-      <comment>法人证件类型 01身份证 02台胞证 02港澳居民通行证</comment>
-      <data-type>varchar(36)|0</data-type>
-    </column>
-    <column id="697" parent="45" name="mnt_legal_cert_no">
-      <comment>法人证件号</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="698" parent="45" name="mnt_about">
-      <comment>商户简介</comment>
-      <data-type>varchar(512)|0</data-type>
-    </column>
-    <column id="699" parent="45" name="mnt_zipcode">
-      <comment>邮编</comment>
-      <data-type>varchar(12)|0</data-type>
-    </column>
-    <column id="700" parent="45" name="mnt_bus_no">
-      <comment>营业执照号</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="701" parent="45" name="mnt_tax_no">
-      <comment>税务登记证号</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="702" parent="45" name="mnt_org_no">
-      <comment>组织机构代码</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="703" parent="45" name="mnt_reg_fund">
-      <comment>注册资金</comment>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="704" parent="45" name="mnt_act_name">
-      <comment>主账户开户名</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="705" parent="45" name="mnt_act_openid">
-      <comment>主账户开户行</comment>
-      <data-type>varchar(256)|0</data-type>
-    </column>
-    <column id="706" parent="45" name="mnt_act_no">
-      <comment>主账户开户账号</comment>
-      <data-type>varchar(20)|0</data-type>
-    </column>
-    <column id="707" parent="45" name="mnt_email">
-      <comment>商户邮箱</comment>
-      <data-type>varchar(100)|0</data-type>
-    </column>
-    <column id="708" parent="45" name="mnt_qq">
-      <comment>商户QQ/MSN</comment>
-      <data-type>varchar(100)|0</data-type>
-    </column>
-    <column id="709" parent="45" name="mnt_province">
-      <comment>商户省份</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(80)|0</data-type>
-    </column>
-    <column id="710" parent="45" name="mnt_city">
-      <comment>商户城市</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(80)|0</data-type>
-    </column>
-    <column id="711" parent="45" name="mnt_bus_year">
-      <comment>经营年限</comment>
-      <data-type>decimal(10)|0</data-type>
-    </column>
-    <column id="712" parent="45" name="mnt_bus_place">
-      <comment>租赁房，自主房</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="713" parent="45" name="inst_id">
-      <comment>所属区域组织机构</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="714" parent="45" name="mnt_clear_rate">
-      <comment>结算扣率</comment>
-      <data-type>decimal(10)|0</data-type>
-    </column>
-    <column id="715" parent="45" name="mnt_clear_mcc">
-      <comment>MCC</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(4)|0</data-type>
-    </column>
-    <column id="716" parent="45" name="mnt_clear_bond">
-      <comment>交易保证金</comment>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="717" parent="45" name="mnt_clear_date">
-      <comment>清算日</comment>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="718" parent="45" name="mnt_clear_cycle">
-      <comment>结算周期 日结1，周结2，月节3</comment>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="719" parent="45" name="mnt_buscode_photo">
-      <comment>企业营业执照复印件照片</comment>
-      <data-type>varchar(256)|0</data-type>
-    </column>
-    <column id="720" parent="45" name="mnt_taxcode_photo">
-      <comment>税务登记证照片</comment>
-      <data-type>varchar(256)|0</data-type>
-    </column>
-    <column id="721" parent="45" name="mnt_busplace_photo">
-      <comment>营业场所照片</comment>
-      <data-type>varchar(256)|0</data-type>
-    </column>
-    <column id="722" parent="45" name="mnt_orgcode_photo">
-      <comment>组织机构代码照片</comment>
-      <data-type>varchar(256)|0</data-type>
-    </column>
-    <column id="723" parent="45" name="mnt_legalcert_photo">
-      <comment>法人身份证照片</comment>
-      <data-type>varchar(256)|0</data-type>
-    </column>
-    <column id="724" parent="45" name="mnt_openbank_photo">
-      <comment>开户许可证照片</comment>
-      <data-type>varchar(256)|0</data-type>
-    </column>
-    <column id="725" parent="45" name="mnt_legalbank_photo">
-      <comment>法人或者公司银行卡照片</comment>
-      <data-type>varchar(256)|0</data-type>
-    </column>
-    <column id="726" parent="45" name="self_inst_id">
-      <comment>商户本身的组织机构Id</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <index id="727" parent="45" name="TBL_PCARD_MERCHANT_SELF_INST_ID_UNIQUE">
-      <columns>self_inst_id</columns>
-      <desc-columns></desc-columns>
-      <unique>1</unique>
-    </index>
-    <key id="728" parent="45" name="PRIMARY">
-      <columns>mnt_id</columns>
-      <primary>1</primary>
-    </key>
-    <key id="729" parent="45" name="TBL_PCARD_MERCHANT_SELF_INST_ID_UNIQUE">
-      <columns>self_inst_id</columns>
-      <underlying-index>TBL_PCARD_MERCHANT_SELF_INST_ID_UNIQUE</underlying-index>
-    </key>
-    <column id="730" parent="46" name="mnt_id">
-      <comment>商户ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="731" parent="46" name="mnt_cd">
-      <comment>商户代码</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="732" parent="46" name="mnt_nm">
-      <comment>商户名称</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="733" parent="46" name="mnt_addr">
-      <comment>商户地址</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(500)|0</data-type>
-    </column>
-    <column id="734" parent="46" name="mnt_tel">
-      <comment>商户电话</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="735" parent="46" name="mnt_fax">
-      <comment>商户传真</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="736" parent="46" name="mnt_url">
-      <comment>商户主页</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="737" parent="46" name="mnt_token">
-      <comment>商户token(特定商户调用接口凭证)</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="738" parent="46" name="mnt_pub_key">
-      <comment>商户公钥（PDM格式），发消息时候用</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(2000)|0</data-type>
-    </column>
-    <column id="739" parent="46" name="mnt_pri_key">
-      <comment>商户私钥（PDM格式），收消息时候用（包含我们自己的公私钥）</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(2000)|0</data-type>
-    </column>
-    <column id="740" parent="46" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="741" parent="46" name="last_modify_time">
-      <comment>最后修改时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="742" parent="46" name="creator">
-      <comment>创建人</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="743" parent="46" name="check_usr">
-      <comment>审核人</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="744" parent="46" name="check_type">
-      <comment>状态(0:新增,1:修改，2：删除（逻辑删除）</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="745" parent="46" name="st">
-      <comment>状态(0:待审核,1:审核通过2:审核失败)</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="746" parent="46" name="mnt_st">
-      <comment>0正常  1禁用</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-      <default-expression>&apos;0&apos;</default-expression>
-    </column>
-    <column id="747" parent="46" name="mnt_contact">
-      <comment>联系人</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="748" parent="46" name="mnt_short_nm">
-      <comment>商户简称</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="749" parent="46" name="mnt_type">
-      <comment>01 事业单位 ,02 企业单位 03个体工商户</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(4)|0</data-type>
-    </column>
-    <column id="750" parent="46" name="mnt_regnm">
-      <comment>工商注册名称</comment>
-      <data-type>varchar(256)|0</data-type>
-    </column>
-    <column id="751" parent="46" name="mnt_scope">
-      <comment>经营范围</comment>
-      <data-type>varchar(256)|0</data-type>
-    </column>
-    <column id="752" parent="46" name="mnt_legal">
-      <comment>法人名称</comment>
-      <data-type>varchar(36)|0</data-type>
-    </column>
-    <column id="753" parent="46" name="mnt_legal_cert_type">
-      <comment>法人证件类型 01身份证 02台胞证 02港澳居民通行证</comment>
-      <data-type>varchar(36)|0</data-type>
-    </column>
-    <column id="754" parent="46" name="mnt_legal_cert_no">
-      <comment>法人证件号</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="755" parent="46" name="mnt_about">
-      <comment>商户简介</comment>
-      <data-type>varchar(512)|0</data-type>
-    </column>
-    <column id="756" parent="46" name="mnt_zipcode">
-      <comment>邮编</comment>
-      <data-type>varchar(12)|0</data-type>
-    </column>
-    <column id="757" parent="46" name="mnt_bus_no">
-      <comment>营业执照号</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="758" parent="46" name="mnt_tax_no">
-      <comment>税务登记证号</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="759" parent="46" name="mnt_org_no">
-      <comment>组织机构代码</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="760" parent="46" name="mnt_reg_fund">
-      <comment>注册资金</comment>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="761" parent="46" name="mnt_act_name">
-      <comment>主账户开户名</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="762" parent="46" name="mnt_act_openid">
-      <comment>主账户开户行</comment>
-      <data-type>varchar(256)|0</data-type>
-    </column>
-    <column id="763" parent="46" name="mnt_act_no">
-      <comment>主账户开户账号</comment>
-      <data-type>varchar(20)|0</data-type>
-    </column>
-    <column id="764" parent="46" name="mnt_email">
-      <comment>商户邮箱</comment>
-      <data-type>varchar(100)|0</data-type>
-    </column>
-    <column id="765" parent="46" name="mnt_qq">
-      <comment>商户QQ/MSN</comment>
-      <data-type>varchar(100)|0</data-type>
-    </column>
-    <column id="766" parent="46" name="mnt_province">
-      <comment>商户省份</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(80)|0</data-type>
-    </column>
-    <column id="767" parent="46" name="mnt_city">
-      <comment>商户城市</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(80)|0</data-type>
-    </column>
-    <column id="768" parent="46" name="mnt_bus_year">
-      <comment>经营年限</comment>
-      <data-type>decimal(10)|0</data-type>
-    </column>
-    <column id="769" parent="46" name="mnt_bus_place">
-      <comment>租赁房，自主房</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="770" parent="46" name="inst_id">
-      <comment>所属区域组织机构</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="771" parent="46" name="mnt_clear_rate">
-      <comment>结算扣率</comment>
-      <data-type>decimal(10)|0</data-type>
-    </column>
-    <column id="772" parent="46" name="mnt_clear_mcc">
-      <comment>MCC</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(4)|0</data-type>
-    </column>
-    <column id="773" parent="46" name="mnt_clear_bond">
-      <comment>交易保证金</comment>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="774" parent="46" name="mnt_clear_date">
-      <comment>清算日</comment>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="775" parent="46" name="mnt_clear_cycle">
-      <comment>结算周期 日结1，周结2，月节3</comment>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="776" parent="46" name="mnt_buscode_photo">
-      <comment>企业营业执照复印件照片</comment>
-      <data-type>varchar(256)|0</data-type>
-    </column>
-    <column id="777" parent="46" name="mnt_taxcode_photo">
-      <comment>税务登记证照片</comment>
-      <data-type>varchar(256)|0</data-type>
-    </column>
-    <column id="778" parent="46" name="mnt_busplace_photo">
-      <comment>营业场所照片</comment>
-      <data-type>varchar(256)|0</data-type>
-    </column>
-    <column id="779" parent="46" name="mnt_orgcode_photo">
-      <comment>组织机构代码照片</comment>
-      <data-type>varchar(256)|0</data-type>
-    </column>
-    <column id="780" parent="46" name="mnt_legalcert_photo">
-      <comment>法人身份证照片</comment>
-      <data-type>varchar(256)|0</data-type>
-    </column>
-    <column id="781" parent="46" name="mnt_openbank_photo">
-      <comment>开户许可证照片</comment>
-      <data-type>varchar(256)|0</data-type>
-    </column>
-    <column id="782" parent="46" name="mnt_legalbank_photo">
-      <comment>法人或者公司银行卡照片</comment>
-      <data-type>varchar(256)|0</data-type>
-    </column>
-    <column id="783" parent="46" name="self_inst_id">
-      <comment>本身的组织机构</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <key id="784" parent="46" name="PRIMARY">
-      <columns>mnt_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="785" parent="47" name="id">
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="786" parent="47" name="trans_amt">
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="787" parent="47" name="mnt_id">
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="788" parent="47" name="mnt_nm">
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <key id="789" parent="47" name="PRIMARY">
-      <columns>id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="790" parent="48" name="order_id">
-      <comment>订单Id</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="791" parent="48" name="order_mnt_dt">
-      <comment>原所属商户订单日期(追踪对账用)</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="792" parent="48" name="order_mnt_time">
-      <comment> 原所属商户订单时间(追踪对账用)</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="793" parent="48" name="order_mnt_code">
-      <comment>原所属商户订单代码(追踪对账用)</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="794" parent="48" name="order_dt">
-      <comment>订单日期（yyyyMMdd）</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="795" parent="48" name="order_time">
-      <comment>订单时间（yyyyMMddHHMISS）</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="796" parent="48" name="order_type_id">
-      <comment>订单类型，关键字段，确定订单对账户的加金还是减金</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="797" parent="48" name="acq_acct_id">
-      <comment>订单关联收单账号</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="798" parent="48" name="acq_channel_id">
-      <comment>不同渠道，当订单加金时候（账户充值，购买虚拟卡）填写</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="799" parent="48" name="order_acq_channel_code">
-      <comment>不同渠道的订单号，方便对账</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="800" parent="48" name="acct_id">
-      <comment>订单关联虚拟账号</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="801" parent="48" name="order_amt">
-      <comment>订单总金额，精确到分</comment>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="802" parent="48" name="curr_cd">
-      <comment>币别（默认CNY）</comment>
-      <data-type>varchar(255)|0</data-type>
-      <default-expression>&apos;CNY&apos;</default-expression>
-    </column>
-    <column id="803" parent="48" name="order_st">
-      <mandatory>1</mandatory>
-      <data-type>varchar(2)|0</data-type>
-    </column>
-    <column id="804" parent="48" name="order_resp_cd">
-      <comment>订单交易响应码</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="805" parent="48" name="order_resp_msg">
-      <comment>订单交易响应描述</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(500)|0</data-type>
-    </column>
-    <column id="806" parent="48" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="807" parent="48" name="last_modify_time">
-      <comment>最后修改时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="808" parent="48" name="st">
-      <comment>状态(0:可用,1:不可用)</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="809" parent="48" name="vcard_id">
-      <comment>支付卡号,便于按卡号查询交易记录</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="810" parent="48" name="dis_amt">
-      <comment>优惠金额,便于统计</comment>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="811" parent="48" name="pay_amt">
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="812" parent="48" name="order_mnt_id">
-      <comment>商户号</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="813" parent="48" name="term_id">
-      <comment>终端号</comment>
-      <data-type>varchar(20)|0</data-type>
-    </column>
-    <column id="814" parent="48" name="order_reserved">
-      <comment>保留域</comment>
-      <data-type>varchar(512)|0</data-type>
-    </column>
-    <column id="815" parent="48" name="txn_type">
-      <comment>子交易类型</comment>
-      <data-type>varchar(12)|0</data-type>
-    </column>
-    <column id="816" parent="48" name="resp_st">
-      <comment>00 正常 01 已消费撤销 02 已消费冲正 03 已消费撤销冲正 04 已退货,05退货中</comment>
-      <data-type>varchar(2)|0</data-type>
-      <default-expression>&apos;0&apos;</default-expression>
-    </column>
-    <column id="817" parent="48" name="ref_no">
-      <comment>检索号</comment>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="818" parent="48" name="sources">
-      <comment>来源</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="819" parent="48" name="versions">
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="820" parent="48" name="bank_card">
-      <comment>所属银行卡</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="821" parent="48" name="pay_type">
-      <comment>支付方式 00 钱包余额  01 银行卡 02 微信 03 支付宝 99 POS</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="822" parent="48" name="is_scancode">
-      <comment>是否为扫码订单</comment>
-      <data-type>char(1)|0</data-type>
-    </column>
-    <column id="823" parent="48" name="scancode">
-      <comment>条形码+二维码</comment>
-      <data-type>char(36)|0</data-type>
-    </column>
-    <column id="824" parent="48" name="eancode">
-      <data-type>char(18)|0</data-type>
-    </column>
-    <column id="825" parent="48" name="inst_id">
-      <comment>机构号</comment>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="826" parent="48" name="return_url">
-      <comment>同步返回</comment>
-      <data-type>varchar(512)|0</data-type>
-    </column>
-    <column id="827" parent="48" name="notify_url">
-      <comment>异步通知</comment>
-      <data-type>varchar(512)|0</data-type>
-    </column>
-    <column id="828" parent="48" name="app_id">
-      <comment>应用ID</comment>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <index id="829" parent="48" name="seq_order_mnt_code__id">
-      <columns>order_mnt_dt
-order_mnt_code</columns>
-      <desc-columns></desc-columns>
-      <unique>1</unique>
-    </index>
-    <index id="830" parent="48" name="UNQ_mnt_time">
-      <columns>order_mnt_time</columns>
-      <desc-columns></desc-columns>
-    </index>
-    <key id="831" parent="48" name="PRIMARY">
-      <columns>order_id</columns>
-      <primary>1</primary>
-    </key>
-    <key id="832" parent="48" name="seq_order_mnt_code__id">
-      <columns>order_mnt_dt
-order_mnt_code</columns>
-      <underlying-index>seq_order_mnt_code__id</underlying-index>
-    </key>
-    <column id="833" parent="49" name="order_id">
-      <comment>账户ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="834" parent="49" name="order_mnt_dt">
-      <comment>原所属商户订单日期(追踪对账用)</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="835" parent="49" name="order_mnt_time">
-      <comment> 原所属商户订单时间(追踪对账用)</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="836" parent="49" name="order_mnt_code">
-      <comment>原所属商户订单代码(追踪对账用)</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="837" parent="49" name="order_dt">
-      <comment>订单日期（yyyyMMdd）</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="838" parent="49" name="order_time">
-      <comment>订单时间（yyyyMMddHHMISS）</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="839" parent="49" name="order_type_id">
-      <comment>订单类型，关键字段，确定订单对账户的加金还是减金</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="840" parent="49" name="acq_acct_id">
-      <comment>订单关联收单账号</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="841" parent="49" name="acq_channel_id">
-      <comment>不同渠道，当订单加金时候（账户充值，购买虚拟卡）填写</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="842" parent="49" name="order_acq_channel_code">
-      <comment>不同渠道的订单号，方便对账</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="843" parent="49" name="acct_id">
-      <comment>订单关联虚拟账号</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="844" parent="49" name="order_amt">
-      <comment>订单总金额，精确到分</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="845" parent="49" name="curr_cd">
-      <comment>币别（默认CNY）</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-      <default-expression>&apos;CNY&apos;</default-expression>
-    </column>
-    <column id="846" parent="49" name="order_st">
-      <comment>订单状态 0 操作成功</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="847" parent="49" name="order_resp_cd">
-      <comment>订单交易响应码</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="848" parent="49" name="order_resp_msg">
-      <comment>订单交易响应描述</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(500)|0</data-type>
-    </column>
-    <column id="849" parent="49" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="850" parent="49" name="last_modify_time">
-      <comment>最后修改时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="851" parent="49" name="st">
-      <comment>状态(0:可用,1:不可用)</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="852" parent="49" name="vcard_id">
-      <comment>支付卡号,便于按卡号查询交易记录</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="853" parent="49" name="dis_amt">
-      <comment>优惠金额,便于统计</comment>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="854" parent="49" name="pay_amt">
-      <comment>支付金额,当一个订单需要多张卡支付时使用，支付金额=order_amt时为一次支付的金额</comment>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="855" parent="49" name="order_mnt_id">
-      <comment>商户号</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="856" parent="49" name="term_id">
-      <comment>终端号</comment>
-      <data-type>varchar(8)|0</data-type>
-    </column>
-    <column id="857" parent="49" name="order_reserved">
-      <comment>保留域</comment>
-      <data-type>varchar(512)|0</data-type>
-    </column>
-    <column id="858" parent="49" name="txn_type">
-      <comment>交易类型</comment>
-      <data-type>varchar(12)|0</data-type>
-    </column>
-    <column id="859" parent="49" name="resp_st">
-      <comment>00 正常 01 已消费撤销 02 已消费冲正 03 已消费撤销冲正</comment>
-      <data-type>varchar(2)|0</data-type>
-      <default-expression>&apos;0&apos;</default-expression>
-    </column>
-    <column id="860" parent="49" name="ref_no">
-      <comment>检索号</comment>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <key id="861" parent="49" name="PRIMARY">
-      <columns>order_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="862" parent="50" name="order_type_id">
-      <comment>订单类型ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="863" parent="50" name="order_type_code">
-      <comment>订单类型代码</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="864" parent="50" name="order_type_des">
-      <comment>订单类型描述</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(500)|0</data-type>
-    </column>
-    <column id="865" parent="50" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="866" parent="50" name="last_modify_time">
-      <comment>最后修改时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="867" parent="50" name="st">
-      <comment>状态(0:可用,1:不可用)</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <key id="868" parent="50" name="PRIMARY">
-      <columns>order_type_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="869" parent="51" name="id">
-      <comment>主键</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="870" parent="51" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="871" parent="51" name="last_modify_time">
-      <comment>最后修改时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="872" parent="51" name="amt">
-      <comment>支付金额</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="873" parent="51" name="refund_amt">
-      <comment>退款金额</comment>
-      <data-type>bigint(20)|0</data-type>
-      <default-expression>&apos;0&apos;</default-expression>
-    </column>
-    <column id="874" parent="51" name="fee">
-      <comment>支付手续费</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="875" parent="51" name="pay_type">
-      <comment>支付方式</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="876" parent="51" name="pay_type_name">
-      <comment>支付方式名称</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="877" parent="51" name="order_type">
-      <comment>00 充值 01 普通商品 消费 02 预付费卡 购买 消费</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="878" parent="51" name="acct_id">
-      <comment>账户ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="879" parent="51" name="vcard_id">
-      <comment>卡号</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="880" parent="51" name="order_id">
-      <comment>订单号</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="881" parent="51" name="trans_id">
-      <comment>后端支付订单号</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="882" parent="51" name="status">
-      <comment>支付状态 0 待支付 1支付成功  2支付失败 3支付取消 4有退货</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="883" parent="51" name="goods">
-      <comment>商品信息</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <key id="884" parent="51" name="PRIMARY">
-      <columns>id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="885" parent="52" name="pm_id">
-      <comment>主键</comment>
-      <mandatory>1</mandatory>
-      <data-type>char(36)|0</data-type>
-    </column>
-    <column id="886" parent="52" name="pm_type">
-      <comment>00 钱包余额  01 银行卡 02 微信 03 支付宝</comment>
-      <mandatory>1</mandatory>
-      <data-type>char(2)|0</data-type>
-    </column>
-    <column id="887" parent="52" name="pm_type_nm">
-      <comment>支付方式名称 00 钱包余额 01 银行名称 02 微信 03 支付宝</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="888" parent="52" name="pm_type_id">
-      <comment>支付类型ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="889" parent="52" name="orders">
-      <comment>排序</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="890" parent="52" name="bind_id">
-      <comment>01 银行卡token号 02 微信开放号 默认- 03 支付宝 默认-</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="891" parent="52" name="bind_cert_nm">
-      <comment>绑定证件姓名</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="892" parent="52" name="bind_cert_tp">
-      <comment>绑定身份类型  01：身份证 02：军官证 03：护照 04：回乡证 05：台胞证 06：警官证 07：士兵证 99：其它证件</comment>
-      <data-type>char(2)|0</data-type>
-    </column>
-    <column id="893" parent="52" name="bind_cert_no">
-      <comment>绑定证件号</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="894" parent="52" name="bind_card_no">
-      <comment>绑定卡号</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="895" parent="52" name="bind_card_type">
-      <comment>绑定卡类型 1借记卡2信用卡3预付费卡</comment>
-      <data-type>char(2)|0</data-type>
-    </column>
-    <column id="896" parent="52" name="bind_card_mobile">
-      <comment>手机号码</comment>
-      <data-type>varchar(20)|0</data-type>
-    </column>
-    <column id="897" parent="52" name="acct_id">
-      <comment>钱包账户ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="898" parent="52" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="899" parent="52" name="modify_time">
-      <comment>更新时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="900" parent="52" name="version">
-      <comment>版本</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="901" parent="52" name="bind_info">
-      <comment>绑定信息 限额信息</comment>
-      <data-type>varchar(255)|0</data-type>
-      <default-expression>&apos;&apos;</default-expression>
-    </column>
-    <column id="902" parent="52" name="bind_acct_type">
-      <comment>卡介质类型01：银行卡02：存折03：IC卡04：对公账户取值</comment>
-      <data-type>char(2)|0</data-type>
-    </column>
-    <column id="903" parent="52" name="pm_pay_logo">
-      <comment>付款方式logo</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="904" parent="52" name="bind_card_province">
-      <comment>省份</comment>
-      <data-type>varchar(128)|0</data-type>
-    </column>
-    <column id="905" parent="52" name="bind_card_city">
-      <comment>城市</comment>
-      <data-type>varchar(128)|0</data-type>
-    </column>
-    <key id="906" parent="52" name="PRIMARY">
-      <columns>pm_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="907" parent="53" name="id">
-      <comment>主键</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="908" parent="53" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="909" parent="53" name="last_modify_time">
-      <comment>最后修改时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="910" parent="53" name="account">
-      <comment>收款账号</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="911" parent="53" name="bank">
-      <comment>收款银行</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="912" parent="53" name="operator">
-      <comment>操作员（添加）</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="913" parent="53" name="checker">
-      <comment>操作员（审核）</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="914" parent="53" name="pay_name">
-      <comment>支付名称</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="915" parent="53" name="pay_icon">
-      <comment>支付图标</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="916" parent="53" name="fee">
-      <comment>支付手续费</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="917" parent="53" name="account_name">
-      <comment>收款用户名</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="918" parent="53" name="status">
-      <comment>0 启用 1未启用</comment>
-      <mandatory>1</mandatory>
-      <data-type>char(1)|0</data-type>
-    </column>
-    <column id="919" parent="53" name="pay_des">
-      <comment>支付描述</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="920" parent="53" name="fee_type">
-      <comment>支付手续费类型 0 费率 1笔数</comment>
-      <data-type>char(1)|0</data-type>
-      <default-expression>&apos;0&apos;</default-expression>
-    </column>
-    <key id="921" parent="53" name="PRIMARY">
-      <columns>id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="922" parent="54" name="id">
-      <comment>主键</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="923" parent="54" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="924" parent="54" name="last_modify_time">
-      <comment>最后修改时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="925" parent="54" name="order_amt">
-      <comment>支付总金额=卡总金额+发票税点</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="926" parent="54" name="dis_amt">
-      <comment>优惠金额</comment>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="927" parent="54" name="pay_amt">
-      <comment>已支付金额</comment>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="928" parent="54" name="expire">
-      <comment>失效支付时间</comment>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="929" parent="54" name="status">
-      <comment>0 待支付 1支付完成 2 支付取消</comment>
-      <mandatory>1</mandatory>
-      <data-type>char(1)|0</data-type>
-    </column>
-    <column id="930" parent="54" name="invoice_title">
-      <comment>发票抬头</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="931" parent="54" name="invoice_content">
-      <comment>发票内容</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="932" parent="54" name="invoice_fee">
-      <comment>发票税点   系统设置税点</comment>
-      <data-type>bigint(20)|0</data-type>
-      <default-expression>&apos;0&apos;</default-expression>
-    </column>
-    <column id="933" parent="54" name="is_gift">
-      <comment>是否赠送(0 赠送 1不赠送)</comment>
-      <data-type>char(1)|0</data-type>
-    </column>
-    <column id="934" parent="54" name="acceptor_acct_id">
-      <comment>接收者用户ID</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="935" parent="54" name="acceptor_mobile">
-      <comment>接收者手机号</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="936" parent="54" name="acct_id">
-      <comment>账户ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="937" parent="54" name="order_desc">
-      <comment>备注</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="938" parent="54" name="acceptor_msg">
-      <comment>赠送留言</comment>
-      <data-type>varchar(500)|0</data-type>
-    </column>
-    <column id="939" parent="54" name="acceptor_nm">
-      <comment>接收人姓名</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="940" parent="54" name="giver_nm">
-      <comment>赠送者姓名</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="941" parent="54" name="recipients">
-      <comment>发票收件人</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="942" parent="54" name="address">
-      <comment>发票收件人地址</comment>
-      <data-type>varchar(500)|0</data-type>
-    </column>
-    <column id="943" parent="54" name="postcode">
-      <comment>发票邮政编码</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="944" parent="54" name="is_invoice">
-      <comment>是否申请发票 0 要发票  1不要发票</comment>
-      <data-type>char(1)|0</data-type>
-    </column>
-    <column id="945" parent="54" name="mnt_id">
-      <data-type>varchar(64)|0</data-type>
-      <default-expression>&apos;0405184704124&apos;</default-expression>
-    </column>
-    <key id="946" parent="54" name="PRIMARY">
-      <columns>id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="947" parent="55" name="id">
-      <comment>主键</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="948" parent="55" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="949" parent="55" name="last_modify_time">
-      <comment>最后修改时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="950" parent="55" name="vcard_type_id">
-      <comment>类型ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="951" parent="55" name="vcard_num">
-      <comment>购买数量</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="952" parent="55" name="vcard_amt">
-      <comment>购买价格(单价)</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="953" parent="55" name="order_id">
-      <comment>订单ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="954" parent="55" name="vcard_des">
-      <comment>描述</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <key id="955" parent="55" name="PRIMARY">
-      <columns>id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="956" parent="56" name="resource_id">
-      <comment>资源ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="957" parent="56" name="resource_code">
-      <comment>资源代码(包含排序)</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="958" parent="56" name="resource_url">
-      <comment>资源对应url</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="959" parent="56" name="resource_des">
-      <comment>资源描述</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="960" parent="56" name="create_time">
-      <comment>创建时间</comment>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="961" parent="56" name="last_modify_time">
-      <comment>最后修改时间</comment>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="962" parent="56" name="st">
-      <comment>状态(0:可用,1:不可用)</comment>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="963" parent="56" name="resource_icon">
-      <comment>资源图标</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="964" parent="56" name="resource_use">
-      <comment>前端使用id</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <index id="965" parent="56" name="TBL_PCARD_RESOURCE_RESOURCE_URL">
-      <columns>resource_code</columns>
-      <desc-columns></desc-columns>
-      <unique>1</unique>
-    </index>
-    <key id="966" parent="56" name="PRIMARY">
-      <columns>resource_id</columns>
-      <primary>1</primary>
-    </key>
-    <key id="967" parent="56" name="TBL_PCARD_RESOURCE_RESOURCE_URL">
-      <columns>resource_code</columns>
-      <underlying-index>TBL_PCARD_RESOURCE_RESOURCE_URL</underlying-index>
-    </key>
-    <column id="968" parent="57" name="role_id">
-      <comment>角色ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="969" parent="57" name="role_code">
-      <comment>角色代码</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="970" parent="57" name="role_des">
-      <comment>角色描述</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(500)|0</data-type>
-    </column>
-    <column id="971" parent="57" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="972" parent="57" name="last_modify_time">
-      <comment>最后修改时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="973" parent="57" name="st">
-      <comment>状态(0:可用,1:不可用)</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="974" parent="57" name="role_type">
-      <comment>角色类型  1 管理员 2商户 3卡商</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(2)|0</data-type>
-    </column>
-    <column id="975" parent="57" name="role_inst">
-      <comment>所属机构</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <key id="976" parent="57" name="PRIMARY">
-      <columns>role_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="977" parent="58" name="role_id">
-      <comment>角色ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="978" parent="58" name="menu_id">
-      <comment>菜单ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="979" parent="58" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="980" parent="58" name="last_modify_time">
-      <comment>最后修改时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <key id="981" parent="58" name="PRIMARY">
-      <columns>role_id
-menu_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="982" parent="59" name="role_id">
-      <comment>角色ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="983" parent="59" name="resource_id">
-      <comment>资源ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="984" parent="59" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="985" parent="59" name="last_modify_time">
-      <comment>修改时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <key id="986" parent="59" name="PRIMARY">
-      <columns>role_id
-resource_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="987" parent="60" name="inf_id">
-      <comment>主键ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="988" parent="60" name="ref_no">
-      <comment>资源ID</comment>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="989" parent="60" name="ref_tp">
-      <comment>更新类型</comment>
-      <data-type>varchar(2)|0</data-type>
-    </column>
-    <column id="990" parent="60" name="ref_num">
-      <comment>更新数（正数为入库，负数为出库）</comment>
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="991" parent="60" name="ct_dm">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="992" parent="60" name="demo">
-      <comment> 备注</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(256)|0</data-type>
-    </column>
-    <column id="993" parent="60" name="st_card_no">
-      <comment>起始卡号</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="994" parent="60" name="end_card_no">
-      <comment>终止卡号</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="995" parent="60" name="seq_step">
-      <comment>步长</comment>
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-      <default-expression>&apos;1&apos;</default-expression>
-    </column>
-    <column id="996" parent="60" name="card_amt">
-      <comment>卡面金额</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="997" parent="60" name="inst_id">
-      <comment>库存机构</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="998" parent="60" name="creator">
-      <comment>操作人</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(100)|0</data-type>
-    </column>
-    <column id="999" parent="60" name="out_inst_id">
-      <comment>出库机构</comment>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="1000" parent="60" name="default_ref_num">
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="1001" parent="60" name="st">
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1002" parent="60" name="check_usr">
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1003" parent="60" name="lt_dm">
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="1004" parent="60" name="vcard_make_id">
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <key id="1005" parent="60" name="PRIMARY">
-      <columns>inf_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="1006" parent="61" name="si_id">
-      <comment>主键</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="1007" parent="61" name="inst_id">
-      <comment>组织机构</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="1008" parent="61" name="ck_num">
-      <comment>出库数</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="1009" parent="61" name="rk_num">
-      <comment>入库数</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="1010" parent="61" name="ck_amt">
-      <comment>出库金额</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="1011" parent="61" name="rk_amt">
-      <comment>入库金额</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="1012" parent="61" name="ct_dt">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="1013" parent="61" name="lt_dt">
-      <comment>更新时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="1014" parent="61" name="st">
-      <comment>库存状态</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="1015" parent="61" name="demo">
-      <comment>备注</comment>
-      <data-type>varchar(256)|0</data-type>
-    </column>
-    <key id="1016" parent="61" name="PRIMARY">
-      <columns>si_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="1017" parent="62" name="para_id">
-      <comment>参数ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1018" parent="62" name="para_cd">
-      <comment>参数代码</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1019" parent="62" name="para_nm">
-      <comment>参数名称</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1020" parent="62" name="para_value">
-      <comment>参数数值</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(500)|0</data-type>
-    </column>
-    <column id="1021" parent="62" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="1022" parent="62" name="last_modify_time">
-      <comment>最后修改时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="1023" parent="62" name="st">
-      <comment>状态(0:可用,1:不可用)</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <key id="1024" parent="62" name="PRIMARY">
-      <columns>para_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="1025" parent="63" name="usr_id">
-      <comment>用户ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1026" parent="63" name="usr_code">
-      <comment>用户代码（登陆名）</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1027" parent="63" name="usr_nm">
-      <comment>用户姓名</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1028" parent="63" name="usr_mnt">
-      <comment>用户所属商户</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1029" parent="63" name="usr_role">
-      <comment>用户角色(关联角色表role_id字段)</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1030" parent="63" name="usr_passwd">
-      <comment>用户密码</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1031" parent="63" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="1032" parent="63" name="last_modify_time">
-      <comment>最后修改时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="1033" parent="63" name="st">
-      <comment>状态(0:可用,1:不可用)</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="1034" parent="63" name="login_cnt">
-      <comment>登录次数</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-      <default-expression>&apos;0&apos;</default-expression>
-    </column>
-    <column id="1035" parent="63" name="password_reset">
-      <comment>密码是否被重置（0;初始,1:重置）</comment>
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-      <default-expression>&apos;0&apos;</default-expression>
-    </column>
-    <column id="1036" parent="63" name="usr_identity">
-      <comment>用户身份 1 管理员 2商户 3卡商</comment>
-      <data-type>varchar(2)|0</data-type>
-    </column>
-    <column id="1037" parent="63" name="usr_demo">
-      <comment>备注</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <index id="1038" parent="63" name="unq_usr_code">
-      <columns>usr_code</columns>
-      <desc-columns></desc-columns>
-      <unique>1</unique>
-    </index>
-    <key id="1039" parent="63" name="PRIMARY">
-      <columns>usr_id</columns>
-      <primary>1</primary>
-    </key>
-    <key id="1040" parent="63" name="unq_usr_code">
-      <columns>usr_code</columns>
-      <underlying-index>unq_usr_code</underlying-index>
-    </key>
-    <column id="1041" parent="64" name="theme_id">
-      <comment>主键，主题ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="1042" parent="64" name="theme_code">
-      <comment>卡主题编号（客户端使用、显示使用）</comment>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="1043" parent="64" name="inst_id">
-      <comment>创建卡主题组织机构ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="1044" parent="64" name="usr_code">
-      <comment>用户ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="1045" parent="64" name="parent_id">
-      <comment>上级主题ID 为-1 或者empty时  为一级主题</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(64)|0</data-type>
-      <default-expression>&apos;-1&apos;</default-expression>
-    </column>
-    <column id="1046" parent="64" name="sort">
-      <comment>排序</comment>
-      <mandatory>1</mandatory>
-      <data-type>decimal(5)|0</data-type>
-    </column>
-    <column id="1047" parent="64" name="theme_demo">
-      <comment>备注</comment>
-      <data-type>varchar(512)|0</data-type>
-    </column>
-    <column id="1048" parent="64" name="theme_name">
-      <comment>主题名称</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="1049" parent="64" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="1050" parent="64" name="last_modify_time">
-      <comment>最后修改时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="1051" parent="64" name="st">
-      <comment>0 启用 1 冻结</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="1052" parent="64" name="theme_type">
-      <comment>主题类型 01实体卡 02 虚拟卡</comment>
-      <data-type>varchar(2)|0</data-type>
-    </column>
-    <key id="1053" parent="64" name="PRIMARY">
-      <columns>theme_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="1054" parent="65" name="id">
-      <comment>主键</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-      <sequence-identity>1</sequence-identity>
-    </column>
-    <column id="1055" parent="65" name="create_date">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="1056" parent="65" name="modify_date">
-      <comment>修改时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="1057" parent="65" name="version">
-      <comment>版本</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="1058" parent="65" name="acct_id">
-      <comment>会员ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1059" parent="65" name="orders">
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="1060" parent="65" name="id_type">
-      <comment>证件类型</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1061" parent="65" name="id_name">
-      <comment>证件对应姓名</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1062" parent="65" name="id_num">
-      <comment>证件号</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1063" parent="65" name="bank_id">
-      <comment>开户行号</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1064" parent="65" name="bank_name">
-      <comment>开户行名称</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1065" parent="65" name="bank_card_no">
-      <comment>银行卡号</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1066" parent="65" name="bank_card_mobile">
-      <comment>绑定银行手机号</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1067" parent="65" name="bank_card_type">
-      <comment>银行卡类型</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1068" parent="65" name="unpwd_pay">
-      <comment>免密金额</comment>
-      <mandatory>1</mandatory>
-      <data-type>decimal(21,6)|0</data-type>
-    </column>
-    <column id="1069" parent="65" name="token">
-      <comment>token信息</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1070" parent="65" name="memo">
-      <comment>备注</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1071" parent="65" name="status">
-      <comment>状态 0成功 1失败</comment>
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="1072" parent="65" name="sn">
-      <comment>编号</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1073" parent="65" name="logo">
-      <comment>logo图片</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <key id="1074" parent="65" name="PRIMARY">
-      <columns>id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="1075" parent="66" name="qd_a">
-      <comment>0000</comment>
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-      <default-expression>&apos;0&apos;</default-expression>
-    </column>
-    <column id="1076" parent="66" name="qd_b">
-      <comment>3200</comment>
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-      <default-expression>&apos;0&apos;</default-expression>
-    </column>
-    <column id="1077" parent="66" name="qd_c">
-      <comment>3300</comment>
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-      <default-expression>&apos;0&apos;</default-expression>
-    </column>
-    <column id="1078" parent="66" name="qd_d">
-      <comment>3500</comment>
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-      <default-expression>&apos;0&apos;</default-expression>
-    </column>
-    <column id="1079" parent="66" name="qd_e">
-      <comment>3600</comment>
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-      <default-expression>&apos;0&apos;</default-expression>
-    </column>
-    <column id="1080" parent="66" name="qd_f">
-      <comment>3800</comment>
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-      <default-expression>&apos;0&apos;</default-expression>
-    </column>
-    <column id="1081" parent="66" name="qd_g">
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-      <default-expression>&apos;0&apos;</default-expression>
-    </column>
-    <column id="1082" parent="66" name="total">
-      <comment>这一秒的总TPS</comment>
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-      <default-expression>&apos;0&apos;</default-expression>
-    </column>
-    <column id="1083" parent="66" name="yymmdd">
-      <data-type>varchar(8)|0</data-type>
-    </column>
-    <column id="1084" parent="66" name="hh">
-      <data-type>varchar(2)|0</data-type>
-    </column>
-    <column id="1085" parent="66" name="mm">
-      <data-type>varchar(2)|0</data-type>
-    </column>
-    <column id="1086" parent="66" name="ss">
-      <data-type>varchar(2)|0</data-type>
-    </column>
-    <column id="1087" parent="66" name="datatimes">
-      <data-type>varchar(14)|0</data-type>
-    </column>
-    <column id="1088" parent="67" name="vcard_id">
-      <comment>虚拟卡ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1089" parent="67" name="vcard_make_id">
-      <comment>所属制卡ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1090" parent="67" name="vcard_code">
-      <comment>虚拟卡代码</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1091" parent="67" name="vcard_vtype_id">
-      <comment>虚拟类型代码</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1092" parent="67" name="vcard_amount">
-      <comment>虚拟卡初始金额，精确到分</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="1093" parent="67" name="vcard_bal_amt">
-      <comment>虚拟卡账户余额（包含账户充值和关联虚拟卡总额），精确到分</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="1094" parent="67" name="curr_cd">
-      <comment>币别（默认CNY）</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-      <default-expression>&apos;CNY&apos;</default-expression>
-    </column>
-    <column id="1095" parent="67" name="vcard_bind_st">
-      <comment>状态(0:未绑定,1:绑定 9 待激活,10待制卡)</comment>
-      <data-type>varchar(2)|0</data-type>
-    </column>
-    <column id="1096" parent="67" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="1097" parent="67" name="last_modify_time">
-      <comment>最后修改时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="1098" parent="67" name="st">
-      <comment>状态(0:可用,1:不可用,2废除)</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="1099" parent="67" name="vcard_mnt_id">
-      <comment>所属商户</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1100" parent="67" name="validity_date">
-      <comment>有效期</comment>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="1101" parent="67" name="active_code">
-      <comment>激活码</comment>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="1102" parent="67" name="vcard_frz_amt">
-      <comment>冻结金额</comment>
-      <data-type>bigint(20)|0</data-type>
-      <default-expression>&apos;0&apos;</default-expression>
-    </column>
-    <column id="1103" parent="67" name="order_id">
-      <comment>产生激活码交易订单号</comment>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="1104" parent="67" name="customer_information_id">
-      <comment>绑定客户的ID</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="1105" parent="67" name="vcard_bind_dm">
-      <comment>绑定时间</comment>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="1106" parent="67" name="vcard_apply_range">
-      <comment>使用范围</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="1107" parent="67" name="vcard_issuing_inst">
-      <comment>发卡机构</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="1108" parent="67" name="is_custom">
-      <comment>是否为自定义卡 0 是 1否</comment>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="1109" parent="67" name="support_recharge">
-      <comment>是否支持充值   0 是 1否</comment>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="1110" parent="67" name="card_image">
-      <comment>卡片图片</comment>
-      <data-type>varchar(512)|0</data-type>
-    </column>
-    <column id="1111" parent="67" name="tf_cnt">
-      <comment>交易次数</comment>
-      <data-type>bigint(20)|0</data-type>
-      <default-expression>&apos;0&apos;</default-expression>
-    </column>
-    <column id="1112" parent="67" name="version">
-      <comment>版本</comment>
-      <data-type>bigint(20)|0</data-type>
-      <default-expression>&apos;0&apos;</default-expression>
-    </column>
-    <index id="1113" parent="67" name="VCARD_CODE_UNIQUE">
-      <columns>vcard_code</columns>
-      <desc-columns></desc-columns>
-      <unique>1</unique>
-    </index>
-    <key id="1114" parent="67" name="PRIMARY">
-      <columns>vcard_id</columns>
-      <primary>1</primary>
-    </key>
-    <key id="1115" parent="67" name="VCARD_CODE_UNIQUE">
-      <columns>vcard_code</columns>
-      <underlying-index>VCARD_CODE_UNIQUE</underlying-index>
-    </key>
-    <column id="1116" parent="68" name="vcard_make_id">
-      <comment>制卡ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1117" parent="68" name="vcard_make_vtype_id">
-      <comment>虚拟类型代码</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1118" parent="68" name="vcard_make_des">
-      <comment>制卡描述</comment>
-      <data-type>varchar(500)|0</data-type>
-    </column>
-    <column id="1119" parent="68" name="mnt_id">
-      <comment>所属商户//暂不用</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1120" parent="68" name="vcard_make_num">
-      <comment>虚拟卡数目</comment>
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="1121" parent="68" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="1122" parent="68" name="last_modify_time">
-      <comment>最后修改时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="1123" parent="68" name="creator">
-      <comment>制卡人</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(500)|0</data-type>
-    </column>
-    <column id="1124" parent="68" name="check_usr">
-      <comment>审核人</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1125" parent="68" name="st">
-      <comment>状态(0:待审核,1:审核通过)</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(11)|0</data-type>
-    </column>
-    <column id="1126" parent="68" name="institution_id">
-      <comment>组织机构ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(30)|0</data-type>
-    </column>
-    <column id="1127" parent="68" name="seq_begin">
-      <comment>起始制卡数字</comment>
-      <data-type>varchar(30)|0</data-type>
-    </column>
-    <column id="1128" parent="68" name="seq_step">
-      <comment>偏移量</comment>
-      <data-type>int(11)|0</data-type>
-      <default-expression>&apos;1&apos;</default-expression>
-    </column>
-    <column id="1129" parent="68" name="appoint_mchtcard">
-      <comment>委托卡商</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="1130" parent="68" name="begin_cd_code">
-      <comment>起始卡号</comment>
-      <data-type>varchar(20)|0</data-type>
-    </column>
-    <column id="1131" parent="68" name="end_cd_code">
-      <comment>终止卡号</comment>
-      <data-type>varchar(20)|0</data-type>
-    </column>
-    <column id="1132" parent="68" name="vcard_make_type">
-      <comment>01 实体卡 02 虚拟卡</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(2)|0</data-type>
-      <default-expression>&apos;01&apos;</default-expression>
-    </column>
-    <column id="1133" parent="68" name="make_st">
-      <comment>0 配送完成  1待确认制卡  2正在制卡 3 设置配送   9 拒绝制卡</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-      <default-expression>&apos;9&apos;</default-expression>
-    </column>
-    <column id="1134" parent="68" name="apply_inst_id">
-      <comment>申请机构id</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="1135" parent="68" name="creator_name">
-      <comment>操作人姓名</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1136" parent="68" name="receive_inst">
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <key id="1137" parent="68" name="PRIMARY">
-      <columns>vcard_make_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="1138" parent="69" name="vtype_id">
-      <comment>虚拟卡类型ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1139" parent="69" name="vtype_code">
-      <comment>虚拟卡类型代码</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1140" parent="69" name="vtype_nm">
-      <comment>虚拟卡类型名称</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1141" parent="69" name="vtype_des">
-      <comment>虚拟卡类型描述</comment>
-      <data-type>varchar(500)|0</data-type>
-    </column>
-    <column id="1142" parent="69" name="vtype_mnt_id">
-      <comment>所属商户(权限隔离，统计用)</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1143" parent="69" name="vtype_rule">
-      <comment>虚拟卡类型规则，用来发卡计算优惠等，暂时没有</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1144" parent="69" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="1145" parent="69" name="last_modify_time">
-      <comment>最后修改时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="1146" parent="69" name="st">
-      <comment>状态(0:可用,1:不可用)</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="1147" parent="69" name="vtype_image">
-      <comment>卡类型图片</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1148" parent="69" name="vtype_amt">
-      <comment>卡类金额</comment>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="1149" parent="69" name="vtype_cur">
-      <comment>卡币种</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1150" parent="69" name="vtype_validity">
-      <comment>卡有效期</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="1151" parent="69" name="vtype_validity_unit">
-      <comment>卡有效期单位 1、年</comment>
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="1152" parent="69" name="vtype_st">
-      <comment>状态（0 启用  1禁用）</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="1153" parent="69" name="card_type">
-      <comment>卡种类 01：实体卡，02：虚拟卡</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(30)|0</data-type>
-    </column>
-    <column id="1154" parent="69" name="card_material">
-      <comment>卡介质    00 CPU卡 01 M1卡 02 磁条卡，03:4442 卡</comment>
-      <data-type>varchar(30)|0</data-type>
-    </column>
-    <column id="1155" parent="69" name="card_quota">
-      <comment>卡片限制额度</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="1156" parent="69" name="cardnum_rule_id">
-      <comment>卡号规则</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(30)|0</data-type>
-    </column>
-    <column id="1157" parent="69" name="support_recharge">
-      <comment>是否支持充值</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-      <default-expression>&apos;0&apos;</default-expression>
-    </column>
-    <column id="1158" parent="69" name="theme_id">
-      <comment>主题ID，空为无主题，有值则为二级主题</comment>
-      <data-type>varchar(64)|0</data-type>
-    </column>
-    <column id="1159" parent="69" name="is_realnm">
-      <comment>是否实名 0 实名 1非实名</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-      <default-expression>&apos;0&apos;</default-expression>
-    </column>
-    <column id="1160" parent="69" name="is_custom">
-      <comment>是否自定义   0自定义卡 1非自定义卡（自定义卡的默认金额为0）</comment>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <key id="1161" parent="69" name="PRIMARY">
-      <columns>vtype_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="1162" parent="70" name="rule_id">
-      <comment>卡类型规则ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1163" parent="70" name="rule_type">
-      <comment>积分类，红包类，优惠券，返券类，现金类等</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1164" parent="70" name="market_amt">
-      <comment>市场价</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="1165" parent="70" name="sell_amt">
-      <comment>出售价格</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="1166" parent="70" name="cost_amt">
-      <comment>成本价</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="1167" parent="70" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="1168" parent="70" name="last_modify_time">
-      <comment>最后更新时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="1169" parent="70" name="st">
-      <comment>0 未审核 1审核通过 2审核失败</comment>
-      <data-type>char(1)|0</data-type>
-    </column>
-    <column id="1170" parent="70" name="version">
-      <comment>版本</comment>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="1171" parent="70" name="rule_st">
-      <comment>0 启用 1禁用</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="1172" parent="70" name="rule_name">
-      <comment>规则名称</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <key id="1173" parent="70" name="PRIMARY">
-      <columns>rule_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="1174" parent="71" name="rule_id">
-      <comment>卡类型规则ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1175" parent="71" name="rule_type">
-      <comment>积分类，红包类，优惠券，返券类，现金类等</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1176" parent="71" name="market_amt">
-      <comment>市场价</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="1177" parent="71" name="sell_amt">
-      <comment>出售价格</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="1178" parent="71" name="cost_amt">
-      <comment>成本价</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="1179" parent="71" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="1180" parent="71" name="last_modify_time">
-      <comment>最后更新时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="1181" parent="71" name="st">
-      <comment>0 未审核 1审核通过 2审核失败</comment>
-      <data-type>char(1)|0</data-type>
-    </column>
-    <column id="1182" parent="71" name="version">
-      <comment>版本</comment>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="1183" parent="71" name="creator">
-      <comment>创建用户</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1184" parent="71" name="check_usr">
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1185" parent="71" name="check_type">
-      <comment>状态(0:新增,1:修改，2：删除（逻辑删除）</comment>
-      <data-type>char(1)|0</data-type>
-    </column>
-    <column id="1186" parent="71" name="rule_st">
-      <comment>0 启用  1禁用</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="1187" parent="71" name="rule_name">
-      <comment>规则名称</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1188" parent="71" name="is_realnm">
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1189" parent="71" name="support_recharge">
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1190" parent="71" name="theme_id">
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <key id="1191" parent="71" name="PRIMARY">
-      <columns>rule_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="1192" parent="72" name="vtype_id">
-      <comment>虚拟卡类型ID</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1193" parent="72" name="vtype_code">
-      <comment>虚拟卡类型代码</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1194" parent="72" name="vtype_nm">
-      <comment>虚拟卡类型名称</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1195" parent="72" name="vtype_des">
-      <comment>虚拟卡类型描述</comment>
-      <data-type>varchar(500)|0</data-type>
-    </column>
-    <column id="1196" parent="72" name="mnt_id">
-      <comment>所属商户(权限隔离，统计用)</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1197" parent="72" name="vtype_rule">
-      <comment>虚拟卡类型规则，用来发卡计算优惠等，暂时没有</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1198" parent="72" name="create_time">
-      <comment>创建时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="1199" parent="72" name="last_modify_time">
-      <comment>最后修改时间</comment>
-      <mandatory>1</mandatory>
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="1200" parent="72" name="creator">
-      <comment>创建人</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1201" parent="72" name="check_usr">
-      <comment>审核人</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1202" parent="72" name="check_type">
-      <comment>状态(0:新增,1:修改，2：删除（逻辑删除）</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="1203" parent="72" name="st">
-      <comment>状态(0:待审核,1:审核通过 2:审核未通过)</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="1204" parent="72" name="vtype_image">
-      <comment>卡类型图片</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1205" parent="72" name="vtype_amt">
-      <comment>卡类金额</comment>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="1206" parent="72" name="vtype_cur">
-      <comment>币种</comment>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1207" parent="72" name="vtype_validity">
-      <comment>有效期时间</comment>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="1208" parent="72" name="vtype_validity_unit">
-      <comment>有效期单位</comment>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="1209" parent="72" name="vtype_st">
-      <comment>状态（0:启用,1:禁用）</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <column id="1210" parent="72" name="card_type">
-      <comment>卡种类 01：实体卡，02：虚拟卡</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(30)|0</data-type>
-    </column>
-    <column id="1211" parent="72" name="card_material">
-      <comment>卡介质    00 CPU卡 01 M1卡 02 磁条卡，03:4442 卡</comment>
-      <data-type>varchar(30)|0</data-type>
-    </column>
-    <column id="1212" parent="72" name="card_quota">
-      <comment>卡片限制额度</comment>
-      <mandatory>1</mandatory>
-      <data-type>bigint(20)|0</data-type>
-    </column>
-    <column id="1213" parent="72" name="cardnum_rule_id">
-      <comment>卡号规则</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(30)|0</data-type>
-    </column>
-    <column id="1214" parent="72" name="support_recharge">
-      <comment>是否支持充值 0支持 1不支持</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-      <default-expression>&apos;0&apos;</default-expression>
-    </column>
-    <column id="1215" parent="72" name="theme_id">
-      <comment>主题</comment>
-      <data-type>varchar(32)|0</data-type>
-    </column>
-    <column id="1216" parent="72" name="is_realnm">
-      <comment>是否实名 0 实名 1非实名</comment>
-      <mandatory>1</mandatory>
-      <data-type>varchar(1)|0</data-type>
-      <default-expression>&apos;0&apos;</default-expression>
-    </column>
-    <column id="1217" parent="72" name="is_custom">
-      <comment>是否自定义   0自定义卡 1非自定义卡（自定义卡的默认金额为0）</comment>
-      <data-type>varchar(1)|0</data-type>
-    </column>
-    <key id="1218" parent="72" name="PRIMARY">
-      <columns>vtype_id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="1219" parent="73" name="ID">
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="1220" parent="73" name="NAME">
-      <mandatory>1</mandatory>
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="1221" parent="73" name="BANK_NAME">
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <key id="1222" parent="73" name="PRIMARY">
-      <columns>ID</columns>
-      <primary>1</primary>
-    </key>
-    <argument id="1223" parent="74">
-      <direction>RETURN</direction>
-      <data-type>varchar(4000)|0</data-type>
-    </argument>
-    <argument id="1224" parent="74" name="f_string">
-      <direction>IN</direction>
-      <data-type>varchar(4000)|0</data-type>
-    </argument>
-    <argument id="1225" parent="74" name="f_delimiter">
-      <direction>IN</direction>
-      <data-type>varchar(5)|0</data-type>
-    </argument>
-    <argument id="1226" parent="74" name="f_order">
-      <direction>IN</direction>
-      <data-type>int(11)|0</data-type>
-    </argument>
-    <argument id="1227" parent="75">
-      <direction>RETURN</direction>
-      <data-type>int(11)|0</data-type>
-    </argument>
-    <argument id="1228" parent="75" name="f_string">
-      <direction>IN</direction>
-      <data-type>varchar(4000)|0</data-type>
-    </argument>
-    <argument id="1229" parent="75" name="f_delimiter">
-      <direction>IN</direction>
-      <data-type>varchar(5)|0</data-type>
-    </argument>
-    <argument id="1230" parent="76">
-      <direction>RETURN</direction>
-      <data-type>varchar(4000)|0</data-type>
-    </argument>
-    <argument id="1231" parent="76" name="rootId">
-      <direction>IN</direction>
-      <data-type>varchar(255)|0</data-type>
-    </argument>
-    <argument id="1232" parent="77">
-      <direction>RETURN</direction>
-      <data-type>varchar(4000)|0</data-type>
-    </argument>
-    <argument id="1233" parent="77" name="rootId">
-      <direction>IN</direction>
-      <data-type>varchar(255)|0</data-type>
-    </argument>
-    <argument id="1234" parent="78">
-      <direction>RETURN</direction>
-      <data-type>varchar(4000)|0</data-type>
-    </argument>
-    <argument id="1235" parent="78" name="rootId">
-      <direction>IN</direction>
-      <data-type>varchar(255)|0</data-type>
-    </argument>
-    <argument id="1236" parent="79">
-      <direction>RETURN</direction>
-      <data-type>varchar(4000)|0</data-type>
-    </argument>
-    <argument id="1237" parent="79" name="rootId">
-      <direction>IN</direction>
-      <data-type>varchar(255)|0</data-type>
-    </argument>
-    <argument id="1238" parent="80">
-      <direction>RETURN</direction>
-      <data-type>varchar(4000)|0</data-type>
-    </argument>
-    <argument id="1239" parent="80" name="rootId">
-      <direction>IN</direction>
-      <data-type>varchar(255)|0</data-type>
-    </argument>
-    <argument id="1240" parent="81" name="f_string">
-      <direction>IN</direction>
-      <data-type>varchar(4000)|0</data-type>
-    </argument>
-    <argument id="1241" parent="81" name="f_delimiter">
-      <direction>IN</direction>
-      <data-type>varchar(5)|0</data-type>
-    </argument>
-  </database-model>
-</dataSource>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/deployment.xml b/JPA-Demo/.idea/deployment.xml
deleted file mode 100644
index 25a0408..0000000
--- a/JPA-Demo/.idea/deployment.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PublishConfigData">
-    <serverData>
-      <paths name="172.18.0.91">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-    </serverData>
-  </component>
-</project>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/encodings.xml b/JPA-Demo/.idea/encodings.xml
deleted file mode 100644
index 97626ba..0000000
--- a/JPA-Demo/.idea/encodings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/JPA-Demo/.idea/libraries/Maven__antlr_antlr_2_7_7.xml
deleted file mode 100644
index b8d93d8..0000000
--- a/JPA-Demo/.idea/libraries/Maven__antlr_antlr_2_7_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: antlr:antlr:2.7.7">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/antlr/antlr/2.7.7/antlr-2.7.7.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/antlr/antlr/2.7.7/antlr-2.7.7-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/antlr/antlr/2.7.7/antlr-2.7.7-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/JPA-Demo/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml
deleted file mode 100644
index a8b0d9c..0000000
--- a/JPA-Demo/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: ch.qos.logback:logback-classic:1.1.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.1.2/logback-classic-1.1.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.1.2/logback-classic-1.1.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.1.2/logback-classic-1.1.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/JPA-Demo/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml
deleted file mode 100644
index 1c76d0b..0000000
--- a/JPA-Demo/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: ch.qos.logback:logback-core:1.1.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.1.2/logback-core-1.1.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.1.2/logback-core-1.1.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.1.2/logback-core-1.1.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/libraries/Maven__com_alibaba_druid_1_0_19.xml b/JPA-Demo/.idea/libraries/Maven__com_alibaba_druid_1_0_19.xml
deleted file mode 100644
index 4a7f94b..0000000
--- a/JPA-Demo/.idea/libraries/Maven__com_alibaba_druid_1_0_19.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.alibaba:druid:1.0.19">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.0.19/druid-1.0.19.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.0.19/druid-1.0.19-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.0.19/druid-1.0.19-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/libraries/Maven__com_alibaba_fastjson_1_2_14.xml b/JPA-Demo/.idea/libraries/Maven__com_alibaba_fastjson_1_2_14.xml
deleted file mode 100644
index 3888159..0000000
--- a/JPA-Demo/.idea/libraries/Maven__com_alibaba_fastjson_1_2_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.alibaba:fastjson:1.2.14">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.14/fastjson-1.2.14.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.14/fastjson-1.2.14-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.14/fastjson-1.2.14-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/libraries/Maven__com_fasterxml_classmate_1_3_0.xml b/JPA-Demo/.idea/libraries/Maven__com_fasterxml_classmate_1_3_0.xml
deleted file mode 100644
index 073c2de..0000000
--- a/JPA-Demo/.idea/libraries/Maven__com_fasterxml_classmate_1_3_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.fasterxml:classmate:1.3.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.3.0/classmate-1.3.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.3.0/classmate-1.3.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.3.0/classmate-1.3.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml b/JPA-Demo/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml
deleted file mode 100644
index eab40b3..0000000
--- a/JPA-Demo/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: commons-logging:commons-logging:1.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/JPA-Demo/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml
deleted file mode 100644
index 14681ee..0000000
--- a/JPA-Demo/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: dom4j:dom4j:1.6.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/dom4j/dom4j/1.6.1/dom4j-1.6.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/libraries/Maven__junit_junit_4_10.xml b/JPA-Demo/.idea/libraries/Maven__junit_junit_4_10.xml
deleted file mode 100644
index ed8bf5f..0000000
--- a/JPA-Demo/.idea/libraries/Maven__junit_junit_4_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: junit:junit:4.10">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.10/junit-4.10.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.10/junit-4.10-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.10/junit-4.10-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_34.xml b/JPA-Demo/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_34.xml
deleted file mode 100644
index b984e59..0000000
--- a/JPA-Demo/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_34.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: mysql:mysql-connector-java:5.1.34">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/5.1.34/mysql-connector-java-5.1.34.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/5.1.34/mysql-connector-java-5.1.34-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/5.1.34/mysql-connector-java-5.1.34-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/JPA-Demo/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml
deleted file mode 100644
index 83cba3e..0000000
--- a/JPA-Demo/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.commons:commons-lang3:3.3.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.3.2/commons-lang3-3.3.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.3.2/commons-lang3-3.3.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.3.2/commons-lang3-3.3.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_jta_1_1_spec_1_1_1.xml b/JPA-Demo/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_jta_1_1_spec_1_1_1.xml
deleted file mode 100644
index a6f25db..0000000
--- a/JPA-Demo/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_jta_1_1_spec_1_1_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/geronimo/specs/geronimo-jta_1.1_spec/1.1.1/geronimo-jta_1.1_spec-1.1.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/geronimo/specs/geronimo-jta_1.1_spec/1.1.1/geronimo-jta_1.1_spec-1.1.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/geronimo/specs/geronimo-jta_1.1_spec/1.1.1/geronimo-jta_1.1_spec-1.1.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/libraries/Maven__org_aspectj_aspectjrt_1_8_9.xml b/JPA-Demo/.idea/libraries/Maven__org_aspectj_aspectjrt_1_8_9.xml
deleted file mode 100644
index 112f7ca..0000000
--- a/JPA-Demo/.idea/libraries/Maven__org_aspectj_aspectjrt_1_8_9.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.aspectj:aspectjrt:1.8.9">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjrt/1.8.9/aspectjrt-1.8.9.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjrt/1.8.9/aspectjrt-1.8.9-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjrt/1.8.9/aspectjrt-1.8.9-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/JPA-Demo/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml
deleted file mode 100644
index acdf443..0000000
--- a/JPA-Demo/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.hamcrest:hamcrest-core:1.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_0_1_Final.xml b/JPA-Demo/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_0_1_Final.xml
deleted file mode 100644
index ce34f42..0000000
--- a/JPA-Demo/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_0_1_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.hibernate.common:hibernate-commons-annotations:5.0.1.Final">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/common/hibernate-commons-annotations/5.0.1.Final/hibernate-commons-annotations-5.0.1.Final.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/common/hibernate-commons-annotations/5.0.1.Final/hibernate-commons-annotations-5.0.1.Final-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/common/hibernate-commons-annotations/5.0.1.Final/hibernate-commons-annotations-5.0.1.Final-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/libraries/Maven__org_hibernate_hibernate_core_5_1_0_Final.xml b/JPA-Demo/.idea/libraries/Maven__org_hibernate_hibernate_core_5_1_0_Final.xml
deleted file mode 100644
index a871e06..0000000
--- a/JPA-Demo/.idea/libraries/Maven__org_hibernate_hibernate_core_5_1_0_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.hibernate:hibernate-core:5.1.0.Final">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/5.1.0.Final/hibernate-core-5.1.0.Final.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/5.1.0.Final/hibernate-core-5.1.0.Final-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/5.1.0.Final/hibernate-core-5.1.0.Final-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/libraries/Maven__org_hibernate_hibernate_entitymanager_5_1_0_Final.xml b/JPA-Demo/.idea/libraries/Maven__org_hibernate_hibernate_entitymanager_5_1_0_Final.xml
deleted file mode 100644
index 9cf1471..0000000
--- a/JPA-Demo/.idea/libraries/Maven__org_hibernate_hibernate_entitymanager_5_1_0_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.hibernate:hibernate-entitymanager:5.1.0.Final">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-entitymanager/5.1.0.Final/hibernate-entitymanager-5.1.0.Final.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-entitymanager/5.1.0.Final/hibernate-entitymanager-5.1.0.Final-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-entitymanager/5.1.0.Final/hibernate-entitymanager-5.1.0.Final-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/JPA-Demo/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml
deleted file mode 100644
index 6492b2b..0000000
--- a/JPA-Demo/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/javax/persistence/hibernate-jpa-2.1-api/1.0.0.Final/hibernate-jpa-2.1-api-1.0.0.Final.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/javax/persistence/hibernate-jpa-2.1-api/1.0.0.Final/hibernate-jpa-2.1-api-1.0.0.Final-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/javax/persistence/hibernate-jpa-2.1-api/1.0.0.Final/hibernate-jpa-2.1-api-1.0.0.Final-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/libraries/Maven__org_javassist_javassist_3_20_0_GA.xml b/JPA-Demo/.idea/libraries/Maven__org_javassist_javassist_3_20_0_GA.xml
deleted file mode 100644
index c21c9b0..0000000
--- a/JPA-Demo/.idea/libraries/Maven__org_javassist_javassist_3_20_0_GA.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.javassist:javassist:3.20.0-GA">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/javassist/javassist/3.20.0-GA/javassist-3.20.0-GA.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/javassist/javassist/3.20.0-GA/javassist-3.20.0-GA-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/javassist/javassist/3.20.0-GA/javassist-3.20.0-GA-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/libraries/Maven__org_jboss_jandex_2_0_0_Final.xml b/JPA-Demo/.idea/libraries/Maven__org_jboss_jandex_2_0_0_Final.xml
deleted file mode 100644
index a74dcfd..0000000
--- a/JPA-Demo/.idea/libraries/Maven__org_jboss_jandex_2_0_0_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.jboss:jandex:2.0.0.Final">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/jandex/2.0.0.Final/jandex-2.0.0.Final.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/jandex/2.0.0.Final/jandex-2.0.0.Final-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/jandex/2.0.0.Final/jandex-2.0.0.Final-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_0_Final.xml b/JPA-Demo/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_0_Final.xml
deleted file mode 100644
index 186d87f..0000000
--- a/JPA-Demo/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_0_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.3.0.Final/jboss-logging-3.3.0.Final.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.3.0.Final/jboss-logging-3.3.0.Final-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.3.0.Final/jboss-logging-3.3.0.Final-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/JPA-Demo/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml
deleted file mode 100644
index 282edcb..0000000
--- a/JPA-Demo/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.slf4j:jcl-over-slf4j:1.7.7">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jcl-over-slf4j/1.7.7/jcl-over-slf4j-1.7.7.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jcl-over-slf4j/1.7.7/jcl-over-slf4j-1.7.7-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jcl-over-slf4j/1.7.7/jcl-over-slf4j-1.7.7-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/JPA-Demo/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml
deleted file mode 100644
index 1e67260..0000000
--- a/JPA-Demo/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.slf4j:slf4j-api:1.7.7">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/libraries/Maven__org_springframework_data_spring_data_commons_1_12_4_RELEASE.xml b/JPA-Demo/.idea/libraries/Maven__org_springframework_data_spring_data_commons_1_12_4_RELEASE.xml
deleted file mode 100644
index f1c6daa..0000000
--- a/JPA-Demo/.idea/libraries/Maven__org_springframework_data_spring_data_commons_1_12_4_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.data:spring-data-commons:1.12.4.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/1.12.4.RELEASE/spring-data-commons-1.12.4.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/1.12.4.RELEASE/spring-data-commons-1.12.4.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/1.12.4.RELEASE/spring-data-commons-1.12.4.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_1_10_4_RELEASE.xml b/JPA-Demo/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_1_10_4_RELEASE.xml
deleted file mode 100644
index 3d7ae60..0000000
--- a/JPA-Demo/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_1_10_4_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.data:spring-data-jpa:1.10.4.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-jpa/1.10.4.RELEASE/spring-data-jpa-1.10.4.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-jpa/1.10.4.RELEASE/spring-data-jpa-1.10.4.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-jpa/1.10.4.RELEASE/spring-data-jpa-1.10.4.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_aop_4_3_0_RELEASE.xml b/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_aop_4_3_0_RELEASE.xml
deleted file mode 100644
index 80294b1..0000000
--- a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_aop_4_3_0_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-aop:4.3.0.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.3.0.RELEASE/spring-aop-4.3.0.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.3.0.RELEASE/spring-aop-4.3.0.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.3.0.RELEASE/spring-aop-4.3.0.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_beans_4_3_0_RELEASE.xml b/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_beans_4_3_0_RELEASE.xml
deleted file mode 100644
index 09b7e0c..0000000
--- a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_beans_4_3_0_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-beans:4.3.0.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/4.3.0.RELEASE/spring-beans-4.3.0.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/4.3.0.RELEASE/spring-beans-4.3.0.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/4.3.0.RELEASE/spring-beans-4.3.0.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_context_4_3_0_RELEASE.xml b/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_context_4_3_0_RELEASE.xml
deleted file mode 100644
index 3c94644..0000000
--- a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_context_4_3_0_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-context:4.3.0.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/4.3.0.RELEASE/spring-context-4.3.0.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/4.3.0.RELEASE/spring-context-4.3.0.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/4.3.0.RELEASE/spring-context-4.3.0.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_context_support_4_3_0_RELEASE.xml b/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_context_support_4_3_0_RELEASE.xml
deleted file mode 100644
index ef485cc..0000000
--- a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_context_support_4_3_0_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-context-support:4.3.0.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/4.3.0.RELEASE/spring-context-support-4.3.0.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/4.3.0.RELEASE/spring-context-support-4.3.0.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/4.3.0.RELEASE/spring-context-support-4.3.0.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_core_4_3_0_RELEASE.xml b/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_core_4_3_0_RELEASE.xml
deleted file mode 100644
index 7300f9e..0000000
--- a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_core_4_3_0_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-core:4.3.0.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.3.0.RELEASE/spring-core-4.3.0.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.3.0.RELEASE/spring-core-4.3.0.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.3.0.RELEASE/spring-core-4.3.0.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_expression_4_3_0_RELEASE.xml b/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_expression_4_3_0_RELEASE.xml
deleted file mode 100644
index 099312a..0000000
--- a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_expression_4_3_0_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-expression:4.3.0.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/4.3.0.RELEASE/spring-expression-4.3.0.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/4.3.0.RELEASE/spring-expression-4.3.0.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/4.3.0.RELEASE/spring-expression-4.3.0.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_0_RELEASE.xml b/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_0_RELEASE.xml
deleted file mode 100644
index 7d27aaf..0000000
--- a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_0_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-jdbc:4.3.0.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/4.3.0.RELEASE/spring-jdbc-4.3.0.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/4.3.0.RELEASE/spring-jdbc-4.3.0.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/4.3.0.RELEASE/spring-jdbc-4.3.0.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_orm_4_3_0_RELEASE.xml b/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_orm_4_3_0_RELEASE.xml
deleted file mode 100644
index c400a2d..0000000
--- a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_orm_4_3_0_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-orm:4.3.0.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-orm/4.3.0.RELEASE/spring-orm-4.3.0.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-orm/4.3.0.RELEASE/spring-orm-4.3.0.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-orm/4.3.0.RELEASE/spring-orm-4.3.0.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_tx_4_3_0_RELEASE.xml b/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_tx_4_3_0_RELEASE.xml
deleted file mode 100644
index 89e6704..0000000
--- a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_tx_4_3_0_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-tx:4.3.0.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.3.0.RELEASE/spring-tx-4.3.0.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.3.0.RELEASE/spring-tx-4.3.0.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.3.0.RELEASE/spring-tx-4.3.0.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_web_4_3_0_RELEASE.xml b/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_web_4_3_0_RELEASE.xml
deleted file mode 100644
index 61084b2..0000000
--- a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_web_4_3_0_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-web:4.3.0.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.3.0.RELEASE/spring-web-4.3.0.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.3.0.RELEASE/spring-web-4.3.0.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.3.0.RELEASE/spring-web-4.3.0.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/libraries/Maven__xml_apis_xml_apis_1_0_b2.xml b/JPA-Demo/.idea/libraries/Maven__xml_apis_xml_apis_1_0_b2.xml
deleted file mode 100644
index c36e717..0000000
--- a/JPA-Demo/.idea/libraries/Maven__xml_apis_xml_apis_1_0_b2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: xml-apis:xml-apis:1.0.b2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/misc.xml b/JPA-Demo/.idea/misc.xml
deleted file mode 100644
index adfbe50..0000000
--- a/JPA-Demo/.idea/misc.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
-  <component name="FrameworkDetectionExcludesConfiguration">
-    <file type="web" url="file://$PROJECT_DIR$" />
-  </component>
-  <component name="MavenProjectsManager">
-    <option name="originalFiles">
-      <list>
-        <option value="$PROJECT_DIR$/pom.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8 " project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/modules.xml b/JPA-Demo/.idea/modules.xml
deleted file mode 100644
index 7b75f0c..0000000
--- a/JPA-Demo/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/TestJPA.iml" filepath="$PROJECT_DIR$/TestJPA.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/sqldialects.xml b/JPA-Demo/.idea/sqldialects.xml
deleted file mode 100644
index af0e43a..0000000
--- a/JPA-Demo/.idea/sqldialects.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="SqlDialectMappings">
-    <file url="file://$PROJECT_DIR$" dialect="MySQL" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/uiDesigner.xml b/JPA-Demo/.idea/uiDesigner.xml
deleted file mode 100644
index e96534f..0000000
--- a/JPA-Demo/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
\ No newline at end of file
diff --git a/JPA-Demo/.idea/workspace.xml b/JPA-Demo/.idea/workspace.xml
deleted file mode 100644
index 52f7d02..0000000
--- a/JPA-Demo/.idea/workspace.xml
+++ /dev/null
@@ -1,1768 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="a1261010-47e0-4068-8f88-e54b86879610" name="Default" comment="" />
-    <ignored path="TestJPA.iws" />
-    <ignored path=".idea/workspace.xml" />
-    <ignored path="$PROJECT_DIR$/out/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="TRACKING_ENABLED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="CoverageDataManager">
-    <SUITE FILE_PATH="coverage/TestJPA$BaseRepository.coverage" NAME="BaseRepository Coverage Results" MODIFIED="1479448318908" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
-      <FILTER>cn.mrdear.repository.PcardOrderRepository</FILTER>
-    </SUITE>
-  </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_TABLE_DETAILS" value="true" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-  </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
-  <component name="FavoritesManager">
-    <favorites_list name="TestJPA" />
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="UserRepositoryTest.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/test/UserRepositoryTest.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="397">
-              <caret line="33" column="22" selection-start-line="33" selection-start-column="22" selection-end-line="33" selection-end-column="22" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="config.properties" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/config.properties">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="300">
-              <caret line="12" column="35" selection-start-line="12" selection-start-column="35" selection-end-line="12" selection-end-column="35" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="QueryParams.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/jpa/QueryParams.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="353">
-              <caret line="168" column="9" selection-start-line="168" selection-start-column="9" selection-end-line="168" selection-end-column="9" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="BaseRepository.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/repository/BaseRepository.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1900">
-              <caret line="87" column="0" selection-start-line="87" selection-start-column="0" selection-end-line="87" selection-end-column="0" />
-              <folding>
-                <element signature="imports" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="PcardOrderRepository.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/repository/PcardOrderRepository.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="225">
-              <caret line="12" column="47" selection-start-line="12" selection-start-column="47" selection-end-line="12" selection-end-column="47" />
-              <folding>
-                <element signature="imports" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="JpaSpecificationExecutor.java" pinned="false" current-in-tab="false">
-        <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-jpa/1.10.4.RELEASE/spring-data-jpa-1.10.4.RELEASE-sources.jar!/org/springframework/data/jpa/repository/JpaSpecificationExecutor.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="875">
-              <caret line="54" column="26" selection-start-line="54" selection-start-column="26" selection-end-line="54" selection-end-column="26" />
-              <folding>
-                <element signature="e#0#2009#0" expanded="false" />
-                <element signature="imports" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Filter.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/jpa/Filter.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="9175">
-              <caret line="392" column="23" selection-start-line="392" selection-start-column="23" selection-end-line="392" selection-end-column="23" />
-              <folding>
-                <element signature="imports" expanded="false" />
-                <element signature="e#884#885#0" expanded="false" />
-                <element signature="e#932#933#0" expanded="false" />
-                <element signature="e#1005#1006#0" expanded="false" />
-                <element signature="e#1044#1045#0" expanded="false" />
-                <element signature="e#1096#1097#0" expanded="false" />
-                <element signature="e#1144#1145#0" expanded="false" />
-                <element signature="e#5922#5923#0" expanded="false" />
-                <element signature="e#5953#5954#0" expanded="false" />
-                <element signature="e#6080#6081#0" expanded="false" />
-                <element signature="e#6120#6121#0" expanded="false" />
-                <element signature="e#6219#6220#0" expanded="false" />
-                <element signature="e#6250#6251#0" expanded="false" />
-                <element signature="e#6388#6389#0" expanded="false" />
-                <element signature="e#6428#6429#0" expanded="false" />
-                <element signature="e#6511#6512#0" expanded="false" />
-                <element signature="e#6539#6540#0" expanded="false" />
-                <element signature="e#6655#6656#0" expanded="false" />
-                <element signature="e#6689#6690#0" expanded="false" />
-                <element signature="e#6790#6791#0" expanded="false" />
-                <element signature="e#6823#6824#0" expanded="false" />
-                <element signature="e#6967#6968#0" expanded="false" />
-                <element signature="e#7011#7012#0" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Specification.java" pinned="false" current-in-tab="false">
-        <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-jpa/1.10.4.RELEASE/spring-data-jpa-1.10.4.RELEASE-sources.jar!/org/springframework/data/jpa/domain/Specification.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="275">
-              <caret line="28" column="17" selection-start-line="28" selection-start-column="17" selection-end-line="28" selection-end-column="17" />
-              <folding>
-                <element signature="e#0#1356#0" expanded="false" />
-                <element signature="imports" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="package-info" />
-        <option value="Interface" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="GradleLocalSettings">
-    <option name="externalProjectsViewState">
-      <projects_view />
-    </option>
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/resources/spring/persistence.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/dispatcher-servlet.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/persistence.xml" />
-        <option value="$PROJECT_DIR$/src/test/java/UserRepositoryTest.java" />
-        <option value="$PROJECT_DIR$/src/test/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/entity/User.java" />
-        <option value="$APPLICATION_CONFIG_DIR$/consoles/db/09276611-812e-4df4-b751-a31d7ea1465f/console.sql" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/repository/UserRepositoryCustomImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/Filter.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/repository/BaseRepositoryImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/repository/UserRepositoryCustom.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/repository/UserRepositoryImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/service/UserService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/repository/UserRepository.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/config.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/entity/PcardCardOrder.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/jpa/Filter.java" />
-        <option value="$APPLICATION_CONFIG_DIR$/consoles/db/9b9d41a7-087f-4d48-b6f5-6a32ff67416e/console.sql" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/jpa/Order.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/repository/PcardCardOrderRepository.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/repository/PcardOrderRepository.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/controller/UserController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/service/PcardOrderService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/repository/BaseRepository.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/repository/PcardOrderRepositoryCustom.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/service/impl/PcardOrderServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/repository/PcardOrderRepositoryImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/controller/OrderController.java" />
-        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" />
-        <option value="$PROJECT_DIR$/pom.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/jpa/QueryParams.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/test/UserRepositoryTest.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/develop/maven/apache-maven-3.3.9" />
-        <option name="userSettingsFile" value="D:\develop\maven\apache-maven-3.3.9\conf\settings.xml" />
-      </MavenGeneralSettings>
-    </option>
-    <option name="importingSettings">
-      <MavenImportingSettings>
-        <option name="importAutomatically" value="true" />
-      </MavenImportingSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="" />
-          <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$RootNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="testjpa Maven Webapp" />
-          <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$ProjectNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="" />
-          <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$RootNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="testjpa Maven Webapp" />
-          <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$ProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="Lifecycle" />
-          <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$LifecycleNode" />
-        </PATH_ELEMENT>
-      </PATH>
-    </treeState>
-  </component>
-  <component name="MavenRunner">
-    <option name="jreName" value="1.8 " />
-    <option name="vmOptions" value="-DarchetypeCatalog=internal" />
-  </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-9" />
-    <option name="y" value="-9" />
-    <option name="width" value="1860" />
-    <option name="height" value="1092" />
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectView">
-    <navigator currentView="ProjectPane" proportions="" version="1">
-      <flattenPackages />
-      <showMembers />
-      <showModules />
-      <showLibraryContents />
-      <hideEmptyPackages />
-      <abbreviatePackageNames />
-      <autoscrollToSource />
-      <autoscrollFromSource />
-      <sortByType />
-      <manualOrder />
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="PackagesPane" />
-      <pane id="Scratches" />
-      <pane id="ProjectPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="JPA-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="JPA-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="JPA-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="JPA-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="JPA-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="JPA-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="JPA-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="JPA-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="JPA-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="resources" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="JPA-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="JPA-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="mrdear" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="JPA-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="JPA-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="mrdear" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="test" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
-      <pane id="Scope" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="settings.editor.selected.configurable" value="com.zeroturnaround.javarebel.idea.plugin.settings.JRebelSettingsComponent" />
-    <property name="settings.editor.splitter.proportion" value="0.2" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="true" />
-    <property name="js-jscs-nodeInterpreter" value="D:\develop\nodejs\node.exe" />
-    <property name="project.structure.last.edited" value="Modules" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.2" />
-    <property name="WebServerToolWindowPanel.toolwindow.show.size" value="false" />
-    <property name="WebServerToolWindowPanel.toolwindow.show.date" value="false" />
-    <property name="WebServerToolWindowPanel.toolwindow.show.permissions" value="false" />
-    <property name="WebServerToolWindowPanel.toolwindow.highlight.symlinks" value="true" />
-    <property name="WebServerToolWindowPanel.toolwindow.highlight.mappings" value="true" />
-    <property name="com.intellij.database.dataSource.DataSourceTemplate" value="MySQL" />
-  </component>
-  <component name="RecentsManager">
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="F:\workspace\TestJPA\src\test\resources" />
-      <recent name="F:\workspace\TestJPA\src\test" />
-      <recent name="F:\workspace\TestJPA\src\main\resources" />
-    </key>
-    <key name="CopyClassDialog.RECENTS_KEY">
-      <recent name="cn.mrdear.entity" />
-      <recent name="cn.mrdear" />
-    </key>
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="F:\workspace\TestJPA\doc" />
-      <recent name="F:\workspace\TestJPA\target\classes" />
-      <recent name="F:\workspace\TestJPA\src\main\java\cn\mrdear\test" />
-      <recent name="F:\workspace\TestJPA\src\main\resources" />
-      <recent name="F:\workspace\TestJPA\src\test\resources\spring" />
-    </key>
-  </component>
-  <component name="RunManager" selected="Application.UserRepositoryTest">
-    <configuration default="false" name="UserRepositoryTest$UserDAOImplTest.testGetList" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="TestJPA" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="UserRepositoryTest$UserDAOImplTest" />
-      <option name="METHOD_NAME" value="testGetList" />
-      <option name="TEST_OBJECT" value="method" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="false" name="UserRepositoryTest.testGetList" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="TestJPA" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" value="cn.mrdear.test" />
-      <option name="MAIN_CLASS_NAME" value="cn.mrdear.test.UserRepositoryTest" />
-      <option name="METHOD_NAME" value="testGetList" />
-      <option name="TEST_OBJECT" value="method" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" value="" />
-      <option name="WORKING_DIRECTORY" value="file://$MODULE_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="false" name="UserRepositoryTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="TestJPA" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" value="cn.mrdear.test" />
-      <option name="MAIN_CLASS_NAME" value="cn.mrdear.test.UserRepositoryTest" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="false" name="UserRepositoryTest" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
-        <pattern>
-          <option name="PATTERN" value="cn.mrdear.test.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <option name="MAIN_CLASS_NAME" value="cn.mrdear.test.UserRepositoryTest" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="TestJPA" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="false" name="BaseRepository" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
-        <pattern>
-          <option name="PATTERN" value="cn.mrdear.repository.PcardOrderRepository" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <option name="MAIN_CLASS_NAME" value="cn.mrdear.repository.BaseRepository" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="TestJPA" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false">
-      <deployment />
-      <server-settings />
-      <predefined_log_file id="Tomcat" enabled="true" />
-      <predefined_log_file id="Tomcat Catalina" enabled="true" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <method />
-    </configuration>
-    <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
-      <module name="" />
-      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
-      <option name="PROGRAM_PARAMETERS" />
-      <method />
-    </configuration>
-    <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
-      <module name="" />
-      <option name="DEPLOY" value="true" />
-      <option name="ARTIFACT_NAME" value="" />
-      <option name="PM_INSTALL_OPTIONS" value="" />
-      <option name="ACTIVITY_EXTRA_FLAGS" value="" />
-      <option name="MODE" value="default_activity" />
-      <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-      <option name="PREFERRED_AVD" value="" />
-      <option name="CLEAR_LOGCAT" value="false" />
-      <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
-      <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
-      <option name="FORCE_STOP_RUNNING_APP" value="true" />
-      <option name="DEBUGGER_TYPE" value="Java" />
-      <option name="USE_LAST_SELECTED_DEVICE" value="false" />
-      <option name="PREFERRED_AVD" value="" />
-      <Java />
-      <Profilers>
-        <option name="GAPID_DISABLE_PCS" value="false" />
-      </Profilers>
-      <option name="DEEP_LINK" value="" />
-      <option name="ACTIVITY_CLASS" value="" />
-      <method />
-    </configuration>
-    <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
-      <module name="" />
-      <option name="TESTING_TYPE" value="0" />
-      <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
-      <option name="METHOD_NAME" value="" />
-      <option name="CLASS_NAME" value="" />
-      <option name="PACKAGE_NAME" value="" />
-      <option name="EXTRA_OPTIONS" value="" />
-      <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-      <option name="PREFERRED_AVD" value="" />
-      <option name="CLEAR_LOGCAT" value="false" />
-      <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
-      <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
-      <option name="FORCE_STOP_RUNNING_APP" value="true" />
-      <option name="DEBUGGER_TYPE" value="Java" />
-      <option name="USE_LAST_SELECTED_DEVICE" value="false" />
-      <option name="PREFERRED_AVD" value="" />
-      <Java />
-      <Profilers>
-        <option name="GAPID_DISABLE_PCS" value="false" />
-      </Profilers>
-      <method />
-    </configuration>
-    <configuration default="true" type="Applet" factoryName="Applet">
-      <option name="HTML_USED" value="false" />
-      <option name="WIDTH" value="400" />
-      <option name="HEIGHT" value="300" />
-      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
-      <module />
-      <method />
-    </configuration>
-    <configuration default="true" type="Application" factoryName="Application">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="ArquillianJUnit" factoryName="">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="arquillianRunConfiguration">
-        <value>
-          <option name="containerStateName" value="" />
-        </value>
-      </option>
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="true" type="ArquillianTestNG" factoryName="">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="arquillianRunConfiguration">
-        <value>
-          <option name="containerStateName" value="" />
-        </value>
-      </option>
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="ANNOTATION_TYPE" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
-      <envs />
-      <properties />
-      <listeners />
-      <method />
-    </configuration>
-    <configuration default="true" type="Cold Fusion runner description" factoryName="Cold Fusion" custom_browser="" web_path="">
-      <method />
-    </configuration>
-    <configuration default="true" type="CucumberJavaRunConfigurationType" factoryName="Cucumber java">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="myFilePath" />
-      <option name="GLUE" />
-      <option name="myNameFilter" />
-      <option name="myGeneratedName" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="FlashRunConfigurationType" factoryName="Flash App">
-      <option name="BCName" value="" />
-      <option name="IOSSimulatorSdkPath" value="" />
-      <option name="adlOptions" value="" />
-      <option name="airProgramParameters" value="" />
-      <option name="appDescriptorForEmulator" value="Android" />
-      <option name="debugTransport" value="USB" />
-      <option name="debuggerSdkRaw" value="BC SDK" />
-      <option name="emulator" value="NexusOne" />
-      <option name="emulatorAdlOptions" value="" />
-      <option name="fastPackaging" value="true" />
-      <option name="fullScreenHeight" value="0" />
-      <option name="fullScreenWidth" value="0" />
-      <option name="launchUrl" value="false" />
-      <option name="launcherParameters">
-        <LauncherParameters>
-          <option name="browser" value="a7bb68e0-33c0-4d6f-a81a-aac1fdb870c8" />
-          <option name="launcherType" value="OSDefault" />
-          <option name="newPlayerInstance" value="false" />
-          <option name="playerPath" value="FlashPlayerDebugger.exe" />
-        </LauncherParameters>
-      </option>
-      <option name="mobileRunTarget" value="Emulator" />
-      <option name="moduleName" value="" />
-      <option name="overriddenMainClass" value="" />
-      <option name="overriddenOutputFileName" value="" />
-      <option name="overrideMainClass" value="false" />
-      <option name="runTrusted" value="true" />
-      <option name="screenDpi" value="0" />
-      <option name="screenHeight" value="0" />
-      <option name="screenWidth" value="0" />
-      <option name="url" value="http://" />
-      <option name="usbDebugPort" value="7936" />
-      <method />
-    </configuration>
-    <configuration default="true" type="FlexUnitRunConfigurationType" factoryName="FlexUnit" appDescriptorForEmulator="Android" class_name="" emulatorAdlOptions="" method_name="" package_name="" scope="Class">
-      <option name="BCName" value="" />
-      <option name="launcherParameters">
-        <LauncherParameters>
-          <option name="browser" value="a7bb68e0-33c0-4d6f-a81a-aac1fdb870c8" />
-          <option name="launcherType" value="OSDefault" />
-          <option name="newPlayerInstance" value="false" />
-          <option name="playerPath" value="FlashPlayerDebugger.exe" />
-        </LauncherParameters>
-      </option>
-      <option name="moduleName" value="" />
-      <option name="trusted" value="true" />
-      <method />
-    </configuration>
-    <configuration default="true" type="GradleRunConfiguration" factoryName="Gradle">
-      <ExternalSystemSettings>
-        <option name="executionName" />
-        <option name="externalProjectPath" />
-        <option name="externalSystemIdString" value="GRADLE" />
-        <option name="scriptParameters" />
-        <option name="taskDescriptions">
-          <list />
-        </option>
-        <option name="taskNames">
-          <list />
-        </option>
-        <option name="vmOptions" />
-      </ExternalSystemSettings>
-      <method />
-    </configuration>
-    <configuration default="true" type="GrailsRunConfigurationType" factoryName="Grails">
-      <setting name="vmparams" value="" />
-      <setting name="cmdLine" value="run-app" />
-      <setting name="passParentEnv" value="true" />
-      <setting name="launchBrowser" value="true" />
-      <setting name="depsClasspath" value="false" />
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <method />
-    </configuration>
-    <configuration default="true" type="JUnit" factoryName="JUnit">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="true" type="JUnitTestDiscovery" factoryName="JUnit Test Discovery" changeList="All">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="true" type="JarApplication" factoryName="JAR Application">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="Java Scratch" factoryName="Java Scratch">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="SCRATCH_FILE_ID" value="0" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
-      <method />
-    </configuration>
-    <configuration default="true" type="JetRunConfigurationType" factoryName="Kotlin">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="TestJPA" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="KotlinStandaloneScriptRunConfigurationType" factoryName="Kotlin script">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="filePath" />
-      <option name="vmParameters" />
-      <option name="alternativeJrePath" />
-      <option name="programParameters" />
-      <option name="passParentEnvs" value="true" />
-      <option name="workingDirectory" />
-      <option name="isAlternativeJrePathEnabled" value="false" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="MavenRunConfiguration" factoryName="Maven">
-      <MavenSettings>
-        <option name="myGeneralSettings" />
-        <option name="myRunnerSettings" />
-        <option name="myRunnerParameters">
-          <MavenRunnerParameters>
-            <option name="profiles">
-              <set />
-            </option>
-            <option name="goals">
-              <list />
-            </option>
-            <option name="profilesMap">
-              <map />
-            </option>
-            <option name="resolveToWorkspace" value="false" />
-            <option name="workingDirPath" value="" />
-          </MavenRunnerParameters>
-        </option>
-      </MavenSettings>
-      <method />
-    </configuration>
-    <configuration default="true" type="Remote" factoryName="Remote">
-      <option name="USE_SOCKET_TRANSPORT" value="true" />
-      <option name="SERVER_MODE" value="false" />
-      <option name="SHMEM_ADDRESS" value="javadebug" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="5005" />
-      <method />
-    </configuration>
-    <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="TestNG" factoryName="TestNG">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="ANNOTATION_TYPE" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
-      <envs />
-      <properties />
-      <listeners />
-      <method />
-    </configuration>
-    <configuration default="true" type="TestNGTestDiscovery" factoryName="TestNG Test Discovery" changeList="All">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="ANNOTATION_TYPE" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
-      <envs />
-      <properties />
-      <listeners />
-      <method />
-    </configuration>
-    <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
-      <node-interpreter>project</node-interpreter>
-      <node-options />
-      <gulpfile />
-      <tasks />
-      <arguments />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="js.build_tools.npm" factoryName="npm">
-      <command value="run-script" />
-      <scripts />
-      <node-interpreter value="project" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="osgi.bnd.run" factoryName="Run Launcher">
-      <method />
-    </configuration>
-    <configuration default="true" type="osgi.bnd.run" factoryName="Test Launcher (JUnit)">
-      <method />
-    </configuration>
-    <configuration default="false" name="JPATest" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.0.301" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="OPEN_IN_BROWSER" value="false" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="HOT_SWAP_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATING_POLICY" value="hot-swap-classes" />
-      <deployment>
-        <artifact name="TestJPA:war">
-          <settings>
-            <option name="CONTEXT_PATH" value="/jpa" />
-          </settings>
-        </artifact>
-      </deployment>
-      <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_TestJPA" />
-        <option name="HTTP_PORT" value="8080" />
-      </server-settings>
-      <predefined_log_file id="Tomcat" enabled="true" />
-      <predefined_log_file id="Tomcat Catalina" enabled="true" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="50932" />
-      </RunnerSettings>
-      <RunnerSettings RunnerId="JRebel Debug">
-        <option name="DEBUG_PORT" value="50933" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="JRebel Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="JRebel Executor">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method>
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="TestJPA:war" />
-        </option>
-      </method>
-    </configuration>
-    <list size="6">
-      <item index="0" class="java.lang.String" itemvalue="Tomcat Server.JPATest" />
-      <item index="1" class="java.lang.String" itemvalue="JUnit.UserRepositoryTest$UserDAOImplTest.testGetList" />
-      <item index="2" class="java.lang.String" itemvalue="JUnit.UserRepositoryTest.testGetList" />
-      <item index="3" class="java.lang.String" itemvalue="JUnit.UserRepositoryTest" />
-      <item index="4" class="java.lang.String" itemvalue="Application.UserRepositoryTest" />
-      <item index="5" class="java.lang.String" itemvalue="Application.BaseRepository" />
-    </list>
-    <recent_temporary>
-      <list size="5">
-        <item index="0" class="java.lang.String" itemvalue="Application.UserRepositoryTest" />
-        <item index="1" class="java.lang.String" itemvalue="Application.BaseRepository" />
-        <item index="2" class="java.lang.String" itemvalue="JUnit.UserRepositoryTest.testGetList" />
-        <item index="3" class="java.lang.String" itemvalue="JUnit.UserRepositoryTest" />
-        <item index="4" class="java.lang.String" itemvalue="JUnit.UserRepositoryTest$UserDAOImplTest.testGetList" />
-      </list>
-    </recent_temporary>
-  </component>
-  <component name="ShelveChangesManager" show_recycled="false">
-    <option name="remove_strategy" value="false" />
-  </component>
-  <component name="SvnConfiguration">
-    <configuration>C:\Users\NL\AppData\Roaming\Subversion</configuration>
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="a1261010-47e0-4068-8f88-e54b86879610" name="Default" comment="" />
-      <created>1477877210784</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1477877210784</updated>
-      <workItem from="1477877212394" duration="4799000" />
-      <workItem from="1477882640346" duration="656000" />
-      <workItem from="1477883496907" duration="403000" />
-      <workItem from="1477928348153" duration="1224000" />
-      <workItem from="1477961979097" duration="5970000" />
-      <workItem from="1477979247733" duration="4732000" />
-      <workItem from="1478007850693" duration="4958000" />
-      <workItem from="1478048793105" duration="11523000" />
-      <workItem from="1478073846708" duration="842000" />
-      <workItem from="1478098097477" duration="645000" />
-      <workItem from="1478133425326" duration="12142000" />
-      <workItem from="1478496367911" duration="21000" />
-      <workItem from="1478586296464" duration="626000" />
-      <workItem from="1478613827352" duration="241000" />
-      <workItem from="1479011199493" duration="55000" />
-      <workItem from="1479285741291" duration="22000" />
-      <workItem from="1479347032401" duration="871000" />
-      <workItem from="1479351394380" duration="13642000" />
-      <workItem from="1479383009299" duration="1743000" />
-      <workItem from="1479442716346" duration="11194000" />
-      <workItem from="1479820270845" duration="1446000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TestHistory">
-    <history-entry file="UserRepositoryTest - 2016.11.01 at 14h 01m 33s.xml">
-      <configuration name="UserRepositoryTest" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="UserRepositoryTest - 2016.11.01 at 14h 01m 55s.xml">
-      <configuration name="UserRepositoryTest" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="UserRepositoryTest_testGetList - 2016.11.01 at 10h 07m 00s.xml">
-      <configuration name="UserRepositoryTest.testGetList" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="UserRepositoryTest_testGetList - 2016.11.01 at 10h 10m 08s.xml">
-      <configuration name="UserRepositoryTest.testGetList" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="UserRepositoryTest_testGetList - 2016.11.01 at 13h 53m 38s.xml">
-      <configuration name="UserRepositoryTest.testGetList" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="UserRepositoryTest_testGetList - 2016.11.01 at 13h 54m 04s.xml">
-      <configuration name="UserRepositoryTest.testGetList" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="UserRepositoryTest_testGetList - 2016.11.01 at 13h 58m 59s.xml">
-      <configuration name="UserRepositoryTest.testGetList" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="UserRepositoryTest_testGetList - 2016.11.01 at 14h 00m 49s.xml">
-      <configuration name="UserRepositoryTest.testGetList" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="UserRepositoryTest_testGetList - 2016.11.01 at 14h 05m 00s.xml">
-      <configuration name="UserRepositoryTest.testGetList" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="UserRepositoryTest_testGetList - 2016.11.01 at 14h 07m 58s.xml">
-      <configuration name="UserRepositoryTest.testGetList" configurationId="JUnit" />
-    </history-entry>
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="77755000" />
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="-9" y="-9" width="1860" height="1092" extended-state="0" />
-    <editor active="false" />
-    <layout>
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="FindBugs-IDEA" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="17" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32406417" sideWeight="0.50503355" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.23101604" sideWeight="0.49776036" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="JRebel Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="17" side_tool="true" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20917226" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="JRebel Executor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Remote Host" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32997763" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24496645" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.17505592" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.371123" sideWeight="0.49328858" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3272727" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.43595263" sideWeight="0.49496645" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3965702" sideWeight="0.49440715" order="12" side_tool="false" content_ui="tabs" />
-      <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3290461" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
-      <window_info id="Persistence" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23322147" sideWeight="0.49624866" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
-      <window_info id="JRebel" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16722596" sideWeight="0.50375134" order="5" side_tool="true" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16722596" sideWeight="0.50375134" order="6" side_tool="true" content_ui="tabs" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="CDI" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
-      <window_info id="SVN Properties" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3290461" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32997763" sideWeight="0.5" order="11" side_tool="true" content_ui="tabs" />
-      <window_info id="JRebel remote servers log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="15" side_tool="true" content_ui="tabs" />
-      <window_info id="Database Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32941177" sideWeight="0.5" order="18" side_tool="false" content_ui="tabs" />
-      <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32834226" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-    </layout>
-    <layout-to-restore>
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="FindBugs-IDEA" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="17" side_tool="false" content_ui="tabs" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32406417" sideWeight="0.50503355" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.23101604" sideWeight="0.49776036" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="JRebel Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="18" side_tool="true" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34731543" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="JRebel Executor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="CDI" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
-      <window_info id="SVN Properties" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3290461" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Remote Host" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32997763" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24496645" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.17505592" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.371123" sideWeight="0.49328858" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3272727" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3828877" sideWeight="0.49496645" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3965702" sideWeight="0.49440715" order="12" side_tool="false" content_ui="tabs" />
-      <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3290461" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
-      <window_info id="JRebel remote servers log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="15" side_tool="true" content_ui="tabs" />
-      <window_info id="Persistence" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Database Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32941177" sideWeight="0.5" order="19" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.26901567" sideWeight="0.49624866" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
-      <window_info id="JRebel" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16722596" sideWeight="0.50375134" order="5" side_tool="true" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32937366" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16722596" sideWeight="0.50375134" order="6" side_tool="true" content_ui="tabs" />
-    </layout-to-restore>
-  </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <option name="time" value="16" />
-    </breakpoint-manager>
-    <watches-manager />
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-entitymanager/5.1.0.Final/hibernate-entitymanager-5.1.0.Final-sources.jar!/org/hibernate/jpa/internal/QueryImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="603">
-          <caret line="605" column="24" selection-start-line="605" selection-start-column="24" selection-end-line="605" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/5.1.0.Final/hibernate-core-5.1.0.Final-sources.jar!/org/hibernate/internal/SQLQueryImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="301">
-          <caret line="116" column="16" selection-start-line="116" selection-start-column="16" selection-end-line="116" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/5.1.0.Final/hibernate-core-5.1.0.Final-sources.jar!/org/hibernate/internal/AbstractQueryImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="301">
-          <caret line="1026" column="19" selection-start-line="1026" selection-start-column="19" selection-end-line="1026" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/javax/persistence/hibernate-jpa-2.1-api/1.0.0.Final/hibernate-jpa-2.1-api-1.0.0.Final-sources.jar!/javax/persistence/Query.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="301">
-          <caret line="47" column="9" selection-start-line="47" selection-start-column="9" selection-end-line="47" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/5.1.0.Final/hibernate-core-5.1.0.Final.jar!/org/hibernate/internal/QueryImpl.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="301">
-          <caret line="71" column="16" selection-start-line="71" selection-start-column="16" selection-end-line="71" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-jpa/1.10.4.RELEASE/spring-data-jpa-1.10.4.RELEASE-sources.jar!/org/springframework/data/jpa/repository/Query.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="321">
-          <caret line="72" column="7" selection-start-line="72" selection-start-column="7" selection-end-line="72" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-entitymanager/5.1.0.Final/hibernate-entitymanager-5.1.0.Final-sources.jar!/org/hibernate/jpa/criteria/QueryStructure.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="290">
-          <caret line="69" column="65" selection-start-line="69" selection-start-column="65" selection-end-line="69" selection-end-column="65" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-entitymanager/5.1.0.Final/hibernate-entitymanager-5.1.0.Final-sources.jar!/org/hibernate/jpa/criteria/CriteriaQueryImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="315">
-          <caret line="88" column="29" selection-start-line="88" selection-start-column="29" selection-end-line="88" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/javax/persistence/hibernate-jpa-2.1-api/1.0.0.Final/hibernate-jpa-2.1-api-1.0.0.Final-sources.jar!/javax/persistence/criteria/CriteriaQuery.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="301">
-          <caret line="55" column="21" selection-start-line="55" selection-start-column="21" selection-end-line="55" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/5.1.0.Final/hibernate-core-5.1.0.Final-sources.jar!/org/hibernate/Query.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="290">
-          <caret line="264" column="16" selection-start-line="264" selection-start-column="16" selection-end-line="264" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/1.12.4.RELEASE/spring-data-commons-1.12.4.RELEASE.jar!/org/springframework/data/repository/NoRepositoryBean.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="16" column="18" selection-start-line="16" selection-start-column="18" selection-end-line="16" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/entity/User.java" />
-    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/javax/persistence/hibernate-jpa-2.1-api/1.0.0.Final/hibernate-jpa-2.1-api-1.0.0.Final-sources.jar!/javax/persistence/criteria/Selection.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="193">
-          <caret line="31" column="17" selection-start-line="31" selection-start-column="17" selection-end-line="31" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/repository/BaseRepositoryImpl.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/repository/UserRepositoryCustom.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/repository/UserRepositoryImpl.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/Filter.java" />
-    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/javax/persistence/hibernate-jpa-2.1-api/1.0.0.Final/hibernate-jpa-2.1-api-1.0.0.Final-sources.jar!/javax/persistence/criteria/Root.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="20" column="17" selection-start-line="20" selection-start-column="17" selection-end-line="20" selection-end-column="17" />
-          <folding>
-            <element signature="e#0#934#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/repository/UserRepository.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/service/UserService.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1290">
-          <caret line="68" column="74" selection-start-line="68" selection-start-column="74" selection-end-line="68" selection-end-column="74" />
-          <folding>
-            <element signature="e#1772#1788#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/javax/persistence/hibernate-jpa-2.1-api/1.0.0.Final/hibernate-jpa-2.1-api-1.0.0.Final-sources.jar!/javax/persistence/criteria/CriteriaBuilder.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="171">
-          <caret line="1087" column="14" selection-start-line="1087" selection-start-column="14" selection-end-line="1087" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-entitymanager/5.1.0.Final/hibernate-entitymanager-5.1.0.Final-sources.jar!/org/hibernate/jpa/criteria/CriteriaBuilderImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="431">
-          <caret line="565" column="28" selection-start-line="565" selection-start-column="28" selection-end-line="565" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-entitymanager/5.1.0.Final/hibernate-entitymanager-5.1.0.Final-sources.jar!/org/hibernate/jpa/criteria/predicate/LikePredicate.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="181">
-          <caret line="34" column="11" selection-start-line="34" selection-start-column="11" selection-end-line="34" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/service/PcardOrderService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="175">
-          <caret line="7" column="36" selection-start-line="7" selection-start-column="36" selection-end-line="7" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/PcardAcct.class" />
-    <entry file="file://$PROJECT_DIR$/src/test/resources/PcardAcct.class" />
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/1.12.4.RELEASE/spring-data-commons-1.12.4.RELEASE.jar!/org/springframework/data/domain/Page.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="13" column="28" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_77/src.zip!/java/lang/SuppressWarnings.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="301">
-          <caret line="53" column="18" selection-start-line="53" selection-start-column="18" selection-end-line="53" selection-end-column="18" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/1.12.4.RELEASE/spring-data-commons-1.12.4.RELEASE.jar!/org/springframework/data/domain/AbstractPageRequest.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="301">
-          <caret line="34" column="15" selection-start-line="34" selection-start-column="15" selection-end-line="34" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/1.12.4.RELEASE/spring-data-commons-1.12.4.RELEASE.jar!/org/springframework/data/domain/Pageable.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="275">
-          <caret line="14" column="8" selection-start-line="14" selection-start-column="8" selection-end-line="14" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="174">
-          <caret line="93" column="57" selection-start-line="93" selection-start-column="57" selection-end-line="93" selection-end-column="57" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/entity/PcardOrder.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="275">
-          <caret line="22" column="30" selection-start-line="22" selection-start-column="15" selection-end-line="22" selection-end-column="30" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/service/impl/PcardOrderServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="100">
-          <caret line="9" column="3" selection-start-line="9" selection-start-column="3" selection-end-line="9" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-jpa/1.10.4.RELEASE/spring-data-jpa-1.10.4.RELEASE-sources.jar!/org/springframework/data/jpa/domain/Specification.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="275">
-          <caret line="28" column="17" selection-start-line="28" selection-start-column="17" selection-end-line="28" selection-end-column="17" />
-          <folding>
-            <element signature="e#0#1356#0" expanded="false" />
-            <element signature="imports" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-jpa/1.10.4.RELEASE/spring-data-jpa-1.10.4.RELEASE-sources.jar!/org/springframework/data/jpa/repository/JpaSpecificationExecutor.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="875">
-          <caret line="54" column="26" selection-start-line="54" selection-start-column="26" selection-end-line="54" selection-end-column="26" />
-          <folding>
-            <element signature="e#0#2009#0" expanded="false" />
-            <element signature="imports" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/jpa/Order.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="525">
-          <caret line="24" column="17" selection-start-line="24" selection-start-column="17" selection-end-line="24" selection-end-column="17" />
-          <folding>
-            <element signature="e#717#718#0" expanded="true" />
-            <element signature="e#771#772#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/jpa/Filter.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="9175">
-          <caret line="392" column="23" selection-start-line="392" selection-start-column="23" selection-end-line="392" selection-end-column="23" />
-          <folding>
-            <element signature="imports" expanded="false" />
-            <element signature="e#884#885#0" expanded="false" />
-            <element signature="e#932#933#0" expanded="false" />
-            <element signature="e#1005#1006#0" expanded="false" />
-            <element signature="e#1044#1045#0" expanded="false" />
-            <element signature="e#1096#1097#0" expanded="false" />
-            <element signature="e#1144#1145#0" expanded="false" />
-            <element signature="e#5922#5923#0" expanded="false" />
-            <element signature="e#5953#5954#0" expanded="false" />
-            <element signature="e#6080#6081#0" expanded="false" />
-            <element signature="e#6120#6121#0" expanded="false" />
-            <element signature="e#6219#6220#0" expanded="false" />
-            <element signature="e#6250#6251#0" expanded="false" />
-            <element signature="e#6388#6389#0" expanded="false" />
-            <element signature="e#6428#6429#0" expanded="false" />
-            <element signature="e#6511#6512#0" expanded="false" />
-            <element signature="e#6539#6540#0" expanded="false" />
-            <element signature="e#6655#6656#0" expanded="false" />
-            <element signature="e#6689#6690#0" expanded="false" />
-            <element signature="e#6790#6791#0" expanded="false" />
-            <element signature="e#6823#6824#0" expanded="false" />
-            <element signature="e#6967#6968#0" expanded="false" />
-            <element signature="e#7011#7012#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/9b9d41a7-087f-4d48-b6f5-6a32ff67416e/console.sql">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="50">
-          <caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/repository/PcardOrderRepository.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="12" column="47" selection-start-line="12" selection-start-column="47" selection-end-line="12" selection-end-column="47" />
-          <folding>
-            <element signature="imports" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/repository/BaseRepository.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1900">
-          <caret line="87" column="0" selection-start-line="87" selection-start-column="0" selection-end-line="87" selection-end-column="0" />
-          <folding>
-            <element signature="imports" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/repository/PcardOrderRepositoryImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="100">
-          <caret line="13" column="3" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/repository/PcardOrderRepositoryCustom.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="7" column="0" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/dispatcher-servlet.xml" />
-    <entry file="file://$PROJECT_DIR$/doc/sql.sql">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="425">
-          <caret line="17" column="12" selection-start-line="17" selection-start-column="12" selection-end-line="17" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/controller/OrderController.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="246">
-          <caret line="26" column="44" selection-start-line="26" selection-start-column="44" selection-end-line="26" selection-end-column="44" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="650">
-          <caret line="57" column="32" selection-start-line="57" selection-start-column="32" selection-end-line="57" selection-end-column="32" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/config.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="12" column="35" selection-start-line="12" selection-start-column="35" selection-end-line="12" selection-end-column="35" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/jpa/QueryParams.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="353">
-          <caret line="168" column="9" selection-start-line="168" selection-start-column="9" selection-end-line="168" selection-end-column="9" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/test/UserRepositoryTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="397">
-          <caret line="33" column="22" selection-start-line="33" selection-start-column="22" selection-end-line="33" selection-end-column="22" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>TestJPA:war</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>app</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring|TestJPA</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectJDKs.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: commons-logging:commons-logging:1.2</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/JPA-Demo/TestJPA.iml b/JPA-Demo/TestJPA.iml
deleted file mode 100644
index 4db1ae4..0000000
--- a/JPA-Demo/TestJPA.iml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="web" name="Web">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
-        </webroots>
-        <sourceRoots>
-          <root url="file://$MODULE_DIR$/src/main/java" />
-          <root url="file://$MODULE_DIR$/src/main/resources" />
-        </sourceRoots>
-      </configuration>
-    </facet>
-    <facet type="Spring" name="Spring">
-      <configuration>
-        <fileset id="fileset" name="Spring Application Context" removed="false">
-          <file>file://$MODULE_DIR$/src/main/resources/spring/applicationContext.xml</file>
-          <file>file://$MODULE_DIR$/src/test/resources/spring/applicationContext.xml</file>
-          <file>file://$MODULE_DIR$/src/test/resources/spring/applicationContext.xml</file>
-        </fileset>
-      </configuration>
-    </facet>
-    <facet type="jpa" name="JPA">
-      <configuration>
-        <setting name="validation-enabled" value="true" />
-        <setting name="provider-name" value="" />
-        <datasource-mapping>
-          <factory-entry name="TestJPA" value="9b9d41a7-087f-4d48-b6f5-6a32ff67416e" />
-          <factory-entry name="entityManagerFactory" />
-        </datasource-mapping>
-        <deploymentDescriptor name="persistence.xml" url="file://$MODULE_DIR$/src/main/resources/persistence.xml" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="Tomcat 8.0.30" level="application_server_libraries" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-orm:4.3.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid:1.0.19" level="project" />
-    <orderEntry type="module-library">
-      <library name="Maven: com.alibaba:jconsole:1.8.0">
-        <CLASSES>
-          <root url="jar://C:/Program Files/Java/jdk1.8.0_77/jre/../lib/jconsole.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Maven: com.alibaba:tools:1.8.0">
-        <CLASSES>
-          <root url="jar://C:/Program Files/Java/jdk1.8.0_77/jre/../lib/tools.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.14" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:1.10.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.12.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.7" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.7" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.9" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.1.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
-    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.0" level="project" />
-    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.0.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-entitymanager:5.1.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.34" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.2" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.10" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.3.2" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git "a/JPA-Demo/doc/SpringDataJPA\345\255\246\344\271\240\350\256\260\345\275\225(\345\233\233)--\344\275\277\347\224\250QueryDSL.md" "b/JPA-Demo/doc/SpringDataJPA\345\255\246\344\271\240\350\256\260\345\275\225(\345\233\233)--\344\275\277\347\224\250QueryDSL.md"
new file mode 100644
index 0000000..f5e6277
--- /dev/null
+++ "b/JPA-Demo/doc/SpringDataJPA\345\255\246\344\271\240\350\256\260\345\275\225(\345\233\233)--\344\275\277\347\224\250QueryDSL.md"
@@ -0,0 +1,287 @@
+# SpringDataJPA学习记录(四)--使用QueryDSL
+
+标签（空格分隔）： springJPA
+
+---
+
+1.问题的提出
+-------
+
+最近再看公司项目中有如下代码,看了后简直不能忍.缺点列出来的话,如下:
+1. 返回类型Object[]数组,至于每一个下标对应哪个字段,没法直观的看到,例如object[11]是什么类型?字段名是什么?这个就无法直观得知.
+2. sql中复杂的关系导致不可维护,每一个接手的人都要研究sql半天
+3. 动态拼接条件导致类似的代码会大量重复,所以IDEA打开的时候黄了半边天.
+4. 该查询为分页查询,这样写的话,还要再copy一个count查询才能拿到总数,无疑又是代码重复.
+5. JPA这种框架目的就是少些原生sql语句,大量这样的操作的话,还不如使用dbUtil这样的工具类查询.
+```
+	@Override
+	public List<Object[]> findByPcardCardOrder(
+			PcardCardOrder pcardCardOrder,String applyInstName2,Integer page, Integer rows) {
+		StringBuffer sql = new StringBuffer(
+				"SELECT p.*"
+						+",p2.vcard_make_des" 
+						+",p3.cardnum_rule_id,p3.vtype_nm"
+						+",p4.cn_card_bin,p4.cn_nm"
+						+",p5.inst_id,p5.inst_name,p5.apply_range,p5.card_name,p5.card_type,p5.bin_card_material"
+						+",p6.inst_name AS apply_inst_name "
+						+",p7.inst_name AS apply_inst_name2"
+						+ ",p8.inst_name as receive_inst_name"
+						+ " FROM "
+						+" tbl_pcard_card_order p LEFT JOIN tbl_pcard_vcard_make p2 ON p.make_id = p2.vcard_make_id"
+				     +" LEFT JOIN  tbl_pcard_vtype p3 ON p2.vcard_make_vtype_id=p3.vtype_id"
+				     +" LEFT JOIN  tbl_pcard_cardnum_rule p4 ON p3.cardnum_rule_id=p4.cn_id"
+				     +" LEFT JOIN  tbl_pcard_cardbin p5 ON p4.cn_card_bin=p5.card_bin"
+				     +" LEFT JOIN  tbl_pcard_institution p6 ON p5.apply_range=p6.inst_id"
+				     +" LEFT JOIN  tbl_pcard_institution p7 ON p.apply_inst_id=p7.inst_id"
+				     +" LEFT JOIN  tbl_pcard_institution p8 ON p.receive_inst=p8.inst_id"
+				     +" WHERE 1=1 ");
+		int i = 1;
+		Map<String, Object> map = new HashMap<String, Object>();
+
+		if (!StringUtils.isEmpty(pcardCardOrder.getCordId())) {
+			sql.append(" and p.cord_id=");
+			sql.append("?" + i);
+			map.put(i + "", pcardCardOrder.getCordId());
+			i++;
+		}
+		if (!StringUtils.isEmpty(pcardCardOrder.getAppointMchtcard())) {
+			sql.append(" and p.appoint_mchtcard=");
+			sql.append("?" + i);
+			map.put(i + "", pcardCardOrder.getAppointMchtcard());
+			i++;
+		}
+
+		if (!StringUtils.isEmpty(pcardCardOrder.getMakeId())) {
+			sql.append(" and p.make_id like ");
+			sql.append("?" + i);
+			map.put(i + "","%%"+ pcardCardOrder.getMakeId()+"%%");
+			i++;
+		}
+
+		if (!StringUtils.isEmpty(applyInstName2)) {
+			sql.append(" and p7.inst_name like ");
+			sql.append("?"+i);
+			map.put(i+"","%%"+applyInstName2+"%%");
+			i++;
+		}
+		
+		sql.append(" order by p.ct_dm desc");
+		Query query = entityManager.createNativeQuery(sql.toString());
+		for (String key : map.keySet()) {
+			query.setParameter(key, map.get(key));
+		}
+		if (page != null && rows != null) {
+			query.setFirstResult(rows * (page - 1));
+			query.setMaxResults(rows);
+		}
+		return query.getResultList();
+	}
+```
+
+
+----------
+
+2.使用QueryDSL
+----------
+queryDSL就可以避免上面全部的问题,他有以下特点:
+1. QueryDSL仅仅是一个通用的查询框架，专注于通过Java API构建类型安全的SQL查询。
+2. Querydsl可以通过一组通用的查询API为用户构建出适合不同类型ORM框架或者是SQL的查询语句，也就是说QueryDSL是基于各种ORM框架以及SQL之上的一个通用的查询框架。
+3. 借助QueryDSL可以在任何支持的ORM框架或者SQL平台上以一种通用的API方式来构建查询。目前QueryDSL支持的平台包括JPA,JDO,SQL,Java Collections,RDF,Lucene,Hibernate Search。
+4. 官网地址:[点击进入][1]
+
+###2.1配置到项目
+首先对于queryDSL有两个版本,`com.mysema.querydsl`和`com.querydsl`,前者是3.X系列后者是4.X系列,这里使用的是后者.
+
+第一步:Maven引入依赖:
+```
+    <!--query dsl-->
+    <dependency>
+      <groupId>com.querydsl</groupId>
+      <artifactId>querydsl-jpa</artifactId>
+      <version>${querydsl.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.querydsl</groupId>
+      <artifactId>querydsl-apt</artifactId>
+      <version>${querydsl.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <!--query dsl end-->
+```
+第二步:加入插件,用于生成查询实例
+```
+<!--该插件可以生成querysdl需要的查询对象，执行mvn compile即可-->
+      <plugin>
+        <groupId>com.mysema.maven</groupId>
+        <artifactId>apt-maven-plugin</artifactId>
+        <version>1.1.3</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>process</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>target/generated-sources/java</outputDirectory>
+              <processor>com.querydsl.apt.jpa.JPAAnnotationProcessor</processor>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+```
+执行mvn compile之后,可以找到该`target/generated-sources/java`,然后IDEA标示为源代码目录即可.
+![1.jpg](http://upload-images.jianshu.io/upload_images/2148449-752f2ecd91207128.jpg?imageMogr2/auto-orient/strip%7CimageView2/2/w/1240)
+
+###2.2 单表动态分页查询
+Spring Data JPA中提供了QueryDslPredicateExecutor接口,用于支持QueryDSL的查询操作,这样的话单表动态查询就可以参考如下代码:
+```
+        //动态条件
+        QTCity qtCity = QTCity.tCity;
+        //该Predicate为querydsl下的类,支持嵌套组装复杂查询条件
+        Predicate predicate = qtCity.id.longValue().lt(3)
+                                       .and(qtCity.name.like("shanghai"));
+        //分页排序
+        Sort sort = new Sort(new Sort.Order(Sort.Direction.ASC,"id"));
+        PageRequest pageRequest = new PageRequest(0,10,sort);
+        //查找结果
+        Page<TCity> tCityPage = tCityRepository.findAll(predicate,pageRequest);
+```
+###2.3多表动态查询
+queryDSL对多表查询提供了一个很好地封装,看下面代码:
+```
+    /**
+     * 关联查询示例,查询出城市和对应的旅店
+     * @param predicate 查询条件
+     * @return 查询实体
+     */
+    @Override
+    public List<Tuple> findCityAndHotel(Predicate predicate) {
+        JPAQueryFactory queryFactory = new JPAQueryFactory(em);
+        JPAQuery<Tuple> jpaQuery = queryFactory.select(QTCity.tCity,QTHotel.tHotel)
+                                        .from(QTCity.tCity)
+                                        .leftJoin(QTHotel.tHotel)
+                                        .on(QTHotel.tHotel.city.longValue().eq(QTCity.tCity.id.longValue()));
+        jpaQuery.where(predicate);
+        return jpaQuery.fetch();
+    }
+```
+城市表左连接旅店表,当该旅店属于这个城市时查询出两者的详细字段,存放到一个Tuple的多元组中.相比原生sql,简单清晰了很多.
+那么该怎么调用这个方法呢?
+```
+ @Test
+    public void findByLeftJoin(){
+        QTCity qtCity = QTCity.tCity;
+        QTHotel qtHotel = QTHotel.tHotel;
+        //查询条件
+        Predicate predicate = qtCity.name.like("shanghai");
+        //调用
+        List<Tuple> result = tCityRepository.findCityAndHotel(predicate);
+        //对多元组取出数据,这个和select时的数据相匹配
+        for (Tuple row : result) {
+            System.out.println("qtCity:"+row.get(qtCity));
+            System.out.println("qtHotel:"+row.get(qtHotel));
+            System.out.println("--------------------");
+        }
+        System.out.println(result);
+    }
+```
+下面是自动生成的sql语句:
+```
+select
+        tcity0_.id as id1_0_0_,
+        thotel1_.id as id1_1_1_,
+        tcity0_.country as country2_0_0_,
+        tcity0_.map as map3_0_0_,
+        tcity0_.name as name4_0_0_,
+        tcity0_.state as state5_0_0_,
+        thotel1_.address as address2_1_1_,
+        thotel1_.city as city3_1_1_,
+        thotel1_.name as name4_1_1_ 
+    from
+        t_city tcity0_ 
+    left outer join
+        t_hotel thotel1_ 
+            on (
+                cast(thotel1_.city as signed)=cast(tcity0_.id as signed)
+            ) 
+    where
+        tcity0_.name like ? escape '!'
+```
+
+###2.4 多表动态分页查询
+分页查询对于queryDSL无论什么样的sql只需要写一遍,会自动转换为相应的count查询,也就避免了文章开始的问题4.
+```
+      @Override
+    public QueryResults<Tuple> findCityAndHotelPage(Predicate predicate,Pageable pageable) {
+        JPAQueryFactory queryFactory = new JPAQueryFactory(em);
+        JPAQuery<Tuple> jpaQuery = queryFactory.select(QTCity.tCity.id,QTHotel.tHotel)
+                                               .from(QTCity.tCity)
+                                               .leftJoin(QTHotel.tHotel)
+                                               .on(QTHotel.tHotel.city.longValue().eq(QTCity.tCity.id.longValue()))
+                                               .offset(pageable.getOffset())
+                                               .limit(pageable.getPageSize());
+        return jpaQuery.fetchResults();
+    }
+```
+和上面不同之处在于这里使用了`offset`和`limit`限制查询结果.并且返回一个QueryResults,该类会自动实现count查询和结果查询,并进行封装.
+调用形式如下:
+```
+    @Test
+    public void findByLeftJoinPage(){
+        QTCity qtCity = QTCity.tCity;
+        QTHotel qtHotel = QTHotel.tHotel;
+        //条件
+        Predicate predicate = qtCity.name.like("shanghai");
+        //分页
+        PageRequest pageRequest = new PageRequest(0,10);
+        //调用查询
+        QueryResults<Tuple> result = tCityRepository.findCityAndHotelPage(predicate,pageRequest);
+        //结果取出
+        for (Tuple row : result.getResults()) {
+            System.out.println("qtCity:"+row.get(qtCity));
+            System.out.println("qtHotel:"+row.get(qtHotel));
+            System.out.println("--------------------");
+        }
+        //取出count查询总数
+        System.out.println(result.getTotal());
+    }
+```
+生成的原生sql,当该count查询结果为0的话,则直接返回,并不会再次查询结果:
+```
+    select
+        count(tcity0_.id) as col_0_0_ 
+    from
+        t_city tcity0_ 
+    left outer join
+        t_hotel thotel1_ 
+            on (
+                cast(thotel1_.city as signed)=cast(tcity0_.id as signed)
+            )
+```
+生成的原生sql:
+```
+    select
+        tcity0_.id as col_0_0_,
+        thotel1_.id as col_1_0_,
+        thotel1_.id as id1_1_,
+        thotel1_.address as address2_1_,
+        thotel1_.city as city3_1_,
+        thotel1_.name as name4_1_ 
+    from
+        t_city tcity0_ 
+    left outer join
+        t_hotel thotel1_ 
+            on (
+                cast(thotel1_.city as signed)=cast(tcity0_.id as signed)
+            ) limit ?
+```
+
+3.总结
+----
+仿照上面的例子就可以很好地对文章开头的sql改造,无非是多了几个leftJoin,条件的组装放到service层,或者一个专门组装条件的工厂都可以,对于Repository来说只需要一个predicate即可.
+
+近期逐渐把公司项目切换为queryDSL,个人感觉和Spring Data JPA是绝配.文章写得不是很详细,更多请参考Demo代码:
+
+github: https://github.com/nl101531/JavaWEB
+
+
+  [1]: http://www.querydsl.com/static/querydsl/4.1.3/reference/html_single/
\ No newline at end of file
diff --git a/JPA-Demo/doc/sql.sql b/JPA-Demo/doc/sql.sql
index e69dc00..0a431b6 100644
--- a/JPA-Demo/doc/sql.sql
+++ b/JPA-Demo/doc/sql.sql
@@ -1,6 +1,6 @@
 /*
 SQLyog Ultimate v12.08 (64 bit)
-MySQL - 5.6.19-log : Database - pcard
+MySQL - 5.6.24 : Database - test
 *********************************************************************
 */
 
@@ -13,56 +13,46 @@ MySQL - 5.6.19-log : Database - pcard
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-CREATE DATABASE /*!32312 IF NOT EXISTS*/`pcard` /*!40100 DEFAULT CHARACTER SET utf8 */;
-
-USE `pcard`;
-
-/*Table structure for table `tbl_pcard_order` */
-
-CREATE TABLE `tbl_pcard_order` (
-  `order_id` varchar(255) NOT NULL COMMENT '订单Id',
-  `order_mnt_dt` varchar(255) NOT NULL COMMENT '原所属商户订单日期(追踪对账用)',
-  `order_mnt_time` varchar(255) NOT NULL COMMENT ' 原所属商户订单时间(追踪对账用)',
-  `order_mnt_code` varchar(255) NOT NULL COMMENT '原所属商户订单代码(追踪对账用)',
-  `order_dt` varchar(255) NOT NULL COMMENT '订单日期（yyyyMMdd）',
-  `order_time` varchar(255) NOT NULL COMMENT '订单时间（yyyyMMddHHMISS）',
-  `order_type_id` varchar(255) NOT NULL COMMENT '订单类型，关键字段，确定订单对账户的加金还是减金',
-  `acq_acct_id` varchar(255) DEFAULT NULL COMMENT '订单关联收单账号',
-  `acq_channel_id` varchar(255) DEFAULT NULL COMMENT '不同渠道，当订单加金时候（账户充值，购买虚拟卡）填写',
-  `order_acq_channel_code` varchar(255) DEFAULT NULL COMMENT '不同渠道的订单号，方便对账',
-  `acct_id` varchar(255) DEFAULT NULL COMMENT '订单关联虚拟账号',
-  `order_amt` bigint(20) DEFAULT NULL COMMENT '订单总金额，精确到分',
-  `curr_cd` varchar(255) DEFAULT 'CNY' COMMENT '币别（默认CNY）',
-  `order_st` varchar(2) NOT NULL,
-  `order_resp_cd` varchar(255) NOT NULL COMMENT '订单交易响应码',
-  `order_resp_msg` varchar(500) NOT NULL COMMENT '订单交易响应描述',
-  `create_time` datetime NOT NULL COMMENT '创建时间',
-  `last_modify_time` datetime NOT NULL COMMENT '最后修改时间',
-  `st` varchar(1) NOT NULL COMMENT '状态(0:可用,1:不可用)',
-  `vcard_id` varchar(255) DEFAULT NULL COMMENT '支付卡号,便于按卡号查询交易记录',
-  `dis_amt` bigint(20) DEFAULT NULL COMMENT '优惠金额,便于统计',
-  `pay_amt` bigint(20) DEFAULT NULL,
-  `order_mnt_id` varchar(255) DEFAULT NULL COMMENT '商户号',
-  `term_id` varchar(20) DEFAULT NULL COMMENT '终端号',
-  `order_reserved` varchar(512) DEFAULT NULL COMMENT '保留域',
-  `txn_type` varchar(12) DEFAULT NULL COMMENT '子交易类型',
-  `resp_st` varchar(2) DEFAULT '0' COMMENT '00 ',
-  `ref_no` varchar(64) DEFAULT NULL COMMENT '检索号',
-  `sources` varchar(255) DEFAULT NULL COMMENT '来源',
-  `versions` varchar(255) DEFAULT NULL,
-  `bank_card` varchar(255) DEFAULT NULL COMMENT '所属银行卡',
-  `pay_type` varchar(255) DEFAULT NULL COMMENT '支付方式 ',
-  `is_scancode` char(1) DEFAULT NULL COMMENT '是否为扫码订单',
-  `scancode` char(36) DEFAULT NULL COMMENT '条形码+二维码',
-  `eancode` char(18) DEFAULT NULL,
-  `inst_id` varchar(64) DEFAULT NULL COMMENT '机构号',
-  `return_url` varchar(512) DEFAULT NULL COMMENT '同步返回',
-  `notify_url` varchar(512) DEFAULT NULL COMMENT '异步通知',
-  `app_id` varchar(64) DEFAULT NULL COMMENT '应用ID',
-  PRIMARY KEY (`order_id`),
-  UNIQUE KEY `seq_order_mnt_code__id` (`order_mnt_dt`,`order_mnt_code`) USING HASH,
-  KEY `UNQ_mnt_time` (`order_mnt_time`) USING HASH
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+CREATE DATABASE /*!32312 IF NOT EXISTS*/`test` /*!40100 DEFAULT CHARACTER SET latin1 */;
+
+USE `test`;
+
+/*Table structure for table `t_city` */
+
+CREATE TABLE `t_city` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(30) DEFAULT NULL,
+  `state` varchar(30) DEFAULT NULL,
+  `country` varchar(30) DEFAULT NULL,
+  `map` varchar(30) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=latin1;
+
+/*Data for the table `t_city` */
+
+LOCK TABLES `t_city` WRITE;
+
+insert  into `t_city`(`id`,`name`,`state`,`country`,`map`) values (2,'ShangHai','China.ShangHai','China','1'),(3,'NanJing','China.NanJing','China','1'),(4,'BeiJing','China.BeiJing','China','1'),(5,'GuangDong','China.GuangDong','China','1'),(6,'ShanDong','China.ShanDong','China','0');
+
+UNLOCK TABLES;
+
+/*Table structure for table `t_hotel` */
+
+CREATE TABLE `t_hotel` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(30) DEFAULT NULL,
+  `address` varchar(255) DEFAULT NULL,
+  `city` int(11) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=latin1;
+
+/*Data for the table `t_hotel` */
+
+LOCK TABLES `t_hotel` WRITE;
+
+insert  into `t_hotel`(`id`,`name`,`address`,`city`) values (1,'ShangHai.HutaiLu','Seven.Day',2),(2,'ShangHai.HongQiao','MoTai',2),(3,'ShangHai.JiangXi','HanTing',2),(4,'ShangHai.RenMin','Eight.Day',2),(5,'ShangHai','Nine.Day',2),(8,'BeiJing','Seven.Day',3),(9,'BeiJing','Nine.Day',3),(10,'NanJing','MoTai',4),(11,'NanJing','HanTing',4),(12,'GuangDong','Nine.Day',5),(13,'GuangDong','Eight.Day',5);
+
+UNLOCK TABLES;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
diff --git a/JPA-Demo/pom.xml b/JPA-Demo/pom.xml
index 76956c5..c9cbbc4 100644
--- a/JPA-Demo/pom.xml
+++ b/JPA-Demo/pom.xml
@@ -1,11 +1,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>cn.mrdear.testjpa</groupId>
-  <artifactId>testjpa</artifactId>
+  <groupId>cn.mrdear</groupId>
+  <artifactId>JPA-Demo</artifactId>
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
-  <name>testjpa Maven Webapp</name>
+  <name>JPA-Demo</name>
   <url>http://maven.apache.org</url>
 
   <!--配置版本号-->
@@ -13,6 +13,7 @@
     <mysql.version>5.1.34</mysql.version>
     <spring.version>4.3.0.RELEASE</spring.version>
     <hibernate.version>5.1.0.Final</hibernate.version>
+    <querydsl.version>4.1.4</querydsl.version>
   </properties>
 
   <dependencies>
@@ -57,6 +58,11 @@
       <artifactId>spring-web</artifactId>
       <version>${spring.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
     <!-- Spring Framework end-->
 
     <!--alibaba start-->
@@ -65,11 +71,6 @@
       <artifactId>druid</artifactId>
       <version>1.0.19</version>
     </dependency>
-    <dependency>
-      <groupId>com.alibaba</groupId>
-      <artifactId>fastjson</artifactId>
-      <version>1.2.14</version>
-    </dependency>
     <!--alibaba end-->
 
     <!--JPA start-->
@@ -92,7 +93,6 @@
       <version>${hibernate.version}</version>
     </dependency>
     <!--hibernate end-->
-
     <!--mysql start-->
     <dependency>
       <groupId>mysql</groupId>
@@ -126,7 +126,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.10</version>
+      <version>4.12</version>
       <scope>test</scope>
     </dependency>
     <!--test end-->
@@ -137,10 +137,42 @@
       <version>3.3.2</version>
     </dependency>
     <!--common end-->
+    <!--query dsl-->
+    <dependency>
+      <groupId>com.querydsl</groupId>
+      <artifactId>querydsl-jpa</artifactId>
+      <version>${querydsl.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.querydsl</groupId>
+      <artifactId>querydsl-apt</artifactId>
+      <version>${querydsl.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <!--query dsl end-->
   </dependencies>
+
   <build>
     <finalName>testjpa</finalName>
     <plugins>
+      <!--该插件可以生成querysdl需要的查询对象，执行mvn compile即可-->
+      <plugin>
+        <groupId>com.mysema.maven</groupId>
+        <artifactId>apt-maven-plugin</artifactId>
+        <version>1.1.3</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>process</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>target/generated-sources/java</outputDirectory>
+              <processor>com.querydsl.apt.jpa.JPAAnnotationProcessor</processor>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
@@ -149,6 +181,7 @@
           <target>1.8</target>
         </configuration>
       </plugin>
+
     </plugins>
   </build>
 </project>
diff --git a/JPA-Demo/src/main/java/cn/mrdear/entity/PcardOrder.java b/JPA-Demo/src/main/java/cn/mrdear/entity/PcardOrder.java
deleted file mode 100644
index a23c86f..0000000
--- a/JPA-Demo/src/main/java/cn/mrdear/entity/PcardOrder.java
+++ /dev/null
@@ -1,447 +0,0 @@
-/*
- * Copyright 2016, China MPay Co., Ltd. All right reserved.
- *
- * THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF CHINA MPAY CO., LTD. THE CONTENTS OF THIS FILE MAY NOT BE
- * DISCLOSED TO THIRD PARTIES, COPIED OR DUPLICATED IN ANY FORM, IN WHOLE OR IN PART, WITHOUT THE PRIOR WRITTEN
- * PERMISSION OF CHINA MPAY CO., LTD.
- */
-package cn.mrdear.entity;
-
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-
-/**
- * 交易订单流水表，是否有冲正，取消，终止之类 17
- *
- * */
-@Entity
-@Table(name = "tbl_pcard_order")
-public class PcardOrder implements java.io.Serializable {
-	/**
-	 *
-	 */
-	private static final long serialVersionUID = 1L;
-	@Id
-	@Column(name = "order_id")
-	private String orderId;// 订单ID
-	@Column(name = "order_mnt_dt")
-	private String orderMntDt;// 原所属商户订单日期(追踪对账用)
-	@Column(name = "order_mnt_time")
-	private String orderMntTime;// 原所属商户订单时间(追踪对账用)
-	@Column(name = "order_mnt_code")
-	private String orderMntCode;// 商户提交的交易订单号
-	@Column(name = "order_mnt_id")
-	private String orderMntId; // 原所属商户号
-	@Column(name = "order_dt")
-	private String orderDt;// 订单日期（yyyyMMdd）
-	@Column(name = "order_time")
-	private String orderTime;// 订单时间（yyyyMMddHHMISS）
-	@Column(name = "order_type_id")
-	private String orderTypeId;// 订单类型，关键字段，确定订单对账户的加金还是减金
-	@Column(name = "acq_acct_id")
-	private String acqAcctId;// 订单关联收单账号
-	@Column(name = "acq_channel_id")
-	private String acqChannelId;// 不同渠道，当订单加金时候（账户充值，购买虚拟卡）填写
-	@Column(name = "order_acq_channel_code")
-	private String orderAcqChannelCode;// 不同渠道的订单号，方便对账
-	@Column(name = "acct_id")
-	private String acctId;// 订单关联虚拟账号
-	@Column(name = "order_amt")
-	private Long orderAmt; // 订单金额，精确到分
-	@Column(name = "curr_cd")
-	private String currCd;// 订单币别，默认CNY
-	@Column(name = "order_st")
-	private String orderSt;// 订单状态
-	@Column(name = "order_resp_cd")
-	private String orderRespCd;// 订单交易响应码
-	@Column(name = "order_resp_msg")
-	private String orderRespMsg;// 订单交易响应描述
-	@Column(name = "create_time")
-	private Date createTime; // 创建时间
-	@Column(name = "last_modify_time")
-	private Date lastModifyTime;// 最后修改时间
-	@Column(name = "st")
-	private String st; // 状态(0:可用,1:不可用)
-	@Column(name = "vcard_id")
-	private String vcardId; // 支付卡号
-	@Column(name = "dis_amt")
-	private Long disAmt; // 优惠金额,便于统计
-	@Column(name = "pay_amt")
-	private Long payAmt; // 支付金额
-	@Column(name = "term_id")
-	private String termId;// 终端号
-	// term_id,order_reserved,retrivl_ref
-	@Column(name = "order_reserved")
-	private String orderReserved;// 保留域
-	@Column(name = "txn_type")
-	private String txnType;// 交易类型
-	@Column(name = "resp_st")
-	private String respSt;// 状态00 正常 01 已消费撤销 02 已消费冲正 03 已消费撤销冲正 04 已退貨
-	@Column(name = "ref_no")
-	private String refNo;// 检索引用号
-	@Column(name = "versions")
-	private String versions;
-	@Column(name = "sources")
-	private String sources;
-	@Column(name = "bank_card")
-	// 所属银行
-	private String bank_card;
-
-	// 支付方式
-	@Column(name = "pay_type")
-	private String pay_type;
-	@Column(name = "is_scancode")
-	private String isScancode;// 是否为扫码订单
-	@Column(name = "scancode")
-	private String scancode;// 扫码编号
-	@Column(name = "eancode")
-	private String eancode;// 条形码
-	@Column(name = "inst_id")
-	private String instId; // 机构号
-	@Column(name = "return_url")
-	private String returnUrl; // 同步返回地址
-	@Column(name = "notify_url")
-	private String notifyUrl;// 异步通知地址
-	@Column(name = "app_id")
-	private String appId; // 应用ID
-
-	public void setAppId(String appId) {
-		this.appId = appId;
-	}
-
-	public String getAppId() {
-		return appId;
-	}
-
-	public void setReturnUrl(String returnUrl) {
-		this.returnUrl = returnUrl;
-	}
-
-	public String getReturnUrl() {
-		return returnUrl;
-	}
-
-	public void setNotifyUrl(String notifyUrl) {
-		this.notifyUrl = notifyUrl;
-	}
-
-	public String getNotifyUrl() {
-		return notifyUrl;
-	}
-
-	public void setInstId(String instId) {
-		this.instId = instId;
-	}
-
-	public String getInstId() {
-		return instId;
-	}
-
-	public void setIsScancode(String isScancode) {
-		this.isScancode = isScancode;
-	}
-
-	public String getIsScancode() {
-		return isScancode;
-	}
-
-	public void setScancode(String scancode) {
-		this.scancode = scancode;
-	}
-
-	public void setEancode(String eancode) {
-		this.eancode = eancode;
-	}
-
-	public String getEancode() {
-		return eancode;
-	}
-
-	public String getScancode() {
-		return scancode;
-	}
-
-	public String getBank_card() {
-		return bank_card;
-	}
-
-	public void setBank_card(String bank_card) {
-		this.bank_card = bank_card;
-	}
-
-	public String getPay_type() {
-		return pay_type;
-	}
-
-	public void setPay_type(String pay_type) {
-		this.pay_type = pay_type;
-	}
-
-	public String getVersions() {
-		return versions;
-	}
-
-	public void setVersions(String versions) {
-		this.versions = versions;
-	}
-
-	public String getSources() {
-		return sources;
-	}
-
-	public void setSources(String sources) {
-		this.sources = sources;
-	}
-
-	public void setRefNo(String refNo) {
-		this.refNo = refNo;
-	}
-
-	public String getRefNo() {
-		return refNo;
-	}
-
-	public void setOrderReserved(String orderReserved) {
-		this.orderReserved = orderReserved;
-	}
-
-	public String getOrderReserved() {
-		return orderReserved;
-	}
-
-	public void setTxnType(String txnType) {
-		this.txnType = txnType;
-	}
-
-	public String getTxnType() {
-		return txnType;
-	}
-
-	public void setRespSt(String respSt) {
-		this.respSt = respSt;
-	}
-
-	public String getRespSt() {
-		return respSt;
-	}
-
-	public void setTermId(String termId) {
-		this.termId = termId;
-	}
-
-	public String getTermId() {
-		return termId;
-	}
-
-	public String getVcardId() {
-		return vcardId;
-	}
-
-	public void setVcardId(String vcardId) {
-		this.vcardId = vcardId;
-	}
-
-	public Long getDisAmt() {
-		return disAmt;
-	}
-
-	public void setDisAmt(Long disAmt) {
-		this.disAmt = disAmt;
-	}
-
-	public Long getPayAmt() {
-		return payAmt;
-	}
-
-	public void setPayAmt(Long payAmt) {
-		this.payAmt = payAmt;
-	}
-
-	public void setOrderMntId(String orderMntId) {
-		this.orderMntId = orderMntId;
-	}
-
-	public String getOrderMntId() {
-		return orderMntId;
-	}
-
-	public String getSt() {
-		return st;
-	}
-
-	public void setSt(String st) {
-		this.st = st;
-	}
-
-	public String getOrderId() {
-		return orderId;
-	}
-
-	public void setOrderId(String orderId) {
-		this.orderId = orderId;
-	}
-
-	public String getOrderMntDt() {
-		return orderMntDt;
-	}
-
-	public void setOrderMntDt(String orderMntDt) {
-		this.orderMntDt = orderMntDt;
-	}
-
-	public String getOrderTime() {
-		return orderTime;
-	}
-
-	public void setOrderTime(String orderTime) {
-		this.orderTime = orderTime;
-	}
-
-	public String getOrderMntTime() {
-		return orderMntTime;
-	}
-
-	public void setOrderMntTime(String orderMntTime) {
-		this.orderMntTime = orderMntTime;
-	}
-
-	public String getOrderMntCode() {
-		return orderMntCode;
-	}
-
-	public void setOrderMntCode(String orderMntCode) {
-		this.orderMntCode = orderMntCode;
-	}
-
-	public String getOrderDt() {
-		return orderDt;
-	}
-
-	public void setOrderDt(String orderDt) {
-		this.orderDt = orderDt;
-	}
-
-	public String getOrderTypeId() {
-		return orderTypeId;
-	}
-
-	public void setOrderTypeId(String orderTypeId) {
-		this.orderTypeId = orderTypeId;
-	}
-
-	public String getOrderSt() {
-		return orderSt;
-	}
-
-	public void setOrderSt(String orderSt) {
-		this.orderSt = orderSt;
-	}
-
-	public String getAcqAcctId() {
-		return acqAcctId;
-	}
-
-	public void setAcqAcctId(String acqAcctId) {
-		this.acqAcctId = acqAcctId;
-	}
-
-	public String getAcqChannelId() {
-		return acqChannelId;
-	}
-
-	public void setAcqChannelId(String acqChannelId) {
-		this.acqChannelId = acqChannelId;
-	}
-
-	public String getOrderAcqChannelCode() {
-		return orderAcqChannelCode;
-	}
-
-	public void setOrderAcqChannelCode(String orderAcqChannelCode) {
-		this.orderAcqChannelCode = orderAcqChannelCode;
-	}
-
-	public String getAcctId() {
-		return acctId;
-	}
-
-	public void setAcctId(String acctId) {
-		this.acctId = acctId;
-	}
-
-	public Long getOrderAmt() {
-		return orderAmt;
-	}
-
-	public void setOrderAmt(Long orderAmt) {
-		this.orderAmt = orderAmt;
-	}
-
-	public String getCurrCd() {
-		return currCd;
-	}
-
-	public void setCurrCd(String currCd) {
-		this.currCd = currCd;
-	}
-
-	public String getOrderRespCd() {
-		return orderRespCd;
-	}
-
-	public void setOrderRespCd(String orderRespCd) {
-		this.orderRespCd = orderRespCd;
-	}
-
-	public String getOrderRespMsg() {
-		return orderRespMsg;
-	}
-
-	public void setOrderRespMsg(String orderRespMsg) {
-		this.orderRespMsg = orderRespMsg;
-	}
-
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-
-	public Date getLastModifyTime() {
-		return lastModifyTime;
-	}
-
-	public void setLastModifyTime(Date lastModifyTime) {
-		this.lastModifyTime = lastModifyTime;
-	}
-
-	@Override
-	public String toString() {
-		return "PcardOrder [orderId=" + orderId + ", orderMntDt=" + orderMntDt
-				+ ", orderMntTime=" + orderMntTime + ", orderMntCode="
-				+ orderMntCode + ", orderMntId=" + orderMntId + ", orderDt="
-				+ orderDt + ", orderTime=" + orderTime + ", orderTypeId="
-				+ orderTypeId + ", acqAcctId=" + acqAcctId + ", acqChannelId="
-				+ acqChannelId + ", orderAcqChannelCode=" + orderAcqChannelCode
-				+ ", acctId=" + acctId + ", orderAmt=" + orderAmt + ", currCd="
-				+ currCd + ", orderSt=" + orderSt + ", orderRespCd="
-				+ orderRespCd + ", orderRespMsg=" + orderRespMsg
-				+ ", createTime=" + createTime + ", lastModifyTime="
-				+ lastModifyTime + ", st=" + st + ", vcardId=" + vcardId
-				+ ", disAmt=" + disAmt + ", payAmt=" + payAmt + ", termId="
-				+ termId + ", orderReserved=" + orderReserved + ", txnType="
-				+ txnType + ", respSt=" + respSt + ", refNo=" + refNo
-				+ ", versions=" + versions + ", sources=" + sources
-				+ ", bank_card=" + bank_card + ", pay_type=" + pay_type
-				+ ", isScancode=" + isScancode + ", scancode=" + scancode
-				+ ", eancode=" + eancode + "]";
-	}
-
-}
diff --git a/JPA-Demo/src/main/java/cn/mrdear/entity/TCity.java b/JPA-Demo/src/main/java/cn/mrdear/entity/TCity.java
new file mode 100644
index 0000000..b8d5a47
--- /dev/null
+++ b/JPA-Demo/src/main/java/cn/mrdear/entity/TCity.java
@@ -0,0 +1,100 @@
+package cn.mrdear.entity;
+
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * @author Niu Li
+ * @date 2017/1/7
+ */
+@Entity
+@Table(name = "t_city", schema = "test", catalog = "")
+public class TCity {
+    private int id;
+
+    @Id
+    @Column(name = "id", nullable = false)
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    private String name;
+
+    @Basic
+    @Column(name = "name", nullable = true, length = 30)
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    private String state;
+
+    @Basic
+    @Column(name = "state", nullable = true, length = 30)
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    private String country;
+
+    @Basic
+    @Column(name = "country", nullable = true, length = 30)
+    public String getCountry() {
+        return country;
+    }
+
+
+    public void setCountry(String country) {
+        this.country = country;
+    }    private String map;
+
+    @Basic
+    @Column(name = "map", nullable = true, length = 30)
+    public String getMap() {
+        return map;
+    }
+
+    public void setMap(String map) {
+        this.map = map;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        TCity tCity = (TCity) o;
+
+        if (id != tCity.id) return false;
+        if (name != null ? !name.equals(tCity.name) : tCity.name != null) return false;
+        if (state != null ? !state.equals(tCity.state) : tCity.state != null) return false;
+        if (country != null ? !country.equals(tCity.country) : tCity.country != null) return false;
+        if (map != null ? !map.equals(tCity.map) : tCity.map != null) return false;
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = id;
+        result = 31 * result + (name != null ? name.hashCode() : 0);
+        result = 31 * result + (state != null ? state.hashCode() : 0);
+        result = 31 * result + (country != null ? country.hashCode() : 0);
+        result = 31 * result + (map != null ? map.hashCode() : 0);
+        return result;
+    }
+}
diff --git a/JPA-Demo/src/main/java/cn/mrdear/entity/THotel.java b/JPA-Demo/src/main/java/cn/mrdear/entity/THotel.java
new file mode 100644
index 0000000..68f2d06
--- /dev/null
+++ b/JPA-Demo/src/main/java/cn/mrdear/entity/THotel.java
@@ -0,0 +1,86 @@
+package cn.mrdear.entity;
+
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+/**
+ * @author Niu Li
+ * @date 2017/1/7
+ */
+@Entity
+@javax.persistence.Table(name = "t_hotel", schema = "test", catalog = "")
+public class THotel {
+    private int id;
+
+    @Id
+    @javax.persistence.Column(name = "id", nullable = false)
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    private String name;
+
+    @Basic
+    @javax.persistence.Column(name = "name", nullable = true, length = 30)
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    private String address;
+
+    @Basic
+    @javax.persistence.Column(name = "address", nullable = true, length = 255)
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    private Integer city;
+
+    @Basic
+    @javax.persistence.Column(name = "city", nullable = true)
+    public Integer getCity() {
+        return city;
+    }
+
+    public void setCity(Integer city) {
+        this.city = city;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        THotel tHotel = (THotel) o;
+
+        if (id != tHotel.id) return false;
+        if (name != null ? !name.equals(tHotel.name) : tHotel.name != null) return false;
+        if (address != null ? !address.equals(tHotel.address) : tHotel.address != null)
+            return false;
+        if (city != null ? !city.equals(tHotel.city) : tHotel.city != null) return false;
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = id;
+        result = 31 * result + (name != null ? name.hashCode() : 0);
+        result = 31 * result + (address != null ? address.hashCode() : 0);
+        result = 31 * result + (city != null ? city.hashCode() : 0);
+        return result;
+    }
+}
diff --git a/JPA-Demo/src/main/java/cn/mrdear/repository/BaseRepository.java b/JPA-Demo/src/main/java/cn/mrdear/repository/BaseRepository.java
index 8b21556..7c12317 100644
--- a/JPA-Demo/src/main/java/cn/mrdear/repository/BaseRepository.java
+++ b/JPA-Demo/src/main/java/cn/mrdear/repository/BaseRepository.java
@@ -1,87 +1,19 @@
 package cn.mrdear.repository;
 
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.data.repository.NoRepositoryBean;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import cn.mrdear.entity.PcardOrder;
-import cn.mrdear.jpa.Filter;
-import cn.mrdear.jpa.QueryParams;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
 
 /**
- * 公共方法的repository
  * @author Niu Li
- * @date 2016/11/17
+ * @date 2017/1/8
  */
 @NoRepositoryBean
 public class BaseRepository {
 
-    private static Logger logger = LoggerFactory.getLogger(BaseRepository.class);
-
-    /**
-     * 分析查询参数,并且合并到sql语句中
-     * @param sql JPQL查询语句
-     * @param params 查询参数
-     * @return 参数对应的value
-     */
-    @SuppressWarnings("Unchecked")
-    protected List<Object> analysisQueryParams(StringBuilder sql, QueryParams<?> params){
-        List<String> strList = new ArrayList<>();
-        List<Object> valueList = new ArrayList<>();
-        int i = 1;
-        //分析or条件
-        for (Filter filter : params.getOrFilters()) {
-            if (filter.getValue() != null){
-                strList.add(filter.getProperty()+" " + filter.getOperator().getOperator()+" ?" + (i++));
-                valueList.add(filter.getValue());
-            }else {
-                strList.add(filter.getProperty()+" " + filter.getOperator().getOperator()+" ");
-            }
-        }
-        if (!strList.isEmpty()){
-            sql.append(" and ").append("( ").append(StringUtils.join(strList," or ")).append(" )");
-        }
-        strList.clear();
-        //分析and条件
-        for (Filter filter : params.getAndFilters()) {
-            if (filter.getValue() != null){
-                strList.add(filter.getProperty()+" " + filter.getOperator().getOperator()+" ?" + (i++));
-                valueList.add(filter.getValue());
-            }else {
-                strList.add(filter.getProperty()+" " + filter.getOperator().getOperator()+" ");
-            }
-        }
-        sql.append(" and ").append(StringUtils.join(strList," and "));
-        //分析排序字段
-        if (!params.getOrders().isEmpty()){
-            sql.append(" order by ");
-            sql.append(StringUtils.join(params.getOrders(),","));
-        }
-        logger.debug("解析后的sql:"+sql.toString());
-        logger.debug("对应的值为:"+valueList);
-        return valueList;
-    }
-
-
-	public static void main(String[] args) {
-		StringBuilder sql = new StringBuilder("select count(*) from PcardAcctChange p where 1=1 ");
-		QueryParams<PcardOrder> queryParams = new QueryParams<>();
-		queryParams.or(Filter.eq("username","niuli"));
-		queryParams.or(Filter.eq("passwd",1234));
-		queryParams.or(Filter.eq("date",new Date()));
-		queryParams.and(Filter.isNotNull("nickname"));
-		queryParams.orderDESC("date");
-		queryParams.orderASC("date3");
+    @PersistenceContext(unitName = "TestJPA")
+    protected EntityManager em;
 
-        BaseRepository baseRepository = new BaseRepository();
-		List<Object> objects = baseRepository.analysisQueryParams(sql,queryParams);
-		System.out.println(sql);
-		System.out.println(objects);
-	}
 
 }
diff --git a/JPA-Demo/src/main/java/cn/mrdear/repository/PcardOrderRepository.java b/JPA-Demo/src/main/java/cn/mrdear/repository/PcardOrderRepository.java
deleted file mode 100644
index 94267a4..0000000
--- a/JPA-Demo/src/main/java/cn/mrdear/repository/PcardOrderRepository.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package cn.mrdear.repository;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-
-import cn.mrdear.entity.PcardOrder;
-
-/**
- * @author Niu Li
- * @date 2016/11/17
- */
-public interface PcardOrderRepository extends JpaRepository<PcardOrder,String>
-        ,PcardOrderRepositoryCustom,JpaSpecificationExecutor<PcardOrder> {
-
-}
diff --git a/JPA-Demo/src/main/java/cn/mrdear/repository/PcardOrderRepositoryCustom.java b/JPA-Demo/src/main/java/cn/mrdear/repository/PcardOrderRepositoryCustom.java
deleted file mode 100644
index dfcf6a4..0000000
--- a/JPA-Demo/src/main/java/cn/mrdear/repository/PcardOrderRepositoryCustom.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.mrdear.repository;
-
-import org.springframework.data.domain.Pageable;
-
-import java.util.List;
-
-import cn.mrdear.jpa.QueryParams;
-
-/**
- * @author Niu Li
- * @date 2016/11/17
- */
-public interface PcardOrderRepositoryCustom {
-
-    List findByQueryParam(QueryParams queryParams, Pageable pageable);
-}
diff --git a/JPA-Demo/src/main/java/cn/mrdear/repository/PcardOrderRepositoryImpl.java b/JPA-Demo/src/main/java/cn/mrdear/repository/PcardOrderRepositoryImpl.java
deleted file mode 100644
index 3e7cbe5..0000000
--- a/JPA-Demo/src/main/java/cn/mrdear/repository/PcardOrderRepositoryImpl.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package cn.mrdear.repository;
-
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.repository.NoRepositoryBean;
-
-import java.util.List;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
-
-import cn.mrdear.jpa.QueryParams;
-
-/**
- * @author Niu Li
- * @date 2016/11/18
- */
-@NoRepositoryBean
-public class PcardOrderRepositoryImpl extends BaseRepository implements PcardOrderRepositoryCustom {
-
-    @PersistenceContext
-    private EntityManager entityManager;
-    @Override
-    public List findByQueryParam(QueryParams queryParams, Pageable pageable) {
-        StringBuilder sql = new StringBuilder("select * from tbl_pcard_order where 1=1 ");
-        List values = analysisQueryParams(sql,queryParams);
-        Query query = entityManager.createNativeQuery(sql.toString());
-        for (int i = 0; i < values.size(); i++) {
-            query.setParameter(i+1,values.get(i));
-        }
-        query.setFirstResult(pageable.getOffset());
-        query.setMaxResults(pageable.getPageSize());
-        return query.getResultList();
-    }
-}
diff --git a/JPA-Demo/src/main/java/cn/mrdear/repository/TCityRepository.java b/JPA-Demo/src/main/java/cn/mrdear/repository/TCityRepository.java
new file mode 100644
index 0000000..470bfb2
--- /dev/null
+++ b/JPA-Demo/src/main/java/cn/mrdear/repository/TCityRepository.java
@@ -0,0 +1,14 @@
+package cn.mrdear.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.querydsl.QueryDslPredicateExecutor;
+
+import cn.mrdear.entity.TCity;
+
+/**
+ * @author Niu Li
+ * @date 2017/1/7
+ */
+public interface TCityRepository extends JpaRepository<TCity,Long>,QueryDslPredicateExecutor<TCity>, cn.mrdear.repository.custom.TCityRepositoryCustom {
+
+}
diff --git a/JPA-Demo/src/main/java/cn/mrdear/repository/THotelRepository.java b/JPA-Demo/src/main/java/cn/mrdear/repository/THotelRepository.java
new file mode 100644
index 0000000..f8cc86a
--- /dev/null
+++ b/JPA-Demo/src/main/java/cn/mrdear/repository/THotelRepository.java
@@ -0,0 +1,8 @@
+package cn.mrdear.repository;
+
+/**
+ * @author Niu Li
+ * @date 2017/1/7
+ */
+public interface THotelRepository {
+}
diff --git a/JPA-Demo/src/main/java/cn/mrdear/repository/custom/TCityRepositoryCustom.java b/JPA-Demo/src/main/java/cn/mrdear/repository/custom/TCityRepositoryCustom.java
new file mode 100644
index 0000000..1a16eb1
--- /dev/null
+++ b/JPA-Demo/src/main/java/cn/mrdear/repository/custom/TCityRepositoryCustom.java
@@ -0,0 +1,29 @@
+package cn.mrdear.repository.custom;
+
+import com.querydsl.core.QueryResults;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Predicate;
+
+import org.springframework.data.domain.Pageable;
+
+import java.util.List;
+
+/**
+ * @author Niu Li
+ * @date 2017/1/7
+ */
+public interface TCityRepositoryCustom {
+    /**
+     * 关联查询示例,查询出城市和对应的旅店
+     * @param predicate 查询条件
+     * @return 查询实体
+     */
+    public List<Tuple> findCityAndHotel(Predicate predicate);
+
+    /**
+     * 关联查询示例,查询出城市和对应的旅店
+     * @param predicate 查询条件
+     * @return 查询实体
+     */
+    public QueryResults<Tuple> findCityAndHotelPage(Predicate predicate,Pageable pageable);
+}
diff --git a/JPA-Demo/src/main/java/cn/mrdear/repository/custom/TCityRepositoryImpl.java b/JPA-Demo/src/main/java/cn/mrdear/repository/custom/TCityRepositoryImpl.java
new file mode 100644
index 0000000..4ddde14
--- /dev/null
+++ b/JPA-Demo/src/main/java/cn/mrdear/repository/custom/TCityRepositoryImpl.java
@@ -0,0 +1,46 @@
+package cn.mrdear.repository.custom;
+
+import com.querydsl.core.QueryResults;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.jpa.impl.JPAQuery;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+
+import org.springframework.data.domain.Pageable;
+
+import java.util.List;
+
+import cn.mrdear.entity.QTCity;
+import cn.mrdear.entity.QTHotel;
+import cn.mrdear.repository.BaseRepository;
+
+/**
+ * @author Niu Li
+ * @date 2017/1/7
+ */
+public class TCityRepositoryImpl extends BaseRepository implements TCityRepositoryCustom {
+
+    @Override
+    public List<Tuple> findCityAndHotel(Predicate predicate) {
+        JPAQueryFactory queryFactory = new JPAQueryFactory(em);
+        JPAQuery<Tuple> jpaQuery = queryFactory.select(QTCity.tCity,QTHotel.tHotel)
+                                        .from(QTCity.tCity)
+                                        .leftJoin(QTHotel.tHotel)
+                                               .on(QTHotel.tHotel.city.longValue().eq(QTCity.tCity.id.longValue()));
+        jpaQuery.where(predicate);
+        return jpaQuery.fetch();
+    }
+
+    @Override
+    public QueryResults<Tuple> findCityAndHotelPage(Predicate predicate,Pageable pageable) {
+        JPAQueryFactory queryFactory = new JPAQueryFactory(em);
+        JPAQuery<Tuple> jpaQuery = queryFactory.select(QTCity.tCity.id,QTHotel.tHotel)
+                                               .from(QTCity.tCity)
+                                               .leftJoin(QTHotel.tHotel)
+                                               .on(QTHotel.tHotel.city.longValue().eq(QTCity.tCity.id.longValue()))
+                                               .offset(pageable.getOffset())
+                                               .limit(pageable.getPageSize());
+        return jpaQuery.fetchResults();
+    }
+
+}
diff --git a/JPA-Demo/src/main/java/cn/mrdear/repository/custom/THotelRepositoryCustom.java b/JPA-Demo/src/main/java/cn/mrdear/repository/custom/THotelRepositoryCustom.java
new file mode 100644
index 0000000..960f94a
--- /dev/null
+++ b/JPA-Demo/src/main/java/cn/mrdear/repository/custom/THotelRepositoryCustom.java
@@ -0,0 +1,8 @@
+package cn.mrdear.repository.custom;
+
+/**
+ * @author Niu Li
+ * @date 2017/1/7
+ */
+public interface THotelRepositoryCustom {
+}
diff --git a/JPA-Demo/src/main/java/cn/mrdear/repository/custom/THotelRepositoryImpl.java b/JPA-Demo/src/main/java/cn/mrdear/repository/custom/THotelRepositoryImpl.java
new file mode 100644
index 0000000..7d094e3
--- /dev/null
+++ b/JPA-Demo/src/main/java/cn/mrdear/repository/custom/THotelRepositoryImpl.java
@@ -0,0 +1,8 @@
+package cn.mrdear.repository.custom;
+
+/**
+ * @author Niu Li
+ * @date 2017/1/7
+ */
+public class THotelRepositoryImpl {
+}
diff --git a/JPA-Demo/src/main/java/cn/mrdear/service/PcardOrderService.java b/JPA-Demo/src/main/java/cn/mrdear/service/PcardOrderService.java
deleted file mode 100644
index 6107718..0000000
--- a/JPA-Demo/src/main/java/cn/mrdear/service/PcardOrderService.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package cn.mrdear.service;
-
-/**
- * service层
- * @author Niu Li
- * @date 2016/11/18
- */
-public interface PcardOrderService {
-}
diff --git a/JPA-Demo/src/main/java/cn/mrdear/service/impl/PcardOrderServiceImpl.java b/JPA-Demo/src/main/java/cn/mrdear/service/impl/PcardOrderServiceImpl.java
deleted file mode 100644
index 70cc191..0000000
--- a/JPA-Demo/src/main/java/cn/mrdear/service/impl/PcardOrderServiceImpl.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.mrdear.service.impl;
-
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-import cn.mrdear.repository.PcardOrderRepository;
-import cn.mrdear.service.PcardOrderService;
-
-/**
- * @author Niu Li
- * @date 2016/11/18
- */
-@Service
-public class PcardOrderServiceImpl implements PcardOrderService {
-
-    @Resource
-    private PcardOrderRepository pcardOrderRepository;
-
-
-}
diff --git a/JPA-Demo/src/main/java/cn/mrdear/test/UserRepositoryTest.java b/JPA-Demo/src/main/java/cn/mrdear/test/UserRepositoryTest.java
deleted file mode 100644
index 24c23e9..0000000
--- a/JPA-Demo/src/main/java/cn/mrdear/test/UserRepositoryTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package cn.mrdear.test;
-
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-
-import java.util.List;
-
-import cn.mrdear.entity.PcardOrder;
-import cn.mrdear.jpa.Filter;
-import cn.mrdear.jpa.QueryParams;
-import cn.mrdear.repository.PcardOrderRepository;
-
-/**
- * @author Niu Li
- * @date 2016/11/1
- */
-public class UserRepositoryTest {
-
-
-    public static void main(String[] args) {
-        ApplicationContext applicationContext = new ClassPathXmlApplicationContext("spring/applicationContext.xml");
-        PcardOrderRepository pcardOrderRepository = (PcardOrderRepository) applicationContext.getBean("pcardOrderRepository");
-        QueryParams<PcardOrder> queryParams = new QueryParams<>();
-        //使用Specification条件查询,使用JPQL字段查询
-        queryParams
-                .and(Filter.eq("acctId","0014779934917371041"),Filter.ne("orderAmt",0L),
-                        Filter.eq("orderRespCd","00"))
-                .or(Filter.eq("orderTypeId","A003"),Filter.eq("orderTypeId","A007"),
-                        Filter.eq("orderTypeId","A021"),Filter.eq("orderTypeId","A018"))
-                .orderDESC("createTime");
-
-        Page<PcardOrder> JPQLlist = pcardOrderRepository.findAll(queryParams,new PageRequest(0,2));
-
-        //使用原生sql查询,注意这里使用原生sql字段,并非JPQL字段,
-        //本质是根据BaseRepository.analysisQueryParams 来拼接条件,可以根据自己的需求更改
-        queryParams.clearAll()
-                .and(Filter.eq("acct_id","0014779934917371041"),Filter.ne("order_amt",0L),
-                        Filter.eq("order_resp_cd","00"))
-                .or(Filter.eq("order_type_id","A003"),Filter.eq("order_type_id","A007"),
-                        Filter.eq("order_type_id","A021"),Filter.eq("order_type_id","A018"))
-                .orderDESC("create_time");
-        List nativeSqlList = pcardOrderRepository.findByQueryParam(queryParams,new PageRequest(0,2));
-
-        System.out.println(nativeSqlList);
-    }
-}
diff --git a/JPA-Demo/src/main/resources/config.properties b/JPA-Demo/src/main/resources/config.properties
index c956005..9e6ae62 100644
--- a/JPA-Demo/src/main/resources/config.properties
+++ b/JPA-Demo/src/main/resources/config.properties
@@ -1,8 +1,8 @@
 #jdbc start
 jdbc.driver=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://172.18.0.13:60001/pcard?useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8
-jdbc.username=pcard_ap
-jdbc.password=pcard_ap
+jdbc.url=jdbc:mysql://127.0.0.1:3306/test?useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8
+jdbc.username=root
+jdbc.password=7946521
 
 #druid start
 filters=stat
diff --git a/JPA-Demo/src/main/resources/spring/applicationContext.xml b/JPA-Demo/src/main/resources/spring/applicationContext.xml
index b03b741..97cf7c7 100644
--- a/JPA-Demo/src/main/resources/spring/applicationContext.xml
+++ b/JPA-Demo/src/main/resources/spring/applicationContext.xml
@@ -100,7 +100,4 @@
     <!--声明采用注解的方式申明事务-->
     <tx:annotation-driven transaction-manager="transactionManager"/>
 
-
-
-
 </beans>
\ No newline at end of file
diff --git a/JPA-Demo/src/test/java/TCityTest.java b/JPA-Demo/src/test/java/TCityTest.java
new file mode 100644
index 0000000..4b0af31
--- /dev/null
+++ b/JPA-Demo/src/test/java/TCityTest.java
@@ -0,0 +1,81 @@
+import com.querydsl.core.QueryResults;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Predicate;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.util.List;
+
+import cn.mrdear.entity.QTCity;
+import cn.mrdear.entity.QTHotel;
+import cn.mrdear.entity.TCity;
+import cn.mrdear.repository.TCityRepository;
+
+/**
+ * @author Niu Li
+ * @date 2017/1/8
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath:spring/applicationContext.xml")
+public class TCityTest {
+    @Autowired
+    private TCityRepository tCityRepository;
+    //动态条件
+    QTCity qtCity = QTCity.tCity;
+    QTHotel qtHotel = QTHotel.tHotel;
+
+    //单表操作系列 start
+    /**
+     * 非动态查询建议使用Query注解
+     */
+    @Test
+    public void findDynamic(){
+        Predicate predicate = qtCity.id.longValue().lt(3)
+                                       .and(qtCity.name.like("shanghai"));
+        //分页排序
+        Sort sort = new Sort(new Sort.Order(Sort.Direction.ASC,"id"));
+        PageRequest pageRequest = new PageRequest(0,10,sort);
+        //查找结果
+        Page<TCity> tCityPage = tCityRepository.findAll(predicate,pageRequest);
+        System.out.println(tCityPage);
+    }
+    //单表操作系列 end
+
+    //多表操作系列 start
+    //针对返回的是Object[]提供了一个很好地解决方案
+    @Test
+    public void findByLeftJoin(){
+        QTCity qtCity = QTCity.tCity;
+        QTHotel qtHotel = QTHotel.tHotel;
+        Predicate predicate = qtCity.name.like("shanghai");
+        List<Tuple> result = tCityRepository.findCityAndHotel(predicate);
+        for (Tuple row : result) {
+            System.out.println("qtCity:"+row.get(qtCity));
+            System.out.println("qtHotel:"+row.get(qtHotel));
+            System.out.println("--------------------");
+        }
+        System.out.println(result);
+    }
+    @Test
+    public void findByLeftJoinPage(){
+        QTCity qtCity = QTCity.tCity;
+        QTHotel qtHotel = QTHotel.tHotel;
+        Predicate predicate = qtCity.name.like("shanghai");
+        PageRequest pageRequest = new PageRequest(0,10);
+        QueryResults<Tuple> result = tCityRepository.findCityAndHotelPage(predicate,pageRequest);
+        for (Tuple row : result.getResults()) {
+            System.out.println("qtCity:"+row.get(qtCity));
+            System.out.println("qtHotel:"+row.get(qtHotel));
+            System.out.println("--------------------");
+        }
+        System.out.println(result.getTotal());
+    }
+    //多表操作系列 end
+}
diff --git a/JPA-Demo/src/test/resources/persistence.xml b/JPA-Demo/src/test/resources/persistence.xml
deleted file mode 100644
index 67f8c03..0000000
--- a/JPA-Demo/src/test/resources/persistence.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="2.0">
-    <persistence-unit name="TestJPA" transaction-type="RESOURCE_LOCAL">
-        <!--jpa的提供者-->
-        <provider>org.hibernate.ejb.HibernatePersistence</provider>
-        <properties>
-            <!--声明数据库连接的驱动-->
-            <property name="hibernate.connection.driver_class" value="com.mysql.jdbc.Driver"/>
-            <!--jdbc数据库的连接地址-->
-            <property name="hibernate.connection.url" value="jdbc:mysql://localhost:3306/testframework"/>
-            <property name="hibernate.connection.username" value="root"/>
-            <property name="hibernate.connection.password" value="7946521"/>
-            <!--配置方言-->
-            <property name="hibernate.dialect" value="org.hibernate.dialect.MySQL5Dialect"/>
-            <!--激活查询日志功能-->
-            <property name="hibernate.show_sql" value="true"/>
-            <!--优雅地输出Sql-->
-            <property name="hibernate.format_sql" value="true"/>
-            <!--添加一条解释型标注-->
-            <property name="hibernate.use_sql_comments" value="false"/>
-            <!--配置如何根据java模型生成数据库表结构,常用update,validate-->
-            <property name="hibernate.hbm2ddl.auto" value="update"/>
-        </properties>
-    </persistence-unit>
-</persistence>
\ No newline at end of file
diff --git a/JPA-Demo/src/test/resources/spring/applicationContext.xml b/JPA-Demo/src/test/resources/spring/applicationContext.xml
deleted file mode 100644
index 401fd0c..0000000
--- a/JPA-Demo/src/test/resources/spring/applicationContext.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:jdbc="http://www.springframework.org/schema/jdbc"
-       xmlns:jee="http://www.springframework.org/schema/jee"
-       xmlns:tx="http://www.springframework.org/schema/tx"
-       xmlns:jpa="http://www.springframework.org/schema/data/jpa"
-       xsi:schemaLocation="
-        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
-        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd
-        http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.2.xsd
-        http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-3.2.xsd
-        http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.2.xsd
-        http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd"
-       default-lazy-init="true">
-
-    <!--第一步-->
-    <!--定义包扫描路径-->
-    <context:component-scan base-package="cn.mrdear.service" />
-
-    <!-- 加载数据库配置文件 -->
-    <context:property-placeholder location="classpath:config.properties"/>
-    <!--配置数据库连接池Druid-->
-    <bean id="dataSource" class="com.alibaba.druid.pool.DruidDataSource" init-method="init" destroy-method="close">
-        <!-- 数据库基本信息配置 -->
-        <property name="url" value="${jdbc.url}" />
-        <property name="username" value="${jdbc.username}" />
-        <property name="password" value="${jdbc.password}" />
-        <property name="driverClassName" value="${jdbc.driver}" />
-        <property name="filters" value="${filters}" />
-        <!-- 最大并发连接数 -->
-        <property name="maxActive" value="${maxActive}" />
-        <!-- 初始化连接数量 -->
-        <property name="initialSize" value="${initialSize}" />
-        <!-- 配置获取连接等待超时的时间 -->
-        <property name="maxWait" value="${maxWait}" />
-        <!-- 最小空闲连接数 -->
-        <property name="minIdle" value="${minIdle}" />
-        <!-- 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 -->
-        <property name="timeBetweenEvictionRunsMillis" value="${timeBetweenEvictionRunsMillis}" />
-        <!-- 配置一个连接在池中最小生存的时间，单位是毫秒 -->
-        <property name="minEvictableIdleTimeMillis" value="${minEvictableIdleTimeMillis}" />
-        <property name="validationQuery" value="SELECT 1" />
-        <property name="testWhileIdle" value="${testWhileIdle}" />
-        <property name="testOnBorrow" value="${testOnBorrow}" />
-        <property name="testOnReturn" value="${testOnReturn}" />
-        <property name="maxOpenPreparedStatements" value="${maxOpenPreparedStatements}" />
-        <!-- 打开removeAbandoned功能 -->
-        <property name="removeAbandoned" value="${removeAbandoned}" />
-        <!-- 1800秒，也就是30分钟 -->
-        <property name="removeAbandonedTimeout" value="${removeAbandonedTimeout}" />
-        <!-- 关闭abanded连接时输出错误日志 -->
-        <property name="logAbandoned" value="${logAbandoned}" />
-    </bean>
-
-    <!--第二步-->
-    <!--定义实体的工厂bean-->
-    <bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
-        <property name="dataSource" ref="dataSource"/>
-        <!--实体类位置-->
-        <property name="packagesToScan" value="cn.mrdear.entity"/>
-        <!--持久化单元名-->
-        <property name="persistenceUnitName" value="TestJPA" />
-        <!--JPA提供者-->
-        <property name="persistenceProviderClass" value="org.hibernate.ejb.HibernatePersistence"/>
-        <!--JPA属性-->
-        <property name="jpaProperties">
-            <props>
-                <!--配置方言-->
-                <prop key="hibernate.dialect">org.hibernate.dialect.MySQL5Dialect</prop>
-                <!--激活查询日志功能-->
-                <prop key="hibernate.show_sql">false</prop>
-                <!--优雅地输出Sql-->
-                <prop key="hibernate.format_sql">false</prop>
-                <!--添加一条解释型标注-->
-                <prop key="hibernate.use_sql_comments">false</prop>
-                <!--配置如何根据java模型生成数据库表结构,常用update,validate-->
-                <prop key="hibernate.hbm2ddl.auto">none</prop>
-            </props>
-        </property>
-    </bean>
-
-    <!--第三步-->
-    <!--定义事务管理器-->
-    <bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
-        <property name="dataSource" ref="dataSource"/>
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
-
-    <!--第四步-->
-    <!--定义repository接口的存放目录-->
-    <!--定义接口实现的后缀，通常用Impl-->
-    <!--定义实体工厂的引用-->
-    <!--定义事务管理器的引用-->
-    <jpa:repositories base-package="cn.mrdear.repository"
-                      repository-impl-postfix="Impl"
-                      entity-manager-factory-ref="entityManagerFactory"
-                      transaction-manager-ref="transactionManager"/>
-
-    <!--第五步-->
-    <!--声明采用注解的方式申明事务-->
-    <tx:annotation-driven transaction-manager="transactionManager"/>
-
-
-
-
-</beans>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/artifacts/Jersey_war.xml b/Jersey--Demo/.idea/artifacts/Jersey_war.xml
deleted file mode 100644
index c0768b5..0000000
--- a/Jersey--Demo/.idea/artifacts/Jersey_war.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="war" name="Jersey工程:war">
-    <output-path>$PROJECT_DIR$/target</output-path>
-    <root id="archive" name="mrdear.war">
-      <element id="artifact" artifact-name="Jersey工程:war exploded" />
-    </root>
-  </artifact>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/artifacts/Jersey_war_exploded.xml b/Jersey--Demo/.idea/artifacts/Jersey_war_exploded.xml
deleted file mode 100644
index 96a9cc5..0000000
--- a/Jersey--Demo/.idea/artifacts/Jersey_war_exploded.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="exploded-war" name="Jersey工程:war exploded">
-    <output-path>$PROJECT_DIR$/target/mrdear</output-path>
-    <root id="root">
-      <element id="directory" name="WEB-INF">
-        <element id="directory" name="classes">
-          <element id="module-output" name="Jersey工程" />
-        </element>
-        <element id="directory" name="lib">
-          <element id="library" level="project" name="Maven: org.springframework:spring-core:4.1.1.RELEASE" />
-          <element id="library" level="project" name="Maven: commons-logging:commons-logging:1.1.3" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-tx:4.1.1.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-beans:4.1.1.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-aop:4.1.1.RELEASE" />
-          <element id="library" level="project" name="Maven: aopalliance:aopalliance:1.0" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-jdbc:4.1.1.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-web:4.1.1.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-context:4.1.1.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-expression:4.1.1.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-context-support:4.1.1.RELEASE" />
-          <element id="library" level="project" name="Maven: cglib:cglib:3.2.2" />
-          <element id="library" level="project" name="Maven: org.ow2.asm:asm:5.0.4" />
-          <element id="library" level="project" name="Maven: org.apache.ant:ant:1.9.6" />
-          <element id="library" level="project" name="Maven: org.apache.ant:ant-launcher:1.9.6" />
-          <element id="library" level="project" name="Maven: org.aspectj:aspectjweaver:1.8.6" />
-          <element id="library" level="project" name="Maven: org.aspectj:aspectjrt:1.8.6" />
-          <element id="library" level="project" name="Maven: com.alibaba:druid:1.0.18" />
-          <element id="library" level="project" name="Maven: org.mybatis:mybatis:3.3.0" />
-          <element id="library" level="project" name="Maven: org.mybatis:mybatis-spring:1.2.3" />
-          <element id="library" level="project" name="Maven: mysql:mysql-connector-java:5.1.6" />
-          <element id="library" level="project" name="Maven: org.glassfish.jersey.containers:jersey-container-servlet:2.16" />
-          <element id="library" level="project" name="Maven: org.glassfish.jersey.containers:jersey-container-servlet-core:2.16" />
-          <element id="library" level="project" name="Maven: org.glassfish.hk2.external:javax.inject:2.4.0-b09" />
-          <element id="library" level="project" name="Maven: org.glassfish.jersey.core:jersey-common:2.16" />
-          <element id="library" level="project" name="Maven: org.glassfish.jersey.core:jersey-server:2.16" />
-          <element id="library" level="project" name="Maven: javax.ws.rs:javax.ws.rs-api:2.0.1" />
-          <element id="library" level="project" name="Maven: javax.annotation:javax.annotation-api:1.2" />
-          <element id="library" level="project" name="Maven: org.glassfish.jersey.bundles.repackaged:jersey-guava:2.16" />
-          <element id="library" level="project" name="Maven: org.glassfish.hk2:hk2-api:2.4.0-b09" />
-          <element id="library" level="project" name="Maven: org.glassfish.hk2:hk2-utils:2.4.0-b09" />
-          <element id="library" level="project" name="Maven: org.glassfish.hk2.external:aopalliance-repackaged:2.4.0-b09" />
-          <element id="library" level="project" name="Maven: org.glassfish.hk2:hk2-locator:2.4.0-b09" />
-          <element id="library" level="project" name="Maven: org.javassist:javassist:3.18.1-GA" />
-          <element id="library" level="project" name="Maven: org.glassfish.hk2:osgi-resource-locator:1.0.1" />
-          <element id="library" level="project" name="Maven: org.glassfish.jersey.core:jersey-client:2.16" />
-          <element id="library" level="project" name="Maven: org.glassfish.jersey.media:jersey-media-jaxb:2.16" />
-          <element id="library" level="project" name="Maven: javax.validation:validation-api:1.1.0.Final" />
-          <element id="library" level="project" name="Maven: org.glassfish.jersey.ext:jersey-spring3:2.16" />
-          <element id="library" level="project" name="Maven: org.glassfish.hk2:hk2:2.4.0-b09" />
-          <element id="library" level="project" name="Maven: javax.inject:javax.inject:1" />
-          <element id="library" level="project" name="Maven: org.glassfish.hk2:config-types:2.4.0-b09" />
-          <element id="library" level="project" name="Maven: org.glassfish.hk2:hk2-config:2.4.0-b09" />
-          <element id="library" level="project" name="Maven: org.glassfish.hk2:core:2.4.0-b09" />
-          <element id="library" level="project" name="Maven: org.jvnet:tiger-types:1.4" />
-          <element id="library" level="project" name="Maven: org.glassfish.hk2.external:bean-validator:2.4.0-b09" />
-          <element id="library" level="project" name="Maven: org.glassfish.hk2:hk2-runlevel:2.4.0-b09" />
-          <element id="library" level="project" name="Maven: org.glassfish.hk2:class-model:2.4.0-b09" />
-          <element id="library" level="project" name="Maven: org.glassfish.hk2.external:asm-all-repackaged:2.4.0-b09" />
-          <element id="library" level="project" name="Maven: org.glassfish.hk2:spring-bridge:2.4.0-b09" />
-          <element id="library" level="project" name="Maven: com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.3.3" />
-          <element id="library" level="project" name="Maven: com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.3.3" />
-          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-core:2.3.3" />
-          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.3.3" />
-          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.3.0" />
-          <element id="library" level="project" name="Maven: com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.3.3" />
-          <element id="library" level="project" name="Maven: org.glassfish.jersey.media:jersey-media-moxy:2.16" />
-          <element id="library" level="project" name="Maven: org.glassfish.jersey.ext:jersey-entity-filtering:2.16" />
-          <element id="library" level="project" name="Maven: org.eclipse.persistence:org.eclipse.persistence.moxy:2.5.0" />
-          <element id="library" level="project" name="Maven: org.eclipse.persistence:org.eclipse.persistence.core:2.5.0" />
-          <element id="library" level="project" name="Maven: org.eclipse.persistence:org.eclipse.persistence.asm:2.5.0" />
-          <element id="library" level="project" name="Maven: org.eclipse.persistence:org.eclipse.persistence.antlr:2.5.0" />
-          <element id="library" level="project" name="Maven: org.glassfish.jersey.media:jersey-media-multipart:2.16" />
-          <element id="library" level="project" name="Maven: org.jvnet.mimepull:mimepull:1.9.3" />
-          <element id="library" level="project" name="Maven: com.alibaba:fastjson:1.2.14" />
-          <element id="library" level="project" name="Maven: log4j:log4j:1.2.17" />
-          <element id="library" level="project" name="Maven: org.slf4j:slf4j-api:1.7.7" />
-          <element id="library" level="project" name="Maven: org.slf4j:slf4j-log4j12:1.7.7" />
-        </element>
-      </element>
-      <element id="directory" name="META-INF">
-        <element id="file-copy" path="$PROJECT_DIR$/target/mrdear/META-INF/MANIFEST.MF" />
-      </element>
-      <element id="javaee-facet-resources" facet="Jersey工程/web/Web" />
-    </root>
-  </artifact>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/compiler.xml b/Jersey--Demo/.idea/compiler.xml
deleted file mode 100644
index 7bb2917..0000000
--- a/Jersey--Demo/.idea/compiler.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-      <entry name="!?*.aj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-      <profile default="false" name="Maven default annotation processors profile" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <processorPath useClasspath="true" />
-        <module name="Jersey工程" />
-      </profile>
-    </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="Jersey工程" target="1.8" />
-    </bytecodeTargetLevel>
-  </component>
-</project>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/copyright/profiles_settings.xml b/Jersey--Demo/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/Jersey--Demo/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/encodings.xml b/Jersey--Demo/.idea/encodings.xml
deleted file mode 100644
index 97626ba..0000000
--- a/Jersey--Demo/.idea/encodings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/Jersey--Demo/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml
deleted file mode 100644
index 30ff5cb..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: aopalliance:aopalliance:1.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/aopalliance/aopalliance/1.0/aopalliance-1.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/aopalliance/aopalliance/1.0/aopalliance-1.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__cglib_cglib_3_2_2.xml b/Jersey--Demo/.idea/libraries/Maven__cglib_cglib_3_2_2.xml
deleted file mode 100644
index 9e3d27a..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__cglib_cglib_3_2_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: cglib:cglib:3.2.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/cglib/cglib/3.2.2/cglib-3.2.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/cglib/cglib/3.2.2/cglib-3.2.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/cglib/cglib/3.2.2/cglib-3.2.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__com_alibaba_druid_1_0_18.xml b/Jersey--Demo/.idea/libraries/Maven__com_alibaba_druid_1_0_18.xml
deleted file mode 100644
index 2b9baaf..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__com_alibaba_druid_1_0_18.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.alibaba:druid:1.0.18">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.0.18/druid-1.0.18.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.0.18/druid-1.0.18-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.0.18/druid-1.0.18-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__com_alibaba_fastjson_1_2_14.xml b/Jersey--Demo/.idea/libraries/Maven__com_alibaba_fastjson_1_2_14.xml
deleted file mode 100644
index 3888159..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__com_alibaba_fastjson_1_2_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.alibaba:fastjson:1.2.14">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.14/fastjson-1.2.14.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.14/fastjson-1.2.14-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.14/fastjson-1.2.14-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_3_0.xml b/Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_3_0.xml
deleted file mode 100644
index e90bc9c..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_3_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.3.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.3.0/jackson-annotations-2.3.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.3.0/jackson-annotations-2.3.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.3.0/jackson-annotations-2.3.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_3_3.xml b/Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_3_3.xml
deleted file mode 100644
index 87b1692..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_3_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.fasterxml.jackson.core:jackson-core:2.3.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.3.3/jackson-core-2.3.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.3.3/jackson-core-2.3.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.3.3/jackson-core-2.3.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_3_3.xml b/Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_3_3.xml
deleted file mode 100644
index 4d18ceb..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_3_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.fasterxml.jackson.core:jackson-databind:2.3.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.3.3/jackson-databind-2.3.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.3.3/jackson-databind-2.3.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.3.3/jackson-databind-2.3.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_3_3.xml b/Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_3_3.xml
deleted file mode 100644
index 926c37b..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_3_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.3.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/jaxrs/jackson-jaxrs-base/2.3.3/jackson-jaxrs-base-2.3.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/jaxrs/jackson-jaxrs-base/2.3.3/jackson-jaxrs-base-2.3.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/jaxrs/jackson-jaxrs-base/2.3.3/jackson-jaxrs-base-2.3.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_3_3.xml b/Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_3_3.xml
deleted file mode 100644
index d8b05f2..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_3_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.3.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/2.3.3/jackson-jaxrs-json-provider-2.3.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/2.3.3/jackson-jaxrs-json-provider-2.3.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/2.3.3/jackson-jaxrs-json-provider-2.3.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_3_3.xml b/Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_3_3.xml
deleted file mode 100644
index 8a8e4a2..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_3_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.3.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.3.3/jackson-module-jaxb-annotations-2.3.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.3.3/jackson-module-jaxb-annotations-2.3.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.3.3/jackson-module-jaxb-annotations-2.3.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__commons_logging_commons_logging_1_1_3.xml b/Jersey--Demo/.idea/libraries/Maven__commons_logging_commons_logging_1_1_3.xml
deleted file mode 100644
index 01c7b8e..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__commons_logging_commons_logging_1_1_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: commons-logging:commons-logging:1.1.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_2.xml b/Jersey--Demo/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_2.xml
deleted file mode 100644
index e35b936..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: javax.annotation:javax.annotation-api:1.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__javax_inject_javax_inject_1.xml b/Jersey--Demo/.idea/libraries/Maven__javax_inject_javax_inject_1.xml
deleted file mode 100644
index 93cf65a..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__javax_inject_javax_inject_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: javax.inject:javax.inject:1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_1_0.xml b/Jersey--Demo/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_1_0.xml
deleted file mode 100644
index c24f7e3..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_1_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: javax.servlet:javax.servlet-api:3.1.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/Jersey--Demo/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml
deleted file mode 100644
index 940ce73..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: javax.validation:validation-api:1.1.0.Final">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/Jersey--Demo/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml
deleted file mode 100644
index c890167..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: javax.ws.rs:javax.ws.rs-api:2.0.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/ws/rs/javax.ws.rs-api/2.0.1/javax.ws.rs-api-2.0.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/ws/rs/javax.ws.rs-api/2.0.1/javax.ws.rs-api-2.0.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/ws/rs/javax.ws.rs-api/2.0.1/javax.ws.rs-api-2.0.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__junit_junit_4_10.xml b/Jersey--Demo/.idea/libraries/Maven__junit_junit_4_10.xml
deleted file mode 100644
index ed8bf5f..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__junit_junit_4_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: junit:junit:4.10">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.10/junit-4.10.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.10/junit-4.10-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.10/junit-4.10-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__log4j_log4j_1_2_17.xml b/Jersey--Demo/.idea/libraries/Maven__log4j_log4j_1_2_17.xml
deleted file mode 100644
index e383c1b..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__log4j_log4j_1_2_17.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: log4j:log4j:1.2.17">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.17/log4j-1.2.17.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.17/log4j-1.2.17-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.17/log4j-1.2.17-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_6.xml b/Jersey--Demo/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_6.xml
deleted file mode 100644
index 2b062b5..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: mysql:mysql-connector-java:5.1.6">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/5.1.6/mysql-connector-java-5.1.6.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/5.1.6/mysql-connector-java-5.1.6-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/5.1.6/mysql-connector-java-5.1.6-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_apache_ant_ant_1_9_6.xml b/Jersey--Demo/.idea/libraries/Maven__org_apache_ant_ant_1_9_6.xml
deleted file mode 100644
index 8cba3e1..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_apache_ant_ant_1_9_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.ant:ant:1.9.6">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant/1.9.6/ant-1.9.6.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant/1.9.6/ant-1.9.6-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant/1.9.6/ant-1.9.6-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_apache_ant_ant_launcher_1_9_6.xml b/Jersey--Demo/.idea/libraries/Maven__org_apache_ant_ant_launcher_1_9_6.xml
deleted file mode 100644
index 4a5c8b2..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_apache_ant_ant_launcher_1_9_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.ant:ant-launcher:1.9.6">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant-launcher/1.9.6/ant-launcher-1.9.6.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant-launcher/1.9.6/ant-launcher-1.9.6-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant-launcher/1.9.6/ant-launcher-1.9.6-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_aspectj_aspectjrt_1_8_6.xml b/Jersey--Demo/.idea/libraries/Maven__org_aspectj_aspectjrt_1_8_6.xml
deleted file mode 100644
index c62d9a0..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_aspectj_aspectjrt_1_8_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.aspectj:aspectjrt:1.8.6">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjrt/1.8.6/aspectjrt-1.8.6.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjrt/1.8.6/aspectjrt-1.8.6-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjrt/1.8.6/aspectjrt-1.8.6-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_6.xml b/Jersey--Demo/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_6.xml
deleted file mode 100644
index 61938e1..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.aspectj:aspectjweaver:1.8.6">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjweaver/1.8.6/aspectjweaver-1.8.6.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjweaver/1.8.6/aspectjweaver-1.8.6-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjweaver/1.8.6/aspectjweaver-1.8.6-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_eclipse_persistence_org_eclipse_persistence_antlr_2_5_0.xml b/Jersey--Demo/.idea/libraries/Maven__org_eclipse_persistence_org_eclipse_persistence_antlr_2_5_0.xml
deleted file mode 100644
index 81c15cb..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_eclipse_persistence_org_eclipse_persistence_antlr_2_5_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.eclipse.persistence:org.eclipse.persistence.antlr:2.5.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/persistence/org.eclipse.persistence.antlr/2.5.0/org.eclipse.persistence.antlr-2.5.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/persistence/org.eclipse.persistence.antlr/2.5.0/org.eclipse.persistence.antlr-2.5.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/persistence/org.eclipse.persistence.antlr/2.5.0/org.eclipse.persistence.antlr-2.5.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_eclipse_persistence_org_eclipse_persistence_asm_2_5_0.xml b/Jersey--Demo/.idea/libraries/Maven__org_eclipse_persistence_org_eclipse_persistence_asm_2_5_0.xml
deleted file mode 100644
index 153155e..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_eclipse_persistence_org_eclipse_persistence_asm_2_5_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.eclipse.persistence:org.eclipse.persistence.asm:2.5.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/persistence/org.eclipse.persistence.asm/2.5.0/org.eclipse.persistence.asm-2.5.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/persistence/org.eclipse.persistence.asm/2.5.0/org.eclipse.persistence.asm-2.5.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/persistence/org.eclipse.persistence.asm/2.5.0/org.eclipse.persistence.asm-2.5.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_eclipse_persistence_org_eclipse_persistence_core_2_5_0.xml b/Jersey--Demo/.idea/libraries/Maven__org_eclipse_persistence_org_eclipse_persistence_core_2_5_0.xml
deleted file mode 100644
index a4277bc..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_eclipse_persistence_org_eclipse_persistence_core_2_5_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.eclipse.persistence:org.eclipse.persistence.core:2.5.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/persistence/org.eclipse.persistence.core/2.5.0/org.eclipse.persistence.core-2.5.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/persistence/org.eclipse.persistence.core/2.5.0/org.eclipse.persistence.core-2.5.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/persistence/org.eclipse.persistence.core/2.5.0/org.eclipse.persistence.core-2.5.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_eclipse_persistence_org_eclipse_persistence_moxy_2_5_0.xml b/Jersey--Demo/.idea/libraries/Maven__org_eclipse_persistence_org_eclipse_persistence_moxy_2_5_0.xml
deleted file mode 100644
index f567f2c..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_eclipse_persistence_org_eclipse_persistence_moxy_2_5_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.eclipse.persistence:org.eclipse.persistence.moxy:2.5.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/persistence/org.eclipse.persistence.moxy/2.5.0/org.eclipse.persistence.moxy-2.5.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/persistence/org.eclipse.persistence.moxy/2.5.0/org.eclipse.persistence.moxy-2.5.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/persistence/org.eclipse.persistence.moxy/2.5.0/org.eclipse.persistence.moxy-2.5.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_class_model_2_4_0_b09.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_class_model_2_4_0_b09.xml
deleted file mode 100644
index b09e817..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_class_model_2_4_0_b09.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.glassfish.hk2:class-model:2.4.0-b09">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/class-model/2.4.0-b09/class-model-2.4.0-b09.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/class-model/2.4.0-b09/class-model-2.4.0-b09-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/class-model/2.4.0-b09/class-model-2.4.0-b09-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_config_types_2_4_0_b09.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_config_types_2_4_0_b09.xml
deleted file mode 100644
index 4210c4f..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_config_types_2_4_0_b09.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.glassfish.hk2:config-types:2.4.0-b09">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/config-types/2.4.0-b09/config-types-2.4.0-b09.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/config-types/2.4.0-b09/config-types-2.4.0-b09-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/config-types/2.4.0-b09/config-types-2.4.0-b09-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_core_2_4_0_b09.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_core_2_4_0_b09.xml
deleted file mode 100644
index 8846537..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_core_2_4_0_b09.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.glassfish.hk2:core:2.4.0-b09">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/core/2.4.0-b09/core-2.4.0-b09.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/core/2.4.0-b09/core-2.4.0-b09-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/core/2.4.0-b09/core-2.4.0-b09-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_external_aopalliance_repackaged_2_4_0_b09.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_external_aopalliance_repackaged_2_4_0_b09.xml
deleted file mode 100644
index c3efd2a..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_external_aopalliance_repackaged_2_4_0_b09.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.glassfish.hk2.external:aopalliance-repackaged:2.4.0-b09">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/external/aopalliance-repackaged/2.4.0-b09/aopalliance-repackaged-2.4.0-b09.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/external/aopalliance-repackaged/2.4.0-b09/aopalliance-repackaged-2.4.0-b09-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/external/aopalliance-repackaged/2.4.0-b09/aopalliance-repackaged-2.4.0-b09-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_external_asm_all_repackaged_2_4_0_b09.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_external_asm_all_repackaged_2_4_0_b09.xml
deleted file mode 100644
index a5bf8d3..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_external_asm_all_repackaged_2_4_0_b09.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.glassfish.hk2.external:asm-all-repackaged:2.4.0-b09">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/external/asm-all-repackaged/2.4.0-b09/asm-all-repackaged-2.4.0-b09.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/external/asm-all-repackaged/2.4.0-b09/asm-all-repackaged-2.4.0-b09-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/external/asm-all-repackaged/2.4.0-b09/asm-all-repackaged-2.4.0-b09-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_external_bean_validator_2_4_0_b09.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_external_bean_validator_2_4_0_b09.xml
deleted file mode 100644
index 477880c..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_external_bean_validator_2_4_0_b09.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.glassfish.hk2.external:bean-validator:2.4.0-b09">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/external/bean-validator/2.4.0-b09/bean-validator-2.4.0-b09.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/external/bean-validator/2.4.0-b09/bean-validator-2.4.0-b09-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/external/bean-validator/2.4.0-b09/bean-validator-2.4.0-b09-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_external_javax_inject_2_4_0_b09.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_external_javax_inject_2_4_0_b09.xml
deleted file mode 100644
index 2138707..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_external_javax_inject_2_4_0_b09.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.glassfish.hk2.external:javax.inject:2.4.0-b09">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/external/javax.inject/2.4.0-b09/javax.inject-2.4.0-b09.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/external/javax.inject/2.4.0-b09/javax.inject-2.4.0-b09-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/external/javax.inject/2.4.0-b09/javax.inject-2.4.0-b09-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_2_4_0_b09.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_2_4_0_b09.xml
deleted file mode 100644
index fad414f..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_2_4_0_b09.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.glassfish.hk2:hk2:2.4.0-b09">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/hk2/2.4.0-b09/hk2-2.4.0-b09.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/hk2/2.4.0-b09/hk2-2.4.0-b09-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/hk2/2.4.0-b09/hk2-2.4.0-b09-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_api_2_4_0_b09.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_api_2_4_0_b09.xml
deleted file mode 100644
index 6c41a8a..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_api_2_4_0_b09.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.glassfish.hk2:hk2-api:2.4.0-b09">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/hk2-api/2.4.0-b09/hk2-api-2.4.0-b09.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/hk2-api/2.4.0-b09/hk2-api-2.4.0-b09-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/hk2-api/2.4.0-b09/hk2-api-2.4.0-b09-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_config_2_4_0_b09.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_config_2_4_0_b09.xml
deleted file mode 100644
index dfbf251..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_config_2_4_0_b09.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.glassfish.hk2:hk2-config:2.4.0-b09">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/hk2-config/2.4.0-b09/hk2-config-2.4.0-b09.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/hk2-config/2.4.0-b09/hk2-config-2.4.0-b09-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/hk2-config/2.4.0-b09/hk2-config-2.4.0-b09-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_locator_2_4_0_b09.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_locator_2_4_0_b09.xml
deleted file mode 100644
index 7b0e1b5..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_locator_2_4_0_b09.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.glassfish.hk2:hk2-locator:2.4.0-b09">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/hk2-locator/2.4.0-b09/hk2-locator-2.4.0-b09.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/hk2-locator/2.4.0-b09/hk2-locator-2.4.0-b09-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/hk2-locator/2.4.0-b09/hk2-locator-2.4.0-b09-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_runlevel_2_4_0_b09.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_runlevel_2_4_0_b09.xml
deleted file mode 100644
index d0ec802..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_runlevel_2_4_0_b09.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.glassfish.hk2:hk2-runlevel:2.4.0-b09">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/hk2-runlevel/2.4.0-b09/hk2-runlevel-2.4.0-b09.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/hk2-runlevel/2.4.0-b09/hk2-runlevel-2.4.0-b09-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/hk2-runlevel/2.4.0-b09/hk2-runlevel-2.4.0-b09-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_utils_2_4_0_b09.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_utils_2_4_0_b09.xml
deleted file mode 100644
index 7ec721b..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_utils_2_4_0_b09.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.glassfish.hk2:hk2-utils:2.4.0-b09">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/hk2-utils/2.4.0-b09/hk2-utils-2.4.0-b09.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/hk2-utils/2.4.0-b09/hk2-utils-2.4.0-b09-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/hk2-utils/2.4.0-b09/hk2-utils-2.4.0-b09-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_osgi_resource_locator_1_0_1.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_osgi_resource_locator_1_0_1.xml
deleted file mode 100644
index 3d299fa..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_osgi_resource_locator_1_0_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.glassfish.hk2:osgi-resource-locator:1.0.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/osgi-resource-locator/1.0.1/osgi-resource-locator-1.0.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/osgi-resource-locator/1.0.1/osgi-resource-locator-1.0.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/osgi-resource-locator/1.0.1/osgi-resource-locator-1.0.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_spring_bridge_2_4_0_b09.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_spring_bridge_2_4_0_b09.xml
deleted file mode 100644
index a6f4ab1..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_spring_bridge_2_4_0_b09.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.glassfish.hk2:spring-bridge:2.4.0-b09">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/spring-bridge/2.4.0-b09/spring-bridge-2.4.0-b09.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/spring-bridge/2.4.0-b09/spring-bridge-2.4.0-b09-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/spring-bridge/2.4.0-b09/spring-bridge-2.4.0-b09-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_bundles_repackaged_jersey_guava_2_16.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_bundles_repackaged_jersey_guava_2_16.xml
deleted file mode 100644
index 993c539..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_bundles_repackaged_jersey_guava_2_16.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.glassfish.jersey.bundles.repackaged:jersey-guava:2.16">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/bundles/repackaged/jersey-guava/2.16/jersey-guava-2.16.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/bundles/repackaged/jersey-guava/2.16/jersey-guava-2.16-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/bundles/repackaged/jersey-guava/2.16/jersey-guava-2.16-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_containers_jersey_container_servlet_2_16.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_containers_jersey_container_servlet_2_16.xml
deleted file mode 100644
index 304d588..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_containers_jersey_container_servlet_2_16.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.glassfish.jersey.containers:jersey-container-servlet:2.16">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/containers/jersey-container-servlet/2.16/jersey-container-servlet-2.16.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/containers/jersey-container-servlet/2.16/jersey-container-servlet-2.16-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/containers/jersey-container-servlet/2.16/jersey-container-servlet-2.16-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_containers_jersey_container_servlet_core_2_16.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_containers_jersey_container_servlet_core_2_16.xml
deleted file mode 100644
index 4c0edaa..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_containers_jersey_container_servlet_core_2_16.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.glassfish.jersey.containers:jersey-container-servlet-core:2.16">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/containers/jersey-container-servlet-core/2.16/jersey-container-servlet-core-2.16.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/containers/jersey-container-servlet-core/2.16/jersey-container-servlet-core-2.16-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/containers/jersey-container-servlet-core/2.16/jersey-container-servlet-core-2.16-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_client_2_16.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_client_2_16.xml
deleted file mode 100644
index 1712979..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_client_2_16.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.glassfish.jersey.core:jersey-client:2.16">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/core/jersey-client/2.16/jersey-client-2.16.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/core/jersey-client/2.16/jersey-client-2.16-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/core/jersey-client/2.16/jersey-client-2.16-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_common_2_16.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_common_2_16.xml
deleted file mode 100644
index cd700e9..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_common_2_16.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.glassfish.jersey.core:jersey-common:2.16">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/core/jersey-common/2.16/jersey-common-2.16.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/core/jersey-common/2.16/jersey-common-2.16-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/core/jersey-common/2.16/jersey-common-2.16-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_server_2_16.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_server_2_16.xml
deleted file mode 100644
index 2a3b4b9..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_server_2_16.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.glassfish.jersey.core:jersey-server:2.16">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/core/jersey-server/2.16/jersey-server-2.16.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/core/jersey-server/2.16/jersey-server-2.16-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/core/jersey-server/2.16/jersey-server-2.16-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_ext_jersey_entity_filtering_2_16.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_ext_jersey_entity_filtering_2_16.xml
deleted file mode 100644
index fa44000..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_ext_jersey_entity_filtering_2_16.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.glassfish.jersey.ext:jersey-entity-filtering:2.16">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/ext/jersey-entity-filtering/2.16/jersey-entity-filtering-2.16.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/ext/jersey-entity-filtering/2.16/jersey-entity-filtering-2.16-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/ext/jersey-entity-filtering/2.16/jersey-entity-filtering-2.16-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_ext_jersey_spring3_2_16.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_ext_jersey_spring3_2_16.xml
deleted file mode 100644
index e87be18..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_ext_jersey_spring3_2_16.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.glassfish.jersey.ext:jersey-spring3:2.16">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/ext/jersey-spring3/2.16/jersey-spring3-2.16.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/ext/jersey-spring3/2.16/jersey-spring3-2.16-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/ext/jersey-spring3/2.16/jersey-spring3-2.16-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_jaxb_2_16.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_jaxb_2_16.xml
deleted file mode 100644
index 6ebbf60..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_jaxb_2_16.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.glassfish.jersey.media:jersey-media-jaxb:2.16">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/media/jersey-media-jaxb/2.16/jersey-media-jaxb-2.16.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/media/jersey-media-jaxb/2.16/jersey-media-jaxb-2.16-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/media/jersey-media-jaxb/2.16/jersey-media-jaxb-2.16-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_moxy_2_16.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_moxy_2_16.xml
deleted file mode 100644
index ddbe45c..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_moxy_2_16.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.glassfish.jersey.media:jersey-media-moxy:2.16">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/media/jersey-media-moxy/2.16/jersey-media-moxy-2.16.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/media/jersey-media-moxy/2.16/jersey-media-moxy-2.16-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/media/jersey-media-moxy/2.16/jersey-media-moxy-2.16-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_multipart_2_16.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_multipart_2_16.xml
deleted file mode 100644
index 4827c65..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_multipart_2_16.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.glassfish.jersey.media:jersey-media-multipart:2.16">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/media/jersey-media-multipart/2.16/jersey-media-multipart-2.16.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/media/jersey-media-multipart/2.16/jersey-media-multipart-2.16-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/media/jersey-media-multipart/2.16/jersey-media-multipart-2.16-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/Jersey--Demo/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml
deleted file mode 100644
index acdf443..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.hamcrest:hamcrest-core:1.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_javassist_javassist_3_18_1_GA.xml b/Jersey--Demo/.idea/libraries/Maven__org_javassist_javassist_3_18_1_GA.xml
deleted file mode 100644
index 1f90730..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_javassist_javassist_3_18_1_GA.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.javassist:javassist:3.18.1-GA">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/javassist/javassist/3.18.1-GA/javassist-3.18.1-GA.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/javassist/javassist/3.18.1-GA/javassist-3.18.1-GA-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/javassist/javassist/3.18.1-GA/javassist-3.18.1-GA-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_jvnet_mimepull_mimepull_1_9_3.xml b/Jersey--Demo/.idea/libraries/Maven__org_jvnet_mimepull_mimepull_1_9_3.xml
deleted file mode 100644
index 5429fb6..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_jvnet_mimepull_mimepull_1_9_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.jvnet.mimepull:mimepull:1.9.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jvnet/mimepull/mimepull/1.9.3/mimepull-1.9.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jvnet/mimepull/mimepull/1.9.3/mimepull-1.9.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jvnet/mimepull/mimepull/1.9.3/mimepull-1.9.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_jvnet_tiger_types_1_4.xml b/Jersey--Demo/.idea/libraries/Maven__org_jvnet_tiger_types_1_4.xml
deleted file mode 100644
index 8d7e1d6..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_jvnet_tiger_types_1_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.jvnet:tiger-types:1.4">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jvnet/tiger-types/1.4/tiger-types-1.4.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jvnet/tiger-types/1.4/tiger-types-1.4-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jvnet/tiger-types/1.4/tiger-types-1.4-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_mybatis_mybatis_3_3_0.xml b/Jersey--Demo/.idea/libraries/Maven__org_mybatis_mybatis_3_3_0.xml
deleted file mode 100644
index 86720b3..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_mybatis_mybatis_3_3_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.mybatis:mybatis:3.3.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.3.0/mybatis-3.3.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.3.0/mybatis-3.3.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.3.0/mybatis-3.3.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_2_3.xml b/Jersey--Demo/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_2_3.xml
deleted file mode 100644
index 8d9620c..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_2_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.mybatis:mybatis-spring:1.2.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/1.2.3/mybatis-spring-1.2.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/1.2.3/mybatis-spring-1.2.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/1.2.3/mybatis-spring-1.2.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml b/Jersey--Demo/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml
deleted file mode 100644
index 0bf8cf2..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.ow2.asm:asm:5.0.4">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/5.0.4/asm-5.0.4-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/5.0.4/asm-5.0.4-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/Jersey--Demo/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml
deleted file mode 100644
index 1e67260..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.slf4j:slf4j-api:1.7.7">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_7.xml b/Jersey--Demo/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_7.xml
deleted file mode 100644
index 65d0ae6..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.slf4j:slf4j-log4j12:1.7.7">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-log4j12/1.7.7/slf4j-log4j12-1.7.7.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-log4j12/1.7.7/slf4j-log4j12-1.7.7-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-log4j12/1.7.7/slf4j-log4j12-1.7.7-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_aop_4_1_1_RELEASE.xml b/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_aop_4_1_1_RELEASE.xml
deleted file mode 100644
index eade391..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_aop_4_1_1_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-aop:4.1.1.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.1.1.RELEASE/spring-aop-4.1.1.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.1.1.RELEASE/spring-aop-4.1.1.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.1.1.RELEASE/spring-aop-4.1.1.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_beans_4_1_1_RELEASE.xml b/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_beans_4_1_1_RELEASE.xml
deleted file mode 100644
index 318e479..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_beans_4_1_1_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-beans:4.1.1.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/4.1.1.RELEASE/spring-beans-4.1.1.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/4.1.1.RELEASE/spring-beans-4.1.1.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/4.1.1.RELEASE/spring-beans-4.1.1.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_context_4_1_1_RELEASE.xml b/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_context_4_1_1_RELEASE.xml
deleted file mode 100644
index f770b86..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_context_4_1_1_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-context:4.1.1.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/4.1.1.RELEASE/spring-context-4.1.1.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/4.1.1.RELEASE/spring-context-4.1.1.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/4.1.1.RELEASE/spring-context-4.1.1.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_context_support_4_1_1_RELEASE.xml b/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_context_support_4_1_1_RELEASE.xml
deleted file mode 100644
index ccead97..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_context_support_4_1_1_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-context-support:4.1.1.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/4.1.1.RELEASE/spring-context-support-4.1.1.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/4.1.1.RELEASE/spring-context-support-4.1.1.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/4.1.1.RELEASE/spring-context-support-4.1.1.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_core_4_1_1_RELEASE.xml b/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_core_4_1_1_RELEASE.xml
deleted file mode 100644
index 4a192e5..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_core_4_1_1_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-core:4.1.1.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.1.1.RELEASE/spring-core-4.1.1.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.1.1.RELEASE/spring-core-4.1.1.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.1.1.RELEASE/spring-core-4.1.1.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_expression_4_1_1_RELEASE.xml b/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_expression_4_1_1_RELEASE.xml
deleted file mode 100644
index fe9be52..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_expression_4_1_1_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-expression:4.1.1.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/4.1.1.RELEASE/spring-expression-4.1.1.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/4.1.1.RELEASE/spring-expression-4.1.1.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/4.1.1.RELEASE/spring-expression-4.1.1.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_jdbc_4_1_1_RELEASE.xml b/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_jdbc_4_1_1_RELEASE.xml
deleted file mode 100644
index 95d8731..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_jdbc_4_1_1_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-jdbc:4.1.1.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/4.1.1.RELEASE/spring-jdbc-4.1.1.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/4.1.1.RELEASE/spring-jdbc-4.1.1.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/4.1.1.RELEASE/spring-jdbc-4.1.1.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_tx_4_1_1_RELEASE.xml b/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_tx_4_1_1_RELEASE.xml
deleted file mode 100644
index a4c93d7..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_tx_4_1_1_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-tx:4.1.1.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.1.1.RELEASE/spring-tx-4.1.1.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.1.1.RELEASE/spring-tx-4.1.1.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.1.1.RELEASE/spring-tx-4.1.1.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_web_4_1_1_RELEASE.xml b/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_web_4_1_1_RELEASE.xml
deleted file mode 100644
index 5c3f046..0000000
--- a/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_web_4_1_1_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-web:4.1.1.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.1.1.RELEASE/spring-web-4.1.1.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.1.1.RELEASE/spring-web-4.1.1.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.1.1.RELEASE/spring-web-4.1.1.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/misc.xml b/Jersey--Demo/.idea/misc.xml
deleted file mode 100644
index adfbe50..0000000
--- a/Jersey--Demo/.idea/misc.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
-  <component name="FrameworkDetectionExcludesConfiguration">
-    <file type="web" url="file://$PROJECT_DIR$" />
-  </component>
-  <component name="MavenProjectsManager">
-    <option name="originalFiles">
-      <list>
-        <option value="$PROJECT_DIR$/pom.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8 " project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/modules.xml b/Jersey--Demo/.idea/modules.xml
deleted file mode 100644
index 84ac91e..0000000
--- a/Jersey--Demo/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/Jersey工程.iml" filepath="$PROJECT_DIR$/Jersey工程.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/uiDesigner.xml b/Jersey--Demo/.idea/uiDesigner.xml
deleted file mode 100644
index e96534f..0000000
--- a/Jersey--Demo/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
\ No newline at end of file
diff --git a/Jersey--Demo/.idea/workspace.xml b/Jersey--Demo/.idea/workspace.xml
deleted file mode 100644
index 1c94010..0000000
--- a/Jersey--Demo/.idea/workspace.xml
+++ /dev/null
@@ -1,1685 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="49085bcd-f807-4321-90d1-c9acfb0a12d3" name="Default" comment="" />
-    <ignored path="Jersey工程.iws" />
-    <ignored path=".idea/workspace.xml" />
-    <ignored path="$PROJECT_DIR$/out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="TRACKING_ENABLED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
-  <component name="FavoritesManager">
-    <favorites_list name="Jersey工程" />
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="RESTApplication.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/haikong/application/RESTApplication.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="594">
-              <caret line="32" column="43" selection-start-line="32" selection-start-column="43" selection-end-line="32" selection-end-column="43" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="log4j.properties" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/log4j.properties">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="132">
-              <caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="DeviceExceptionMapper.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/haikong/exception/DeviceExceptionMapper.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="374">
-              <caret line="24" column="41" selection-start-line="24" selection-start-column="39" selection-end-line="24" selection-end-column="41" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="ErrorEntity.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/haikong/exception/ErrorEntity.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="10" column="25" selection-start-line="10" selection-start-column="25" selection-end-line="10" selection-end-column="25" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="DeviceMapper.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/haikong/dao/DeviceMapper.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-176">
-              <caret line="14" column="33" selection-start-line="14" selection-start-column="33" selection-end-line="14" selection-end-column="33" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="GradleLocalSettings">
-    <option name="externalProjectsViewState">
-      <projects_view />
-    </option>
-  </component>
-  <component name="HighlightingSettingsPerFile">
-    <setting file="file://$PROJECT_DIR$/src/main/resources/mybatis/Mapper/DeviceMapper.xml" root0="SKIP_INSPECTION" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/resources/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/haikong/dao/DeviceMapper.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/mybatis/Mapper/DeviceMapper.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/haikong/util/CheckUtil.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/haikong/util/DecriptUtil.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/haikong/util/DeviceUtil.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/mybatis/SqlMapConfig.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/haikong/filter/RequestFilter.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/haikong/filter/AftRequestFilter.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/haikong/exception/ErrorEntity.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/haikong/filter/PreRequestFilter.java" />
-        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/haikong/filter/ResponseFilter.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/haikong/model/ReqDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/haikong/interceptor/GzipInterceptor.java" />
-        <option value="$PROJECT_DIR$/pom.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/haikong/application/RESTApplication.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/haikong/service/DeviceService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/haikong/resources/DeviceController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/haikong/exception/ResultVO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/haikong/ResultVO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/haikong/exception/DeviceExceptionMapper.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/log4j.properties" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/develop/maven/apache-maven-3.3.9" />
-        <option name="userSettingsFile" value="D:\develop\maven\apache-maven-3.3.9\conf\settings.xml" />
-      </MavenGeneralSettings>
-    </option>
-    <option name="importingSettings">
-      <MavenImportingSettings>
-        <option name="importAutomatically" value="true" />
-      </MavenImportingSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="" />
-          <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$RootNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="mrdear Maven Webapp" />
-          <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$ProjectNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="" />
-          <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$RootNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="mrdear Maven Webapp" />
-          <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$ProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="Lifecycle" />
-          <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$LifecycleNode" />
-        </PATH_ELEMENT>
-      </PATH>
-    </treeState>
-  </component>
-  <component name="MavenRunner">
-    <option name="jreName" value="1.8 " />
-    <option name="vmOptions" value="-DarchetypeCatalog=internal" />
-  </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-9" />
-    <option name="y" value="-9" />
-    <option name="width" value="1860" />
-    <option name="height" value="1092" />
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectView">
-    <navigator currentView="ProjectPane" proportions="" version="1">
-      <flattenPackages />
-      <showMembers />
-      <showModules />
-      <showLibraryContents />
-      <hideEmptyPackages />
-      <abbreviatePackageNames />
-      <autoscrollToSource />
-      <autoscrollFromSource />
-      <sortByType />
-      <manualOrder />
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="ProjectPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Jersey--Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Jersey--Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Jersey--Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Jersey--Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Jersey--Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Jersey--Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Jersey--Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Jersey--Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Jersey--Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="resources" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Jersey--Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Jersey--Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="haikong" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Jersey--Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Jersey--Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="haikong" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="service" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Jersey--Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Jersey--Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="haikong" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="resources" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Jersey--Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Jersey--Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="haikong" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="interceptor" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Jersey--Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Jersey--Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="haikong" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="filter" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Jersey--Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Jersey--Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="haikong" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="exception" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Jersey--Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Jersey--Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="haikong" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dao" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Jersey--Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Jersey--Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="haikong" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="application" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
-      <pane id="Scratches" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="settings.editor.selected.configurable" value="reference.settings.project.maven.repository.indices" />
-    <property name="settings.editor.splitter.proportion" value="0.2" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="project.structure.last.edited" value="Modules" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.2" />
-    <property name="js-jscs-nodeInterpreter" value="C:\Program Files\nodejs\node.exe" />
-  </component>
-  <component name="RecentsManager">
-    <key name="CopyClassDialog.RECENTS_KEY">
-      <recent name="com.haikong.dao" />
-      <recent name="com.haikong.service" />
-      <recent name="com.haikong.application" />
-    </key>
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="F:\Git\RestDemo\Jersey工程\src\main\java\com\haikong" />
-      <recent name="F:\Git\RestDemo\Jersey工程\src\main\java\com\haikong\model" />
-      <recent name="F:\Git\RestDemo\Jersey工程\src\main\resources" />
-      <recent name="F:\Git\RestDemo\Jersey工程\src\main\resources\mybatis" />
-      <recent name="F:\Git\RestDemo\Jersey工程\src\main\java\com\haikong\util" />
-    </key>
-  </component>
-  <component name="RunManager" selected="Tomcat Server.Jersey">
-    <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false">
-      <deployment />
-      <server-settings />
-      <predefined_log_file id="Tomcat" enabled="true" />
-      <predefined_log_file id="Tomcat Catalina" enabled="true" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <method />
-    </configuration>
-    <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
-      <module name="" />
-      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
-      <option name="PROGRAM_PARAMETERS" />
-      <method />
-    </configuration>
-    <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
-      <module name="" />
-      <option name="DEPLOY" value="true" />
-      <option name="ARTIFACT_NAME" value="" />
-      <option name="PM_INSTALL_OPTIONS" value="" />
-      <option name="ACTIVITY_EXTRA_FLAGS" value="" />
-      <option name="MODE" value="default_activity" />
-      <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-      <option name="PREFERRED_AVD" value="" />
-      <option name="CLEAR_LOGCAT" value="false" />
-      <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
-      <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
-      <option name="FORCE_STOP_RUNNING_APP" value="true" />
-      <option name="DEBUGGER_TYPE" value="Java" />
-      <option name="USE_LAST_SELECTED_DEVICE" value="false" />
-      <option name="PREFERRED_AVD" value="" />
-      <Java />
-      <Profilers>
-        <option name="GAPID_DISABLE_PCS" value="false" />
-      </Profilers>
-      <option name="DEEP_LINK" value="" />
-      <option name="ACTIVITY_CLASS" value="" />
-      <method />
-    </configuration>
-    <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
-      <module name="" />
-      <option name="TESTING_TYPE" value="0" />
-      <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
-      <option name="METHOD_NAME" value="" />
-      <option name="CLASS_NAME" value="" />
-      <option name="PACKAGE_NAME" value="" />
-      <option name="EXTRA_OPTIONS" value="" />
-      <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-      <option name="PREFERRED_AVD" value="" />
-      <option name="CLEAR_LOGCAT" value="false" />
-      <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
-      <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
-      <option name="FORCE_STOP_RUNNING_APP" value="true" />
-      <option name="DEBUGGER_TYPE" value="Java" />
-      <option name="USE_LAST_SELECTED_DEVICE" value="false" />
-      <option name="PREFERRED_AVD" value="" />
-      <Java />
-      <Profilers>
-        <option name="GAPID_DISABLE_PCS" value="false" />
-      </Profilers>
-      <method />
-    </configuration>
-    <configuration default="true" type="Applet" factoryName="Applet">
-      <option name="HTML_USED" value="false" />
-      <option name="WIDTH" value="400" />
-      <option name="HEIGHT" value="300" />
-      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
-      <module />
-      <method />
-    </configuration>
-    <configuration default="true" type="Application" factoryName="Application">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="ArquillianJUnit" factoryName="">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="arquillianRunConfiguration">
-        <value>
-          <option name="containerStateName" value="" />
-        </value>
-      </option>
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="true" type="ArquillianTestNG" factoryName="">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="arquillianRunConfiguration">
-        <value>
-          <option name="containerStateName" value="" />
-        </value>
-      </option>
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="ANNOTATION_TYPE" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
-      <envs />
-      <properties />
-      <listeners />
-      <method />
-    </configuration>
-    <configuration default="true" type="Cold Fusion runner description" factoryName="Cold Fusion" custom_browser="" web_path="">
-      <method />
-    </configuration>
-    <configuration default="true" type="CucumberJavaRunConfigurationType" factoryName="Cucumber java">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="myFilePath" />
-      <option name="GLUE" />
-      <option name="myNameFilter" />
-      <option name="myGeneratedName" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="FlashRunConfigurationType" factoryName="Flash App">
-      <option name="BCName" value="" />
-      <option name="IOSSimulatorSdkPath" value="" />
-      <option name="adlOptions" value="" />
-      <option name="airProgramParameters" value="" />
-      <option name="appDescriptorForEmulator" value="Android" />
-      <option name="debugTransport" value="USB" />
-      <option name="debuggerSdkRaw" value="BC SDK" />
-      <option name="emulator" value="NexusOne" />
-      <option name="emulatorAdlOptions" value="" />
-      <option name="fastPackaging" value="true" />
-      <option name="fullScreenHeight" value="0" />
-      <option name="fullScreenWidth" value="0" />
-      <option name="launchUrl" value="false" />
-      <option name="launcherParameters">
-        <LauncherParameters>
-          <option name="browser" value="a7bb68e0-33c0-4d6f-a81a-aac1fdb870c8" />
-          <option name="launcherType" value="OSDefault" />
-          <option name="newPlayerInstance" value="false" />
-          <option name="playerPath" value="FlashPlayerDebugger.exe" />
-        </LauncherParameters>
-      </option>
-      <option name="mobileRunTarget" value="Emulator" />
-      <option name="moduleName" value="" />
-      <option name="overriddenMainClass" value="" />
-      <option name="overriddenOutputFileName" value="" />
-      <option name="overrideMainClass" value="false" />
-      <option name="runTrusted" value="true" />
-      <option name="screenDpi" value="0" />
-      <option name="screenHeight" value="0" />
-      <option name="screenWidth" value="0" />
-      <option name="url" value="http://" />
-      <option name="usbDebugPort" value="7936" />
-      <method />
-    </configuration>
-    <configuration default="true" type="FlexUnitRunConfigurationType" factoryName="FlexUnit" appDescriptorForEmulator="Android" class_name="" emulatorAdlOptions="" method_name="" package_name="" scope="Class">
-      <option name="BCName" value="" />
-      <option name="launcherParameters">
-        <LauncherParameters>
-          <option name="browser" value="a7bb68e0-33c0-4d6f-a81a-aac1fdb870c8" />
-          <option name="launcherType" value="OSDefault" />
-          <option name="newPlayerInstance" value="false" />
-          <option name="playerPath" value="FlashPlayerDebugger.exe" />
-        </LauncherParameters>
-      </option>
-      <option name="moduleName" value="" />
-      <option name="trusted" value="true" />
-      <method />
-    </configuration>
-    <configuration default="true" type="GradleRunConfiguration" factoryName="Gradle">
-      <ExternalSystemSettings>
-        <option name="executionName" />
-        <option name="externalProjectPath" />
-        <option name="externalSystemIdString" value="GRADLE" />
-        <option name="scriptParameters" />
-        <option name="taskDescriptions">
-          <list />
-        </option>
-        <option name="taskNames">
-          <list />
-        </option>
-        <option name="vmOptions" />
-      </ExternalSystemSettings>
-      <method />
-    </configuration>
-    <configuration default="true" type="GrailsRunConfigurationType" factoryName="Grails">
-      <setting name="vmparams" value="" />
-      <setting name="cmdLine" value="run-app" />
-      <setting name="passParentEnv" value="true" />
-      <setting name="launchBrowser" value="true" />
-      <setting name="depsClasspath" value="false" />
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <method />
-    </configuration>
-    <configuration default="true" type="JUnit" factoryName="JUnit">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="true" type="JUnitTestDiscovery" factoryName="JUnit Test Discovery" changeList="All">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="true" type="JarApplication" factoryName="JAR Application">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="Java Scratch" factoryName="Java Scratch">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="SCRATCH_FILE_ID" value="0" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
-      <method />
-    </configuration>
-    <configuration default="true" type="JetRunConfigurationType" factoryName="Kotlin">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="Jersey工程" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="KotlinStandaloneScriptRunConfigurationType" factoryName="Kotlin script">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="filePath" />
-      <option name="vmParameters" />
-      <option name="alternativeJrePath" />
-      <option name="programParameters" />
-      <option name="passParentEnvs" value="true" />
-      <option name="workingDirectory" />
-      <option name="isAlternativeJrePathEnabled" value="false" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="MavenRunConfiguration" factoryName="Maven">
-      <MavenSettings>
-        <option name="myGeneralSettings" />
-        <option name="myRunnerSettings" />
-        <option name="myRunnerParameters">
-          <MavenRunnerParameters>
-            <option name="profiles">
-              <set />
-            </option>
-            <option name="goals">
-              <list />
-            </option>
-            <option name="profilesMap">
-              <map />
-            </option>
-            <option name="resolveToWorkspace" value="false" />
-            <option name="workingDirPath" value="" />
-          </MavenRunnerParameters>
-        </option>
-      </MavenSettings>
-      <method />
-    </configuration>
-    <configuration default="true" type="Remote" factoryName="Remote">
-      <option name="USE_SOCKET_TRANSPORT" value="true" />
-      <option name="SERVER_MODE" value="false" />
-      <option name="SHMEM_ADDRESS" value="javadebug" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="5005" />
-      <method />
-    </configuration>
-    <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="TestNG" factoryName="TestNG">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="ANNOTATION_TYPE" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
-      <envs />
-      <properties />
-      <listeners />
-      <method />
-    </configuration>
-    <configuration default="true" type="TestNGTestDiscovery" factoryName="TestNG Test Discovery" changeList="All">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="ANNOTATION_TYPE" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
-      <envs />
-      <properties />
-      <listeners />
-      <method />
-    </configuration>
-    <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
-      <node-interpreter>project</node-interpreter>
-      <node-options />
-      <gulpfile />
-      <tasks />
-      <arguments />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="js.build_tools.npm" factoryName="npm">
-      <command value="run-script" />
-      <scripts />
-      <node-interpreter value="project" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="osgi.bnd.run" factoryName="Run Launcher">
-      <method />
-    </configuration>
-    <configuration default="true" type="osgi.bnd.run" factoryName="Test Launcher (JUnit)">
-      <method />
-    </configuration>
-    <configuration default="false" name="Jersey" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.0.301" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="OPEN_IN_BROWSER" value="false" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATING_POLICY" value="restart-server" />
-      <deployment>
-        <artifact name="Jersey工程:war exploded">
-          <settings>
-            <option name="CONTEXT_PATH" value="/" />
-          </settings>
-        </artifact>
-      </deployment>
-      <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_Jersey工程" />
-      </server-settings>
-      <predefined_log_file id="Tomcat" enabled="true" />
-      <predefined_log_file id="Tomcat Catalina" enabled="true" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="49819" />
-      </RunnerSettings>
-      <RunnerSettings RunnerId="JRebel Debug">
-        <option name="DEBUG_PORT" value="49820" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="JRebel Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="JRebel Executor">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method>
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="Jersey工程:war exploded" />
-        </option>
-      </method>
-    </configuration>
-    <list size="1">
-      <item index="0" class="java.lang.String" itemvalue="Tomcat Server.Jersey" />
-    </list>
-  </component>
-  <component name="ShelveChangesManager" show_recycled="false">
-    <option name="remove_strategy" value="false" />
-  </component>
-  <component name="SvnConfiguration">
-    <configuration>C:\Users\牛李\AppData\Roaming\Subversion</configuration>
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="49085bcd-f807-4321-90d1-c9acfb0a12d3" name="Default" comment="" />
-      <created>1469408303254</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1469408303254</updated>
-      <workItem from="1469408304716" duration="1205000" />
-      <workItem from="1469409516817" duration="45000" />
-      <workItem from="1469422116550" duration="213000" />
-      <workItem from="1469422392373" duration="2000" />
-      <workItem from="1469422812044" duration="3000" />
-      <workItem from="1469426590726" duration="3192000" />
-      <workItem from="1469446663906" duration="1735000" />
-      <workItem from="1469456646794" duration="5207000" />
-      <workItem from="1469547515121" duration="613000" />
-      <workItem from="1469581263495" duration="5128000" />
-      <workItem from="1469609730565" duration="782000" />
-      <workItem from="1469628113904" duration="5617000" />
-      <workItem from="1469668808738" duration="2724000" />
-      <workItem from="1469672536659" duration="1298000" />
-      <workItem from="1469678238291" duration="1271000" />
-      <workItem from="1469693354445" duration="18000" />
-      <workItem from="1469977006842" duration="385000" />
-      <workItem from="1474610642867" duration="1026000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="30464000" />
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="-9" y="-9" width="1860" height="1092" extended-state="0" />
-    <editor active="false" />
-    <layout>
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32939914" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3290461" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32997763" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="JRebel Executor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3601286" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3290461" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4056095" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="JRebel remote servers log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22315437" sideWeight="0.490161" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
-      <window_info id="JRebel" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.22315437" sideWeight="0.5066225" order="2" side_tool="true" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.22315437" sideWeight="0.509839" order="2" side_tool="true" content_ui="tabs" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="SVN Properties" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3290461" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3290461" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-    </layout>
-  </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <option name="time" value="13" />
-    </breakpoint-manager>
-    <watches-manager />
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/haikong/dao/DeviceMapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="17" column="26" selection-start-line="17" selection-start-column="26" selection-end-line="17" selection-end-column="26" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/Mapper/DeviceMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="15" column="31" selection-start-line="15" selection-start-column="31" selection-end-line="15" selection-end-column="31" />
-          <folding>
-            <marker date="1469457460171" expanded="true" signature="303:440" ph="UPDATE devic... " />
-            <marker date="1469457460171" expanded="true" signature="573:783" ph="UPDATE devic... " />
-            <marker date="1469457460171" expanded="true" signature="914:1009" ph="INSERT INTO device... " />
-            <marker date="1469457460171" expanded="true" signature="1135:1206" ph="INSERT INTO user_device... " />
-            <marker date="1469457460171" expanded="true" signature="1332:1405" ph="DELETE FROM " />
-            <marker date="1469457460171" expanded="true" signature="1549:1603" ph="SELECT data device" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/SqlMapConfig.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/db.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="10" column="10" selection-start-line="10" selection-start-column="10" selection-end-line="10" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/haikong/util/CheckUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="14" column="0" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
-          <folding>
-            <element signature="imports" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1738">
-          <caret line="79" column="24" selection-start-line="79" selection-start-column="24" selection-end-line="79" selection-end-column="24" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/haikong/resources/DeviceController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/haikong/resources/DeviceController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="34" column="5" selection-start-line="34" selection-start-column="5" selection-end-line="34" selection-end-column="5" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/ext/jersey-spring3/2.16/jersey-spring3-2.16.jar!/org/glassfish/jersey/server/spring/SpringWebApplicationInitializer.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="132">
-          <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="336">
-          <caret line="62" column="34" selection-start-line="62" selection-start-column="34" selection-end-line="62" selection-end-column="34" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/haikong/util/DeviceUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/haikong/util/Constants.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/haikong/util/DecriptUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="52" column="43" selection-start-line="52" selection-start-column="43" selection-end-line="52" selection-end-column="43" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/haikong/util/CheckUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="14" column="0" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
-          <folding>
-            <element signature="imports" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/Mapper/DeviceMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="15" column="31" selection-start-line="15" selection-start-column="31" selection-end-line="15" selection-end-column="31" />
-          <folding>
-            <marker date="1469457460171" expanded="true" signature="303:440" ph="UPDATE devic... " />
-            <marker date="1469457460171" expanded="true" signature="573:783" ph="UPDATE devic... " />
-            <marker date="1469457460171" expanded="true" signature="914:1009" ph="INSERT INTO device... " />
-            <marker date="1469457460171" expanded="true" signature="1135:1206" ph="INSERT INTO user_device... " />
-            <marker date="1469457460171" expanded="true" signature="1332:1405" ph="DELETE FROM " />
-            <marker date="1469457460171" expanded="true" signature="1549:1603" ph="SELECT data device" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/SqlMapConfig.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/db.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="10" column="10" selection-start-line="10" selection-start-column="10" selection-end-line="10" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/javax/ws/rs/javax.ws.rs-api/2.0.1/javax.ws.rs-api-2.0.1.jar!/javax/ws/rs/ext/InterceptorContext.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-132">
-          <caret line="12" column="17" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/javax/ws/rs/javax.ws.rs-api/2.0.1/javax.ws.rs-api-2.0.1.jar!/javax/ws/rs/ext/WriterInterceptorContext.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="22" column="9" selection-start-line="22" selection-start-column="9" selection-end-line="22" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/haikong/filter/AftRequestFilter.java" />
-    <entry file="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/core/jersey-common/2.16/jersey-common-2.16.jar!/org/glassfish/jersey/internal/util/Tokenizer.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="43">
-          <caret line="21" column="27" selection-start-line="21" selection-start-column="27" selection-end-line="21" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/core/jersey-server/2.16/jersey-server-2.16.jar!/org/glassfish/jersey/server/ResourceConfig.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="228" column="88" selection-start-line="228" selection-start-column="88" selection-end-line="228" selection-end-column="88" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/core/jersey-server/2.16/jersey-server-2.16-sources.jar!/org/glassfish/jersey/server/ResourceConfig.java" />
-    <entry file="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/core/jersey-server/2.16/jersey-server-2.16-sources.jar!/org/glassfish/jersey/server/internal/scanning/PackageNamesScanner.java" />
-    <entry file="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/core/jersey-common/2.16/jersey-common-2.16-sources.jar!/org/glassfish/jersey/message/internal/WriterInterceptorExecutor.java" />
-    <entry file="jar://$MAVEN_REPOSITORY$/javax/ws/rs/javax.ws.rs-api/2.0.1/javax.ws.rs-api-2.0.1-sources.jar!/javax/ws/rs/ext/WriterInterceptorContext.java" />
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_77/src.zip!/java/util/zip/GZIPOutputStream.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1239">
-          <caret line="107" column="11" selection-start-line="107" selection-start-column="11" selection-end-line="107" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/javax/ws/rs/javax.ws.rs-api/2.0.1/javax.ws.rs-api-2.0.1-sources.jar!/javax/ws/rs/core/MediaType.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="13" column="6" selection-start-line="13" selection-start-column="6" selection-end-line="13" selection-end-column="6" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3234">
-          <caret line="147" column="17" selection-start-line="147" selection-start-column="17" selection-end-line="147" selection-end-column="17" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/haikong/model/Device.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="28" column="12" selection-start-line="28" selection-start-column="12" selection-end-line="28" selection-end-column="12" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/haikong/model/ReqDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="24" column="5" selection-start-line="24" selection-start-column="5" selection-end-line="24" selection-end-column="5" />
-          <folding>
-            <element signature="e#486#487#0" expanded="true" />
-            <element signature="e#522#523#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/haikong/model/ServicesBean.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/haikong/resources/DeviceController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="44">
-          <caret line="28" column="40" selection-start-line="28" selection-start-column="40" selection-end-line="28" selection-end-column="40" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/haikong/interceptor/GzipInterceptor.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="528">
-          <caret line="24" column="63" selection-start-line="24" selection-start-column="63" selection-end-line="24" selection-end-column="63" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/haikong/filter/PreRequestFilter.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="22" column="5" selection-start-line="22" selection-start-column="5" selection-end-line="22" selection-end-column="5" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/haikong/filter/ResponseFilter.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="22" column="36" selection-start-line="22" selection-start-column="36" selection-end-line="22" selection-end-column="36" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/haikong/ResultVO.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="5" column="12" selection-start-line="5" selection-start-column="12" selection-end-line="5" selection-end-column="12" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/haikong/exception/DeviceException.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="10" column="7" selection-start-line="10" selection-start-column="7" selection-end-line="10" selection-end-column="7" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/haikong/service/DeviceService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="352">
-          <caret line="22" column="20" selection-start-line="21" selection-start-column="22" selection-end-line="22" selection-end-column="20" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/haikong/exception/DeviceExceptionMapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="24" column="41" selection-start-line="24" selection-start-column="39" selection-end-line="24" selection-end-column="41" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/haikong/exception/ErrorEntity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="10" column="25" selection-start-line="10" selection-start-column="25" selection-end-line="10" selection-end-column="25" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/haikong/dao/DeviceMapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-176">
-          <caret line="14" column="33" selection-start-line="14" selection-start-column="33" selection-end-line="14" selection-end-column="33" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/haikong/application/RESTApplication.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="594">
-          <caret line="32" column="43" selection-start-line="32" selection-start-column="43" selection-end-line="32" selection-end-column="43" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/log4j.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="132">
-          <caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>Jersey工程:war</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring|Jersey工程</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectJDKs.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: javax.annotation:javax.annotation-api:1.2</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git "a/Jersey--Demo/Jersey\345\267\245\347\250\213.iml" "b/Jersey--Demo/Jersey\345\267\245\347\250\213.iml"
deleted file mode 100644
index 650de83..0000000
--- "a/Jersey--Demo/Jersey\345\267\245\347\250\213.iml"
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="web" name="Web">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
-        </webroots>
-        <sourceRoots>
-          <root url="file://$MODULE_DIR$/src/main/java" />
-          <root url="file://$MODULE_DIR$/src/main/resources" />
-        </sourceRoots>
-      </configuration>
-    </facet>
-    <facet type="Spring" name="Spring">
-      <configuration>
-        <fileset id="fileset" name="Spring Application Context" removed="false">
-          <file>file://$MODULE_DIR$/src/main/resources/applicationContext.xml</file>
-        </fileset>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.1.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.1.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.1.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.1.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.1.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.1.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.1.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.1.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.1.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: cglib:cglib:3.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.ant:ant:1.9.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.ant:ant-launcher:1.9.6" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.6" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.6" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid:1.0.18" level="project" />
-    <orderEntry type="module-library">
-      <library name="Maven: com.alibaba:jconsole:1.8.0">
-        <CLASSES>
-          <root url="jar://C:/Program Files/Java/jdk1.8.0_77/jre/../lib/jconsole.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Maven: com.alibaba:tools:1.8.0">
-        <CLASSES>
-          <root url="jar://C:/Program Files/Java/jdk1.8.0_77/jre/../lib/tools.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.3.0" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.6" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jersey.containers:jersey-container-servlet:2.16" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jersey.containers:jersey-container-servlet-core:2.16" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.hk2.external:javax.inject:2.4.0-b09" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jersey.core:jersey-common:2.16" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jersey.core:jersey-server:2.16" level="project" />
-    <orderEntry type="library" name="Maven: javax.ws.rs:javax.ws.rs-api:2.0.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jersey.bundles.repackaged:jersey-guava:2.16" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.hk2:hk2-api:2.4.0-b09" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.hk2:hk2-utils:2.4.0-b09" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.hk2.external:aopalliance-repackaged:2.4.0-b09" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.hk2:hk2-locator:2.4.0-b09" level="project" />
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.18.1-GA" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.hk2:osgi-resource-locator:1.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jersey.core:jersey-client:2.16" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jersey.media:jersey-media-jaxb:2.16" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jersey.ext:jersey-spring3:2.16" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.hk2:hk2:2.4.0-b09" level="project" />
-    <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.hk2:config-types:2.4.0-b09" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.hk2:hk2-config:2.4.0-b09" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.hk2:core:2.4.0-b09" level="project" />
-    <orderEntry type="library" name="Maven: org.jvnet:tiger-types:1.4" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.hk2.external:bean-validator:2.4.0-b09" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.hk2:hk2-runlevel:2.4.0-b09" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.hk2:class-model:2.4.0-b09" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.hk2.external:asm-all-repackaged:2.4.0-b09" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.hk2:spring-bridge:2.4.0-b09" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.3.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.3.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.3.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.3.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.3.3" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jersey.media:jersey-media-moxy:2.16" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jersey.ext:jersey-entity-filtering:2.16" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.persistence:org.eclipse.persistence.moxy:2.5.0" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.persistence:org.eclipse.persistence.core:2.5.0" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.persistence:org.eclipse.persistence.asm:2.5.0" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.persistence:org.eclipse.persistence.antlr:2.5.0" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jersey.media:jersey-media-multipart:2.16" level="project" />
-    <orderEntry type="library" name="Maven: org.jvnet.mimepull:mimepull:1.9.3" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.14" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.7" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.7" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.10" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/Jersey--Demo/pom.xml b/Jersey-Demo/pom.xml
similarity index 98%
rename from Jersey--Demo/pom.xml
rename to Jersey-Demo/pom.xml
index 517faa3..774ec31 100644
--- a/Jersey--Demo/pom.xml
+++ b/Jersey-Demo/pom.xml
@@ -2,11 +2,10 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>cn.mrdear</groupId>
-  <artifactId>mrdear</artifactId>
+  <artifactId>Jersey-Demo</artifactId>
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
-  <name>mrdear Maven Webapp</name>
-  <url>http://maven.apache.org</url>
+  <name>Jersey-Demo</name>
   <properties>
     <!--spring版本-->
     <spring.version>4.1.1.RELEASE</spring.version>
diff --git a/Jersey--Demo/src/main/java/com/haikong/ResultVO.java b/Jersey-Demo/src/main/java/com/haikong/ResultVO.java
similarity index 100%
rename from Jersey--Demo/src/main/java/com/haikong/ResultVO.java
rename to Jersey-Demo/src/main/java/com/haikong/ResultVO.java
diff --git a/Jersey--Demo/src/main/java/com/haikong/application/RESTApplication.java b/Jersey-Demo/src/main/java/com/haikong/application/RESTApplication.java
similarity index 100%
rename from Jersey--Demo/src/main/java/com/haikong/application/RESTApplication.java
rename to Jersey-Demo/src/main/java/com/haikong/application/RESTApplication.java
diff --git a/Jersey--Demo/src/main/java/com/haikong/dao/DeviceMapper.java b/Jersey-Demo/src/main/java/com/haikong/dao/DeviceMapper.java
similarity index 100%
rename from Jersey--Demo/src/main/java/com/haikong/dao/DeviceMapper.java
rename to Jersey-Demo/src/main/java/com/haikong/dao/DeviceMapper.java
diff --git a/Jersey--Demo/src/main/java/com/haikong/exception/DeviceExceptionMapper.java b/Jersey-Demo/src/main/java/com/haikong/exception/DeviceExceptionMapper.java
similarity index 100%
rename from Jersey--Demo/src/main/java/com/haikong/exception/DeviceExceptionMapper.java
rename to Jersey-Demo/src/main/java/com/haikong/exception/DeviceExceptionMapper.java
diff --git a/Jersey--Demo/src/main/java/com/haikong/exception/ErrorEntity.java b/Jersey-Demo/src/main/java/com/haikong/exception/ErrorEntity.java
similarity index 100%
rename from Jersey--Demo/src/main/java/com/haikong/exception/ErrorEntity.java
rename to Jersey-Demo/src/main/java/com/haikong/exception/ErrorEntity.java
diff --git a/Jersey--Demo/src/main/java/com/haikong/filter/PreRequestFilter.java b/Jersey-Demo/src/main/java/com/haikong/filter/PreRequestFilter.java
similarity index 100%
rename from Jersey--Demo/src/main/java/com/haikong/filter/PreRequestFilter.java
rename to Jersey-Demo/src/main/java/com/haikong/filter/PreRequestFilter.java
diff --git a/Jersey--Demo/src/main/java/com/haikong/filter/ResponseFilter.java b/Jersey-Demo/src/main/java/com/haikong/filter/ResponseFilter.java
similarity index 100%
rename from Jersey--Demo/src/main/java/com/haikong/filter/ResponseFilter.java
rename to Jersey-Demo/src/main/java/com/haikong/filter/ResponseFilter.java
diff --git a/Jersey--Demo/src/main/java/com/haikong/interceptor/GzipInterceptor.java b/Jersey-Demo/src/main/java/com/haikong/interceptor/GzipInterceptor.java
similarity index 100%
rename from Jersey--Demo/src/main/java/com/haikong/interceptor/GzipInterceptor.java
rename to Jersey-Demo/src/main/java/com/haikong/interceptor/GzipInterceptor.java
diff --git a/Jersey--Demo/src/main/java/com/haikong/model/Device.java b/Jersey-Demo/src/main/java/com/haikong/model/Device.java
similarity index 100%
rename from Jersey--Demo/src/main/java/com/haikong/model/Device.java
rename to Jersey-Demo/src/main/java/com/haikong/model/Device.java
diff --git a/Jersey--Demo/src/main/java/com/haikong/model/ReqDevice.java b/Jersey-Demo/src/main/java/com/haikong/model/ReqDevice.java
similarity index 100%
rename from Jersey--Demo/src/main/java/com/haikong/model/ReqDevice.java
rename to Jersey-Demo/src/main/java/com/haikong/model/ReqDevice.java
diff --git a/Jersey--Demo/src/main/java/com/haikong/model/ServicesBean.java b/Jersey-Demo/src/main/java/com/haikong/model/ServicesBean.java
similarity index 100%
rename from Jersey--Demo/src/main/java/com/haikong/model/ServicesBean.java
rename to Jersey-Demo/src/main/java/com/haikong/model/ServicesBean.java
diff --git a/Jersey--Demo/src/main/java/com/haikong/resources/DeviceController.java b/Jersey-Demo/src/main/java/com/haikong/resources/DeviceController.java
similarity index 100%
rename from Jersey--Demo/src/main/java/com/haikong/resources/DeviceController.java
rename to Jersey-Demo/src/main/java/com/haikong/resources/DeviceController.java
diff --git a/Jersey--Demo/src/main/java/com/haikong/service/DeviceService.java b/Jersey-Demo/src/main/java/com/haikong/service/DeviceService.java
similarity index 100%
rename from Jersey--Demo/src/main/java/com/haikong/service/DeviceService.java
rename to Jersey-Demo/src/main/java/com/haikong/service/DeviceService.java
diff --git a/Jersey--Demo/src/main/java/com/haikong/util/CheckUtil.java b/Jersey-Demo/src/main/java/com/haikong/util/CheckUtil.java
similarity index 100%
rename from Jersey--Demo/src/main/java/com/haikong/util/CheckUtil.java
rename to Jersey-Demo/src/main/java/com/haikong/util/CheckUtil.java
diff --git a/Jersey--Demo/src/main/java/com/haikong/util/Constants.java b/Jersey-Demo/src/main/java/com/haikong/util/Constants.java
similarity index 100%
rename from Jersey--Demo/src/main/java/com/haikong/util/Constants.java
rename to Jersey-Demo/src/main/java/com/haikong/util/Constants.java
diff --git a/Jersey--Demo/src/main/java/com/haikong/util/DecriptUtil.java b/Jersey-Demo/src/main/java/com/haikong/util/DecriptUtil.java
similarity index 100%
rename from Jersey--Demo/src/main/java/com/haikong/util/DecriptUtil.java
rename to Jersey-Demo/src/main/java/com/haikong/util/DecriptUtil.java
diff --git a/Jersey--Demo/src/main/java/com/haikong/util/DeviceUtil.java b/Jersey-Demo/src/main/java/com/haikong/util/DeviceUtil.java
similarity index 100%
rename from Jersey--Demo/src/main/java/com/haikong/util/DeviceUtil.java
rename to Jersey-Demo/src/main/java/com/haikong/util/DeviceUtil.java
diff --git a/Jersey--Demo/src/main/resources/applicationContext.xml b/Jersey-Demo/src/main/resources/applicationContext.xml
similarity index 100%
rename from Jersey--Demo/src/main/resources/applicationContext.xml
rename to Jersey-Demo/src/main/resources/applicationContext.xml
diff --git a/Jersey--Demo/src/main/resources/db.properties b/Jersey-Demo/src/main/resources/db.properties
similarity index 100%
rename from Jersey--Demo/src/main/resources/db.properties
rename to Jersey-Demo/src/main/resources/db.properties
diff --git a/Jersey-Demo/src/main/resources/db.sql b/Jersey-Demo/src/main/resources/db.sql
new file mode 100644
index 0000000..af88aa9
--- /dev/null
+++ b/Jersey-Demo/src/main/resources/db.sql
@@ -0,0 +1,88 @@
+/*
+SQLyog Ultimate v12.08 (64 bit)
+MySQL - 5.6.24 : Database - haikong
+*********************************************************************
+*/
+
+
+/*!40101 SET NAMES utf8 */;
+
+/*!40101 SET SQL_MODE=''*/;
+
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+CREATE DATABASE /*!32312 IF NOT EXISTS*/`haikong` /*!40100 DEFAULT CHARACTER SET utf8 */;
+
+USE `haikong`;
+
+/*Table structure for table `switchdevice` */
+
+CREATE TABLE `switchdevice` (
+  `device_id` varchar(255) NOT NULL,
+  `device_type` varchar(255) NOT NULL,
+  `onoffStatus` tinyint(1) DEFAULT NULL,
+  `data` varchar(255) DEFAULT NULL,
+  `create_time` datetime DEFAULT NULL,
+  `asy_error_code` int(10) DEFAULT '50013',
+  PRIMARY KEY (`device_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+/*Data for the table `switchdevice` */
+
+LOCK TABLES `switchdevice` WRITE;
+
+insert  into `switchdevice`(`device_id`,`device_type`,`onoffStatus`,`data`,`create_time`,`asy_error_code`) values ('gh_4f7d3885c0a9_24bf775bf31306a6','gh_4f7d3885c0a9',0,'{\"ct\":\"0-5-1\",\"ene\":0,\"power\":0,\"t1\":\"1-920-922-127\",\"t2\":\"1-510-810-127\",\"t3\":\"1-520-820-127\",\"t4\":\"0-530-830-127\",\"vol\":0}',NULL,50013),('gh_4f7d3885c0a9_5cb36c1e609fc5e4','gh_4f7d3885c0a9',0,'{\"vol\":2330,\"power\":0.0,\"ene\":123,\"t1\":\"1-485-495-127\",\"t2\":\"0-950-955-127\",\"t3\":\"1-960-965-127\",\"t4\":\"0-970-975-127\",\"ct\":\"0-30-0\"}','2016-07-26 00:00:02',0),('gh_4f7d3885c0a9_6862ecf1431908aa','gh_4f7d3885c0a9',0,'{\"vol\":2277,\"power\":0,\"ene\":0,\"t1\":\"1-590-592-127\",\"t2\":\"1-595-597-127\",\"t3\":\"1-600-602-127\",\"t4\":\"1-605-610-127\",\"ct\":\"0-5-1\"}','2016-06-08 09:28:23',50013),('gh_4f7d3885c0a9_6aae48686d7aa518','gh_4f7d3885c0a9',0,'{\"vol\":0,\"power\":0,\"ene\":0,\"t1\":\"0-920-922-127\",\"t2\":\"0-510-810-127\",\"t3\":\"0-520-820-127\",\"t4\":\"0-530-830-127\",\"ct\":\"0-5-1\"}','2016-06-13 19:53:54',50013),('gh_4f7d3885c0a9_6c5ecdde0b08ee85','gh_4f7d3885c0a9',1,'{\"vol\":2688,\"power\":41,\"ene\":0,\"t1\":\"\",\"t2\":\"\",\"t3\":\"\",\"t4\":\"\",\"ct\":\"\"}','2016-07-01 17:35:49',0),('gh_4f7d3885c0a9_9ea2808950a2dce5','gh_4f7d3885c0a9',0,'{\"vol\":2250,\"power\":4,\"ene\":0,\"t1\":\"0-920-922-127\",\"t2\":\"0-510-810-127\",\"t3\":\"0-520-820-127\",\"t4\":\"0-530-830-127\",\"ct\":\"0-5-1\"}','2016-06-07 21:04:43',50013),('gh_4f7d3885c0a9_9eeb6cd5b2248acc','gh_4f7d3885c0a9',0,'{\"vol\":42,\"power\":0.0,\"ene\":2,\"t1\":\"0-4-14341-0\",\"t2\":\"159--22525-10753-2\",\"t3\":\"224--20480-0-4\",\"t4\":\"0-0-0-0\",\"ct\":\"0-8032-31\"}','2016-07-11 15:38:33',0),('gh_4f7d3885c0a9_b5d8814afb0644d5','gh_4f7d3885c0a9',0,'{\"ct\":\"0-5-1\",\"ene\":0,\"power\":0,\"t1\":\"1-920-922-127\",\"t2\":\"1-510-810-127\",\"t3\":\"1-520-820-127\",\"t4\":\"0-530-830-127\",\"vol\":0}',NULL,50013),('gh_4f7d3885c0a9_bc77b4f0d2d7a89e','gh_4f7d3885c0a9',0,'{\"vol\":2288,\"power\":0.0,\"ene\":3,\"t1\":\"0-590-592-127\",\"t2\":\"1-595-597-127\",\"t3\":\"1-600-602-127\",\"t4\":\"1-605-610-127\",\"ct\":\"0-2-0\"}','2016-07-23 18:09:25',0),('gh_4f7d3885c0a9_d5abb053ddb1bf6b','gh_4f7d3885c0a9',0,'{\"vol\":2342,\"power\":0.0,\"ene\":71,\"t1\":\"1-920-922-127\",\"t2\":\"0-510-810-127\",\"t3\":\"1-520-820-127\",\"t4\":\"0-530-830-127\",\"ct\":\"0-5-1\"}','2016-07-12 16:44:59',0),('gh_4f7d3885c0a9_ddc94c4cbd475075','gh_4f7d3885c0a9',0,'{\"vol\":2319,\"power\":0.0,\"ene\":13,\"t1\":\"1-551-553-2\",\"t2\":\"0-0-0-0\",\"t3\":\"0-0-0-0\",\"t4\":\"0-0-0-0\",\"ct\":\"0-2-0\"}','2016-07-09 15:04:35',50012),('gh_4f7d3885c0a9_df131bbd83974bc8','gh_4f7d3885c0a9',0,'{\"vol\":0,\"power\":0,\"ene\":0,\"t1\":\"\",\"t2\":\"\",\"t3\":\"\",\"t4\":\"\",\"ct\":\"\"}','2016-06-27 16:06:21',50013),('gh_4f7d3885c0a9_e0242e4ca8017c8d','gh_4f7d3885c0a9',0,'{\"vol\":2319,\"power\":0.0,\"ene\":13,\"t1\":\"1-551-553-2\",\"t2\":\"0-0-0-0\",\"t3\":\"0-0-0-0\",\"t4\":\"0-0-0-0\",\"ct\":\"0-2-0\"}',NULL,50012);
+
+UNLOCK TABLES;
+
+/*Table structure for table `user` */
+
+CREATE TABLE `user` (
+  `openid` varchar(255) NOT NULL,
+  `nickname` varchar(255) NOT NULL,
+  `sex` int(1) DEFAULT NULL,
+  `language` varchar(20) DEFAULT NULL,
+  `country` varchar(30) DEFAULT NULL,
+  `province` varchar(30) DEFAULT NULL,
+  `city` varchar(30) DEFAULT NULL,
+  `headimgurl` varchar(255) DEFAULT NULL,
+  `subscribe_time` datetime NOT NULL,
+  `remark` varchar(50) DEFAULT NULL,
+  `groupid` int(5) DEFAULT NULL,
+  `tagid_list` varchar(50) DEFAULT NULL,
+  `subscribe` int(1) NOT NULL,
+  `device_id` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`openid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+/*Data for the table `user` */
+
+LOCK TABLES `user` WRITE;
+
+insert  into `user`(`openid`,`nickname`,`sex`,`language`,`country`,`province`,`city`,`headimgurl`,`subscribe_time`,`remark`,`groupid`,`tagid_list`,`subscribe`,`device_id`) values ('ocT6Ivwa8DBigrwt2vJQfnQYZ_Ho','MR.dear',1,'zh_CN','中国','安徽','淮南','http://wx.qlogo.cn/mmopen/ajNVdqHZLLABYMN0Tsttb5HHrlPG2aU9oDhDJMfFaYKbu4aVpvcsTYP6KibfBrwQWyLGr3ib8sXWoLqZKSPpzPmQ/0','1970-01-18 09:19:26','',0,'[]',0,NULL),('ov4a6wg2snvQ3eJiZcxJI31noVZk','梅斯塔利亚球童',1,'zh_CN','中国','安徽','淮南','http://wx.qlogo.cn/mmopen/Q3auHgzwzM6zC3QlibnibafA7EtI3vayCVVZiamd9r2ulYR5G4uVkVYvhUZ1XuHfwb8WTHkYw1fjw8o9Jgr41XlEw/0','2016-06-13 10:55:52','',0,'[]',1,NULL),('ov4a6wiikevsn_Wev3xVQz1UEAhY','洛齐',1,'zh_CN','中国','安徽','淮南','http://wx.qlogo.cn/mmopen/wotl6RIXwvTP6uQEHEmpDHg4oVlLMHaDNRicTwD03tG4JGJoLqCuOIRQicIB2C9s001J2sPAGU4j4w4IaGKxiccMeBeNlL3FaicE/0','2016-07-09 12:29:57','',0,'[]',1,NULL),('ov4a6wi_ZdkGdIxAlyVwlHkisFXI','MR.dear',1,'zh_CN','中国','安徽','淮南','http://wx.qlogo.cn/mmopen/ajNVdqHZLLDVFjDEYwqoOKMrhHbBwK2WhN8I89Tdu8iajz1rI244L26qrvSFmshDX8WlW542TlvA8w4VibXKR0Sg/0','2016-05-20 10:52:57','',0,'[]',1,NULL),('ov4a6wl9hqiaIjq35gqKBfq8V__g','木字柏',1,'zh_CN','中国','河南','郑州','http://wx.qlogo.cn/mmopen/wotl6RIXwvTP6uQEHEmpDH1WU61QmVpehnPO2gv8hX0vXXTJa12QgHFy82jst6It5sVgkos110xh14T0SlojX3RLdiae3wLt9/0','2016-06-28 09:37:05','',0,'[]',1,NULL),('ov4a6wnuLygS245t7p8JsKJmzAhM','丁丁',1,'zh_CN','中国','北京','','http://wx.qlogo.cn/mmopen/JVDECnNjedHtic678xUWBMyW2HEXHbdVSPzl7acIznEzXEX0iabMyJzuicmjcXKMM6xlBmEnK5X3Bwm0GfFcLmWgw/0','2016-07-02 23:35:00','',0,'[]',1,NULL),('ov4a6woxlwp3vo_rTu6nL_HK1Hw8','童鑫',1,'zh_CN','中国','安徽','淮南','http://wx.qlogo.cn/mmopen/ajNVdqHZLLAOPbQXZP7mNpeNfdiaoaL1x3cTmv1bgfC6htRW5WFZ31oxFRnStQeqF78iaLMZRianrI6bDjcIrUw2Q/0','2016-07-04 10:56:36','',0,'[]',1,NULL),('ov4a6wq0aYpL4yVXuNdsWnx50O1w','笑笑',2,'zh_CN','中国','浙江','嘉兴','http://wx.qlogo.cn/mmopen/wotl6RIXwvTP6uQEHEmpDHce2C5RcP8Q6F67ZQOHwEV8xGvtoKQCHKMvmB3FTnZ3tM25FicMgIWQsrChUgYXFR6qibeY7ibQJY4/0','2016-05-20 10:56:35','',0,'[]',1,NULL),('ov4a6wqwZnD4A40ptII5HRfcl5P4','星之辉',1,'zh_CN','中国','河南','郑州','http://wx.qlogo.cn/mmopen/ajNVdqHZLLCsgtZribtLYslXHibVxN9pQs8ju3EI5Iju5JgV33DWF8B9KYO0f3ChiasPA7ibrrpCx5ca4TQq1swFUg/0','2016-06-27 17:32:58','',0,'[]',1,NULL),('ov4a6wriUlQK7c2b4J9GdlFMT-lM','张馨元',2,'zh_CN','中国','安徽','淮南','http://wx.qlogo.cn/mmopen/PiajxSqBRaEL095aT9yJXxjolfHPwmEI5DvB8qahl4mQQSYeCSvV5pUaXmHNGJBniaXF9yGBBUPic7amwAZlD0lNw/0','2016-06-07 22:57:22','',0,'[]',1,NULL),('ov4a6wsY4w_iD887DUlJAmtcqX0E','丽丽',2,'zh_CN','中国','安徽','淮南','http://wx.qlogo.cn/mmopen/ajNVdqHZLLBZ4nibrIsryUwia5ibmmkHZx1cqt4m8nN5oMIicmJGC5LOaANcgWb86hJHZ4yRziaYqYBDWewGTnXysMw/0','2016-05-20 12:59:11','',0,'[]',1,NULL),('ov4a6wszjYYE3oTZ-g7dvvlfVHU8','づヤ↘',1,'zh_CN','冰岛','','','http://wx.qlogo.cn/mmopen/C6GINSn24pTeWxlFk1AbM19ZtIOzibv5IuhQgzp4ordS2Gbh50SbGiaLEobib3ys5vMBfbibqAiafVh4azibmhxoPdtQbQoqGIldibz/0','2016-07-01 20:31:13','',0,'[]',1,NULL),('ov4a6wtqBple7-0p-Wk_dwWdJo9w','MR.dear',1,'zh_CN','中国','安徽','淮南','http://wx.qlogo.cn/mmopen/ajNVdqHZLLDVFjDEYwqoOKMrhHbBwK2WhN8I89Tdu8iajz1rI244L26qrvSFmshDX8WlW542TlvA8w4VibXKR0Sg/0','2016-07-12 23:25:42','',0,'[]',1,NULL),('ov4a6wuj8FYpUFWW48gCP0iM2Vdo','查查网-姚多桂',1,'zh_CN','中国','安徽','淮南','http://wx.qlogo.cn/mmopen/wotl6RIXwvTP6uQEHEmpDG34jfISWkLlLjwV54XXBjVOjjiaUlbFxpl1Be40yuFTsuIwcmXBvvUtnTfyllDndtDGFJRTRg1ll/0','2016-05-31 16:11:56','',0,'[]',1,NULL),('ov4a6wvc5HVK7Dgghk8NxC22vG4g','lens',1,'zh_CN','中国','浙江','绍兴','http://wx.qlogo.cn/mmopen/C6GINSn24pQEmfQSSPIJqjLiauloPYLPcMicLZXvGq8wBZCYicjl6CYYnRtKPmBv578NEnwDopzqb3icZYYwbexqEQ/0','2016-06-29 16:49:53','',0,'[]',1,NULL);
+
+UNLOCK TABLES;
+
+/*Table structure for table `user_device` */
+
+CREATE TABLE `user_device` (
+  `device_id` varchar(255) DEFAULT NULL,
+  `user` varchar(255) DEFAULT NULL,
+  `device_type` varchar(255) DEFAULT NULL,
+  `bz` varchar(255) DEFAULT '我的插座'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+/*Data for the table `user_device` */
+
+LOCK TABLES `user_device` WRITE;
+
+insert  into `user_device`(`device_id`,`user`,`device_type`,`bz`) values ('gh_4f7d3885c0a9_9ea2808950a2dce5','ov4a6wsY4w_iD887DUlJAmtcqX0E','gh_4f7d3885c0a9','我的插座'),('gh_4f7d3885c0a9_9ea2808950a2dce5','ov4a6wi_ZdkGdIxAlyVwlHkisFXI','gh_4f7d3885c0a9','我的插座'),('gh_4f7d3885c0a9_6aae48686d7aa518','ov4a6wuj8FYpUFWW48gCP0iM2Vdo','gh_4f7d3885c0a9','我的插座'),('gh_4f7d3885c0a9_6aae48686d7aa518','ov4a6wriUlQK7c2b4J9GdlFMT-lM','gh_4f7d3885c0a9','我的插座'),('gh_4f7d3885c0a9_9ea2808950a2dce5','ov4a6wriUlQK7c2b4J9GdlFMT-lM','gh_4f7d3885c0a9','我的插座'),('gh_4f7d3885c0a9_5cb36c1e609fc5e4','ov4a6wriUlQK7c2b4J9GdlFMT-lM','gh_4f7d3885c0a9','我的插座'),('gh_4f7d3885c0a9_6c5ecdde0b08ee85','ov4a6wuNSuFHzF06WH5s6SGgXiw0','gh_4f7d3885c0a9','我的插座'),('gh_4f7d3885c0a9_5cb36c1e609fc5e4','ov4a6wg2snvQ3eJiZcxJI31noVZk','gh_4f7d3885c0a9','我的插座'),('gh_4f7d3885c0a9_5cb36c1e609fc5e4','ov4a6wg2snvQ3eJiZcxJI31noVZk','gh_4f7d3885c0a9','我的插座'),('gh_4f7d3885c0a9_5cb36c1e609fc5e4','ov4a6wvc5HVK7Dgghk8NxC22vG4g','gh_4f7d3885c0a9','我的插座'),('gh_4f7d3885c0a9_ddc94c4cbd475075','ov4a6woxlwp3vo_rTu6nL_HK1Hw8','gh_4f7d3885c0a9','我的插座'),('gh_4f7d3885c0a9_d5abb053ddb1bf6b','ov4a6woxlwp3vo_rTu6nL_HK1Hw8','gh_4f7d3885c0a9','我的插座'),('gh_4f7d3885c0a9_9eeb6cd5b2248acc','ov4a6woxlwp3vo_rTu6nL_HK1Hw8','gh_4f7d3885c0a9','我的插座'),('gh_4f7d3885c0a9_bc77b4f0d2d7a89e','ov4a6woxlwp3vo_rTu6nL_HK1Hw8','gh_4f7d3885c0a9','卧室'),('gh_4f7d3885c0a9_d5abb053ddb1bf6b','ov4a6wnuLygS245t7p8JsKJmzAhM','gh_4f7d3885c0a9','我的插座'),('gh_4f7d3885c0a9_bc77b4f0d2d7a89e','ov4a6wtqBple7-0p-Wk_dwWdJo9w','gh_4f7d3885c0a9','卧室'),('gh_4f7d3885c0a9_bc77b4f0d2d7a89e','ov4a6wi_ZdkGdIxAlyVwlHkisFXI','gh_4f7d3885c0a9','我的插座'),('gh_4f7d3885c0a9_d5abb053ddb1bf6b','ov4a6wi_ZdkGdIxAlyVwlHkisFXI','gh_4f7d3885c0a9','我的插座'),('gh_4f7d3885c0a9_d5abb053ddb1bf6b','ocT6Ivwa8DBigrwt2vJQfnQYZ_Ho','gh_4f7d3885c0a9','嘻嘻'),('gh_4f7d3885c0a9_ddc94c4cbd475075','ocT6Ivwa8DBigrwt2vJQfnQYZ_Ho','gh_4f7d3885c0a9','嘻嘻'),('gh_4f7d3885c0a9_ddc94c4cbd475075','ocT6Ivwa8DBigrwt2vJQfnQYZ_Ho','gh_4f7d3885c0a9','嘻嘻');
+
+UNLOCK TABLES;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
diff --git a/Jersey--Demo/src/main/resources/log4j.properties b/Jersey-Demo/src/main/resources/log4j.properties
similarity index 100%
rename from Jersey--Demo/src/main/resources/log4j.properties
rename to Jersey-Demo/src/main/resources/log4j.properties
diff --git a/Jersey--Demo/src/main/resources/mybatis/Mapper/DeviceMapper.xml b/Jersey-Demo/src/main/resources/mybatis/Mapper/DeviceMapper.xml
similarity index 100%
rename from Jersey--Demo/src/main/resources/mybatis/Mapper/DeviceMapper.xml
rename to Jersey-Demo/src/main/resources/mybatis/Mapper/DeviceMapper.xml
diff --git a/Jersey--Demo/src/main/resources/mybatis/SqlMapConfig.xml b/Jersey-Demo/src/main/resources/mybatis/SqlMapConfig.xml
similarity index 100%
rename from Jersey--Demo/src/main/resources/mybatis/SqlMapConfig.xml
rename to Jersey-Demo/src/main/resources/mybatis/SqlMapConfig.xml
diff --git a/Jersey--Demo/src/main/webapp/WEB-INF/web.xml b/Jersey-Demo/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from Jersey--Demo/src/main/webapp/WEB-INF/web.xml
rename to Jersey-Demo/src/main/webapp/WEB-INF/web.xml
diff --git a/Jersey--Demo/src/main/webapp/index.jsp b/Jersey-Demo/src/main/webapp/index.jsp
similarity index 100%
rename from Jersey--Demo/src/main/webapp/index.jsp
rename to Jersey-Demo/src/main/webapp/index.jsp
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/doc/README.MD" b/Maven-Demo/doc/README.MD
similarity index 100%
rename from "maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/doc/README.MD"
rename to Maven-Demo/doc/README.MD
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-common/pom.xml" b/Maven-Demo/haikong-common/pom.xml
similarity index 100%
rename from "maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-common/pom.xml"
rename to Maven-Demo/haikong-common/pom.xml
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-common/src/main/java/com/haikong/common/entity/User.java" b/Maven-Demo/haikong-common/src/main/java/com/haikong/common/entity/User.java
similarity index 100%
rename from "maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-common/src/main/java/com/haikong/common/entity/User.java"
rename to Maven-Demo/haikong-common/src/main/java/com/haikong/common/entity/User.java
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-common/src/main/java/com/haikong/common/mapper/UserMapper.java" b/Maven-Demo/haikong-common/src/main/java/com/haikong/common/mapper/UserMapper.java
similarity index 100%
rename from "maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-common/src/main/java/com/haikong/common/mapper/UserMapper.java"
rename to Maven-Demo/haikong-common/src/main/java/com/haikong/common/mapper/UserMapper.java
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-common/src/main/resources/mybatis/mapper/userMapper.xml" b/Maven-Demo/haikong-common/src/main/resources/mybatis/mapper/userMapper.xml
similarity index 100%
rename from "maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-common/src/main/resources/mybatis/mapper/userMapper.xml"
rename to Maven-Demo/haikong-common/src/main/resources/mybatis/mapper/userMapper.xml
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/pom.xml" b/Maven-Demo/haikong-core/pom.xml
similarity index 95%
rename from "maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/pom.xml"
rename to Maven-Demo/haikong-core/pom.xml
index d5872c8..ebefddc 100644
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/pom.xml"
+++ b/Maven-Demo/haikong-core/pom.xml
@@ -7,9 +7,9 @@
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>core</artifactId>
+    <artifactId>haikong-core</artifactId>
     <packaging>war</packaging>
-    <name>core Maven Webapp</name>
+    <name>haikong-core</name>
     <url>http://maven.apache.org</url>
 
     <dependencies>
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/java/com/haikong/core/controller/indexController.java" b/Maven-Demo/haikong-core/src/main/java/com/haikong/core/controller/indexController.java
similarity index 100%
rename from "maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/java/com/haikong/core/controller/indexController.java"
rename to Maven-Demo/haikong-core/src/main/java/com/haikong/core/controller/indexController.java
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/resources/config.properties" b/Maven-Demo/haikong-core/src/main/resources/config.properties
similarity index 100%
rename from "maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/resources/config.properties"
rename to Maven-Demo/haikong-core/src/main/resources/config.properties
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/resources/db.properties" b/Maven-Demo/haikong-core/src/main/resources/db.properties
similarity index 100%
rename from "maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/resources/db.properties"
rename to Maven-Demo/haikong-core/src/main/resources/db.properties
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/resources/log4j.properties" b/Maven-Demo/haikong-core/src/main/resources/log4j.properties
similarity index 100%
rename from "maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/resources/log4j.properties"
rename to Maven-Demo/haikong-core/src/main/resources/log4j.properties
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/resources/mybatis/SqlMapConfig.xml" b/Maven-Demo/haikong-core/src/main/resources/mybatis/SqlMapConfig.xml
similarity index 100%
rename from "maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/resources/mybatis/SqlMapConfig.xml"
rename to Maven-Demo/haikong-core/src/main/resources/mybatis/SqlMapConfig.xml
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/resources/mybatis/mapper/2.txt" b/Maven-Demo/haikong-core/src/main/resources/mybatis/mapper/2.txt
similarity index 100%
rename from "maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/resources/mybatis/mapper/2.txt"
rename to Maven-Demo/haikong-core/src/main/resources/mybatis/mapper/2.txt
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/resources/spring/applicationContext.xml" b/Maven-Demo/haikong-core/src/main/resources/spring/applicationContext.xml
similarity index 100%
rename from "maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/resources/spring/applicationContext.xml"
rename to Maven-Demo/haikong-core/src/main/resources/spring/applicationContext.xml
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/resources/spring/dispatcher-servlet.xml" b/Maven-Demo/haikong-core/src/main/resources/spring/dispatcher-servlet.xml
similarity index 94%
rename from "maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/resources/spring/dispatcher-servlet.xml"
rename to Maven-Demo/haikong-core/src/main/resources/spring/dispatcher-servlet.xml
index 3db2ecd..7a8b34b 100644
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/resources/spring/dispatcher-servlet.xml"
+++ b/Maven-Demo/haikong-core/src/main/resources/spring/dispatcher-servlet.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mvc="http://www.springframework.org/schema/mvc"
-       xmlns:content="http://www.springframework.org/schema/context"
+       xmlns:contents="http://www.springframework.org/schema/context"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
     <!-- 自动扫描该包，使SpringMVC认为包下用了@controller注解的类是控制器 -->
-    <content:component-scan base-package="com.haikong.core.controller"/>
+    <contents:component-scan base-package="com.haikong.core.controller"/>
 
     <!-- 启用默认配置 -->
     <mvc:annotation-driven>
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/webapp/WEB-INF/web.xml" b/Maven-Demo/haikong-core/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from "maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/webapp/WEB-INF/web.xml"
rename to Maven-Demo/haikong-core/src/main/webapp/WEB-INF/web.xml
diff --git a/SSM--Demo/src/main/webapp/index.jsp b/Maven-Demo/haikong-core/src/main/webapp/index.jsp
similarity index 100%
rename from SSM--Demo/src/main/webapp/index.jsp
rename to Maven-Demo/haikong-core/src/main/webapp/index.jsp
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-switch/pom.xml" b/Maven-Demo/haikong-switch/pom.xml
similarity index 100%
rename from "maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-switch/pom.xml"
rename to Maven-Demo/haikong-switch/pom.xml
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/pom.xml" b/Maven-Demo/pom.xml
similarity index 99%
rename from "maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/pom.xml"
rename to Maven-Demo/pom.xml
index 82a4f01..f67ce3c 100644
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/pom.xml"
+++ b/Maven-Demo/pom.xml
@@ -5,9 +5,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.haikong</groupId>
-    <artifactId>haikong</artifactId>
+    <artifactId>Maven-Demo</artifactId>
     <packaging>pom</packaging>
     <version>1.0.0</version>
+    <name>Maven-demo</name>
     <modules>
         <module>haikong-core</module>
         <module>haikong-switch</module>
diff --git a/Motan-Demo/Service-Client/pom.xml b/Motan-Demo/Service-Client/pom.xml
new file mode 100644
index 0000000..8d2eade
--- /dev/null
+++ b/Motan-Demo/Service-Client/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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>Motan-Demo</artifactId>
+        <groupId>cn.mrdear.motan</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>cn.mrdear.motan</groupId>
+    <artifactId>Service-Client</artifactId>
+
+
+</project>
\ No newline at end of file
diff --git a/Motan-Demo/Service-Client/src/main/java/cn/mrdear/client/dto/UserDTO.java b/Motan-Demo/Service-Client/src/main/java/cn/mrdear/client/dto/UserDTO.java
new file mode 100644
index 0000000..72dd1ce
--- /dev/null
+++ b/Motan-Demo/Service-Client/src/main/java/cn/mrdear/client/dto/UserDTO.java
@@ -0,0 +1,31 @@
+package cn.mrdear.client.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 用户DTO,用于Service层传输
+ * @author Niu Li
+ * @since 2017/6/12
+ */
+@Data
+public class UserDTO implements Serializable{
+
+  private static final long serialVersionUID = 4086492518942464226L;
+
+  private Long id;
+
+  private String username;
+
+  private String password;
+
+  private Integer age;
+
+  private String nickname;
+
+  private String mail;
+
+  private String memo;
+
+}
diff --git a/Motan-Demo/Service-Client/src/main/java/cn/mrdear/client/service/IUserService.java b/Motan-Demo/Service-Client/src/main/java/cn/mrdear/client/service/IUserService.java
new file mode 100644
index 0000000..1edd92f
--- /dev/null
+++ b/Motan-Demo/Service-Client/src/main/java/cn/mrdear/client/service/IUserService.java
@@ -0,0 +1,37 @@
+package cn.mrdear.client.service;
+
+import cn.mrdear.client.dto.UserDTO;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 用户服务,一般都会在返回层再包裹一层,这里简而化之
+ * @author Niu Li
+ * @since 2017/6/12
+ */
+public interface IUserService {
+
+  /**
+   * 根据id查找
+   */
+  UserDTO findById(Long id);
+
+  /**
+   * 根据id批量查询
+   */
+  List<UserDTO> queryByIds(Collection<Long> ids);
+
+  /**
+   * 更新用户
+   * @return 返回更新后的实体
+   */
+  UserDTO updateById(UserDTO userDTO);
+
+  /**
+   * 根据id删除用户
+   */
+  Boolean deleteById(Long id);
+
+
+}
diff --git a/Motan-Demo/Service-Consumer/pom.xml b/Motan-Demo/Service-Consumer/pom.xml
new file mode 100644
index 0000000..31ec032
--- /dev/null
+++ b/Motan-Demo/Service-Consumer/pom.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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>Motan-Demo</artifactId>
+        <groupId>cn.mrdear.motan</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>cn.mrdear.motan</groupId>
+    <artifactId>Service-Consumer</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.mrdear.motan</groupId>
+            <artifactId>Service-Client</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.weibo</groupId>
+            <artifactId>motan-core</artifactId>
+            <version>RELEASE</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.weibo</groupId>
+            <artifactId>motan-transport-netty</artifactId>
+            <version>RELEASE</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.weibo</groupId>
+            <artifactId>motan-registry-zookeeper</artifactId>
+            <version>RELEASE</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.101tec</groupId>
+                    <artifactId>zkclient</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.101tec</groupId>
+            <artifactId>zkclient</artifactId>
+            <version>0.10</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.weibo</groupId>
+            <artifactId>motan-springsupport</artifactId>
+            <version>RELEASE</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>4.3.6.RELEASE</version>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/Motan-Demo/Service-Consumer/src/main/java/cn/mrdear/consumer/ApplicationStart.java b/Motan-Demo/Service-Consumer/src/main/java/cn/mrdear/consumer/ApplicationStart.java
new file mode 100644
index 0000000..f5e634b
--- /dev/null
+++ b/Motan-Demo/Service-Consumer/src/main/java/cn/mrdear/consumer/ApplicationStart.java
@@ -0,0 +1,21 @@
+package cn.mrdear.consumer;
+
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+import cn.mrdear.client.service.IUserService;
+
+/**
+ * @author Niu Li
+ * @since 2017/6/14
+ */
+public class ApplicationStart {
+
+  public static void main(String[] args) throws InterruptedException {
+    ApplicationContext ctx = new ClassPathXmlApplicationContext(
+        "classpath:applicationContext.xml");
+    IUserService service = (IUserService) ctx.getBean("userService");
+    System.out.println(service.findById(1L));
+  }
+
+}
diff --git a/Motan-Demo/Service-Consumer/src/main/resources/applicationContext.xml b/Motan-Demo/Service-Consumer/src/main/resources/applicationContext.xml
new file mode 100644
index 0000000..28b860c
--- /dev/null
+++ b/Motan-Demo/Service-Consumer/src/main/resources/applicationContext.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:task="http://www.springframework.org/schema/task"
+       xmlns:jpa="http://www.springframework.org/schema/data/jpa"
+       xmlns:jdbc="http://www.springframework.org/schema/jdbc"
+       xmlns:motan="http://api.weibo.com/schema/motan"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd   http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd     http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd   http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd   http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd http://api.weibo.com/schema/motan http://api.weibo.com/schema/motan.xsd">
+
+    <!-- 启用注解 -->
+    <context:annotation-config/>
+    <!--启动定时器-->
+    <task:annotation-driven/>
+
+    <context:component-scan base-package="cn.mrdear.consumer"/>
+
+    <motan:registry regProtocol="zookeeper" name="my_zookeeper" address="127.0.0.1:2181"/>
+
+    <motan:referer id="userService" interface="cn.mrdear.client.service.IUserService"
+                   registry="my_zookeeper"/>
+</beans>
\ No newline at end of file
diff --git a/Motan-Demo/Service-Consumer/src/main/resources/logback.xml b/Motan-Demo/Service-Consumer/src/main/resources/logback.xml
new file mode 100644
index 0000000..d68cd15
--- /dev/null
+++ b/Motan-Demo/Service-Consumer/src/main/resources/logback.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+    <property name="LOG_HOME" value="logs" />
+
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>%d{HH:mm:ss} [%t] %logger{5} [%line] %p - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <!-- project level -->
+    <logger name="cn.mrdear" level="DEBUG" />
+
+    <root level="DEBUG" >
+        <appender-ref ref="console" />
+    </root>
+
+</configuration>
\ No newline at end of file
diff --git a/Motan-Demo/Service-Provider/pom.xml b/Motan-Demo/Service-Provider/pom.xml
new file mode 100644
index 0000000..d5a727e
--- /dev/null
+++ b/Motan-Demo/Service-Provider/pom.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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>Motan-Demo</artifactId>
+        <groupId>cn.mrdear.motan</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>cn.mrdear.motan</groupId>
+    <artifactId>Service-Provider</artifactId>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.mrdear.motan</groupId>
+            <artifactId>Service-Client</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.weibo</groupId>
+            <artifactId>motan-core</artifactId>
+            <version>RELEASE</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.weibo</groupId>
+            <artifactId>motan-transport-netty</artifactId>
+            <version>RELEASE</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.weibo</groupId>
+            <artifactId>motan-registry-zookeeper</artifactId>
+            <version>RELEASE</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.101tec</groupId>
+                    <artifactId>zkclient</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.101tec</groupId>
+            <artifactId>zkclient</artifactId>
+            <version>0.10</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- only needed for spring-based features -->
+        <dependency>
+            <groupId>com.weibo</groupId>
+            <artifactId>motan-springsupport</artifactId>
+            <version>RELEASE</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>4.3.6.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-jpa</artifactId>
+            <version>1.10.4.RELEASE</version>
+        </dependency>
+        <!--hibernate start-->
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>5.1.0.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-entitymanager</artifactId>
+            <version>5.1.0.Final</version>
+        </dependency>
+        <!--hibernate end-->
+        <!--aspectj start-->
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjweaver</artifactId>
+            <version>1.8.6</version>
+        </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjrt</artifactId>
+            <version>1.8.6</version>
+        </dependency>
+        <!--aspectj end-->
+        <!--cglib start-->
+        <dependency>
+            <groupId>cglib</groupId>
+            <artifactId>cglib</artifactId>
+            <version>3.2.2</version>
+        </dependency>
+        <!--cglib end-->
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>1.4.187</version>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/Motan-Demo/Service-Provider/src/main/java/cn/mrdear/provider/ApplicationStart.java b/Motan-Demo/Service-Provider/src/main/java/cn/mrdear/provider/ApplicationStart.java
new file mode 100644
index 0000000..7db2920
--- /dev/null
+++ b/Motan-Demo/Service-Provider/src/main/java/cn/mrdear/provider/ApplicationStart.java
@@ -0,0 +1,22 @@
+package cn.mrdear.provider;
+
+import com.weibo.api.motan.common.MotanConstants;
+import com.weibo.api.motan.util.MotanSwitcherUtil;
+
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+/**
+ * @author Niu Li
+ * @since 2017/6/14
+ */
+public class ApplicationStart {
+
+  public static void main(String[] args) throws InterruptedException {
+    ApplicationContext applicationContext =
+        new ClassPathXmlApplicationContext("classpath:applicationContext.xml");
+    MotanSwitcherUtil.setSwitcherValue(MotanConstants.REGISTRY_HEARTBEAT_SWITCHER, true);
+    System.out.println("server start...");
+  }
+
+}
diff --git a/Motan-Demo/Service-Provider/src/main/java/cn/mrdear/provider/convert/UserConvert.java b/Motan-Demo/Service-Provider/src/main/java/cn/mrdear/provider/convert/UserConvert.java
new file mode 100644
index 0000000..67ae9ca
--- /dev/null
+++ b/Motan-Demo/Service-Provider/src/main/java/cn/mrdear/provider/convert/UserConvert.java
@@ -0,0 +1,42 @@
+package cn.mrdear.provider.convert;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.util.CollectionUtils;
+
+import cn.mrdear.client.dto.UserDTO;
+import cn.mrdear.provider.domain.User;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author Niu Li
+ * @since 2017/6/12
+ */
+public class UserConvert {
+
+  public static UserDTO toDTO(User user) {
+    UserDTO userDTO = new UserDTO();
+    BeanUtils.copyProperties(user,userDTO);
+    return userDTO;
+  }
+
+
+  public static List<UserDTO> toDTOS(List<User> users) {
+    if (CollectionUtils.isEmpty(users)) {
+      return new ArrayList<>(1);
+    }
+    List<UserDTO> results = new ArrayList<>();
+    return users.stream().map(UserConvert::toDTO)
+        .collect(Collectors.toList());
+  }
+
+
+  public static User toDO(UserDTO userDTO) {
+    User user = new User();
+    BeanUtils.copyProperties(userDTO,user);
+    return user;
+  }
+
+}
diff --git a/Motan-Demo/Service-Provider/src/main/java/cn/mrdear/provider/dao/UserRepository.java b/Motan-Demo/Service-Provider/src/main/java/cn/mrdear/provider/dao/UserRepository.java
new file mode 100644
index 0000000..6b068b4
--- /dev/null
+++ b/Motan-Demo/Service-Provider/src/main/java/cn/mrdear/provider/dao/UserRepository.java
@@ -0,0 +1,24 @@
+package cn.mrdear.provider.dao;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+
+import cn.mrdear.provider.domain.User;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * JPA repo层
+ * @author Niu Li
+ * @since 2017/6/12
+ */
+public interface UserRepository extends JpaRepository<User,Long>{
+
+  User findById(Long id);
+
+  @Query("select p from User p where id in (?1)")
+  List<User> queryByIds(Collection<Long> ids);
+
+
+}
diff --git a/Motan-Demo/Service-Provider/src/main/java/cn/mrdear/provider/domain/User.java b/Motan-Demo/Service-Provider/src/main/java/cn/mrdear/provider/domain/User.java
new file mode 100644
index 0000000..81849e5
--- /dev/null
+++ b/Motan-Demo/Service-Provider/src/main/java/cn/mrdear/provider/domain/User.java
@@ -0,0 +1,39 @@
+package cn.mrdear.provider.domain;
+
+import lombok.Data;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import java.io.Serializable;
+
+/**
+ * 用户实体类,对应数据库
+ * @author Niu Li
+ * @since 2017/6/12
+ */
+@Data
+@Entity
+@Table(name = "user")
+public class User implements Serializable{
+
+  private static final long serialVersionUID = 1793488098966504793L;
+  @Id
+  @GeneratedValue
+  private Long id;
+
+  private String username;
+
+  private String password;
+
+  private Integer age;
+
+  private String nickname;
+
+  private String mail;
+
+  private String memo;
+
+}
diff --git a/Motan-Demo/Service-Provider/src/main/java/cn/mrdear/provider/service/UserServiceImpl.java b/Motan-Demo/Service-Provider/src/main/java/cn/mrdear/provider/service/UserServiceImpl.java
new file mode 100644
index 0000000..7ab049a
--- /dev/null
+++ b/Motan-Demo/Service-Provider/src/main/java/cn/mrdear/provider/service/UserServiceImpl.java
@@ -0,0 +1,46 @@
+package cn.mrdear.provider.service;
+
+import cn.mrdear.client.dto.UserDTO;
+import cn.mrdear.client.service.IUserService;
+import cn.mrdear.provider.convert.UserConvert;
+import cn.mrdear.provider.dao.UserRepository;
+import cn.mrdear.provider.domain.User;
+
+import javax.annotation.Resource;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * @author Niu Li
+ * @since 2017/6/14
+ */
+public class UserServiceImpl implements IUserService{
+  @Resource
+  private UserRepository userRepository;
+
+  @Override
+  public UserDTO findById(Long id) {
+    User user = userRepository.findById(id);
+    return UserConvert.toDTO(user);
+  }
+
+  @Override
+  public List<UserDTO> queryByIds(Collection<Long> ids) {
+    List<User> users = userRepository.queryByIds(ids);
+    return UserConvert.toDTOS(users);
+  }
+
+  @Override
+  public UserDTO updateById(UserDTO userDTO) {
+    User user = UserConvert.toDO(userDTO);
+    userRepository.save(user);
+    return this.findById(userDTO.getId());
+  }
+
+  @Override
+  public Boolean deleteById(Long id) {
+    userRepository.delete(id);
+    return true;
+  }
+}
diff --git a/Motan-Demo/Service-Provider/src/main/resources/applicationContext.xml b/Motan-Demo/Service-Provider/src/main/resources/applicationContext.xml
new file mode 100644
index 0000000..4b5d788
--- /dev/null
+++ b/Motan-Demo/Service-Provider/src/main/resources/applicationContext.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:task="http://www.springframework.org/schema/task"
+       xmlns:jpa="http://www.springframework.org/schema/data/jpa"
+       xmlns:jdbc="http://www.springframework.org/schema/jdbc"
+       xmlns:motan="http://api.weibo.com/schema/motan"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd   http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd     http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd   http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd   http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd http://api.weibo.com/schema/motan http://api.weibo.com/schema/motan.xsd">
+
+    <!-- 启用注解 -->
+    <context:annotation-config/>
+    <!--启动定时器-->
+    <task:annotation-driven/>
+
+    <context:component-scan base-package="cn.mrdear.provider"/>
+
+    <bean id="dataSource" class="org.h2.jdbcx.JdbcConnectionPool"
+          destroy-method="dispose">
+        <constructor-arg>
+            <bean class="org.h2.jdbcx.JdbcDataSource">
+                <!-- 内存模式 -->
+                <property name="URL" value="jdbc:h2:mem:test;MODE=MySql;DB_CLOSE_DELAY=-1"/>
+                <!-- 文件模式 -->
+                <!--<property name="URL" value="jdbc:h2:testRestDB" /> -->
+                <property name="user" value="sa"/>
+                <property name="password" value="sa"/>
+            </bean>
+        </constructor-arg>
+    </bean>
+
+    <!-- 初始化数据表结构 -->
+    <jdbc:initialize-database data-source="dataSource"
+                              ignore-failures="ALL">
+        <jdbc:script location="classpath:/h2/schema.sql"/>
+        <jdbc:script location="classpath:/h2/data.sql"/>
+    </jdbc:initialize-database>
+
+    <!--第二步-->
+    <!--定义实体的工厂bean-->
+    <bean id="entityManagerFactory"
+          class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
+        <property name="dataSource" ref="dataSource"/>
+        <!--实体类位置-->
+        <property name="packagesToScan" value="cn.mrdear.provider.domain"/>
+        <!--持久化单元名-->
+        <property name="persistenceUnitName" value="TestJPA"/>
+        <!--JPA提供者-->
+        <property name="persistenceProviderClass" value="org.hibernate.ejb.HibernatePersistence"/>
+        <!--JPA属性-->
+        <property name="jpaProperties">
+            <props>
+                <!--配置方言-->
+                <prop key="hibernate.dialect">org.hibernate.dialect.MySQL5Dialect</prop>
+                <!--激活查询日志功能-->
+                <prop key="hibernate.show_sql">false</prop>
+                <!--优雅地输出Sql-->
+                <prop key="hibernate.format_sql">false</prop>
+                <!--添加一条解释型标注-->
+                <prop key="hibernate.use_sql_comments">false</prop>
+                <!--配置如何根据java模型生成数据库表结构,常用update,validate-->
+                <prop key="hibernate.hbm2ddl.auto">none</prop>
+            </props>
+        </property>
+    </bean>
+
+    <!--第三步-->
+    <!--定义repository接口的存放目录-->
+    <!--定义接口实现的后缀，通常用Impl-->
+    <!--定义实体工厂的引用-->
+    <!--定义事务管理器的引用-->
+    <jpa:repositories base-package="cn.mrdear.provider.dao"
+                      repository-impl-postfix="Impl"
+                      entity-manager-factory-ref="entityManagerFactory"/>
+
+    <!-- 具体的实现bean -->
+    <bean id="userService" class="cn.mrdear.provider.service.UserServiceImpl"/>
+
+    <motan:protocol id="motan-provider" name="provider"/>
+
+    <motan:registry regProtocol="zookeeper" name="my_zookeeper" address="127.0.0.1:2181"/>
+
+    <motan:service interface="cn.mrdear.client.service.IUserService" ref="userService"
+                   registry="my_zookeeper" export="8002" />
+
+</beans>
\ No newline at end of file
diff --git a/Motan-Demo/Service-Provider/src/main/resources/h2/data.sql b/Motan-Demo/Service-Provider/src/main/resources/h2/data.sql
new file mode 100644
index 0000000..a09f7a8
--- /dev/null
+++ b/Motan-Demo/Service-Provider/src/main/resources/h2/data.sql
@@ -0,0 +1,6 @@
+INSERT INTO user (username, password, age, nickname, mail, memo) VALUES ('zhangsan',
+ '123456', 18, '张三', '1111@qq.com', 'hahahah');
+INSERT INTO user (username, password, age, nickname, mail, memo) VALUES ('lis',
+'123456', 19, '李四', '123131@qq.com', 'xixiixxi');
+INSERT INTO user (username, password, age, nickname, mail, memo) VALUES ('wanger',
+'123456', 29, '王二', '12131984@qq.com', 'dqdh');
\ No newline at end of file
diff --git a/Motan-Demo/Service-Provider/src/main/resources/h2/schema.sql b/Motan-Demo/Service-Provider/src/main/resources/h2/schema.sql
new file mode 100644
index 0000000..8de82c2
--- /dev/null
+++ b/Motan-Demo/Service-Provider/src/main/resources/h2/schema.sql
@@ -0,0 +1,10 @@
+DROP TABLE user if exist;
+create table user (
+  id INT(11) AUTO_INCREMENT PRIMARY KEY ,
+  username VARCHAR(255),
+  password VARCHAR(255),
+  age INT(3),
+  nickname VARCHAR(255),
+  mail VARCHAR(255),
+  memo VARCHAR(255),
+  );
\ No newline at end of file
diff --git a/Motan-Demo/Service-Provider/src/main/resources/logback.xml b/Motan-Demo/Service-Provider/src/main/resources/logback.xml
new file mode 100644
index 0000000..d68cd15
--- /dev/null
+++ b/Motan-Demo/Service-Provider/src/main/resources/logback.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+    <property name="LOG_HOME" value="logs" />
+
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>%d{HH:mm:ss} [%t] %logger{5} [%line] %p - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <!-- project level -->
+    <logger name="cn.mrdear" level="DEBUG" />
+
+    <root level="DEBUG" >
+        <appender-ref ref="console" />
+    </root>
+
+</configuration>
\ No newline at end of file
diff --git a/Motan-Demo/pom.xml b/Motan-Demo/pom.xml
new file mode 100644
index 0000000..eb68369
--- /dev/null
+++ b/Motan-Demo/pom.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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>
+
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>Service-Client</module>
+        <module>Service-Provider</module>
+        <module>Service-Consumer</module>
+    </modules>
+
+    <groupId>cn.mrdear.motan</groupId>
+    <artifactId>Motan-Demo</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <!--配置依赖-->
+    <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.16.14</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>21.0</version>
+        </dependency>
+        <!--logger start-->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.7</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <version>1.7.7</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>1.1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.logback-extensions</groupId>
+            <artifactId>logback-ext-spring</artifactId>
+            <version>0.1.4</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.1.2</version>
+        </dependency>
+        <!--logger end-->
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/Pay-Demo/.idea/compiler.xml b/Pay-Demo/.idea/compiler.xml
deleted file mode 100644
index 4dbd659..0000000
--- a/Pay-Demo/.idea/compiler.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-      <entry name="!?*.aj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-      <profile default="false" name="Maven default annotation processors profile" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <processorPath useClasspath="true" />
-        <module name="CommonPay" />
-      </profile>
-    </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="CommonPay" target="1.7" />
-    </bytecodeTargetLevel>
-  </component>
-</project>
\ No newline at end of file
diff --git a/Pay-Demo/.idea/copyright/profiles_settings.xml b/Pay-Demo/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/Pay-Demo/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/Pay-Demo/.idea/deployment.xml b/Pay-Demo/.idea/deployment.xml
deleted file mode 100644
index 25a0408..0000000
--- a/Pay-Demo/.idea/deployment.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PublishConfigData">
-    <serverData>
-      <paths name="172.18.0.91">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-    </serverData>
-  </component>
-</project>
\ No newline at end of file
diff --git a/Pay-Demo/.idea/encodings.xml b/Pay-Demo/.idea/encodings.xml
deleted file mode 100644
index c0bce70..0000000
--- a/Pay-Demo/.idea/encodings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="file://$PROJECT_DIR$" charset="UTF-8" />
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/Pay-Demo/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/Pay-Demo/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml
deleted file mode 100644
index a8b0d9c..0000000
--- a/Pay-Demo/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: ch.qos.logback:logback-classic:1.1.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.1.2/logback-classic-1.1.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.1.2/logback-classic-1.1.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.1.2/logback-classic-1.1.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Pay-Demo/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/Pay-Demo/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml
deleted file mode 100644
index 1c76d0b..0000000
--- a/Pay-Demo/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: ch.qos.logback:logback-core:1.1.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.1.2/logback-core-1.1.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.1.2/logback-core-1.1.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.1.2/logback-core-1.1.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Pay-Demo/.idea/libraries/Maven__com_alibaba_fastjson_1_2_14.xml b/Pay-Demo/.idea/libraries/Maven__com_alibaba_fastjson_1_2_14.xml
deleted file mode 100644
index 3888159..0000000
--- a/Pay-Demo/.idea/libraries/Maven__com_alibaba_fastjson_1_2_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.alibaba:fastjson:1.2.14">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.14/fastjson-1.2.14.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.14/fastjson-1.2.14-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.14/fastjson-1.2.14-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Pay-Demo/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml b/Pay-Demo/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml
deleted file mode 100644
index 27424a1..0000000
--- a/Pay-Demo/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: commons-codec:commons-codec:1.10">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.10/commons-codec-1.10.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.10/commons-codec-1.10-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.10/commons-codec-1.10-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Pay-Demo/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml b/Pay-Demo/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml
deleted file mode 100644
index eab40b3..0000000
--- a/Pay-Demo/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: commons-logging:commons-logging:1.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Pay-Demo/.idea/libraries/Maven__junit_junit_4_10.xml b/Pay-Demo/.idea/libraries/Maven__junit_junit_4_10.xml
deleted file mode 100644
index ed8bf5f..0000000
--- a/Pay-Demo/.idea/libraries/Maven__junit_junit_4_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: junit:junit:4.10">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.10/junit-4.10.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.10/junit-4.10-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.10/junit-4.10-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Pay-Demo/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/Pay-Demo/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml
deleted file mode 100644
index 83cba3e..0000000
--- a/Pay-Demo/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.commons:commons-lang3:3.3.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.3.2/commons-lang3-3.3.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.3.2/commons-lang3-3.3.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.3.2/commons-lang3-3.3.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Pay-Demo/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_3_5.xml b/Pay-Demo/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_3_5.xml
deleted file mode 100644
index 5601459..0000000
--- a/Pay-Demo/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_3_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.httpcomponents:httpclient:4.3.5">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.3.5/httpclient-4.3.5.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.3.5/httpclient-4.3.5-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.3.5/httpclient-4.3.5-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Pay-Demo/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_3_2.xml b/Pay-Demo/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_3_2.xml
deleted file mode 100644
index 1c14963..0000000
--- a/Pay-Demo/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_3_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.httpcomponents:httpcore:4.3.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.3.2/httpcore-4.3.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.3.2/httpcore-4.3.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.3.2/httpcore-4.3.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Pay-Demo/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_51.xml b/Pay-Demo/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_51.xml
deleted file mode 100644
index e98695e..0000000
--- a/Pay-Demo/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_51.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.bouncycastle:bcprov-jdk15on:1.51">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/bouncycastle/bcprov-jdk15on/1.51/bcprov-jdk15on-1.51.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/bouncycastle/bcprov-jdk15on/1.51/bcprov-jdk15on-1.51-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/bouncycastle/bcprov-jdk15on/1.51/bcprov-jdk15on-1.51-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Pay-Demo/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/Pay-Demo/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml
deleted file mode 100644
index acdf443..0000000
--- a/Pay-Demo/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.hamcrest:hamcrest-core:1.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Pay-Demo/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/Pay-Demo/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml
deleted file mode 100644
index 282edcb..0000000
--- a/Pay-Demo/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.slf4j:jcl-over-slf4j:1.7.7">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jcl-over-slf4j/1.7.7/jcl-over-slf4j-1.7.7.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jcl-over-slf4j/1.7.7/jcl-over-slf4j-1.7.7-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jcl-over-slf4j/1.7.7/jcl-over-slf4j-1.7.7-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Pay-Demo/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/Pay-Demo/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml
deleted file mode 100644
index 1e67260..0000000
--- a/Pay-Demo/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.slf4j:slf4j-api:1.7.7">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Pay-Demo/.idea/libraries/alipay_sdk_java20161029120104.xml b/Pay-Demo/.idea/libraries/alipay_sdk_java20161029120104.xml
deleted file mode 100644
index 106ac78..0000000
--- a/Pay-Demo/.idea/libraries/alipay_sdk_java20161029120104.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="alipay-sdk-java20161029120104">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/alipay-sdk-java20161029120104.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/alipay-sdk-java20161029120104-source.jar!/com/alipay/api" />
-      <root url="jar://$PROJECT_DIR$/lib/alipay-sdk-java20161029120104-source.jar!/com/alipay/api" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Pay-Demo/.idea/misc.xml b/Pay-Demo/.idea/misc.xml
deleted file mode 100644
index 7586d10..0000000
--- a/Pay-Demo/.idea/misc.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
-  <component name="MavenProjectsManager">
-    <option name="originalFiles">
-      <list>
-        <option value="$PROJECT_DIR$/pom.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8 " project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-  <component name="SvnConfiguration">
-    <configuration>C:\Users\NL\AppData\Roaming\Subversion</configuration>
-  </component>
-</project>
\ No newline at end of file
diff --git a/Pay-Demo/.idea/modules.xml b/Pay-Demo/.idea/modules.xml
deleted file mode 100644
index 923c63e..0000000
--- a/Pay-Demo/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/CommonPay.iml" filepath="$PROJECT_DIR$/CommonPay.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/Pay-Demo/.idea/uiDesigner.xml b/Pay-Demo/.idea/uiDesigner.xml
deleted file mode 100644
index e96534f..0000000
--- a/Pay-Demo/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
\ No newline at end of file
diff --git a/Pay-Demo/.idea/workspace.xml b/Pay-Demo/.idea/workspace.xml
deleted file mode 100644
index 68c7538..0000000
--- a/Pay-Demo/.idea/workspace.xml
+++ /dev/null
@@ -1,1671 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="80a00b0a-e906-4de4-b416-e2da4b321d36" name="Default" comment="" />
-    <ignored path="CommonPay.iws" />
-    <ignored path=".idea/workspace.xml" />
-    <ignored path="$PROJECT_DIR$/out/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="TRACKING_ENABLED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_TABLE_DETAILS" value="true" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-  </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
-  <component name="FavoritesManager">
-    <favorites_list name="CommonPay" />
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="AliPayConfig.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/pay/alipay/AliPayConfig.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="324">
-              <caret line="43" column="38" selection-start-line="43" selection-start-column="38" selection-end-line="43" selection-end-column="38" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="UnionPayTradeTest.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/test/java/cn/mrdear/pay/unionpay/UnionPayTradeTest.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="222">
-              <caret line="40" column="13" selection-start-line="40" selection-start-column="13" selection-end-line="40" selection-end-column="13" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="UnionPayTrade.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/pay/unionpay/UnionPayTrade.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="375">
-              <caret line="23" column="16" selection-start-line="23" selection-start-column="16" selection-end-line="23" selection-end-column="16" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="UnionPayClient.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/pay/unionpay/UnionPayClient.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="274">
-              <caret line="35" column="7" selection-start-line="35" selection-start-column="7" selection-end-line="35" selection-end-column="7" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="GradleLocalSettings">
-    <option name="externalProjectsViewState">
-      <projects_view />
-    </option>
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/pay/App.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/pay/util/Assert.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/pay/util/RSAUtils.java" />
-        <option value="$PROJECT_DIR$/src/test/java/cn/mrdear/pay/util/SignUtilTest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/pay/wechat/entity/WecharUnifiedOrder.java" />
-        <option value="$PROJECT_DIR$/src/test/java/cn/mrdear/pay/util/XMLUtilTest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/pay/util/XmlUtil.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/pay/util/SignUtil.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/pay/wechat/entity/WechatUnifiedOrder.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/pay/wechat/entity/WechatPayNotify.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/pay/wechat/entity/RefundQuery.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/pay/wechat/entity/WechatRefundQuery.java" />
-        <option value="$PROJECT_DIR$/src/test/java/cn/mrdear/pay/wechat/WecharTradeTest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/pay/unionpay/sdk/AcpService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/pay/unionpay/sdk/CertUtil.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/pay/unionpay/sdk/HttpClient.java" />
-        <option value="$PROJECT_DIR$/pom.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/pay/unionpay/sdk/SDKConfig.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/pay/unionpay/sdk/SDKUtil.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/pay/unionpay/sdk/SecureUtil.java" />
-        <option value="$PROJECT_DIR$/src/test/java/cn/mrdear/pay/WechatTradeTest.java" />
-        <option value="$PROJECT_DIR$/src/test/java/cn/mrdear/pay/pay/wechat/WechatTradeTest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/pay/wechat/WechatTradeTest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/pay/wechat/entity/WechatRefund.java" />
-        <option value="$PROJECT_DIR$/src/test/java/cn/mrdear/pay/alipay/AlipayTradeTest.java" />
-        <option value="$PROJECT_DIR$/src/test/java/cn/mrdear/pay/wechat/WechatTradeTest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/pay/wechat/WechatClient.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/pay/util/WebUtils.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/acp_sdk.properties" />
-        <option value="$PROJECT_DIR$/src/test/resources/acp_sdk.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/pay/unionpay/UnionPayConfig.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/pay/wechat/WechatConfig.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/pay/wechat/WechatTrade.java" />
-        <option value="$PROJECT_DIR$/src/test/java/cn/mrdear/pay/util/DateUtil.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/pay/unionpay/UnionPayClient.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/pay/alipay/AliPayConfig.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/pay/alipay/AlipayTrade.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/pay/unionpay/UnionPayTrade.java" />
-        <option value="$PROJECT_DIR$/src/test/java/cn/mrdear/pay/unionpay/UnionPayTradeTest.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/develop/maven/apache-maven-3.3.9" />
-        <option name="userSettingsFile" value="D:\develop\maven\apache-maven-3.3.9\conf\settings.xml" />
-      </MavenGeneralSettings>
-    </option>
-    <option name="importingSettings">
-      <MavenImportingSettings>
-        <option name="importAutomatically" value="true" />
-      </MavenImportingSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="" />
-          <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$RootNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="commonpay" />
-          <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$ProjectNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="" />
-          <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$RootNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="commonpay" />
-          <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$ProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="Lifecycle" />
-          <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$LifecycleNode" />
-        </PATH_ELEMENT>
-      </PATH>
-    </treeState>
-  </component>
-  <component name="MavenRunner">
-    <option name="jreName" value="1.8 " />
-    <option name="vmOptions" value="-DarchetypeCatalog=internal" />
-  </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-9" />
-    <option name="y" value="-9" />
-    <option name="width" value="1860" />
-    <option name="height" value="1092" />
-  </component>
-  <component name="ProjectInspectionProfilesVisibleTreeState">
-    <entry key="Project Default">
-      <profile-state>
-        <expanded-state>
-          <State>
-            <id />
-          </State>
-          <State>
-            <id>Java</id>
-          </State>
-          <State>
-            <id>Java language level migration aidsJava</id>
-          </State>
-        </expanded-state>
-        <selected-state>
-          <State>
-            <id>Since15</id>
-          </State>
-        </selected-state>
-      </profile-state>
-    </entry>
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectView">
-    <navigator currentView="ProjectPane" proportions="" version="1">
-      <flattenPackages />
-      <showMembers />
-      <showModules />
-      <showLibraryContents />
-      <hideEmptyPackages />
-      <abbreviatePackageNames />
-      <autoscrollToSource />
-      <autoscrollFromSource />
-      <sortByType />
-      <manualOrder />
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Pay-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Pay-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Pay-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Pay-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Pay-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="test" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Pay-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Pay-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="test" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Pay-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Pay-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Pay-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Pay-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="pay" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="wechat" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Pay-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Pay-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="pay" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="util" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Pay-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Pay-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="pay" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="unionpay" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Pay-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Pay-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="pay" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="alipay" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
-      <pane id="Scratches" />
-      <pane id="PackagesPane" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="settings.editor.selected.configurable" value="com.zeroturnaround.javarebel.idea.plugin.settings.JRebelSettingsComponent" />
-    <property name="settings.editor.splitter.proportion" value="0.2" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="true" />
-    <property name="js-jscs-nodeInterpreter" value="D:\develop\nodejs\node.exe" />
-    <property name="project.structure.last.edited" value="Modules" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.2" />
-  </component>
-  <component name="RecentsManager">
-    <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
-      <recent name="cn.mrdear.pay.util" />
-      <recent name="cn.mrdear.pay.wechat" />
-      <recent name="cn.mrdear.pay" />
-    </key>
-    <key name="CopyClassDialog.RECENTS_KEY">
-      <recent name="cn.mrdear.pay.util" />
-      <recent name="cn.mrdear.pay.wechat" />
-      <recent name="cn.mrdear.pay.unionpay" />
-      <recent name="cn.mrdear.pay.alipay" />
-    </key>
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="F:\Git\CommonPay\src\main\java\cn\mrdear\pay\alipay" />
-      <recent name="F:\Git\CommonPay\src\main\java\cn\mrdear\pay\unionpay" />
-      <recent name="F:\Git\CommonPay\src\main\java\cn\mrdear\pay\wechat\entity" />
-      <recent name="F:\Git\CommonPay\src\main\java\cn\mrdear\pay\wechat" />
-      <recent name="F:\Git\CommonPay\src\main\java\cn\mrdear\pay" />
-    </key>
-  </component>
-  <component name="RunManager" selected="JUnit.UnionPayTradeTest.testTokenOpen">
-    <configuration default="false" name="XMLUtilTest.testJava2XML" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
-        <pattern>
-          <option name="PATTERN" value="cn.mrdear.pay.util.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <module name="CommonPay" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" value="cn.mrdear.pay.util" />
-      <option name="MAIN_CLASS_NAME" value="cn.mrdear.pay.util.XMLUtilTest" />
-      <option name="METHOD_NAME" value="testJava2XML" />
-      <option name="TEST_OBJECT" value="method" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="false" name="WechatClient" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
-        <pattern>
-          <option name="PATTERN" value="cn.mrdear.pay.wechat.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <option name="MAIN_CLASS_NAME" value="cn.mrdear.pay.wechat.WechatClient" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="CommonPay" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="false" name="WecharTradeTest.testunifiedOrder" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
-        <pattern>
-          <option name="PATTERN" value="cn.mrdear.pay.wechat.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <module name="CommonPay" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" value="cn.mrdear.pay.wechat" />
-      <option name="MAIN_CLASS_NAME" value="cn.mrdear.pay.wechat.WecharTradeTest" />
-      <option name="METHOD_NAME" value="testunifiedOrder" />
-      <option name="TEST_OBJECT" value="method" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="false" name="WecharTradeTest.testRefundQuery" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
-        <pattern>
-          <option name="PATTERN" value="cn.mrdear.pay.wechat.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <module name="CommonPay" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" value="cn.mrdear.pay.wechat" />
-      <option name="MAIN_CLASS_NAME" value="cn.mrdear.pay.wechat.WecharTradeTest" />
-      <option name="METHOD_NAME" value="testRefundQuery" />
-      <option name="TEST_OBJECT" value="method" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="false" name="UnionPayTradeTest.testTokenOpen" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
-        <pattern>
-          <option name="PATTERN" value="cn.mrdear.pay.unionpay.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <module name="CommonPay" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" value="cn.mrdear.pay.unionpay" />
-      <option name="MAIN_CLASS_NAME" value="cn.mrdear.pay.unionpay.UnionPayTradeTest" />
-      <option name="METHOD_NAME" value="testTokenOpen" />
-      <option name="TEST_OBJECT" value="method" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
-      <module name="" />
-      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
-      <option name="PROGRAM_PARAMETERS" />
-      <method />
-    </configuration>
-    <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
-      <module name="" />
-      <option name="DEPLOY" value="true" />
-      <option name="ARTIFACT_NAME" value="" />
-      <option name="PM_INSTALL_OPTIONS" value="" />
-      <option name="ACTIVITY_EXTRA_FLAGS" value="" />
-      <option name="MODE" value="default_activity" />
-      <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-      <option name="PREFERRED_AVD" value="" />
-      <option name="CLEAR_LOGCAT" value="false" />
-      <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
-      <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
-      <option name="FORCE_STOP_RUNNING_APP" value="true" />
-      <option name="DEBUGGER_TYPE" value="Java" />
-      <option name="USE_LAST_SELECTED_DEVICE" value="false" />
-      <option name="PREFERRED_AVD" value="" />
-      <Java />
-      <Profilers>
-        <option name="GAPID_DISABLE_PCS" value="false" />
-      </Profilers>
-      <option name="DEEP_LINK" value="" />
-      <option name="ACTIVITY_CLASS" value="" />
-      <method />
-    </configuration>
-    <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
-      <module name="" />
-      <option name="TESTING_TYPE" value="0" />
-      <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
-      <option name="METHOD_NAME" value="" />
-      <option name="CLASS_NAME" value="" />
-      <option name="PACKAGE_NAME" value="" />
-      <option name="EXTRA_OPTIONS" value="" />
-      <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-      <option name="PREFERRED_AVD" value="" />
-      <option name="CLEAR_LOGCAT" value="false" />
-      <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
-      <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
-      <option name="FORCE_STOP_RUNNING_APP" value="true" />
-      <option name="DEBUGGER_TYPE" value="Java" />
-      <option name="USE_LAST_SELECTED_DEVICE" value="false" />
-      <option name="PREFERRED_AVD" value="" />
-      <Java />
-      <Profilers>
-        <option name="GAPID_DISABLE_PCS" value="false" />
-      </Profilers>
-      <method />
-    </configuration>
-    <configuration default="true" type="Applet" factoryName="Applet">
-      <option name="HTML_USED" value="false" />
-      <option name="WIDTH" value="400" />
-      <option name="HEIGHT" value="300" />
-      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
-      <module />
-      <method />
-    </configuration>
-    <configuration default="true" type="Application" factoryName="Application">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="ArquillianJUnit" factoryName="">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="arquillianRunConfiguration">
-        <value>
-          <option name="containerStateName" value="" />
-        </value>
-      </option>
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="true" type="ArquillianTestNG" factoryName="">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="arquillianRunConfiguration">
-        <value>
-          <option name="containerStateName" value="" />
-        </value>
-      </option>
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="ANNOTATION_TYPE" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
-      <envs />
-      <properties />
-      <listeners />
-      <method />
-    </configuration>
-    <configuration default="true" type="Cold Fusion runner description" factoryName="Cold Fusion" custom_browser="" web_path="">
-      <method />
-    </configuration>
-    <configuration default="true" type="CucumberJavaRunConfigurationType" factoryName="Cucumber java">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="myFilePath" />
-      <option name="GLUE" />
-      <option name="myNameFilter" />
-      <option name="myGeneratedName" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="FlashRunConfigurationType" factoryName="Flash App">
-      <option name="BCName" value="" />
-      <option name="IOSSimulatorSdkPath" value="" />
-      <option name="adlOptions" value="" />
-      <option name="airProgramParameters" value="" />
-      <option name="appDescriptorForEmulator" value="Android" />
-      <option name="debugTransport" value="USB" />
-      <option name="debuggerSdkRaw" value="BC SDK" />
-      <option name="emulator" value="NexusOne" />
-      <option name="emulatorAdlOptions" value="" />
-      <option name="fastPackaging" value="true" />
-      <option name="fullScreenHeight" value="0" />
-      <option name="fullScreenWidth" value="0" />
-      <option name="launchUrl" value="false" />
-      <option name="launcherParameters">
-        <LauncherParameters>
-          <option name="browser" value="a7bb68e0-33c0-4d6f-a81a-aac1fdb870c8" />
-          <option name="launcherType" value="OSDefault" />
-          <option name="newPlayerInstance" value="false" />
-          <option name="playerPath" value="FlashPlayerDebugger.exe" />
-        </LauncherParameters>
-      </option>
-      <option name="mobileRunTarget" value="Emulator" />
-      <option name="moduleName" value="" />
-      <option name="overriddenMainClass" value="" />
-      <option name="overriddenOutputFileName" value="" />
-      <option name="overrideMainClass" value="false" />
-      <option name="runTrusted" value="true" />
-      <option name="screenDpi" value="0" />
-      <option name="screenHeight" value="0" />
-      <option name="screenWidth" value="0" />
-      <option name="url" value="http://" />
-      <option name="usbDebugPort" value="7936" />
-      <method />
-    </configuration>
-    <configuration default="true" type="FlexUnitRunConfigurationType" factoryName="FlexUnit" appDescriptorForEmulator="Android" class_name="" emulatorAdlOptions="" method_name="" package_name="" scope="Class">
-      <option name="BCName" value="" />
-      <option name="launcherParameters">
-        <LauncherParameters>
-          <option name="browser" value="a7bb68e0-33c0-4d6f-a81a-aac1fdb870c8" />
-          <option name="launcherType" value="OSDefault" />
-          <option name="newPlayerInstance" value="false" />
-          <option name="playerPath" value="FlashPlayerDebugger.exe" />
-        </LauncherParameters>
-      </option>
-      <option name="moduleName" value="" />
-      <option name="trusted" value="true" />
-      <method />
-    </configuration>
-    <configuration default="true" type="GradleRunConfiguration" factoryName="Gradle">
-      <ExternalSystemSettings>
-        <option name="executionName" />
-        <option name="externalProjectPath" />
-        <option name="externalSystemIdString" value="GRADLE" />
-        <option name="scriptParameters" />
-        <option name="taskDescriptions">
-          <list />
-        </option>
-        <option name="taskNames">
-          <list />
-        </option>
-        <option name="vmOptions" />
-      </ExternalSystemSettings>
-      <method />
-    </configuration>
-    <configuration default="true" type="GrailsRunConfigurationType" factoryName="Grails">
-      <setting name="vmparams" value="" />
-      <setting name="cmdLine" value="run-app" />
-      <setting name="passParentEnv" value="true" />
-      <setting name="launchBrowser" value="true" />
-      <setting name="depsClasspath" value="false" />
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <method />
-    </configuration>
-    <configuration default="true" type="JUnit" factoryName="JUnit">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="true" type="JUnitTestDiscovery" factoryName="JUnit Test Discovery" changeList="All">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="true" type="JarApplication" factoryName="JAR Application">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="Java Scratch" factoryName="Java Scratch">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="SCRATCH_FILE_ID" value="0" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
-      <method />
-    </configuration>
-    <configuration default="true" type="JetRunConfigurationType" factoryName="Kotlin">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="CommonPay" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="KotlinStandaloneScriptRunConfigurationType" factoryName="Kotlin script">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="filePath" />
-      <option name="vmParameters" />
-      <option name="alternativeJrePath" />
-      <option name="programParameters" />
-      <option name="passParentEnvs" value="true" />
-      <option name="workingDirectory" />
-      <option name="isAlternativeJrePathEnabled" value="false" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="MavenRunConfiguration" factoryName="Maven">
-      <MavenSettings>
-        <option name="myGeneralSettings" />
-        <option name="myRunnerSettings" />
-        <option name="myRunnerParameters">
-          <MavenRunnerParameters>
-            <option name="profiles">
-              <set />
-            </option>
-            <option name="goals">
-              <list />
-            </option>
-            <option name="profilesMap">
-              <map />
-            </option>
-            <option name="resolveToWorkspace" value="false" />
-            <option name="workingDirPath" value="" />
-          </MavenRunnerParameters>
-        </option>
-      </MavenSettings>
-      <method />
-    </configuration>
-    <configuration default="true" type="Remote" factoryName="Remote">
-      <option name="USE_SOCKET_TRANSPORT" value="true" />
-      <option name="SERVER_MODE" value="false" />
-      <option name="SHMEM_ADDRESS" value="javadebug" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="5005" />
-      <method />
-    </configuration>
-    <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="TestNG" factoryName="TestNG">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="ANNOTATION_TYPE" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
-      <envs />
-      <properties />
-      <listeners />
-      <method />
-    </configuration>
-    <configuration default="true" type="TestNGTestDiscovery" factoryName="TestNG Test Discovery" changeList="All">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="ANNOTATION_TYPE" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
-      <envs />
-      <properties />
-      <listeners />
-      <method />
-    </configuration>
-    <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
-      <node-interpreter>project</node-interpreter>
-      <node-options />
-      <gulpfile />
-      <tasks />
-      <arguments />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="js.build_tools.npm" factoryName="npm">
-      <command value="run-script" />
-      <scripts />
-      <node-interpreter value="project" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="osgi.bnd.run" factoryName="Run Launcher">
-      <method />
-    </configuration>
-    <configuration default="true" type="osgi.bnd.run" factoryName="Test Launcher (JUnit)">
-      <method />
-    </configuration>
-    <list size="5">
-      <item index="0" class="java.lang.String" itemvalue="JUnit.XMLUtilTest.testJava2XML" />
-      <item index="1" class="java.lang.String" itemvalue="Application.WechatClient" />
-      <item index="2" class="java.lang.String" itemvalue="JUnit.WecharTradeTest.testunifiedOrder" />
-      <item index="3" class="java.lang.String" itemvalue="JUnit.WecharTradeTest.testRefundQuery" />
-      <item index="4" class="java.lang.String" itemvalue="JUnit.UnionPayTradeTest.testTokenOpen" />
-    </list>
-    <recent_temporary>
-      <list size="5">
-        <item index="0" class="java.lang.String" itemvalue="JUnit.UnionPayTradeTest.testTokenOpen" />
-        <item index="1" class="java.lang.String" itemvalue="JUnit.WecharTradeTest.testRefundQuery" />
-        <item index="2" class="java.lang.String" itemvalue="JUnit.WecharTradeTest.testunifiedOrder" />
-        <item index="3" class="java.lang.String" itemvalue="Application.WechatClient" />
-        <item index="4" class="java.lang.String" itemvalue="JUnit.XMLUtilTest.testJava2XML" />
-      </list>
-    </recent_temporary>
-  </component>
-  <component name="ShelveChangesManager" show_recycled="false">
-    <option name="remove_strategy" value="false" />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="80a00b0a-e906-4de4-b416-e2da4b321d36" name="Default" comment="" />
-      <created>1477710230969</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1477710230969</updated>
-      <workItem from="1477710232796" duration="11983000" />
-      <workItem from="1477731259796" duration="580000" />
-      <workItem from="1477731846690" duration="25291000" />
-      <workItem from="1477794541773" duration="25000" />
-      <workItem from="1477801729194" duration="1528000" />
-      <workItem from="1477803488862" duration="17000" />
-      <workItem from="1477876716457" duration="1094000" />
-      <workItem from="1477879897814" duration="3307000" />
-      <workItem from="1477884174024" duration="400000" />
-      <workItem from="1477923983476" duration="2301000" />
-      <workItem from="1479693327737" duration="983000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TestHistory">
-    <history-entry file="UnionPayTradeTest_testTokenOpen - 2016.10.30 at 00h 28m 52s.xml">
-      <configuration name="UnionPayTradeTest.testTokenOpen" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="UnionPayTradeTest_testTokenOpen - 2016.10.30 at 00h 30m 13s.xml">
-      <configuration name="UnionPayTradeTest.testTokenOpen" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="UnionPayTradeTest_testTokenOpen - 2016.10.30 at 00h 30m 59s.xml">
-      <configuration name="UnionPayTradeTest.testTokenOpen" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="UnionPayTradeTest_testTokenOpen - 2016.10.30 at 00h 31m 19s.xml">
-      <configuration name="UnionPayTradeTest.testTokenOpen" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="UnionPayTradeTest_testTokenOpen - 2016.10.30 at 00h 31m 52s.xml">
-      <configuration name="UnionPayTradeTest.testTokenOpen" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="UnionPayTradeTest_testTokenOpen - 2016.10.30 at 00h 32m 35s.xml">
-      <configuration name="UnionPayTradeTest.testTokenOpen" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="UnionPayTradeTest_testTokenOpen - 2016.10.30 at 00h 36m 23s.xml">
-      <configuration name="UnionPayTradeTest.testTokenOpen" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="UnionPayTradeTest_testTokenOpen - 2016.10.30 at 12h 31m 59s.xml">
-      <configuration name="UnionPayTradeTest.testTokenOpen" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="UnionPayTradeTest_testTokenOpen - 2016.10.31 at 22h 34m 59s.xml">
-      <configuration name="UnionPayTradeTest.testTokenOpen" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="UnionPayTradeTest_testTokenOpen - 2016.11.21 at 10h 10m 58s.xml">
-      <configuration name="UnionPayTradeTest.testTokenOpen" configurationId="JUnit" />
-    </history-entry>
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="47509000" />
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="-9" y="-9" width="1860" height="1092" extended-state="0" />
-    <editor active="false" />
-    <layout>
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="FindBugs-IDEA" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="17" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32615715" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32475883" sideWeight="0.50503355" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="JRebel Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="17" side_tool="true" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.18512304" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="JRebel Executor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.38320774" sideWeight="0.49496645" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3965702" sideWeight="0.49440715" order="12" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Remote Host" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22651006" sideWeight="0.49624866" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="JRebel" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16722596" sideWeight="0.50375134" order="5" side_tool="true" content_ui="tabs" />
-      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32997763" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.17505592" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.40320855" sideWeight="0.49328858" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16722596" sideWeight="0.50375134" order="6" side_tool="true" content_ui="tabs" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.724622" sideWeight="0.49776036" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="SVN Properties" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3290461" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3290461" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
-      <window_info id="JRebel remote servers log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="15" side_tool="true" content_ui="tabs" />
-      <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3290461" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-    </layout>
-    <layout-to-restore>
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="FindBugs-IDEA" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="17" side_tool="false" content_ui="tabs" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32475883" sideWeight="0.50503355" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="JRebel Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="18" side_tool="true" content_ui="tabs" />
-      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.724622" sideWeight="0.49776036" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.1828859" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="JRebel Executor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="SVN Properties" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3290461" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Remote Host" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32997763" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.17505592" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.40320855" sideWeight="0.49328858" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3262032" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4524064" sideWeight="0.49496645" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3965702" sideWeight="0.49440715" order="12" side_tool="false" content_ui="tabs" />
-      <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3290461" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
-      <window_info id="JRebel remote servers log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="15" side_tool="true" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22651006" sideWeight="0.49624866" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="JRebel" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16722596" sideWeight="0.50375134" order="5" side_tool="true" content_ui="tabs" />
-      <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3290461" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16722596" sideWeight="0.50375134" order="6" side_tool="true" content_ui="tabs" />
-    </layout-to-restore>
-  </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <option name="time" value="6" />
-    </breakpoint-manager>
-    <watches-manager />
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/pay/util/WebUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="375">
-          <caret line="33" column="48" selection-start-line="33" selection-start-column="48" selection-end-line="33" selection-end-column="48" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/pay/util/SignUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1425">
-          <caret line="57" column="17" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="17" />
-          <folding>
-            <element signature="imports" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/pay/App.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/pay/util/Assert.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-275">
-          <caret line="52" column="9" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/cn/mrdear/pay/AppTest.java" />
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_77/src.zip!/java/security/KeyFactory.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="400">
-          <caret line="113" column="37" selection-start-line="113" selection-start-column="37" selection-end-line="113" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/pay/util/RSAUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="338">
-          <caret line="89" column="45" selection-start-line="89" selection-start-column="45" selection-end-line="89" selection-end-column="45" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/cn/mrdear/pay/util.java" />
-    <entry file="jar://$PROJECT_DIR$/lib/alipay-sdk-java20161029120104.jar!/com/alipay/api/response/AlipayTradeRefundResponse.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="413">
-          <caret line="27" column="30" selection-start-line="27" selection-start-column="30" selection-end-line="27" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$PROJECT_DIR$/lib/alipay-sdk-java20161029120104-source.jar!/com/alipay/api/com/alipay/api/DefaultAlipayClient.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="65">
-          <caret line="234" column="55" selection-start-line="234" selection-start-column="55" selection-end-line="234" selection-end-column="55" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$PROJECT_DIR$/lib/alipay-sdk-java20161029120104-source.jar!/com/alipay/api/com/alipay/api/AlipayClient.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="301">
-          <caret line="55" column="40" selection-start-line="55" selection-start-column="40" selection-end-line="55" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/cn/mrdear/pay/util/SignUtilTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="550">
-          <caret line="27" column="73" selection-start-line="27" selection-start-column="73" selection-end-line="27" selection-end-column="73" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/cn/mrdear/pay/util/XMLUtilTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="12" column="19" selection-start-line="12" selection-start-column="19" selection-end-line="12" selection-end-column="19" />
-          <folding>
-            <element signature="imports" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_77/src.zip!/javax/xml/bind/annotation/XmlRootElement.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-25">
-          <caret line="161" column="18" selection-start-line="161" selection-start-column="18" selection-end-line="161" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.3.2/httpcore-4.3.2.jar!/org/apache/http/HttpEntity.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="12" column="17" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/pay/util/XmlUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="271">
-          <caret line="38" column="13" selection-start-line="38" selection-start-column="13" selection-end-line="38" selection-end-column="13" />
-          <folding>
-            <element signature="e#864#894#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/pay/util/SignUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="446">
-          <caret line="74" column="42" selection-start-line="74" selection-start-column="42" selection-end-line="74" selection-end-column="42" />
-          <folding>
-            <element signature="imports" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/cn/mrdear/pay/wechat/WecharTradeTest.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/pay/unionpay/sdk/LogUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="550">
-          <caret line="43" column="0" selection-start-line="43" selection-start-column="0" selection-end-line="43" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/pay/unionpay/sdk/SecureUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="475">
-          <caret line="524" column="24" selection-start-line="524" selection-start-column="24" selection-end-line="524" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/pay/unionpay/sdk/HttpClient.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="234" column="80" selection-start-line="234" selection-start-column="80" selection-end-line="234" selection-end-column="80" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/pay/unionpay/sdk/SDKConfig.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="39">
-          <caret line="173" column="50" selection-start-line="173" selection-start-column="50" selection-end-line="173" selection-end-column="50" />
-          <folding>
-            <element signature="e#11309#11310#0" expanded="false" />
-            <element signature="e#11338#11339#0" expanded="false" />
-            <element signature="e#13965#13966#0" expanded="false" />
-            <element signature="e#13979#13980#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/pay/unionpay/sdk/CertUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="10200">
-          <caret line="448" column="25" selection-start-line="448" selection-start-column="25" selection-end-line="448" selection-end-column="25" />
-          <folding>
-            <element signature="n#!!doc" expanded="false" />
-            <element signature="imports" expanded="false" />
-            <element signature="e#17340#17341#0" expanded="false" />
-            <element signature="e#17367#17368#0" expanded="false" />
-            <element signature="e#18985#18986#0" expanded="false" />
-            <element signature="e#19006#19007#0" expanded="false" />
-            <element signature="e#19123#19124#0" expanded="false" />
-            <element signature="e#19156#19157#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/pay/unionpay/sdk/SDKUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="425">
-          <caret line="39" column="26" selection-start-line="39" selection-start-column="26" selection-end-line="39" selection-end-column="26" />
-          <folding>
-            <element signature="n#!!doc" expanded="false" />
-            <element signature="imports" expanded="false" />
-            <element signature="e#6670#6671#0" expanded="false" />
-            <element signature="e#6716#6717#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/pay/unionpay/sdk/AcpService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="340">
-          <caret line="27" column="18" selection-start-line="27" selection-start-column="18" selection-end-line="27" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/cn/mrdear/pay/pay/alipay/AlipayTradeTest.java" />
-    <entry file="file://$PROJECT_DIR$/src/test/java/cn/mrdear/pay/pay/unionpay/UnionPayTradeTest.java" />
-    <entry file="file://$PROJECT_DIR$/src/test/java/cn/mrdear/pay/pay/util/XMLUtilTest.java" />
-    <entry file="file://$PROJECT_DIR$/src/test/java/cn/mrdear/pay/pay/util/SignUtilTest.java" />
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="496">
-          <caret line="73" column="30" selection-start-line="73" selection-start-column="30" selection-end-line="73" selection-end-column="30" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/pay/wechat/WechatTradeTest.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/pay/wechat/entity/WechatPayNotify.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3700">
-          <caret line="254" column="39" selection-start-line="254" selection-start-column="39" selection-end-line="254" selection-end-column="39" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/pay/wechat/entity/WechatRefundQuery.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1425">
-          <caret line="59" column="5" selection-start-line="59" selection-start-column="5" selection-end-line="59" selection-end-column="5" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/pay/wechat/entity/WechatUnifiedOrder.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1200">
-          <caret line="50" column="0" selection-start-line="50" selection-start-column="0" selection-end-line="50" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/pay/wechat/entity/WechatRefund.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="815">
-          <caret line="357" column="39" selection-start-line="357" selection-start-column="39" selection-end-line="357" selection-end-column="39" />
-          <folding>
-            <element signature="e#8515#8516#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/pay/util/WebUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="301">
-          <caret line="120" column="25" selection-start-line="120" selection-start-column="25" selection-end-line="120" selection-end-column="25" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/resources/acp_sdk.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="403">
-          <caret line="22" column="41" selection-start-line="22" selection-start-column="41" selection-end-line="22" selection-end-column="41" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/acp_sdk.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="325">
-          <caret line="13" column="26" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/cn/mrdear/pay/wechat/WechatTradeTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1022">
-          <caret line="50" column="5" selection-start-line="50" selection-start-column="5" selection-end-line="50" selection-end-column="5" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/cn/mrdear/pay/alipay/AlipayTradeTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="203">
-          <caret line="15" column="9" selection-start-line="15" selection-start-column="9" selection-end-line="15" selection-end-column="9" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/pay/util/DateUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="299">
-          <caret line="24" column="31" selection-start-line="24" selection-start-column="31" selection-end-line="24" selection-end-column="31" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/pay/unionpay/UnionPayConfig.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="25">
-          <caret line="47" column="41" selection-start-line="47" selection-start-column="41" selection-end-line="47" selection-end-column="41" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/pay/wechat/WechatConfig.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="625">
-          <caret line="58" column="29" selection-start-line="58" selection-start-column="29" selection-end-line="58" selection-end-column="29" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/pay/wechat/WechatClient.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="379">
-          <caret line="125" column="7" selection-start-line="125" selection-start-column="7" selection-end-line="126" selection-end-column="14" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/pay/wechat/WechatTrade.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="450">
-          <caret line="61" column="27" selection-start-line="61" selection-start-column="27" selection-end-line="61" selection-end-column="27" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/pay/alipay/AlipayTrade.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="665">
-          <caret line="42" column="40" selection-start-line="42" selection-start-column="40" selection-end-line="42" selection-end-column="40" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/pay/alipay/AliPayConfig.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="324">
-          <caret line="43" column="38" selection-start-line="43" selection-start-column="38" selection-end-line="43" selection-end-column="38" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/pay/unionpay/UnionPayClient.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="35" column="7" selection-start-line="35" selection-start-column="7" selection-end-line="35" selection-end-column="7" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/pay/unionpay/UnionPayTrade.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="375">
-          <caret line="23" column="16" selection-start-line="23" selection-start-column="16" selection-end-line="23" selection-end-column="16" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/cn/mrdear/pay/unionpay/UnionPayTradeTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="222">
-          <caret line="40" column="13" selection-start-line="40" selection-start-column="13" selection-end-line="40" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>No facets are configured</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>app</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>CommonPay</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectJDKs.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>alipay-sdk-java20161029120104</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/Pay-Demo/CommonPay.iml b/Pay-Demo/CommonPay.iml
deleted file mode 100644
index 0899be1..0000000
--- a/Pay-Demo/CommonPay.iml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="alipay-sdk-java20161029120104" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Tomcat 8.0.30" level="application_server_libraries" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.10" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.51" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.3.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.3.2" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.14" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.7" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.7" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.2" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.2" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/Pay-Demo/pom.xml b/Pay-Demo/pom.xml
index 7ae5ba7..c87d8e1 100644
--- a/Pay-Demo/pom.xml
+++ b/Pay-Demo/pom.xml
@@ -3,11 +3,11 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>cn.mrdear</groupId>
-  <artifactId>commonpay</artifactId>
+  <artifactId>Pay-Demo</artifactId>
   <version>1.0.0</version>
   <packaging>jar</packaging>
 
-  <name>commonpay</name>
+  <name>Pay-demo</name>
   <url>http://maven.apache.org</url>
 
   <properties>
diff --git a/Pay-Demo/src/main/java/cn/mrdear/pay/alipay/AliPayConfig.java b/Pay-Demo/src/main/java/cn/mrdear/pay/alipay/AliPayConfig.java
index 9e7217e..64a6cbc 100644
--- a/Pay-Demo/src/main/java/cn/mrdear/pay/alipay/AliPayConfig.java
+++ b/Pay-Demo/src/main/java/cn/mrdear/pay/alipay/AliPayConfig.java
@@ -54,6 +54,10 @@ public final class AliPayConfig {
      * 交易关闭回调(当该笔订单全部退款完毕,则交易关闭)
      */
     public static final String TRADE_CLOSED = "TRADE_CLOSED";
+    /**
+     * 收款方账号
+     */
+    public static final String SELLER_ID = "xxxx@qq.com";
     /**
      * 支付宝请求客户端入口
      */
diff --git a/Pay-Demo/src/main/java/cn/mrdear/pay/alipay/AlipayTrade.java b/Pay-Demo/src/main/java/cn/mrdear/pay/alipay/AlipayTrade.java
index 06aac73..8b8c713 100644
--- a/Pay-Demo/src/main/java/cn/mrdear/pay/alipay/AlipayTrade.java
+++ b/Pay-Demo/src/main/java/cn/mrdear/pay/alipay/AlipayTrade.java
@@ -31,11 +31,12 @@ public class AlipayTrade {
      * url https://doc.open.alipay.com/doc2/detail.htm?treeId=203&articleId=105463&docType=1#s1
      * @return web支付的表单
      */
-    public String TradeWapPayRequest(Map<String, ?> sParaTemp){
+    public String TradeWapPayRequest(Map<String, String> sParaTemp){
         AlipayTradeWapPayRequest alipayRequest = new AlipayTradeWapPayRequest();
         alipayRequest.setReturnUrl(AliPayConfig.RETURN_URL);
         alipayRequest.setNotifyUrl(AliPayConfig.PAY_NOTIFY);
         // 待请求参数数组
+        sParaTemp.put("seller_id",AliPayConfig.SELLER_ID);
         alipayRequest.setBizContent(JSON.toJSONString(sParaTemp));
         String form = "";
         try {
diff --git a/Pay-Demo/src/main/java/cn/mrdear/pay/unionpay/UnionPayTrade.java b/Pay-Demo/src/main/java/cn/mrdear/pay/unionpay/UnionPayTrade.java
index 2a88287..3a672fb 100644
--- a/Pay-Demo/src/main/java/cn/mrdear/pay/unionpay/UnionPayTrade.java
+++ b/Pay-Demo/src/main/java/cn/mrdear/pay/unionpay/UnionPayTrade.java
@@ -6,7 +6,6 @@
 
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
 
 import cn.mrdear.pay.unionpay.sdk.AcpService;
 import cn.mrdear.pay.util.SignUtil;
diff --git a/Pay-Demo/src/test/java/cn/mrdear/pay/alipay/AlipayTradeTest.java b/Pay-Demo/src/test/java/cn/mrdear/pay/alipay/AlipayTradeTest.java
index 7bc41cd..aad33b8 100644
--- a/Pay-Demo/src/test/java/cn/mrdear/pay/alipay/AlipayTradeTest.java
+++ b/Pay-Demo/src/test/java/cn/mrdear/pay/alipay/AlipayTradeTest.java
@@ -19,8 +19,7 @@ public void testTradeWapPayRequest(){
         Map<String,String> paraMap = new HashMap<String,String>();
         paraMap.put("out_trade_no",System.currentTimeMillis()+"");
         paraMap.put("total_amount","0.01");
-        paraMap.put("subject","测试退款");
-        paraMap.put("seller_id",System.currentTimeMillis()+"");
+        paraMap.put("subject","测试下单");
         paraMap.put("product_code","QUICK_WAP_PAY");
         alipayTrade.TradeWapPayRequest(paraMap);
     }
diff --git a/README.MD b/README.MD
index b3c7031..5ab30da 100644
--- a/README.MD
+++ b/README.MD
@@ -1,3 +1,7 @@
+### 2017.9.27
+随着开发经验的增加,现在觉得这种Demo对于学习一个框架起不到太大的作用,顶多是个参考,并且由于使用经验的增加,对于之前一些错误的用法很难得到纠正,如果想要快速入门的话官方+造轮子才是最佳选择,类似豆瓣有许多开放的API,都可以用来练手,最后该项目不再更新,这点经验希望能帮助你.
+
+
 #该仓库主要记录学习javaWEB中一些Demo
 
 1.SSM-Demo
@@ -18,11 +22,11 @@
 --------------
 该Demo是做学习Spring-Boot时整合环境,整合了thymeleaf,Mybatis,Druid,ehcache可以拉下来直接进行二次开发,如果是WebService服务的话,去掉thymeleaf即可.
 
-4.maven多模块项目
+4.Maven-Demo
 --------------
 该demo针对具体项目所整合.主要设计mybatis多模块使用,spring多模块使用,要点就是无论什么模块,只要配置文件加载位置正确配置,就不会出问题.
 
-5.HtmlUnit-Demo
+5.HtmlUnit-Demo   
 --------------
 使用htmlUnit模拟浏览器请求,抓取Shadowsocks的一些免费账户使用,在win下配合bat脚本启动,很是方便.详情可以看项目的Main方法使用说明.
 
@@ -33,11 +37,39 @@
 
 7.JPA-Demo
 --------------
-学习SpringDataJPA使用,需要配合博客博文http://www.jianshu.com/p/e3812fc23f83 ,该Demo主要是对复杂查询的封装,为原生sql和JPQL查询封装一个通用的方法.具体可以看代码的test包中的测试代码
+SpringDataJPA+QueryDSL使用,需要配合博客博文http://www.jianshu.com/p/e3812fc23f83 ,两者配合很好地解决了单表动态查询,多表动态查询.
 
 8.Util-Demo
 --------------
 开发中常用工具类的写法,比如PropertiesUtil,XmlUtil,HttpUtil等,该Demo希望大家能不断扩充.
 
-9.待添加
+9.gRPC-Demo
+--------------
+参考官方案例的gRPC的Demo,里面有Hello World和 RouteGuide案例,适合入门.相关博文参考 http://www.jianshu.com/nb/9491747
+
+10.Excel-Demo
+--------------
+使用Apache-poi封装的一个通用表单导出模块和解析模块,可以很容易的迁移到项目中,配合Jackxml使用更佳
+
+11.Spring-Data-Redis
+--------------
+SpringDataRedis学习的一个Demo,内容不多,配合博文:[redis学习记录(四)-SpringDataRedis分析](http://mrdear.cn/2017/03/29/linux/redis%E5%AD%A6%E4%B9%A0%E8%AE%B0%E5%BD%95(%E5%9B%9B)-SpringDataRedis%E5%88%86%E6%9E%90/)可以很好的入手
+
+12.Spring-Cloud-Demo
+--------------
+学习Spring Cloud的一个Demo,其中对于Eureka,Ribbon,Feign等都有相应的Demo,相应博文会更新在[我的博客](mrdear.cn)上,希望对你有帮助
+
+13.Dubbo-Demo
+--------------
+增加Dubbo-Demo,一个基本的RPC调用Demo
+
+14.Motan-Demo
+--------------
+增加Motan-Demo,一个基本的RPC调用Demo
+
+15.Spring-Security-Demo
+--------------
+增加Spring Security Demo,项目中使用了JWT Token验证机制,该项目可以很好的了解整个流程的作用,需要配合我博客中Spring Security相关博文食用.
+
+16.待添加
 --------------
diff --git a/SSM--Demo/.idea/artifacts/Freemarker_war.xml b/SSM--Demo/.idea/artifacts/Freemarker_war.xml
deleted file mode 100644
index a014441..0000000
--- a/SSM--Demo/.idea/artifacts/Freemarker_war.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="war" name="Freemarker:war">
-    <output-path>$PROJECT_DIR$/target</output-path>
-    <root id="archive" name="mrdear-1.0.0.war">
-      <element id="artifact" artifact-name="Freemarker:war exploded" />
-    </root>
-  </artifact>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/artifacts/Freemarker_war_exploded.xml b/SSM--Demo/.idea/artifacts/Freemarker_war_exploded.xml
deleted file mode 100644
index 5056fc8..0000000
--- a/SSM--Demo/.idea/artifacts/Freemarker_war_exploded.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="exploded-war" name="Freemarker:war exploded">
-    <output-path>$PROJECT_DIR$/target/mrdear-1.0.0</output-path>
-    <root id="root">
-      <element id="directory" name="WEB-INF">
-        <element id="directory" name="classes">
-          <element id="module-output" name="Freemarker" />
-        </element>
-        <element id="directory" name="lib">
-          <element id="library" level="project" name="Maven: org.springframework:spring-core:4.3.2.RELEASE" />
-          <element id="library" level="project" name="Maven: commons-logging:commons-logging:1.2" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-web:4.3.2.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-aop:4.3.2.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-beans:4.3.2.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-context:4.3.2.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-expression:4.3.2.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-jdbc:4.3.2.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-tx:4.3.2.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-webmvc:4.3.2.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-context-support:4.3.2.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-test:4.3.2.RELEASE" />
-          <element id="library" level="project" name="Maven: cglib:cglib:3.2.2" />
-          <element id="library" level="project" name="Maven: org.ow2.asm:asm:5.0.4" />
-          <element id="library" level="project" name="Maven: org.apache.ant:ant:1.9.6" />
-          <element id="library" level="project" name="Maven: org.apache.ant:ant-launcher:1.9.6" />
-          <element id="library" level="project" name="Maven: org.aspectj:aspectjweaver:1.8.6" />
-          <element id="library" level="project" name="Maven: org.aspectj:aspectjrt:1.8.6" />
-          <element id="library" level="project" name="Maven: org.mybatis:mybatis:3.4.1" />
-          <element id="library" level="project" name="Maven: org.mybatis:mybatis-spring:1.3.0" />
-          <element id="library" level="project" name="Maven: com.github.pagehelper:pagehelper:4.1.6" />
-          <element id="library" level="project" name="Maven: com.github.jsqlparser:jsqlparser:0.9.5" />
-          <element id="library" level="project" name="Maven: org.mybatis:mybatis-ehcache:1.0.0" />
-          <element id="library" level="project" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" />
-          <element id="library" level="project" name="Maven: org.slf4j:slf4j-api:1.7.21" />
-          <element id="library" level="project" name="Maven: net.sf.ehcache:ehcache-web:2.0.4" />
-          <element id="library" level="project" name="Maven: mysql:mysql-connector-java:5.1.39" />
-          <element id="library" level="project" name="Maven: com.alibaba:druid:1.0.25" />
-          <element id="library" level="project" name="Maven: com.alibaba:fastjson:1.2.16" />
-          <element id="library" level="project" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" />
-          <element id="library" level="project" name="Maven: javax.validation:validation-api:1.1.0.Final" />
-          <element id="library" level="project" name="Maven: org.jboss.logging:jboss-logging:3.2.1.Final" />
-          <element id="library" level="project" name="Maven: com.fasterxml:classmate:1.1.0" />
-          <element id="library" level="project" name="Maven: org.apache.commons:commons-lang3:3.4" />
-          <element id="library" level="project" name="Maven: commons-beanutils:commons-beanutils:1.9.2" />
-          <element id="library" level="project" name="Maven: commons-collections:commons-collections:3.2.1" />
-          <element id="library" level="project" name="Maven: commons-io:commons-io:2.5" />
-          <element id="library" level="project" name="Maven: commons-fileupload:commons-fileupload:1.3.2" />
-          <element id="library" level="project" name="Maven: ch.qos.logback:logback-core:1.1.7" />
-          <element id="library" level="project" name="Maven: ch.qos.logback:logback-classic:1.1.7" />
-          <element id="library" level="project" name="Maven: org.logback-extensions:logback-ext-spring:0.1.4" />
-          <element id="library" level="project" name="Maven: org.slf4j:jcl-over-slf4j:1.7.12" />
-        </element>
-      </element>
-      <element id="directory" name="META-INF">
-        <element id="file-copy" path="$PROJECT_DIR$/target/mrdear-1.0.0/META-INF/MANIFEST.MF" />
-      </element>
-      <element id="javaee-facet-resources" facet="Freemarker/web/Web" />
-    </root>
-  </artifact>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/compiler.xml b/SSM--Demo/.idea/compiler.xml
deleted file mode 100644
index 9d05644..0000000
--- a/SSM--Demo/.idea/compiler.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-      <entry name="!?*.aj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-      <profile default="false" name="Maven default annotation processors profile" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <processorPath useClasspath="true" />
-        <module name="Freemarker" />
-      </profile>
-    </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="Freemarker" target="1.8" />
-    </bytecodeTargetLevel>
-  </component>
-</project>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/copyright/profiles_settings.xml b/SSM--Demo/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/SSM--Demo/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/dataSources.ids b/SSM--Demo/.idea/dataSources.ids
deleted file mode 100644
index 86f0a67..0000000
--- a/SSM--Demo/.idea/dataSources.ids
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component name="dataSourceStorage">
-  <data-source name="MySQL - shopdemo@localhost" uuid="7c49da35-2907-409b-947b-220b9e548c32">
-    <database-info product="MySQL" version="5.6.24" jdbc-version="4.0" driver-name="MySQL Connector Java" driver-version="mysql-connector-java-5.1.38 ( Revision: fe541c166cec739c74cc727c5da96c1028b4834a )">
-      <extra-name-characters>#@</extra-name-characters>
-      <identifier-quote-string>`</identifier-quote-string>
-    </database-info>
-    <case-sensitivity plain-identifiers="lower" quoted-identifiers="lower"/>
-    <database-model serializer="dbm" rdbms="MYSQL" format-version="2.5">
-      <schema id="1" name="shopdemo"/>
-      <table id="2" parent="1" name="t_address"/>
-      <table id="3" parent="1" name="t_category"/>
-      <table id="4" parent="1" name="t_goods"/>
-      <table id="5" parent="1" name="t_goods_orders"/>
-      <table id="6" parent="1" name="t_orders"/>
-      <table id="7" parent="1" name="user"/>
-      <column id="8" parent="2" name="id">
-        <mandatory>1</mandatory>
-        <data-type>int(11)</data-type>
-        <sequence-identity>1</sequence-identity>
-      </column>
-      <column id="9" parent="2" name="name">
-        <data-type>varchar(255)</data-type>
-      </column>
-      <column id="10" parent="2" name="phone">
-        <data-type>varchar(100)</data-type>
-      </column>
-      <column id="11" parent="2" name="postcode">
-        <data-type>varchar(100)</data-type>
-      </column>
-      <column id="12" parent="2" name="user_id">
-        <data-type>int(11)</data-type>
-      </column>
-      <index id="13" parent="2" name="user_id">
-        <columns>user_id</columns>
-        <desc-columns></desc-columns>
-      </index>
-      <key id="14" parent="2" name="PRIMARY">
-        <columns>id</columns>
-        <primary>1</primary>
-      </key>
-      <foreign-key id="15" parent="2" name="t_address_ibfk_1">
-        <columns>user_id</columns>
-        <ref-key>~.user.PRIMARY</ref-key>
-        <cascade-update-rule>restrict</cascade-update-rule>
-        <cascade-delete-rule>restrict</cascade-delete-rule>
-      </foreign-key>
-      <column id="16" parent="3" name="id">
-        <mandatory>1</mandatory>
-        <data-type>int(11)</data-type>
-        <sequence-identity>1</sequence-identity>
-      </column>
-      <column id="17" parent="3" name="name">
-        <data-type>varchar(100)</data-type>
-      </column>
-      <key id="18" parent="3" name="PRIMARY">
-        <columns>id</columns>
-        <primary>1</primary>
-      </key>
-      <column id="19" parent="4" name="id">
-        <mandatory>1</mandatory>
-        <data-type>int(11)</data-type>
-        <sequence-identity>1</sequence-identity>
-      </column>
-      <column id="20" parent="4" name="name">
-        <data-type>varchar(100)</data-type>
-      </column>
-      <column id="21" parent="4" name="price">
-        <data-type>double</data-type>
-      </column>
-      <column id="22" parent="4" name="intro">
-        <data-type>text</data-type>
-      </column>
-      <column id="23" parent="4" name="img">
-        <data-type>varchar(100)</data-type>
-      </column>
-      <column id="24" parent="4" name="stock">
-        <data-type>int(10)</data-type>
-      </column>
-      <column id="25" parent="4" name="c_id">
-        <data-type>int(10)</data-type>
-      </column>
-      <index id="26" parent="4" name="c_id">
-        <columns>c_id</columns>
-        <desc-columns></desc-columns>
-      </index>
-      <key id="27" parent="4" name="PRIMARY">
-        <columns>id</columns>
-        <primary>1</primary>
-      </key>
-      <foreign-key id="28" parent="4" name="t_goods_ibfk_1">
-        <columns>c_id</columns>
-        <ref-key>~.t_category.PRIMARY</ref-key>
-        <cascade-update-rule>restrict</cascade-update-rule>
-        <cascade-delete-rule>restrict</cascade-delete-rule>
-      </foreign-key>
-      <column id="29" parent="5" name="id">
-        <mandatory>1</mandatory>
-        <data-type>int(11)</data-type>
-        <sequence-identity>1</sequence-identity>
-      </column>
-      <column id="30" parent="5" name="goods_id">
-        <data-type>int(10)</data-type>
-      </column>
-      <column id="31" parent="5" name="orders_id">
-        <data-type>int(10)</data-type>
-      </column>
-      <index id="32" parent="5" name="goods_id">
-        <columns>goods_id</columns>
-        <desc-columns></desc-columns>
-      </index>
-      <index id="33" parent="5" name="orders_id">
-        <columns>orders_id</columns>
-        <desc-columns></desc-columns>
-      </index>
-      <key id="34" parent="5" name="PRIMARY">
-        <columns>id</columns>
-        <primary>1</primary>
-      </key>
-      <foreign-key id="35" parent="5" name="t_goods_orders_ibfk_1">
-        <columns>goods_id</columns>
-        <ref-key>~.t_goods.PRIMARY</ref-key>
-        <cascade-update-rule>restrict</cascade-update-rule>
-        <cascade-delete-rule>restrict</cascade-delete-rule>
-      </foreign-key>
-      <foreign-key id="36" parent="5" name="t_goods_orders_ibfk_2">
-        <columns>orders_id</columns>
-        <ref-key>~.t_orders.PRIMARY</ref-key>
-        <cascade-update-rule>restrict</cascade-update-rule>
-        <cascade-delete-rule>restrict</cascade-delete-rule>
-      </foreign-key>
-      <column id="37" parent="6" name="id">
-        <mandatory>1</mandatory>
-        <data-type>int(11)</data-type>
-        <sequence-identity>1</sequence-identity>
-      </column>
-      <column id="38" parent="6" name="buy_date">
-        <data-type>datetime</data-type>
-      </column>
-      <column id="39" parent="6" name="pay_date">
-        <data-type>datetime</data-type>
-      </column>
-      <column id="40" parent="6" name="confirm_date">
-        <data-type>datetime</data-type>
-      </column>
-      <column id="41" parent="6" name="status">
-        <data-type>int(5)</data-type>
-      </column>
-      <column id="42" parent="6" name="user_id">
-        <data-type>int(11)</data-type>
-      </column>
-      <column id="43" parent="6" name="address_id">
-        <data-type>int(11)</data-type>
-      </column>
-      <index id="44" parent="6" name="address_id">
-        <columns>address_id</columns>
-        <desc-columns></desc-columns>
-      </index>
-      <index id="45" parent="6" name="user_id">
-        <columns>user_id</columns>
-        <desc-columns></desc-columns>
-      </index>
-      <key id="46" parent="6" name="PRIMARY">
-        <columns>id</columns>
-        <primary>1</primary>
-      </key>
-      <foreign-key id="47" parent="6" name="t_orders_ibfk_1">
-        <columns>user_id</columns>
-        <ref-key>~.user.PRIMARY</ref-key>
-        <cascade-update-rule>restrict</cascade-update-rule>
-        <cascade-delete-rule>restrict</cascade-delete-rule>
-      </foreign-key>
-      <foreign-key id="48" parent="6" name="t_orders_ibfk_2">
-        <columns>address_id</columns>
-        <ref-key>~.t_address.PRIMARY</ref-key>
-        <cascade-update-rule>restrict</cascade-update-rule>
-        <cascade-delete-rule>restrict</cascade-delete-rule>
-      </foreign-key>
-      <column id="49" parent="7" name="id">
-        <mandatory>1</mandatory>
-        <data-type>int(3)</data-type>
-        <sequence-identity>1</sequence-identity>
-      </column>
-      <column id="50" parent="7" name="username">
-        <data-type>varchar(30)</data-type>
-      </column>
-      <column id="51" parent="7" name="password">
-        <data-type>varchar(30)</data-type>
-      </column>
-      <column id="52" parent="7" name="nickname">
-        <data-type>varchar(30)</data-type>
-      </column>
-      <column id="53" parent="7" name="status">
-        <data-type>int(2)</data-type>
-      </column>
-      <key id="54" parent="7" name="PRIMARY">
-        <columns>id</columns>
-        <primary>1</primary>
-      </key>
-    </database-model>
-  </data-source>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/dataSources.local.xml b/SSM--Demo/.idea/dataSources.local.xml
deleted file mode 100644
index 0a839de..0000000
--- a/SSM--Demo/.idea/dataSources.local.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="dataSourceStorageLocal">
-    <data-source name="MySQL - shopdemo@localhost" uuid="7c49da35-2907-409b-947b-220b9e548c32">
-      <database-info product="MySQL" version="5.6.24" jdbc-version="4.0" driver-name="MySQL Connector Java" driver-version="mysql-connector-java-5.1.38 ( Revision: fe541c166cec739c74cc727c5da96c1028b4834a )">
-        <extra-name-characters>#@</extra-name-characters>
-        <identifier-quote-string>`</identifier-quote-string>
-      </database-info>
-      <case-sensitivity plain-identifiers="lower" quoted-identifiers="lower" />
-      <secret-storage>memory</secret-storage>
-      <user-name>root</user-name>
-      <introspection-scope>shopdemo:*</introspection-scope>
-      <resolve-scope>shopdemo:*</resolve-scope>
-    </data-source>
-  </component>
-</project>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/dataSources.xml b/SSM--Demo/.idea/dataSources.xml
deleted file mode 100644
index 988e953..0000000
--- a/SSM--Demo/.idea/dataSources.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
-    <data-source source="LOCAL" name="MySQL - shopdemo@localhost" uuid="7c49da35-2907-409b-947b-220b9e548c32">
-      <driver-ref>mysql</driver-ref>
-      <synchronize>true</synchronize>
-      <jdbc-driver>com.mysql.jdbc.Driver</jdbc-driver>
-      <jdbc-url>jdbc:mysql://localhost:3306/shopdemo</jdbc-url>
-      <driver-properties>
-        <property name="autoReconnect" value="true" />
-        <property name="zeroDateTimeBehavior" value="convertToNull" />
-        <property name="tinyInt1isBit" value="false" />
-        <property name="characterEncoding" value="utf8" />
-        <property name="characterSetResults" value="utf8" />
-        <property name="yearIsDateType" value="false" />
-      </driver-properties>
-    </data-source>
-  </component>
-</project>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/dataSources/7c49da35-2907-409b-947b-220b9e548c32.xml b/SSM--Demo/.idea/dataSources/7c49da35-2907-409b-947b-220b9e548c32.xml
deleted file mode 100644
index b8bbae2..0000000
--- a/SSM--Demo/.idea/dataSources/7c49da35-2907-409b-947b-220b9e548c32.xml
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dataSource name="MySQL - shopdemo@localhost">
-  <database-model serializer="dbm" rdbms="MYSQL" format-version="2.6">
-    <schema id="1" name="shopdemo">
-      <visible>1</visible>
-    </schema>
-    <table id="2" parent="1" name="t_address"/>
-    <table id="3" parent="1" name="t_category"/>
-    <table id="4" parent="1" name="t_goods"/>
-    <table id="5" parent="1" name="t_goods_orders"/>
-    <table id="6" parent="1" name="t_orders"/>
-    <table id="7" parent="1" name="user"/>
-    <column id="8" parent="2" name="id">
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-      <sequence-identity>1</sequence-identity>
-    </column>
-    <column id="9" parent="2" name="name">
-      <data-type>varchar(255)|0</data-type>
-    </column>
-    <column id="10" parent="2" name="phone">
-      <data-type>varchar(100)|0</data-type>
-    </column>
-    <column id="11" parent="2" name="postcode">
-      <data-type>varchar(100)|0</data-type>
-    </column>
-    <column id="12" parent="2" name="user_id">
-      <data-type>int(11)|0</data-type>
-    </column>
-    <index id="13" parent="2" name="user_id">
-      <columns>user_id</columns>
-      <desc-columns></desc-columns>
-    </index>
-    <key id="14" parent="2" name="PRIMARY">
-      <columns>id</columns>
-      <primary>1</primary>
-    </key>
-    <foreign-key id="15" parent="2" name="t_address_ibfk_1">
-      <columns>user_id</columns>
-      <ref-key>~.user.PRIMARY</ref-key>
-      <cascade-update-rule>restrict</cascade-update-rule>
-      <cascade-delete-rule>restrict</cascade-delete-rule>
-    </foreign-key>
-    <column id="16" parent="3" name="id">
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-      <sequence-identity>1</sequence-identity>
-    </column>
-    <column id="17" parent="3" name="name">
-      <data-type>varchar(100)|0</data-type>
-    </column>
-    <key id="18" parent="3" name="PRIMARY">
-      <columns>id</columns>
-      <primary>1</primary>
-    </key>
-    <column id="19" parent="4" name="id">
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-      <sequence-identity>1</sequence-identity>
-    </column>
-    <column id="20" parent="4" name="name">
-      <data-type>varchar(100)|0</data-type>
-    </column>
-    <column id="21" parent="4" name="price">
-      <data-type>double|0</data-type>
-    </column>
-    <column id="22" parent="4" name="intro">
-      <data-type>text|0</data-type>
-    </column>
-    <column id="23" parent="4" name="img">
-      <data-type>varchar(100)|0</data-type>
-    </column>
-    <column id="24" parent="4" name="stock">
-      <data-type>int(10)|0</data-type>
-    </column>
-    <column id="25" parent="4" name="c_id">
-      <data-type>int(10)|0</data-type>
-    </column>
-    <index id="26" parent="4" name="c_id">
-      <columns>c_id</columns>
-      <desc-columns></desc-columns>
-    </index>
-    <key id="27" parent="4" name="PRIMARY">
-      <columns>id</columns>
-      <primary>1</primary>
-    </key>
-    <foreign-key id="28" parent="4" name="t_goods_ibfk_1">
-      <columns>c_id</columns>
-      <ref-key>~.t_category.PRIMARY</ref-key>
-      <cascade-update-rule>restrict</cascade-update-rule>
-      <cascade-delete-rule>restrict</cascade-delete-rule>
-    </foreign-key>
-    <column id="29" parent="5" name="id">
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-      <sequence-identity>1</sequence-identity>
-    </column>
-    <column id="30" parent="5" name="goods_id">
-      <data-type>int(10)|0</data-type>
-    </column>
-    <column id="31" parent="5" name="orders_id">
-      <data-type>int(10)|0</data-type>
-    </column>
-    <index id="32" parent="5" name="goods_id">
-      <columns>goods_id</columns>
-      <desc-columns></desc-columns>
-    </index>
-    <index id="33" parent="5" name="orders_id">
-      <columns>orders_id</columns>
-      <desc-columns></desc-columns>
-    </index>
-    <key id="34" parent="5" name="PRIMARY">
-      <columns>id</columns>
-      <primary>1</primary>
-    </key>
-    <foreign-key id="35" parent="5" name="t_goods_orders_ibfk_1">
-      <columns>goods_id</columns>
-      <ref-key>~.t_goods.PRIMARY</ref-key>
-      <cascade-update-rule>restrict</cascade-update-rule>
-      <cascade-delete-rule>restrict</cascade-delete-rule>
-    </foreign-key>
-    <foreign-key id="36" parent="5" name="t_goods_orders_ibfk_2">
-      <columns>orders_id</columns>
-      <ref-key>~.t_orders.PRIMARY</ref-key>
-      <cascade-update-rule>restrict</cascade-update-rule>
-      <cascade-delete-rule>restrict</cascade-delete-rule>
-    </foreign-key>
-    <column id="37" parent="6" name="id">
-      <mandatory>1</mandatory>
-      <data-type>int(11)|0</data-type>
-      <sequence-identity>1</sequence-identity>
-    </column>
-    <column id="38" parent="6" name="buy_date">
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="39" parent="6" name="pay_date">
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="40" parent="6" name="confirm_date">
-      <data-type>datetime|0</data-type>
-    </column>
-    <column id="41" parent="6" name="status">
-      <data-type>int(5)|0</data-type>
-    </column>
-    <column id="42" parent="6" name="user_id">
-      <data-type>int(11)|0</data-type>
-    </column>
-    <column id="43" parent="6" name="address_id">
-      <data-type>int(11)|0</data-type>
-    </column>
-    <index id="44" parent="6" name="address_id">
-      <columns>address_id</columns>
-      <desc-columns></desc-columns>
-    </index>
-    <index id="45" parent="6" name="user_id">
-      <columns>user_id</columns>
-      <desc-columns></desc-columns>
-    </index>
-    <key id="46" parent="6" name="PRIMARY">
-      <columns>id</columns>
-      <primary>1</primary>
-    </key>
-    <foreign-key id="47" parent="6" name="t_orders_ibfk_1">
-      <columns>user_id</columns>
-      <ref-key>~.user.PRIMARY</ref-key>
-      <cascade-update-rule>restrict</cascade-update-rule>
-      <cascade-delete-rule>restrict</cascade-delete-rule>
-    </foreign-key>
-    <foreign-key id="48" parent="6" name="t_orders_ibfk_2">
-      <columns>address_id</columns>
-      <ref-key>~.t_address.PRIMARY</ref-key>
-      <cascade-update-rule>restrict</cascade-update-rule>
-      <cascade-delete-rule>restrict</cascade-delete-rule>
-    </foreign-key>
-    <column id="49" parent="7" name="id">
-      <mandatory>1</mandatory>
-      <data-type>int(3)|0</data-type>
-      <sequence-identity>1</sequence-identity>
-    </column>
-    <column id="50" parent="7" name="username">
-      <data-type>varchar(30)|0</data-type>
-    </column>
-    <column id="51" parent="7" name="password">
-      <data-type>varchar(30)|0</data-type>
-    </column>
-    <column id="52" parent="7" name="nickname">
-      <data-type>varchar(30)|0</data-type>
-    </column>
-    <column id="53" parent="7" name="status">
-      <data-type>int(2)|0</data-type>
-    </column>
-    <key id="54" parent="7" name="PRIMARY">
-      <columns>id</columns>
-      <primary>1</primary>
-    </key>
-  </database-model>
-</dataSource>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/encodings.xml b/SSM--Demo/.idea/encodings.xml
deleted file mode 100644
index c0bce70..0000000
--- a/SSM--Demo/.idea/encodings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="file://$PROJECT_DIR$" charset="UTF-8" />
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__cglib_cglib_3_2_2.xml b/SSM--Demo/.idea/libraries/Maven__cglib_cglib_3_2_2.xml
deleted file mode 100644
index 9e3d27a..0000000
--- a/SSM--Demo/.idea/libraries/Maven__cglib_cglib_3_2_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: cglib:cglib:3.2.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/cglib/cglib/3.2.2/cglib-3.2.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/cglib/cglib/3.2.2/cglib-3.2.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/cglib/cglib/3.2.2/cglib-3.2.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_7.xml b/SSM--Demo/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_7.xml
deleted file mode 100644
index cdd7959..0000000
--- a/SSM--Demo/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: ch.qos.logback:logback-classic:1.1.7">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.1.7/logback-classic-1.1.7.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.1.7/logback-classic-1.1.7-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.1.7/logback-classic-1.1.7-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_7.xml b/SSM--Demo/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_7.xml
deleted file mode 100644
index 6c2a760..0000000
--- a/SSM--Demo/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: ch.qos.logback:logback-core:1.1.7">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.1.7/logback-core-1.1.7.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.1.7/logback-core-1.1.7-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.1.7/logback-core-1.1.7-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__com_alibaba_druid_1_0_25.xml b/SSM--Demo/.idea/libraries/Maven__com_alibaba_druid_1_0_25.xml
deleted file mode 100644
index a99867b..0000000
--- a/SSM--Demo/.idea/libraries/Maven__com_alibaba_druid_1_0_25.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.alibaba:druid:1.0.25">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.0.25/druid-1.0.25.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.0.25/druid-1.0.25-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.0.25/druid-1.0.25-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__com_alibaba_fastjson_1_2_16.xml b/SSM--Demo/.idea/libraries/Maven__com_alibaba_fastjson_1_2_16.xml
deleted file mode 100644
index 974cfda..0000000
--- a/SSM--Demo/.idea/libraries/Maven__com_alibaba_fastjson_1_2_16.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.alibaba:fastjson:1.2.16">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.16/fastjson-1.2.16.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.16/fastjson-1.2.16-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.16/fastjson-1.2.16-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__com_fasterxml_classmate_1_1_0.xml b/SSM--Demo/.idea/libraries/Maven__com_fasterxml_classmate_1_1_0.xml
deleted file mode 100644
index 727b8fe..0000000
--- a/SSM--Demo/.idea/libraries/Maven__com_fasterxml_classmate_1_1_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.fasterxml:classmate:1.1.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.1.0/classmate-1.1.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.1.0/classmate-1.1.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.1.0/classmate-1.1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_0_9_5.xml b/SSM--Demo/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_0_9_5.xml
deleted file mode 100644
index eba478b..0000000
--- a/SSM--Demo/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_0_9_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.github.jsqlparser:jsqlparser:0.9.5">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/0.9.5/jsqlparser-0.9.5.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/0.9.5/jsqlparser-0.9.5-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/0.9.5/jsqlparser-0.9.5-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__com_github_pagehelper_pagehelper_4_1_6.xml b/SSM--Demo/.idea/libraries/Maven__com_github_pagehelper_pagehelper_4_1_6.xml
deleted file mode 100644
index 84bf18c..0000000
--- a/SSM--Demo/.idea/libraries/Maven__com_github_pagehelper_pagehelper_4_1_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.github.pagehelper:pagehelper:4.1.6">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/4.1.6/pagehelper-4.1.6.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/4.1.6/pagehelper-4.1.6-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/4.1.6/pagehelper-4.1.6-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/SSM--Demo/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml
deleted file mode 100644
index 9c245b9..0000000
--- a/SSM--Demo/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: commons-beanutils:commons-beanutils:1.9.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-beanutils/commons-beanutils/1.9.2/commons-beanutils-1.9.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-beanutils/commons-beanutils/1.9.2/commons-beanutils-1.9.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-beanutils/commons-beanutils/1.9.2/commons-beanutils-1.9.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/SSM--Demo/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml
deleted file mode 100644
index 3caee7e..0000000
--- a/SSM--Demo/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: commons-collections:commons-collections:3.2.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_2.xml b/SSM--Demo/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_2.xml
deleted file mode 100644
index f180407..0000000
--- a/SSM--Demo/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: commons-fileupload:commons-fileupload:1.3.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.3.2/commons-fileupload-1.3.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.3.2/commons-fileupload-1.3.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.3.2/commons-fileupload-1.3.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__commons_io_commons_io_2_5.xml b/SSM--Demo/.idea/libraries/Maven__commons_io_commons_io_2_5.xml
deleted file mode 100644
index 67c2ad2..0000000
--- a/SSM--Demo/.idea/libraries/Maven__commons_io_commons_io_2_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: commons-io:commons-io:2.5">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.5/commons-io-2.5.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.5/commons-io-2.5-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.5/commons-io-2.5-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml b/SSM--Demo/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml
deleted file mode 100644
index eab40b3..0000000
--- a/SSM--Demo/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: commons-logging:commons-logging:1.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/SSM--Demo/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml
deleted file mode 100644
index 940ce73..0000000
--- a/SSM--Demo/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: javax.validation:validation-api:1.1.0.Final">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_39.xml b/SSM--Demo/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_39.xml
deleted file mode 100644
index 18e6ec9..0000000
--- a/SSM--Demo/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_39.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: mysql:mysql-connector-java:5.1.39">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/5.1.39/mysql-connector-java-5.1.39.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/5.1.39/mysql-connector-java-5.1.39-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/5.1.39/mysql-connector-java-5.1.39-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_11.xml b/SSM--Demo/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_11.xml
deleted file mode 100644
index 1c71163..0000000
--- a/SSM--Demo/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_11.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: net.sf.ehcache:ehcache-core:2.6.11">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/sf/ehcache/ehcache-core/2.6.11/ehcache-core-2.6.11.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/net/sf/ehcache/ehcache-core/2.6.11/ehcache-core-2.6.11-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/sf/ehcache/ehcache-core/2.6.11/ehcache-core-2.6.11-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__net_sf_ehcache_ehcache_web_2_0_4.xml b/SSM--Demo/.idea/libraries/Maven__net_sf_ehcache_ehcache_web_2_0_4.xml
deleted file mode 100644
index e41e7ba..0000000
--- a/SSM--Demo/.idea/libraries/Maven__net_sf_ehcache_ehcache_web_2_0_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: net.sf.ehcache:ehcache-web:2.0.4">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/sf/ehcache/ehcache-web/2.0.4/ehcache-web-2.0.4.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/net/sf/ehcache/ehcache-web/2.0.4/ehcache-web-2.0.4-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/sf/ehcache/ehcache-web/2.0.4/ehcache-web-2.0.4-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__org_apache_ant_ant_1_9_6.xml b/SSM--Demo/.idea/libraries/Maven__org_apache_ant_ant_1_9_6.xml
deleted file mode 100644
index 8cba3e1..0000000
--- a/SSM--Demo/.idea/libraries/Maven__org_apache_ant_ant_1_9_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.ant:ant:1.9.6">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant/1.9.6/ant-1.9.6.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant/1.9.6/ant-1.9.6-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant/1.9.6/ant-1.9.6-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__org_apache_ant_ant_launcher_1_9_6.xml b/SSM--Demo/.idea/libraries/Maven__org_apache_ant_ant_launcher_1_9_6.xml
deleted file mode 100644
index 4a5c8b2..0000000
--- a/SSM--Demo/.idea/libraries/Maven__org_apache_ant_ant_launcher_1_9_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.ant:ant-launcher:1.9.6">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant-launcher/1.9.6/ant-launcher-1.9.6.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant-launcher/1.9.6/ant-launcher-1.9.6-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant-launcher/1.9.6/ant-launcher-1.9.6-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml b/SSM--Demo/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml
deleted file mode 100644
index 78cfcd3..0000000
--- a/SSM--Demo/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.commons:commons-lang3:3.4">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__org_aspectj_aspectjrt_1_8_6.xml b/SSM--Demo/.idea/libraries/Maven__org_aspectj_aspectjrt_1_8_6.xml
deleted file mode 100644
index c62d9a0..0000000
--- a/SSM--Demo/.idea/libraries/Maven__org_aspectj_aspectjrt_1_8_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.aspectj:aspectjrt:1.8.6">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjrt/1.8.6/aspectjrt-1.8.6.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjrt/1.8.6/aspectjrt-1.8.6-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjrt/1.8.6/aspectjrt-1.8.6-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_6.xml b/SSM--Demo/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_6.xml
deleted file mode 100644
index 61938e1..0000000
--- a/SSM--Demo/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.aspectj:aspectjweaver:1.8.6">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjweaver/1.8.6/aspectjweaver-1.8.6.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjweaver/1.8.6/aspectjweaver-1.8.6-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjweaver/1.8.6/aspectjweaver-1.8.6-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_2_4_Final.xml b/SSM--Demo/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_2_4_Final.xml
deleted file mode 100644
index 6c5e17f..0000000
--- a/SSM--Demo/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_2_4_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.hibernate:hibernate-validator:5.2.4.Final">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-validator/5.2.4.Final/hibernate-validator-5.2.4.Final.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-validator/5.2.4.Final/hibernate-validator-5.2.4.Final-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-validator/5.2.4.Final/hibernate-validator-5.2.4.Final-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_2_1_Final.xml b/SSM--Demo/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_2_1_Final.xml
deleted file mode 100644
index ce63724..0000000
--- a/SSM--Demo/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_2_1_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.jboss.logging:jboss-logging:3.2.1.Final">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.2.1.Final/jboss-logging-3.2.1.Final.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.2.1.Final/jboss-logging-3.2.1.Final-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.2.1.Final/jboss-logging-3.2.1.Final-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__org_logback_extensions_logback_ext_spring_0_1_4.xml b/SSM--Demo/.idea/libraries/Maven__org_logback_extensions_logback_ext_spring_0_1_4.xml
deleted file mode 100644
index a3b7eff..0000000
--- a/SSM--Demo/.idea/libraries/Maven__org_logback_extensions_logback_ext_spring_0_1_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.logback-extensions:logback-ext-spring:0.1.4">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/logback-extensions/logback-ext-spring/0.1.4/logback-ext-spring-0.1.4.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/logback-extensions/logback-ext-spring/0.1.4/logback-ext-spring-0.1.4-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/logback-extensions/logback-ext-spring/0.1.4/logback-ext-spring-0.1.4-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__org_mybatis_mybatis_3_4_1.xml b/SSM--Demo/.idea/libraries/Maven__org_mybatis_mybatis_3_4_1.xml
deleted file mode 100644
index 19d1175..0000000
--- a/SSM--Demo/.idea/libraries/Maven__org_mybatis_mybatis_3_4_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.mybatis:mybatis:3.4.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.4.1/mybatis-3.4.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.4.1/mybatis-3.4.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.4.1/mybatis-3.4.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__org_mybatis_mybatis_ehcache_1_0_0.xml b/SSM--Demo/.idea/libraries/Maven__org_mybatis_mybatis_ehcache_1_0_0.xml
deleted file mode 100644
index 87a1f58..0000000
--- a/SSM--Demo/.idea/libraries/Maven__org_mybatis_mybatis_ehcache_1_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.mybatis:mybatis-ehcache:1.0.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-ehcache/1.0.0/mybatis-ehcache-1.0.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-ehcache/1.0.0/mybatis-ehcache-1.0.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-ehcache/1.0.0/mybatis-ehcache-1.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_0.xml b/SSM--Demo/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_0.xml
deleted file mode 100644
index bd108d5..0000000
--- a/SSM--Demo/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.mybatis:mybatis-spring:1.3.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/1.3.0/mybatis-spring-1.3.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/1.3.0/mybatis-spring-1.3.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/1.3.0/mybatis-spring-1.3.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml b/SSM--Demo/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml
deleted file mode 100644
index 0bf8cf2..0000000
--- a/SSM--Demo/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.ow2.asm:asm:5.0.4">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/5.0.4/asm-5.0.4-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/5.0.4/asm-5.0.4-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_12.xml b/SSM--Demo/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_12.xml
deleted file mode 100644
index 5aeb229..0000000
--- a/SSM--Demo/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_12.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.slf4j:jcl-over-slf4j:1.7.12">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jcl-over-slf4j/1.7.12/jcl-over-slf4j-1.7.12.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jcl-over-slf4j/1.7.12/jcl-over-slf4j-1.7.12-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jcl-over-slf4j/1.7.12/jcl-over-slf4j-1.7.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_21.xml b/SSM--Demo/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_21.xml
deleted file mode 100644
index 1b644dd..0000000
--- a/SSM--Demo/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_21.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.slf4j:slf4j-api:1.7.21">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.21/slf4j-api-1.7.21.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.21/slf4j-api-1.7.21-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.21/slf4j-api-1.7.21-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__org_springframework_spring_aop_4_3_2_RELEASE.xml b/SSM--Demo/.idea/libraries/Maven__org_springframework_spring_aop_4_3_2_RELEASE.xml
deleted file mode 100644
index 4508a6b..0000000
--- a/SSM--Demo/.idea/libraries/Maven__org_springframework_spring_aop_4_3_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-aop:4.3.2.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.3.2.RELEASE/spring-aop-4.3.2.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.3.2.RELEASE/spring-aop-4.3.2.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.3.2.RELEASE/spring-aop-4.3.2.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__org_springframework_spring_beans_4_3_2_RELEASE.xml b/SSM--Demo/.idea/libraries/Maven__org_springframework_spring_beans_4_3_2_RELEASE.xml
deleted file mode 100644
index d650bb8..0000000
--- a/SSM--Demo/.idea/libraries/Maven__org_springframework_spring_beans_4_3_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-beans:4.3.2.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/4.3.2.RELEASE/spring-beans-4.3.2.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/4.3.2.RELEASE/spring-beans-4.3.2.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/4.3.2.RELEASE/spring-beans-4.3.2.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__org_springframework_spring_context_4_3_2_RELEASE.xml b/SSM--Demo/.idea/libraries/Maven__org_springframework_spring_context_4_3_2_RELEASE.xml
deleted file mode 100644
index b497541..0000000
--- a/SSM--Demo/.idea/libraries/Maven__org_springframework_spring_context_4_3_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-context:4.3.2.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/4.3.2.RELEASE/spring-context-4.3.2.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/4.3.2.RELEASE/spring-context-4.3.2.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/4.3.2.RELEASE/spring-context-4.3.2.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__org_springframework_spring_context_support_4_3_2_RELEASE.xml b/SSM--Demo/.idea/libraries/Maven__org_springframework_spring_context_support_4_3_2_RELEASE.xml
deleted file mode 100644
index 0cc3aa4..0000000
--- a/SSM--Demo/.idea/libraries/Maven__org_springframework_spring_context_support_4_3_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-context-support:4.3.2.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/4.3.2.RELEASE/spring-context-support-4.3.2.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/4.3.2.RELEASE/spring-context-support-4.3.2.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/4.3.2.RELEASE/spring-context-support-4.3.2.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__org_springframework_spring_core_4_3_2_RELEASE.xml b/SSM--Demo/.idea/libraries/Maven__org_springframework_spring_core_4_3_2_RELEASE.xml
deleted file mode 100644
index aca549b..0000000
--- a/SSM--Demo/.idea/libraries/Maven__org_springframework_spring_core_4_3_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-core:4.3.2.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.3.2.RELEASE/spring-core-4.3.2.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.3.2.RELEASE/spring-core-4.3.2.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.3.2.RELEASE/spring-core-4.3.2.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__org_springframework_spring_expression_4_3_2_RELEASE.xml b/SSM--Demo/.idea/libraries/Maven__org_springframework_spring_expression_4_3_2_RELEASE.xml
deleted file mode 100644
index e802cd8..0000000
--- a/SSM--Demo/.idea/libraries/Maven__org_springframework_spring_expression_4_3_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-expression:4.3.2.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/4.3.2.RELEASE/spring-expression-4.3.2.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/4.3.2.RELEASE/spring-expression-4.3.2.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/4.3.2.RELEASE/spring-expression-4.3.2.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_2_RELEASE.xml b/SSM--Demo/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_2_RELEASE.xml
deleted file mode 100644
index 7b6a300..0000000
--- a/SSM--Demo/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-jdbc:4.3.2.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/4.3.2.RELEASE/spring-jdbc-4.3.2.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/4.3.2.RELEASE/spring-jdbc-4.3.2.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/4.3.2.RELEASE/spring-jdbc-4.3.2.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__org_springframework_spring_test_4_3_2_RELEASE.xml b/SSM--Demo/.idea/libraries/Maven__org_springframework_spring_test_4_3_2_RELEASE.xml
deleted file mode 100644
index 144d742..0000000
--- a/SSM--Demo/.idea/libraries/Maven__org_springframework_spring_test_4_3_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-test:4.3.2.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/4.3.2.RELEASE/spring-test-4.3.2.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/4.3.2.RELEASE/spring-test-4.3.2.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/4.3.2.RELEASE/spring-test-4.3.2.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__org_springframework_spring_tx_4_3_2_RELEASE.xml b/SSM--Demo/.idea/libraries/Maven__org_springframework_spring_tx_4_3_2_RELEASE.xml
deleted file mode 100644
index 0254b40..0000000
--- a/SSM--Demo/.idea/libraries/Maven__org_springframework_spring_tx_4_3_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-tx:4.3.2.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.3.2.RELEASE/spring-tx-4.3.2.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.3.2.RELEASE/spring-tx-4.3.2.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.3.2.RELEASE/spring-tx-4.3.2.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__org_springframework_spring_web_4_3_2_RELEASE.xml b/SSM--Demo/.idea/libraries/Maven__org_springframework_spring_web_4_3_2_RELEASE.xml
deleted file mode 100644
index 2b7b1d4..0000000
--- a/SSM--Demo/.idea/libraries/Maven__org_springframework_spring_web_4_3_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-web:4.3.2.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.3.2.RELEASE/spring-web-4.3.2.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.3.2.RELEASE/spring-web-4.3.2.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.3.2.RELEASE/spring-web-4.3.2.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/libraries/Maven__org_springframework_spring_webmvc_4_3_2_RELEASE.xml b/SSM--Demo/.idea/libraries/Maven__org_springframework_spring_webmvc_4_3_2_RELEASE.xml
deleted file mode 100644
index e4b70bb..0000000
--- a/SSM--Demo/.idea/libraries/Maven__org_springframework_spring_webmvc_4_3_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-webmvc:4.3.2.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/4.3.2.RELEASE/spring-webmvc-4.3.2.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/4.3.2.RELEASE/spring-webmvc-4.3.2.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/4.3.2.RELEASE/spring-webmvc-4.3.2.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/misc.xml b/SSM--Demo/.idea/misc.xml
deleted file mode 100644
index adfbe50..0000000
--- a/SSM--Demo/.idea/misc.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
-  <component name="FrameworkDetectionExcludesConfiguration">
-    <file type="web" url="file://$PROJECT_DIR$" />
-  </component>
-  <component name="MavenProjectsManager">
-    <option name="originalFiles">
-      <list>
-        <option value="$PROJECT_DIR$/pom.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8 " project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/modules.xml b/SSM--Demo/.idea/modules.xml
deleted file mode 100644
index 95a223d..0000000
--- a/SSM--Demo/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/Freemarker.iml" filepath="$PROJECT_DIR$/Freemarker.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/uiDesigner.xml b/SSM--Demo/.idea/uiDesigner.xml
deleted file mode 100644
index e96534f..0000000
--- a/SSM--Demo/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
\ No newline at end of file
diff --git a/SSM--Demo/.idea/workspace.xml b/SSM--Demo/.idea/workspace.xml
deleted file mode 100644
index 5b340d1..0000000
--- a/SSM--Demo/.idea/workspace.xml
+++ /dev/null
@@ -1,1314 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="2f67be18-2176-4d5b-8409-7d5c1bef6de6" name="Default" comment="" />
-    <ignored path="Freemarker.iws" />
-    <ignored path=".idea/workspace.xml" />
-    <ignored path="$PROJECT_DIR$/out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="TRACKING_ENABLED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_TABLE_DETAILS" value="true" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-  </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
-  <component name="FavoritesManager">
-    <favorites_list name="Freemarker" />
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pom.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="4444">
-              <caret line="202" column="34" selection-start-line="202" selection-start-column="34" selection-end-line="202" selection-end-column="34" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="web.xml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="132">
-              <caret line="32" column="3" selection-start-line="32" selection-start-column="3" selection-end-line="32" selection-end-column="3" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="logback.xml" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/logback.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="13" column="0" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="GradleLocalSettings">
-    <option name="externalProjectsViewState">
-      <projects_view />
-    </option>
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$APPLICATION_CONFIG_DIR$/consoles/db/1ee50aad-b262-4703-aa4d-c5e8da099e79/console.sql" />
-        <option value="$APPLICATION_CONFIG_DIR$/consoles/db/7c49da35-2907-409b-947b-220b9e548c32/console.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/mybatis/mapper/userMapper.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/log4j.properties" />
-        <option value="$PROJECT_DIR$/src/main/resources/logback.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/dispatcher-servlet.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/db.properties" />
-        <option value="$PROJECT_DIR$/src/main/resources/mybatis/sqlmapconfig.xml" />
-        <option value="$PROJECT_DIR$/pom.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/ehcache.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/service/impl/serviceTest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/controller/CacheTest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/service/impl/CacheTestService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/service/CacheTestService.java" />
-        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/develop/maven/apache-maven-3.3.9" />
-        <option name="userSettingsFile" value="D:\develop\maven\apache-maven-3.3.9\conf\settings.xml" />
-      </MavenGeneralSettings>
-    </option>
-    <option name="importingSettings">
-      <MavenImportingSettings>
-        <option name="importAutomatically" value="true" />
-      </MavenImportingSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="" />
-          <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$RootNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="mrdear Maven Webapp" />
-          <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$ProjectNode" />
-        </PATH_ELEMENT>
-      </PATH>
-    </treeState>
-  </component>
-  <component name="MavenRunner">
-    <option name="jreName" value="1.8 " />
-    <option name="vmOptions" value="-DarchetypeCatalog=internal" />
-  </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-9" />
-    <option name="y" value="-9" />
-    <option name="width" value="1860" />
-    <option name="height" value="1092" />
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectView">
-    <navigator currentView="ProjectPane" proportions="" version="1">
-      <flattenPackages />
-      <showMembers />
-      <showModules />
-      <showLibraryContents />
-      <hideEmptyPackages />
-      <abbreviatePackageNames />
-      <autoscrollToSource />
-      <autoscrollFromSource />
-      <sortByType />
-      <manualOrder />
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="Scratches" />
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="SSM--Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="SSM--Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="SSM--Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="SSM--Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="SSM--Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="SSM--Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="SSM--Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="webapp" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="SSM--Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="SSM--Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="resources" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="SSM--Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="SSM--Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="settings.editor.selected.configurable" value="reference.settings.project.maven.runner" />
-    <property name="settings.editor.splitter.proportion" value="0.2" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="project.structure.last.edited" value="Modules" />
-    <property name="project.structure.proportion" value="0.0" />
-    <property name="project.structure.side.proportion" value="0.2" />
-    <property name="com.intellij.database.dataSource.DataSourceTemplate" value="MySQL" />
-    <property name="js-jscs-nodeInterpreter" value="C:\Program Files\nodejs\node.exe" />
-  </component>
-  <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="F:\Git\JavaWEB\SSM--Demo\src\main\resources" />
-      <recent name="F:\workspace\Freemarker\src\main\resources" />
-      <recent name="F:\workspace\Freemarker\src\main\resources\spring" />
-      <recent name="F:\workspace\Freemarker\src\main\webapp\WEB-INF" />
-    </key>
-  </component>
-  <component name="RunManager" selected="Tomcat Server.Freemarker">
-    <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false">
-      <deployment />
-      <server-settings />
-      <predefined_log_file id="Tomcat" enabled="true" />
-      <predefined_log_file id="Tomcat Catalina" enabled="true" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <method />
-    </configuration>
-    <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
-      <module name="" />
-      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
-      <option name="PROGRAM_PARAMETERS" />
-      <method />
-    </configuration>
-    <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
-      <module name="" />
-      <option name="DEPLOY" value="true" />
-      <option name="ARTIFACT_NAME" value="" />
-      <option name="PM_INSTALL_OPTIONS" value="" />
-      <option name="ACTIVITY_EXTRA_FLAGS" value="" />
-      <option name="MODE" value="default_activity" />
-      <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-      <option name="PREFERRED_AVD" value="" />
-      <option name="CLEAR_LOGCAT" value="false" />
-      <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
-      <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
-      <option name="FORCE_STOP_RUNNING_APP" value="true" />
-      <option name="DEBUGGER_TYPE" value="Java" />
-      <option name="USE_LAST_SELECTED_DEVICE" value="false" />
-      <option name="PREFERRED_AVD" value="" />
-      <Java />
-      <Profilers>
-        <option name="GAPID_DISABLE_PCS" value="false" />
-      </Profilers>
-      <option name="DEEP_LINK" value="" />
-      <option name="ACTIVITY_CLASS" value="" />
-      <method>
-        <option name="Make" enabled="true" />
-        <option name="Android.Gradle.BeforeRunTask" enabled="true" />
-      </method>
-    </configuration>
-    <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
-      <module name="" />
-      <option name="TESTING_TYPE" value="0" />
-      <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
-      <option name="METHOD_NAME" value="" />
-      <option name="CLASS_NAME" value="" />
-      <option name="PACKAGE_NAME" value="" />
-      <option name="EXTRA_OPTIONS" value="" />
-      <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-      <option name="PREFERRED_AVD" value="" />
-      <option name="CLEAR_LOGCAT" value="false" />
-      <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
-      <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
-      <option name="FORCE_STOP_RUNNING_APP" value="true" />
-      <option name="DEBUGGER_TYPE" value="Java" />
-      <option name="USE_LAST_SELECTED_DEVICE" value="false" />
-      <option name="PREFERRED_AVD" value="" />
-      <Java />
-      <Profilers>
-        <option name="GAPID_DISABLE_PCS" value="false" />
-      </Profilers>
-      <method>
-        <option name="Make" enabled="true" />
-        <option name="Android.Gradle.BeforeRunTask" enabled="true" />
-      </method>
-    </configuration>
-    <configuration default="true" type="Applet" factoryName="Applet">
-      <option name="HTML_USED" value="false" />
-      <option name="WIDTH" value="400" />
-      <option name="HEIGHT" value="300" />
-      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
-      <module />
-      <method />
-    </configuration>
-    <configuration default="true" type="Application" factoryName="Application">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="ArquillianJUnit" factoryName="">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="arquillianRunConfiguration">
-        <value>
-          <option name="containerStateName" value="" />
-        </value>
-      </option>
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="true" type="ArquillianTestNG" factoryName="">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="arquillianRunConfiguration">
-        <value>
-          <option name="containerStateName" value="" />
-        </value>
-      </option>
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="ANNOTATION_TYPE" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
-      <envs />
-      <properties />
-      <listeners />
-      <method />
-    </configuration>
-    <configuration default="true" type="Cold Fusion runner description" factoryName="Cold Fusion" custom_browser="" web_path="">
-      <method />
-    </configuration>
-    <configuration default="true" type="CucumberJavaRunConfigurationType" factoryName="Cucumber java">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="myFilePath" />
-      <option name="GLUE" />
-      <option name="myNameFilter" />
-      <option name="myGeneratedName" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="FlashRunConfigurationType" factoryName="Flash App">
-      <option name="BCName" value="" />
-      <option name="IOSSimulatorSdkPath" value="" />
-      <option name="adlOptions" value="" />
-      <option name="airProgramParameters" value="" />
-      <option name="appDescriptorForEmulator" value="Android" />
-      <option name="debugTransport" value="USB" />
-      <option name="debuggerSdkRaw" value="BC SDK" />
-      <option name="emulator" value="NexusOne" />
-      <option name="emulatorAdlOptions" value="" />
-      <option name="fastPackaging" value="true" />
-      <option name="fullScreenHeight" value="0" />
-      <option name="fullScreenWidth" value="0" />
-      <option name="launchUrl" value="false" />
-      <option name="launcherParameters">
-        <LauncherParameters>
-          <option name="browser" value="a7bb68e0-33c0-4d6f-a81a-aac1fdb870c8" />
-          <option name="launcherType" value="OSDefault" />
-          <option name="newPlayerInstance" value="false" />
-          <option name="playerPath" value="FlashPlayerDebugger.exe" />
-        </LauncherParameters>
-      </option>
-      <option name="mobileRunTarget" value="Emulator" />
-      <option name="moduleName" value="" />
-      <option name="overriddenMainClass" value="" />
-      <option name="overriddenOutputFileName" value="" />
-      <option name="overrideMainClass" value="false" />
-      <option name="runTrusted" value="true" />
-      <option name="screenDpi" value="0" />
-      <option name="screenHeight" value="0" />
-      <option name="screenWidth" value="0" />
-      <option name="url" value="http://" />
-      <option name="usbDebugPort" value="7936" />
-      <method />
-    </configuration>
-    <configuration default="true" type="FlexUnitRunConfigurationType" factoryName="FlexUnit" appDescriptorForEmulator="Android" class_name="" emulatorAdlOptions="" method_name="" package_name="" scope="Class">
-      <option name="BCName" value="" />
-      <option name="launcherParameters">
-        <LauncherParameters>
-          <option name="browser" value="a7bb68e0-33c0-4d6f-a81a-aac1fdb870c8" />
-          <option name="launcherType" value="OSDefault" />
-          <option name="newPlayerInstance" value="false" />
-          <option name="playerPath" value="FlashPlayerDebugger.exe" />
-        </LauncherParameters>
-      </option>
-      <option name="moduleName" value="" />
-      <option name="trusted" value="true" />
-      <method />
-    </configuration>
-    <configuration default="true" type="GradleRunConfiguration" factoryName="Gradle">
-      <ExternalSystemSettings>
-        <option name="executionName" />
-        <option name="externalProjectPath" />
-        <option name="externalSystemIdString" value="GRADLE" />
-        <option name="scriptParameters" />
-        <option name="taskDescriptions">
-          <list />
-        </option>
-        <option name="taskNames">
-          <list />
-        </option>
-        <option name="vmOptions" />
-      </ExternalSystemSettings>
-      <method />
-    </configuration>
-    <configuration default="true" type="GrailsRunConfigurationType" factoryName="Grails">
-      <setting name="vmparams" value="" />
-      <setting name="cmdLine" value="run-app" />
-      <setting name="passParentEnv" value="true" />
-      <setting name="launchBrowser" value="true" />
-      <setting name="depsClasspath" value="false" />
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <method />
-    </configuration>
-    <configuration default="true" type="JUnit" factoryName="JUnit">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="true" type="JUnitTestDiscovery" factoryName="JUnit Test Discovery" changeList="All">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="true" type="JarApplication" factoryName="JAR Application">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="Java Scratch" factoryName="Java Scratch">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="SCRATCH_FILE_ID" value="0" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
-      <method />
-    </configuration>
-    <configuration default="true" type="JetRunConfigurationType" factoryName="Kotlin">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="Freemarker" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="KotlinStandaloneScriptRunConfigurationType" factoryName="Kotlin script">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="filePath" />
-      <option name="vmParameters" />
-      <option name="alternativeJrePath" />
-      <option name="programParameters" />
-      <option name="passParentEnvs" value="true" />
-      <option name="workingDirectory" />
-      <option name="isAlternativeJrePathEnabled" value="false" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="MavenRunConfiguration" factoryName="Maven">
-      <MavenSettings>
-        <option name="myGeneralSettings" />
-        <option name="myRunnerSettings" />
-        <option name="myRunnerParameters">
-          <MavenRunnerParameters>
-            <option name="profiles">
-              <set />
-            </option>
-            <option name="goals">
-              <list />
-            </option>
-            <option name="profilesMap">
-              <map />
-            </option>
-            <option name="resolveToWorkspace" value="false" />
-            <option name="workingDirPath" value="" />
-          </MavenRunnerParameters>
-        </option>
-      </MavenSettings>
-      <method />
-    </configuration>
-    <configuration default="true" type="Remote" factoryName="Remote">
-      <option name="USE_SOCKET_TRANSPORT" value="true" />
-      <option name="SERVER_MODE" value="false" />
-      <option name="SHMEM_ADDRESS" value="javadebug" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="5005" />
-      <method />
-    </configuration>
-    <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="TestNG" factoryName="TestNG">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="ANNOTATION_TYPE" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
-      <envs />
-      <properties />
-      <listeners />
-      <method />
-    </configuration>
-    <configuration default="true" type="TestNGTestDiscovery" factoryName="TestNG Test Discovery" changeList="All">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="ANNOTATION_TYPE" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
-      <envs />
-      <properties />
-      <listeners />
-      <method />
-    </configuration>
-    <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
-      <node-interpreter>project</node-interpreter>
-      <node-options />
-      <gulpfile />
-      <tasks />
-      <arguments />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="js.build_tools.npm" factoryName="npm">
-      <command value="run-script" />
-      <scripts />
-      <node-interpreter value="project" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="osgi.bnd.run" factoryName="Run Launcher">
-      <method />
-    </configuration>
-    <configuration default="true" type="osgi.bnd.run" factoryName="Test Launcher (JUnit)">
-      <method />
-    </configuration>
-    <configuration default="false" name="Freemarker" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.0.30" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="OPEN_IN_BROWSER" value="false" />
-      <option name="UPDATING_POLICY" value="restart-server" />
-      <deployment>
-        <artifact name="Freemarker:war exploded">
-          <settings>
-            <option name="CONTEXT_PATH" value="/" />
-          </settings>
-        </artifact>
-      </deployment>
-      <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_Freemarker" />
-      </server-settings>
-      <predefined_log_file id="Tomcat" enabled="true" />
-      <predefined_log_file id="Tomcat Catalina" enabled="true" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="58127" />
-      </RunnerSettings>
-      <RunnerSettings RunnerId="JRebel Debug">
-        <option name="DEBUG_PORT" value="58128" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="JRebel Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="JRebel Executor">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method>
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="Freemarker:war exploded" />
-        </option>
-      </method>
-    </configuration>
-    <list size="1">
-      <item index="0" class="java.lang.String" itemvalue="Tomcat Server.Freemarker" />
-    </list>
-  </component>
-  <component name="ShelveChangesManager" show_recycled="false">
-    <option name="remove_strategy" value="false" />
-  </component>
-  <component name="SvnConfiguration">
-    <configuration>C:\Users\牛李\AppData\Roaming\Subversion</configuration>
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="2f67be18-2176-4d5b-8409-7d5c1bef6de6" name="Default" comment="" />
-      <created>1469149044008</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1469149044008</updated>
-      <workItem from="1469149045361" duration="3027000" />
-      <workItem from="1469978313180" duration="34000" />
-      <workItem from="1474555415378" duration="2000" />
-      <workItem from="1474555494956" duration="5263000" />
-      <workItem from="1474592656686" duration="1911000" />
-      <workItem from="1474610460080" duration="34000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="10271000" />
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="-9" y="-9" width="1860" height="1092" extended-state="0" />
-    <editor active="true" />
-    <layout>
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32937366" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20022371" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="JRebel Executor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33034715" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33440515" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32583067" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="JRebel remote servers log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32997763" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
-      <window_info id="JRebel" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="SVN Properties" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3290461" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32903227" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Database Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3509719" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-    </layout>
-  </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <option name="time" value="4" />
-    </breakpoint-manager>
-    <watches-manager />
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4444">
-          <caret line="202" column="34" selection-start-line="202" selection-start-column="34" selection-end-line="202" selection-end-column="34" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4444">
-          <caret line="202" column="34" selection-start-line="202" selection-start-column="34" selection-end-line="202" selection-end-column="34" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/db.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="66">
-          <caret line="3" column="21" selection-start-line="3" selection-start-column="21" selection-end-line="3" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/controller/CacheTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/sqlmapconfig.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="7" column="53" selection-start-line="7" selection-start-column="53" selection-end-line="7" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="946">
-          <caret line="43" column="17" selection-start-line="43" selection-start-column="17" selection-end-line="43" selection-end-column="17" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/4.3.2.RELEASE/spring-beans-4.3.2.RELEASE.jar!/org/springframework/beans/factory/xml/spring-beans-4.3.xsd">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="14036">
-          <caret line="638" column="4" selection-start-line="638" selection-start-column="4" selection-end-line="638" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/4.3.2.RELEASE/spring-context-support-4.3.2.RELEASE-sources.jar!/org/springframework/cache/ehcache/EhCacheManagerFactoryBean.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="638">
-          <caret line="53" column="13" selection-start-line="53" selection-start-column="13" selection-end-line="53" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/4.3.2.RELEASE/spring-context-support-4.3.2.RELEASE-sources.jar!/org/springframework/cache/ehcache/EhCacheFactoryBean.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1804">
-          <caret line="118" column="16" selection-start-line="118" selection-start-column="16" selection-end-line="118" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/ehcache.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="17" column="38" selection-start-line="17" selection-start-column="38" selection-end-line="17" selection-end-column="38" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear.java" />
-    <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/7c49da35-2907-409b-947b-220b9e548c32/console.sql">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="19" selection-start-line="0" selection-start-column="19" selection-end-line="0" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/1ee50aad-b262-4703-aa4d-c5e8da099e79/console.sql">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/index.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/mapper/userMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/doc/readme.md" />
-    <entry file="file://$PROJECT_DIR$/src/main/resources/log4j.properties" />
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/4.3.2.RELEASE/spring-context-support-4.3.2.RELEASE.jar!/org/springframework/cache/ehcache/EhCacheFactoryBean.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="132">
-          <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/net/sf/ehcache/ehcache-core/2.6.11/ehcache-core-2.6.11.jar!/net/sf/ehcache/CacheManager.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="520">
-          <caret line="629" column="41" selection-start-line="629" selection-start-column="41" selection-end-line="629" selection-end-column="41" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.3.2.RELEASE/spring-tx-4.3.2.RELEASE.jar!/org/springframework/transaction/config/spring-tx-4.3.xsd">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="344">
-          <caret line="179" column="107" selection-start-line="179" selection-start-column="107" selection-end-line="179" selection-end-column="107" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/service.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/service/imp.java" />
-    <entry file="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.16/fastjson-1.2.16-sources.jar!/com/alibaba/fastjson/parser/ParserConfig.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="289">
-          <caret line="131" column="60" selection-start-line="131" selection-start-column="60" selection-end-line="131" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.16/fastjson-1.2.16-sources.jar!/com/alibaba/fastjson/support/config/FastJsonConfig.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="289">
-          <caret line="41" column="19" selection-start-line="41" selection-start-column="19" selection-end-line="41" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/cache/1.txt" />
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/4.3.2.RELEASE/spring-context-support-4.3.2.RELEASE-sources.jar!/org/springframework/cache/ehcache/EhCacheCacheManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="35" column="13" selection-start-line="35" selection-start-column="13" selection-end-line="35" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/dispatcher-servlet.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-14">
-          <caret line="37" column="0" selection-start-line="37" selection-start-column="0" selection-end-line="37" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/4.3.2.RELEASE/spring-context-support-4.3.2.RELEASE-sources.jar!/org/springframework/cache/ehcache/EhCacheFactoryBean.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1804">
-          <caret line="118" column="16" selection-start-line="118" selection-start-column="16" selection-end-line="118" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/4.3.2.RELEASE/spring-context-support-4.3.2.RELEASE-sources.jar!/org/springframework/cache/ehcache/EhCacheManagerFactoryBean.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="638">
-          <caret line="53" column="13" selection-start-line="53" selection-start-column="13" selection-end-line="53" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/4.3.2.RELEASE/spring-beans-4.3.2.RELEASE.jar!/org/springframework/beans/factory/xml/spring-beans-4.3.xsd">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="638" column="4" selection-start-line="638" selection-start-column="4" selection-end-line="638" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/db.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="66">
-          <caret line="3" column="21" selection-start-line="3" selection-start-column="21" selection-end-line="3" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/controller/CacheTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="550">
-          <caret line="25" column="44" selection-start-line="25" selection-start-column="44" selection-end-line="25" selection-end-column="44" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/service/CacheTestService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="19" column="16" selection-start-line="19" selection-start-column="16" selection-end-line="19" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/sqlmapconfig.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="594">
-          <caret line="27" column="68" selection-start-line="27" selection-start-column="68" selection-end-line="27" selection-end-column="68" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4444">
-          <caret line="202" column="34" selection-start-line="202" selection-start-column="34" selection-end-line="202" selection-end-column="34" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="366">
-          <caret line="82" column="21" selection-start-line="82" selection-start-column="21" selection-end-line="82" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/ehcache.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="17" column="38" selection-start-line="17" selection-start-column="38" selection-end-line="17" selection-end-column="38" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="132">
-          <caret line="32" column="3" selection-start-line="32" selection-start-column="3" selection-end-line="32" selection-end-column="3" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/logback.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="13" column="0" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>Freemarker:war</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Web</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Freemarker</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-                <option value="0.6" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectJDKs.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: junit:junit:3.8.1</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/SSM--Demo/Freemarker.iml b/SSM--Demo/Freemarker.iml
deleted file mode 100644
index bff1f9b..0000000
--- a/SSM--Demo/Freemarker.iml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="web" name="Web">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
-        </webroots>
-        <sourceRoots>
-          <root url="file://$MODULE_DIR$/src/main/java" />
-          <root url="file://$MODULE_DIR$/src/main/resources" />
-        </sourceRoots>
-      </configuration>
-    </facet>
-    <facet type="Spring" name="Spring">
-      <configuration>
-        <fileset id="fileset" name="Spring Application Context" removed="false">
-          <file>file://$MODULE_DIR$/src/main/resources/spring/dispatcher-servlet.xml</file>
-          <file>file://$MODULE_DIR$/src/main/resources/spring/applicationContext.xml</file>
-        </fileset>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: cglib:cglib:3.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.ant:ant:1.9.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.ant:ant-launcher:1.9.6" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.6" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.6" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.1" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:4.1.6" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:0.9.5" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-ehcache:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-web:2.0.4" level="project" />
-    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.39" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid:1.0.25" level="project" />
-    <orderEntry type="module-library">
-      <library name="Maven: com.alibaba:jconsole:1.8.0">
-        <CLASSES>
-          <root url="jar://C:/Program Files/Java/jdk1.8.0_77/jre/../lib/jconsole.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Maven: com.alibaba:tools:1.8.0">
-        <CLASSES>
-          <root url="jar://C:/Program Files/Java/jdk1.8.0_77/jre/../lib/tools.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.16" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.2.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
-    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
-    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
-    <orderEntry type="library" name="Maven: org.logback-extensions:logback-ext-spring:0.1.4" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.12" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/SSM--Demo/src/main/java/cn/mrdear/controller/CacheTest.java b/SSM--Demo/src/main/java/cn/mrdear/controller/CacheTest.java
deleted file mode 100644
index eb30881..0000000
--- a/SSM--Demo/src/main/java/cn/mrdear/controller/CacheTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package cn.mrdear.controller;
-
-import com.alibaba.fastjson.JSONObject;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-import cn.mrdear.service.CacheTestService;
-
-/**
- * @author Niu Li
- * @date 2016/9/22
- */
-@RestController
-public class CacheTest {
-    @Resource
-    private CacheTestService CacheTestService;
-
-    @RequestMapping(value = "/test")
-    public JSONObject test(int id){
-        JSONObject object = CacheTestService.getjson(id);
-        JSONObject object1 = CacheTestService.getjson(id);
-        System.out.println(object == object1);
-        return CacheTestService.getjson(id);
-    }
-}
diff --git a/SSM--Demo/src/main/java/cn/mrdear/service/CacheTestService.java b/SSM--Demo/src/main/java/cn/mrdear/service/CacheTestService.java
deleted file mode 100644
index bbbf6fd..0000000
--- a/SSM--Demo/src/main/java/cn/mrdear/service/CacheTestService.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package cn.mrdear.service;
-
-import com.alibaba.fastjson.JSONObject;
-
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.stereotype.Service;
-
-/**
- * @author Niu Li
- * @date 2016/9/23
- */
-@Service
-public class CacheTestService {
-
-    @Cacheable(value = "springCache")
-    public JSONObject getjson(int id){
-        JSONObject object = new JSONObject();
-        object.put("hahah","123");
-        object.put("id",id);
-        return object;
-    }
-}
diff --git a/SSM--Demo/src/main/resources/mybatis/mapper/userMapper.xml b/SSM--Demo/src/main/resources/mybatis/mapper/userMapper.xml
deleted file mode 100644
index 9c01206..0000000
--- a/SSM--Demo/src/main/resources/mybatis/mapper/userMapper.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="userMapper">
-    <!--启用二级缓存-->
-    <cache type="org.mybatis.caches.ehcache.EhcacheCache"/>
-
-</mapper>
\ No newline at end of file
diff --git a/SSM--Demo/doc/readme.md b/SSM-Demo/doc/readme.md
similarity index 100%
rename from SSM--Demo/doc/readme.md
rename to SSM-Demo/doc/readme.md
diff --git a/SSM--Demo/pom.xml b/SSM-Demo/pom.xml
similarity index 81%
rename from SSM--Demo/pom.xml
rename to SSM-Demo/pom.xml
index 7cb87c3..cb23e4b 100644
--- a/SSM--Demo/pom.xml
+++ b/SSM-Demo/pom.xml
@@ -2,28 +2,27 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>cn.mrdear</groupId>
-  <artifactId>mrdear</artifactId>
+  <artifactId>SSM-Demo</artifactId>
   <packaging>war</packaging>
   <version>1.0.0</version>
-  <name>mrdear Maven Webapp</name>
+  <name>SSM-Demo</name>
   <url>http://maven.apache.org</url>
+
   <properties>
     <spring.version>4.3.2.RELEASE</spring.version>
     <mybatis.version>3.4.1</mybatis.version>
     <mybatis.spring>1.3.0</mybatis.spring>
     <mybatis.pagehelper>4.1.6</mybatis.pagehelper>
+    <mybatis.mapper>3.3.9</mybatis.mapper>
     <ehcache.version>2.6.11</ehcache.version>
     <ehcache.web>2.0.4</ehcache.web>
     <ehcache.mybatis>1.0.0</ehcache.mybatis>
-    <thymeleaf.version>3.0.1.RELEASE</thymeleaf.version>
-    <shiro.version>1.3.0</shiro.version>
     <hibernate.validator>5.2.4.Final</hibernate.validator>
     <druid.version>1.0.25</druid.version>
     <fastjson.version>1.2.16</fastjson.version>
     <mysql.version>5.1.39</mysql.version>
     <slf4j.version>1.7.21</slf4j.version>
     <logback.version>1.1.7</logback.version>
-    <guava.version>19.0</guava.version>
     <httpclient.version>4.5.2</httpclient.version>
     <commonlang.version>3.4</commonlang.version>
     <commonbean.version>1.9.2</commonbean.version>
@@ -34,27 +33,8 @@
   </properties>
 
     <dependencies>
+
       <!-- springframe start -->
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-core</artifactId>
-        <version>${spring.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-web</artifactId>
-        <version>${spring.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-jdbc</artifactId>
-        <version>${spring.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-tx</artifactId>
-        <version>${spring.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-webmvc</artifactId>
@@ -62,7 +42,7 @@
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
-        <artifactId>spring-aop</artifactId>
+        <artifactId>spring-jdbc</artifactId>
         <version>${spring.version}</version>
       </dependency>
       <dependency>
@@ -75,7 +55,6 @@
         <artifactId>spring-test</artifactId>
         <version>${spring.version}</version>
       </dependency>
-      <!-- springframe end -->
       <!--cglib动态代理-->
       <dependency>
         <groupId>cglib</groupId>
@@ -93,7 +72,6 @@
         <artifactId>aspectjrt</artifactId>
         <version>1.8.6</version>
       </dependency>
-
       <!--mybatis start-->
       <dependency>
         <groupId>org.mybatis</groupId>
@@ -125,35 +103,42 @@
         <artifactId>ehcache-web</artifactId>
         <version>${ehcache.web}</version>
       </dependency>
-      <!--mybatis end-->
+      <!--通用mapper-->
+      <dependency>
+        <groupId>tk.mybatis</groupId>
+        <artifactId>mapper</artifactId>
+        <version>${mybatis.mapper}</version>
+      </dependency>
+      <!--给通用mapper提供注解 start-->
+      <dependency>
+        <groupId>javax.persistence</groupId>
+        <artifactId>persistence-api</artifactId>
+        <version>1.0.2</version>
+      </dependency>
       <!--mysql start-->
       <dependency>
         <groupId>mysql</groupId>
         <artifactId>mysql-connector-java</artifactId>
         <version>${mysql.version}</version>
       </dependency>
-      <!--mysql end-->
       <!--druid -start-->
       <dependency>
         <groupId>com.alibaba</groupId>
         <artifactId>druid</artifactId>
         <version>${druid.version}</version>
       </dependency>
-      <!--druid -end-->
       <!--fastjson start-->
       <dependency>
         <groupId>com.alibaba</groupId>
         <artifactId>fastjson</artifactId>
         <version>${fastjson.version}</version>
       </dependency>
-      <!--fastjson end-->
       <!--hibervate validate start-->
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-validator</artifactId>
         <version>${hibernate.validator}</version>
       </dependency>
-      <!--hibervate validate end-->
       <!--commons start -->
       <dependency>
         <groupId>org.apache.commons</groupId>
@@ -175,7 +160,6 @@
         <artifactId>commons-fileupload</artifactId>
         <version>${commonfile.version}</version>
       </dependency>
-      <!--commons end -->
       <!--log start-->
       <dependency>
         <groupId>org.slf4j</groupId>
@@ -202,12 +186,44 @@
         <artifactId>jcl-over-slf4j</artifactId>
         <version>${slf4j.jcl.version}</version>
       </dependency>
-      <!--log end-->
+      <dependency>
+        <groupId>javax.servlet</groupId>
+        <artifactId>jstl</artifactId>
+        <version>1.2</version>
+        <scope>runtime</scope>
+      </dependency>
+
     </dependencies>
 
   <build>
-    <pluginManagement>
+
+    <finalName>ssm</finalName>
+
       <plugins>
+        <!--通用mapper插件-->
+        <plugin>
+          <groupId>org.mybatis.generator</groupId>
+          <artifactId>mybatis-generator-maven-plugin</artifactId>
+          <version>1.3.2</version>
+          <configuration>
+            <configurationFile>../SSM-Demo/src/main/resources/ModelGenerator.xml</configurationFile>
+            <overwrite>true</overwrite>
+            <verbose>true</verbose>
+          </configuration>
+          <dependencies>
+            <dependency>
+              <groupId>mysql</groupId>
+              <artifactId>mysql-connector-java</artifactId>
+              <version>5.1.39</version>
+            </dependency>
+            <dependency>
+              <groupId>tk.mybatis</groupId>
+              <artifactId>mapper</artifactId>
+              <version>3.3.9</version>
+            </dependency>
+          </dependencies>
+        </plugin>
+        <!--编译插件设为1.8-->
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
@@ -218,6 +234,5 @@
           </configuration>
         </plugin>
       </plugins>
-    </pluginManagement>
   </build>
 </project>
diff --git a/SSM-Demo/src/main/java/cn/mrdear/controller/BookController.java b/SSM-Demo/src/main/java/cn/mrdear/controller/BookController.java
new file mode 100644
index 0000000..e488320
--- /dev/null
+++ b/SSM-Demo/src/main/java/cn/mrdear/controller/BookController.java
@@ -0,0 +1,27 @@
+package cn.mrdear.controller;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import cn.mrdear.entity.Book;
+import cn.mrdear.service.BookService;
+
+/**
+ * @author Niu Li
+ * @since  2016/9/22
+ */
+@RestController
+public class BookController {
+
+    @Resource
+    private BookService bookService;
+
+    @GetMapping("/books")
+    public List<Book> books(){
+        return bookService.findAll();
+    }
+}
diff --git a/SSM-Demo/src/main/java/cn/mrdear/controller/ErrorController.java b/SSM-Demo/src/main/java/cn/mrdear/controller/ErrorController.java
new file mode 100644
index 0000000..449c00d
--- /dev/null
+++ b/SSM-Demo/src/main/java/cn/mrdear/controller/ErrorController.java
@@ -0,0 +1,17 @@
+package cn.mrdear.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+/**
+ * @author Niu Li
+ * @since 2017/4/19
+ */
+@Controller
+public class ErrorController {
+
+  @GetMapping("/error")
+  public String error(){
+    return "error";
+  }
+}
diff --git a/SSM-Demo/src/main/java/cn/mrdear/entity/Book.java b/SSM-Demo/src/main/java/cn/mrdear/entity/Book.java
new file mode 100644
index 0000000..08d5077
--- /dev/null
+++ b/SSM-Demo/src/main/java/cn/mrdear/entity/Book.java
@@ -0,0 +1,82 @@
+package cn.mrdear.entity;
+
+import java.io.Serializable;
+
+import javax.persistence.*;
+
+@Table(name = "book")
+public class Book implements Serializable{
+
+    private static final long serialVersionUID = 4189250872871101725L;
+    /**
+     * 图书ID
+     */
+    @Id
+    @Column(name = "book_id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long bookId;
+
+    /**
+     * 图书名称
+     */
+    private String name;
+
+    /**
+     * 馆藏数量
+     */
+    private Integer number;
+
+    /**
+     * 获取图书ID
+     *
+     * @return book_id - 图书ID
+     */
+    public Long getBookId() {
+        return bookId;
+    }
+
+    /**
+     * 设置图书ID
+     *
+     * @param bookId 图书ID
+     */
+    public void setBookId(Long bookId) {
+        this.bookId = bookId;
+    }
+
+    /**
+     * 获取图书名称
+     *
+     * @return name - 图书名称
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * 设置图书名称
+     *
+     * @param name 图书名称
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * 获取馆藏数量
+     *
+     * @return number - 馆藏数量
+     */
+    public Integer getNumber() {
+        return number;
+    }
+
+    /**
+     * 设置馆藏数量
+     *
+     * @param number 馆藏数量
+     */
+    public void setNumber(Integer number) {
+        this.number = number;
+    }
+}
\ No newline at end of file
diff --git a/SSM-Demo/src/main/java/cn/mrdear/exception/GlobalException.java b/SSM-Demo/src/main/java/cn/mrdear/exception/GlobalException.java
new file mode 100644
index 0000000..bec18d4
--- /dev/null
+++ b/SSM-Demo/src/main/java/cn/mrdear/exception/GlobalException.java
@@ -0,0 +1,78 @@
+package cn.mrdear.exception;
+
+import com.alibaba.fastjson.JSONObject;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 全局异常配置
+ * @author Niu Li
+ * @since 2017/4/19
+ */
+@ControllerAdvice
+public class GlobalException {
+
+  private static Logger logger = LoggerFactory.getLogger(GlobalException.class);
+  /**
+   * 全局异常处理
+   *
+   * @param request  请求
+   * @param response 返回
+   * @param ex       异常
+   */
+  @ExceptionHandler(value = Exception.class)
+  @ResponseStatus(HttpStatus.OK)//错误码可以自己定义
+  @ResponseBody
+  public Object exceptionHandler(HttpServletRequest request, HttpServletResponse response, Exception ex) {
+    logger.error("ExceptionHander catch error: ", ex);
+    //判断是否为ajax请求
+    String xRequested = request.getHeader("x-requested-with");
+    if (StringUtils.equalsIgnoreCase(xRequested,"XMLHttpRequest")){
+      return handlerAjax(ex);
+    }
+
+    //重定向到错误页面,错误页面需要自己定义
+    request.setAttribute("errorMessage",ex.getMessage());
+    redirect("/error", HttpStatus.NOT_FOUND,request,response);
+    return null;
+  }
+
+  /**
+   * 处理ajax异常
+   * @param ex 异常
+   * @return json异常信息
+   */
+  private JSONObject handlerAjax(Exception ex){
+    JSONObject resultVO = new JSONObject();
+    resultVO.put("status",0);
+    resultVO.put("msg",ex.getMessage());
+    return resultVO;
+  }
+
+  /**
+   * 重定向到错误页面
+   * @param url 链接
+   */
+  private void redirect(String url,HttpStatus status,HttpServletRequest request,
+      HttpServletResponse response){
+    try {
+      response.setStatus(status.value());
+      request.getRequestDispatcher(url).forward(request,response);
+    } catch (IOException | ServletException e) {
+      logger.error("redirect fail,e:{}",e);
+    }
+  }
+}
diff --git a/SSM-Demo/src/main/java/cn/mrdear/mapper/BookMapper.java b/SSM-Demo/src/main/java/cn/mrdear/mapper/BookMapper.java
new file mode 100644
index 0000000..35bb73a
--- /dev/null
+++ b/SSM-Demo/src/main/java/cn/mrdear/mapper/BookMapper.java
@@ -0,0 +1,8 @@
+package cn.mrdear.mapper;
+
+import cn.mrdear.entity.Book;
+import tk.mybatis.mapper.common.Mapper;
+
+public interface BookMapper extends Mapper<Book> {
+
+}
\ No newline at end of file
diff --git a/SSM-Demo/src/main/java/cn/mrdear/service/BookService.java b/SSM-Demo/src/main/java/cn/mrdear/service/BookService.java
new file mode 100644
index 0000000..ad31516
--- /dev/null
+++ b/SSM-Demo/src/main/java/cn/mrdear/service/BookService.java
@@ -0,0 +1,19 @@
+package cn.mrdear.service;
+
+import org.springframework.cache.annotation.Cacheable;
+
+import java.util.List;
+
+import cn.mrdear.entity.Book;
+
+/**
+ * @author Niu Li
+ * @date 2016/9/23
+ */
+public interface BookService {
+    /**
+     * 查询所有的books
+     * @return 结果集
+     */
+    List<Book> findAll();
+}
diff --git a/SSM-Demo/src/main/java/cn/mrdear/service/impl/BookServiceImpl.java b/SSM-Demo/src/main/java/cn/mrdear/service/impl/BookServiceImpl.java
new file mode 100644
index 0000000..c2dbca0
--- /dev/null
+++ b/SSM-Demo/src/main/java/cn/mrdear/service/impl/BookServiceImpl.java
@@ -0,0 +1,31 @@
+package cn.mrdear.service.impl;
+
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import cn.mrdear.entity.Book;
+import cn.mrdear.mapper.BookMapper;
+import cn.mrdear.service.BookService;
+
+/**
+ * @author Niu Li
+ * @since  2017/1/23
+ */
+@Service
+public class BookServiceImpl implements BookService {
+
+    @Resource
+    private BookMapper bookMapper;
+
+    @Override
+    @Cacheable(cacheNames = "bookcache")
+    public List<Book> findAll() {
+        List<Book> books = bookMapper.selectAll();
+        System.out.println("测试缓存,如果缓存开启,多次请求则该方法会执行一次");
+        return books;
+    }
+}
diff --git a/SSM-Demo/src/main/resources/ModelGenerator.xml b/SSM-Demo/src/main/resources/ModelGenerator.xml
new file mode 100644
index 0000000..98a4080
--- /dev/null
+++ b/SSM-Demo/src/main/resources/ModelGenerator.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE generatorConfiguration
+        PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
+        "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
+
+<generatorConfiguration>
+
+    <!--指定特定数据库的jdbc驱动jar包的位置-->
+    <classPathEntry location="D:\develop\maven\my_local_repository\mysql\mysql-connector-java\5.1.39\mysql-connector-java-5.1.39.jar"/>
+
+    <context id="default" targetRuntime="MyBatis3">
+
+        <plugin type="tk.mybatis.mapper.generator.MapperPlugin">
+            <property name="mappers" value="tk.mybatis.mapper.common.Mapper"/>
+            <!-- caseSensitive默认false，当数据库表名区分大小写时，可以将该属性设置为true -->
+            <property name="caseSensitive" value="true"/>
+        </plugin>
+
+
+        <jdbcConnection driverClass="com.mysql.jdbc.Driver"
+                        connectionURL="jdbc:mysql://localhost:3306/ssm"
+                        userId="root"
+                        password="7946521">
+        </jdbcConnection>
+
+        <!--只生成Java model-->
+        <javaModelGenerator targetPackage="cn.mrdear.entity" targetProject="F:\Git\JavaWEB\SSM--Demo\src\main\java"/>
+
+        <sqlMapGenerator targetPackage="cn.mrdear.entity"  targetProject="F:\Git\JavaWEB\SSM--Demo\src\main\resources"/>
+
+        <javaClientGenerator targetPackage="cn.mrdear.entity" targetProject="F:\Git\JavaWEB\SSM--Demo\src\main\java" type="XMLMAPPER" />
+
+        <table tableName="%" enableCountByExample="false" enableDeleteByExample="false"
+               enableSelectByExample="false"
+               enableUpdateByExample="false">
+            <generatedKey column="book_id" sqlStatement="Mysql" identity="true" />
+        </table>
+
+    </context>
+</generatorConfiguration>
\ No newline at end of file
diff --git a/SSM-Demo/src/main/resources/db.properties b/SSM-Demo/src/main/resources/db.properties
new file mode 100644
index 0000000..aa18d74
--- /dev/null
+++ b/SSM-Demo/src/main/resources/db.properties
@@ -0,0 +1,23 @@
+jdbc.driver=com.mysql.jdbc.Driver
+jdbc.url=jdbc:mysql://115.159.185.14:3306/ssm?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+jdbc.username=root
+jdbc.password=7946521
+
+filters:stat
+
+maxActive:20
+initialSize:1
+maxWait:60000
+minIdle:10
+
+timeBetweenEvictionRunsMillis:60000
+minEvictableIdleTimeMillis:300000
+
+testWhileIdle:true
+testOnBorrow:false
+testOnReturn:false
+
+maxOpenPreparedStatements:20
+removeAbandoned:true
+removeAbandonedTimeout:1800
+logAbandoned:true
diff --git a/SSM-Demo/src/main/resources/db.sql b/SSM-Demo/src/main/resources/db.sql
new file mode 100644
index 0000000..bdc7459
--- /dev/null
+++ b/SSM-Demo/src/main/resources/db.sql
@@ -0,0 +1,31 @@
+/*
+SQLyog Ultimate v12.08 (64 bit)
+MySQL - 5.6.24 : Database - ssm
+*********************************************************************
+*/
+
+
+/*!40101 SET NAMES utf8 */;
+
+CREATE DATABASE /*!32312 IF NOT EXISTS*/`ssm` /*!40100 DEFAULT CHARACTER SET utf8 */;
+
+USE `ssm`;
+
+
+
+/*Table structure for table `book` */
+
+CREATE TABLE `book` (
+  `book_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '图书ID',
+  `name` varchar(100) NOT NULL COMMENT '图书名称',
+  `number` int(11) NOT NULL COMMENT '馆藏数量',
+  PRIMARY KEY (`book_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1004 DEFAULT CHARSET=utf8 COMMENT='图书表';
+
+/*Data for the table `book` */
+
+LOCK TABLES `book` WRITE;
+
+insert  into `book`(`book_id`,`name`,`number`) values (1000,'Java程序设计',10),(1001,'数据结构',10),(1002,'设计模式',10),(1003,'编译原理',10);
+
+UNLOCK TABLES;
diff --git a/SSM--Demo/src/main/resources/ehcache.xml b/SSM-Demo/src/main/resources/ehcache.xml
similarity index 98%
rename from SSM--Demo/src/main/resources/ehcache.xml
rename to SSM-Demo/src/main/resources/ehcache.xml
index 33920c7..1f6d01d 100644
--- a/SSM--Demo/src/main/resources/ehcache.xml
+++ b/SSM-Demo/src/main/resources/ehcache.xml
@@ -25,7 +25,7 @@
     diskSpoolBufferSizeMB：这个参数设置DiskStore（磁盘缓存）的缓存区大小。默认是30MB。每个Cache都应该有自己的一个缓冲区  
      memoryStoreEvictionPolicy：当达到maxElementsInMemory限制时，Ehcache将会根据指定的策略去清理内存。默认策略是LRU（最近最少使用）。你可以设置为FIFO（先进先出）或是LFU（较少使用）   
     -->
-    <cache name="springCache"
+    <cache name="bookcache"
            maxElementsInMemory="10000"
            eternal="false"
            timeToIdleSeconds="300000"
diff --git a/SSM--Demo/src/main/resources/logback.xml b/SSM-Demo/src/main/resources/logback.xml
similarity index 95%
rename from SSM--Demo/src/main/resources/logback.xml
rename to SSM-Demo/src/main/resources/logback.xml
index 66a8974..34851ed 100644
--- a/SSM--Demo/src/main/resources/logback.xml
+++ b/SSM-Demo/src/main/resources/logback.xml
@@ -12,7 +12,7 @@
 	<!-- project level -->
 	<logger name="cn.mrdear" level="DEBUG" />
 
-	<root level="INFO" >
+	<root level="DEBUG" >
 		<appender-ref ref="console" />
 	</root>
 
diff --git a/SSM-Demo/src/main/resources/mybatis/mapper/BookMapper.xml b/SSM-Demo/src/main/resources/mybatis/mapper/BookMapper.xml
new file mode 100644
index 0000000..745ae83
--- /dev/null
+++ b/SSM-Demo/src/main/resources/mybatis/mapper/BookMapper.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="cn.mrdear.mapper.AppointMentMapper.BookMapper" >
+  <resultMap id="BaseResultMap" type="cn.mrdear.entity.Book" >
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="book_id" property="bookId" jdbcType="BIGINT" />
+    <result column="name" property="name" jdbcType="VARCHAR" />
+    <result column="number" property="number" jdbcType="INTEGER" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbg.generated
+    -->
+    book_id, name, number
+  </sql>
+</mapper>
\ No newline at end of file
diff --git a/SSM--Demo/src/main/resources/mybatis/sqlmapconfig.xml b/SSM-Demo/src/main/resources/mybatis/sqlmapconfig.xml
similarity index 100%
rename from SSM--Demo/src/main/resources/mybatis/sqlmapconfig.xml
rename to SSM-Demo/src/main/resources/mybatis/sqlmapconfig.xml
diff --git a/SSM--Demo/src/main/resources/spring/applicationContext.xml b/SSM-Demo/src/main/resources/spring/applicationContext.xml
similarity index 92%
rename from SSM--Demo/src/main/resources/spring/applicationContext.xml
rename to SSM-Demo/src/main/resources/spring/applicationContext.xml
index e96f1d5..2c20542 100644
--- a/SSM--Demo/src/main/resources/spring/applicationContext.xml
+++ b/SSM-Demo/src/main/resources/spring/applicationContext.xml
@@ -5,7 +5,6 @@
        xmlns:tx="http://www.springframework.org/schema/tx"
        xmlns:aop="http://www.springframework.org/schema/aop"
        xmlns:task="http://www.springframework.org/schema/task"
-       xmlns:p="http://www.springframework.org/schema/p"
        xmlns:cache="http://www.springframework.org/schema/cache"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd   http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache.xsd">
 
@@ -65,20 +64,20 @@
         <!-- 加载mybatis的全局配置文件 -->
         <property name="configLocation" value="classpath:mybatis/sqlmapconfig.xml" />
         <!--配置mapper.xml扫描-->
-        <property name="mapperLocations" value="classpath:mybatis/*/*.xml"/>
+        <property name="mapperLocations" value="classpath:mybatis/mapper/*.xml"/>
     </bean>
 
     <!--配置mapper.java扫描-->
-    <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
+    <bean class="tk.mybatis.spring.mapper.MapperScannerConfigurer">
         <property name="basePackage" value="cn.mrdear.mapper"/>
+        <property name="properties">
+            <value>
+                mappers=tk.mybatis.mapper.common.Mapper
+            </value>
+        </property>
         <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory"/>
     </bean>
 
-    <!--线程安全的sqlSessionTemplate,如果采用DAO开发,那么就使用这个-->
-    <!--<bean id="sqlSessionTemplate" class="org.mybatis.spring.SqlSessionTemplate">-->
-        <!--<constructor-arg ref="sqlSessionFactory" />-->
-    <!--</bean>-->
-
     <!--产生ehcache的缓存管理器,并把ehcache的cacheManager注入到Spring的EhCacheCacheManager-->
     <bean id="defaultCacheManager" class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean">
         <property name="configLocation" value="classpath:ehcache.xml"/>
@@ -103,7 +102,9 @@
                        rollback-for="java.lang.Exception" />
             <tx:method name="save*" propagation="REQUIRED" read-only="false"
                        rollback-for="java.lang.Exception" />
-            <tx:method name="select*" propagation="SUPPORTS" read-only="true"/>
+            <!--查询使用只读事务-->
+            <tx:method name="find*" propagation="SUPPORTS" read-only="true"/>
+            <tx:method name="query*" propagation="SUPPORTS" read-only="true"/>
         </tx:attributes>
     </tx:advice>
 
diff --git a/SSM--Demo/src/main/resources/spring/dispatcher-servlet.xml b/SSM-Demo/src/main/resources/spring/dispatcher-servlet.xml
similarity index 90%
rename from SSM--Demo/src/main/resources/spring/dispatcher-servlet.xml
rename to SSM-Demo/src/main/resources/spring/dispatcher-servlet.xml
index 347bad8..7fd3f3a 100644
--- a/SSM--Demo/src/main/resources/spring/dispatcher-servlet.xml
+++ b/SSM-Demo/src/main/resources/spring/dispatcher-servlet.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mvc="http://www.springframework.org/schema/mvc"
-       xmlns:content="http://www.springframework.org/schema/context"
+       xmlns:contents="http://www.springframework.org/schema/context"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
     <!-- 自动扫描该包，使SpringMVC认为包下用了@controller注解的类是控制器 -->
-    <content:component-scan base-package="cn.mrdear.controller"/>
+    <contents:component-scan base-package="cn.mrdear.controller"/>
 
     <!-- 启用默认配置 -->
     <mvc:annotation-driven>
@@ -48,7 +48,6 @@
 
     <!--静态资源映射-->
     <mvc:resources mapping="/static/**" location="/static/" />
-    <mvc:resources mapping="/uploadimg/**" location="/uploadimg/" />
 
     <!--拦截器配置-->
     <!--<mvc:interceptors>-->
@@ -61,9 +60,6 @@
     <!--</mvc:interceptors>-->
     <!--拦截器结束-->
 
-    <!-- 全局异常配置 -->
-    <!--<bean id="exceptionResolver" class="cn.edu.aust.exception.exceptionSolver"/>-->
-
 
     <!-- 文件上传 -->
     <bean id="multipartResolver"
diff --git a/SSM-Demo/src/main/webapp/WEB-INF/view/error.jsp b/SSM-Demo/src/main/webapp/WEB-INF/view/error.jsp
new file mode 100644
index 0000000..e9ea535
--- /dev/null
+++ b/SSM-Demo/src/main/webapp/WEB-INF/view/error.jsp
@@ -0,0 +1,16 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: niuli
+  Date: 2017/4/19
+  Time: 09:45
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>Title</title>
+</head>
+<body>
+<h1>Error 页面</h1>
+</body>
+</html>
diff --git a/SSM--Demo/src/main/webapp/WEB-INF/web.xml b/SSM-Demo/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from SSM--Demo/src/main/webapp/WEB-INF/web.xml
rename to SSM-Demo/src/main/webapp/WEB-INF/web.xml
diff --git a/SSM-Demo/src/main/webapp/index.jsp b/SSM-Demo/src/main/webapp/index.jsp
new file mode 100644
index 0000000..79c57f9
--- /dev/null
+++ b/SSM-Demo/src/main/webapp/index.jsp
@@ -0,0 +1,17 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: NL
+  Date: 2017/1/23
+  Time: 9:09
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title></title>
+</head>
+<body>
+<h2>Hello World!</h2>
+<h3>请访问/books测试</h3>
+</body>
+</html>
diff --git a/Spring-Boot-Demo/.idea/compiler.xml b/Spring-Boot-Demo/.idea/compiler.xml
deleted file mode 100644
index ce4b38c..0000000
--- a/Spring-Boot-Demo/.idea/compiler.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-      <entry name="!?*.aj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-      <profile default="false" name="Maven default annotation processors profile" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <processorPath useClasspath="true" />
-        <module name="SpringBoot" />
-      </profile>
-    </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="SpringBoot" target="1.8" />
-    </bytecodeTargetLevel>
-  </component>
-</project>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/copyright/profiles_settings.xml b/Spring-Boot-Demo/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/Spring-Boot-Demo/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/encodings.xml b/Spring-Boot-Demo/.idea/encodings.xml
deleted file mode 100644
index c0bce70..0000000
--- a/Spring-Boot-Demo/.idea/encodings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="file://$PROJECT_DIR$" charset="UTF-8" />
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/inspectionProfiles/Project_Default.xml b/Spring-Boot-Demo/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 8c9b405..0000000
--- a/Spring-Boot-Demo/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false">
-      <option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" />
-      <option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" />
-    </inspection_tool>
-    <inspection_tool class="SpringJavaAutowiringInspection" enabled="false" level="ERROR" enabled_by_default="false" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/inspectionProfiles/profiles_settings.xml b/Spring-Boot-Demo/.idea/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index 3b31283..0000000
--- a/Spring-Boot-Demo/.idea/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="PROJECT_PROFILE" value="Project Default" />
-    <option name="USE_PROJECT_PROFILE" value="true" />
-    <version value="1.0" />
-  </settings>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_7.xml b/Spring-Boot-Demo/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_7.xml
deleted file mode 100644
index cdd7959..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: ch.qos.logback:logback-classic:1.1.7">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.1.7/logback-classic-1.1.7.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.1.7/logback-classic-1.1.7-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.1.7/logback-classic-1.1.7-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_7.xml b/Spring-Boot-Demo/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_7.xml
deleted file mode 100644
index 6c2a760..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: ch.qos.logback:logback-core:1.1.7">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.1.7/logback-core-1.1.7.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.1.7/logback-core-1.1.7-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.1.7/logback-core-1.1.7-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__com_alibaba_druid_1_0_19.xml b/Spring-Boot-Demo/.idea/libraries/Maven__com_alibaba_druid_1_0_19.xml
deleted file mode 100644
index 4a7f94b..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__com_alibaba_druid_1_0_19.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.alibaba:druid:1.0.19">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.0.19/druid-1.0.19.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.0.19/druid-1.0.19-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.0.19/druid-1.0.19-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__com_alibaba_fastjson_1_2_14.xml b/Spring-Boot-Demo/.idea/libraries/Maven__com_alibaba_fastjson_1_2_14.xml
deleted file mode 100644
index 3888159..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__com_alibaba_fastjson_1_2_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.alibaba:fastjson:1.2.14">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.14/fastjson-1.2.14.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.14/fastjson-1.2.14-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.14/fastjson-1.2.14-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__com_fasterxml_classmate_1_3_1.xml b/Spring-Boot-Demo/.idea/libraries/Maven__com_fasterxml_classmate_1_3_1.xml
deleted file mode 100644
index cfcab12..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__com_fasterxml_classmate_1_3_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.fasterxml:classmate:1.3.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.3.1/classmate-1.3.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.3.1/classmate-1.3.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.3.1/classmate-1.3.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_8_1.xml b/Spring-Boot-Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_8_1.xml
deleted file mode 100644
index 1a718d6..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_8_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.8.1/jackson-annotations-2.8.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.8.1/jackson-annotations-2.8.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.8.1/jackson-annotations-2.8.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_8_1.xml b/Spring-Boot-Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_8_1.xml
deleted file mode 100644
index 89164c5..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_8_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.8.1/jackson-core-2.8.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.8.1/jackson-core-2.8.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.8.1/jackson-core-2.8.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_8_1.xml b/Spring-Boot-Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_8_1.xml
deleted file mode 100644
index 6307d67..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_8_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.8.1/jackson-databind-2.8.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.8.1/jackson-databind-2.8.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.8.1/jackson-databind-2.8.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_0_9_4.xml b/Spring-Boot-Demo/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_0_9_4.xml
deleted file mode 100644
index 01dedb4..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_0_9_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.github.jsqlparser:jsqlparser:0.9.4">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/0.9.4/jsqlparser-0.9.4.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/0.9.4/jsqlparser-0.9.4-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/0.9.4/jsqlparser-0.9.4-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__com_github_pagehelper_pagehelper_4_1_3.xml b/Spring-Boot-Demo/.idea/libraries/Maven__com_github_pagehelper_pagehelper_4_1_3.xml
deleted file mode 100644
index cd0a66a..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__com_github_pagehelper_pagehelper_4_1_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.github.pagehelper:pagehelper:4.1.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/4.1.3/pagehelper-4.1.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/4.1.3/pagehelper-4.1.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/4.1.3/pagehelper-4.1.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/Spring-Boot-Demo/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml
deleted file mode 100644
index 940ce73..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: javax.validation:validation-api:1.1.0.Final">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__junit_junit_4_10.xml b/Spring-Boot-Demo/.idea/libraries/Maven__junit_junit_4_10.xml
deleted file mode 100644
index ed8bf5f..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__junit_junit_4_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: junit:junit:4.10">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.10/junit-4.10.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.10/junit-4.10-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.10/junit-4.10-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_34.xml b/Spring-Boot-Demo/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_34.xml
deleted file mode 100644
index b984e59..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_34.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: mysql:mysql-connector-java:5.1.34">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/5.1.34/mysql-connector-java-5.1.34.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/5.1.34/mysql-connector-java-5.1.34-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/5.1.34/mysql-connector-java-5.1.34-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__net_sf_ehcache_ehcache_2_10_2_2_21.xml b/Spring-Boot-Demo/.idea/libraries/Maven__net_sf_ehcache_ehcache_2_10_2_2_21.xml
deleted file mode 100644
index b777b97..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__net_sf_ehcache_ehcache_2_10_2_2_21.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: net.sf.ehcache:ehcache:2.10.2.2.21">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/sf/ehcache/ehcache/2.10.2.2.21/ehcache-2.10.2.2.21.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/net/sf/ehcache/ehcache/2.10.2.2.21/ehcache-2.10.2.2.21-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/sf/ehcache/ehcache/2.10.2.2.21/ehcache-2.10.2.2.21-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_8.xml b/Spring-Boot-Demo/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_8.xml
deleted file mode 100644
index 3515cd5..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_8.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: net.sf.ehcache:ehcache-core:2.6.8">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/sf/ehcache/ehcache-core/2.6.8/ehcache-core-2.6.8.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/net/sf/ehcache/ehcache-core/2.6.8/ehcache-core-2.6.8-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/sf/ehcache/ehcache-core/2.6.8/ehcache-core-2.6.8-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__net_sf_ehcache_ehcache_web_2_0_4.xml b/Spring-Boot-Demo/.idea/libraries/Maven__net_sf_ehcache_ehcache_web_2_0_4.xml
deleted file mode 100644
index e41e7ba..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__net_sf_ehcache_ehcache_web_2_0_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: net.sf.ehcache:ehcache-web:2.0.4">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/sf/ehcache/ehcache-web/2.0.4/ehcache-web-2.0.4.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/net/sf/ehcache/ehcache-web/2.0.4/ehcache-web-2.0.4-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/sf/ehcache/ehcache-web/2.0.4/ehcache-web-2.0.4-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__nz_net_ultraq_thymeleaf_thymeleaf_layout_dialect_1_4_0.xml b/Spring-Boot-Demo/.idea/libraries/Maven__nz_net_ultraq_thymeleaf_thymeleaf_layout_dialect_1_4_0.xml
deleted file mode 100644
index 537b4b1..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__nz_net_ultraq_thymeleaf_thymeleaf_layout_dialect_1_4_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:1.4.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/nz/net/ultraq/thymeleaf/thymeleaf-layout-dialect/1.4.0/thymeleaf-layout-dialect-1.4.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/nz/net/ultraq/thymeleaf/thymeleaf-layout-dialect/1.4.0/thymeleaf-layout-dialect-1.4.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/nz/net/ultraq/thymeleaf/thymeleaf-layout-dialect/1.4.0/thymeleaf-layout-dialect-1.4.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__ognl_ognl_3_0_8.xml b/Spring-Boot-Demo/.idea/libraries/Maven__ognl_ognl_3_0_8.xml
deleted file mode 100644
index 1a94644..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__ognl_ognl_3_0_8.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: ognl:ognl:3.0.8">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/ognl/ognl/3.0.8/ognl-3.0.8.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/ognl/ognl/3.0.8/ognl-3.0.8-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/ognl/ognl/3.0.8/ognl-3.0.8-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_4.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_4.xml
deleted file mode 100644
index 09827ab..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.4">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/8.5.4/tomcat-embed-core-8.5.4.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/8.5.4/tomcat-embed-core-8.5.4-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/8.5.4/tomcat-embed-core-8.5.4-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_4.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_4.xml
deleted file mode 100644
index 588a181..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.4">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/8.5.4/tomcat-embed-el-8.5.4.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/8.5.4/tomcat-embed-el-8.5.4-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/8.5.4/tomcat-embed-el-8.5.4-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_4.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_4.xml
deleted file mode 100644
index 9962a4b..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.4">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/8.5.4/tomcat-embed-websocket-8.5.4.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/8.5.4/tomcat-embed-websocket-8.5.4-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/8.5.4/tomcat-embed-websocket-8.5.4-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_apache_tomcat_tomcat_jdbc_8_5_4.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_apache_tomcat_tomcat_jdbc_8_5_4.xml
deleted file mode 100644
index 637262e..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_apache_tomcat_tomcat_jdbc_8_5_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.tomcat:tomcat-jdbc:8.5.4">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/tomcat-jdbc/8.5.4/tomcat-jdbc-8.5.4.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/tomcat-jdbc/8.5.4/tomcat-jdbc-8.5.4-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/tomcat-jdbc/8.5.4/tomcat-jdbc-8.5.4-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_apache_tomcat_tomcat_juli_8_5_4.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_apache_tomcat_tomcat_juli_8_5_4.xml
deleted file mode 100644
index 45edb2d..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_apache_tomcat_tomcat_juli_8_5_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.tomcat:tomcat-juli:8.5.4">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/tomcat-juli/8.5.4/tomcat-juli-8.5.4.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/tomcat-juli/8.5.4/tomcat-juli-8.5.4-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/tomcat-juli/8.5.4/tomcat-juli-8.5.4-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_codehaus_groovy_groovy_2_4_7.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_codehaus_groovy_groovy_2_4_7.xml
deleted file mode 100644
index 8c0eabe..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_codehaus_groovy_groovy_2_4_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.codehaus.groovy:groovy:2.4.7">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy/2.4.7/groovy-2.4.7.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy/2.4.7/groovy-2.4.7-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy/2.4.7/groovy-2.4.7-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
deleted file mode 100644
index f58bbc1..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.hamcrest:hamcrest-core:1.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_2_4_Final.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_2_4_Final.xml
deleted file mode 100644
index 6c5e17f..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_2_4_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.hibernate:hibernate-validator:5.2.4.Final">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-validator/5.2.4.Final/hibernate-validator-5.2.4.Final.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-validator/5.2.4.Final/hibernate-validator-5.2.4.Final-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-validator/5.2.4.Final/hibernate-validator-5.2.4.Final-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_javassist_javassist_3_20_0_GA.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_javassist_javassist_3_20_0_GA.xml
deleted file mode 100644
index c21c9b0..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_javassist_javassist_3_20_0_GA.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.javassist:javassist:3.20.0-GA">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/javassist/javassist/3.20.0-GA/javassist-3.20.0-GA.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/javassist/javassist/3.20.0-GA/javassist-3.20.0-GA-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/javassist/javassist/3.20.0-GA/javassist-3.20.0-GA-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_0_Final.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_0_Final.xml
deleted file mode 100644
index 186d87f..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_0_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.3.0.Final/jboss-logging-3.3.0.Final.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.3.0.Final/jboss-logging-3.3.0.Final-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.3.0.Final/jboss-logging-3.3.0.Final-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_mybatis_caches_mybatis_ehcache_1_0_3.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_mybatis_caches_mybatis_ehcache_1_0_3.xml
deleted file mode 100644
index 31ffbe4..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_mybatis_caches_mybatis_ehcache_1_0_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.mybatis.caches:mybatis-ehcache:1.0.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/caches/mybatis-ehcache/1.0.3/mybatis-ehcache-1.0.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/caches/mybatis-ehcache/1.0.3/mybatis-ehcache-1.0.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/caches/mybatis-ehcache/1.0.3/mybatis-ehcache-1.0.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_mybatis_mybatis_3_4_0.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_mybatis_mybatis_3_4_0.xml
deleted file mode 100644
index 655ae2e..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_mybatis_mybatis_3_4_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.mybatis:mybatis:3.4.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.4.0/mybatis-3.4.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.4.0/mybatis-3.4.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.4.0/mybatis-3.4.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_0.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_0.xml
deleted file mode 100644
index bd108d5..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.mybatis:mybatis-spring:1.3.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/1.3.0/mybatis-spring-1.3.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/1.3.0/mybatis-spring-1.3.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/1.3.0/mybatis-spring-1.3.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_1_1.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_1_1.xml
deleted file mode 100644
index 218b48a..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_1_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.1.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/1.1.1/mybatis-spring-boot-autoconfigure-1.1.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/1.1.1/mybatis-spring-boot-autoconfigure-1.1.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/1.1.1/mybatis-spring-boot-autoconfigure-1.1.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_1_1.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_1_1.xml
deleted file mode 100644
index 77694f1..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_1_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.1.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-starter/1.1.1/mybatis-spring-boot-starter-1.1.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-starter/1.1.1/mybatis-spring-boot-starter-1.1.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-starter/1.1.1/mybatis-spring-boot-starter-1.1.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_21.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_21.xml
deleted file mode 100644
index 2f93a63..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_21.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.slf4j:jcl-over-slf4j:1.7.21">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jcl-over-slf4j/1.7.21/jcl-over-slf4j-1.7.21.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jcl-over-slf4j/1.7.21/jcl-over-slf4j-1.7.21-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jcl-over-slf4j/1.7.21/jcl-over-slf4j-1.7.21-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_21.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_21.xml
deleted file mode 100644
index dd05efc..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_21.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.slf4j:jul-to-slf4j:1.7.21">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jul-to-slf4j/1.7.21/jul-to-slf4j-1.7.21.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jul-to-slf4j/1.7.21/jul-to-slf4j-1.7.21-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jul-to-slf4j/1.7.21/jul-to-slf4j-1.7.21-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_slf4j_log4j_over_slf4j_1_7_21.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_slf4j_log4j_over_slf4j_1_7_21.xml
deleted file mode 100644
index 0f9744a..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_slf4j_log4j_over_slf4j_1_7_21.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.slf4j:log4j-over-slf4j:1.7.21">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/log4j-over-slf4j/1.7.21/log4j-over-slf4j-1.7.21.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/log4j-over-slf4j/1.7.21/log4j-over-slf4j-1.7.21-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/log4j-over-slf4j/1.7.21/log4j-over-slf4j-1.7.21-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_21.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_21.xml
deleted file mode 100644
index 1b644dd..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_21.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.slf4j:slf4j-api:1.7.21">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.21/slf4j-api-1.7.21.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.21/slf4j-api-1.7.21-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.21/slf4j-api-1.7.21-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_1_4_0_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_1_4_0_RELEASE.xml
deleted file mode 100644
index a193527..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_1_4_0_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.boot:spring-boot:1.4.0.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/1.4.0.RELEASE/spring-boot-1.4.0.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/1.4.0.RELEASE/spring-boot-1.4.0.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/1.4.0.RELEASE/spring-boot-1.4.0.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_4_0_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_4_0_RELEASE.xml
deleted file mode 100644
index d24946a..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_4_0_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.4.0.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/1.4.0.RELEASE/spring-boot-autoconfigure-1.4.0.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/1.4.0.RELEASE/spring-boot-autoconfigure-1.4.0.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/1.4.0.RELEASE/spring-boot-autoconfigure-1.4.0.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_1_4_0_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_1_4_0_RELEASE.xml
deleted file mode 100644
index 07ae94e..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_1_4_0_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.boot:spring-boot-starter:1.4.0.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/1.4.0.RELEASE/spring-boot-starter-1.4.0.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/1.4.0.RELEASE/spring-boot-starter-1.4.0.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/1.4.0.RELEASE/spring-boot-starter-1.4.0.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_1_4_0_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_1_4_0_RELEASE.xml
deleted file mode 100644
index 59f1e83..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_1_4_0_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.boot:spring-boot-starter-jdbc:1.4.0.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/1.4.0.RELEASE/spring-boot-starter-jdbc-1.4.0.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/1.4.0.RELEASE/spring-boot-starter-jdbc-1.4.0.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/1.4.0.RELEASE/spring-boot-starter-jdbc-1.4.0.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_1_4_0_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_1_4_0_RELEASE.xml
deleted file mode 100644
index f965e34..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_1_4_0_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.boot:spring-boot-starter-logging:1.4.0.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/1.4.0.RELEASE/spring-boot-starter-logging-1.4.0.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/1.4.0.RELEASE/spring-boot-starter-logging-1.4.0.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/1.4.0.RELEASE/spring-boot-starter-logging-1.4.0.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_1_4_0_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_1_4_0_RELEASE.xml
deleted file mode 100644
index c275816..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_1_4_0_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:1.4.0.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-thymeleaf/1.4.0.RELEASE/spring-boot-starter-thymeleaf-1.4.0.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-thymeleaf/1.4.0.RELEASE/spring-boot-starter-thymeleaf-1.4.0.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-thymeleaf/1.4.0.RELEASE/spring-boot-starter-thymeleaf-1.4.0.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_1_4_0_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_1_4_0_RELEASE.xml
deleted file mode 100644
index 2f661ba..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_1_4_0_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.boot:spring-boot-starter-tomcat:1.4.0.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/1.4.0.RELEASE/spring-boot-starter-tomcat-1.4.0.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/1.4.0.RELEASE/spring-boot-starter-tomcat-1.4.0.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/1.4.0.RELEASE/spring-boot-starter-tomcat-1.4.0.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_1_4_0_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_1_4_0_RELEASE.xml
deleted file mode 100644
index e2e3a71..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_1_4_0_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.boot:spring-boot-starter-web:1.4.0.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/1.4.0.RELEASE/spring-boot-starter-web-1.4.0.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/1.4.0.RELEASE/spring-boot-starter-web-1.4.0.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/1.4.0.RELEASE/spring-boot-starter-web-1.4.0.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_aop_4_3_2_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_aop_4_3_2_RELEASE.xml
deleted file mode 100644
index 4508a6b..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_aop_4_3_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-aop:4.3.2.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.3.2.RELEASE/spring-aop-4.3.2.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.3.2.RELEASE/spring-aop-4.3.2.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.3.2.RELEASE/spring-aop-4.3.2.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_beans_4_3_2_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_beans_4_3_2_RELEASE.xml
deleted file mode 100644
index d650bb8..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_beans_4_3_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-beans:4.3.2.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/4.3.2.RELEASE/spring-beans-4.3.2.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/4.3.2.RELEASE/spring-beans-4.3.2.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/4.3.2.RELEASE/spring-beans-4.3.2.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_context_4_3_2_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_context_4_3_2_RELEASE.xml
deleted file mode 100644
index b497541..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_context_4_3_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-context:4.3.2.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/4.3.2.RELEASE/spring-context-4.3.2.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/4.3.2.RELEASE/spring-context-4.3.2.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/4.3.2.RELEASE/spring-context-4.3.2.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_core_4_3_2_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_core_4_3_2_RELEASE.xml
deleted file mode 100644
index aca549b..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_core_4_3_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-core:4.3.2.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.3.2.RELEASE/spring-core-4.3.2.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.3.2.RELEASE/spring-core-4.3.2.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.3.2.RELEASE/spring-core-4.3.2.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_expression_4_3_2_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_expression_4_3_2_RELEASE.xml
deleted file mode 100644
index e802cd8..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_expression_4_3_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-expression:4.3.2.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/4.3.2.RELEASE/spring-expression-4.3.2.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/4.3.2.RELEASE/spring-expression-4.3.2.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/4.3.2.RELEASE/spring-expression-4.3.2.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_2_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_2_RELEASE.xml
deleted file mode 100644
index 7b6a300..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-jdbc:4.3.2.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/4.3.2.RELEASE/spring-jdbc-4.3.2.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/4.3.2.RELEASE/spring-jdbc-4.3.2.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/4.3.2.RELEASE/spring-jdbc-4.3.2.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_tx_4_3_2_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_tx_4_3_2_RELEASE.xml
deleted file mode 100644
index 0254b40..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_tx_4_3_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-tx:4.3.2.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.3.2.RELEASE/spring-tx-4.3.2.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.3.2.RELEASE/spring-tx-4.3.2.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.3.2.RELEASE/spring-tx-4.3.2.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_web_4_3_2_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_web_4_3_2_RELEASE.xml
deleted file mode 100644
index 2b7b1d4..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_web_4_3_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-web:4.3.2.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.3.2.RELEASE/spring-web-4.3.2.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.3.2.RELEASE/spring-web-4.3.2.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.3.2.RELEASE/spring-web-4.3.2.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_webmvc_4_3_2_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_webmvc_4_3_2_RELEASE.xml
deleted file mode 100644
index e4b70bb..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_webmvc_4_3_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-webmvc:4.3.2.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/4.3.2.RELEASE/spring-webmvc-4.3.2.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/4.3.2.RELEASE/spring-webmvc-4.3.2.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/4.3.2.RELEASE/spring-webmvc-4.3.2.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_thymeleaf_thymeleaf_2_1_5_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_thymeleaf_thymeleaf_2_1_5_RELEASE.xml
deleted file mode 100644
index 3905ea7..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_thymeleaf_thymeleaf_2_1_5_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.thymeleaf:thymeleaf:2.1.5.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf/2.1.5.RELEASE/thymeleaf-2.1.5.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf/2.1.5.RELEASE/thymeleaf-2.1.5.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf/2.1.5.RELEASE/thymeleaf-2.1.5.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring4_2_1_5_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring4_2_1_5_RELEASE.xml
deleted file mode 100644
index 9cba1c2..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring4_2_1_5_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.thymeleaf:thymeleaf-spring4:2.1.5.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf-spring4/2.1.5.RELEASE/thymeleaf-spring4-2.1.5.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf-spring4/2.1.5.RELEASE/thymeleaf-spring4-2.1.5.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf-spring4/2.1.5.RELEASE/thymeleaf-spring4-2.1.5.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_unbescape_unbescape_1_1_0_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_unbescape_unbescape_1_1_0_RELEASE.xml
deleted file mode 100644
index c05f04a..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_unbescape_unbescape_1_1_0_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.unbescape:unbescape:1.1.0.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/unbescape/unbescape/1.1.0.RELEASE/unbescape-1.1.0.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/unbescape/unbescape/1.1.0.RELEASE/unbescape-1.1.0.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/unbescape/unbescape/1.1.0.RELEASE/unbescape-1.1.0.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_yaml_snakeyaml_1_17.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_yaml_snakeyaml_1_17.xml
deleted file mode 100644
index 20e2920..0000000
--- a/Spring-Boot-Demo/.idea/libraries/Maven__org_yaml_snakeyaml_1_17.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.yaml:snakeyaml:1.17">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.17/snakeyaml-1.17.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.17/snakeyaml-1.17-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.17/snakeyaml-1.17-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/misc.xml b/Spring-Boot-Demo/.idea/misc.xml
deleted file mode 100644
index 8cd8b9b..0000000
--- a/Spring-Boot-Demo/.idea/misc.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
-  <component name="MavenProjectsManager">
-    <option name="originalFiles">
-      <list>
-        <option value="$PROJECT_DIR$/pom.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8 " project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/modules.xml b/Spring-Boot-Demo/.idea/modules.xml
deleted file mode 100644
index dff154d..0000000
--- a/Spring-Boot-Demo/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/SpringBoot.iml" filepath="$PROJECT_DIR$/SpringBoot.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/uiDesigner.xml b/Spring-Boot-Demo/.idea/uiDesigner.xml
deleted file mode 100644
index e96534f..0000000
--- a/Spring-Boot-Demo/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/.idea/workspace.xml b/Spring-Boot-Demo/.idea/workspace.xml
deleted file mode 100644
index 71cce74..0000000
--- a/Spring-Boot-Demo/.idea/workspace.xml
+++ /dev/null
@@ -1,1523 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="b075e85b-bd5a-4a3a-b08d-7fddfc56d50d" name="Default" comment="" />
-    <ignored path="SpringBoot.iws" />
-    <ignored path=".idea/workspace.xml" />
-    <ignored path="$PROJECT_DIR$/out/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="TRACKING_ENABLED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_TABLE_DETAILS" value="true" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-  </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
-  <component name="FavoritesManager">
-    <favorites_list name="SpringBoot" />
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="FilterConfig.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/conf/FilterConfig.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="429">
-              <caret line="34" column="9" selection-start-line="34" selection-start-column="9" selection-end-line="34" selection-end-column="9" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="MybatisConfig.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/conf/MybatisConfig.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="198">
-              <caret line="47" column="39" selection-start-line="47" selection-start-column="39" selection-end-line="47" selection-end-column="39" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="HelloController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/controller/HelloController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="484">
-              <caret line="32" column="5" selection-start-line="32" selection-start-column="5" selection-end-line="32" selection-end-column="5" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/pom.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="374">
-              <caret line="41" column="17" selection-start-line="41" selection-start-column="17" selection-end-line="41" selection-end-column="17" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="DataSourcesConfig.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/conf/DataSourcesConfig.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-638">
-              <caret line="24" column="20" selection-start-line="24" selection-start-column="20" selection-end-line="24" selection-end-column="20" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="HTML File" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="GradleLocalSettings">
-    <option name="externalProjectsViewState">
-      <projects_view />
-    </option>
-  </component>
-  <component name="HighlightingSettingsPerFile">
-    <setting file="file://$PROJECT_DIR$/src/main/resources/mapper/UserMapper.xml" root0="SKIP_INSPECTION" />
-    <setting file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/controller/HelloController.java" root0="FORCE_HIGHLIGHTING" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/resources/banner.txt" />
-        <option value="$PROJECT_DIR$/src/main/java/resources/logback-spring.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/resources/application.yml" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/entity/DemoEntity.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/PageException.java" />
-        <option value="$PROJECT_DIR$/src/main/java/resources/templates/error.html" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/conf/WEBMessageConvert.java" />
-        <option value="$PROJECT_DIR$/src/main/java/resources/templates/hello.html" />
-        <option value="$PROJECT_DIR$/src/main/java/resources/META-INF/additional-spring-configuration-metadata.json" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/exception/PageException.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/conf/DruidStatViewServlet.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/conf/DruidConfig.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/filter/DruidStatFilter.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/conf/DataSourcesConfig.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/entity/User.java" />
-        <option value="$PROJECT_DIR$/src/main/java/resources/mapper/UserMapper.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/dao/UserDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/dao/UserMapper.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/mapper/UserMapper.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/Application.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/controller/HelloController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/conf/ServletConfig.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/ehcache.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/UserMapper.xml" />
-        <option value="$PROJECT_DIR$/pom.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/conf/MybatisConfig.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/conf/FilterConfig.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/develop/maven/apache-maven-3.3.9" />
-        <option name="userSettingsFile" value="D:\develop\maven\apache-maven-3.3.9\conf\settings.xml" />
-      </MavenGeneralSettings>
-    </option>
-    <option name="importingSettings">
-      <MavenImportingSettings>
-        <option name="importAutomatically" value="true" />
-      </MavenImportingSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="" />
-          <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$RootNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="mrdear" />
-          <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$ProjectNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="" />
-          <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$RootNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="mrdear" />
-          <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$ProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="Lifecycle" />
-          <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$LifecycleNode" />
-        </PATH_ELEMENT>
-      </PATH>
-    </treeState>
-  </component>
-  <component name="MavenRunner">
-    <option name="jreName" value="1.8 " />
-    <option name="vmOptions" value="-DarchetypeCatalog=internal" />
-  </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-9" />
-    <option name="y" value="-9" />
-    <option name="width" value="1860" />
-    <option name="height" value="1098" />
-  </component>
-  <component name="ProjectInspectionProfilesVisibleTreeState">
-    <entry key="Project Default">
-      <profile-state>
-        <expanded-state>
-          <State>
-            <id />
-          </State>
-          <State>
-            <id>Thymeleaf</id>
-          </State>
-        </expanded-state>
-        <selected-state>
-          <State>
-            <id>ThymeleafVariablesResolveInspection</id>
-          </State>
-        </selected-state>
-      </profile-state>
-    </entry>
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectView">
-    <navigator currentView="ProjectPane" proportions="" version="1">
-      <flattenPackages />
-      <showMembers />
-      <showModules />
-      <showLibraryContents />
-      <hideEmptyPackages />
-      <abbreviatePackageNames />
-      <autoscrollToSource />
-      <autoscrollFromSource />
-      <sortByType />
-      <manualOrder />
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="Scratches" />
-      <pane id="Scope" />
-      <pane id="PackagesPane" />
-      <pane id="ProjectPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="SpringBoot" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="SpringBoot" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="SpringBoot" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="SpringBoot" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="SpringBoot" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="SpringBoot" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="SpringBoot" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="resources" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="SpringBoot" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="SpringBoot" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="resources" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="mapper" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="SpringBoot" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="SpringBoot" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="mrdear" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="SpringBoot" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="SpringBoot" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="mrdear" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="mapper" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="SpringBoot" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="SpringBoot" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="mrdear" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="exception" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="SpringBoot" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="SpringBoot" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="mrdear" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="controller" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="SpringBoot" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="SpringBoot" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="mrdear" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="conf" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="settings.editor.selected.configurable" value="reference.idesettings.debugger.dataviews" />
-    <property name="settings.editor.splitter.proportion" value="0.2" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/.." />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="js-jscs-nodeInterpreter" value="C:\Program Files\nodejs\node.exe" />
-    <property name="project.structure.last.edited" value="Modules" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.2" />
-    <property name="DefaultHtmlFileTemplate" value="HTML File" />
-  </component>
-  <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="F:\Git\SpringBoot\src\main\resources" />
-      <recent name="F:\Git\SpringBoot\src\main\java\resources\static\css" />
-      <recent name="F:\Git\SpringBoot\src\main\java\resources" />
-    </key>
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="F:\Git\SpringBoot\src\main" />
-      <recent name="F:\Git\SpringBoot\src\main\java\resources" />
-      <recent name="F:\Git\SpringBoot\src\main\java\resources\static" />
-      <recent name="F:\Git\SpringBoot\src\main\java" />
-    </key>
-  </component>
-  <component name="RunManager" selected="Spring Boot.Application">
-    <configuration default="false" name="Application" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
-        <pattern>
-          <option name="PATTERN" value="cn.mrdear.exception.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <option name="MAIN_CLASS_NAME" value="cn.mrdear.Application" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="SpringBoot" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="false" name="mrdear [spring-boot:run]" type="MavenRunConfiguration" factoryName="Maven" temporary="true">
-      <MavenSettings>
-        <option name="myGeneralSettings" />
-        <option name="myRunnerSettings" />
-        <option name="myRunnerParameters">
-          <MavenRunnerParameters>
-            <option name="profiles">
-              <set />
-            </option>
-            <option name="goals">
-              <list>
-                <option value="spring-boot:run" />
-              </list>
-            </option>
-            <option name="profilesMap">
-              <map />
-            </option>
-            <option name="resolveToWorkspace" value="false" />
-            <option name="workingDirPath" value="$PROJECT_DIR$" />
-          </MavenRunnerParameters>
-        </option>
-      </MavenSettings>
-      <method />
-    </configuration>
-    <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
-      <module name="" />
-      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
-      <option name="PROGRAM_PARAMETERS" />
-      <method />
-    </configuration>
-    <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
-      <module name="" />
-      <option name="DEPLOY" value="true" />
-      <option name="ARTIFACT_NAME" value="" />
-      <option name="PM_INSTALL_OPTIONS" value="" />
-      <option name="ACTIVITY_EXTRA_FLAGS" value="" />
-      <option name="MODE" value="default_activity" />
-      <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-      <option name="PREFERRED_AVD" value="" />
-      <option name="CLEAR_LOGCAT" value="false" />
-      <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
-      <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
-      <option name="FORCE_STOP_RUNNING_APP" value="true" />
-      <option name="DEBUGGER_TYPE" value="Java" />
-      <option name="USE_LAST_SELECTED_DEVICE" value="false" />
-      <option name="PREFERRED_AVD" value="" />
-      <Java />
-      <Profilers>
-        <option name="GAPID_DISABLE_PCS" value="false" />
-      </Profilers>
-      <option name="DEEP_LINK" value="" />
-      <option name="ACTIVITY_CLASS" value="" />
-      <method />
-    </configuration>
-    <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
-      <module name="" />
-      <option name="TESTING_TYPE" value="0" />
-      <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
-      <option name="METHOD_NAME" value="" />
-      <option name="CLASS_NAME" value="" />
-      <option name="PACKAGE_NAME" value="" />
-      <option name="EXTRA_OPTIONS" value="" />
-      <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-      <option name="PREFERRED_AVD" value="" />
-      <option name="CLEAR_LOGCAT" value="false" />
-      <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
-      <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
-      <option name="FORCE_STOP_RUNNING_APP" value="true" />
-      <option name="DEBUGGER_TYPE" value="Java" />
-      <option name="USE_LAST_SELECTED_DEVICE" value="false" />
-      <option name="PREFERRED_AVD" value="" />
-      <Java />
-      <Profilers>
-        <option name="GAPID_DISABLE_PCS" value="false" />
-      </Profilers>
-      <method />
-    </configuration>
-    <configuration default="true" type="Applet" factoryName="Applet">
-      <option name="HTML_USED" value="false" />
-      <option name="WIDTH" value="400" />
-      <option name="HEIGHT" value="300" />
-      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
-      <module />
-      <method />
-    </configuration>
-    <configuration default="true" type="Application" factoryName="Application">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="ArquillianJUnit" factoryName="">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="arquillianRunConfiguration">
-        <value>
-          <option name="containerStateName" value="" />
-        </value>
-      </option>
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="true" type="ArquillianTestNG" factoryName="">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="arquillianRunConfiguration">
-        <value>
-          <option name="containerStateName" value="" />
-        </value>
-      </option>
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="ANNOTATION_TYPE" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
-      <envs />
-      <properties />
-      <listeners />
-      <method />
-    </configuration>
-    <configuration default="true" type="Cold Fusion runner description" factoryName="Cold Fusion" custom_browser="" web_path="">
-      <method />
-    </configuration>
-    <configuration default="true" type="CucumberJavaRunConfigurationType" factoryName="Cucumber java">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="myFilePath" />
-      <option name="GLUE" />
-      <option name="myNameFilter" />
-      <option name="myGeneratedName" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="FlashRunConfigurationType" factoryName="Flash App">
-      <option name="BCName" value="" />
-      <option name="IOSSimulatorSdkPath" value="" />
-      <option name="adlOptions" value="" />
-      <option name="airProgramParameters" value="" />
-      <option name="appDescriptorForEmulator" value="Android" />
-      <option name="debugTransport" value="USB" />
-      <option name="debuggerSdkRaw" value="BC SDK" />
-      <option name="emulator" value="NexusOne" />
-      <option name="emulatorAdlOptions" value="" />
-      <option name="fastPackaging" value="true" />
-      <option name="fullScreenHeight" value="0" />
-      <option name="fullScreenWidth" value="0" />
-      <option name="launchUrl" value="false" />
-      <option name="launcherParameters">
-        <LauncherParameters>
-          <option name="browser" value="a7bb68e0-33c0-4d6f-a81a-aac1fdb870c8" />
-          <option name="launcherType" value="OSDefault" />
-          <option name="newPlayerInstance" value="false" />
-          <option name="playerPath" value="FlashPlayerDebugger.exe" />
-        </LauncherParameters>
-      </option>
-      <option name="mobileRunTarget" value="Emulator" />
-      <option name="moduleName" value="" />
-      <option name="overriddenMainClass" value="" />
-      <option name="overriddenOutputFileName" value="" />
-      <option name="overrideMainClass" value="false" />
-      <option name="runTrusted" value="true" />
-      <option name="screenDpi" value="0" />
-      <option name="screenHeight" value="0" />
-      <option name="screenWidth" value="0" />
-      <option name="url" value="http://" />
-      <option name="usbDebugPort" value="7936" />
-      <method />
-    </configuration>
-    <configuration default="true" type="FlexUnitRunConfigurationType" factoryName="FlexUnit" appDescriptorForEmulator="Android" class_name="" emulatorAdlOptions="" method_name="" package_name="" scope="Class">
-      <option name="BCName" value="" />
-      <option name="launcherParameters">
-        <LauncherParameters>
-          <option name="browser" value="a7bb68e0-33c0-4d6f-a81a-aac1fdb870c8" />
-          <option name="launcherType" value="OSDefault" />
-          <option name="newPlayerInstance" value="false" />
-          <option name="playerPath" value="FlashPlayerDebugger.exe" />
-        </LauncherParameters>
-      </option>
-      <option name="moduleName" value="" />
-      <option name="trusted" value="true" />
-      <method />
-    </configuration>
-    <configuration default="true" type="GradleRunConfiguration" factoryName="Gradle">
-      <ExternalSystemSettings>
-        <option name="executionName" />
-        <option name="externalProjectPath" />
-        <option name="externalSystemIdString" value="GRADLE" />
-        <option name="scriptParameters" />
-        <option name="taskDescriptions">
-          <list />
-        </option>
-        <option name="taskNames">
-          <list />
-        </option>
-        <option name="vmOptions" />
-      </ExternalSystemSettings>
-      <method />
-    </configuration>
-    <configuration default="true" type="GrailsRunConfigurationType" factoryName="Grails">
-      <setting name="vmparams" value="" />
-      <setting name="cmdLine" value="run-app" />
-      <setting name="passParentEnv" value="true" />
-      <setting name="launchBrowser" value="true" />
-      <setting name="depsClasspath" value="false" />
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <method />
-    </configuration>
-    <configuration default="true" type="JUnit" factoryName="JUnit">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="true" type="JUnitTestDiscovery" factoryName="JUnit Test Discovery" changeList="All">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="true" type="JarApplication" factoryName="JAR Application">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="Java Scratch" factoryName="Java Scratch">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="SCRATCH_FILE_ID" value="0" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
-      <method />
-    </configuration>
-    <configuration default="true" type="JetRunConfigurationType" factoryName="Kotlin">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="SpringBoot" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="KotlinStandaloneScriptRunConfigurationType" factoryName="Kotlin script">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="filePath" />
-      <option name="vmParameters" />
-      <option name="alternativeJrePath" />
-      <option name="programParameters" />
-      <option name="passParentEnvs" value="true" />
-      <option name="workingDirectory" />
-      <option name="isAlternativeJrePathEnabled" value="false" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="MavenRunConfiguration" factoryName="Maven">
-      <MavenSettings>
-        <option name="myGeneralSettings" />
-        <option name="myRunnerSettings" />
-        <option name="myRunnerParameters">
-          <MavenRunnerParameters>
-            <option name="profiles">
-              <set />
-            </option>
-            <option name="goals">
-              <list />
-            </option>
-            <option name="profilesMap">
-              <map />
-            </option>
-            <option name="resolveToWorkspace" value="false" />
-            <option name="workingDirPath" value="" />
-          </MavenRunnerParameters>
-        </option>
-      </MavenSettings>
-      <method />
-    </configuration>
-    <configuration default="true" type="Remote" factoryName="Remote">
-      <option name="USE_SOCKET_TRANSPORT" value="true" />
-      <option name="SERVER_MODE" value="false" />
-      <option name="SHMEM_ADDRESS" value="javadebug" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="5005" />
-      <method />
-    </configuration>
-    <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="TestNG" factoryName="TestNG">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="ANNOTATION_TYPE" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
-      <envs />
-      <properties />
-      <listeners />
-      <method />
-    </configuration>
-    <configuration default="true" type="TestNGTestDiscovery" factoryName="TestNG Test Discovery" changeList="All">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="ANNOTATION_TYPE" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
-      <envs />
-      <properties />
-      <listeners />
-      <method />
-    </configuration>
-    <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
-      <node-interpreter>project</node-interpreter>
-      <node-options />
-      <gulpfile />
-      <tasks />
-      <arguments />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="js.build_tools.npm" factoryName="npm">
-      <command value="run-script" />
-      <scripts />
-      <node-interpreter value="project" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="osgi.bnd.run" factoryName="Run Launcher">
-      <method />
-    </configuration>
-    <configuration default="true" type="osgi.bnd.run" factoryName="Test Launcher (JUnit)">
-      <method />
-    </configuration>
-    <configuration default="false" name="Application" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="SPRING_BOOT_MAIN_CLASS" value="cn.mrdear.Application" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <module name="SpringBoot" />
-      <envs />
-      <method />
-    </configuration>
-    <list size="3">
-      <item index="0" class="java.lang.String" itemvalue="Spring Boot.Application" />
-      <item index="1" class="java.lang.String" itemvalue="Application.Application" />
-      <item index="2" class="java.lang.String" itemvalue="Maven.mrdear [spring-boot:run]" />
-    </list>
-    <recent_temporary>
-      <list size="2">
-        <item index="0" class="java.lang.String" itemvalue="Application.Application" />
-        <item index="1" class="java.lang.String" itemvalue="Maven.mrdear [spring-boot:run]" />
-      </list>
-    </recent_temporary>
-  </component>
-  <component name="ShelveChangesManager" show_recycled="false">
-    <option name="remove_strategy" value="false" />
-  </component>
-  <component name="SpringBeansView">
-    <option name="showGraph" value="false" />
-  </component>
-  <component name="SvnConfiguration">
-    <configuration>C:\Users\牛李\AppData\Roaming\Subversion</configuration>
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="b075e85b-bd5a-4a3a-b08d-7fddfc56d50d" name="Default" comment="" />
-      <created>1470710399332</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1470710399332</updated>
-      <workItem from="1470710400693" duration="7143000" />
-      <workItem from="1470720787213" duration="4023000" />
-      <workItem from="1470754544629" duration="733000" />
-      <workItem from="1470790098908" duration="2467000" />
-      <workItem from="1470838796281" duration="3332000" />
-      <workItem from="1470842606213" duration="2718000" />
-      <workItem from="1470878744928" duration="315000" />
-      <workItem from="1470879382007" duration="1107000" />
-      <workItem from="1470896548454" duration="2423000" />
-      <workItem from="1470899420892" duration="4992000" />
-      <workItem from="1470904490813" duration="7149000" />
-      <workItem from="1470967092766" duration="1015000" />
-      <workItem from="1470991443168" duration="3546000" />
-      <workItem from="1471008568351" duration="4378000" />
-      <workItem from="1471014641523" duration="3226000" />
-      <workItem from="1471054874279" duration="1247000" />
-      <workItem from="1471058589563" duration="4022000" />
-      <workItem from="1471083028805" duration="16000" />
-      <workItem from="1471095570546" duration="2169000" />
-      <workItem from="1471101709934" duration="827000" />
-      <workItem from="1471102543890" duration="2187000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="59035000" />
-  </component>
-  <component name="TodoView">
-    <todo-panel id="selected-file">
-      <is-autoscroll-to-source value="true" />
-    </todo-panel>
-    <todo-panel id="all">
-      <are-packages-shown value="true" />
-      <is-autoscroll-to-source value="true" />
-    </todo-panel>
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="-9" y="-9" width="1860" height="1098" extended-state="7" />
-    <editor active="true" />
-    <layout>
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3290461" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3279743" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32475883" sideWeight="0.50503355" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32606265" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="JRebel Executor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3033226" sideWeight="0.49496645" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3965702" sideWeight="0.49440715" order="12" side_tool="false" content_ui="tabs" />
-      <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3290461" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3290461" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
-      <window_info id="JRebel remote servers log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="15" side_tool="true" content_ui="tabs" />
-      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18903804" sideWeight="0.48961425" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32997763" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="JRebel" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.1756152" sideWeight="0.51038575" order="5" side_tool="true" content_ui="tabs" />
-      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32997763" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.17505592" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3290461" sideWeight="0.49328858" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16722596" sideWeight="0.50375134" order="6" side_tool="true" content_ui="tabs" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.724622" sideWeight="0.49776036" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="SVN Properties" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3290461" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32901832" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-    </layout>
-  </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <option name="time" value="6" />
-    </breakpoint-manager>
-    <watches-manager />
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/Application.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/conf/WEBMessageConvert.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="20" column="14" selection-start-line="20" selection-start-column="14" selection-end-line="20" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/cn/mrdear/ApplicationTest.java" />
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/1.4.0.RELEASE/spring-boot-1.4.0.RELEASE-sources.jar!/org/springframework/boot/SpringApplication.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="344">
-          <caret line="245" column="38" selection-start-line="245" selection-start-column="38" selection-end-line="245" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/1.4.0.RELEASE/spring-boot-autoconfigure-1.4.0.RELEASE-sources.jar!/org/springframework/boot/autoconfigure/SpringBootApplication.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-401">
-          <caret line="52" column="18" selection-start-line="52" selection-start-column="18" selection-end-line="52" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/1.4.0.RELEASE/spring-boot-autoconfigure-1.4.0.RELEASE-sources.jar!/org/springframework/boot/autoconfigure/web/HttpMessageConverters.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="214">
-          <caret line="77" column="11" selection-start-line="77" selection-start-column="11" selection-end-line="77" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/4.3.2.RELEASE/spring-context-4.3.2.RELEASE.jar!/org/springframework/context/annotation/Configuration.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="18" column="18" selection-start-line="18" selection-start-column="18" selection-end-line="18" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/4.3.2.RELEASE/spring-webmvc-4.3.2.RELEASE.jar!/org/springframework/web/servlet/config/ResourcesBeanDefinitionParser.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-396">
-          <caret line="42" column="6" selection-start-line="42" selection-start-column="6" selection-end-line="42" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/resources/static/a.txt" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/resources/logback-spring.xml" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/entity/DemoEntity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="8" column="28" selection-start-line="8" selection-start-column="28" selection-end-line="8" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/banner.txt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="44">
-          <caret line="2" column="40" selection-start-line="2" selection-start-column="40" selection-end-line="2" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.3.2.RELEASE/spring-web-4.3.2.RELEASE.jar!/org/springframework/web/bind/annotation/ControllerAdvice.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
-          <caret line="19" column="10" selection-start-line="19" selection-start-column="10" selection-end-line="19" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-thymeleaf/1.4.0.RELEASE/spring-boot-starter-thymeleaf-1.4.0.RELEASE.pom">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="261">
-          <caret line="29" column="12" selection-start-line="29" selection-start-column="12" selection-end-line="29" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/1.4.0.RELEASE/spring-boot-autoconfigure-1.4.0.RELEASE-sources.jar!/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafProperties.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1914">
-          <caret line="29" column="44" selection-start-line="29" selection-start-column="44" selection-end-line="29" selection-end-column="44" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/1.4.0.RELEASE/spring-boot-1.4.0.RELEASE-sources.jar!/org/springframework/boot/logging/LoggingApplicationListener.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2134">
-          <caret line="75" column="13" selection-start-line="75" selection-start-column="13" selection-end-line="75" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/bootstrap.min.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf/2.1.5.RELEASE/thymeleaf-2.1.5.RELEASE.jar!/org/thymeleaf/expression/Dates.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1518">
-          <caret line="18" column="19" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf-spring4/2.1.5.RELEASE/thymeleaf-spring4-2.1.5.RELEASE.jar!/org/thymeleaf/spring4/expression/Themes.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="132">
-          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/hello.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="13" column="70" selection-start-line="13" selection-start-column="70" selection-end-line="13" selection-end-column="70" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/resources/META-INF/additional-spring-configuration-metadata.json" />
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/1.4.0.RELEASE/spring-boot-autoconfigure-1.4.0.RELEASE-sources.jar!/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3036">
-          <caret line="178" column="16" selection-start-line="178" selection-start-column="16" selection-end-line="178" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_77/src.zip!/javax/sql/DataSource.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="83">
-          <caret line="76" column="47" selection-start-line="76" selection-start-column="47" selection-end-line="76" selection-end-column="47" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_77/src.zip!/javax/sql/CommonDataSource.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1501">
-          <caret line="37" column="17" selection-start-line="37" selection-start-column="17" selection-end-line="37" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/1.4.0.RELEASE/spring-boot-autoconfigure-1.4.0.RELEASE-sources.jar!/org/springframework/boot/autoconfigure/jdbc/DataSourceBuilder.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="55" column="36" selection-start-line="55" selection-start-column="36" selection-end-line="55" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/1.1.1/mybatis-spring-boot-autoconfigure-1.1.1.jar!/org/mybatis/spring/boot/autoconfigure/MybatisAutoConfiguration.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="236">
-          <caret line="83" column="29" selection-start-line="83" selection-start-column="29" selection-end-line="83" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/4.3.2.RELEASE/spring-context-4.3.2.RELEASE-sources.jar!/org/springframework/context/annotation/Primary.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1452">
-          <caret line="85" column="18" selection-start-line="85" selection-start-column="18" selection-end-line="85" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.0.19/druid-1.0.19.jar!/com/alibaba/druid/pool/DruidDataSource.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="298">
-          <caret line="1299" column="16" selection-start-line="1299" selection-start-column="16" selection-end-line="1299" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/conf/DruidStatViewServlet.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/conf/DruidConfig.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/filter/DruidStatFilter.java" />
-    <entry file="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/1.3.0/mybatis-spring-1.3.0.jar!/org/mybatis/spring/SqlSessionFactoryBean.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1284">
-          <caret line="65" column="11" selection-start-line="65" selection-start-column="11" selection-end-line="65" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/entity/User.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="66">
-          <caret line="5" column="8" selection-start-line="5" selection-start-column="8" selection-end-line="5" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/dao/UserDao.java" />
-    <entry file="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/1.3.0/mybatis-spring-1.3.0-sources.jar!/org/mybatis/spring/SqlSessionFactoryBean.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-9863">
-          <caret line="78" column="41" selection-start-line="78" selection-start-column="41" selection-end-line="78" selection-end-column="41" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/Application.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="14" column="5" selection-start-line="14" selection-start-column="5" selection-end-line="14" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/1.1.1/mybatis-spring-boot-autoconfigure-1.1.1.jar!/org/mybatis/spring/boot/autoconfigure/MybatisProperties.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="196">
-          <caret line="96" column="16" selection-start-line="96" selection-start-column="16" selection-end-line="96" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/mapper/UserMapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="8" column="18" selection-start-line="8" selection-start-column="18" selection-end-line="8" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/conf/WEBMessageConvert.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="21" column="7" selection-start-line="21" selection-start-column="7" selection-end-line="21" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/exception/PageException.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
-          <caret line="16" column="11" selection-start-line="16" selection-start-column="11" selection-end-line="16" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/conf/ServletConfig.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="4" selection-start-line="11" selection-start-column="4" selection-end-line="11" selection-end-column="4" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/1.4.0.RELEASE/spring-boot-1.4.0.RELEASE-sources.jar!/org/springframework/boot/web/servlet/FilterRegistrationBean.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="231">
-          <caret line="53" column="11" selection-start-line="53" selection-start-column="11" selection-end-line="53" selection-end-column="11" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-dependencies/1.4.0.RELEASE/spring-boot-dependencies-1.4.0.RELEASE.pom">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="338">
-          <caret line="71" column="40" selection-start-line="71" selection-start-column="33" selection-end-line="71" selection-end-column="40" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/conf/DataSourcesConfig.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-638">
-          <caret line="24" column="20" selection-start-line="24" selection-start-column="20" selection-end-line="24" selection-end-column="20" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/ehcache.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="352">
-          <caret line="16" column="0" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/UserMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="66">
-          <caret line="3" column="14" selection-start-line="3" selection-start-column="14" selection-end-line="3" selection-end-column="14" />
-          <folding>
-            <marker date="1471103718688" expanded="true" signature="388:421" ph="SELECT * FRO... user" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="14" column="28" selection-start-line="14" selection-start-column="28" selection-end-line="14" selection-end-column="28" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/conf/MybatisConfig.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
-          <caret line="47" column="39" selection-start-line="47" selection-start-column="39" selection-end-line="47" selection-end-column="39" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/conf/FilterConfig.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="429">
-          <caret line="34" column="9" selection-start-line="34" selection-start-column="9" selection-end-line="34" selection-end-column="9" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/controller/HelloController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="32" column="5" selection-start-line="32" selection-start-column="5" selection-end-line="32" selection-end-column="5" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="41" column="17" selection-start-line="41" selection-start-column="17" selection-end-line="41" selection-end-column="17" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>SpringBoot</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-                <option value="0.6" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectJDKs.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: ch.qos.logback:logback-classic:1.1.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/SpringBoot.iml b/Spring-Boot-Demo/SpringBoot.iml
deleted file mode 100644
index b428057..0000000
--- a/Spring-Boot-Demo/SpringBoot.iml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-    <facet type="JRebel" name="JRebel">
-      <configuration>
-        <option name="deleteUnindexed" value="true" />
-        <option name="httpAuthEnabled" value="false" />
-        <option name="httpPassword" />
-        <option name="httpUsername" />
-        <option name="ideModuleStorage">
-          <map>
-            <entry key="com.zeroturnaround.jrebel.FormatVersion" value="6.3.2" />
-            <entry key="com.zeroturnaround.jrebel.remoting.ModuleRemoteServerSelection" value="off" />
-          </map>
-        </option>
-        <option name="manualXML" value="false" />
-        <option name="masterModuleName" />
-        <option name="remotingEnabled" value="false" />
-        <option name="secure" value="true" />
-        <option name="url" />
-        <option name="xmlDir" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:1.4.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.4.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.4.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.4.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:1.4.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.21" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.21" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:1.4.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:1.4.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.4" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring4:2.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:2.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: ognl:ognl:3.0.8" level="project" />
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
-    <orderEntry type="library" name="Maven: org.unbescape:unbescape:1.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.groovy:groovy:2.4.7" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:1.4.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jdbc:8.5.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-juli:8.5.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:4.1.3" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:0.9.4" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis.caches:mybatis-ehcache:1.0.3" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.8" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache:2.10.2.2.21" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-web:2.0.4" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid:1.0.19" level="project" />
-    <orderEntry type="module-library">
-      <library name="Maven: com.alibaba:jconsole:1.8.0">
-        <CLASSES>
-          <root url="jar://C:/Program Files/Java/jdk1.8.0_77/jre/../lib/jconsole.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Maven: com.alibaba:tools:1.8.0">
-        <CLASSES>
-          <root url="jar://C:/Program Files/Java/jdk1.8.0_77/jre/../lib/tools.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.34" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.14" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.10" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/Spring-Boot-Demo/pom.xml b/Spring-Boot-Demo/pom.xml
index 7f49224..04ef1ea 100644
--- a/Spring-Boot-Demo/pom.xml
+++ b/Spring-Boot-Demo/pom.xml
@@ -3,11 +3,11 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>cn.mrdear</groupId>
-  <artifactId>mrdear</artifactId>
+  <artifactId>Spring-Boot-Demo</artifactId>
   <version>1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
-  <name>mrdear</name>
+  <name>Spring-Boot-Demo</name>
   <url>http://maven.apache.org</url>
 
   <properties>
diff --git a/Spring-Boot-Demo/src/main/java/cn/mrdear/entity/DemoEntity.java b/Spring-Boot-Demo/src/main/java/cn/mrdear/entity/DemoEntity.java
deleted file mode 100644
index 6a4711e..0000000
--- a/Spring-Boot-Demo/src/main/java/cn/mrdear/entity/DemoEntity.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package cn.mrdear.entity;
-
-/**
- * @author Niu Li
- * @date 2016/8/9
- */
-public class DemoEntity {
-    private String id;
-    private String username;
-    private String password;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-}
diff --git a/Spring-Boot-Demo/src/main/resources/application.properties b/Spring-Boot-Demo/src/main/resources/application.properties
index 884a55a..28aeafb 100644
--- a/Spring-Boot-Demo/src/main/resources/application.properties
+++ b/Spring-Boot-Demo/src/main/resources/application.properties
@@ -10,7 +10,7 @@ logging.level.cn.mrdear.mapper = trace
 #thymeleaf start
 spring.thymeleaf.mode=HTML5
 spring.thymeleaf.encoding=UTF-8
-spring.thymeleaf.content-type=text/html
-#����ʱ�رջ���,��Ȼû������ʵʱҳ��
+spring.thymeleaf.contents-type=text/html
+#����ʱ�رջ���,��Ȼû������ʵʱҳ��
 spring.thymeleaf.cache=false
 #thymeleaf end
diff --git a/Spring-Boot-Demo/src/main/resources/templates/hello.html b/Spring-Boot-Demo/src/main/resources/templates/hello.html
index 0da11da..b78e8a1 100644
--- a/Spring-Boot-Demo/src/main/resources/templates/hello.html
+++ b/Spring-Boot-Demo/src/main/resources/templates/hello.html
@@ -2,7 +2,7 @@
 <html xmlns:th="http://www.thymeleaf.org">
 <head>
     <title>hello</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta http-equiv="Content-Type" contents="text/html; charset=UTF-8" />
 </head>
 <body>
 
diff --git a/Spring-Cloud-Demo/Service-Discovery-Eureka/pom.xml b/Spring-Cloud-Demo/Service-Discovery-Eureka/pom.xml
new file mode 100644
index 0000000..9d30f7b
--- /dev/null
+++ b/Spring-Cloud-Demo/Service-Discovery-Eureka/pom.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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>
+        <groupId>cn.mrdear.springcloud</groupId>
+        <artifactId>springcloud-parent</artifactId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>service-discovery-eureka</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-eureka-server</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/Spring-Cloud-Demo/Service-Discovery-Eureka/src/main/java/cn/mrdear/EurekaApplication.java b/Spring-Cloud-Demo/Service-Discovery-Eureka/src/main/java/cn/mrdear/EurekaApplication.java
new file mode 100644
index 0000000..b60fdc0
--- /dev/null
+++ b/Spring-Cloud-Demo/Service-Discovery-Eureka/src/main/java/cn/mrdear/EurekaApplication.java
@@ -0,0 +1,17 @@
+package cn.mrdear;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer;
+
+/**
+ * @author Niu Li
+ * @since 2017/5/25
+ */
+@EnableEurekaServer//启动服务注册中心
+@SpringBootApplication
+public class EurekaApplication {
+  public static void main(String[] args) {
+    SpringApplication.run(EurekaApplication.class,args);
+  }
+}
diff --git a/Spring-Cloud-Demo/Service-Discovery-Eureka/src/main/resources/application.yml b/Spring-Cloud-Demo/Service-Discovery-Eureka/src/main/resources/application.yml
new file mode 100644
index 0000000..4bb275e
--- /dev/null
+++ b/Spring-Cloud-Demo/Service-Discovery-Eureka/src/main/resources/application.yml
@@ -0,0 +1,19 @@
+
+server:
+  port: 8761
+
+spring:
+  application:
+    name: eureka-server
+
+eureka:
+  instance:
+    hostname: localhost
+    prefer-ip-address: true
+  client:
+    register-with-eureka: false
+    fetch-registry: false
+    service-url:
+      defaultZone: http://${eureka.instance.hostname}:${server.port}/eureka/
+
+
diff --git a/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/pom.xml b/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/pom.xml
new file mode 100644
index 0000000..7a1f4b0
--- /dev/null
+++ b/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/pom.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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>springcloud-parent</artifactId>
+        <groupId>cn.mrdear.springcloud</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>cn.mrdear.springcloud</groupId>
+    <artifactId>Service-Product-Consumer-Feign-Hystrix</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-feign</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-eureka</artifactId>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file
diff --git a/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/src/main/java/UserConsumeFeignHystrixApplication.java b/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/src/main/java/UserConsumeFeignHystrixApplication.java
new file mode 100644
index 0000000..e9f93d4
--- /dev/null
+++ b/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/src/main/java/UserConsumeFeignHystrixApplication.java
@@ -0,0 +1,19 @@
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.netflix.feign.EnableFeignClients;
+
+
+/**
+ * @author Niu Li
+ * @since 2017/6/3
+ */
+@SpringBootApplication(scanBasePackages = "cn.medear.springcloud")
+@EnableDiscoveryClient
+@EnableFeignClients(basePackages = "cn.medear.springcloud.restclient")
+public class UserConsumeFeignHystrixApplication {
+
+  public static void main(String[] args) {
+    SpringApplication.run(UserConsumeFeignHystrixApplication.class, args);
+  }
+}
diff --git a/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/src/main/java/cn/medear/springcloud/controller/ConsumeUserController.java b/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/src/main/java/cn/medear/springcloud/controller/ConsumeUserController.java
new file mode 100644
index 0000000..e53e366
--- /dev/null
+++ b/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/src/main/java/cn/medear/springcloud/controller/ConsumeUserController.java
@@ -0,0 +1,41 @@
+package cn.medear.springcloud.controller;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+import cn.medear.springcloud.entity.User;
+import cn.medear.springcloud.restclient.UserClient;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 用于消费UserService的类
+ * @author Niu Li
+ * @since 2017/6/3
+ */
+@RestController
+@Slf4j
+public class ConsumeUserController {
+
+  @Resource
+  private UserClient userClient;
+
+  private static final ObjectMapper objectMapper = new ObjectMapper();
+
+  @GetMapping("/{id}")
+  public String findUserById(@PathVariable Long id) {
+    User user = userClient.findById(id);
+    String valueAsString = null;
+    try {
+      valueAsString = objectMapper.writeValueAsString(user);
+    } catch (JsonProcessingException e) {
+      log.error("parse json error. {}",e);
+    }
+    return valueAsString;
+  }
+}
diff --git a/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/src/main/java/cn/medear/springcloud/entity/User.java b/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/src/main/java/cn/medear/springcloud/entity/User.java
new file mode 100644
index 0000000..2dc8e22
--- /dev/null
+++ b/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/src/main/java/cn/medear/springcloud/entity/User.java
@@ -0,0 +1,25 @@
+package cn.medear.springcloud.entity;
+
+import java.io.Serializable;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+/**
+ * @author Niu Li
+ * @since 2017/6/3
+ */
+@Data
+@NoArgsConstructor
+@ToString
+public class User implements Serializable{
+
+  private static final long serialVersionUID = -2885884654600114856L;
+
+  private Long id;
+
+  private String username;
+
+  private String password;
+}
diff --git a/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/src/main/java/cn/medear/springcloud/restclient/UserClient.java b/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/src/main/java/cn/medear/springcloud/restclient/UserClient.java
new file mode 100644
index 0000000..2d75906
--- /dev/null
+++ b/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/src/main/java/cn/medear/springcloud/restclient/UserClient.java
@@ -0,0 +1,21 @@
+package cn.medear.springcloud.restclient;
+
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import cn.medear.springcloud.entity.User;
+import cn.medear.springcloud.restclient.failback.UserClientFailBack;
+
+/**
+ * @author Niu Li
+ * @since 2017/6/4
+ */
+@FeignClient(name = "service-user-provider",fallbackFactory = UserClientFailBack.class)
+public interface UserClient {
+
+  @RequestMapping(value = "/{id}",method = RequestMethod.GET)
+  User findById(@PathVariable("id") Long id);
+
+}
diff --git a/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/src/main/java/cn/medear/springcloud/restclient/failback/UserClientFailBack.java b/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/src/main/java/cn/medear/springcloud/restclient/failback/UserClientFailBack.java
new file mode 100644
index 0000000..4004042
--- /dev/null
+++ b/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/src/main/java/cn/medear/springcloud/restclient/failback/UserClientFailBack.java
@@ -0,0 +1,40 @@
+package cn.medear.springcloud.restclient.failback;
+
+import org.springframework.stereotype.Component;
+
+import cn.medear.springcloud.entity.User;
+import cn.medear.springcloud.restclient.UserClient;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 用户调用断路器
+ * @author Niu Li
+ * @since 2017/6/4
+ */
+@Slf4j
+@Component
+public class UserClientFailBack implements FallbackFactory<UserClient>{
+
+  private static UserClient userClient = new UserClientFailBackWithInfo();
+
+  /**
+   * 错误返回内容配置
+   */
+  @Override
+  public UserClient create(Throwable throwable) {
+    log.error("UserClient hystrix open,error is {}",throwable.getMessage());
+    return userClient;
+  }
+
+
+  private static class UserClientFailBackWithInfo implements UserClient{
+    @Override
+    public User findById(Long id) {
+      User user = new User();
+      user.setId(0L);
+      user.setUsername("失败用户");
+      return user;
+    }
+  }
+}
diff --git a/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/src/main/resources/application.yml b/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/src/main/resources/application.yml
new file mode 100644
index 0000000..729bcbe
--- /dev/null
+++ b/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/src/main/resources/application.yml
@@ -0,0 +1,24 @@
+server:
+  port: 8086
+
+spring:
+  application:
+    name: service-product-consumer-fegin-hystrix
+
+eureka:
+  client:
+    service-url:
+      default-zone: http://localhost:8761/eureka/
+  instance:
+    prefer-ip-address: true
+
+#开启断路器
+feign:
+  hystrix:
+    enabled: true
+
+# 负载均衡配置为随机,不配置默认轮询
+service-user-provider:
+  ribbon:
+    NFLoadBalancerRuleClassName: com.netflix.loadbalancer.RandomRule
+
diff --git a/Spring-Cloud-Demo/Service-Product-Consumer-Feign/pom.xml b/Spring-Cloud-Demo/Service-Product-Consumer-Feign/pom.xml
new file mode 100644
index 0000000..57785b7
--- /dev/null
+++ b/Spring-Cloud-Demo/Service-Product-Consumer-Feign/pom.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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>springcloud-parent</artifactId>
+        <groupId>cn.mrdear.springcloud</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>cn.mrdear.springcloud</groupId>
+    <artifactId>Service-Product-Consumer-Feign</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-feign</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-httpclient</artifactId>
+            <version>9.5.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-eureka</artifactId>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file
diff --git a/Spring-Cloud-Demo/Service-Product-Consumer-Feign/src/main/java/UserConsumeFeignApplication.java b/Spring-Cloud-Demo/Service-Product-Consumer-Feign/src/main/java/UserConsumeFeignApplication.java
new file mode 100644
index 0000000..7ad8139
--- /dev/null
+++ b/Spring-Cloud-Demo/Service-Product-Consumer-Feign/src/main/java/UserConsumeFeignApplication.java
@@ -0,0 +1,46 @@
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.netflix.feign.EnableFeignClients;
+import org.springframework.context.annotation.Bean;
+
+
+/**
+ * @author Niu Li
+ * @since 2017/6/3
+ */
+@SpringBootApplication(scanBasePackages = "cn.medear.springcloud.controller")
+@EnableDiscoveryClient
+@EnableFeignClients(basePackages = "cn.medear.springcloud.restclient")
+public class UserConsumeFeignApplication {
+
+  public static void main(String[] args) {
+    SpringApplication.run(UserConsumeFeignApplication.class, args);
+  }
+
+  /**
+   * 自定义feign的Httpclient,其注入在HttpClientFeignLoadBalancedConfiguration中
+   * @return
+   */
+  @Bean
+  public HttpClient feignHttpClient() {
+    PoolingHttpClientConnectionManager HTTP_CLIENT_CONNECTION_MANAGER =
+        new PoolingHttpClientConnectionManager(RegistryBuilder.<ConnectionSocketFactory>create().register("http", PlainConnectionSocketFactory.getSocketFactory()).register("https", SSLConnectionSocketFactory.getSocketFactory()).build());
+    HTTP_CLIENT_CONNECTION_MANAGER.setDefaultMaxPerRoute(100);
+    HTTP_CLIENT_CONNECTION_MANAGER.setMaxTotal(200);
+    RequestConfig requestConfig = RequestConfig.custom().setConnectionRequestTimeout(60000).setConnectTimeout(60000).setSocketTimeout(60000).build();
+    CloseableHttpClient httpClient = HttpClientBuilder.create()
+        .setConnectionManager(HTTP_CLIENT_CONNECTION_MANAGER)
+        .setDefaultRequestConfig(requestConfig).build();
+    return httpClient;
+  }
+}
diff --git a/Spring-Cloud-Demo/Service-Product-Consumer-Feign/src/main/java/cn/medear/springcloud/controller/ConsumeUserController.java b/Spring-Cloud-Demo/Service-Product-Consumer-Feign/src/main/java/cn/medear/springcloud/controller/ConsumeUserController.java
new file mode 100644
index 0000000..e53e366
--- /dev/null
+++ b/Spring-Cloud-Demo/Service-Product-Consumer-Feign/src/main/java/cn/medear/springcloud/controller/ConsumeUserController.java
@@ -0,0 +1,41 @@
+package cn.medear.springcloud.controller;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+import cn.medear.springcloud.entity.User;
+import cn.medear.springcloud.restclient.UserClient;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 用于消费UserService的类
+ * @author Niu Li
+ * @since 2017/6/3
+ */
+@RestController
+@Slf4j
+public class ConsumeUserController {
+
+  @Resource
+  private UserClient userClient;
+
+  private static final ObjectMapper objectMapper = new ObjectMapper();
+
+  @GetMapping("/{id}")
+  public String findUserById(@PathVariable Long id) {
+    User user = userClient.findById(id);
+    String valueAsString = null;
+    try {
+      valueAsString = objectMapper.writeValueAsString(user);
+    } catch (JsonProcessingException e) {
+      log.error("parse json error. {}",e);
+    }
+    return valueAsString;
+  }
+}
diff --git a/Spring-Cloud-Demo/Service-Product-Consumer-Feign/src/main/java/cn/medear/springcloud/entity/User.java b/Spring-Cloud-Demo/Service-Product-Consumer-Feign/src/main/java/cn/medear/springcloud/entity/User.java
new file mode 100644
index 0000000..2dc8e22
--- /dev/null
+++ b/Spring-Cloud-Demo/Service-Product-Consumer-Feign/src/main/java/cn/medear/springcloud/entity/User.java
@@ -0,0 +1,25 @@
+package cn.medear.springcloud.entity;
+
+import java.io.Serializable;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+/**
+ * @author Niu Li
+ * @since 2017/6/3
+ */
+@Data
+@NoArgsConstructor
+@ToString
+public class User implements Serializable{
+
+  private static final long serialVersionUID = -2885884654600114856L;
+
+  private Long id;
+
+  private String username;
+
+  private String password;
+}
diff --git a/Spring-Cloud-Demo/Service-Product-Consumer-Feign/src/main/java/cn/medear/springcloud/restclient/UserClient.java b/Spring-Cloud-Demo/Service-Product-Consumer-Feign/src/main/java/cn/medear/springcloud/restclient/UserClient.java
new file mode 100644
index 0000000..28606ea
--- /dev/null
+++ b/Spring-Cloud-Demo/Service-Product-Consumer-Feign/src/main/java/cn/medear/springcloud/restclient/UserClient.java
@@ -0,0 +1,20 @@
+package cn.medear.springcloud.restclient;
+
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import cn.medear.springcloud.entity.User;
+
+/**
+ * @author Niu Li
+ * @since 2017/6/4
+ */
+@FeignClient("service-user-provider")
+public interface UserClient {
+
+  @RequestMapping(value = "/{id}",method = RequestMethod.GET)
+  User findById(@PathVariable("id") Long id);
+
+}
diff --git a/Spring-Cloud-Demo/Service-Product-Consumer-Feign/src/main/resources/application.yml b/Spring-Cloud-Demo/Service-Product-Consumer-Feign/src/main/resources/application.yml
new file mode 100644
index 0000000..a57867d
--- /dev/null
+++ b/Spring-Cloud-Demo/Service-Product-Consumer-Feign/src/main/resources/application.yml
@@ -0,0 +1,23 @@
+server:
+  port: 8085
+
+spring:
+  application:
+    name: service-product-consumer-fegin
+
+eureka:
+  client:
+    service-url:
+      default-zone: http://localhost:8761/eureka/
+  instance:
+    prefer-ip-address: true
+
+feign:
+  httpclient:
+    enabled: true
+
+# 负载均衡配置为随机,不配置默认轮询
+service-user-provider:
+  ribbon:
+    NFLoadBalancerRuleClassName: com.netflix.loadbalancer.RandomRule
+
diff --git a/Spring-Cloud-Demo/Service-Product-Consumer-Ribbon/pom.xml b/Spring-Cloud-Demo/Service-Product-Consumer-Ribbon/pom.xml
new file mode 100644
index 0000000..5418098
--- /dev/null
+++ b/Spring-Cloud-Demo/Service-Product-Consumer-Ribbon/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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>springcloud-parent</artifactId>
+        <groupId>cn.mrdear.springcloud</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>cn.mrdear.springcloud</groupId>
+    <artifactId>Service-Product-Consumer-Ribbon</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-eureka</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/Spring-Cloud-Demo/Service-Product-Consumer-Ribbon/src/main/java/cn/mrdear/springcloud/UserConsumeApplication.java b/Spring-Cloud-Demo/Service-Product-Consumer-Ribbon/src/main/java/cn/mrdear/springcloud/UserConsumeApplication.java
new file mode 100644
index 0000000..5366289
--- /dev/null
+++ b/Spring-Cloud-Demo/Service-Product-Consumer-Ribbon/src/main/java/cn/mrdear/springcloud/UserConsumeApplication.java
@@ -0,0 +1,19 @@
+package cn.mrdear.springcloud;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+
+/**
+ * @author Niu Li
+ * @since 2017/6/3
+ */
+@SpringBootApplication
+@EnableDiscoveryClient
+public class UserConsumeApplication {
+
+  public static void main(String[] args) {
+    SpringApplication.run(UserConsumeApplication.class,args);
+  }
+
+}
diff --git a/Spring-Cloud-Demo/Service-Product-Consumer-Ribbon/src/main/java/cn/mrdear/springcloud/config/BeanConfig.java b/Spring-Cloud-Demo/Service-Product-Consumer-Ribbon/src/main/java/cn/mrdear/springcloud/config/BeanConfig.java
new file mode 100644
index 0000000..13e312c
--- /dev/null
+++ b/Spring-Cloud-Demo/Service-Product-Consumer-Ribbon/src/main/java/cn/mrdear/springcloud/config/BeanConfig.java
@@ -0,0 +1,22 @@
+package cn.mrdear.springcloud.config;
+
+import org.springframework.cloud.client.loadbalancer.LoadBalanced;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * @author Niu Li
+ * @since 2017/6/3
+ */
+@Configuration
+//@RibbonClient(name = "user-resporitory",configuration = MyConfig.class)
+//可以指定针对某服务器采取指定的配置负载均衡算法,配置文件中配置更加方便
+public class BeanConfig {
+
+  @Bean
+  @LoadBalanced //开启客户端负载均衡,自动配置类在LoadBalancerAutoConfiguration中
+  public RestTemplate restTemplate(){
+    return new RestTemplate();
+  }
+}
diff --git a/Spring-Cloud-Demo/Service-Product-Consumer-Ribbon/src/main/java/cn/mrdear/springcloud/controller/ConsumeUserController.java b/Spring-Cloud-Demo/Service-Product-Consumer-Ribbon/src/main/java/cn/mrdear/springcloud/controller/ConsumeUserController.java
new file mode 100644
index 0000000..a839637
--- /dev/null
+++ b/Spring-Cloud-Demo/Service-Product-Consumer-Ribbon/src/main/java/cn/mrdear/springcloud/controller/ConsumeUserController.java
@@ -0,0 +1,25 @@
+package cn.mrdear.springcloud.controller;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.RestTemplate;
+
+import javax.annotation.Resource;
+
+/**
+ * 用于消费UserService的类
+ * @author Niu Li
+ * @since 2017/6/3
+ */
+@RestController
+public class ConsumeUserController {
+
+  @Resource
+  private RestTemplate restTemplate;
+
+  @GetMapping("/{id}")
+  public String findUserById(@PathVariable Long id) {
+    return restTemplate.getForObject("http://service-user-provider/"+id,String.class);
+  }
+}
diff --git a/Spring-Cloud-Demo/Service-Product-Consumer-Ribbon/src/main/resources/application.yml b/Spring-Cloud-Demo/Service-Product-Consumer-Ribbon/src/main/resources/application.yml
new file mode 100644
index 0000000..efa8d13
--- /dev/null
+++ b/Spring-Cloud-Demo/Service-Product-Consumer-Ribbon/src/main/resources/application.yml
@@ -0,0 +1,18 @@
+server:
+  port: 8082
+
+spring:
+  application:
+    name: service-product-consumer-ribbon
+
+eureka:
+  client:
+    service-url:
+      default-zone: http://localhost:8761/eureka/
+  instance:
+      prefer-ip-address: true
+
+# 负载均衡配置为随机,不配置默认轮询
+service-user-provider:
+  ribbon:
+    NFLoadBalancerRuleClassName: com.netflix.loadbalancer.RandomRule
diff --git a/Spring-Cloud-Demo/Service-User-Provider/pom.xml b/Spring-Cloud-Demo/Service-User-Provider/pom.xml
new file mode 100644
index 0000000..e1b37bb
--- /dev/null
+++ b/Spring-Cloud-Demo/Service-User-Provider/pom.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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>springcloud-parent</artifactId>
+        <groupId>cn.mrdear.springcloud</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>cn.mrdear.springcloud</groupId>
+    <artifactId>Service-User-Provider</artifactId>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-eureka</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/Spring-Cloud-Demo/Service-User-Provider/src/main/java/cn/mrdear/UserApplication.java b/Spring-Cloud-Demo/Service-User-Provider/src/main/java/cn/mrdear/UserApplication.java
new file mode 100644
index 0000000..acfdfec
--- /dev/null
+++ b/Spring-Cloud-Demo/Service-User-Provider/src/main/java/cn/mrdear/UserApplication.java
@@ -0,0 +1,19 @@
+package cn.mrdear;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+
+/**
+ * @author Niu Li
+ * @since 2017/5/25
+ */
+@EnableDiscoveryClient
+@SpringBootApplication
+public class UserApplication {
+
+  public static void main(String[] args) {
+    SpringApplication.run(UserApplication.class,args);
+  }
+
+}
diff --git a/Spring-Cloud-Demo/Service-User-Provider/src/main/java/cn/mrdear/controller/UserController.java b/Spring-Cloud-Demo/Service-User-Provider/src/main/java/cn/mrdear/controller/UserController.java
new file mode 100644
index 0000000..4135af0
--- /dev/null
+++ b/Spring-Cloud-Demo/Service-User-Provider/src/main/java/cn/mrdear/controller/UserController.java
@@ -0,0 +1,61 @@
+package cn.mrdear.controller;
+
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.client.ServiceInstance;
+import org.springframework.cloud.client.discovery.DiscoveryClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import cn.mrdear.entity.User;
+import cn.mrdear.resporitory.UserResporitory;
+
+/**
+ * @author Niu Li
+ * @since 2017/5/25
+ */
+@RestController
+public class UserController {
+
+  @Value("${spring.application.name}")
+  private String serverName;
+
+  @Resource
+  private UserResporitory userResporitory;
+
+  @Resource
+  private DiscoveryClient discoveryClient;
+
+  @RequestMapping(value = "/add" ,method = RequestMethod.GET)
+  public User add(String username,String password) {
+    User user = new User();
+    user.setUsername(username);
+    user.setPassword(password);
+    userResporitory.saveAndFlush(user);
+    return user;
+  }
+
+  @GetMapping("/{id}")
+  public User find(@PathVariable Long id) {
+    return userResporitory.findOne(id);
+  }
+
+  @GetMapping("/list")
+  public List<User> findAll(){
+    return userResporitory.findAll();
+  }
+
+  @GetMapping("/console")
+  public List<ServiceInstance> console(){
+    List<ServiceInstance> instances = discoveryClient.getInstances(serverName);
+    return instances;
+  }
+
+}
diff --git a/Spring-Cloud-Demo/Service-User-Provider/src/main/java/cn/mrdear/entity/User.java b/Spring-Cloud-Demo/Service-User-Provider/src/main/java/cn/mrdear/entity/User.java
new file mode 100644
index 0000000..fb3e22c
--- /dev/null
+++ b/Spring-Cloud-Demo/Service-User-Provider/src/main/java/cn/mrdear/entity/User.java
@@ -0,0 +1,32 @@
+package cn.mrdear.entity;
+
+import java.io.Serializable;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+/**
+ * @author Niu Li
+ * @since 2017/6/3
+ */
+@Data
+@NoArgsConstructor
+@ToString
+@Entity
+public class User implements Serializable{
+
+  private static final long serialVersionUID = -2885884654600114856L;
+
+  @Id
+  @GeneratedValue
+  private Long id;
+
+  private String username;
+
+  private String password;
+}
diff --git a/Spring-Cloud-Demo/Service-User-Provider/src/main/java/cn/mrdear/resporitory/UserResporitory.java b/Spring-Cloud-Demo/Service-User-Provider/src/main/java/cn/mrdear/resporitory/UserResporitory.java
new file mode 100644
index 0000000..36ec6bd
--- /dev/null
+++ b/Spring-Cloud-Demo/Service-User-Provider/src/main/java/cn/mrdear/resporitory/UserResporitory.java
@@ -0,0 +1,15 @@
+package cn.mrdear.resporitory;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import cn.mrdear.entity.User;
+
+/**
+ * @author Niu Li
+ * @since 2017/6/3
+ */
+@Repository
+public interface UserResporitory extends JpaRepository<User,Long>{
+
+}
diff --git a/Spring-Cloud-Demo/Service-User-Provider/src/main/resources/application.yml b/Spring-Cloud-Demo/Service-User-Provider/src/main/resources/application.yml
new file mode 100644
index 0000000..dec0aa8
--- /dev/null
+++ b/Spring-Cloud-Demo/Service-User-Provider/src/main/resources/application.yml
@@ -0,0 +1,20 @@
+server:
+  port: 8083
+spring:
+  application:
+    name: service-user-provider
+  jpa:
+    generate-ddl: false
+    show-sql: true
+    hibernate:
+      ddl-auto: none
+  datasource:
+    platform: h2
+    schema: classpath:database/schema.sql
+    data: classpath:database/data.sql
+eureka:
+  client:
+    service-url:
+      default-zone: http://localhost:8761/eureka/
+  instance:
+    prefer-ip-address: true
\ No newline at end of file
diff --git a/Spring-Cloud-Demo/Service-User-Provider/src/main/resources/database/data.sql b/Spring-Cloud-Demo/Service-User-Provider/src/main/resources/database/data.sql
new file mode 100644
index 0000000..8d203ef
--- /dev/null
+++ b/Spring-Cloud-Demo/Service-User-Provider/src/main/resources/database/data.sql
@@ -0,0 +1,3 @@
+INSERT INTO user(username,password) VALUES ('张三','111111');
+INSERT INTO user(username,password) VALUES ('李四','111111');
+INSERT INTO user(username,password) VALUES ('王二','111111');
\ No newline at end of file
diff --git a/Spring-Cloud-Demo/Service-User-Provider/src/main/resources/database/schema.sql b/Spring-Cloud-Demo/Service-User-Provider/src/main/resources/database/schema.sql
new file mode 100644
index 0000000..737b628
--- /dev/null
+++ b/Spring-Cloud-Demo/Service-User-Provider/src/main/resources/database/schema.sql
@@ -0,0 +1,6 @@
+drop table user if exists;
+create table user (
+  id INT(11) AUTO_INCREMENT PRIMARY KEY ,
+  username VARCHAR(255),
+  password VARCHAR(255)
+  );
\ No newline at end of file
diff --git a/Spring-Cloud-Demo/Service-User-Provider/target/classes/cn/mrdear/Application.class b/Spring-Cloud-Demo/Service-User-Provider/target/classes/cn/mrdear/Application.class
new file mode 100644
index 0000000..0625b42
Binary files /dev/null and b/Spring-Cloud-Demo/Service-User-Provider/target/classes/cn/mrdear/Application.class differ
diff --git a/Spring-Cloud-Demo/pom.xml b/Spring-Cloud-Demo/pom.xml
new file mode 100644
index 0000000..9b0ac77
--- /dev/null
+++ b/Spring-Cloud-Demo/pom.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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>cn.mrdear.springcloud</groupId>
+    <artifactId>springcloud-parent</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0.0</version>
+
+    <modules>
+        <module>Service-Discovery-Eureka</module>
+        <module>Service-User-Provider</module>
+        <module>Service-Product-Consumer-Ribbon</module>
+        <module>Service-Product-Consumer-Feign</module>
+        <module>Service-Product-Consumer-Feign-Hystrix</module>
+    </modules>
+
+    <!--Spring Boot依赖-->
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>1.5.2.RELEASE</version>
+    </parent>
+
+    <properties>
+        <spring.cloud.version>Dalston.SR1</spring.cloud.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+    </dependencies>
+
+    <!--Spring Cloud依赖-->
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring.cloud.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.6.1</version>
+                <configuration>
+                    <compilerVersion>1.8</compilerVersion>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/Spring-Data-Redis/pom.xml b/Spring-Data-Redis/pom.xml
new file mode 100644
index 0000000..ff7aa0f
--- /dev/null
+++ b/Spring-Data-Redis/pom.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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>cn.mrdear</groupId>
+    <artifactId>Spring-Data-Redis</artifactId>
+    <version>1.0.0</version>
+    <name>Spring-Data-Redis</name>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>1.5.2.RELEASE</version>
+    </parent>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <java.version>1.8</java.version>
+    </properties>
+
+    <dependencies>
+        <!--spring boot start-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <!--swagger start-->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>2.6.1</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>2.6.1</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/Spring-Data-Redis/src/main/java/cn/mrdear/Application.java b/Spring-Data-Redis/src/main/java/cn/mrdear/Application.java
new file mode 100644
index 0000000..be24911
--- /dev/null
+++ b/Spring-Data-Redis/src/main/java/cn/mrdear/Application.java
@@ -0,0 +1,17 @@
+package cn.mrdear;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * @author Niu Li
+ * @since 2017/3/28
+ */
+@SpringBootApplication
+public class Application {
+  public static void main( String[] args )
+  {
+    SpringApplication.run(Application.class, args);
+  }
+
+}
diff --git a/Spring-Data-Redis/src/main/java/cn/mrdear/conf/SwaggerConfig.java b/Spring-Data-Redis/src/main/java/cn/mrdear/conf/SwaggerConfig.java
new file mode 100644
index 0000000..e7f7c12
--- /dev/null
+++ b/Spring-Data-Redis/src/main/java/cn/mrdear/conf/SwaggerConfig.java
@@ -0,0 +1,59 @@
+package cn.mrdear.conf;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.context.request.async.DeferredResult;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Contact;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+/**
+ * @author Niu Li
+ * @since 2017/3/30
+ */
+@Configuration
+@EnableSwagger2
+public class SwaggerConfig extends WebMvcConfigurerAdapter {
+
+  /**
+   * 使用enableMVC注解的话,该配置必须,否则无法映射资源
+   */
+  @Override
+  public void addResourceHandlers(ResourceHandlerRegistry registry) {
+    registry.addResourceHandler("swagger-ui.html")
+        .addResourceLocations("classpath:/META-INF/resources/");
+    registry.addResourceHandler("/webjars/**")
+        .addResourceLocations("classpath:/META-INF/resources/webjars/");
+
+  }
+
+  @Bean
+  public Docket createRestApi() {
+    return new Docket(DocumentationType.SWAGGER_2)
+        .groupName("api")
+        .genericModelSubstitutes(DeferredResult.class)
+        .useDefaultResponseMessages(false)
+        .forCodeGeneration(true)
+        .pathMapping("/")
+        .select()
+        .build()
+        .apiInfo(apiInfo());
+  }
+
+  private ApiInfo apiInfo() {
+    Contact contact = new Contact("屈定","http://mrdear.cn","niudear@foxmail.com");
+    return new ApiInfoBuilder()
+        .title("Spring Data Redis")
+        .description("Spring Data Redis学习记录")
+        .termsOfServiceUrl("http://mrdear.cn")
+        .contact(contact)
+        .version("1.0")
+        .build();
+  }
+}
diff --git a/Spring-Data-Redis/src/main/java/cn/mrdear/controller/UserController.java b/Spring-Data-Redis/src/main/java/cn/mrdear/controller/UserController.java
new file mode 100644
index 0000000..6eda395
--- /dev/null
+++ b/Spring-Data-Redis/src/main/java/cn/mrdear/controller/UserController.java
@@ -0,0 +1,63 @@
+package cn.mrdear.controller;
+
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import javax.annotation.Resource;
+
+import cn.mrdear.dao.UserDao;
+import cn.mrdear.model.User;
+import cn.mrdear.util.MockUserUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+
+/**
+ * @author Niu Li
+ * @since 2017/3/30
+ */
+@Api(description = "提供增删改查,swagger示例",tags = "API-UserController")
+@RestController
+@RequestMapping(value = "/api/v1")
+public class UserController {
+  @Resource
+  private UserDao userDao;
+
+  @ApiOperation(value = "查询全部用户",httpMethod = "GET")
+  @ApiResponse(code = 200,message = "Success")
+  @RequestMapping(value = "/users",method = RequestMethod.GET)
+  public List<User> getAllUsers(){
+    return userDao.query();
+  }
+
+  @ApiOperation(value = "查询单个用户",notes = "根据传入id查找用户",httpMethod = "GET")
+  @ApiResponse(code = 200,message = "Success")
+  @RequestMapping(value = "/user/{id}",method = RequestMethod.GET)
+  public User getUser(@PathVariable("id") Integer id){
+    return userDao.find(id);
+  }
+
+  @ApiOperation(value = "批量插入用户",notes = "根据传入参数增加用户",httpMethod = "POST")
+  @ApiResponse(code = 200,message = "Success")
+  @RequestMapping(value = "/user",method = RequestMethod.POST)
+  public List<User> InsertUser(Integer nums){
+    if (Objects.isNull(nums)){
+      nums = 10;
+    }
+    List<User> users = new ArrayList<>();
+    for (Integer i = 0; i < nums; i++) {
+      User user = MockUserUtil.mockSignle();
+      userDao.save(user);
+      users.add(user);
+    }
+    return users;
+  }
+
+
+}
diff --git a/Spring-Data-Redis/src/main/java/cn/mrdear/dao/UserDao.java b/Spring-Data-Redis/src/main/java/cn/mrdear/dao/UserDao.java
new file mode 100644
index 0000000..35b01e8
--- /dev/null
+++ b/Spring-Data-Redis/src/main/java/cn/mrdear/dao/UserDao.java
@@ -0,0 +1,84 @@
+package cn.mrdear.dao;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.data.redis.core.HashOperations;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Repository;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import javax.annotation.Resource;
+
+import cn.mrdear.model.User;
+
+/**
+ * redis操作示例
+ *
+ * @author Niu Li
+ * @since 2017/3/30
+ */
+@Repository
+public class UserDao {
+  private static Logger logger = LoggerFactory.getLogger(UserDao.class);
+  @Resource
+  private StringRedisTemplate stringRedisTemplate;
+
+  private static final String KEY_PREFIX = "users";
+
+  private ObjectMapper objectMapper = new ObjectMapper();
+
+  /**
+   * 保存一个用户
+   */
+  public void save(User user) {
+    HashOperations<String, String, String> opsForHash = stringRedisTemplate.opsForHash();
+    try {
+      opsForHash.put(KEY_PREFIX, user.getId() + "", objectMapper.writeValueAsString(user));
+    } catch (JsonProcessingException e) {
+      logger.error("save user error,user id is ", user.getId());
+    }
+  }
+
+  /**
+   * 插入一个用户
+   * @param id 用户id
+   * @return 用户
+   */
+  public User find(Integer id) {
+    try {
+      HashOperations<String, String, String> opsForHash = stringRedisTemplate.opsForHash();
+      String userJson = opsForHash.get(KEY_PREFIX, id.toString());
+      if (Objects.isNull(userJson)){
+        return null;
+      }
+      return objectMapper.readValue(userJson, User.class);
+    } catch (IOException e) {
+      logger.error("find user error id is {}",id);
+    }
+    return null;
+  }
+
+  /**
+   * 查询全部用户
+   */
+  public List<User> query(){
+    HashOperations<String, String, String> opsForHash = stringRedisTemplate.opsForHash();
+    List<String> usersJson = opsForHash.values(KEY_PREFIX);
+    List<User> users = new ArrayList<>(usersJson.size());
+    usersJson.forEach(x -> {
+      try {
+        users.add(objectMapper.readValue(x,User.class));
+      } catch (IOException e) {
+        logger.error("read user error id is {}",x);
+      }
+    });
+    return users;
+  }
+}
diff --git a/Spring-Data-Redis/src/main/java/cn/mrdear/model/User.java b/Spring-Data-Redis/src/main/java/cn/mrdear/model/User.java
new file mode 100644
index 0000000..f9047ed
--- /dev/null
+++ b/Spring-Data-Redis/src/main/java/cn/mrdear/model/User.java
@@ -0,0 +1,36 @@
+package cn.mrdear.model;
+
+/**
+ * 测试用户
+ * @author Niu Li
+ * @since 2017/3/30
+ */
+public class User {
+  private Long id;
+  private String username;
+  private String password;
+
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  public String getUsername() {
+    return username;
+  }
+
+  public void setUsername(String username) {
+    this.username = username;
+  }
+
+  public String getPassword() {
+    return password;
+  }
+
+  public void setPassword(String password) {
+    this.password = password;
+  }
+}
diff --git a/Spring-Data-Redis/src/main/java/cn/mrdear/publish/Listen.java b/Spring-Data-Redis/src/main/java/cn/mrdear/publish/Listen.java
new file mode 100644
index 0000000..841fdc1
--- /dev/null
+++ b/Spring-Data-Redis/src/main/java/cn/mrdear/publish/Listen.java
@@ -0,0 +1,29 @@
+package cn.mrdear.publish;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import java.util.concurrent.CountDownLatch;
+
+/**
+ * 消息订阅者
+ * @author Niu Li
+ * @since 2017/3/29
+ */
+@Component
+public class Listen {
+
+  private static Logger logger = LoggerFactory.getLogger(Listen.class);
+
+  private CountDownLatch latch = new CountDownLatch(1);
+
+  public void handleMsg(String message) {
+    logger.info("reciver msg :" + message);
+    latch.countDown();
+  }
+
+  public CountDownLatch getLatch() {
+    return latch;
+  }
+}
diff --git a/Spring-Data-Redis/src/main/java/cn/mrdear/publish/PublishConfig.java b/Spring-Data-Redis/src/main/java/cn/mrdear/publish/PublishConfig.java
new file mode 100644
index 0000000..51bdc5e
--- /dev/null
+++ b/Spring-Data-Redis/src/main/java/cn/mrdear/publish/PublishConfig.java
@@ -0,0 +1,37 @@
+package cn.mrdear.publish;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.listener.PatternTopic;
+import org.springframework.data.redis.listener.RedisMessageListenerContainer;
+import org.springframework.data.redis.listener.adapter.MessageListenerAdapter;
+
+/**
+ * @author Niu Li
+ * @since 2017/3/29
+ */
+@Configuration
+public class PublishConfig {
+  /**
+   * 注入消息容器
+   * @param jedisConnectionFactory jedis连接池
+   * @param listenerAdapter 监听适配器
+   * @return bean
+   */
+  @Bean
+  public RedisMessageListenerContainer container(RedisConnectionFactory jedisConnectionFactory,
+      MessageListenerAdapter listenerAdapter){
+    RedisMessageListenerContainer container = new RedisMessageListenerContainer();
+    container.setConnectionFactory(jedisConnectionFactory);
+    //绑定监听者与信道的管理
+    container.addMessageListener(listenerAdapter,new PatternTopic("java"));
+    return container;
+  }
+
+  @Bean
+  public MessageListenerAdapter adapter(Listen listen){
+    //指定监听者和监听方法
+    return new MessageListenerAdapter(listen,"handleMsg");
+  }
+}
diff --git a/Spring-Data-Redis/src/main/java/cn/mrdear/util/MockUserUtil.java b/Spring-Data-Redis/src/main/java/cn/mrdear/util/MockUserUtil.java
new file mode 100644
index 0000000..23110ed
--- /dev/null
+++ b/Spring-Data-Redis/src/main/java/cn/mrdear/util/MockUserUtil.java
@@ -0,0 +1,49 @@
+package cn.mrdear.util;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+import java.util.UUID;
+
+import cn.mrdear.model.User;
+
+/**
+ * mock虚拟用户
+ * @author Niu Li
+ * @since 2017/3/30
+ */
+public class MockUserUtil {
+
+  //mock数据来源
+  private static String[] namePrefix = {"赵","钱","孙","李","周","吴","郑","王"};
+  private static String[] nameSuffix = {"一","二","三","四","五","六","七","八"};
+
+  private static Random random = new Random();
+
+  /**
+   * mock用户
+   * @return 用户实体
+   */
+  public static User mockSignle(){
+    User user = new User();
+    int x = random.nextInt(namePrefix.length);
+    String userName = namePrefix[x]+nameSuffix[x];
+    user.setId((long) x);
+    user.setUsername(userName);
+    user.setPassword(UUID.randomUUID().toString());
+    return user;
+  }
+
+  /**
+   * mock集合
+   * @param num 集合数量
+   * @return  集合
+   */
+  public static List<User> mockList(int num){
+    List<User> users = new ArrayList<>();
+    for (int i = 0; i < num; i++) {
+      users.add(mockSignle());
+    }
+    return users;
+  }
+}
diff --git a/Spring-Data-Redis/src/main/resources/application.properties b/Spring-Data-Redis/src/main/resources/application.properties
new file mode 100644
index 0000000..3fb5d36
--- /dev/null
+++ b/Spring-Data-Redis/src/main/resources/application.properties
@@ -0,0 +1,24 @@
+#logger start
+logging.path = logs/loging.log
+logging.level.cn.mrdear = debug
+#logger end
+
+# spring date redis start
+# Redis数据库索引（默认为0）
+spring.redis.database=0
+# Redis服务器地址
+spring.redis.host=115.159.185.14
+# Redis服务器连接端口
+spring.redis.port=6379
+# Redis服务器连接密码（默认为空）
+spring.redis.password=
+# 连接池最大连接数（使用负值表示没有限制）
+spring.redis.pool.max-active=8
+# 连接池最大阻塞等待时间（使用负值表示没有限制）
+spring.redis.pool.max-wait=-1
+# 连接池中的最大空闲连接
+spring.redis.pool.max-idle=8
+# 连接池中的最小空闲连接
+spring.redis.pool.min-idle=0
+# 连接超时时间（毫秒）
+spring.redis.timeout=2000
diff --git a/Spring-Data-Redis/src/test/java/cn/mrdear/test/RedisConnectTest.java b/Spring-Data-Redis/src/test/java/cn/mrdear/test/RedisConnectTest.java
new file mode 100644
index 0000000..131413d
--- /dev/null
+++ b/Spring-Data-Redis/src/test/java/cn/mrdear/test/RedisConnectTest.java
@@ -0,0 +1,86 @@
+package cn.mrdear.test;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.dao.DataAccessException;
+import org.springframework.data.redis.connection.RedisConnection;
+import org.springframework.data.redis.connection.StringRedisConnection;
+import org.springframework.data.redis.core.RedisCallback;
+import org.springframework.data.redis.core.RedisOperations;
+import org.springframework.data.redis.core.SessionCallback;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import cn.mrdear.Application;
+import cn.mrdear.publish.Listen;
+
+/**
+ * @author Niu Li
+ * @since 2017/3/28
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes = Application.class)
+public class RedisConnectTest {
+  @Resource
+  private StringRedisTemplate stringRedisTemplate;
+  @Resource
+  private Listen listen;
+  @Test
+  public void testSetAndGet() {
+    stringRedisTemplate.opsForValue().set("ping","pong");
+    System.out.println(stringRedisTemplate.opsForValue().get("ping"));
+  }
+
+  @Test
+  public void testPublish() throws InterruptedException {
+    stringRedisTemplate.convertAndSend("java","hello world");
+    listen.getLatch().await();
+  }
+
+  @Test
+  public void testMulti() {
+    boolean isThrow = false;
+    List<Object> result = null;
+    try {
+      result = stringRedisTemplate.execute(new SessionCallback<List<Object>>() {
+        @Override
+        public List<Object> execute(RedisOperations operations) throws
+            DataAccessException {
+          operations.multi();
+          ValueOperations<String,String> ops = operations.opsForValue();
+          ops.set("ping1","pong1");
+          ops.set("ping2","pong2");
+          if (isThrow){
+            throw new IllegalArgumentException("测试异常");
+          }
+          return operations.exec();
+        }
+      });
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+
+    System.out.println(result);
+  }
+
+  @Test
+  public void testPipe() {
+//pop a specified number of items from a queue
+    List<Object> results = stringRedisTemplate.executePipelined(
+        new RedisCallback<Object>() {
+          public Object doInRedis(RedisConnection connection) throws DataAccessException {
+            StringRedisConnection stringRedisConn = (StringRedisConnection)connection;
+            for(int i=0; i< 10; i++) {
+              stringRedisConn.rPush("myqueue",i+"");
+            }
+            return null;
+          }
+        });
+  }
+}
diff --git a/Spring-Security-Demo/pom.xml b/Spring-Security-Demo/pom.xml
new file mode 100644
index 0000000..034f981
--- /dev/null
+++ b/Spring-Security-Demo/pom.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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>cn.mrdear.security</groupId>
+    <artifactId>Spring-Security-Demo</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>1.5.4.RELEASE</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <!--jwt依赖-->
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+            <version>0.7.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.5</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>21.0</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>
\ No newline at end of file
diff --git a/Spring-Security-Demo/src/main/java/cn/mrdear/security/Application.java b/Spring-Security-Demo/src/main/java/cn/mrdear/security/Application.java
new file mode 100644
index 0000000..a8425d5
--- /dev/null
+++ b/Spring-Security-Demo/src/main/java/cn/mrdear/security/Application.java
@@ -0,0 +1,17 @@
+package cn.mrdear.security;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * @author Niu Li
+ * @since 2017/6/16
+ */
+@SpringBootApplication
+public class Application {
+
+  public static void main(String[] args) {
+    SpringApplication.run(Application.class, args);
+  }
+
+}
diff --git a/Spring-Security-Demo/src/main/java/cn/mrdear/security/config/CommonBeanConfig.java b/Spring-Security-Demo/src/main/java/cn/mrdear/security/config/CommonBeanConfig.java
new file mode 100644
index 0000000..bc1958e
--- /dev/null
+++ b/Spring-Security-Demo/src/main/java/cn/mrdear/security/config/CommonBeanConfig.java
@@ -0,0 +1,23 @@
+package cn.mrdear.security.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import cn.mrdear.security.util.JwtTokenUtil;
+
+/**
+ * 配置一些线程安全的工具类
+ * @author Niu Li
+ * @since 2017/6/28
+ */
+@Configuration
+public class CommonBeanConfig {
+
+  /**
+   * 配置jwt token
+   */
+  @Bean
+  public JwtTokenUtil configToken() {
+    return new JwtTokenUtil();
+  }
+}
diff --git a/Spring-Security-Demo/src/main/java/cn/mrdear/security/config/CorsFilter.java b/Spring-Security-Demo/src/main/java/cn/mrdear/security/config/CorsFilter.java
new file mode 100644
index 0000000..2babd09
--- /dev/null
+++ b/Spring-Security-Demo/src/main/java/cn/mrdear/security/config/CorsFilter.java
@@ -0,0 +1,40 @@
+package cn.mrdear.security.config;
+
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import java.io.IOException;
+
+
+public class CorsFilter implements javax.servlet.Filter {
+  @Override
+  public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+    System.err.println("CorsFilter");
+    HttpServletResponse res = (HttpServletResponse) response;
+    HttpServletRequest req = (HttpServletRequest) request;
+
+    res.setHeader("Access-Control-Allow-Origin", "*");
+    res.setHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT, OPTIONS");
+    res.setHeader("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept, Accept-Encoding, Accept-Language, Host, Referer, Connection, User-Agent, authorization, sw-useragent, sw-version");
+
+    // Just REPLY OK if request method is OPTIONS for CORS (pre-flight)
+    if (req.getMethod().equals("OPTIONS")) {
+      res.setStatus(HttpServletResponse.SC_OK);
+      return;
+    }
+    chain.doFilter(request, response);
+  }
+
+  @Override
+  public void destroy() {
+  }
+
+  @Override
+  public void init(FilterConfig filterConfig) throws ServletException {
+  }
+}
diff --git a/Spring-Security-Demo/src/main/java/cn/mrdear/security/config/SecurityConfig.java b/Spring-Security-Demo/src/main/java/cn/mrdear/security/config/SecurityConfig.java
new file mode 100644
index 0000000..0c7f13a
--- /dev/null
+++ b/Spring-Security-Demo/src/main/java/cn/mrdear/security/config/SecurityConfig.java
@@ -0,0 +1,64 @@
+package cn.mrdear.security.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.builders.WebSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.web.access.channel.ChannelProcessingFilter;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+import org.springframework.security.web.context.NullSecurityContextRepository;
+
+import cn.mrdear.security.util.JwtTokenUtil;
+
+import javax.annotation.Resource;
+
+/**
+ * Spring Security配置类
+ * @author Niu Li
+ * @since 2017/6/16
+ */
+@Configuration
+@EnableWebSecurity
+public class SecurityConfig extends WebSecurityConfigurerAdapter {
+
+  @Resource
+  private JwtTokenUtil jwtTokenUtil;
+
+  /**
+   * 在此配置不过滤的请求
+   */
+  @Override
+  public void configure(WebSecurity web) throws Exception {
+    //每一个请求对应一个空的filter链,这里一般不要配置过多,
+    // 因为查找处是一个for循环,过多就导致每个请求都需要循环一遍直到找到
+    web.ignoring().antMatchers("/","/login","/favicon.ico");
+  }
+
+  /**
+   * 在此配置过滤链
+   */
+  @Override
+  protected void configure(HttpSecurity http) throws Exception {
+    http
+        .authorizeRequests()
+        //角色定义,Spring Security会在其前面自动加上ROLE_,因此存储权限的时候也要加上ROLE_ADMIN
+        .antMatchers("/detail").access("hasRole('ADMIN')")
+        .anyRequest().permitAll().and()
+        //异常处理,可以再此使用entrypoint来定义错误输出
+        .exceptionHandling().and()
+        //不需要session来控制,所以这里可以去掉
+        .securityContext().securityContextRepository(new NullSecurityContextRepository()).and()
+        //开启匿名访问
+        .anonymous().and()
+        //退出登录自己来控制
+        .logout().disable()
+        //因为没用到cookies,所以关闭cookies
+        .csrf().disable()
+        //允许跨域
+        .addFilterBefore(new CorsFilter(), ChannelProcessingFilter.class)
+        //验证token
+        .addFilterBefore(new VerifyTokenFilter(jwtTokenUtil),
+            UsernamePasswordAuthenticationFilter.class);
+  }
+}
diff --git a/Spring-Security-Demo/src/main/java/cn/mrdear/security/config/VerifyTokenFilter.java b/Spring-Security-Demo/src/main/java/cn/mrdear/security/config/VerifyTokenFilter.java
new file mode 100644
index 0000000..2054617
--- /dev/null
+++ b/Spring-Security-Demo/src/main/java/cn/mrdear/security/config/VerifyTokenFilter.java
@@ -0,0 +1,46 @@
+package cn.mrdear.security.config;
+
+import lombok.extern.slf4j.Slf4j;
+
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import cn.mrdear.security.util.JwtTokenUtil;
+import io.jsonwebtoken.JwtException;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import java.io.IOException;
+import java.util.Optional;
+
+/**
+ *  jwt token验证类,验证成功后设置进去SecurityContext中
+ * @author Niu Li
+ * @since 2017/6/28
+ */
+@Slf4j
+public class VerifyTokenFilter extends OncePerRequestFilter {
+
+  private JwtTokenUtil jwtTokenUtil;
+
+  public VerifyTokenFilter(JwtTokenUtil jwtTokenUtil) {
+    this.jwtTokenUtil = jwtTokenUtil;
+  }
+
+  @Override
+  protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
+    try {
+      Optional<Authentication> authentication = jwtTokenUtil.verifyToken(request);
+      log.debug("VerifyTokenFilter result: {}",authentication.orElse(null));
+      SecurityContextHolder.getContext().setAuthentication(authentication.orElse(null));
+      filterChain.doFilter(request,response);
+    } catch (JwtException e) {
+      response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+      //可以在这里指定重定向还是返回错误接口示例
+    }
+  }
+}
diff --git a/Spring-Security-Demo/src/main/java/cn/mrdear/security/controller/LoginCntroller.java b/Spring-Security-Demo/src/main/java/cn/mrdear/security/controller/LoginCntroller.java
new file mode 100644
index 0000000..488fc57
--- /dev/null
+++ b/Spring-Security-Demo/src/main/java/cn/mrdear/security/controller/LoginCntroller.java
@@ -0,0 +1,65 @@
+package cn.mrdear.security.controller;
+
+import com.google.common.collect.Lists;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import cn.mrdear.security.dto.TokenUserDTO;
+import cn.mrdear.security.util.JwtTokenUtil;
+
+import javax.annotation.Resource;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @author Niu Li
+ * @since 2017/6/19
+ */
+@RestController
+public class LoginCntroller {
+
+  @Resource
+  private JwtTokenUtil jwtTokenUtil;
+
+  /**
+   * 该链接获取token
+   */
+  @GetMapping("/login")
+  public Map login(String username, String password) {
+    Map<String, Object> map = new HashMap<>();
+    if (!StringUtils.equals(username, "demo") || !StringUtils.equals(password, "demo")) {
+      map.put("status", 4);
+      map.put("msg", "登录失败,用户名密码错误");
+      return map;
+    }
+    TokenUserDTO userDTO = new TokenUserDTO();
+    userDTO.setUsername(username);
+    userDTO.setRoles(Lists.newArrayList("ROLE_ADMIN"));
+    userDTO.setId(1L);
+    userDTO.setEmail("1015315668@qq.com");
+    userDTO.setAvatar("ahahhahahhaha");
+    map.put("status", 1);
+    map.put("msg", "Success");
+    map.put("token", jwtTokenUtil.create(userDTO));
+    return map;
+  }
+
+  /**
+   * 该链接尝试获取登录用户,返回该认证用户的信息,请求该链接需要在header中放入x-authorization: token
+   */
+  @GetMapping("/detail")
+  public TokenUserDTO userDetail() {
+    Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+    if (Objects.isNull(authentication)) {
+      return null;
+    }
+    return (TokenUserDTO) authentication.getDetails();
+  }
+
+}
diff --git a/Spring-Security-Demo/src/main/java/cn/mrdear/security/dto/TokenUserAuthentication.java b/Spring-Security-Demo/src/main/java/cn/mrdear/security/dto/TokenUserAuthentication.java
new file mode 100644
index 0000000..188acfc
--- /dev/null
+++ b/Spring-Security-Demo/src/main/java/cn/mrdear/security/dto/TokenUserAuthentication.java
@@ -0,0 +1,63 @@
+package cn.mrdear.security.dto;
+
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+
+import java.util.Collection;
+import java.util.stream.Collectors;
+
+/**
+ * Spring Security中存放的认证用户
+ * @author Niu Li
+ * @since 2017/6/28
+ */
+public class TokenUserAuthentication implements Authentication {
+
+  private static final long serialVersionUID = 3730332217518791533L;
+
+  private TokenUserDTO userDTO;
+
+  private Boolean authentication = false;
+
+  public TokenUserAuthentication(TokenUserDTO userDTO, Boolean authentication) {
+    this.userDTO = userDTO;
+    this.authentication = authentication;
+  }
+
+  @Override
+  public Collection<? extends GrantedAuthority> getAuthorities() {
+    return userDTO.getRoles().stream()
+        .map(SimpleGrantedAuthority::new).collect(Collectors.toList());
+  }
+
+  @Override
+  public Object getCredentials() {
+    return "";
+  }
+
+  @Override
+  public Object getDetails() {
+    return userDTO;
+  }
+
+  @Override
+  public Object getPrincipal() {
+    return userDTO.getUsername();
+  }
+
+  @Override
+  public boolean isAuthenticated() {
+    return authentication;
+  }
+
+  @Override
+  public void setAuthenticated(boolean isAuthenticated) throws IllegalArgumentException {
+    this.authentication = isAuthenticated;
+  }
+
+  @Override
+  public String getName() {
+    return userDTO.getUsername();
+  }
+}
diff --git a/Spring-Security-Demo/src/main/java/cn/mrdear/security/dto/TokenUserDTO.java b/Spring-Security-Demo/src/main/java/cn/mrdear/security/dto/TokenUserDTO.java
new file mode 100644
index 0000000..a7abda4
--- /dev/null
+++ b/Spring-Security-Demo/src/main/java/cn/mrdear/security/dto/TokenUserDTO.java
@@ -0,0 +1,23 @@
+package cn.mrdear.security.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Niu Li
+ * @since 2017/6/28
+ */
+@Data
+public class TokenUserDTO {
+
+  private Long id;
+
+  private String username;
+
+  private String email;
+
+  private String avatar;
+
+  private List<String> roles;
+}
diff --git a/Spring-Security-Demo/src/main/java/cn/mrdear/security/util/JwtTokenUtil.java b/Spring-Security-Demo/src/main/java/cn/mrdear/security/util/JwtTokenUtil.java
new file mode 100644
index 0000000..91fcecc
--- /dev/null
+++ b/Spring-Security-Demo/src/main/java/cn/mrdear/security/util/JwtTokenUtil.java
@@ -0,0 +1,91 @@
+package cn.mrdear.security.util;
+
+import org.apache.commons.lang3.math.NumberUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.core.Authentication;
+
+import cn.mrdear.security.dto.TokenUserAuthentication;
+import cn.mrdear.security.dto.TokenUserDTO;
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.SignatureAlgorithm;
+
+import javax.servlet.http.HttpServletRequest;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * jwt token
+ *
+ * @author Niu Li
+ * @since 2017/6/28
+ */
+public class JwtTokenUtil {
+  /**
+   * token过期时间
+   */
+  private static final long VALIDITY_TIME_MS = 24 * 60 * 60 * 1000; // 24 hours  validity
+  /**
+   * header中标识
+   */
+  private static final String AUTH_HEADER_NAME = "x-authorization";
+
+  /**
+   * 签名密钥
+   */
+  @Value("${jwt.token.secret}")
+  private String secret;
+
+  /**
+   * 验签
+   */
+  public Optional<Authentication> verifyToken(HttpServletRequest request) {
+    final String token = request.getHeader(AUTH_HEADER_NAME);
+    if (token != null && !token.isEmpty()){
+      final TokenUserDTO user = parse(token.trim());
+      if (user != null) {
+        return Optional.of(new TokenUserAuthentication(user, true));
+      }
+    }
+    return Optional.empty();
+  }
+
+
+  /**
+   * 从用户中创建一个jwt Token
+   *
+   * @param userDTO 用户
+   * @return token
+   */
+  public String create(TokenUserDTO userDTO) {
+    return Jwts.builder()
+        .setExpiration(new Date(System.currentTimeMillis() + VALIDITY_TIME_MS))
+        .setSubject(userDTO.getUsername())
+        .claim("id", userDTO.getId())
+        .claim("avatar", userDTO.getAvatar())
+        .claim("email", userDTO.getEmail())
+        .claim("roles", userDTO.getRoles())
+        .signWith(SignatureAlgorithm.HS256, secret)
+        .compact();
+  }
+
+  /**
+   * 从token中取出用户
+   */
+  public TokenUserDTO parse(String token) {
+    Claims claims = Jwts.parser()
+        .setSigningKey(secret)
+        .parseClaimsJws(token)
+        .getBody();
+    TokenUserDTO userDTO = new TokenUserDTO();
+    userDTO.setId(NumberUtils.toLong(claims.getId()));
+    userDTO.setAvatar(claims.get("avatar",String.class));
+    userDTO.setUsername(claims.get("username",String.class));
+    userDTO.setEmail(claims.get("email",String.class));
+    userDTO.setRoles((List<String>) claims.get("roles"));
+    return userDTO;
+  }
+
+}
diff --git a/Spring-Security-Demo/src/main/resources/application.properties b/Spring-Security-Demo/src/main/resources/application.properties
new file mode 100644
index 0000000..07419b0
--- /dev/null
+++ b/Spring-Security-Demo/src/main/resources/application.properties
@@ -0,0 +1,8 @@
+server.port=8080
+
+logging.level.root=info
+logging.level.org.springframework.security=debug
+
+
+# jwt token签名密钥
+jwt.token.secret=quding2017
\ No newline at end of file
diff --git a/Util-Demo/.idea/compiler.xml b/Util-Demo/.idea/compiler.xml
deleted file mode 100644
index da77190..0000000
--- a/Util-Demo/.idea/compiler.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <annotationProcessing>
-      <profile name="Maven default annotation processors profile" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <module name="Util-Demo" />
-      </profile>
-    </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="Util-Demo" target="1.7" />
-    </bytecodeTargetLevel>
-  </component>
-</project>
\ No newline at end of file
diff --git a/Util-Demo/.idea/deployment.xml b/Util-Demo/.idea/deployment.xml
deleted file mode 100644
index 25a0408..0000000
--- a/Util-Demo/.idea/deployment.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PublishConfigData">
-    <serverData>
-      <paths name="172.18.0.91">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-    </serverData>
-  </component>
-</project>
\ No newline at end of file
diff --git a/Util-Demo/.idea/encodings.xml b/Util-Demo/.idea/encodings.xml
deleted file mode 100644
index 97626ba..0000000
--- a/Util-Demo/.idea/encodings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/Util-Demo/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/Util-Demo/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml
deleted file mode 100644
index a8b0d9c..0000000
--- a/Util-Demo/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: ch.qos.logback:logback-classic:1.1.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.1.2/logback-classic-1.1.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.1.2/logback-classic-1.1.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.1.2/logback-classic-1.1.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Util-Demo/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/Util-Demo/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml
deleted file mode 100644
index 1c76d0b..0000000
--- a/Util-Demo/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: ch.qos.logback:logback-core:1.1.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.1.2/logback-core-1.1.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.1.2/logback-core-1.1.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.1.2/logback-core-1.1.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Util-Demo/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml b/Util-Demo/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml
deleted file mode 100644
index 27424a1..0000000
--- a/Util-Demo/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: commons-codec:commons-codec:1.10">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.10/commons-codec-1.10.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.10/commons-codec-1.10-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.10/commons-codec-1.10-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Util-Demo/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/Util-Demo/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml
deleted file mode 100644
index a66d039..0000000
--- a/Util-Demo/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: commons-codec:commons-codec:1.9">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.9/commons-codec-1.9.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.9/commons-codec-1.9-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.9/commons-codec-1.9-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Util-Demo/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml b/Util-Demo/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml
deleted file mode 100644
index eab40b3..0000000
--- a/Util-Demo/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: commons-logging:commons-logging:1.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Util-Demo/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/Util-Demo/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml
deleted file mode 100644
index 14681ee..0000000
--- a/Util-Demo/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: dom4j:dom4j:1.6.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/dom4j/dom4j/1.6.1/dom4j-1.6.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Util-Demo/.idea/libraries/Maven__junit_junit_4_12.xml b/Util-Demo/.idea/libraries/Maven__junit_junit_4_12.xml
deleted file mode 100644
index d411041..0000000
--- a/Util-Demo/.idea/libraries/Maven__junit_junit_4_12.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: junit:junit:4.12">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Util-Demo/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_3.xml b/Util-Demo/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_3.xml
deleted file mode 100644
index d478f56..0000000
--- a/Util-Demo/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.commons:commons-pool2:2.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-pool2/2.3/commons-pool2-2.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-pool2/2.3/commons-pool2-2.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-pool2/2.3/commons-pool2-2.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Util-Demo/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_2.xml b/Util-Demo/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_2.xml
deleted file mode 100644
index fdb7ead..0000000
--- a/Util-Demo/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.httpcomponents:httpclient:4.5.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.2/httpclient-4.5.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.2/httpclient-4.5.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.2/httpclient-4.5.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Util-Demo/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_4.xml b/Util-Demo/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_4.xml
deleted file mode 100644
index 3a5aa19..0000000
--- a/Util-Demo/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.httpcomponents:httpcore:4.4.4">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.4/httpcore-4.4.4.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.4/httpcore-4.4.4-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.4/httpcore-4.4.4-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Util-Demo/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_52.xml b/Util-Demo/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_52.xml
deleted file mode 100644
index 4b942f1..0000000
--- a/Util-Demo/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_52.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.bouncycastle:bcprov-jdk15on:1.52">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/bouncycastle/bcprov-jdk15on/1.52/bcprov-jdk15on-1.52.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/bouncycastle/bcprov-jdk15on/1.52/bcprov-jdk15on-1.52-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/bouncycastle/bcprov-jdk15on/1.52/bcprov-jdk15on-1.52-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Util-Demo/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/Util-Demo/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
deleted file mode 100644
index f58bbc1..0000000
--- a/Util-Demo/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.hamcrest:hamcrest-core:1.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Util-Demo/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_2.xml b/Util-Demo/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_2.xml
deleted file mode 100644
index 4b7cc61..0000000
--- a/Util-Demo/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.slf4j:jcl-over-slf4j:1.7.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jcl-over-slf4j/1.7.2/jcl-over-slf4j-1.7.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jcl-over-slf4j/1.7.2/jcl-over-slf4j-1.7.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jcl-over-slf4j/1.7.2/jcl-over-slf4j-1.7.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Util-Demo/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_2.xml b/Util-Demo/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_2.xml
deleted file mode 100644
index 7d29533..0000000
--- a/Util-Demo/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.slf4j:slf4j-api:1.7.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.2/slf4j-api-1.7.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.2/slf4j-api-1.7.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.2/slf4j-api-1.7.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Util-Demo/.idea/libraries/Maven__redis_clients_jedis_2_8_0.xml b/Util-Demo/.idea/libraries/Maven__redis_clients_jedis_2_8_0.xml
deleted file mode 100644
index 213d5c0..0000000
--- a/Util-Demo/.idea/libraries/Maven__redis_clients_jedis_2_8_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: redis.clients:jedis:2.8.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/redis/clients/jedis/2.8.0/jedis-2.8.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/redis/clients/jedis/2.8.0/jedis-2.8.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/redis/clients/jedis/2.8.0/jedis-2.8.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Util-Demo/.idea/libraries/Maven__xml_apis_xml_apis_1_0_b2.xml b/Util-Demo/.idea/libraries/Maven__xml_apis_xml_apis_1_0_b2.xml
deleted file mode 100644
index c36e717..0000000
--- a/Util-Demo/.idea/libraries/Maven__xml_apis_xml_apis_1_0_b2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: xml-apis:xml-apis:1.0.b2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/Util-Demo/.idea/misc.xml b/Util-Demo/.idea/misc.xml
deleted file mode 100644
index 3be9714..0000000
--- a/Util-Demo/.idea/misc.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="MavenProjectsManager">
-    <option name="originalFiles">
-      <list>
-        <option value="$PROJECT_DIR$/pom.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8 " project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-  <component name="SvnConfiguration">
-    <configuration>C:\Users\NL\AppData\Roaming\Subversion</configuration>
-  </component>
-</project>
\ No newline at end of file
diff --git a/Util-Demo/.idea/modules.xml b/Util-Demo/.idea/modules.xml
deleted file mode 100644
index 7a547cd..0000000
--- a/Util-Demo/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/Util-Demo.iml" filepath="$PROJECT_DIR$/Util-Demo.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/Util-Demo/.idea/uiDesigner.xml b/Util-Demo/.idea/uiDesigner.xml
deleted file mode 100644
index e96534f..0000000
--- a/Util-Demo/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
\ No newline at end of file
diff --git a/Util-Demo/.idea/workspace.xml b/Util-Demo/.idea/workspace.xml
deleted file mode 100644
index 958b80d..0000000
--- a/Util-Demo/.idea/workspace.xml
+++ /dev/null
@@ -1,1442 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="3ec91962-0620-480f-afe4-dea0730c0200" name="Default" comment="" />
-    <ignored path="$PROJECT_DIR$/out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="TRACKING_ENABLED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
-  <component name="FavoritesManager">
-    <favorites_list name="Util-Demo" />
-  </component>
-  <component name="FileEditorManager">
-    <leaf />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="XSLT Stylesheet" />
-        <option value="Singleton" />
-        <option value="Enum" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>Security</find>
-      <find>PROVIDER</find>
-    </findStrings>
-    <replaceStrings>
-      <replace>Digest</replace>
-    </replaceStrings>
-  </component>
-  <component name="GradleLocalSettings">
-    <option name="externalProjectsViewState">
-      <projects_view />
-    </option>
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/util/DateUtil.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/util/redis/calback/WorkCallback.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/util/redis/service/JedisClient.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/util/redis/service/JedisClientSingle.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/util/webutil/WebUtils.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/util/xml/XmlUtil.java" />
-        <option value="$PROJECT_DIR$/src/test/java/XMLUtilTest.java" />
-        <option value="$PROJECT_DIR$/src/test/java/DataUtilTest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/util/dateutil/DateUtil.java" />
-        <option value="$PROJECT_DIR$/src/test/java/httpUtil.java" />
-        <option value="$PROJECT_DIR$/src/test/java/httpUtilTest.java" />
-        <option value="$PROJECT_DIR$/src/test/java/RedisTest.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/message.xml" />
-        <option value="$PROJECT_DIR$/src/test/java/XmlTest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/util/propsUtil/PropertiesUtils.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/util/SecurityUtil/Security.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/util/SecurityUtil/DESUtil.java" />
-        <option value="$PROJECT_DIR$/src/test/java/Base64Test.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/util/SecurityUtil/DigestUtil.java" />
-        <option value="$PROJECT_DIR$/src/test/java/DigestUtilTest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/util/SecurityUtil/AESEncryptUtil.java" />
-        <option value="$PROJECT_DIR$/pom.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/util/SecurityUtil/RSAUtils.java" />
-        <option value="$PROJECT_DIR$/src/main/java/cn/mrdear/util/SecurityUtil/AESUtil.java" />
-        <option value="$PROJECT_DIR$/src/test/java/AESUtilTest.java" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/develop/maven/apache-maven-3.3.9" />
-        <option name="userSettingsFile" value="D:\develop\maven\apache-maven-3.3.9\conf\settings.xml" />
-      </MavenGeneralSettings>
-    </option>
-    <option name="importingSettings">
-      <MavenImportingSettings>
-        <option name="importAutomatically" value="true" />
-      </MavenImportingSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="" />
-          <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$RootNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="util" />
-          <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$ProjectNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="" />
-          <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$RootNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="util" />
-          <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$ProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="Lifecycle" />
-          <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$LifecycleNode" />
-        </PATH_ELEMENT>
-      </PATH>
-    </treeState>
-  </component>
-  <component name="MavenRunner">
-    <option name="jreName" value="1.8 " />
-    <option name="vmOptions" value="-DarchetypeCatalog=internal" />
-  </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-9" />
-    <option name="y" value="-9" />
-    <option name="width" value="1860" />
-    <option name="height" value="1098" />
-  </component>
-  <component name="ProjectView">
-    <navigator currentView="ProjectPane" proportions="" version="1">
-      <flattenPackages />
-      <showMembers />
-      <showModules />
-      <showLibraryContents />
-      <hideEmptyPackages />
-      <abbreviatePackageNames />
-      <autoscrollToSource />
-      <autoscrollFromSource />
-      <sortByType />
-      <manualOrder />
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Util-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Util-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Util-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Util-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="test" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="resources" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Util-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Util-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="test" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Util-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Util-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Util-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Util-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="mrdear" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="util" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Util-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Util-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="mrdear" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="util" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="SecurityUtil" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Util-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Util-Demo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="mrdear" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
-      <pane id="Scratches" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="settings.editor.selected.configurable" value="editing.templates" />
-    <property name="last_opened_file_path" value="F:/RX" />
-    <property name="WebServerToolWindowFactoryState" value="true" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="nodejs_interpreter_path" value="D:/develop/nodejs/node" />
-    <property name="js.eslint.eslintPackage" value="" />
-    <property name="js-jscs-nodeInterpreter" value="D:\develop\nodejs\node.exe" />
-    <property name="project.structure.last.edited" value="Modules" />
-    <property name="project.structure.proportion" value="0.0" />
-    <property name="project.structure.side.proportion" value="0.0" />
-    <property name="extract.method.default.visibility" value="private" />
-  </component>
-  <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="F:\workspace\Util-Demo\src\main\java\cn\mrdear\util\redis\service" />
-    </key>
-    <key name="CopyClassDialog.RECENTS_KEY">
-      <recent name="cn.mrdear.util.SecurityUtil" />
-      <recent name="cn.mrdear.util.propsUtil" />
-      <recent name="cn.mrdear.util.xml" />
-      <recent name="cn.mrdear.util.webutil" />
-      <recent name="cn.mrdear.util.redis.calback" />
-    </key>
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="F:\workspace\Util-Demo\src\test\resources" />
-    </key>
-  </component>
-  <component name="RunManager" selected="JUnit.AESUtilTest.testAES">
-    <configuration default="false" name="Base64Test.testBase64" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="Util-Demo" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="Base64Test" />
-      <option name="METHOD_NAME" value="testBase64" />
-      <option name="TEST_OBJECT" value="method" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="false" name="Base64Test.testMD5" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="Util-Demo" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="Base64Test" />
-      <option name="METHOD_NAME" value="testMD5" />
-      <option name="TEST_OBJECT" value="method" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="false" name="Base64Test.testSHA" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="Util-Demo" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="Base64Test" />
-      <option name="METHOD_NAME" value="testSHA" />
-      <option name="TEST_OBJECT" value="method" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="false" name="DigestUtilTest.testMD5" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="Util-Demo" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="DigestUtilTest" />
-      <option name="METHOD_NAME" value="testMD5" />
-      <option name="TEST_OBJECT" value="method" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="false" name="AESUtilTest.testAES" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="Util-Demo" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="AESUtilTest" />
-      <option name="METHOD_NAME" value="testAES" />
-      <option name="TEST_OBJECT" value="method" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
-      <module name="" />
-      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
-      <option name="PROGRAM_PARAMETERS" />
-      <predefined_log_file id="idea.log" enabled="true" />
-      <method />
-    </configuration>
-    <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android App">
-      <module name="" />
-      <option name="DEPLOY" value="true" />
-      <option name="ARTIFACT_NAME" value="" />
-      <option name="PM_INSTALL_OPTIONS" value="" />
-      <option name="ACTIVITY_EXTRA_FLAGS" value="" />
-      <option name="MODE" value="default_activity" />
-      <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-      <option name="PREFERRED_AVD" value="" />
-      <option name="CLEAR_LOGCAT" value="false" />
-      <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
-      <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
-      <option name="FORCE_STOP_RUNNING_APP" value="true" />
-      <option name="DEBUGGER_TYPE" value="Java" />
-      <option name="USE_LAST_SELECTED_DEVICE" value="false" />
-      <option name="PREFERRED_AVD" value="" />
-      <Java />
-      <Profilers>
-        <option name="ENABLE_ADVANCED_PROFILING" value="true" />
-        <option name="GAPID_ENABLED" value="false" />
-        <option name="GAPID_DISABLE_PCS" value="false" />
-        <option name="SUPPORT_LIB_ENABLED" value="true" />
-        <option name="INSTRUMENTATION_ENABLED" value="true" />
-      </Profilers>
-      <option name="DEEP_LINK" value="" />
-      <option name="ACTIVITY_CLASS" value="" />
-      <method />
-    </configuration>
-    <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
-      <module name="" />
-      <option name="TESTING_TYPE" value="0" />
-      <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
-      <option name="METHOD_NAME" value="" />
-      <option name="CLASS_NAME" value="" />
-      <option name="PACKAGE_NAME" value="" />
-      <option name="EXTRA_OPTIONS" value="" />
-      <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-      <option name="PREFERRED_AVD" value="" />
-      <option name="CLEAR_LOGCAT" value="false" />
-      <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
-      <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
-      <option name="FORCE_STOP_RUNNING_APP" value="true" />
-      <option name="DEBUGGER_TYPE" value="Java" />
-      <option name="USE_LAST_SELECTED_DEVICE" value="false" />
-      <option name="PREFERRED_AVD" value="" />
-      <Java />
-      <Profilers>
-        <option name="ENABLE_ADVANCED_PROFILING" value="true" />
-        <option name="GAPID_ENABLED" value="false" />
-        <option name="GAPID_DISABLE_PCS" value="false" />
-        <option name="SUPPORT_LIB_ENABLED" value="true" />
-        <option name="INSTRUMENTATION_ENABLED" value="true" />
-      </Profilers>
-      <method />
-    </configuration>
-    <configuration default="true" type="Applet" factoryName="Applet">
-      <option name="HTML_USED" value="false" />
-      <option name="WIDTH" value="400" />
-      <option name="HEIGHT" value="300" />
-      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
-      <module />
-      <method />
-    </configuration>
-    <configuration default="true" type="Application" factoryName="Application">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="arquillianRunConfiguration">
-        <value>
-          <option name="containerStateName" value="" />
-        </value>
-      </option>
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="true" type="ArquillianTestNG" factoryName="">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="arquillianRunConfiguration">
-        <value>
-          <option name="containerStateName" value="" />
-        </value>
-      </option>
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="ANNOTATION_TYPE" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
-      <envs />
-      <properties />
-      <listeners />
-      <method />
-    </configuration>
-    <configuration default="true" type="BashConfigurationType" factoryName="Bash">
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="INTERPRETER_PATH" value="D:\develop\Git\bin\bash.exe" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <option name="SCRIPT_NAME" value="" />
-      <option name="PARAMETERS" value="" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="Cold Fusion runner description" factoryName="Cold Fusion" custom_browser="" web_path="">
-      <method />
-    </configuration>
-    <configuration default="true" type="CucumberJavaRunConfigurationType" factoryName="Cucumber java">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="myFilePath" />
-      <option name="GLUE" />
-      <option name="myNameFilter" />
-      <option name="myGeneratedName" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="FlashRunConfigurationType" factoryName="Flash App">
-      <option name="BCName" value="" />
-      <option name="IOSSimulatorSdkPath" value="" />
-      <option name="adlOptions" value="" />
-      <option name="airProgramParameters" value="" />
-      <option name="appDescriptorForEmulator" value="Android" />
-      <option name="debugTransport" value="USB" />
-      <option name="debuggerSdkRaw" value="BC SDK" />
-      <option name="emulator" value="NexusOne" />
-      <option name="emulatorAdlOptions" value="" />
-      <option name="fastPackaging" value="true" />
-      <option name="fullScreenHeight" value="0" />
-      <option name="fullScreenWidth" value="0" />
-      <option name="launchUrl" value="false" />
-      <option name="launcherParameters">
-        <LauncherParameters>
-          <option name="browser" value="a7bb68e0-33c0-4d6f-a81a-aac1fdb870c8" />
-          <option name="launcherType" value="OSDefault" />
-          <option name="newPlayerInstance" value="false" />
-          <option name="playerPath" value="FlashPlayerDebugger.exe" />
-        </LauncherParameters>
-      </option>
-      <option name="mobileRunTarget" value="Emulator" />
-      <option name="moduleName" value="" />
-      <option name="overriddenMainClass" value="" />
-      <option name="overriddenOutputFileName" value="" />
-      <option name="overrideMainClass" value="false" />
-      <option name="runTrusted" value="true" />
-      <option name="screenDpi" value="0" />
-      <option name="screenHeight" value="0" />
-      <option name="screenWidth" value="0" />
-      <option name="url" value="http://" />
-      <option name="usbDebugPort" value="7936" />
-      <method />
-    </configuration>
-    <configuration default="true" type="FlexUnitRunConfigurationType" factoryName="FlexUnit" appDescriptorForEmulator="Android" class_name="" emulatorAdlOptions="" method_name="" package_name="" scope="Class">
-      <option name="BCName" value="" />
-      <option name="launcherParameters">
-        <LauncherParameters>
-          <option name="browser" value="a7bb68e0-33c0-4d6f-a81a-aac1fdb870c8" />
-          <option name="launcherType" value="OSDefault" />
-          <option name="newPlayerInstance" value="false" />
-          <option name="playerPath" value="FlashPlayerDebugger.exe" />
-        </LauncherParameters>
-      </option>
-      <option name="moduleName" value="" />
-      <option name="trusted" value="true" />
-      <method />
-    </configuration>
-    <configuration default="true" type="GradleRunConfiguration" factoryName="Gradle">
-      <ExternalSystemSettings>
-        <option name="executionName" />
-        <option name="externalProjectPath" />
-        <option name="externalSystemIdString" value="GRADLE" />
-        <option name="scriptParameters" />
-        <option name="taskDescriptions">
-          <list />
-        </option>
-        <option name="taskNames">
-          <list />
-        </option>
-        <option name="vmOptions" />
-      </ExternalSystemSettings>
-      <method />
-    </configuration>
-    <configuration default="true" type="GrailsRunConfigurationType" factoryName="Grails">
-      <setting name="vmparams" value="" />
-      <setting name="cmdLine" value="run-app" />
-      <setting name="passParentEnv" value="true" />
-      <setting name="launchBrowser" value="true" />
-      <setting name="launchBrowserUrl" value="" />
-      <setting name="depsClasspath" value="false" />
-      <method />
-    </configuration>
-    <configuration default="true" type="JUnit" factoryName="JUnit">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="true" type="JarApplication" factoryName="JAR Application">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="Java Scratch" factoryName="Java Scratch">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="SCRATCH_FILE_ID" value="0" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="JavaScriptTestRunnerProtractor" factoryName="Protractor">
-      <config-file value="" />
-      <node-interpreter value="project" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
-      <method />
-    </configuration>
-    <configuration default="true" type="JetRunConfigurationType" factoryName="Kotlin">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="Util-Demo" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="KotlinStandaloneScriptRunConfigurationType" factoryName="Kotlin script">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="filePath" />
-      <option name="vmParameters" />
-      <option name="alternativeJrePath" />
-      <option name="programParameters" />
-      <option name="passParentEnvs" value="true" />
-      <option name="workingDirectory" />
-      <option name="isAlternativeJrePathEnabled" value="false" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="MavenRunConfiguration" factoryName="Maven">
-      <MavenSettings>
-        <option name="myGeneralSettings" />
-        <option name="myRunnerSettings" />
-        <option name="myRunnerParameters">
-          <MavenRunnerParameters>
-            <option name="profiles">
-              <set />
-            </option>
-            <option name="goals">
-              <list />
-            </option>
-            <option name="profilesMap">
-              <map />
-            </option>
-            <option name="resolveToWorkspace" value="false" />
-            <option name="workingDirPath" value="" />
-          </MavenRunnerParameters>
-        </option>
-      </MavenSettings>
-      <method />
-    </configuration>
-    <configuration default="true" type="Remote" factoryName="Remote">
-      <option name="USE_SOCKET_TRANSPORT" value="true" />
-      <option name="SERVER_MODE" value="false" />
-      <option name="SHMEM_ADDRESS" value="javadebug" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="5005" />
-      <method />
-    </configuration>
-    <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="TestNG" factoryName="TestNG">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="ANNOTATION_TYPE" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
-      <envs />
-      <properties />
-      <listeners />
-      <method />
-    </configuration>
-    <configuration default="true" type="XSLT" factoryName="XSLT">
-      <option name="myOutputFile" />
-      <option name="myOpenOutputFile" value="false" />
-      <option name="myOpenInBrowser" value="false" />
-      <option name="mySmartErrorHandling" value="true" />
-      <option name="myRunnerPort" value="34873" />
-      <option name="myVmArguments" />
-      <option name="myWorkingDirectory" />
-      <option name="myModule" />
-      <option name="myJdk" />
-      <parameters />
-      <OutputType value="CONSOLE" save-to-file="false" />
-      <FileType name="XML" />
-      <JdkChoice value="FROM_MODULE" />
-      <method />
-    </configuration>
-    <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
-      <node-interpreter>project</node-interpreter>
-      <node-options />
-      <gulpfile />
-      <tasks />
-      <arguments />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="js.build_tools.npm" factoryName="npm">
-      <command value="run-script" />
-      <scripts />
-      <node-interpreter value="project" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="osgi.bnd.run" factoryName="Run Launcher">
-      <method />
-    </configuration>
-    <configuration default="true" type="osgi.bnd.run" factoryName="Test Launcher (JUnit)">
-      <method />
-    </configuration>
-    <list size="5">
-      <item index="0" class="java.lang.String" itemvalue="JUnit.Base64Test.testBase64" />
-      <item index="1" class="java.lang.String" itemvalue="JUnit.Base64Test.testMD5" />
-      <item index="2" class="java.lang.String" itemvalue="JUnit.Base64Test.testSHA" />
-      <item index="3" class="java.lang.String" itemvalue="JUnit.DigestUtilTest.testMD5" />
-      <item index="4" class="java.lang.String" itemvalue="JUnit.AESUtilTest.testAES" />
-    </list>
-    <recent_temporary>
-      <list size="5">
-        <item index="0" class="java.lang.String" itemvalue="JUnit.AESUtilTest.testAES" />
-        <item index="1" class="java.lang.String" itemvalue="JUnit.DigestUtilTest.testMD5" />
-        <item index="2" class="java.lang.String" itemvalue="JUnit.Base64Test.testBase64" />
-        <item index="3" class="java.lang.String" itemvalue="JUnit.Base64Test.testMD5" />
-        <item index="4" class="java.lang.String" itemvalue="JUnit.Base64Test.testSHA" />
-      </list>
-    </recent_temporary>
-  </component>
-  <component name="ShelveChangesManager" show_recycled="false">
-    <option name="remove_strategy" value="false" />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="3ec91962-0620-480f-afe4-dea0730c0200" name="Default" comment="" />
-      <created>1481414104021</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1481414104021</updated>
-      <workItem from="1481414105823" duration="9182000" />
-      <workItem from="1481426540366" duration="8403000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TestHistory">
-    <history-entry file="AESUtilTest_testAES - 2016.12.11 at 16h 25m 29s.xml">
-      <configuration name="AESUtilTest.testAES" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="Base64Test_testBase64 - 2016.12.11 at 15h 10m 56s.xml">
-      <configuration name="Base64Test.testBase64" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="Base64Test_testMD5 - 2016.12.11 at 14h 35m 16s.xml">
-      <configuration name="Base64Test.testMD5" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="Base64Test_testSHA - 2016.12.11 at 14h 28m 11s.xml">
-      <configuration name="Base64Test.testSHA" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="Base64Test_testSHA - 2016.12.11 at 14h 28m 43s.xml">
-      <configuration name="Base64Test.testSHA" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="Base64Test_testSHA - 2016.12.11 at 14h 28m 52s.xml">
-      <configuration name="Base64Test.testSHA" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="Base64Test_testSHA - 2016.12.11 at 14h 32m 21s.xml">
-      <configuration name="Base64Test.testSHA" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="Base64Test_testSHA - 2016.12.11 at 14h 32m 30s.xml">
-      <configuration name="Base64Test.testSHA" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="Base64Test_testSHA - 2016.12.11 at 14h 35m 12s.xml">
-      <configuration name="Base64Test.testSHA" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="DigestUtilTest_testMD5 - 2016.12.11 at 16h 17m 28s.xml">
-      <configuration name="DigestUtilTest.testMD5" configurationId="JUnit" />
-    </history-entry>
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="17585000" />
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="-9" y="-9" width="1860" height="1098" extended-state="7" />
-    <editor active="false" />
-    <layout>
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="FindBugs-IDEA" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32834226" sideWeight="0.5" order="18" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3989305" sideWeight="0.5111857" order="8" side_tool="true" content_ui="tabs" />
-      <window_info id="JRebel Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="19" side_tool="true" content_ui="tabs" />
-      <window_info id="Redis Servers" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="17" side_tool="false" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16666667" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="JRebel Executor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Remote Host" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16498882" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.21364653" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.19989282" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33475935" sideWeight="0.48881432" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32831" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.1882353" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27593583" sideWeight="0.49105147" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.19893049" sideWeight="0.49440715" order="14" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32941177" sideWeight="0.5" order="17" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23322147" sideWeight="0.48235294" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="JRebel" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.22651006" sideWeight="0.5179704" order="5" side_tool="true" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32723358" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.22651006" sideWeight="0.5157729" order="6" side_tool="true" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2395722" sideWeight="0.49776036" order="10" side_tool="false" content_ui="tabs" />
-      <window_info id="CDI" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.32997763" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
-      <window_info id="SVN Properties" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32834226" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24944071" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Dynamic Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.18903804" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
-      <window_info id="JSF" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.32997763" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
-      <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32834226" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Documentation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="FLOATING" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" x="740" y="405" width="514" height="342" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3272727" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
-      <window_info id="JRebel remote servers log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="15" side_tool="true" content_ui="tabs" />
-      <window_info id="Persistence" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24384788" sideWeight="0.5176471" order="8" side_tool="true" content_ui="tabs" />
-      <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32997763" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="REST Client" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39251336" sideWeight="0.5" order="20" side_tool="false" content_ui="tabs" />
-      <window_info id="Database Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4641711" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-    </layout>
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="processedProjectFiles" value="true" />
-  </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <option name="time" value="3" />
-    </breakpoint-manager>
-    <watches-manager />
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/util/redis/calback/WorkCallback.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/util/redis/service/JedisClientSingle.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="175">
-          <caret line="9" column="45" lean-forward="true" selection-start-line="9" selection-start-column="45" selection-end-line="9" selection-end-column="45" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/util/redis/service/JedisClient.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="671">
-          <caret line="70" column="0" lean-forward="false" selection-start-line="70" selection-start-column="0" selection-end-line="70" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.2/httpclient-4.5.2.jar!/org/apache/http/conn/ssl/SSLConnectionSocketFactory.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="251">
-          <caret line="52" column="22" lean-forward="true" selection-start-line="52" selection-start-column="22" selection-end-line="52" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.2/httpclient-4.5.2.jar!/org/apache/http/impl/client/HttpClients.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="175">
-          <caret line="15" column="13" lean-forward="false" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/util/httpUtil/WebUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-72">
-          <caret line="159" column="68" lean-forward="true" selection-start-line="159" selection-start-column="68" selection-end-line="159" selection-end-column="68" />
-          <folding>
-            <element signature="e#1741#1766#0" expanded="false" />
-            <element signature="e#5032#5047#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/XMLUtilTest.java" />
-    <entry file="file://$PROJECT_DIR$/src/test/java/DataUtilTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="450">
-          <caret line="18" column="0" lean-forward="false" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
-          <folding>
-            <element signature="imports" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/util/dateutil/DateUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="475">
-          <caret line="52" column="108" lean-forward="false" selection-start-line="52" selection-start-column="108" selection-end-line="52" selection-end-column="108" />
-          <folding>
-            <element signature="e#2670#2671#0" expanded="false" />
-            <element signature="e#2717#2718#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/httpUtilTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="345">
-          <caret line="23" column="35" lean-forward="true" selection-start-line="23" selection-start-column="35" selection-end-line="23" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/message.xsl" />
-    <entry file="file://$PROJECT_DIR$/src/main/resources/xml.java" />
-    <entry file="file://$PROJECT_DIR$/src/test/resources/message.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="50">
-          <caret line="2" column="10" lean-forward="true" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/util/xml/XmlUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="200">
-          <caret line="71" column="25" lean-forward="false" selection-start-line="71" selection-start-column="25" selection-end-line="71" selection-end-column="25" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/RedisTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="320">
-          <caret line="13" column="18" lean-forward="false" selection-start-line="13" selection-start-column="18" selection-end-line="13" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/XmlTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
-          <caret line="30" column="20" lean-forward="false" selection-start-line="30" selection-start-column="20" selection-end-line="30" selection-end-column="20" />
-          <folding>
-            <element signature="imports" expanded="false" />
-            <element signature="e#1072#1073#0" expanded="false" />
-            <element signature="e#1111#1112#0" expanded="false" />
-            <element signature="e#1163#1164#0" expanded="false" />
-            <element signature="e#1211#1212#0" expanded="false" />
-            <element signature="e#1250#1251#0" expanded="false" />
-            <element signature="e#1289#1290#0" expanded="false" />
-            <element signature="e#1341#1342#0" expanded="false" />
-            <element signature="e#1389#1390#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/util/propsUtil/PropertiesUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="425">
-          <caret line="25" column="74" lean-forward="true" selection-start-line="25" selection-start-column="74" selection-end-line="25" selection-end-column="74" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_77/src.zip!/java/util/Properties.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="151">
-          <caret line="121" column="6" lean-forward="false" selection-start-line="121" selection-start-column="6" selection-end-line="121" selection-end-column="6" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_77/src.zip!/java/security/Provider.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-974">
-          <caret line="87" column="43" lean-forward="false" selection-start-line="87" selection-start-column="43" selection-end-line="87" selection-end-column="43" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_77/jre/lib/rt.jar!/sun/misc/BASE64Decoder.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="14" column="13" lean-forward="false" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.9/commons-codec-1.9.jar!/org/apache/commons/codec/binary/BaseNCodec.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="277">
-          <caret line="123" column="18" lean-forward="false" selection-start-line="123" selection-start-column="18" selection-end-line="123" selection-end-column="18" />
-          <folding>
-            <element signature="e#4149#4150#0" expanded="true" />
-            <element signature="e#4217#4218#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.9/commons-codec-1.9.jar!/org/apache/commons/codec/binary/Base64.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="324">
-          <caret line="256" column="34" lean-forward="false" selection-start-line="256" selection-start-column="34" selection-end-line="256" selection-end-column="34" />
-          <folding>
-            <element signature="e#2103#2104#0" expanded="true" />
-            <element signature="e#2126#2127#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_77/jre/lib/rt.jar!/sun/misc/CharacterEncoder.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="163" column="18" lean-forward="false" selection-start-line="163" selection-start-column="18" selection-end-line="163" selection-end-column="18" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_77/jre/lib/rt.jar!/sun/security/jca/GetInstance.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2144">
-          <caret line="79" column="39" lean-forward="false" selection-start-line="79" selection-start-column="39" selection-end-line="79" selection-end-column="39" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_77/src.zip!/java/security/Security.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="288">
-          <caret line="693" column="37" lean-forward="true" selection-start-line="693" selection-start-column="37" selection-end-line="693" selection-end-column="37" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_77/src.zip!/java/security/MessageDigest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="313">
-          <caret line="166" column="41" lean-forward="false" selection-start-line="166" selection-start-column="41" selection-end-line="166" selection-end-column="41" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/util/SecurityUtil/Security.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="450">
-          <caret line="18" column="5" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="18" selection-end-column="5" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.9/commons-codec-1.9.jar!/org/apache/commons/codec/digest/Md5Crypt.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-375">
-          <caret line="15" column="13" lean-forward="false" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.9/commons-codec-1.9.jar!/org/apache/commons/codec/digest/UnixCrypt.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-450">
-          <caret line="10" column="13" lean-forward="false" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.9/commons-codec-1.9.jar!/org/apache/commons/codec/digest/MessageDigestAlgorithms.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="100">
-          <caret line="7" column="13" lean-forward="false" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.9/commons-codec-1.9.jar!/org/apache/commons/codec/digest/B64.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-213">
-          <caret line="9" column="6" lean-forward="false" selection-start-line="9" selection-start-column="6" selection-end-line="9" selection-end-column="6" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.9/commons-codec-1.9.jar!/org/apache/commons/codec/digest/DigestUtils.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-3975">
-          <caret line="14" column="13" lean-forward="false" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.9/commons-codec-1.9.jar!/org/apache/commons/codec/net/QCodec.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="18" column="13" lean-forward="false" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/util/SecurityUtil/DESUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="373">
-          <caret line="30" column="0" lean-forward="false" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/util/SecurityUtil/DigestUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="73">
-          <caret line="65" column="0" lean-forward="false" selection-start-line="65" selection-start-column="0" selection-end-line="65" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/DigestUtilTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="325">
-          <caret line="13" column="76" lean-forward="false" selection-start-line="13" selection-start-column="76" selection-end-line="13" selection-end-column="76" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/Base64Test.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="475">
-          <caret line="19" column="57" lean-forward="false" selection-start-line="19" selection-start-column="57" selection-end-line="19" selection-end-column="57" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/util/SecurityUtil/RSAUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2097">
-          <caret line="83" column="64" lean-forward="false" selection-start-line="83" selection-start-column="64" selection-end-line="83" selection-end-column="64" />
-          <folding>
-            <element signature="e#3481#3482#0" expanded="true" />
-            <element signature="e#3538#3539#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/AESUtilTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="350">
-          <caret line="14" column="62" lean-forward="false" selection-start-line="14" selection-start-column="62" selection-end-line="14" selection-end-column="62" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="275">
-          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/cn/mrdear/util/SecurityUtil/AESUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2400">
-          <caret line="129" column="56" lean-forward="false" selection-start-line="129" selection-start-column="56" selection-end-line="129" selection-end-column="56" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>No facets are configured</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>app</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Util-Demo</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectJDKs.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/Util-Demo/Util-Demo.iml b/Util-Demo/Util-Demo.iml
deleted file mode 100644
index bfe973d..0000000
--- a/Util-Demo/Util-Demo.iml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.52" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
-    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.4" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Maven: redis.clients:jedis:2.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.3" level="project" />
-    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.2" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.2" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.2" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/Util-Demo/pom.xml b/Util-Demo/pom.xml
index c957b8a..f9f6606 100644
--- a/Util-Demo/pom.xml
+++ b/Util-Demo/pom.xml
@@ -5,10 +5,17 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>cn.mrdear.util</groupId>
-    <artifactId>util</artifactId>
+    <artifactId>Util-Demo</artifactId>
     <version>1.0-SNAPSHOT</version>
 
     <dependencies>
+        <!--公共依赖-->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.4</version>
+        </dependency>
+
         <!--RSA依赖-->
         <dependency>
             <groupId>org.bouncycastle</groupId>
@@ -33,7 +40,11 @@
             <artifactId>httpclient</artifactId>
             <version>4.5.2</version>
         </dependency>
-
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+        </dependency>
         <!--redis依赖-->
         <dependency>
             <groupId>redis.clients</groupId>
@@ -69,6 +80,7 @@
             <artifactId>logback-classic</artifactId>
             <version>1.1.2</version>
         </dependency>
+
     </dependencies>
 
     <build>
diff --git a/Util-Demo/src/main/java/cn/mrdear/util/dateutil/DateUtil.java b/Util-Demo/src/main/java/cn/mrdear/util/dateutil/DateUtil.java
index dc30ba7..c4c8b6c 100644
--- a/Util-Demo/src/main/java/cn/mrdear/util/dateutil/DateUtil.java
+++ b/Util-Demo/src/main/java/cn/mrdear/util/dateutil/DateUtil.java
@@ -94,11 +94,20 @@ public static Date parse(String str, String sdf) {
 
         Date date = null;
         try {
-            date = getSdf(sdf).parse(str);
+            date = parseCanThrow(str, sdf);
         } catch (ParseException e) {
             e.printStackTrace();
         }
         return date;
     }
+    /**
+     * 把字符串按照指定格式转换,需要主动抛异常情况下使用
+     * @param str 时间串
+     * @param sdf 给定转换格式
+     * @return 转换后的时间
+     */
+    public static Date parseCanThrow(String str, String sdf) throws ParseException {
+        return getSdf(sdf).parse(str);
+    }
 
 }
diff --git a/Util-Demo/src/main/java/cn/mrdear/util/httpUtil/WebUtils.java b/Util-Demo/src/main/java/cn/mrdear/util/httpUtil/WebUtils.java
index 5ea7560..c6a2bb2 100644
--- a/Util-Demo/src/main/java/cn/mrdear/util/httpUtil/WebUtils.java
+++ b/Util-Demo/src/main/java/cn/mrdear/util/httpUtil/WebUtils.java
@@ -1,5 +1,7 @@
 package cn.mrdear.util.httpUtil;
 
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.NameValuePair;
 import org.apache.http.ParseException;
@@ -26,12 +28,20 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
 import java.security.KeyStore;
 import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import javax.net.ssl.SSLContext;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * WEB连接中常用到的方法
@@ -52,6 +62,129 @@ public abstract class WebUtils {
 		HTTP_CLIENT = HttpClientBuilder.create().setConnectionManager(HTTP_CLIENT_CONNECTION_MANAGER).setDefaultRequestConfig(requestConfig).build();
 	}
 
+	/**
+	 * 添加cookie
+	 * @param response HttpServletResponse
+	 * @param name  Cookie名称
+	 * @param value  Cookie值
+	 * @param maxAge  有效期(单位: 秒)
+	 * @param path  路径
+	 * @param domain  域
+	 * @param secure  是否启用加密
+	 */
+	public static void addCookie(HttpServletResponse response, String name, String value, Integer maxAge, String path, String domain, Boolean secure) {
+
+		try {
+			name = URLEncoder.encode(name, "UTF-8");
+			value = URLEncoder.encode(value, "UTF-8");
+			Cookie cookie = new Cookie(name, value);
+			if (maxAge != null) {
+				cookie.setMaxAge(maxAge);
+			}
+			if (StringUtils.isNotEmpty(path)) {
+				cookie.setPath(path);
+			}
+			if (StringUtils.isNotEmpty(domain)) {
+				cookie.setDomain(domain);
+			}
+			if (secure != null) {
+				cookie.setSecure(secure);
+			}
+			response.addCookie(cookie);
+		} catch (UnsupportedEncodingException e) {
+			throw new RuntimeException(e.getMessage(), e);
+		}
+	}
+	/**
+	 * 获取cookie
+	 * @param request HttpServletRequest
+	 * @param name Cookie名称
+	 * @return Cookie值，若不存在则返回null
+	 */
+	public static String getCookie(HttpServletRequest request, String name) {
+
+		Cookie[] cookies = request.getCookies();
+		if (cookies != null) {
+			try {
+				name = URLEncoder.encode(name, "UTF-8");
+				for (Cookie cookie : cookies) {
+					if (name.equals(cookie.getName())) {
+						return URLDecoder.decode(cookie.getValue(), "UTF-8");
+					}
+				}
+			} catch (UnsupportedEncodingException e) {
+				throw new RuntimeException(e.getMessage(), e);
+			}
+		}
+		return null;
+	}
+	/**
+	 * 移除cookie
+	 * @param response HttpServletResponse
+	 * @param name Cookie名称
+	 * @param path 路径
+	 * @param domain 域
+	 */
+	public static void removeCookie(HttpServletResponse response, String name, String path, String domain) {
+		try {
+			name = URLEncoder.encode(name, "UTF-8");
+			Cookie cookie = new Cookie(name, null);
+			cookie.setMaxAge(0);
+			if (StringUtils.isNotEmpty(path)) {
+				cookie.setPath(path);
+			}
+			if (StringUtils.isNotEmpty(domain)) {
+				cookie.setDomain(domain);
+			}
+			response.addCookie(cookie);
+		} catch (UnsupportedEncodingException e) {
+			throw new RuntimeException(e.getMessage(), e);
+		}
+	}
+
+	/**
+	 * 把request请求参数转换为Map<String,String>
+	 * @param request 该请求
+	 * @return Map<String,String>格式的参数
+	 */
+	@SuppressWarnings("unchecked")
+	public static Map<String,String> request2Map(HttpServletRequest request){
+		Enumeration<String> names = request.getParameterNames();
+		Map<String, String> resData = new HashMap<String, String>();
+		while (names.hasMoreElements()) {
+			String name = names.nextElement();
+			resData.put(name, request.getParameter(name));
+		}
+		return resData;
+	}
+
+	/**
+	 * 连接Map键值对
+	 * @param map Map
+	 * @param prefix 前缀
+	 * @param suffix 后缀
+	 * @param separator 连接符
+	 * @param ignoreEmptyValue 忽略空值
+	 * @param ignoreKeys 忽略Key
+	 * @return 字符串
+	 */
+	public static String joinKeyValue(Map<String, ?> map, String prefix, String suffix, String separator,
+									  boolean ignoreEmptyValue, String... ignoreKeys) {
+		List<String> list = new ArrayList<String>();
+		if (map != null) {
+			//使用Java8语法会更加简洁
+			for (Map.Entry<String, ?> entry : map.entrySet()) {
+				String key = entry.getKey();
+				String value = String.valueOf(entry.getValue());
+				if (StringUtils.isNotEmpty(key) && !ArrayUtils.contains(ignoreKeys, key)
+						&& (!ignoreEmptyValue || StringUtils.isNotEmpty(value))) {
+					list.add(key + "=" + (value != null ? value : ""));
+				}
+			}
+		}
+		return (prefix != null ? prefix : "") + StringUtils.join(list, separator) + (suffix != null ? suffix : "");
+	}
+
 	/**
 	 * POST请求
 	 * 
@@ -70,7 +203,7 @@ public static String post(String url, Map<String, ?> parameterMap,String encodin
 				for (Map.Entry<String, ?> entry : parameterMap.entrySet()) {
 					String name = entry.getKey();
 					String value = String.valueOf(entry.getValue());
-					if (name != null && !"".equals(name)) {
+					if (StringUtils.isNoneEmpty(value)) {
 						nameValuePairs.add(new BasicNameValuePair(name, value));
 					}
 				}
@@ -158,7 +291,7 @@ public static String get(String url, Map<String, ?> parameterMap) {
 				for (Map.Entry<String, ?> entry : parameterMap.entrySet()) {
 					String name = entry.getKey();
 					String value = String.valueOf(entry.getValue());
-					if (name != null && !"".equals(name)) {
+					if (StringUtils.isNoneEmpty(value)) {
 						nameValuePairs.add(new BasicNameValuePair(name, value));
 					}
 				}
diff --git a/Util-Demo/src/main/java/cn/mrdear/util/jniUtil/NativeLibraryLoader.java b/Util-Demo/src/main/java/cn/mrdear/util/jniUtil/NativeLibraryLoader.java
new file mode 100644
index 0000000..2482c0c
--- /dev/null
+++ b/Util-Demo/src/main/java/cn/mrdear/util/jniUtil/NativeLibraryLoader.java
@@ -0,0 +1,54 @@
+package cn.mrdear.util.jniUtil;
+
+import java.io.*;
+
+/**
+ * Contains helper methods for loading native libraries, particularly JNI.
+ * 
+ * @author gkubisa
+ */
+public class NativeLibraryLoader {
+	/**
+	 * Utility classes should not have a public constructor.
+	 */
+	private NativeLibraryLoader() { }
+	
+	/**
+	 * Loads a native shared library. It tries the standard System.loadLibrary
+	 * method first and if it fails, it looks for the library in the current
+	 * class path. It will handle libraries packed within jar files, too.
+	 *
+	 * @param libraryName - name of the library to load
+	 * @throws IOException if the library cannot be extracted from a jar file
+	 * into a temporary file
+	 */
+	public static void loadLibrary(String libraryName) throws IOException {
+		try {
+			System.loadLibrary(libraryName);
+		} catch (UnsatisfiedLinkError e) {
+			String fileName = System.mapLibraryName(libraryName);
+
+			int dotPosition = fileName.lastIndexOf('.');
+			File file = File.createTempFile(fileName.substring(0, dotPosition), fileName.substring(dotPosition));
+			file.deleteOnExit();
+			
+			byte[] buffer = new byte[4096];
+			InputStream inputStream = NativeLibraryLoader.class.getClassLoader().getResourceAsStream(fileName);
+			OutputStream outputStream = new FileOutputStream(file);
+			
+			try {
+				while ( inputStream.available() > 0 ) {
+					int StreamLength = inputStream.read(buffer);
+					if ( StreamLength >= 0 ) {
+						outputStream.write(buffer, 0, StreamLength);
+					}
+				}
+			} finally {
+				outputStream.close();
+				inputStream.close();
+			}
+			
+			System.load(file.getAbsolutePath());
+		}
+	}
+}
diff --git a/Util-Demo/src/main/java/cn/mrdear/util/moneyUtil/MoneyUtil.java b/Util-Demo/src/main/java/cn/mrdear/util/moneyUtil/MoneyUtil.java
new file mode 100644
index 0000000..32dbb23
--- /dev/null
+++ b/Util-Demo/src/main/java/cn/mrdear/util/moneyUtil/MoneyUtil.java
@@ -0,0 +1,64 @@
+package cn.mrdear.util.moneyUtil;
+
+import org.apache.commons.lang3.math.NumberUtils;
+
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
+import java.text.ParseException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 关于金钱操作的工具类
+ * @author Niu Li
+ * @since 2017/3/2
+ */
+public class MoneyUtil {
+
+    private static final Map<String,ThreadLocal<DecimalFormat>> moneyMap = new HashMap<>();
+
+    private static final double CENT_RATE = 100.0;
+
+    /**
+     * 获取当前线程的decimalFormat工具类,因为该类是非同步的
+     * @param pattern 格式
+     * @return 该实例
+     */
+    private static DecimalFormat getDecimal(final String pattern){
+        ThreadLocal<DecimalFormat> instance = moneyMap.get(pattern);
+        if (instance == null){
+            synchronized (MoneyUtil.class){
+                instance = moneyMap.get(pattern);
+                if (instance == null){
+                    instance = new ThreadLocal<DecimalFormat>(){
+                        @Override
+                        protected DecimalFormat initialValue() {
+                            return new DecimalFormat(pattern);
+                        }
+                    };
+                }
+                moneyMap.put(pattern,instance);
+            }
+        }
+        return instance.get();
+    }
+
+    /**
+     * 分转元
+     * @param cent 分
+     * @return 元
+     */
+    public static String cent2yuan(Long cent){
+        return getDecimal("0.00").format(cent/CENT_RATE);
+    }
+
+    /**
+     * 元转分
+     * @param yuan 元金额
+     * @return 分
+     */
+    public static Long yuan2cent(double yuan) {
+        return Math.round(yuan * CENT_RATE);
+    }
+}
diff --git a/Util-Demo/src/main/java/cn/mrdear/util/propsUtil/PropertiesUtils.java b/Util-Demo/src/main/java/cn/mrdear/util/propsUtil/PropertiesUtils.java
index f88fb40..bc75790 100644
--- a/Util-Demo/src/main/java/cn/mrdear/util/propsUtil/PropertiesUtils.java
+++ b/Util-Demo/src/main/java/cn/mrdear/util/propsUtil/PropertiesUtils.java
@@ -36,7 +36,7 @@ public static String getUserDirProperty(String key, String filename) {
 	 * @return 值
 	 */
 	public static String getClassPathProperty(String key, String fileName) {
-		InputStream input = PropertiesUtils.class.getResourceAsStream(fileName);
+		InputStream input = PropertiesUtils.class.getClassLoader().getResourceAsStream(fileName);
 		return getPropertiesFromInput(input,key);
 	}
 
diff --git a/Util-Demo/src/main/java/cn/mrdear/util/vo/ResultWrapper.java b/Util-Demo/src/main/java/cn/mrdear/util/vo/ResultWrapper.java
new file mode 100644
index 0000000..e05e4c7
--- /dev/null
+++ b/Util-Demo/src/main/java/cn/mrdear/util/vo/ResultWrapper.java
@@ -0,0 +1,79 @@
+package cn.mrdear.util.vo;
+
+import java.util.List;
+
+/**
+ * 用于包装接口返回
+ * @author Niu Li
+ * @since 2017/4/19
+ */
+public class ResultWrapper<T> {
+  /**
+   * 状态码
+   */
+  private Integer status;
+  /**
+   * 状态信息
+   */
+  private String msg;
+  /**
+   * 数据data
+   */
+  private T data;
+
+
+  public ResultWrapper OK(){
+    //todo 自己根据错误码填充
+    this.status = 1;
+    this.msg = "Success";
+    return this;
+  }
+
+  public ResultWrapper OKWithData(T data) {
+    this.OK();
+    this.data = data;
+    return this;
+  }
+
+  public ResultWrapper CustomStatus(Integer status, String msg) {
+    this.status = status;
+    this.msg = msg;
+    return this;
+  }
+
+
+  /**
+   * 用于滚动数据的返回,举例瀑布流
+   * @param <E>
+   */
+  public static class ScrollData<E>{
+    private Integer hasMore;
+
+    private Integer nextSatrt;
+
+    private List<E> objectList;
+
+    public ScrollData(boolean hasMore, Integer nextSatrt, List<E> objectList) {
+      this.hasMore = hasMore?1:0;
+      this.nextSatrt = nextSatrt;
+      this.objectList = objectList;
+    }
+  }
+
+  /**
+   * 用于分页数据返回
+   * @param <E>
+   */
+  private static class PaginationData<E>{
+    private Integer total;
+    private Integer limit;
+    private List<E> objectList;
+
+    public PaginationData(Integer limit, Integer total, List<E> objectList) {
+      this.limit = limit;
+      this.total = total;
+      this.objectList = objectList;
+    }
+  }
+
+}
diff --git a/Util-Demo/src/test/resources/message.xml b/Util-Demo/src/test/resources/message.xml
index 40e484e..5c7f9cc 100644
--- a/Util-Demo/src/test/resources/message.xml
+++ b/Util-Demo/src/test/resources/message.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE messages SYSTEM "message.dtd" >
 <messages>
     <message key="register" >
-        <content>尊敬的会员，这是您的验证码{code_set}（有效时间{minute_set}分钟），感谢您的关注！</content>
+        <contents>尊敬的会员，这是您的验证码{code_set}（有效时间{minute_set}分钟），感谢您的关注！</contents>
     </message>
     <message key="gift" >
-        <content>您的朋友{giver_mobile}赠送给您{card_num}张"{card_name}",请及时关注微信"融信科技"公众号，进行查收。</content></message>
+        <contents>您的朋友{giver_mobile}赠送给您{card_num}张"{card_name}",请及时关注微信"融信科技"公众号，进行查收。</contents></message>
     <message key="findpassword" >
-        <content>尊敬的会员，这是您的支付密码已重置为{passwd_set}，登录后请立即修改密码。</content>
+        <contents>尊敬的会员，这是您的支付密码已重置为{passwd_set}，登录后请立即修改密码。</contents>
     </message>
     <message key="consume" >
-        <content>尊敬的会员，您当前账户余额{bal_amt},您尾号{end_code}的卡号消费了{amt_cuy}元，如果不是本人消费，请立即联系管理员处理。</content>
+        <contents>尊敬的会员，您当前账户余额{bal_amt},您尾号{end_code}的卡号消费了{amt_cuy}元，如果不是本人消费，请立即联系管理员处理。</contents>
     </message>
 </messages>
diff --git a/gRPC-Demo/pom.xml b/gRPC-Demo/pom.xml
new file mode 100644
index 0000000..a92eef4
--- /dev/null
+++ b/gRPC-Demo/pom.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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>cn.mrdear.grpc</groupId>
+    <artifactId>gRPC-Demo</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <name>gRPC-Demo</name>
+    <properties>
+        <grpc.version>1.0.3</grpc.version>
+    </properties>
+
+    <!--grpc所依赖的包-->
+    <dependencies>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-netty</artifactId>
+            <version>${grpc.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-protobuf</artifactId>
+            <version>${grpc.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-stub</artifactId>
+            <version>${grpc.version}</version>
+        </dependency>
+
+        <!--客户端连接池-->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
+            <version>2.4.2</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <!--解析proto的工具-->
+        <extensions>
+            <extension>
+                <groupId>kr.motd.maven</groupId>
+                <artifactId>os-maven-plugin</artifactId>
+                <version>1.4.1.Final</version>
+            </extension>
+        </extensions>
+        <plugins>
+            <plugin>
+                <groupId>org.xolstice.maven.plugins</groupId>
+                <artifactId>protobuf-maven-plugin</artifactId>
+                <version>0.5.0</version>
+                <configuration>
+                    <protocArtifact>com.google.protobuf:protoc:3.1.0:exe:${os.detected.classifier}</protocArtifact>
+                    <pluginId>grpc-java</pluginId>
+                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>compile</goal>
+                            <goal>compile-custom</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/gRPC-Demo/src/main/java/cn/mrdear/grpc/clientProcess/ClientInterruptImpl.java b/gRPC-Demo/src/main/java/cn/mrdear/grpc/clientProcess/ClientInterruptImpl.java
new file mode 100644
index 0000000..d04de2c
--- /dev/null
+++ b/gRPC-Demo/src/main/java/cn/mrdear/grpc/clientProcess/ClientInterruptImpl.java
@@ -0,0 +1,53 @@
+package cn.mrdear.grpc.clientProcess;
+
+import io.grpc.CallOptions;
+import io.grpc.Channel;
+import io.grpc.ClientCall;
+import io.grpc.ClientInterceptor;
+import io.grpc.ForwardingClientCall;
+import io.grpc.ForwardingClientCallListener;
+import io.grpc.Metadata;
+import io.grpc.MethodDescriptor;
+import io.grpc.Status;
+
+/**
+ * 客户端拦截器
+ * @author Niu Li
+ * @date 2017/2/4
+ */
+//ClientInterceptor接口是针对ClientCall的创建进行拦截
+public class ClientInterruptImpl implements ClientInterceptor {
+    @Override
+    public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(MethodDescriptor<ReqT, RespT> method,
+                                                               CallOptions callOptions, Channel next) {
+        //创建client
+        System.out.println("创建client1");
+        ClientCall<ReqT,RespT> clientCall = next.newCall(method,callOptions);
+        return new ForwardingClientCall<ReqT, RespT>() {
+            @Override
+            protected ClientCall<ReqT, RespT> delegate() {
+                return clientCall;
+            }
+            @Override
+            public void start(Listener<RespT> responseListener, Metadata headers) {
+                System.out.println("拦截器1,在此可以对header参数进行修改");
+                Metadata.Key<String> token = Metadata.Key.of("token",Metadata.ASCII_STRING_MARSHALLER);
+                headers.put(token,"123456");
+                //包装回调监听,使其也能拦截
+                Listener<RespT> forwardListener = new ForwardingClientCallListener.
+                        SimpleForwardingClientCallListener<RespT>(responseListener) {
+                    @Override
+                    public void onHeaders(Metadata headers) {
+                        Metadata.Key<String> token = Metadata.Key.of("token",Metadata.ASCII_STRING_MARSHALLER);
+                        if (!"123456".equals(headers.get(token))){
+                            System.out.println("返回参数无token,关闭该链接");
+                            super.onClose(Status.DATA_LOSS,headers);
+                        }
+                        super.onHeaders(headers);
+                    }
+                };
+                super.start(forwardListener, headers);
+            }
+        };
+    }
+}
diff --git a/gRPC-Demo/src/main/java/cn/mrdear/grpc/clientProcess/HelloWorldClientProcess.java b/gRPC-Demo/src/main/java/cn/mrdear/grpc/clientProcess/HelloWorldClientProcess.java
new file mode 100644
index 0000000..277c72d
--- /dev/null
+++ b/gRPC-Demo/src/main/java/cn/mrdear/grpc/clientProcess/HelloWorldClientProcess.java
@@ -0,0 +1,65 @@
+package cn.mrdear.grpc.clientProcess;
+
+import java.util.concurrent.TimeUnit;
+
+import io.grpc.ManagedChannel;
+import io.grpc.ManagedChannelBuilder;
+import io.grpc.StatusRuntimeException;
+import io.grpc.examples.helloworld.GreeterGrpc;
+import io.grpc.examples.helloworld.HelloReply;
+import io.grpc.examples.helloworld.HelloRequest;
+
+/**
+ * 按照hello world来分析整个客户端执行过程
+ * @author Niu Li
+ * @date 2017/1/28
+ */
+public class HelloWorldClientProcess {
+
+    private final ManagedChannel channel; //一个gRPC信道
+    private final GreeterGrpc.GreeterBlockingStub blockingStub;//阻塞/同步 存根
+
+   //初始化信道和存根
+    public HelloWorldClientProcess(String host, int port){
+
+        this(ManagedChannelBuilder.forAddress(host, port)
+                                  // Channels are secure by default (via SSL/TLS). For the example we disable TLS to avoid
+                                  // needing certificates.
+                                  .usePlaintext(true));
+    }
+
+    //创建channel的时候添加上转换器
+    private HelloWorldClientProcess(ManagedChannelBuilder<?> channelBuilder) {
+        channel = channelBuilder.intercept(new ClientInterruptImpl()).build();
+        //使用gzip压缩
+        blockingStub = GreeterGrpc.newBlockingStub(channel).withCompression("gzip");
+    }
+
+    public void shutdown() throws InterruptedException {
+        channel.shutdown().awaitTermination(5, TimeUnit.SECONDS);
+    }
+
+    //客户端方法
+    public  void greet(String name){
+        HelloRequest request = HelloRequest.newBuilder().setName(name).build();
+        HelloReply response;
+        try {
+            response = blockingStub.sayHello(request);
+        } catch (StatusRuntimeException e) {
+            System.out.println("RPC调用失败:"+e.getMessage());
+            return;
+        }
+        System.out.println("服务器返回信息:"+response.getMessage());
+    }
+
+    public static void main(String[] args) throws InterruptedException {
+        HelloWorldClientProcess client = new HelloWorldClientProcess("127.0.0.1",50051);
+        try {
+            for(int i=0;i<5;i++){
+                client.greet("world:"+i);
+            }
+        }finally {
+            client.shutdown();
+        }
+    }
+}
diff --git a/gRPC-Demo/src/main/java/cn/mrdear/grpc/clientProcess/HelloWorldServerProcess.java b/gRPC-Demo/src/main/java/cn/mrdear/grpc/clientProcess/HelloWorldServerProcess.java
new file mode 100644
index 0000000..74b5a54
--- /dev/null
+++ b/gRPC-Demo/src/main/java/cn/mrdear/grpc/clientProcess/HelloWorldServerProcess.java
@@ -0,0 +1,86 @@
+package cn.mrdear.grpc.clientProcess;
+
+import java.io.IOException;
+
+import io.grpc.Server;
+import io.grpc.ServerBuilder;
+import io.grpc.ServerInterceptors;
+import io.grpc.examples.helloworld.GreeterGrpc;
+import io.grpc.examples.helloworld.HelloReply;
+import io.grpc.examples.helloworld.HelloRequest;
+import io.grpc.stub.StreamObserver;
+
+/**
+ * 按照hello world来分析整个服务端执行过程
+ * @author Niu Li
+ * @date 2017/1/28
+ */
+public class HelloWorldServerProcess {
+
+    private int port = 50051;
+    private Server server;
+
+    /**
+     * 启动服务
+     * @throws IOException
+     */
+    private void start() throws IOException {
+        System.out.println("service start...");
+
+        server = ServerBuilder.forPort(port)
+                              .addService(ServerInterceptors.intercept(new  GreeterImpl(),new ServerInterruptImpl()))
+                              .build()
+                              .start();
+
+        System.out.println("service started");
+        //程序正常退出,系统调用 System.exit方法或虚拟机被关闭时执行该调用
+        Runtime.getRuntime().addShutdownHook(new Thread() {
+
+            @Override
+            public void run() {
+                System.err.println("*** shutting down gRPC server since JVM is shutting down");
+                HelloWorldServerProcess.this.stop();
+                System.err.println("*** server shut down");
+            }
+        });
+    }
+
+    private void stop() {
+        if (server != null) {
+            server.shutdown();
+        }
+    }
+
+    // block 一直到退出程序
+    private void blockUntilShutdown() throws InterruptedException {
+        if (server != null) {
+            server.awaitTermination();
+        }
+    }
+
+
+    public static void main(String[] args) throws IOException, InterruptedException {
+        final HelloWorldServerProcess server = new HelloWorldServerProcess();
+        server.start();
+        server.blockUntilShutdown();
+    }
+
+
+    // 实现 定义一个实现服务接口的类
+    private class GreeterImpl extends GreeterGrpc.GreeterImplBase {
+
+        public void sayHello(HelloRequest req, StreamObserver<HelloReply> responseObserver) {
+            //获取参数
+            System.out.println("收到的信息:"+req.getName());
+
+            //这里可以放置具体业务处理代码 start
+
+            //这里可以放置具体业务处理代码 end
+
+            //构造返回
+            HelloReply reply = HelloReply.newBuilder().setMessage(("Hello: " + req.getName())).build();
+            responseObserver.onNext(reply);
+            responseObserver.onCompleted();
+        }
+    }
+}
diff --git a/gRPC-Demo/src/main/java/cn/mrdear/grpc/clientProcess/ServerInterruptImpl.java b/gRPC-Demo/src/main/java/cn/mrdear/grpc/clientProcess/ServerInterruptImpl.java
new file mode 100644
index 0000000..cdee9ba
--- /dev/null
+++ b/gRPC-Demo/src/main/java/cn/mrdear/grpc/clientProcess/ServerInterruptImpl.java
@@ -0,0 +1,39 @@
+package cn.mrdear.grpc.clientProcess;
+
+import io.grpc.ForwardingServerCall;
+import io.grpc.Metadata;
+import io.grpc.ServerCall;
+import io.grpc.ServerCallHandler;
+import io.grpc.ServerInterceptor;
+import io.grpc.Status;
+import io.netty.util.internal.StringUtil;
+
+/**
+ * 服务端拦截器
+ * @author Niu Li
+ * @date 2017/2/4
+ */
+public class ServerInterruptImpl  implements ServerInterceptor{
+    @Override
+    public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(ServerCall<ReqT, RespT> call,
+                                                                 Metadata headers, ServerCallHandler<ReqT, RespT> next) {
+        System.out.println("执行server拦截器1,获取token");
+        //获取客户端参数
+        Metadata.Key<String> token = Metadata.Key.of("token", Metadata.ASCII_STRING_MARSHALLER);
+        String tokenStr = headers.get(token);
+        if (StringUtil.isNullOrEmpty(tokenStr)){
+            System.out.println("未收到客户端token,关闭此连接");
+            call.close(Status.DATA_LOSS,headers);
+        }
+        //服务端写回参数
+        ServerCall<ReqT, RespT> serverCall = new ForwardingServerCall.SimpleForwardingServerCall<ReqT, RespT>(call) {
+            @Override
+            public void sendHeaders(Metadata headers) {
+                System.out.println("执行server拦截器2,写入token");
+                headers.put(token,tokenStr);
+                super.sendHeaders(headers);
+            }
+        };
+        return next.startCall(serverCall,headers);
+    }
+}
diff --git a/gRPC-Demo/src/main/java/cn/mrdear/grpc/clientProcess/forwardExample/Client.java b/gRPC-Demo/src/main/java/cn/mrdear/grpc/clientProcess/forwardExample/Client.java
new file mode 100644
index 0000000..2249339
--- /dev/null
+++ b/gRPC-Demo/src/main/java/cn/mrdear/grpc/clientProcess/forwardExample/Client.java
@@ -0,0 +1,10 @@
+package cn.mrdear.grpc.clientProcess.forwardExample;
+
+/**
+ * 主调用接口
+ * @author Niu Li
+ * @date 2017/2/4
+ */
+public abstract class Client {
+    public abstract void start(String say);
+}
diff --git a/gRPC-Demo/src/main/java/cn/mrdear/grpc/clientProcess/forwardExample/ClientImp.java b/gRPC-Demo/src/main/java/cn/mrdear/grpc/clientProcess/forwardExample/ClientImp.java
new file mode 100644
index 0000000..f65b67a
--- /dev/null
+++ b/gRPC-Demo/src/main/java/cn/mrdear/grpc/clientProcess/forwardExample/ClientImp.java
@@ -0,0 +1,12 @@
+package cn.mrdear.grpc.clientProcess.forwardExample;
+
+/**
+ * @author Niu Li
+ * @date 2017/2/4
+ */
+public class ClientImp extends Client {
+    @Override
+    public void start(String say) {
+        System.out.println(say);
+    }
+}
diff --git a/gRPC-Demo/src/main/java/cn/mrdear/grpc/clientProcess/forwardExample/ForwardingClient.java b/gRPC-Demo/src/main/java/cn/mrdear/grpc/clientProcess/forwardExample/ForwardingClient.java
new file mode 100644
index 0000000..992724e
--- /dev/null
+++ b/gRPC-Demo/src/main/java/cn/mrdear/grpc/clientProcess/forwardExample/ForwardingClient.java
@@ -0,0 +1,16 @@
+package cn.mrdear.grpc.clientProcess.forwardExample;
+
+/**
+ * 用于包装Client到另一个Client
+ * @author Niu Li
+ * @date 2017/2/4
+ */
+public abstract class ForwardingClient extends Client{
+    //要包装的对象
+    protected abstract Client delegate();
+
+    @Override
+    public void start(String say) {
+        delegate().start(say);
+    }
+}
diff --git a/gRPC-Demo/src/main/java/cn/mrdear/grpc/clientProcess/forwardExample/ForwardingClientImpl.java b/gRPC-Demo/src/main/java/cn/mrdear/grpc/clientProcess/forwardExample/ForwardingClientImpl.java
new file mode 100644
index 0000000..3700ebb
--- /dev/null
+++ b/gRPC-Demo/src/main/java/cn/mrdear/grpc/clientProcess/forwardExample/ForwardingClientImpl.java
@@ -0,0 +1,21 @@
+package cn.mrdear.grpc.clientProcess.forwardExample;
+
+/**
+ * 一个简单的包装示例,必须要传入要包装的对象
+ * @author Niu Li
+ * @date 2017/2/4
+ */
+public class ForwardingClientImpl extends ForwardingClient{
+
+    //被委托对象
+    private final Client client;
+
+    public ForwardingClientImpl(Client client) {
+        this.client = client;
+    }
+
+    @Override
+    protected Client delegate() {
+        return client;
+    }
+}
diff --git a/gRPC-Demo/src/main/java/cn/mrdear/grpc/clientProcess/forwardExample/InterceptTest.java b/gRPC-Demo/src/main/java/cn/mrdear/grpc/clientProcess/forwardExample/InterceptTest.java
new file mode 100644
index 0000000..b0ddb49
--- /dev/null
+++ b/gRPC-Demo/src/main/java/cn/mrdear/grpc/clientProcess/forwardExample/InterceptTest.java
@@ -0,0 +1,31 @@
+package cn.mrdear.grpc.clientProcess.forwardExample;
+
+/**
+ * 一个简单的委托模式.
+ * @author Niu Li
+ * @date 2017/2/4
+ */
+public class InterceptTest {
+
+    public static void main(String[] args) {
+        Client client = new ClientImp();//主要想执行的方法
+        //构造第一个拦截器
+        Client intercept1 = new ForwardingClientImpl(client){
+            @Override
+            public void start(String say) {
+                System.out.println("拦截器1");
+                super.start(say);
+            }
+        };
+        //构造第二个拦截器
+        Client intercept2 = new ForwardingClientImpl(intercept1){
+            @Override
+            public void start(String say) {
+                System.out.println("拦截器2");
+                super.start(say);
+            }
+        };
+        //执行主方法
+        intercept2.start("这是要执行的方法");
+    }
+}
diff --git a/gRPC-Demo/src/main/java/cn/mrdear/grpc/common/WorkCallBack.java b/gRPC-Demo/src/main/java/cn/mrdear/grpc/common/WorkCallBack.java
new file mode 100644
index 0000000..ea5b101
--- /dev/null
+++ b/gRPC-Demo/src/main/java/cn/mrdear/grpc/common/WorkCallBack.java
@@ -0,0 +1,11 @@
+package cn.mrdear.grpc.common;
+
+/**
+ * 给模板类使用的接口
+ * @author Niu Li
+ * @since 17-2-8
+ */
+public interface WorkCallBack<S> {
+
+  void callback(S s);
+}
diff --git a/gRPC-Demo/src/main/java/cn/mrdear/grpc/hello/HelloWorldClient.java b/gRPC-Demo/src/main/java/cn/mrdear/grpc/hello/HelloWorldClient.java
new file mode 100644
index 0000000..1107a74
--- /dev/null
+++ b/gRPC-Demo/src/main/java/cn/mrdear/grpc/hello/HelloWorldClient.java
@@ -0,0 +1,66 @@
+package cn.mrdear.grpc.hello;
+
+import java.util.concurrent.TimeUnit;
+
+import io.grpc.ManagedChannel;
+import io.grpc.ManagedChannelBuilder;
+import io.grpc.StatusRuntimeException;
+import io.grpc.examples.helloworld.GreeterGrpc;
+import io.grpc.examples.helloworld.HelloReply;
+import io.grpc.examples.helloworld.HelloRequest;
+
+/**
+ * @author Niu Li
+ * @date 2017/1/28
+ */
+public class HelloWorldClient {
+
+    private final ManagedChannel channel; //一个gRPC信道
+    private final GreeterGrpc.GreeterBlockingStub blockingStub;//阻塞/同步 存根
+    private GreeterGrpc.GreeterFutureStub futureStub;//非阻塞/同步 存根
+    private GreeterGrpc.GreeterStub asyncStub;//非阻塞/异步 存根
+
+   //初始化信道和存根
+    public HelloWorldClient(String host,int port){
+        this(ManagedChannelBuilder.forAddress(host, port)
+                                  .usePlaintext(true));
+    }
+
+    private HelloWorldClient(ManagedChannelBuilder<?> channelBuilder) {
+        //信道应该是长连接,存根则每次调用创建一个
+        channel = channelBuilder.build();
+        //使用gzip压缩
+        blockingStub = GreeterGrpc.newBlockingStub(channel).withCompression("gzip");
+//        futureStub = GreeterGrpc.newFutureStub(channel).withCompression("gzip");
+//        asyncStub = GreeterGrpc.newStub(channel).withCompression("gzip");
+    }
+
+
+    public void shutdown() throws InterruptedException {
+        channel.shutdown().awaitTermination(5, TimeUnit.SECONDS);
+    }
+
+    //客户端方法
+    public  void greet(String name){
+        HelloRequest request = HelloRequest.newBuilder().setName(name).build();
+        HelloReply response;
+        try {
+            response = blockingStub.sayHello(request);
+        } catch (StatusRuntimeException e) {
+            System.out.println("RPC调用失败:"+e.getMessage());
+            return;
+        }
+        System.out.println("服务器返回信息:"+response.getMessage());
+    }
+
+    public static void main(String[] args) throws InterruptedException {
+        HelloWorldClient client = new HelloWorldClient("127.0.0.1",50051);
+        try {
+            for(int i=0;i<5;i++){
+                client.greet("world:"+i);
+            }
+        }finally {
+            client.shutdown();
+        }
+    }
+}
diff --git a/gRPC-Demo/src/main/java/cn/mrdear/grpc/hello/HelloWorldServer.java b/gRPC-Demo/src/main/java/cn/mrdear/grpc/hello/HelloWorldServer.java
new file mode 100644
index 0000000..6c36337
--- /dev/null
+++ b/gRPC-Demo/src/main/java/cn/mrdear/grpc/hello/HelloWorldServer.java
@@ -0,0 +1,79 @@
+package cn.mrdear.grpc.hello;
+
+import java.io.IOException;
+
+import io.grpc.Server;
+import io.grpc.ServerBuilder;
+import io.grpc.examples.helloworld.GreeterGrpc;
+import io.grpc.examples.helloworld.HelloReply;
+import io.grpc.examples.helloworld.HelloRequest;
+import io.grpc.stub.StreamObserver;
+
+/**
+ * @author Niu Li
+ * @date 2017/1/28
+ */
+public class HelloWorldServer {
+
+    private int port = 50051;
+    private Server server;
+
+    /**
+     * 启动服务
+     */
+    private void start() throws IOException {
+
+        System.out.println("service start...");
+        server = ServerBuilder.forPort(port)
+                              .addService(new GreeterImpl())
+                              .build()
+                              .start();
+      System.out.println("service started");
+
+        //程序正常退出,系统调用 System.exit方法或虚拟机被关闭时执行该调用
+        Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+            System.err.println("*** shutting down gRPC server since JVM is shutting down");
+            HelloWorldServer.this.stop();
+            System.err.println("*** server shut down");
+        }));
+    }
+
+    private void stop() {
+        if (server != null) {
+            server.shutdown();
+        }
+    }
+
+    // block 一直到退出程序
+    private void blockUntilShutdown() throws InterruptedException {
+        if (server != null) {
+            server.awaitTermination();
+        }
+    }
+
+
+    public static void main(String[] args) throws IOException, InterruptedException {
+        final HelloWorldServer server = new HelloWorldServer();
+        server.start();
+        server.blockUntilShutdown();
+    }
+
+
+    // 实现 定义一个实现服务接口的类
+    private class GreeterImpl extends GreeterGrpc.GreeterImplBase {
+
+        public void sayHello(HelloRequest req, StreamObserver<HelloReply> responseObserver) {
+            //获取参数
+            System.out.println("收到的信息:"+req.getName());
+
+            //这里可以放置具体业务处理代码 start
+
+            //这里可以放置具体业务处理代码 end
+
+            //构造返回
+            HelloReply reply = HelloReply.newBuilder().setMessage(("Hello: " + req.getName())).build();
+            responseObserver.onNext(reply);
+            responseObserver.onCompleted();
+        }
+    }
+}
diff --git a/gRPC-Demo/src/main/java/cn/mrdear/grpc/hellopool/HelloWorldClientPool.java b/gRPC-Demo/src/main/java/cn/mrdear/grpc/hellopool/HelloWorldClientPool.java
new file mode 100644
index 0000000..5c76ed0
--- /dev/null
+++ b/gRPC-Demo/src/main/java/cn/mrdear/grpc/hellopool/HelloWorldClientPool.java
@@ -0,0 +1,75 @@
+package cn.mrdear.grpc.hellopool;
+
+import org.apache.commons.pool2.impl.GenericObjectPool;
+import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
+
+import cn.mrdear.grpc.common.WorkCallBack;
+
+/**
+ * @author Niu Li
+ * @since 17-2-8
+ */
+public class HelloWorldClientPool {
+
+  private static GenericObjectPool<HelloWorldClientSingle> objectPool = null;
+
+  static {
+    // 连接池的配置
+    GenericObjectPoolConfig poolConfig = new GenericObjectPoolConfig();
+    // 池中的最大连接数
+    poolConfig.setMaxTotal(8);
+    // 最少的空闲连接数
+    poolConfig.setMinIdle(0);
+    // 最多的空闲连接数
+    poolConfig.setMaxIdle(8);
+    // 当连接池资源耗尽时,调用者最大阻塞的时间,超时时抛出异常 单位:毫秒数
+    poolConfig.setMaxWaitMillis(-1);
+    // 连接池存放池化对象方式,true放在空闲队列最前面,false放在空闲队列最后
+    poolConfig.setLifo(true);
+    // 连接空闲的最小时间,达到此值后空闲连接可能会被移除,默认即为30分钟
+    poolConfig.setMinEvictableIdleTimeMillis(1000L * 60L * 30L);
+    // 连接耗尽时是否阻塞,默认为true
+    poolConfig.setBlockWhenExhausted(true);
+    // 连接池创建
+    objectPool = new GenericObjectPool<>(new HelloWorldFactory(), poolConfig);
+  }
+
+  /**
+   * 从连接池获取对象
+   */
+  private static HelloWorldClientSingle borrowObject(){
+    try {
+      HelloWorldClientSingle clientSingle = objectPool.borrowObject();
+      System.out.println("总创建线程数"+objectPool.getCreatedCount());
+      return clientSingle;
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+    //连接池失败则主动创建
+    return createClient();
+  }
+
+  /**
+   * 当连接池异常,则主动创建对象
+   */
+  private static HelloWorldClientSingle createClient(){
+    return new HelloWorldClientSingle("127.0.0.1", 55001);
+  }
+
+  /**
+   * 执行器
+   * @param workCallBack 主要服务内容
+   */
+  public static Runnable execute(WorkCallBack<HelloWorldClientSingle> workCallBack){
+    return () -> {
+      HelloWorldClientSingle client = borrowObject();
+      try {
+       workCallBack.callback(client);
+      } finally {
+        /** 将连接对象返回给连接池 */
+        objectPool.returnObject(client);
+      }
+    };
+  }
+
+}
diff --git a/gRPC-Demo/src/main/java/cn/mrdear/grpc/hellopool/HelloWorldClientSingle.java b/gRPC-Demo/src/main/java/cn/mrdear/grpc/hellopool/HelloWorldClientSingle.java
new file mode 100644
index 0000000..465a7aa
--- /dev/null
+++ b/gRPC-Demo/src/main/java/cn/mrdear/grpc/hellopool/HelloWorldClientSingle.java
@@ -0,0 +1,44 @@
+package cn.mrdear.grpc.hellopool;
+
+import java.util.concurrent.TimeUnit;
+
+import io.grpc.ManagedChannel;
+import io.grpc.ManagedChannelBuilder;
+import io.grpc.StatusRuntimeException;
+import io.grpc.examples.helloworld.GreeterGrpc;
+import io.grpc.examples.helloworld.HelloReply;
+import io.grpc.examples.helloworld.HelloRequest;
+
+/**
+ * @author Niu Li
+ * @date 2017/1/28
+ */
+public class HelloWorldClientSingle {
+
+    private final ManagedChannel channel; //一个gRPC信道
+    private GreeterGrpc.GreeterBlockingStub greeterBlockingStub;//阻塞/同步 存根
+
+   //初始化信道和存根
+    public HelloWorldClientSingle(String host,int port){
+      channel = ManagedChannelBuilder.forAddress(host, port).usePlaintext(true).build();
+    }
+
+    public void shutdown() throws InterruptedException {
+        channel.shutdown().awaitTermination(5, TimeUnit.SECONDS);
+    }
+
+    //客户端方法
+    public  void greet(String name){
+        //需要用到存根时创建,不可复用
+        greeterBlockingStub = GreeterGrpc.newBlockingStub(channel).withCompression("gzip");
+        HelloRequest request = HelloRequest.newBuilder().setName(name).build();
+        HelloReply response;
+        try {
+            response = greeterBlockingStub.sayHello(request);
+        } catch (StatusRuntimeException e) {
+            System.out.println("RPC调用失败:"+e.getMessage());
+            return;
+        }
+        System.out.println("服务器返回信息:"+response.getMessage());
+    }
+}
diff --git a/gRPC-Demo/src/main/java/cn/mrdear/grpc/hellopool/HelloWorldClientTest.java b/gRPC-Demo/src/main/java/cn/mrdear/grpc/hellopool/HelloWorldClientTest.java
new file mode 100644
index 0000000..1bea9f1
--- /dev/null
+++ b/gRPC-Demo/src/main/java/cn/mrdear/grpc/hellopool/HelloWorldClientTest.java
@@ -0,0 +1,16 @@
+package cn.mrdear.grpc.hellopool;
+
+/**
+ * @author Niu Li
+ * @since 17-2-8
+ */
+public class HelloWorldClientTest {
+
+  public static void main(String[] args) {
+    for (int i = 0; i < 100; i++) {
+      new Thread( HelloWorldClientPool.execute(clientSingle -> {
+          clientSingle.greet("world");
+      })).start();
+    }
+  }
+}
diff --git a/gRPC-Demo/src/main/java/cn/mrdear/grpc/hellopool/HelloWorldFactory.java b/gRPC-Demo/src/main/java/cn/mrdear/grpc/hellopool/HelloWorldFactory.java
new file mode 100644
index 0000000..d1efd14
--- /dev/null
+++ b/gRPC-Demo/src/main/java/cn/mrdear/grpc/hellopool/HelloWorldFactory.java
@@ -0,0 +1,33 @@
+package cn.mrdear.grpc.hellopool;
+
+import org.apache.commons.pool2.BasePooledObjectFactory;
+import org.apache.commons.pool2.PooledObject;
+import org.apache.commons.pool2.impl.DefaultPooledObject;
+
+/**
+ * 连接池所需工厂
+ * @author Niu Li
+ * @since 17-2-8
+ */
+public class HelloWorldFactory extends BasePooledObjectFactory<HelloWorldClientSingle> {
+
+  private String host = "127.0.0.1";
+
+  private int port = 50051;
+
+  @Override
+  public HelloWorldClientSingle create() throws Exception {
+    return new HelloWorldClientSingle(this.host,this.port);
+  }
+
+  @Override
+  public PooledObject<HelloWorldClientSingle> wrap(HelloWorldClientSingle helloWorldClientSingle) {
+    return new DefaultPooledObject<>(helloWorldClientSingle);
+  }
+
+  @Override
+  public void destroyObject(PooledObject<HelloWorldClientSingle> p) throws Exception {
+    p.getObject().shutdown();
+    super.destroyObject(p);
+  }
+}
diff --git a/gRPC-Demo/src/main/java/cn/mrdear/grpc/route/RouteGuideClient.java b/gRPC-Demo/src/main/java/cn/mrdear/grpc/route/RouteGuideClient.java
new file mode 100644
index 0000000..604bf81
--- /dev/null
+++ b/gRPC-Demo/src/main/java/cn/mrdear/grpc/route/RouteGuideClient.java
@@ -0,0 +1,207 @@
+package cn.mrdear.grpc.route;
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import cn.mrdear.route.Feature;
+import cn.mrdear.route.Point;
+import cn.mrdear.route.Rectangle;
+import cn.mrdear.route.RouteGuideGrpc;
+import cn.mrdear.route.RouteNote;
+import cn.mrdear.route.RouteSummary;
+import io.grpc.ManagedChannel;
+import io.grpc.ManagedChannelBuilder;
+import io.grpc.StatusRuntimeException;
+import io.grpc.stub.StreamObserver;
+
+/**
+ * @author Niu Li
+ * @date 2017/2/2
+ */
+public class RouteGuideClient {
+
+    private final ManagedChannel channel;//grpc信道,需要指定端口和地址
+    private final RouteGuideGrpc.RouteGuideBlockingStub blockingStub;//阻塞/同步存根
+    private final RouteGuideGrpc.RouteGuideStub asyncStub;//非阻塞,异步存根
+
+
+    public RouteGuideClient(String host,int port) {
+        //创建信道
+        channel = ManagedChannelBuilder.forAddress(host, port)
+                                        .usePlaintext(true)
+                                        .build();
+        //创建存根
+        blockingStub = RouteGuideGrpc.newBlockingStub(channel);
+        asyncStub = RouteGuideGrpc.newStub(channel);
+    }
+
+    /**
+     * 关闭方法
+     */
+    public void shutdown() throws InterruptedException {
+        channel.shutdown().awaitTermination(5, TimeUnit.SECONDS);
+    }
+
+    /**
+     * 主方法中调用这一些函数的执行
+     */
+    public static void main(String[] args) throws InterruptedException {
+        List<Feature> features;
+        try {
+            features = RouteGuideUtil.parseFeatures(RouteGuideUtil.getDefaultFeaturesFile());
+        } catch (IOException ex) {
+            ex.printStackTrace();
+            return;
+        }
+        RouteGuideClient client = new RouteGuideClient("localhost", 50051);
+        try {
+//            client.getFeature(409146138, -746188906);//成功案例
+//            client.getFeature(0, 0);//失败案例
+//            client.listFeatures(400000000, -750000000, 420000000, -730000000);
+//            client.recordRoute(features, 10);
+            CountDownLatch finishLatch = client.routeChat();
+
+            if (!finishLatch.await(1, TimeUnit.MINUTES)) {
+                System.out.println("routeChat can not finish within 1 minutes");
+            }
+        } finally {
+            client.shutdown();
+        }
+    }
+
+    //1.简单grpc
+    public void getFeature(int lat,int lon){
+        System.out.println("start getFeature");
+        Point request = Point.newBuilder()
+                             .setLatitude(lat)
+                             .setLongitude(lon)
+                             .build();
+        Feature feature;
+        try {
+            //同步阻塞调用
+            feature = blockingStub.getFeature(request);
+            System.out.println("getFeature服务端返回 :" + feature);
+        } catch (StatusRuntimeException e) {
+            System.out.println("RPC failed " +e.getStatus());
+        }
+    }
+
+    //2.服务端流式RPC
+    public void listFeatures(int lowLat, int lowLon, int hiLat, int hiLon){
+        System.out.println("start listFeatures");
+        Rectangle request =
+            Rectangle.newBuilder()
+                     .setLo(Point.newBuilder().setLatitude(lowLat).setLongitude(lowLon).build())
+                     .setHi(Point.newBuilder().setLatitude(hiLat).setLongitude(hiLon).build()).build();
+        Iterator<Feature> features;
+        try {
+            features = blockingStub.listFeatures(request);
+            for (int i = 1; features.hasNext(); i++) {
+                Feature feature = features.next();
+                System.out.println("listFeatures服务端返回 :" + feature);
+            }
+        } catch (Exception e) {
+            System.out.println("RPC failed " +e.getMessage());
+        }
+    }
+//    客户端流式RPC
+    public void recordRoute(List<Feature> features, int numPoints) throws InterruptedException {
+        System.out.println("start recordRoute");
+        final CountDownLatch finishLatch = new CountDownLatch(1);
+        //建一个应答者接受返回数据
+        StreamObserver<RouteSummary> responseObserver = new StreamObserver<RouteSummary>() {
+            @Override
+            public void onNext(RouteSummary summary) {
+                System.out.println("recordRoute服务端返回 :" + summary);
+            }
+
+            @Override
+            public void onError(Throwable t) {
+                System.out.println("RecordRoute Failed");
+                finishLatch.countDown();
+            }
+
+            @Override
+            public void onCompleted() {
+                System.out.println("RecordRoute finish");
+                finishLatch.countDown();
+            }
+        };
+        //客户端写入操作
+        StreamObserver<Point> requestObserver = asyncStub.recordRoute(responseObserver);
+        Random random = new Random();
+        try {
+            for (int i = 0; i < numPoints; ++i) {
+                int index = random.nextInt(features.size());
+                Point point = features.get(index).getLocation();
+                System.out.println("客户端写入point:" + point);
+                requestObserver.onNext(point);
+
+                Thread.sleep(random.nextInt(1000) + 500);
+                if (finishLatch.getCount() == 0) {
+                    return;
+                }
+            }
+        } catch (RuntimeException e) {
+            requestObserver.onError(e);
+            throw e;
+        }
+        //标识已经写完
+        requestObserver.onCompleted();
+        // Receiving happens asynchronously
+        if (!finishLatch.await(1, TimeUnit.MINUTES)) {
+            System.out.println("recordRoute can not finish within 1 minutes");
+        }
+    }
+//    双向流式RPC
+    public CountDownLatch routeChat() {
+        System.out.println("start routeChat");
+        final CountDownLatch finishLatch = new CountDownLatch(1);
+        StreamObserver<RouteNote> requestObserver =
+                asyncStub.routeChat(new StreamObserver<RouteNote>() {
+                    @Override
+                    public void onNext(RouteNote note) {
+                        System.out.println("服务端写回: " + note);
+                    }
+
+                    @Override
+                    public void onError(Throwable t) {
+                        t.printStackTrace();
+                        System.out.println("RouteChat Failed:");
+                        finishLatch.countDown();
+                    }
+
+                    @Override
+                    public void onCompleted() {
+                        System.out.println("Finished RouteChat");
+                        finishLatch.countDown();
+                    }
+                });
+
+        try {
+            RouteNote[] requests =
+                    {newNote("First message", 0, 0), newNote("Second message", 0, 1),
+                            newNote("Third message", 1, 0), newNote("Fourth message", 1, 1)};
+
+            for (RouteNote request : requests) {
+                System.out.println("客户端写入:" + request);
+                requestObserver.onNext(request);
+            }
+        } catch (RuntimeException e) {
+            requestObserver.onError(e);
+            throw e;
+        }
+        //标识写完
+        requestObserver.onCompleted();
+        return finishLatch;
+    }
+
+    private RouteNote newNote(String message, int lat, int lon) {
+        return RouteNote.newBuilder().setMessage(message)
+                        .setLocation(Point.newBuilder().setLatitude(lat).setLongitude(lon).build()).build();
+    }
+}
diff --git a/gRPC-Demo/src/main/java/cn/mrdear/grpc/route/RouteGuideServer.java b/gRPC-Demo/src/main/java/cn/mrdear/grpc/route/RouteGuideServer.java
new file mode 100644
index 0000000..6df8a80
--- /dev/null
+++ b/gRPC-Demo/src/main/java/cn/mrdear/grpc/route/RouteGuideServer.java
@@ -0,0 +1,67 @@
+package cn.mrdear.grpc.route;
+
+import java.io.IOException;
+import java.util.List;
+
+import cn.mrdear.route.Feature;
+import io.grpc.Server;
+import io.grpc.ServerBuilder;
+
+/**
+ * @author Niu Li
+ * @date 2017/2/2
+ */
+public class RouteGuideServer {
+    private final int port;//服务端端口
+    private final Server server;//服务器
+
+    public RouteGuideServer(int port) throws IOException {
+        this.port = port;
+        //获取初始化数据
+        List<Feature> features = RouteGuideUtil.parseFeatures(RouteGuideUtil.getDefaultFeaturesFile());
+        //初始化Server参数
+        server = ServerBuilder.forPort(port)
+                              //添加指定服务
+                               .addService(new RouteGuideService(features))
+                               .build();
+    }
+
+    /**
+     * 启动服务
+     */
+    public void start() throws IOException {
+        server.start();
+        System.out.println("Server started, listening on " + port);
+        //程序退出时关闭资源
+        Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+            System.err.println("*** shutting down gRPC server since JVM is shutting down");
+            RouteGuideServer.this.stop();
+            System.err.println("*** server shut down");
+        }));
+    }
+
+    /**
+     * 关闭服务
+     */
+    public void stop() {
+        if (server != null) {
+            server.shutdown();
+        }
+    }
+
+    /**
+     * 使得server一直处于运行状态
+     */
+    private void blockUntilShutdown() throws InterruptedException {
+        if (server != null) {
+            server.awaitTermination();
+        }
+    }
+
+    public static void main(String[] args) throws IOException, InterruptedException {
+        RouteGuideServer server = new RouteGuideServer(50051);
+        server.start();
+        server.blockUntilShutdown();
+    }
+
+}
diff --git a/gRPC-Demo/src/main/java/cn/mrdear/grpc/route/RouteGuideService.java b/gRPC-Demo/src/main/java/cn/mrdear/grpc/route/RouteGuideService.java
new file mode 100644
index 0000000..8031ff9
--- /dev/null
+++ b/gRPC-Demo/src/main/java/cn/mrdear/grpc/route/RouteGuideService.java
@@ -0,0 +1,179 @@
+package cn.mrdear.grpc.route;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import cn.mrdear.route.Feature;
+import cn.mrdear.route.Point;
+import cn.mrdear.route.Rectangle;
+import cn.mrdear.route.RouteGuideGrpc;
+import cn.mrdear.route.RouteNote;
+import cn.mrdear.route.RouteSummary;
+import io.grpc.stub.StreamObserver;
+
+import static java.lang.Math.atan2;
+import static java.lang.Math.cos;
+import static java.lang.Math.max;
+import static java.lang.Math.min;
+import static java.lang.Math.sin;
+import static java.lang.Math.sqrt;
+import static java.lang.Math.toRadians;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+
+/**
+ * 具体服务类
+ * @author Niu Li
+ * @date 2017/2/2
+ */
+public class RouteGuideService extends RouteGuideGrpc.RouteGuideImplBase {
+    //保存搜索的位置
+    private final Collection<Feature> features;
+
+    private final ConcurrentMap<Point, List<RouteNote>> routeNotes =
+            new ConcurrentHashMap<Point, List<RouteNote>>();
+    //初始化所有点
+    RouteGuideService(Collection<Feature> features) {
+        this.features = features;
+    }
+
+    @Override
+    public void getFeature(Point request, StreamObserver<Feature> responseObserver) {
+        System.out.println("getFeature得到的请求参数: " + request.toString());
+//        responseObserver.onError(); 代表请求出错
+        responseObserver.onNext(checkFeature(request));//包装返回信息
+        responseObserver.onCompleted();//完成一次请求
+    }
+    //找到复核的feature
+    private Feature checkFeature(Point location) {
+        for (Feature feature : features) {
+            if (feature.getLocation().getLatitude() == location.getLatitude()
+                    && feature.getLocation().getLongitude() == location.getLongitude()) {
+                return feature;
+            }
+        }
+        // No feature was found, return an unnamed feature.
+        return Feature.newBuilder().setName("").setLocation(location).build();
+    }
+
+    @Override
+    public void listFeatures(Rectangle request, StreamObserver<Feature> responseObserver) {
+        System.out.println("listFeatures得到的请求参数: " + request.toString());
+        int left = min(request.getLo().getLongitude(), request.getHi().getLongitude());
+        int right = max(request.getLo().getLongitude(), request.getHi().getLongitude());
+        int top = max(request.getLo().getLatitude(), request.getHi().getLatitude());
+        int bottom = min(request.getLo().getLatitude(), request.getHi().getLatitude());
+
+        for (Feature feature : features) {
+            //如果不存在则继续
+            if (!RouteGuideUtil.exists(feature)) {
+                continue;
+            }
+
+            int lat = feature.getLocation().getLatitude();
+            int lon = feature.getLocation().getLongitude();
+            if (lon >= left && lon <= right && lat >= bottom && lat <= top) {
+                //找到符合的就写入
+                responseObserver.onNext(feature);
+            }
+        }
+        //最后标识完成
+        responseObserver.onCompleted();
+    }
+
+    @Override
+    public StreamObserver<Point> recordRoute(StreamObserver<RouteSummary> responseObserver) {
+        return new StreamObserver<Point>() {
+            int pointCount;
+            int featureCount;
+            int distance;
+            Point previous;
+            long startTime = System.nanoTime();
+            //客户端每写入一个Point,服务端就会调用该方法
+            @Override
+            public void onNext(Point point) {
+                System.out.println("recordRoute得到的请求参数: " + point.toString());
+                pointCount++;
+                if (RouteGuideUtil.exists(checkFeature(point))) {
+                    featureCount++;
+                }
+                if (previous != null) {
+                    distance += calcDistance(previous, point);
+                }
+                previous = point;
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                throwable.printStackTrace();
+                System.err.println("Encountered error in recordRoute");
+            }
+            //客户端写入结束时调用
+            @Override
+            public void onCompleted() {
+                long seconds = NANOSECONDS.toSeconds(System.nanoTime() - startTime);
+                responseObserver.onNext(RouteSummary.newBuilder().setPointCount(pointCount)
+                                                    .setFetureCount(featureCount)
+                                                    .setDistance(distance)
+                                                    .setElapsedTime((int) seconds).build());
+                responseObserver.onCompleted();
+            }
+        };
+    }
+
+    @Override
+    public StreamObserver<RouteNote> routeChat(StreamObserver<RouteNote> responseObserver) {
+        return new StreamObserver<RouteNote>() {
+            @Override
+            public void onNext(RouteNote note) {
+                System.out.println("routeChat得到参数:" + note);
+                List<RouteNote> notes = getOrCreateNotes(note.getLocation());
+
+                for (RouteNote prevNote : notes.toArray(new RouteNote[0])) {
+                    responseObserver.onNext(prevNote);
+                }
+                notes.add(note);
+            }
+            @Override
+            public void onError(Throwable t) {
+                t.printStackTrace();
+                System.err.println("Encountered error in routeChat");
+            }
+
+            @Override
+            public void onCompleted() {
+                System.out.println("finsh");
+                responseObserver.onCompleted();
+            }
+        };
+    }
+
+    //创建记录点
+    private List<RouteNote> getOrCreateNotes(Point location) {
+        List<RouteNote> notes = Collections.synchronizedList(new ArrayList<RouteNote>());
+        List<RouteNote> prevNotes = routeNotes.putIfAbsent(location, notes);
+        return prevNotes != null ? prevNotes : notes;
+    }
+
+    //计算点与点距离
+    private static int calcDistance(Point start, Point end) {
+        double lat1 = RouteGuideUtil.getLatitude(start);
+        double lat2 = RouteGuideUtil.getLatitude(end);
+        double lon1 = RouteGuideUtil.getLongitude(start);
+        double lon2 = RouteGuideUtil.getLongitude(end);
+        int r = 6371000; // meters
+        double phi1 = toRadians(lat1);
+        double phi2 = toRadians(lat2);
+        double deltaPhi = toRadians(lat2 - lat1);
+        double deltaLambda = toRadians(lon2 - lon1);
+
+        double a = sin(deltaPhi / 2) * sin(deltaPhi / 2)
+                + cos(phi1) * cos(phi2) * sin(deltaLambda / 2) * sin(deltaLambda / 2);
+        double c = 2 * atan2(sqrt(a), sqrt(1 - a));
+
+        return (int) (r * c);
+    }
+}
diff --git a/gRPC-Demo/src/main/java/cn/mrdear/grpc/route/RouteGuideUtil.java b/gRPC-Demo/src/main/java/cn/mrdear/grpc/route/RouteGuideUtil.java
new file mode 100644
index 0000000..f7fc078
--- /dev/null
+++ b/gRPC-Demo/src/main/java/cn/mrdear/grpc/route/RouteGuideUtil.java
@@ -0,0 +1,74 @@
+
+package cn.mrdear.grpc.route;
+
+import com.google.protobuf.util.JsonFormat;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.net.URL;
+import java.util.List;
+
+import cn.mrdear.route.Feature;
+import cn.mrdear.route.FeatureDatabase;
+import cn.mrdear.route.Point;
+
+/**
+ * 为该Demo提供数据
+ */
+public class RouteGuideUtil {
+  private static final double COORD_FACTOR = 1e7;
+
+  public static void main(String[] args) throws IOException {
+    URL featuresFile = getDefaultFeaturesFile();
+    List<Feature> list = parseFeatures(featuresFile);
+    System.out.println(list);
+  }
+  /**
+   * Gets the latitude for the given point.
+   */
+  public static double getLatitude(Point location) {
+    return location.getLatitude() / COORD_FACTOR;
+  }
+
+  /**
+   * Gets the longitude for the given point.
+   */
+  public static double getLongitude(Point location) {
+    return location.getLongitude() / COORD_FACTOR;
+  }
+
+  /**
+   * Gets the default features file from classpath.
+   */
+  public static URL getDefaultFeaturesFile() {
+    return RouteGuideServer.class.getClassLoader().getResource("route_guide_db.json");
+  }
+
+  /**
+   * Parses the JSON input file containing the list of features.
+   */
+  public static List<Feature> parseFeatures(URL file) throws IOException {
+    InputStream input = file.openStream();
+    try {
+      Reader reader = new InputStreamReader(input);
+      try {
+        FeatureDatabase.Builder database = FeatureDatabase.newBuilder();
+        JsonFormat.parser().merge(reader, database);
+        return database.getFeatureList();
+      } finally {
+        reader.close();
+      }
+    } finally {
+      input.close();
+    }
+  }
+
+  /**
+   * Indicates whether the given feature exists (i.e. has a valid name).
+   */
+  public static boolean exists(Feature feature) {
+    return feature != null && !feature.getName().isEmpty();
+  }
+}
diff --git a/gRPC-Demo/src/main/proto/hello.proto b/gRPC-Demo/src/main/proto/hello.proto
new file mode 100644
index 0000000..fdaa504
--- /dev/null
+++ b/gRPC-Demo/src/main/proto/hello.proto
@@ -0,0 +1,23 @@
+//指定proto3格式
+syntax = "proto3";
+//一些生成代码的设置
+option java_multiple_files = true;//以外部类模式生成
+option java_package = "io.grpc.examples.helloworld";//所在包名
+option java_outer_classname = "HelloWorldProto";//最外层类名称
+
+package helloworld;
+
+//定义了一个service
+service Greeter {
+  rpc SayHello (HelloRequest) returns (HelloReply) {}
+}
+
+//定义了一个消息请求体
+message HelloRequest {
+  string name = 1;
+}
+
+//定义了一个消息回复体
+message HelloReply {
+  string message = 1;
+}
diff --git a/gRPC-Demo/src/main/proto/route.proto b/gRPC-Demo/src/main/proto/route.proto
new file mode 100644
index 0000000..636d4bc
--- /dev/null
+++ b/gRPC-Demo/src/main/proto/route.proto
@@ -0,0 +1,64 @@
+//指定proto3格式
+syntax = "proto3";
+//一些生成代码的设置
+option java_multiple_files = true;//以外部类模式生成
+option java_package = "cn.mrdear.route";//所在包名
+option java_outer_classname = "RouteProto";//最外层类名称
+
+
+//定义服务
+service RouteGuide{
+    //得到指定点的feature
+    //一个 简单 RPC ， 客户端使用存根发送请求到服务器并等待响应返回，就像平常的函数调用一样。
+    rpc GetFeature(Point) returns (Feature) {}
+    //获取一个矩形内的点
+    //一个 服务器端流式 RPC ， 客户端发送请求到服务器，拿到一个流去读取返回的消息序列。 客户端读取返回的流，
+    //直到里面没有任何消息。从例子中可以看出，通过在 响应 类型前插入 stream 关键字，可以指定一个服务器端的流方法。
+    rpc ListFeatures(Rectangle) returns (stream Feature){}
+    //记录该点
+    //一个 客户端流式 RPC ， 客户端写入一个消息序列并将其发送到服务器，同样也是使用流。一旦客户端完成写入消息，
+    //它等待服务器完成读取返回它的响应。通过在 请求 类型前指定 stream 关键字来指定一个客户端的流方法。
+    rpc RecordRoute(stream Point) returns (RouteSummary){}
+    //路由交流
+    //一个 双向流式 RPC 是双方使用读写流去发送一个消息序列。两个流独立操作，因此客户端和服务器
+    //可以以任意喜欢的顺序读写：比如， 服务器可以在写入响应前等待接收所有的客户端消息，或者可以交替 的读取和写入消息，
+    //或者其他读写的组合。每个流中的消息顺序被预留。你可以通过在请求和响应前加 stream 关键字去制定方法的类型。
+    rpc RouteChat(stream RouteNote) returns (stream RouteNote){}
+}
+
+
+//代表经纬度
+message Point {
+    int32 latitude = 1;
+    int32 longitude = 2;
+}
+//由两个点确定的一个方块
+message Rectangle{
+    Point lo = 1;
+    Point hi = 2;
+}
+//某一位置的名称
+message Feature {
+
+    string name = 1;
+
+    Point location = 2;
+}
+
+// Not used in the RPC.  Instead, this is here for the form serialized to disk.
+message FeatureDatabase {
+    repeated Feature feature = 1;
+}
+//给某一点发送消息
+message RouteNote{
+    Point location = 1;
+    string message = 2;
+}
+
+//记录收到的信息
+message RouteSummary{
+    int32 point_count = 1;
+    int32 feture_count = 2;
+    int32 distance = 3;
+    int32 elapsed_time = 4;
+}
\ No newline at end of file
diff --git a/gRPC-Demo/src/main/resources/route_guide_db.json b/gRPC-Demo/src/main/resources/route_guide_db.json
new file mode 100644
index 0000000..e0ee318
--- /dev/null
+++ b/gRPC-Demo/src/main/resources/route_guide_db.json
@@ -0,0 +1,603 @@
+{
+  "feature": [{
+      "location": {
+          "latitude": 407838351,
+          "longitude": -746143763
+      },
+      "name": "Patriots Path, Mendham, NJ 07945, USA"
+  }, {
+      "location": {
+          "latitude": 408122808,
+          "longitude": -743999179
+      },
+      "name": "101 New Jersey 10, Whippany, NJ 07981, USA"
+  }, {
+      "location": {
+          "latitude": 413628156,
+          "longitude": -749015468
+      },
+      "name": "U.S. 6, Shohola, PA 18458, USA"
+  }, {
+      "location": {
+          "latitude": 419999544,
+          "longitude": -740371136
+      },
+      "name": "5 Conners Road, Kingston, NY 12401, USA"
+  }, {
+      "location": {
+          "latitude": 414008389,
+          "longitude": -743951297
+      },
+      "name": "Mid Hudson Psychiatric Center, New Hampton, NY 10958, USA"
+  }, {
+      "location": {
+          "latitude": 419611318,
+          "longitude": -746524769
+      },
+      "name": "287 Flugertown Road, Livingston Manor, NY 12758, USA"
+  }, {
+      "location": {
+          "latitude": 406109563,
+          "longitude": -742186778
+      },
+      "name": "4001 Tremley Point Road, Linden, NJ 07036, USA"
+  }, {
+      "location": {
+          "latitude": 416802456,
+          "longitude": -742370183
+      },
+      "name": "352 South Mountain Road, Wallkill, NY 12589, USA"
+  }, {
+      "location": {
+          "latitude": 412950425,
+          "longitude": -741077389
+      },
+      "name": "Bailey Turn Road, Harriman, NY 10926, USA"
+  }, {
+      "location": {
+          "latitude": 412144655,
+          "longitude": -743949739
+      },
+      "name": "193-199 Wawayanda Road, Hewitt, NJ 07421, USA"
+  }, {
+      "location": {
+          "latitude": 415736605,
+          "longitude": -742847522
+      },
+      "name": "406-496 Ward Avenue, Pine Bush, NY 12566, USA"
+  }, {
+      "location": {
+          "latitude": 413843930,
+          "longitude": -740501726
+      },
+      "name": "162 Merrill Road, Highland Mills, NY 10930, USA"
+  }, {
+      "location": {
+          "latitude": 410873075,
+          "longitude": -744459023
+      },
+      "name": "Clinton Road, West Milford, NJ 07480, USA"
+  }, {
+      "location": {
+          "latitude": 412346009,
+          "longitude": -744026814
+      },
+      "name": "16 Old Brook Lane, Warwick, NY 10990, USA"
+  }, {
+      "location": {
+          "latitude": 402948455,
+          "longitude": -747903913
+      },
+      "name": "3 Drake Lane, Pennington, NJ 08534, USA"
+  }, {
+      "location": {
+          "latitude": 406337092,
+          "longitude": -740122226
+      },
+      "name": "6324 8th Avenue, Brooklyn, NY 11220, USA"
+  }, {
+      "location": {
+          "latitude": 406421967,
+          "longitude": -747727624
+      },
+      "name": "1 Merck Access Road, Whitehouse Station, NJ 08889, USA"
+  }, {
+      "location": {
+          "latitude": 416318082,
+          "longitude": -749677716
+      },
+      "name": "78-98 Schalck Road, Narrowsburg, NY 12764, USA"
+  }, {
+      "location": {
+          "latitude": 415301720,
+          "longitude": -748416257
+      },
+      "name": "282 Lakeview Drive Road, Highland Lake, NY 12743, USA"
+  }, {
+      "location": {
+          "latitude": 402647019,
+          "longitude": -747071791
+      },
+      "name": "330 Evelyn Avenue, Hamilton Township, NJ 08619, USA"
+  }, {
+      "location": {
+          "latitude": 412567807,
+          "longitude": -741058078
+      },
+      "name": "New York State Reference Route 987E, Southfields, NY 10975, USA"
+  }, {
+      "location": {
+          "latitude": 416855156,
+          "longitude": -744420597
+      },
+      "name": "103-271 Tempaloni Road, Ellenville, NY 12428, USA"
+  }, {
+      "location": {
+          "latitude": 404663628,
+          "longitude": -744820157
+      },
+      "name": "1300 Airport Road, North Brunswick Township, NJ 08902, USA"
+  }, {
+      "location": {
+          "latitude": 407113723,
+          "longitude": -749746483
+      },
+      "name": ""
+  }, {
+      "location": {
+          "latitude": 402133926,
+          "longitude": -743613249
+      },
+      "name": ""
+  }, {
+      "location": {
+          "latitude": 400273442,
+          "longitude": -741220915
+      },
+      "name": ""
+  }, {
+      "location": {
+          "latitude": 411236786,
+          "longitude": -744070769
+      },
+      "name": ""
+  }, {
+      "location": {
+          "latitude": 411633782,
+          "longitude": -746784970
+      },
+      "name": "211-225 Plains Road, Augusta, NJ 07822, USA"
+  }, {
+      "location": {
+          "latitude": 415830701,
+          "longitude": -742952812
+      },
+      "name": ""
+  }, {
+      "location": {
+          "latitude": 413447164,
+          "longitude": -748712898
+      },
+      "name": "165 Pedersen Ridge Road, Milford, PA 18337, USA"
+  }, {
+      "location": {
+          "latitude": 405047245,
+          "longitude": -749800722
+      },
+      "name": "100-122 Locktown Road, Frenchtown, NJ 08825, USA"
+  }, {
+      "location": {
+          "latitude": 418858923,
+          "longitude": -746156790
+      },
+      "name": ""
+  }, {
+      "location": {
+          "latitude": 417951888,
+          "longitude": -748484944
+      },
+      "name": "650-652 Willi Hill Road, Swan Lake, NY 12783, USA"
+  }, {
+      "location": {
+          "latitude": 407033786,
+          "longitude": -743977337
+      },
+      "name": "26 East 3rd Street, New Providence, NJ 07974, USA"
+  }, {
+      "location": {
+          "latitude": 417548014,
+          "longitude": -740075041
+      },
+      "name": ""
+  }, {
+      "location": {
+          "latitude": 410395868,
+          "longitude": -744972325
+      },
+      "name": ""
+  }, {
+      "location": {
+          "latitude": 404615353,
+          "longitude": -745129803
+      },
+      "name": ""
+  }, {
+      "location": {
+          "latitude": 406589790,
+          "longitude": -743560121
+      },
+      "name": "611 Lawrence Avenue, Westfield, NJ 07090, USA"
+  }, {
+      "location": {
+          "latitude": 414653148,
+          "longitude": -740477477
+      },
+      "name": "18 Lannis Avenue, New Windsor, NY 12553, USA"
+  }, {
+      "location": {
+          "latitude": 405957808,
+          "longitude": -743255336
+      },
+      "name": "82-104 Amherst Avenue, Colonia, NJ 07067, USA"
+  }, {
+      "location": {
+          "latitude": 411733589,
+          "longitude": -741648093
+      },
+      "name": "170 Seven Lakes Drive, Sloatsburg, NY 10974, USA"
+  }, {
+      "location": {
+          "latitude": 412676291,
+          "longitude": -742606606
+      },
+      "name": "1270 Lakes Road, Monroe, NY 10950, USA"
+  }, {
+      "location": {
+          "latitude": 409224445,
+          "longitude": -748286738
+      },
+      "name": "509-535 Alphano Road, Great Meadows, NJ 07838, USA"
+  }, {
+      "location": {
+          "latitude": 406523420,
+          "longitude": -742135517
+      },
+      "name": "652 Garden Street, Elizabeth, NJ 07202, USA"
+  }, {
+      "location": {
+          "latitude": 401827388,
+          "longitude": -740294537
+      },
+      "name": "349 Sea Spray Court, Neptune City, NJ 07753, USA"
+  }, {
+      "location": {
+          "latitude": 410564152,
+          "longitude": -743685054
+      },
+      "name": "13-17 Stanley Street, West Milford, NJ 07480, USA"
+  }, {
+      "location": {
+          "latitude": 408472324,
+          "longitude": -740726046
+      },
+      "name": "47 Industrial Avenue, Teterboro, NJ 07608, USA"
+  }, {
+      "location": {
+          "latitude": 412452168,
+          "longitude": -740214052
+      },
+      "name": "5 White Oak Lane, Stony Point, NY 10980, USA"
+  }, {
+      "location": {
+          "latitude": 409146138,
+          "longitude": -746188906
+      },
+      "name": "Berkshire Valley Management Area Trail, Jefferson, NJ, USA"
+  }, {
+      "location": {
+          "latitude": 404701380,
+          "longitude": -744781745
+      },
+      "name": "1007 Jersey Avenue, New Brunswick, NJ 08901, USA"
+  }, {
+      "location": {
+          "latitude": 409642566,
+          "longitude": -746017679
+      },
+      "name": "6 East Emerald Isle Drive, Lake Hopatcong, NJ 07849, USA"
+  }, {
+      "location": {
+          "latitude": 408031728,
+          "longitude": -748645385
+      },
+      "name": "1358-1474 New Jersey 57, Port Murray, NJ 07865, USA"
+  }, {
+      "location": {
+          "latitude": 413700272,
+          "longitude": -742135189
+      },
+      "name": "367 Prospect Road, Chester, NY 10918, USA"
+  }, {
+      "location": {
+          "latitude": 404310607,
+          "longitude": -740282632
+      },
+      "name": "10 Simon Lake Drive, Atlantic Highlands, NJ 07716, USA"
+  }, {
+      "location": {
+          "latitude": 409319800,
+          "longitude": -746201391
+      },
+      "name": "11 Ward Street, Mount Arlington, NJ 07856, USA"
+  }, {
+      "location": {
+          "latitude": 406685311,
+          "longitude": -742108603
+      },
+      "name": "300-398 Jefferson Avenue, Elizabeth, NJ 07201, USA"
+  }, {
+      "location": {
+          "latitude": 419018117,
+          "longitude": -749142781
+      },
+      "name": "43 Dreher Road, Roscoe, NY 12776, USA"
+  }, {
+      "location": {
+          "latitude": 412856162,
+          "longitude": -745148837
+      },
+      "name": "Swan Street, Pine Island, NY 10969, USA"
+  }, {
+      "location": {
+          "latitude": 416560744,
+          "longitude": -746721964
+      },
+      "name": "66 Pleasantview Avenue, Monticello, NY 12701, USA"
+  }, {
+      "location": {
+          "latitude": 405314270,
+          "longitude": -749836354
+      },
+      "name": ""
+  }, {
+      "location": {
+          "latitude": 414219548,
+          "longitude": -743327440
+      },
+      "name": ""
+  }, {
+      "location": {
+          "latitude": 415534177,
+          "longitude": -742900616
+      },
+      "name": "565 Winding Hills Road, Montgomery, NY 12549, USA"
+  }, {
+      "location": {
+          "latitude": 406898530,
+          "longitude": -749127080
+      },
+      "name": "231 Rocky Run Road, Glen Gardner, NJ 08826, USA"
+  }, {
+      "location": {
+          "latitude": 407586880,
+          "longitude": -741670168
+      },
+      "name": "100 Mount Pleasant Avenue, Newark, NJ 07104, USA"
+  }, {
+      "location": {
+          "latitude": 400106455,
+          "longitude": -742870190
+      },
+      "name": "517-521 Huntington Drive, Manchester Township, NJ 08759, USA"
+  }, {
+      "location": {
+          "latitude": 400066188,
+          "longitude": -746793294
+      },
+      "name": ""
+  }, {
+      "location": {
+          "latitude": 418803880,
+          "longitude": -744102673
+      },
+      "name": "40 Mountain Road, Napanoch, NY 12458, USA"
+  }, {
+      "location": {
+          "latitude": 414204288,
+          "longitude": -747895140
+      },
+      "name": ""
+  }, {
+      "location": {
+          "latitude": 414777405,
+          "longitude": -740615601
+      },
+      "name": ""
+  }, {
+      "location": {
+          "latitude": 415464475,
+          "longitude": -747175374
+      },
+      "name": "48 North Road, Forestburgh, NY 12777, USA"
+  }, {
+      "location": {
+          "latitude": 404062378,
+          "longitude": -746376177
+      },
+      "name": ""
+  }, {
+      "location": {
+          "latitude": 405688272,
+          "longitude": -749285130
+      },
+      "name": ""
+  }, {
+      "location": {
+          "latitude": 400342070,
+          "longitude": -748788996
+      },
+      "name": ""
+  }, {
+      "location": {
+          "latitude": 401809022,
+          "longitude": -744157964
+      },
+      "name": ""
+  }, {
+      "location": {
+          "latitude": 404226644,
+          "longitude": -740517141
+      },
+      "name": "9 Thompson Avenue, Leonardo, NJ 07737, USA"
+  }, {
+      "location": {
+          "latitude": 410322033,
+          "longitude": -747871659
+      },
+      "name": ""
+  }, {
+      "location": {
+          "latitude": 407100674,
+          "longitude": -747742727
+      },
+      "name": ""
+  }, {
+      "location": {
+          "latitude": 418811433,
+          "longitude": -741718005
+      },
+      "name": "213 Bush Road, Stone Ridge, NY 12484, USA"
+  }, {
+      "location": {
+          "latitude": 415034302,
+          "longitude": -743850945
+      },
+      "name": ""
+  }, {
+      "location": {
+          "latitude": 411349992,
+          "longitude": -743694161
+      },
+      "name": ""
+  }, {
+      "location": {
+          "latitude": 404839914,
+          "longitude": -744759616
+      },
+      "name": "1-17 Bergen Court, New Brunswick, NJ 08901, USA"
+  }, {
+      "location": {
+          "latitude": 414638017,
+          "longitude": -745957854
+      },
+      "name": "35 Oakland Valley Road, Cuddebackville, NY 12729, USA"
+  }, {
+      "location": {
+          "latitude": 412127800,
+          "longitude": -740173578
+      },
+      "name": ""
+  }, {
+      "location": {
+          "latitude": 401263460,
+          "longitude": -747964303
+      },
+      "name": ""
+  }, {
+      "location": {
+          "latitude": 412843391,
+          "longitude": -749086026
+      },
+      "name": ""
+  }, {
+      "location": {
+          "latitude": 418512773,
+          "longitude": -743067823
+      },
+      "name": ""
+  }, {
+      "location": {
+          "latitude": 404318328,
+          "longitude": -740835638
+      },
+      "name": "42-102 Main Street, Belford, NJ 07718, USA"
+  }, {
+      "location": {
+          "latitude": 419020746,
+          "longitude": -741172328
+      },
+      "name": ""
+  }, {
+      "location": {
+          "latitude": 404080723,
+          "longitude": -746119569
+      },
+      "name": ""
+  }, {
+      "location": {
+          "latitude": 401012643,
+          "longitude": -744035134
+      },
+      "name": ""
+  }, {
+      "location": {
+          "latitude": 404306372,
+          "longitude": -741079661
+      },
+      "name": ""
+  }, {
+      "location": {
+          "latitude": 403966326,
+          "longitude": -748519297
+      },
+      "name": ""
+  }, {
+      "location": {
+          "latitude": 405002031,
+          "longitude": -748407866
+      },
+      "name": ""
+  }, {
+      "location": {
+          "latitude": 409532885,
+          "longitude": -742200683
+      },
+      "name": ""
+  }, {
+      "location": {
+          "latitude": 416851321,
+          "longitude": -742674555
+      },
+      "name": ""
+  }, {
+      "location": {
+          "latitude": 406411633,
+          "longitude": -741722051
+      },
+      "name": "3387 Richmond Terrace, Staten Island, NY 10303, USA"
+  }, {
+      "location": {
+          "latitude": 413069058,
+          "longitude": -744597778
+      },
+      "name": "261 Van Sickle Road, Goshen, NY 10924, USA"
+  }, {
+      "location": {
+          "latitude": 418465462,
+          "longitude": -746859398
+      },
+      "name": ""
+  }, {
+      "location": {
+          "latitude": 411733222,
+          "longitude": -744228360
+      },
+      "name": ""
+  }, {
+      "location": {
+          "latitude": 410248224,
+          "longitude": -747127767
+      },
+      "name": "3 Hasta Way, Newton, NJ 07860, USA"
+  }]
+}
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/artifacts/core_war.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/artifacts/core_war.xml"
deleted file mode 100644
index 2cb66f0..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/artifacts/core_war.xml"
+++ /dev/null
@@ -1,8 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="war" name="core:war">
-    <output-path>$PROJECT_DIR$/core/target</output-path>
-    <root id="archive" name="core.war">
-      <element id="artifact" artifact-name="core:war exploded" />
-    </root>
-  </artifact>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/artifacts/core_war_exploded.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/artifacts/core_war_exploded.xml"
deleted file mode 100644
index 9ffa33c..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/artifacts/core_war_exploded.xml"
+++ /dev/null
@@ -1,16 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="exploded-war" name="core:war exploded">
-    <output-path>$PROJECT_DIR$/core/target/core</output-path>
-    <root id="root">
-      <element id="directory" name="WEB-INF">
-        <element id="directory" name="classes">
-          <element id="module-output" name="haikong-core" />
-        </element>
-      </element>
-      <element id="directory" name="META-INF">
-        <element id="file-copy" path="$PROJECT_DIR$/haikong-core/target/core/META-INF/MANIFEST.MF" />
-      </element>
-      <element id="javaee-facet-resources" facet="haikong-core/web/Web" />
-    </root>
-  </artifact>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/artifacts/haikong_core_war.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/artifacts/haikong_core_war.xml"
deleted file mode 100644
index 8887c74..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/artifacts/haikong_core_war.xml"
+++ /dev/null
@@ -1,8 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="war" name="haikong-core:war">
-    <output-path>$PROJECT_DIR$/haikong-core/target</output-path>
-    <root id="archive" name="core.war">
-      <element id="artifact" artifact-name="haikong-core:war exploded" />
-    </root>
-  </artifact>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/artifacts/haikong_core_war_exploded.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/artifacts/haikong_core_war_exploded.xml"
deleted file mode 100644
index b2871a9..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/artifacts/haikong_core_war_exploded.xml"
+++ /dev/null
@@ -1,73 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="exploded-war" name="haikong-core:war exploded">
-    <output-path>$PROJECT_DIR$/haikong-core/target/core</output-path>
-    <root id="root">
-      <element id="directory" name="WEB-INF">
-        <element id="directory" name="classes">
-          <element id="module-output" name="haikong-core" />
-        </element>
-        <element id="directory" name="lib">
-          <element id="library" level="project" name="Maven: org.thymeleaf:thymeleaf:3.0.1.RELEASE" />
-          <element id="library" level="project" name="Maven: ognl:ognl:3.1.3" />
-          <element id="library" level="project" name="Maven: org.javassist:javassist:3.20.0-GA" />
-          <element id="library" level="project" name="Maven: org.attoparser:attoparser:2.0.0.RELEASE" />
-          <element id="library" level="project" name="Maven: org.unbescape:unbescape:1.1.3.RELEASE" />
-          <element id="library" level="project" name="Maven: org.slf4j:slf4j-api:1.7.7" />
-          <element id="library" level="project" name="Maven: org.thymeleaf:thymeleaf-spring4:3.0.1.RELEASE" />
-          <element id="archive" name="haikong-switch-1.0.0.jar">
-            <element id="module-output" name="haikong-switch" />
-          </element>
-          <element id="library" level="project" name="Maven: org.springframework:spring-core:4.3.2.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-web:4.3.2.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-jdbc:4.3.2.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-tx:4.3.2.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-webmvc:4.3.2.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-aop:4.3.2.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-context-support:4.3.2.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-test:4.3.2.RELEASE" />
-          <element id="library" level="project" name="Maven: org.mybatis:mybatis:3.4.1" />
-          <element id="library" level="project" name="Maven: org.mybatis:mybatis-spring:1.3.0" />
-          <element id="library" level="project" name="Maven: com.github.pagehelper:pagehelper:4.1.6" />
-          <element id="library" level="project" name="Maven: org.mybatis:mybatis-ehcache:1.0.0" />
-          <element id="library" level="project" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" />
-          <element id="library" level="project" name="Maven: net.sf.ehcache:ehcache-web:2.0.4" />
-          <element id="library" level="project" name="Maven: mysql:mysql-connector-java:5.1.39" />
-          <element id="library" level="project" name="Maven: com.alibaba:druid:1.0.25" />
-          <element id="library" level="project" name="Maven: com.alibaba:fastjson:1.2.16" />
-          <element id="library" level="project" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" />
-          <element id="library" level="project" name="Maven: log4j:log4j:1.2.17" />
-          <element id="library" level="project" name="Maven: org.slf4j:slf4j-log4j12:1.7.7" />
-          <element id="library" level="project" name="Maven: org.aspectj:aspectjweaver:1.8.6" />
-          <element id="library" level="project" name="Maven: org.aspectj:aspectjrt:1.8.6" />
-          <element id="library" level="project" name="Maven: cglib:cglib:3.2.2" />
-          <element id="archive" name="haikong-common-1.0.0.jar">
-            <element id="module-output" name="haikong-common" />
-          </element>
-          <element id="library" level="project" name="Maven: dom4j:dom4j:1.6.1" />
-          <element id="library" level="project" name="Maven: xml-apis:xml-apis:1.0.b2" />
-          <element id="library" level="project" name="Maven: com.thoughtworks.xstream:xstream:1.4.9" />
-          <element id="library" level="project" name="Maven: xmlpull:xmlpull:1.1.3.1" />
-          <element id="library" level="project" name="Maven: xpp3:xpp3_min:1.1.4c" />
-          <element id="library" level="project" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" />
-          <element id="library" level="project" name="Maven: org.apache.httpcomponents:httpcore:4.4.4" />
-          <element id="library" level="project" name="Maven: commons-logging:commons-logging:1.2" />
-          <element id="library" level="project" name="Maven: commons-codec:commons-codec:1.9" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-beans:4.3.2.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-context:4.3.2.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-expression:4.3.2.RELEASE" />
-          <element id="library" level="project" name="Maven: com.github.jsqlparser:jsqlparser:0.9.5" />
-          <element id="library" level="project" name="Maven: javax.validation:validation-api:1.1.0.Final" />
-          <element id="library" level="project" name="Maven: org.jboss.logging:jboss-logging:3.2.1.Final" />
-          <element id="library" level="project" name="Maven: com.fasterxml:classmate:1.1.0" />
-          <element id="library" level="project" name="Maven: org.ow2.asm:asm:5.0.4" />
-          <element id="library" level="project" name="Maven: org.apache.ant:ant:1.9.6" />
-          <element id="library" level="project" name="Maven: org.apache.ant:ant-launcher:1.9.6" />
-        </element>
-      </element>
-      <element id="directory" name="META-INF">
-        <element id="file-copy" path="$PROJECT_DIR$/haikong-core/target/core/META-INF/MANIFEST.MF" />
-      </element>
-      <element id="javaee-facet-resources" facet="haikong-core/web/Web" />
-    </root>
-  </artifact>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/compiler.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/compiler.xml"
deleted file mode 100644
index 52045ca..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/compiler.xml"
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-      <entry name="!?*.aj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-      <profile default="false" name="Maven default annotation processors profile" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <processorPath useClasspath="true" />
-        <module name="core" />
-        <module name="haikong-common" />
-        <module name="haikong-core" />
-        <module name="haikong-switch" />
-      </profile>
-    </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="core" target="1.5" />
-      <module name="haikong-common" target="1.8" />
-      <module name="haikong-core" target="1.8" />
-      <module name="haikong-switch" target="1.8" />
-      <module name="微信服务端" target="1.5" />
-    </bytecodeTargetLevel>
-  </component>
-</project>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/copyright/profiles_settings.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/copyright/profiles_settings.xml"
deleted file mode 100644
index e7bedf3..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/copyright/profiles_settings.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/encodings.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/encodings.xml"
deleted file mode 100644
index 97626ba..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/encodings.xml"
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__cglib_cglib_3_2_2.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__cglib_cglib_3_2_2.xml"
deleted file mode 100644
index 9e3d27a..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__cglib_cglib_3_2_2.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: cglib:cglib:3.2.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/cglib/cglib/3.2.2/cglib-3.2.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/cglib/cglib/3.2.2/cglib-3.2.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/cglib/cglib/3.2.2/cglib-3.2.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__com_alibaba_druid_1_0_25.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__com_alibaba_druid_1_0_25.xml"
deleted file mode 100644
index a99867b..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__com_alibaba_druid_1_0_25.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.alibaba:druid:1.0.25">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.0.25/druid-1.0.25.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.0.25/druid-1.0.25-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.0.25/druid-1.0.25-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__com_alibaba_fastjson_1_2_16.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__com_alibaba_fastjson_1_2_16.xml"
deleted file mode 100644
index 974cfda..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__com_alibaba_fastjson_1_2_16.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.alibaba:fastjson:1.2.16">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.16/fastjson-1.2.16.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.16/fastjson-1.2.16-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.16/fastjson-1.2.16-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__com_fasterxml_classmate_1_1_0.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__com_fasterxml_classmate_1_1_0.xml"
deleted file mode 100644
index 727b8fe..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__com_fasterxml_classmate_1_1_0.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.fasterxml:classmate:1.1.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.1.0/classmate-1.1.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.1.0/classmate-1.1.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.1.0/classmate-1.1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_0_9_5.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_0_9_5.xml"
deleted file mode 100644
index eba478b..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_0_9_5.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.github.jsqlparser:jsqlparser:0.9.5">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/0.9.5/jsqlparser-0.9.5.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/0.9.5/jsqlparser-0.9.5-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/0.9.5/jsqlparser-0.9.5-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__com_github_pagehelper_pagehelper_4_1_6.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__com_github_pagehelper_pagehelper_4_1_6.xml"
deleted file mode 100644
index 84bf18c..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__com_github_pagehelper_pagehelper_4_1_6.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.github.pagehelper:pagehelper:4.1.6">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/4.1.6/pagehelper-4.1.6.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/4.1.6/pagehelper-4.1.6-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/4.1.6/pagehelper-4.1.6-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_9.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_9.xml"
deleted file mode 100644
index 1922b11..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_9.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.thoughtworks.xstream:xstream:1.4.9">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/thoughtworks/xstream/xstream/1.4.9/xstream-1.4.9.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/thoughtworks/xstream/xstream/1.4.9/xstream-1.4.9-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/thoughtworks/xstream/xstream/1.4.9/xstream-1.4.9-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml"
deleted file mode 100644
index a66d039..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: commons-codec:commons-codec:1.9">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.9/commons-codec-1.9.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.9/commons-codec-1.9-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.9/commons-codec-1.9-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml"
deleted file mode 100644
index eab40b3..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: commons-logging:commons-logging:1.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml"
deleted file mode 100644
index 14681ee..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: dom4j:dom4j:1.6.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/dom4j/dom4j/1.6.1/dom4j-1.6.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml"
deleted file mode 100644
index 940ce73..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: javax.validation:validation-api:1.1.0.Final">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__junit_junit_4_10.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__junit_junit_4_10.xml"
deleted file mode 100644
index ed8bf5f..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__junit_junit_4_10.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: junit:junit:4.10">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.10/junit-4.10.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.10/junit-4.10-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.10/junit-4.10-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__log4j_log4j_1_2_17.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__log4j_log4j_1_2_17.xml"
deleted file mode 100644
index e383c1b..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__log4j_log4j_1_2_17.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: log4j:log4j:1.2.17">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.17/log4j-1.2.17.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.17/log4j-1.2.17-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.17/log4j-1.2.17-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_39.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_39.xml"
deleted file mode 100644
index 18e6ec9..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_39.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: mysql:mysql-connector-java:5.1.39">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/5.1.39/mysql-connector-java-5.1.39.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/5.1.39/mysql-connector-java-5.1.39-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/5.1.39/mysql-connector-java-5.1.39-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_11.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_11.xml"
deleted file mode 100644
index 1c71163..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_11.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: net.sf.ehcache:ehcache-core:2.6.11">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/sf/ehcache/ehcache-core/2.6.11/ehcache-core-2.6.11.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/net/sf/ehcache/ehcache-core/2.6.11/ehcache-core-2.6.11-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/sf/ehcache/ehcache-core/2.6.11/ehcache-core-2.6.11-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__net_sf_ehcache_ehcache_web_2_0_4.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__net_sf_ehcache_ehcache_web_2_0_4.xml"
deleted file mode 100644
index e41e7ba..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__net_sf_ehcache_ehcache_web_2_0_4.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: net.sf.ehcache:ehcache-web:2.0.4">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/sf/ehcache/ehcache-web/2.0.4/ehcache-web-2.0.4.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/net/sf/ehcache/ehcache-web/2.0.4/ehcache-web-2.0.4-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/sf/ehcache/ehcache-web/2.0.4/ehcache-web-2.0.4-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__ognl_ognl_3_1_3.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__ognl_ognl_3_1_3.xml"
deleted file mode 100644
index d31c28c..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__ognl_ognl_3_1_3.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: ognl:ognl:3.1.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/ognl/ognl/3.1.3/ognl-3.1.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/ognl/ognl/3.1.3/ognl-3.1.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/ognl/ognl/3.1.3/ognl-3.1.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_apache_ant_ant_1_9_6.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_apache_ant_ant_1_9_6.xml"
deleted file mode 100644
index 8cba3e1..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_apache_ant_ant_1_9_6.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.ant:ant:1.9.6">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant/1.9.6/ant-1.9.6.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant/1.9.6/ant-1.9.6-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant/1.9.6/ant-1.9.6-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_apache_ant_ant_launcher_1_9_6.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_apache_ant_ant_launcher_1_9_6.xml"
deleted file mode 100644
index 4a5c8b2..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_apache_ant_ant_launcher_1_9_6.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.ant:ant-launcher:1.9.6">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant-launcher/1.9.6/ant-launcher-1.9.6.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant-launcher/1.9.6/ant-launcher-1.9.6-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant-launcher/1.9.6/ant-launcher-1.9.6-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_2.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_2.xml"
deleted file mode 100644
index fdb7ead..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_2.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.httpcomponents:httpclient:4.5.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.2/httpclient-4.5.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.2/httpclient-4.5.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.2/httpclient-4.5.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_4.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_4.xml"
deleted file mode 100644
index 3a5aa19..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_4.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.httpcomponents:httpcore:4.4.4">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.4/httpcore-4.4.4.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.4/httpcore-4.4.4-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.4/httpcore-4.4.4-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_aspectj_aspectjrt_1_8_6.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_aspectj_aspectjrt_1_8_6.xml"
deleted file mode 100644
index c62d9a0..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_aspectj_aspectjrt_1_8_6.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.aspectj:aspectjrt:1.8.6">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjrt/1.8.6/aspectjrt-1.8.6.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjrt/1.8.6/aspectjrt-1.8.6-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjrt/1.8.6/aspectjrt-1.8.6-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_6.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_6.xml"
deleted file mode 100644
index 61938e1..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_6.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.aspectj:aspectjweaver:1.8.6">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjweaver/1.8.6/aspectjweaver-1.8.6.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjweaver/1.8.6/aspectjweaver-1.8.6-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjweaver/1.8.6/aspectjweaver-1.8.6-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_attoparser_attoparser_2_0_0_RELEASE.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_attoparser_attoparser_2_0_0_RELEASE.xml"
deleted file mode 100644
index 03d0f91..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_attoparser_attoparser_2_0_0_RELEASE.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.attoparser:attoparser:2.0.0.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/attoparser/attoparser/2.0.0.RELEASE/attoparser-2.0.0.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/attoparser/attoparser/2.0.0.RELEASE/attoparser-2.0.0.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/attoparser/attoparser/2.0.0.RELEASE/attoparser-2.0.0.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml"
deleted file mode 100644
index acdf443..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.hamcrest:hamcrest-core:1.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_2_4_Final.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_2_4_Final.xml"
deleted file mode 100644
index 6c5e17f..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_2_4_Final.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.hibernate:hibernate-validator:5.2.4.Final">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-validator/5.2.4.Final/hibernate-validator-5.2.4.Final.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-validator/5.2.4.Final/hibernate-validator-5.2.4.Final-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-validator/5.2.4.Final/hibernate-validator-5.2.4.Final-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_javassist_javassist_3_20_0_GA.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_javassist_javassist_3_20_0_GA.xml"
deleted file mode 100644
index c21c9b0..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_javassist_javassist_3_20_0_GA.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.javassist:javassist:3.20.0-GA">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/javassist/javassist/3.20.0-GA/javassist-3.20.0-GA.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/javassist/javassist/3.20.0-GA/javassist-3.20.0-GA-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/javassist/javassist/3.20.0-GA/javassist-3.20.0-GA-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_2_1_Final.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_2_1_Final.xml"
deleted file mode 100644
index ce63724..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_2_1_Final.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.jboss.logging:jboss-logging:3.2.1.Final">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.2.1.Final/jboss-logging-3.2.1.Final.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.2.1.Final/jboss-logging-3.2.1.Final-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.2.1.Final/jboss-logging-3.2.1.Final-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_mybatis_mybatis_3_4_1.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_mybatis_mybatis_3_4_1.xml"
deleted file mode 100644
index 19d1175..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_mybatis_mybatis_3_4_1.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.mybatis:mybatis:3.4.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.4.1/mybatis-3.4.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.4.1/mybatis-3.4.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.4.1/mybatis-3.4.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_mybatis_mybatis_ehcache_1_0_0.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_mybatis_mybatis_ehcache_1_0_0.xml"
deleted file mode 100644
index 87a1f58..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_mybatis_mybatis_ehcache_1_0_0.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.mybatis:mybatis-ehcache:1.0.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-ehcache/1.0.0/mybatis-ehcache-1.0.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-ehcache/1.0.0/mybatis-ehcache-1.0.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-ehcache/1.0.0/mybatis-ehcache-1.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_0.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_0.xml"
deleted file mode 100644
index bd108d5..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_0.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.mybatis:mybatis-spring:1.3.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/1.3.0/mybatis-spring-1.3.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/1.3.0/mybatis-spring-1.3.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/1.3.0/mybatis-spring-1.3.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml"
deleted file mode 100644
index 0bf8cf2..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.ow2.asm:asm:5.0.4">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/5.0.4/asm-5.0.4-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/5.0.4/asm-5.0.4-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml"
deleted file mode 100644
index 1e67260..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.slf4j:slf4j-api:1.7.7">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_7.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_7.xml"
deleted file mode 100644
index 65d0ae6..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_7.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.slf4j:slf4j-log4j12:1.7.7">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-log4j12/1.7.7/slf4j-log4j12-1.7.7.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-log4j12/1.7.7/slf4j-log4j12-1.7.7-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-log4j12/1.7.7/slf4j-log4j12-1.7.7-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_springframework_spring_aop_4_3_2_RELEASE.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_springframework_spring_aop_4_3_2_RELEASE.xml"
deleted file mode 100644
index 4508a6b..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_springframework_spring_aop_4_3_2_RELEASE.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-aop:4.3.2.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.3.2.RELEASE/spring-aop-4.3.2.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.3.2.RELEASE/spring-aop-4.3.2.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.3.2.RELEASE/spring-aop-4.3.2.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_springframework_spring_beans_4_3_2_RELEASE.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_springframework_spring_beans_4_3_2_RELEASE.xml"
deleted file mode 100644
index d650bb8..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_springframework_spring_beans_4_3_2_RELEASE.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-beans:4.3.2.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/4.3.2.RELEASE/spring-beans-4.3.2.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/4.3.2.RELEASE/spring-beans-4.3.2.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/4.3.2.RELEASE/spring-beans-4.3.2.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_springframework_spring_context_4_3_2_RELEASE.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_springframework_spring_context_4_3_2_RELEASE.xml"
deleted file mode 100644
index b497541..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_springframework_spring_context_4_3_2_RELEASE.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-context:4.3.2.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/4.3.2.RELEASE/spring-context-4.3.2.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/4.3.2.RELEASE/spring-context-4.3.2.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/4.3.2.RELEASE/spring-context-4.3.2.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_springframework_spring_context_support_4_3_2_RELEASE.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_springframework_spring_context_support_4_3_2_RELEASE.xml"
deleted file mode 100644
index 0cc3aa4..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_springframework_spring_context_support_4_3_2_RELEASE.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-context-support:4.3.2.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/4.3.2.RELEASE/spring-context-support-4.3.2.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/4.3.2.RELEASE/spring-context-support-4.3.2.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/4.3.2.RELEASE/spring-context-support-4.3.2.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_springframework_spring_core_4_3_2_RELEASE.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_springframework_spring_core_4_3_2_RELEASE.xml"
deleted file mode 100644
index aca549b..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_springframework_spring_core_4_3_2_RELEASE.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-core:4.3.2.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.3.2.RELEASE/spring-core-4.3.2.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.3.2.RELEASE/spring-core-4.3.2.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.3.2.RELEASE/spring-core-4.3.2.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_springframework_spring_expression_4_3_2_RELEASE.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_springframework_spring_expression_4_3_2_RELEASE.xml"
deleted file mode 100644
index e802cd8..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_springframework_spring_expression_4_3_2_RELEASE.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-expression:4.3.2.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/4.3.2.RELEASE/spring-expression-4.3.2.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/4.3.2.RELEASE/spring-expression-4.3.2.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/4.3.2.RELEASE/spring-expression-4.3.2.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_2_RELEASE.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_2_RELEASE.xml"
deleted file mode 100644
index 7b6a300..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_2_RELEASE.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-jdbc:4.3.2.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/4.3.2.RELEASE/spring-jdbc-4.3.2.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/4.3.2.RELEASE/spring-jdbc-4.3.2.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/4.3.2.RELEASE/spring-jdbc-4.3.2.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_springframework_spring_test_4_3_2_RELEASE.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_springframework_spring_test_4_3_2_RELEASE.xml"
deleted file mode 100644
index 144d742..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_springframework_spring_test_4_3_2_RELEASE.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-test:4.3.2.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/4.3.2.RELEASE/spring-test-4.3.2.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/4.3.2.RELEASE/spring-test-4.3.2.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/4.3.2.RELEASE/spring-test-4.3.2.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_springframework_spring_tx_4_3_2_RELEASE.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_springframework_spring_tx_4_3_2_RELEASE.xml"
deleted file mode 100644
index 0254b40..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_springframework_spring_tx_4_3_2_RELEASE.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-tx:4.3.2.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.3.2.RELEASE/spring-tx-4.3.2.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.3.2.RELEASE/spring-tx-4.3.2.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.3.2.RELEASE/spring-tx-4.3.2.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_springframework_spring_web_4_3_2_RELEASE.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_springframework_spring_web_4_3_2_RELEASE.xml"
deleted file mode 100644
index 2b7b1d4..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_springframework_spring_web_4_3_2_RELEASE.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-web:4.3.2.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.3.2.RELEASE/spring-web-4.3.2.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.3.2.RELEASE/spring-web-4.3.2.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.3.2.RELEASE/spring-web-4.3.2.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_springframework_spring_webmvc_4_3_2_RELEASE.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_springframework_spring_webmvc_4_3_2_RELEASE.xml"
deleted file mode 100644
index e4b70bb..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_springframework_spring_webmvc_4_3_2_RELEASE.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-webmvc:4.3.2.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/4.3.2.RELEASE/spring-webmvc-4.3.2.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/4.3.2.RELEASE/spring-webmvc-4.3.2.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/4.3.2.RELEASE/spring-webmvc-4.3.2.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_1_RELEASE.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_1_RELEASE.xml"
deleted file mode 100644
index 77c8939..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_1_RELEASE.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.thymeleaf:thymeleaf:3.0.1.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf/3.0.1.RELEASE/thymeleaf-3.0.1.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf/3.0.1.RELEASE/thymeleaf-3.0.1.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf/3.0.1.RELEASE/thymeleaf-3.0.1.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring4_3_0_1_RELEASE.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring4_3_0_1_RELEASE.xml"
deleted file mode 100644
index 3fc9cbf..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring4_3_0_1_RELEASE.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.thymeleaf:thymeleaf-spring4:3.0.1.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf-spring4/3.0.1.RELEASE/thymeleaf-spring4-3.0.1.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf-spring4/3.0.1.RELEASE/thymeleaf-spring4-3.0.1.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf-spring4/3.0.1.RELEASE/thymeleaf-spring4-3.0.1.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_unbescape_unbescape_1_1_3_RELEASE.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_unbescape_unbescape_1_1_3_RELEASE.xml"
deleted file mode 100644
index 59c8248..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__org_unbescape_unbescape_1_1_3_RELEASE.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.unbescape:unbescape:1.1.3.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/unbescape/unbescape/1.1.3.RELEASE/unbescape-1.1.3.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/unbescape/unbescape/1.1.3.RELEASE/unbescape-1.1.3.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/unbescape/unbescape/1.1.3.RELEASE/unbescape-1.1.3.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__xml_apis_xml_apis_1_0_b2.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__xml_apis_xml_apis_1_0_b2.xml"
deleted file mode 100644
index c36e717..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__xml_apis_xml_apis_1_0_b2.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: xml-apis:xml-apis:1.0.b2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml"
deleted file mode 100644
index 0f2d9ef..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: xmlpull:xmlpull:1.1.3.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml"
deleted file mode 100644
index 6726a2d..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: xpp3:xpp3_min:1.1.4c">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/misc.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/misc.xml"
deleted file mode 100644
index 7a5122a..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/misc.xml"
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
-  <component name="FrameworkDetectionExcludesConfiguration">
-    <file type="web" url="file://$PROJECT_DIR$/haikong-core" />
-  </component>
-  <component name="MavenProjectsManager">
-    <option name="originalFiles">
-      <list>
-        <option value="$PROJECT_DIR$/pom.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8 " project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-  <component name="SvnConfiguration">
-    <configuration>C:\Users\牛李\AppData\Roaming\Subversion</configuration>
-  </component>
-</project>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/modules.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/modules.xml"
deleted file mode 100644
index 5397bb5..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/modules.xml"
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/haikong-common/haikong-common.iml" filepath="$PROJECT_DIR$/haikong-common/haikong-common.iml" />
-      <module fileurl="file://$PROJECT_DIR$/haikong-core/haikong-core.iml" filepath="$PROJECT_DIR$/haikong-core/haikong-core.iml" />
-      <module fileurl="file://$PROJECT_DIR$/haikong-switch/haikong-switch.iml" filepath="$PROJECT_DIR$/haikong-switch/haikong-switch.iml" />
-      <module fileurl="file://$PROJECT_DIR$/微信服务端.iml" filepath="$PROJECT_DIR$/微信服务端.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/uiDesigner.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/uiDesigner.xml"
deleted file mode 100644
index e96534f..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/uiDesigner.xml"
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/workspace.xml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/workspace.xml"
deleted file mode 100644
index 175ae16..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/.idea/workspace.xml"
+++ /dev/null
@@ -1,1105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="e8a369c3-758c-4cf5-833a-0b5f37b37dbe" name="Default" comment="" />
-    <ignored path="微信服务端.iws" />
-    <ignored path=".idea/workspace.xml" />
-    <ignored path="$PROJECT_DIR$/out/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path="$PROJECT_DIR$/core/target/" />
-    <ignored path="$PROJECT_DIR$/haikong-switch/target/" />
-    <ignored path="$PROJECT_DIR$/haikong-core/target/" />
-    <ignored path="$PROJECT_DIR$/haikong-common/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="TRACKING_ENABLED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
-  <component name="FavoritesManager">
-    <favorites_list name="微信服务端" />
-  </component>
-  <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name="indexController.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/haikong-core/src/main/java/com/haikong/core/controller/indexController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="242">
-              <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="README.MD" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/doc/README.MD">
-          <provider selected="true" editor-type-id="split-provider[text-editor;MarkdownPreviewEditor]">
-            <state split_layout="FIRST">
-              <first_editor relative-caret-position="154">
-                <caret line="7" column="0" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
-                <folding />
-              </first_editor>
-              <second_editor />
-            </state>
-          </provider>
-          <provider editor-type-id="MarkdownFxPreviewEditor">
-            <state />
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="GradleLocalSettings">
-    <option name="externalProjectsViewState">
-      <projects_view />
-    </option>
-  </component>
-  <component name="HighlightingSettingsPerFile">
-    <setting file="file://$PROJECT_DIR$/haikong-common/src/main/resources/mybatis/mapper/userMapper.xml" root0="SKIP_INSPECTION" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/core/pom.xml" />
-        <option value="$PROJECT_DIR$/haikong-core/src/main/resources/mybatis/SqlMapConfig.xml" />
-        <option value="$PROJECT_DIR$/haikong-core/src/main/resources/db.properties" />
-        <option value="$PROJECT_DIR$/haikong-switch/src/main/resources/mybatis/mapper/1.txt" />
-        <option value="$PROJECT_DIR$/haikong-core/src/main/resources/mybatis/mapper/2.txt" />
-        <option value="$PROJECT_DIR$/haikong-switch/src/main/java/com/haikong/plug/entity/User.java" />
-        <option value="$PROJECT_DIR$/haikong-switch/src/main/resources/mybatis/mapper/UserMapper.xml" />
-        <option value="$PROJECT_DIR$/haikong-switch/src/main/java/com/haikong/plug/mapper/UserMapper.java" />
-        <option value="$PROJECT_DIR$/haikong-core/src/main/resources/spring/dispatcher-servlet.xml" />
-        <option value="$PROJECT_DIR$/haikong-core/src/main/webapp/WEB-INF/web.xml" />
-        <option value="$PROJECT_DIR$/haikong-core/src/main/resources/spring/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/haikong-common/src/main/java/com/haikong/common/entity/User.java" />
-        <option value="$PROJECT_DIR$/haikong-common/src/main/java/com/haikong/common/mapper/UserMapper.java" />
-        <option value="$PROJECT_DIR$/haikong-core/pom.xml" />
-        <option value="$PROJECT_DIR$/haikong-core/src/main/java/com/haikong/core/controller/indexController.java" />
-        <option value="$PROJECT_DIR$/haikong-common/pom.xml" />
-        <option value="$PROJECT_DIR$/pom.xml" />
-        <option value="$PROJECT_DIR$/haikong-core/src/main/resources/log4j.properties" />
-        <option value="$PROJECT_DIR$/doc/README.MD" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/develop/maven/apache-maven-3.3.9" />
-        <option name="userSettingsFile" value="D:\develop\maven\apache-maven-3.3.9\conf\settings.xml" />
-      </MavenGeneralSettings>
-    </option>
-    <option name="importingSettings">
-      <MavenImportingSettings>
-        <option name="importAutomatically" value="true" />
-      </MavenImportingSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState />
-  </component>
-  <component name="MavenRunner">
-    <option name="jreName" value="1.8 " />
-    <option name="vmOptions" value="-DarchetypeCatalog=internal" />
-  </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-9" />
-    <option name="y" value="-9" />
-    <option name="width" value="1860" />
-    <option name="height" value="1098" />
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectView">
-    <navigator currentView="ProjectPane" proportions="" version="1">
-      <flattenPackages />
-      <showMembers />
-      <showModules />
-      <showLibraryContents />
-      <hideEmptyPackages />
-      <abbreviatePackageNames />
-      <autoscrollToSource />
-      <autoscrollFromSource />
-      <sortByType />
-      <manualOrder />
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="Scratches" />
-      <pane id="ProjectPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="微信服务端" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="微信服务端" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="微信服务端" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="settings.editor.selected.configurable" value="preferences.sourceCode" />
-    <property name="settings.editor.splitter.proportion" value="0.2" />
-    <property name="last_opened_file_path" value="F:/workspace/Jersey工程" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="js-jscs-nodeInterpreter" value="C:\Program Files\nodejs\node.exe" />
-    <property name="project.structure.last.edited" value="Modules" />
-    <property name="project.structure.proportion" value="0.0" />
-    <property name="project.structure.side.proportion" value="0.2" />
-  </component>
-  <component name="RecentsManager">
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="F:\Git\微信服务端\haikong-common\src\main\resources\mybatis\mapper" />
-      <recent name="F:\Git\微信服务端\haikong-common\src\main\resources\mybatis" />
-      <recent name="F:\Git\微信服务端\haikong-switch\src\main\resources\mybatis\mapper" />
-      <recent name="F:\Git\微信服务端\haikong-switch\src\main\resources\mybatis.mapper" />
-      <recent name="F:\Git\微信服务端\haikong-switch\src\main\resources" />
-    </key>
-    <key name="CopyClassDialog.RECENTS_KEY">
-      <recent name="com.haikong.plug.entity" />
-    </key>
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="F:\Git\微信服务端\haikong-switch\src\main\resources\mybatis\mapper" />
-      <recent name="F:\Git\微信服务端\haikong-core\src\main\resources" />
-    </key>
-  </component>
-  <component name="RunManager" selected="Tomcat Server.haikong">
-    <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false">
-      <deployment />
-      <server-settings />
-      <predefined_log_file id="Tomcat" enabled="true" />
-      <predefined_log_file id="Tomcat Catalina" enabled="true" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <method />
-    </configuration>
-    <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
-      <module name="" />
-      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
-      <option name="PROGRAM_PARAMETERS" />
-      <method />
-    </configuration>
-    <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
-      <module name="" />
-      <option name="DEPLOY" value="true" />
-      <option name="ARTIFACT_NAME" value="" />
-      <option name="PM_INSTALL_OPTIONS" value="" />
-      <option name="ACTIVITY_EXTRA_FLAGS" value="" />
-      <option name="MODE" value="default_activity" />
-      <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-      <option name="PREFERRED_AVD" value="" />
-      <option name="CLEAR_LOGCAT" value="false" />
-      <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
-      <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
-      <option name="FORCE_STOP_RUNNING_APP" value="true" />
-      <option name="DEBUGGER_TYPE" value="Java" />
-      <option name="USE_LAST_SELECTED_DEVICE" value="false" />
-      <option name="PREFERRED_AVD" value="" />
-      <Java />
-      <Profilers>
-        <option name="GAPID_DISABLE_PCS" value="false" />
-      </Profilers>
-      <option name="DEEP_LINK" value="" />
-      <option name="ACTIVITY_CLASS" value="" />
-      <method />
-    </configuration>
-    <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
-      <module name="" />
-      <option name="TESTING_TYPE" value="0" />
-      <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
-      <option name="METHOD_NAME" value="" />
-      <option name="CLASS_NAME" value="" />
-      <option name="PACKAGE_NAME" value="" />
-      <option name="EXTRA_OPTIONS" value="" />
-      <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-      <option name="PREFERRED_AVD" value="" />
-      <option name="CLEAR_LOGCAT" value="false" />
-      <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
-      <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
-      <option name="FORCE_STOP_RUNNING_APP" value="true" />
-      <option name="DEBUGGER_TYPE" value="Java" />
-      <option name="USE_LAST_SELECTED_DEVICE" value="false" />
-      <option name="PREFERRED_AVD" value="" />
-      <Java />
-      <Profilers>
-        <option name="GAPID_DISABLE_PCS" value="false" />
-      </Profilers>
-      <method />
-    </configuration>
-    <configuration default="true" type="Applet" factoryName="Applet">
-      <option name="HTML_USED" value="false" />
-      <option name="WIDTH" value="400" />
-      <option name="HEIGHT" value="300" />
-      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
-      <module />
-      <method />
-    </configuration>
-    <configuration default="true" type="Application" factoryName="Application">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="ArquillianJUnit" factoryName="">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="arquillianRunConfiguration">
-        <value>
-          <option name="containerStateName" value="" />
-        </value>
-      </option>
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="true" type="ArquillianTestNG" factoryName="">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="arquillianRunConfiguration">
-        <value>
-          <option name="containerStateName" value="" />
-        </value>
-      </option>
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="ANNOTATION_TYPE" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
-      <envs />
-      <properties />
-      <listeners />
-      <method />
-    </configuration>
-    <configuration default="true" type="Cold Fusion runner description" factoryName="Cold Fusion" custom_browser="" web_path="">
-      <method />
-    </configuration>
-    <configuration default="true" type="CucumberJavaRunConfigurationType" factoryName="Cucumber java">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="myFilePath" />
-      <option name="GLUE" />
-      <option name="myNameFilter" />
-      <option name="myGeneratedName" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="FlashRunConfigurationType" factoryName="Flash App">
-      <option name="BCName" value="" />
-      <option name="IOSSimulatorSdkPath" value="" />
-      <option name="adlOptions" value="" />
-      <option name="airProgramParameters" value="" />
-      <option name="appDescriptorForEmulator" value="Android" />
-      <option name="debugTransport" value="USB" />
-      <option name="debuggerSdkRaw" value="BC SDK" />
-      <option name="emulator" value="NexusOne" />
-      <option name="emulatorAdlOptions" value="" />
-      <option name="fastPackaging" value="true" />
-      <option name="fullScreenHeight" value="0" />
-      <option name="fullScreenWidth" value="0" />
-      <option name="launchUrl" value="false" />
-      <option name="launcherParameters">
-        <LauncherParameters>
-          <option name="browser" value="a7bb68e0-33c0-4d6f-a81a-aac1fdb870c8" />
-          <option name="launcherType" value="OSDefault" />
-          <option name="newPlayerInstance" value="false" />
-          <option name="playerPath" value="FlashPlayerDebugger.exe" />
-        </LauncherParameters>
-      </option>
-      <option name="mobileRunTarget" value="Emulator" />
-      <option name="moduleName" value="" />
-      <option name="overriddenMainClass" value="" />
-      <option name="overriddenOutputFileName" value="" />
-      <option name="overrideMainClass" value="false" />
-      <option name="runTrusted" value="true" />
-      <option name="screenDpi" value="0" />
-      <option name="screenHeight" value="0" />
-      <option name="screenWidth" value="0" />
-      <option name="url" value="http://" />
-      <option name="usbDebugPort" value="7936" />
-      <method />
-    </configuration>
-    <configuration default="true" type="FlexUnitRunConfigurationType" factoryName="FlexUnit" appDescriptorForEmulator="Android" class_name="" emulatorAdlOptions="" method_name="" package_name="" scope="Class">
-      <option name="BCName" value="" />
-      <option name="launcherParameters">
-        <LauncherParameters>
-          <option name="browser" value="a7bb68e0-33c0-4d6f-a81a-aac1fdb870c8" />
-          <option name="launcherType" value="OSDefault" />
-          <option name="newPlayerInstance" value="false" />
-          <option name="playerPath" value="FlashPlayerDebugger.exe" />
-        </LauncherParameters>
-      </option>
-      <option name="moduleName" value="" />
-      <option name="trusted" value="true" />
-      <method />
-    </configuration>
-    <configuration default="true" type="GradleRunConfiguration" factoryName="Gradle">
-      <ExternalSystemSettings>
-        <option name="executionName" />
-        <option name="externalProjectPath" />
-        <option name="externalSystemIdString" value="GRADLE" />
-        <option name="scriptParameters" />
-        <option name="taskDescriptions">
-          <list />
-        </option>
-        <option name="taskNames">
-          <list />
-        </option>
-        <option name="vmOptions" />
-      </ExternalSystemSettings>
-      <method />
-    </configuration>
-    <configuration default="true" type="GrailsRunConfigurationType" factoryName="Grails">
-      <setting name="vmparams" value="" />
-      <setting name="cmdLine" value="run-app" />
-      <setting name="passParentEnv" value="true" />
-      <setting name="launchBrowser" value="true" />
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <method />
-    </configuration>
-    <configuration default="true" type="JUnit" factoryName="JUnit">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="true" type="JUnitTestDiscovery" factoryName="JUnit Test Discovery" changeList="All">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="true" type="JarApplication" factoryName="JAR Application">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="Java Scratch" factoryName="Java Scratch">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="SCRATCH_FILE_ID" value="0" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
-      <method />
-    </configuration>
-    <configuration default="true" type="JetRunConfigurationType" factoryName="Kotlin">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="微信服务端" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="KotlinStandaloneScriptRunConfigurationType" factoryName="Kotlin script">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="filePath" />
-      <option name="vmParameters" />
-      <option name="alternativeJrePath" />
-      <option name="programParameters" />
-      <option name="passParentEnvs" value="true" />
-      <option name="workingDirectory" />
-      <option name="isAlternativeJrePathEnabled" value="false" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="MavenRunConfiguration" factoryName="Maven">
-      <MavenSettings>
-        <option name="myGeneralSettings" />
-        <option name="myRunnerSettings" />
-        <option name="myRunnerParameters">
-          <MavenRunnerParameters>
-            <option name="profiles">
-              <set />
-            </option>
-            <option name="goals">
-              <list />
-            </option>
-            <option name="profilesMap">
-              <map />
-            </option>
-            <option name="resolveToWorkspace" value="false" />
-            <option name="workingDirPath" value="" />
-          </MavenRunnerParameters>
-        </option>
-      </MavenSettings>
-      <method />
-    </configuration>
-    <configuration default="true" type="Remote" factoryName="Remote">
-      <option name="USE_SOCKET_TRANSPORT" value="true" />
-      <option name="SERVER_MODE" value="false" />
-      <option name="SHMEM_ADDRESS" value="javadebug" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="5005" />
-      <method />
-    </configuration>
-    <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="TestNG" factoryName="TestNG">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="ANNOTATION_TYPE" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
-      <envs />
-      <properties />
-      <listeners />
-      <method />
-    </configuration>
-    <configuration default="true" type="TestNGTestDiscovery" factoryName="TestNG Test Discovery" changeList="All">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="ANNOTATION_TYPE" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
-      <envs />
-      <properties />
-      <listeners />
-      <method />
-    </configuration>
-    <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
-      <method />
-    </configuration>
-    <configuration default="true" type="js.build_tools.npm" factoryName="npm">
-      <command value="run-script" />
-      <scripts />
-      <node-interpreter value="project" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="osgi.bnd.run" factoryName="Run Launcher">
-      <method />
-    </configuration>
-    <configuration default="true" type="osgi.bnd.run" factoryName="Test Launcher (JUnit)">
-      <method />
-    </configuration>
-    <configuration default="false" name="haikong" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.0.301" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="OPEN_IN_BROWSER" value="false" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
-      <deployment>
-        <artifact name="haikong-core:war exploded">
-          <settings>
-            <option name="CONTEXT_PATH" value="/" />
-          </settings>
-        </artifact>
-      </deployment>
-      <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_微信服务端" />
-      </server-settings>
-      <predefined_log_file id="Tomcat" enabled="true" />
-      <predefined_log_file id="Tomcat Catalina" enabled="true" />
-      <predefined_log_file id="Tomcat Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
-      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="59415" />
-      </RunnerSettings>
-      <RunnerSettings RunnerId="JRebel Debug">
-        <option name="DEBUG_PORT" value="59419" />
-      </RunnerSettings>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="JRebel Debug">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="JRebel Executor">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
-        <option name="USE_ENV_VARIABLES" value="true" />
-        <STARTUP>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </STARTUP>
-        <SHUTDOWN>
-          <option name="USE_DEFAULT" value="true" />
-          <option name="SCRIPT" value="" />
-          <option name="VM_PARAMETERS" value="" />
-          <option name="PROGRAM_PARAMETERS" value="" />
-        </SHUTDOWN>
-      </ConfigurationWrapper>
-      <method>
-        <option name="BuildArtifacts" enabled="true">
-          <artifact name="haikong-core:war exploded" />
-        </option>
-      </method>
-    </configuration>
-    <list size="1">
-      <item index="0" class="java.lang.String" itemvalue="Tomcat Server.haikong" />
-    </list>
-  </component>
-  <component name="ShelveChangesManager" show_recycled="false">
-    <option name="remove_strategy" value="false" />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="e8a369c3-758c-4cf5-833a-0b5f37b37dbe" name="Default" comment="" />
-      <created>1473164490238</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1473164490238</updated>
-      <workItem from="1473164491686" duration="9888000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="9888000" />
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="-9" y="-9" width="1860" height="1098" extended-state="7" />
-    <editor active="true" />
-    <layout>
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32475883" sideWeight="0.50503355" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.30546623" sideWeight="0.49776036" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.23545861" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="JRebel Executor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32997763" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.30872482" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4908896" sideWeight="0.49328858" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3279743" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32368702" sideWeight="0.49496645" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3965702" sideWeight="0.49440715" order="12" side_tool="false" content_ui="tabs" />
-      <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3290461" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
-      <window_info id="JRebel remote servers log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="15" side_tool="true" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23322147" sideWeight="0.49624866" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="JRebel" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16722596" sideWeight="0.50375134" order="5" side_tool="true" content_ui="tabs" />
-      <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3290461" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16722596" sideWeight="0.50375134" order="6" side_tool="true" content_ui="tabs" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="SVN Properties" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3290461" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-    </layout>
-  </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <option name="time" value="10" />
-    </breakpoint-manager>
-    <watches-manager />
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/haikong-core/src/main/resources/mybatis/Mapper/UserMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="352">
-          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/haikong-switch/src/main/resources/mybatis/mapper/1.txt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="3" selection-start-line="0" selection-start-column="3" selection-end-line="0" selection-end-column="3" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/haikong-core/src/main/resources/mybatis/mapper/2.txt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="3" selection-start-line="0" selection-start-column="3" selection-end-line="0" selection-end-column="3" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/haikong-core/src/main/resources/db.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="462">
-          <caret line="21" column="20" selection-start-line="21" selection-start-column="20" selection-end-line="21" selection-end-column="20" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.3.2.RELEASE/spring-aop-4.3.2.RELEASE.jar!/org/springframework/aop/config/spring-aop-4.3.xsd">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="289">
-          <caret line="235" column="8" selection-start-line="235" selection-start-column="8" selection-end-line="235" selection-end-column="8" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/haikong-core/src/main/resources/spring/dispatcher-servlet.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="792">
-          <caret line="36" column="11" selection-start-line="36" selection-start-column="11" selection-end-line="36" selection-end-column="11" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/haikong-core/src/main/webapp/WEB-INF/web.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="33" column="33" selection-start-line="33" selection-start-column="33" selection-end-line="33" selection-end-column="33" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/1.3.0/mybatis-spring-1.3.0-sources.jar!/org/mybatis/spring/SqlSessionFactoryBean.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="423">
-          <caret line="299" column="65" selection-start-line="299" selection-start-column="65" selection-end-line="299" selection-end-column="65" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/haikong-core/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="389">
-          <caret line="76" column="11" selection-start-line="76" selection-start-column="11" selection-end-line="76" selection-end-column="11" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/haikong-switch/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/haikong-common/src/main/resources/mybatis/mapper/userMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="5" column="4" selection-start-line="5" selection-start-column="4" selection-end-line="5" selection-end-column="4" />
-          <folding>
-            <marker date="1473173009627" expanded="true" signature="331:375" ph="SELECT * FRO... user" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/haikong-common/src/main/java/com/haikong/common/mapper/UserMapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/haikong-common/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="693">
-          <caret line="36" column="4" selection-start-line="36" selection-start-column="4" selection-end-line="36" selection-end-column="4" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="421">
-          <caret line="232" column="52" selection-start-line="232" selection-start-column="52" selection-end-line="232" selection-end-column="52" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/haikong-core/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="10" column="30" selection-start-line="10" selection-start-column="30" selection-end-line="10" selection-end-column="30" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/haikong-core/src/main/resources/log4j.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/haikong-core/src/main/resources/mybatis/SqlMapConfig.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/haikong-common/src/main/java/com/haikong/common/entity/User.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="18" column="24" selection-start-line="18" selection-start-column="24" selection-end-line="18" selection-end-column="24" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/doc/README.MD">
-      <provider selected="true" editor-type-id="split-provider[text-editor;MarkdownPreviewEditor]">
-        <state split_layout="FIRST">
-          <first_editor relative-caret-position="154">
-            <caret line="7" column="0" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
-            <folding />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-      <provider editor-type-id="MarkdownFxPreviewEditor">
-        <state />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/haikong-core/src/main/java/com/haikong/core/controller/indexController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>core:war</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>app</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>haikong-core</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-                <option value="0.6" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectJDKs.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>Maven: com.alibaba:druid:1.0.25</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-common/haikong-common.iml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-common/haikong-common.iml"
deleted file mode 100644
index e095f89..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-common/haikong-common.iml"
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
-    <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.9" level="project" />
-    <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.4" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.1" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:4.1.6" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:0.9.5" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-ehcache:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.7" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-web:2.0.4" level="project" />
-    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.39" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid:1.0.25" level="project" />
-    <orderEntry type="module-library">
-      <library name="Maven: com.alibaba:jconsole:1.8.0">
-        <CLASSES>
-          <root url="jar://C:/Program Files/Java/jdk1.8.0_77/jre/../lib/jconsole.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Maven: com.alibaba:tools:1.8.0">
-        <CLASSES>
-          <root url="jar://C:/Program Files/Java/jdk1.8.0_77/jre/../lib/tools.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.16" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.2.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.1.0" level="project" />
-    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.7" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.6" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.6" level="project" />
-    <orderEntry type="library" name="Maven: cglib:cglib:3.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.ant:ant:1.9.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.ant:ant-launcher:1.9.6" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/haikong-core.iml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/haikong-core.iml"
deleted file mode 100644
index df8066a..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/haikong-core.iml"
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="web" name="Web">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
-        </webroots>
-      </configuration>
-    </facet>
-    <facet type="Spring" name="Spring">
-      <configuration>
-        <fileset id="fileset" name="Spring Application Context" removed="false">
-          <file>file://$MODULE_DIR$/src/main/resources/spring/applicationContext.xml</file>
-          <file>file://$MODULE_DIR$/src/main/resources/spring/dispatcher-servlet.xml</file>
-        </fileset>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/../core/target" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.10" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:3.0.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: ognl:ognl:3.1.3" level="project" />
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
-    <orderEntry type="library" name="Maven: org.attoparser:attoparser:2.0.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.unbescape:unbescape:1.1.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.7" level="project" />
-    <orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring4:3.0.1.RELEASE" level="project" />
-    <orderEntry type="module" module-name="haikong-switch" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.1" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:4.1.6" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-ehcache:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-web:2.0.4" level="project" />
-    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.39" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid:1.0.25" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.16" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
-    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.7" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.6" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.6" level="project" />
-    <orderEntry type="library" name="Maven: cglib:cglib:3.2.2" level="project" />
-    <orderEntry type="module" module-name="haikong-common" />
-    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
-    <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.9" level="project" />
-    <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.4" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:0.9.5" level="project" />
-    <orderEntry type="module-library">
-      <library name="Maven: com.alibaba:jconsole:1.8.0">
-        <CLASSES>
-          <root url="jar://C:/Program Files/Java/jdk1.8.0_77/jre/../lib/jconsole.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Maven: com.alibaba:tools:1.8.0">
-        <CLASSES>
-          <root url="jar://C:/Program Files/Java/jdk1.8.0_77/jre/../lib/tools.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.2.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.ant:ant:1.9.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.ant:ant-launcher:1.9.6" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/webapp/index.jsp" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/webapp/index.jsp"
deleted file mode 100644
index c38169b..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/webapp/index.jsp"
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-<h2>Hello World!</h2>
-</body>
-</html>
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-switch/haikong-switch.iml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-switch/haikong-switch.iml"
deleted file mode 100644
index 9e36fcd..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-switch/haikong-switch.iml"
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.1" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:4.1.6" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:0.9.5" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-ehcache:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.7" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-web:2.0.4" level="project" />
-    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.39" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid:1.0.25" level="project" />
-    <orderEntry type="module-library">
-      <library name="Maven: com.alibaba:jconsole:1.8.0">
-        <CLASSES>
-          <root url="jar://C:/Program Files/Java/jdk1.8.0_77/jre/../lib/jconsole.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Maven: com.alibaba:tools:1.8.0">
-        <CLASSES>
-          <root url="jar://C:/Program Files/Java/jdk1.8.0_77/jre/../lib/tools.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.16" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.2.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.1.0" level="project" />
-    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.7" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.6" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.6" level="project" />
-    <orderEntry type="library" name="Maven: cglib:cglib:3.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.ant:ant:1.9.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.ant:ant-launcher:1.9.6" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/\345\276\256\344\277\241\346\234\215\345\212\241\347\253\257.iml" "b/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/\345\276\256\344\277\241\346\234\215\345\212\241\347\253\257.iml"
deleted file mode 100644
index 602908c..0000000
--- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/\345\276\256\344\277\241\346\234\215\345\212\241\347\253\257.iml"
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.1" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:4.1.6" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:0.9.5" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-ehcache:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.7" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-web:2.0.4" level="project" />
-    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.39" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid:1.0.25" level="project" />
-    <orderEntry type="module-library">
-      <library name="Maven: com.alibaba:jconsole:1.8.0">
-        <CLASSES>
-          <root url="jar://C:/Program Files/Java/jdk1.8.0_77/jre/../lib/jconsole.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Maven: com.alibaba:tools:1.8.0">
-        <CLASSES>
-          <root url="jar://C:/Program Files/Java/jdk1.8.0_77/jre/../lib/tools.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.16" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.2.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.1.0" level="project" />
-    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.7" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.6" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.6" level="project" />
-    <orderEntry type="library" name="Maven: cglib:cglib:3.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.ant:ant:1.9.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.ant:ant-launcher:1.9.6" level="project" />
-  </component>
-</module>
\ No newline at end of file