Merge remote-tracking branch 'origin/master'

.idea/artifacts/jeeplus_war.xml

@@ -1,25 +1,8 @@
 <component name="ArtifactManager">
   <artifact type="war" name="jeeplus:war">
     <output-path>$PROJECT_DIR$/target</output-path>
-    <properties id="maven-jee-properties">
-      <options>
-        <module>jeeplus</module>
-        <packaging>war</packaging>
-      </options>
-    </properties>
     <root id="archive" name="jeeplus.war">
       <element id="artifact" artifact-name="jeeplus:war exploded" />
-      <element id="directory" name="WEB-INF">
-        <element id="directory" name="lib">
-          <element id="library" level="module" name="Maven: com.alibaba:jconsole:1.8.0" module-name="jeeplus" />
-          <element id="library" level="module" name="Maven: com.alibaba:tools:1.8.0" module-name="jeeplus" />
-          <element id="library" level="module" name="Maven: ojdbc14:ojdbc14:10.2.0.3.0" module-name="jeeplus" />
-          <element id="library" level="module" name="Maven: batik:batik-util:1.6-1" module-name="jeeplus" />
-          <element id="library" level="module" name="Maven: org.wltea:analyzer:2012_u6" module-name="jeeplus" />
-          <element id="library" level="module" name="Maven: gencode:gencode:2.0" module-name="jeeplus" />
-          <element id="library" level="module" name="Maven: QRCoder:QRCoder:1.0" module-name="jeeplus" />
-        </element>
-      </element>
     </root>
   </artifact>
 </component>

.idea/artifacts/jeeplus_war_exploded.xml

@@ -1,13 +1,6 @@
 <component name="ArtifactManager">
   <artifact type="exploded-war" name="jeeplus:war exploded">
     <output-path>$PROJECT_DIR$/target/jeeplus</output-path>
-    <properties id="maven-jee-properties">
-      <options>
-        <exploded>true</exploded>
-        <module>jeeplus</module>
-        <packaging>war</packaging>
-      </options>
-    </properties>
     <root id="root">
       <element id="directory" name="WEB-INF">
         <element id="directory" name="classes">

.idea/jeeplus.iml

@@ -2,7 +2,16 @@
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="Spring" name="Spring">
-      <configuration />
+      <configuration>
+        <fileset id="fileset" name="Spring Application Context" removed="false">
+          <file>file://$MODULE_DIR$/src/main/resources/spring/spring-context-activiti.xml</file>
+          <file>file://$MODULE_DIR$/src/main/resources/spring/spring-context-shiro.xml</file>
+          <file>file://$MODULE_DIR$/src/main/resources/spring/spring-context.xml</file>
+          <file>file://$MODULE_DIR$/src/main/webapp/act/rest/spring-mvc-modeler.xml</file>
+          <file>file://$MODULE_DIR$/src/main/webapp/act/rest/spring-mvc-rest.xml</file>
+          <file>file://$MODULE_DIR$/src/main/resources/spring/spring-mvc.xml</file>
+        </fileset>
+      </configuration>
     </facet>
     <facet type="web" name="Web">
       <configuration>
@@ -55,7 +64,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:jconsole:1.8.0">
         <CLASSES>
-          <root url="jar://D:/JDK/lib/jconsole.jar!/" />
+          <root url="jar://D:/javasoft/jdk/lib/jconsole.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -64,7 +73,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:tools:1.8.0">
         <CLASSES>
-          <root url="jar://D:/JDK/lib/tools.jar!/" />
+          <root url="jar://D:/javasoft/jdk/lib/tools.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />

src/main/resources/j2cache/j2cache.properties

@@ -88,8 +88,8 @@ redis.cluster_name = j2cache
 redis.namespace = 
 
 ## connection
-redis.hosts = 192.168.2.4:6379
 #redis.hosts = 127.0.0.1:6379
+redis.hosts = 192.168.2.4:6379
 redis.timeout = 2000
 redis.password =
 redis.database = 0