From 27e4454dfd88d8508acbf3a2b070f072f4076bbf Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 24 Oct 2017 11:20:51 +0800
Subject: [PATCH] updates
---
.idea/workspace.xml | 55 +++++++++++++++------------
pom.xml | 22 +++++++++--
2 files changed, 49 insertions(+), 28 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2809531..27efe2d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -56,7 +56,7 @@
<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="202">
+ <state relative-caret-position="-3">
<caret line="37" column="20" lean-forward="false" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" />
<folding />
</state>
@@ -66,8 +66,8 @@
<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="138">
- <caret line="13" column="37" lean-forward="false" selection-start-line="13" selection-start-column="37" selection-end-line="13" selection-end-column="37" />
+ <state relative-caret-position="911">
+ <caret line="199" column="29" lean-forward="false" selection-start-line="199" selection-start-column="29" selection-end-line="199" selection-end-column="29" />
<folding />
</state>
</provider>
@@ -437,7 +437,7 @@
<workItem from="1508491332601" duration="106000" />
<workItem from="1508811045436" duration="651000" />
<workItem from="1508811839440" duration="1908000" />
- <workItem from="1508814020720" duration="965000" />
+ <workItem from="1508814020720" duration="1224000" />
</task>
<task id="LOCAL-00001" summary="updates">
<created>1508484578874</created>
@@ -481,11 +481,18 @@
<option name="project" value="LOCAL" />
<updated>1508814407295</updated>
</task>
- <option name="localTasksCounter" value="7" />
+ <task id="LOCAL-00007" summary="updates">
+ <created>1508814992465</created>
+ <option name="number" value="00007" />
+ <option name="presentableId" value="LOCAL-00007" />
+ <option name="project" value="LOCAL" />
+ <updated>1508814992465</updated>
+ </task>
+ <option name="localTasksCounter" value="8" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="9192000" />
+ <option name="totallyTimeSpent" value="9451000" />
</component>
<component name="ToolWindowManager">
<frame x="-1720" y="23" width="1404" height="877" extended-state="0" />
@@ -879,22 +886,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/message/Captcha.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="345">
- <caret line="30" column="44" lean-forward="false" selection-start-line="30" selection-start-column="44" selection-end-line="30" selection-end-column="44" />
- <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="202">
- <caret line="37" column="20" lean-forward="false" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/ApiController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="340">
@@ -913,10 +904,26 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/message/Captcha.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="345">
+ <caret line="30" column="44" lean-forward="false" selection-start-line="30" selection-start-column="44" selection-end-line="30" selection-end-column="44" />
+ <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="-3">
+ <caret line="37" column="20" lean-forward="false" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="138">
- <caret line="13" column="37" lean-forward="false" selection-start-line="13" selection-start-column="37" selection-end-line="13" selection-end-column="37" />
+ <state relative-caret-position="911">
+ <caret line="199" column="29" lean-forward="false" selection-start-line="199" selection-start-column="29" selection-end-line="199" selection-end-column="29" />
<folding />
</state>
</provider>
diff --git a/pom.xml b/pom.xml
index 0aea02d..02aa12b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,8 +11,7 @@
<properties>
<springversion>4.3.7.RELEASE</springversion>
- <project.build.sourceEncoding>gbk</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
@@ -191,8 +190,23 @@
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>com.makenv.Main</mainClass>
+ </manifest>
+ </archive>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
+ </configuration>
</plugin>
</plugins>
</build>
--
Gitblit v1.8.0