* Date: 2016年4月1日 15:38 diff --git a/async/src/main/java/info/xiaomo/anysc/controller/TestController.java b/async/src/main/java/info/xiaomo/anysc/controller/TestController.java index 065daeaa..0817a3a8 100644 --- a/async/src/main/java/info/xiaomo/anysc/controller/TestController.java +++ b/async/src/main/java/info/xiaomo/anysc/controller/TestController.java @@ -14,10 +14,10 @@ * 把今天最好的表现当作明天最新的起点..〜 * いま 最高の表現 として 明日最新の始発..〜 * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *
* Date: 2016年11月15日 15:12
diff --git a/async/src/main/resources/config/application.properties b/async/src/main/resources/config/application.properties
index 464af148..79ef9397 100644
--- a/async/src/main/resources/config/application.properties
+++ b/async/src/main/resources/config/application.properties
@@ -1,6 +1,6 @@
logging.config=classpath:config/logback-dev.xml
server.port=8080
-server.session.timeout=1800
+
server.max-http-header-size=20971520
# \u914D\u7F6E\u8FD9\u4E2A\u503C\u5C31\u53EF\u4EE5\u683C\u5F0F\u5316\u65F6\u95F4
diff --git a/core/pom.xml b/core/pom.xml
index 18a51db4..8e3af9eb 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -5,7 +5,7 @@
* Date: 2016年4月1日 20:37
diff --git a/core/src/main/java/info/xiaomo/core/base/BaseService.java b/core/src/main/java/info/xiaomo/core/base/BaseService.java
index 276bc04f..4ff3a02f 100644
--- a/core/src/main/java/info/xiaomo/core/base/BaseService.java
+++ b/core/src/main/java/info/xiaomo/core/base/BaseService.java
@@ -6,7 +6,7 @@
import java.util.List;
/**
- * @author : xiaomo (https://xiaomo.info) (https://github.com/xiaomoinfo)
+ * @author : xiaomo (https://xiaomo.info) (https://github.com/houko)
* @version : 2017年1月11日 16:42
*/
@Service
diff --git a/core/src/main/java/info/xiaomo/core/base/Result.java b/core/src/main/java/info/xiaomo/core/base/Result.java
index 9b10b437..4ec1cb45 100644
--- a/core/src/main/java/info/xiaomo/core/base/Result.java
+++ b/core/src/main/java/info/xiaomo/core/base/Result.java
@@ -6,10 +6,10 @@
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016年10月31日 15:25
diff --git a/core/src/main/java/info/xiaomo/core/constant/CodeConst.java b/core/src/main/java/info/xiaomo/core/constant/CodeConst.java
index 840bfdca..9b411ca5 100644
--- a/core/src/main/java/info/xiaomo/core/constant/CodeConst.java
+++ b/core/src/main/java/info/xiaomo/core/constant/CodeConst.java
@@ -4,10 +4,10 @@
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016年10月29日 10:59
diff --git a/core/src/main/java/info/xiaomo/core/constant/GenderConst.java b/core/src/main/java/info/xiaomo/core/constant/GenderConst.java
index 821e9bc6..05694372 100644
--- a/core/src/main/java/info/xiaomo/core/constant/GenderConst.java
+++ b/core/src/main/java/info/xiaomo/core/constant/GenderConst.java
@@ -4,10 +4,10 @@
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016年1月12日 16:37
diff --git a/core/src/main/java/info/xiaomo/core/exception/UserNotFoundException.java b/core/src/main/java/info/xiaomo/core/exception/UserNotFoundException.java
index df1a120c..ee06bc04 100644
--- a/core/src/main/java/info/xiaomo/core/exception/UserNotFoundException.java
+++ b/core/src/main/java/info/xiaomo/core/exception/UserNotFoundException.java
@@ -12,10 +12,10 @@
* |╭---╮把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 16/4/3 11:08
diff --git a/core/src/main/java/info/xiaomo/core/field/LoginField.java b/core/src/main/java/info/xiaomo/core/field/LoginField.java
index 2317485b..e6ea5173 100644
--- a/core/src/main/java/info/xiaomo/core/field/LoginField.java
+++ b/core/src/main/java/info/xiaomo/core/field/LoginField.java
@@ -4,10 +4,10 @@
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info(83387856)
* Date: 2016年1月8日 13:16
* Description: QQ登录常量类
diff --git a/core/src/main/java/info/xiaomo/core/filter/CorsFilter.java b/core/src/main/java/info/xiaomo/core/filter/CorsFilter.java
index ca97c7d8..75ccacf3 100644
--- a/core/src/main/java/info/xiaomo/core/filter/CorsFilter.java
+++ b/core/src/main/java/info/xiaomo/core/filter/CorsFilter.java
@@ -10,10 +10,10 @@
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016/4/1516:25
diff --git a/core/src/main/java/info/xiaomo/core/untils/AuthUtil.java b/core/src/main/java/info/xiaomo/core/untils/AuthUtil.java
index 5536f10a..670f0d70 100644
--- a/core/src/main/java/info/xiaomo/core/untils/AuthUtil.java
+++ b/core/src/main/java/info/xiaomo/core/untils/AuthUtil.java
@@ -6,10 +6,10 @@
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* @email: xiaomo@xiaomo.info
*
* Date: 20161131 9:50
diff --git a/core/src/main/java/info/xiaomo/core/untils/CastUtil.java b/core/src/main/java/info/xiaomo/core/untils/CastUtil.java
index 99ff90aa..a3c19f4c 100644
--- a/core/src/main/java/info/xiaomo/core/untils/CastUtil.java
+++ b/core/src/main/java/info/xiaomo/core/untils/CastUtil.java
@@ -2,6 +2,7 @@
import java.io.*;
import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Hashtable;
import java.util.Iterator;
@@ -10,10 +11,10 @@
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016年11月22日 14:55
@@ -162,7 +163,7 @@ public static String objectToString(Object obj) {
ObjectOutputStream e = new ObjectOutputStream(out);
e.writeObject(obj);
byte[] bytes = out.toByteArray();
- return new String(bytes, "ISO-8859-1");
+ return new String(bytes, StandardCharsets.ISO_8859_1);
} catch (IOException var4) {
var4.printStackTrace();
return null;
@@ -172,7 +173,7 @@ public static String objectToString(Object obj) {
public static Object stringToObject(String string) {
try {
- byte[] e = string.getBytes("ISO-8859-1");
+ byte[] e = string.getBytes(StandardCharsets.ISO_8859_1);
ByteArrayInputStream in = new ByteArrayInputStream(e);
ObjectInputStream ois = new ObjectInputStream(in);
return ois.readObject();
@@ -290,7 +291,7 @@ public static int[] stringToInts(String str, String regex) {
}
public static String bytesToHexString(byte[] src) {
- StringBuilder stringBuilder = new StringBuilder("");
+ StringBuilder stringBuilder = new StringBuilder();
if (src != null && src.length> 0) {
for (byte aSrc : src) {
int v = aSrc & 255;
diff --git a/core/src/main/java/info/xiaomo/core/untils/CharUtil.java b/core/src/main/java/info/xiaomo/core/untils/CharUtil.java
index 623baf3d..17b3e973 100644
--- a/core/src/main/java/info/xiaomo/core/untils/CharUtil.java
+++ b/core/src/main/java/info/xiaomo/core/untils/CharUtil.java
@@ -1,6 +1,7 @@
package info.xiaomo.core.untils;
import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
import java.util.Objects;
/**
@@ -17,7 +18,7 @@ public class CharUtil {
public static String iso2gb(String text) {
String result;
try {
- result = new String(text.getBytes("ISO-8859-1"), "GB2312");
+ result = new String(text.getBytes(StandardCharsets.ISO_8859_1), "GB2312");
} catch (UnsupportedEncodingException ex) {
result = ex.toString();
}
@@ -30,7 +31,7 @@ public static String iso2gb(String text) {
public static String gb2iso(String text) {
String result = "";
try {
- result = new String(text.getBytes("GB2312"), "ISO-8859-1");
+ result = new String(text.getBytes("GB2312"), StandardCharsets.ISO_8859_1);
} catch (UnsupportedEncodingException ex) {
ex.printStackTrace();
}
@@ -51,7 +52,7 @@ public static String utf8urlencode(String text) {
byte[] b = new byte[0];
try {
- b = Character.toString(c).getBytes("UTF-8");
+ b = Character.toString(c).getBytes(StandardCharsets.UTF_8);
} catch (Exception ignored) {
}
@@ -72,7 +73,7 @@ public static String utf8urlencode(String text) {
* Utf8URL解码
*/
public static String utf8urldecode(String text) {
- String result = "";
+ StringBuilder result = new StringBuilder();
int p;
if (text != null && text.length()> 0) {
text = text.toLowerCase();
@@ -81,13 +82,13 @@ public static String utf8urldecode(String text) {
return text;
}
while (p != -1) {
- result += text.substring(0, p);
- text = text.substring(p, text.length());
+ result.append(text, 0, p);
+ text = text.substring(p);
if (Objects.equals(text, "") || text.length() < 9) { - return result; + return result.toString(); } - result += codetoword(text.substring(0, 9)); - text = text.substring(9, text.length()); + result.append(codetoword(text.substring(0, 9))); + text = text.substring(9); p = text.indexOf("%e"); } } @@ -104,11 +105,7 @@ private static String codetoword(String text) { code[0] = (byte) (Integer.parseInt(text.substring(1, 3), 16) - 256); code[1] = (byte) (Integer.parseInt(text.substring(4, 6), 16) - 256); code[2] = (byte) (Integer.parseInt(text.substring(7, 9), 16) - 256); - try { - result = new String(code, "UTF-8"); - } catch (UnsupportedEncodingException ex) { - result = null; - } + result = new String(code, StandardCharsets.UTF_8); } else { result = text; } diff --git a/core/src/main/java/info/xiaomo/core/untils/DownUtil.java b/core/src/main/java/info/xiaomo/core/untils/DownUtil.java index 380d7fcd..3f6d64e0 100644 --- a/core/src/main/java/info/xiaomo/core/untils/DownUtil.java +++ b/core/src/main/java/info/xiaomo/core/untils/DownUtil.java @@ -10,7 +10,7 @@ import java.net.URLConnection; /** - * @author : xiaomo (https://xiaomo.info) (https://github.com/xiaomoinfo) + * @author : xiaomo (https://xiaomo.info) (https://github.com/houko) * @created : 2016/12/26 13:25 */ @Slf4j diff --git a/core/src/main/java/info/xiaomo/core/untils/HtmlUtil.java b/core/src/main/java/info/xiaomo/core/untils/HtmlUtil.java index 4e8157a7..975e56ac 100644 --- a/core/src/main/java/info/xiaomo/core/untils/HtmlUtil.java +++ b/core/src/main/java/info/xiaomo/core/untils/HtmlUtil.java @@ -7,7 +7,6 @@ * 把今天最好的表现当作明天最新的起点..〜 * いま 最高の表現 として 明日最新の始発..〜 * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. *
*
* @author : xiaomo
diff --git a/core/src/main/java/info/xiaomo/core/untils/LunarCalendarUtil.java b/core/src/main/java/info/xiaomo/core/untils/LunarCalendarUtil.java
index b8ed9fc1..5a30f3af 100644
--- a/core/src/main/java/info/xiaomo/core/untils/LunarCalendarUtil.java
+++ b/core/src/main/java/info/xiaomo/core/untils/LunarCalendarUtil.java
@@ -5,7 +5,7 @@
import java.util.GregorianCalendar;
/**
- * @author : xiaomo (https://xiaomo.info) (https://github.com/xiaomoinfo)
+ * @author : xiaomo (https://xiaomo.info) (https://github.com/houko)
* @version : 2017年1月14日 9:59
*/
diff --git a/core/src/main/java/info/xiaomo/core/untils/MailUtil.java b/core/src/main/java/info/xiaomo/core/untils/MailUtil.java
index e45a2b55..d4c36da7 100644
--- a/core/src/main/java/info/xiaomo/core/untils/MailUtil.java
+++ b/core/src/main/java/info/xiaomo/core/untils/MailUtil.java
@@ -12,10 +12,10 @@
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016/4/511:00
diff --git a/core/src/main/java/info/xiaomo/core/untils/Md5Util.java b/core/src/main/java/info/xiaomo/core/untils/Md5Util.java
index acd52178..3a14c314 100644
--- a/core/src/main/java/info/xiaomo/core/untils/Md5Util.java
+++ b/core/src/main/java/info/xiaomo/core/untils/Md5Util.java
@@ -14,10 +14,10 @@
* |╭---╮把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 16/4/3 10:03
diff --git a/core/src/main/java/info/xiaomo/core/untils/SerializeUtil.java b/core/src/main/java/info/xiaomo/core/untils/SerializeUtil.java
index 15d6512d..f6be3ed2 100644
--- a/core/src/main/java/info/xiaomo/core/untils/SerializeUtil.java
+++ b/core/src/main/java/info/xiaomo/core/untils/SerializeUtil.java
@@ -1,6 +1,7 @@
package info.xiaomo.core.untils;
import java.io.*;
+import java.nio.charset.StandardCharsets;
/**
* │\__╭╭╭╭╭__/│
@@ -14,10 +15,10 @@
* |╭---╮把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 15/9/6 16:05
@@ -40,7 +41,7 @@ public static String serialize(Object object) {
oos = new ObjectOutputStream(baos);
oos.writeObject(object);
byte[] bytes = baos.toByteArray();
- return new String(bytes, "utf-8");
+ return new String(bytes, StandardCharsets.UTF_8);
} catch (Exception e) {
e.printStackTrace();
}
@@ -51,7 +52,7 @@ public static String serialize(Object object) {
* 反序列化
*/
public static Object unserialize(String s) throws UnsupportedEncodingException {
- byte[] bytes = s.getBytes("utf-8");
+ byte[] bytes = s.getBytes(StandardCharsets.UTF_8);
ByteArrayInputStream bais;
try {
//反序列化
diff --git a/core/src/main/java/info/xiaomo/core/untils/SqlUtil.java b/core/src/main/java/info/xiaomo/core/untils/SqlUtil.java
index c81ed3c5..7e69e630 100644
--- a/core/src/main/java/info/xiaomo/core/untils/SqlUtil.java
+++ b/core/src/main/java/info/xiaomo/core/untils/SqlUtil.java
@@ -9,7 +9,6 @@
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
*
*
* @author : xiaomo
diff --git a/crawler/pom.xml b/crawler/pom.xml
index d8cde5a4..157ff6a3 100644
--- a/crawler/pom.xml
+++ b/crawler/pom.xml
@@ -5,7 +5,7 @@
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016年4月1日 15:38
diff --git a/crawler/src/main/java/info/xiaomo/crawler/dao/ShikigamaDao.java b/crawler/src/main/java/info/xiaomo/crawler/dao/ShikigamaDao.java
index 3ff5c549..6f3078fc 100644
--- a/crawler/src/main/java/info/xiaomo/crawler/dao/ShikigamaDao.java
+++ b/crawler/src/main/java/info/xiaomo/crawler/dao/ShikigamaDao.java
@@ -5,7 +5,7 @@
import org.springframework.stereotype.Repository;
/**
- * @author : xiaomo (https://xiaomo.info) (https://github.com/xiaomoinfo)
+ * @author : xiaomo (https://xiaomo.info) (https://github.com/houko)
* @created : 2016年12月24日 15:55
*/
@Repository
diff --git a/crawler/src/main/java/info/xiaomo/crawler/model/MitamaModel.java b/crawler/src/main/java/info/xiaomo/crawler/model/MitamaModel.java
index 7e9d1343..4eb5ad72 100644
--- a/crawler/src/main/java/info/xiaomo/crawler/model/MitamaModel.java
+++ b/crawler/src/main/java/info/xiaomo/crawler/model/MitamaModel.java
@@ -4,7 +4,7 @@
import info.xiaomo.core.base.BaseModel;
/**
- * @author : xiaomo (https://xiaomo.info) (https://github.com/xiaomoinfo)
+ * @author : xiaomo (https://xiaomo.info) (https://github.com/houko)
* @created : 2016年12月24日 18:06
* 御魂模型
*/
diff --git a/crawler/src/main/java/info/xiaomo/crawler/model/ShikigamiModel.java b/crawler/src/main/java/info/xiaomo/crawler/model/ShikigamiModel.java
index e7fbfe7f..b208fea5 100644
--- a/crawler/src/main/java/info/xiaomo/crawler/model/ShikigamiModel.java
+++ b/crawler/src/main/java/info/xiaomo/crawler/model/ShikigamiModel.java
@@ -7,7 +7,7 @@
import javax.persistence.Table;
/**
- * @author : xiaomo (https://xiaomo.info) (https://github.com/xiaomoinfo)
+ * @author : xiaomo (https://xiaomo.info) (https://github.com/houko)
* @created : 2016年12月24日 15:09
*/
diff --git a/crawler/src/main/java/info/xiaomo/crawler/schedule/ScheduledTasks.java b/crawler/src/main/java/info/xiaomo/crawler/schedule/ScheduledTasks.java
index fff4fbe5..1d43fcbe 100644
--- a/crawler/src/main/java/info/xiaomo/crawler/schedule/ScheduledTasks.java
+++ b/crawler/src/main/java/info/xiaomo/crawler/schedule/ScheduledTasks.java
@@ -15,7 +15,7 @@
import java.util.List;
/**
- * @author : xiaomo (https://xiaomo.info) (https://github.com/xiaomoinfo)
+ * @author : xiaomo (https://xiaomo.info) (https://github.com/houko)
* @created : 2016年12月24日 15:59
*/
@Component
diff --git a/crawler/src/main/java/info/xiaomo/crawler/service/ShikigamaService.java b/crawler/src/main/java/info/xiaomo/crawler/service/ShikigamaService.java
index 6197f03d..6f3f6b01 100644
--- a/crawler/src/main/java/info/xiaomo/crawler/service/ShikigamaService.java
+++ b/crawler/src/main/java/info/xiaomo/crawler/service/ShikigamaService.java
@@ -5,7 +5,7 @@
import java.util.List;
/**
- * @author : xiaomo (https://xiaomo.info) (https://github.com/xiaomoinfo)
+ * @author : xiaomo (https://xiaomo.info) (https://github.com/houko)
* @created : 2016年12月24日 15:54
*/
public interface ShikigamaService {
diff --git a/crawler/src/main/java/info/xiaomo/crawler/service/impl/ShikigamaServiceImpl.java b/crawler/src/main/java/info/xiaomo/crawler/service/impl/ShikigamaServiceImpl.java
index 730566dc..0a5bfe42 100644
--- a/crawler/src/main/java/info/xiaomo/crawler/service/impl/ShikigamaServiceImpl.java
+++ b/crawler/src/main/java/info/xiaomo/crawler/service/impl/ShikigamaServiceImpl.java
@@ -11,7 +11,7 @@
import java.util.List;
/**
- * @author : xiaomo (https://xiaomo.info) (https://github.com/xiaomoinfo)
+ * @author : xiaomo (https://xiaomo.info) (https://github.com/houko)
* @created : 2016年12月24日 15:54
*/
@Service
diff --git a/crawler/src/main/java/info/xiaomo/crawler/spider/OnnmyoujiSpider.java b/crawler/src/main/java/info/xiaomo/crawler/spider/OnnmyoujiSpider.java
index ffae8cda..2423e44a 100644
--- a/crawler/src/main/java/info/xiaomo/crawler/spider/OnnmyoujiSpider.java
+++ b/crawler/src/main/java/info/xiaomo/crawler/spider/OnnmyoujiSpider.java
@@ -11,7 +11,7 @@
import java.util.List;
/**
- * @author : xiaomo (https://xiaomo.info) (https://github.com/xiaomoinfo)
+ * @author : xiaomo (https://xiaomo.info) (https://github.com/houko)
* @created : 2016年12月24日 15:05
* 阴阳师获取数据
*/
diff --git a/crawler/src/main/resources/config/application.properties b/crawler/src/main/resources/config/application.properties
index 1a4a1da6..8d5bd3e7 100644
--- a/crawler/src/main/resources/config/application.properties
+++ b/crawler/src/main/resources/config/application.properties
@@ -1,6 +1,5 @@
logging.config=classpath:config/logback-dev.xml
server.port=8080
-server.session.timeout=1800
server.max-http-header-size=20971520
#datasource
@@ -8,7 +7,7 @@ spring.datasource.url=jdbc:mysql://ip/db?characterEncoding=utf8&useSSL=true
# ?useUnicode=true&characterEncoding=UTF-8
spring.datasource.username=username
spring.datasource.password=password
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
# \u914D\u7F6E\u8FD9\u4E2A\u503C\u5C31\u53EF\u4EE5\u683C\u5F0F\u5316\u65F6\u95F4
#spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
#spring.jackson.time-zone=GMT+8
diff --git a/freemarker/pom.xml b/freemarker/pom.xml
index 856c083f..d866ff82 100644
--- a/freemarker/pom.xml
+++ b/freemarker/pom.xml
@@ -5,7 +5,7 @@
* Date: 2016年4月1日 15:38
diff --git a/freemarker/src/main/java/info/xiaomo/freemarker/controller/FreemarkerController.java b/freemarker/src/main/java/info/xiaomo/freemarker/controller/FreemarkerController.java
index 03fc51b8..78a3a90e 100644
--- a/freemarker/src/main/java/info/xiaomo/freemarker/controller/FreemarkerController.java
+++ b/freemarker/src/main/java/info/xiaomo/freemarker/controller/FreemarkerController.java
@@ -8,10 +8,10 @@
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016年11月16日 10:19
diff --git a/freemarker/src/main/resources/config/application.properties b/freemarker/src/main/resources/config/application.properties
index 8ac071cd..ae76e147 100644
--- a/freemarker/src/main/resources/config/application.properties
+++ b/freemarker/src/main/resources/config/application.properties
@@ -1,6 +1,6 @@
logging.config=classpath:config/logback-dev.xml
server.port=8080
-server.session.timeout=1800
+
server.max-http-header-size=20971520
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
diff --git a/freemarker/src/main/resources/config/banner-girl.txt b/freemarker/src/main/resources/config/banner-girl.txt
index c826bcd3..5c648ca3 100644
--- a/freemarker/src/main/resources/config/banner-girl.txt
+++ b/freemarker/src/main/resources/config/banner-girl.txt
@@ -16,4 +16,4 @@
...::: ::::::::::::' ``::.
```` ':. ':::::::::' ::::..
'.:::::' ':'````..
-:: Spring Boot :: (v1.5.8.RELEASE)
\ No newline at end of file
+:: Spring Boot :: (v2.0.0.RELEASE)
\ No newline at end of file
diff --git a/javase/pom.xml b/javase/pom.xml
index 14560de4..e3a3c480 100644
--- a/javase/pom.xml
+++ b/javase/pom.xml
@@ -5,7 +5,7 @@
* Date: 2016年4月1日 15:38
@@ -43,9 +43,9 @@
@EnableJpaRepositories("info.xiaomo.*.dao")
@EnableSwagger2
@RestController
-public class QuestionMain extends WebMvcConfigurerAdapter {
+public class QuestionMain implements WebMvcConfigurer {
- public static void main(String[] args) throws Exception {
+ public static void main(String[] args) {
SpringApplication.run(QuestionMain.class, args);
}
diff --git a/javase/src/main/java/info/xiaomo/javase/controller/QuestionController.java b/javase/src/main/java/info/xiaomo/javase/controller/QuestionController.java
index 47dc8d42..d76c4876 100644
--- a/javase/src/main/java/info/xiaomo/javase/controller/QuestionController.java
+++ b/javase/src/main/java/info/xiaomo/javase/controller/QuestionController.java
@@ -18,7 +18,7 @@
* Today the best performance as tomorrow newest starter!
*
* @author : xiaomo
- * github : https://github.com/xiaomoinfo
+ * github : https://github.com/houko
* email : xiaomo@xiaomo.info
* QQ : 83387856
* Date : 2017年11月20日 19:00
@@ -44,7 +44,7 @@ public QuestionController(QuestionService service) {
* @param id id
* @return result
*/
- @ApiOperation(value = "查找问题", notes = "查找问题", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+ @ApiOperation(value = "查找问题", notes = "查找问题", httpMethod = "GET")
@RequestMapping(value = "findById/{id}", method = RequestMethod.GET)
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "唯一id", required = true, dataType = "Long", paramType = "path"),
@@ -52,7 +52,7 @@ public QuestionController(QuestionService service) {
public Result findUserById(@PathVariable("id") Long id) {
QuestionModel questionModel = service.findById(id);
if (questionModel == null) {
- return new Result(CodeConst.NOT_FOUNT.getResultCode(), CodeConst.NOT_FOUNT.getMessage());
+ return new Result(CodeConst.NOT_FOUNT.getResultCode(), CodeConst.NOT_FOUNT.getMessage());
}
return new Result(questionModel);
}
@@ -62,7 +62,7 @@ public Result findUserById(@PathVariable("id") Long id) {
*
* @return result
*/
- @ApiOperation(value = "添加", notes = "添加", httpMethod = "POST", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+ @ApiOperation(value = "添加", notes = "添加", httpMethod = "POST")
@RequestMapping(value = "findById/{id}", method = RequestMethod.POST)
public Result addQuestion(@RequestBody QuestionModel questionModel) {
boolean add = service.add(questionModel);
diff --git a/javase/src/main/java/info/xiaomo/javase/dao/QuestionDao.java b/javase/src/main/java/info/xiaomo/javase/dao/QuestionDao.java
index be27b6b8..489e8c07 100644
--- a/javase/src/main/java/info/xiaomo/javase/dao/QuestionDao.java
+++ b/javase/src/main/java/info/xiaomo/javase/dao/QuestionDao.java
@@ -10,7 +10,7 @@
* Today the best performance as tomorrow newest starter!
*
* @author : xiaomo
- * github : https://github.com/xiaomoinfo
+ * github : https://github.com/houko
* email : xiaomo@xiaomo.info
* QQ : 83387856
* Date : 2017年11月20日 19:00
@@ -19,12 +19,4 @@
*/
@Repository
public interface QuestionDao extends JpaRepository
* Date: 2016年4月1日 15:38
diff --git a/mongodb/src/main/java/info/xiaomo/mongodb/controller/MongoUserController.java b/mongodb/src/main/java/info/xiaomo/mongodb/controller/MongoUserController.java
index 1c5bd457..a7056409 100644
--- a/mongodb/src/main/java/info/xiaomo/mongodb/controller/MongoUserController.java
+++ b/mongodb/src/main/java/info/xiaomo/mongodb/controller/MongoUserController.java
@@ -12,10 +12,10 @@
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016年11月15日 15:49
@@ -54,7 +54,7 @@ public Result add(@RequestBody MongoUser user) {
@RequestMapping(value = "delete/{id}", method = RequestMethod.GET)
public Result delete(@PathVariable("id") Long id) {
service.delete(id);
- return new Result(CodeConst.SUCCESS.getResultCode(), CodeConst.SUCCESS.getMessage());
+ return new Result(CodeConst.SUCCESS.getResultCode(), CodeConst.SUCCESS.getMessage());
}
}
diff --git a/mongodb/src/main/java/info/xiaomo/mongodb/dao/MongoUserDao.java b/mongodb/src/main/java/info/xiaomo/mongodb/dao/MongoUserDao.java
index c4b9c6e3..d86d4de0 100644
--- a/mongodb/src/main/java/info/xiaomo/mongodb/dao/MongoUserDao.java
+++ b/mongodb/src/main/java/info/xiaomo/mongodb/dao/MongoUserDao.java
@@ -8,10 +8,10 @@
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016年11月15日 15:42
diff --git a/mongodb/src/main/java/info/xiaomo/mongodb/model/MongoUser.java b/mongodb/src/main/java/info/xiaomo/mongodb/model/MongoUser.java
index 2363c875..12095176 100644
--- a/mongodb/src/main/java/info/xiaomo/mongodb/model/MongoUser.java
+++ b/mongodb/src/main/java/info/xiaomo/mongodb/model/MongoUser.java
@@ -12,10 +12,10 @@
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016年11月15日 15:39
diff --git a/mongodb/src/main/java/info/xiaomo/mongodb/service/MongoUserService.java b/mongodb/src/main/java/info/xiaomo/mongodb/service/MongoUserService.java
index 5bf3b63d..1eccb9f3 100644
--- a/mongodb/src/main/java/info/xiaomo/mongodb/service/MongoUserService.java
+++ b/mongodb/src/main/java/info/xiaomo/mongodb/service/MongoUserService.java
@@ -8,10 +8,10 @@
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016年11月15日 15:45
diff --git a/mongodb/src/main/java/info/xiaomo/mongodb/service/impl/MongoUserServiceImpl.java b/mongodb/src/main/java/info/xiaomo/mongodb/service/impl/MongoUserServiceImpl.java
index a82c2c55..1827c1a3 100644
--- a/mongodb/src/main/java/info/xiaomo/mongodb/service/impl/MongoUserServiceImpl.java
+++ b/mongodb/src/main/java/info/xiaomo/mongodb/service/impl/MongoUserServiceImpl.java
@@ -7,15 +7,16 @@
import org.springframework.stereotype.Service;
import java.util.List;
+import java.util.Optional;
/**
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016年11月15日 15:45
@@ -38,7 +39,8 @@ public List
* Date: 2016年11月16日 10:45
diff --git a/multipleSource/src/main/java/info/xiaomo/multiplesource/sql/Sql.java b/multipleSource/src/main/java/info/xiaomo/multiplesource/sql/Sql.java
index 43dbc1cf..1185d127 100644
--- a/multipleSource/src/main/java/info/xiaomo/multiplesource/sql/Sql.java
+++ b/multipleSource/src/main/java/info/xiaomo/multiplesource/sql/Sql.java
@@ -4,10 +4,9 @@
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016年11月16日 11:29
diff --git a/multipleSource/src/main/resources/config/application.properties b/multipleSource/src/main/resources/config/application.properties
index 1f0a93a5..f1910361 100644
--- a/multipleSource/src/main/resources/config/application.properties
+++ b/multipleSource/src/main/resources/config/application.properties
@@ -1,6 +1,6 @@
logging.config=classpath:config/logback-dev.xml
server.port=8080
-server.session.timeout=1800
+
server.max-http-header-size=20971520
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
@@ -10,13 +10,13 @@ spring.jackson.time-zone=GMT+8
spring.datasource.primary.url=jdbc:mysql://ip:3306/test1?characterEncoding=utf8&useSSL=true
spring.datasource.primary.username=\u4F60\u7684\u5E10\u53F7
spring.datasource.primary.password=\u4F60\u7684\u5BC6\u7801
-spring.datasource.primary.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.primary.driver-class-name=com.mysql.cj.jdbc.Driver
#database2
spring.datasource.secondary.url=jdbc:mysql://ip:3306/test2?characterEncoding=utf8&useSSL=true
spring.datasource.secondary.username=\u5E10\u53F7
spring.datasource.secondary.password=\u4F60\u7684\u5BC6\u7801
-spring.datasource.secondary.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.secondary.driver-class-name=com.mysql.cj.jdbc.Driver
diff --git a/multipleSource/src/main/resources/config/banner-girl.txt b/multipleSource/src/main/resources/config/banner-girl.txt
index c826bcd3..5c648ca3 100644
--- a/multipleSource/src/main/resources/config/banner-girl.txt
+++ b/multipleSource/src/main/resources/config/banner-girl.txt
@@ -16,4 +16,4 @@
...::: ::::::::::::' ``::.
```` ':. ':::::::::' ::::..
'.:::::' ':'````..
-:: Spring Boot :: (v1.5.8.RELEASE)
\ No newline at end of file
+:: Spring Boot :: (v2.0.0.RELEASE)
\ No newline at end of file
diff --git a/mybatis/pom.xml b/mybatis/pom.xml
index 1f021924..aca5b38b 100644
--- a/mybatis/pom.xml
+++ b/mybatis/pom.xml
@@ -5,7 +5,7 @@
* Date: 2016年4月1日 15:38
diff --git a/mybatis/src/main/java/info/xiaomo/mybatis/controller/MybatisUserController.java b/mybatis/src/main/java/info/xiaomo/mybatis/controller/MybatisUserController.java
index 19d1a423..7b19d769 100644
--- a/mybatis/src/main/java/info/xiaomo/mybatis/controller/MybatisUserController.java
+++ b/mybatis/src/main/java/info/xiaomo/mybatis/controller/MybatisUserController.java
@@ -13,10 +13,10 @@
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016年11月16日 9:41
diff --git a/mybatis/src/main/java/info/xiaomo/mybatis/mapper/UserMapper.java b/mybatis/src/main/java/info/xiaomo/mybatis/mapper/UserMapper.java
index 0e37207c..7de341e9 100644
--- a/mybatis/src/main/java/info/xiaomo/mybatis/mapper/UserMapper.java
+++ b/mybatis/src/main/java/info/xiaomo/mybatis/mapper/UserMapper.java
@@ -3,6 +3,7 @@
import info.xiaomo.mybatis.domain.User;
import org.apache.ibatis.annotations.*;
+import org.springframework.stereotype.Repository;
import java.util.List;
import java.util.Map;
@@ -11,6 +12,7 @@
* @author : xiaomo
*/
@Mapper
+@Repository
public interface UserMapper {
@Results({
diff --git a/mybatis/src/main/resources/config/application.properties b/mybatis/src/main/resources/config/application.properties
index c75522bf..b138051d 100644
--- a/mybatis/src/main/resources/config/application.properties
+++ b/mybatis/src/main/resources/config/application.properties
@@ -1,6 +1,6 @@
logging.config=classpath:config/logback-dev.xml
server.port=8080
-server.session.timeout=1800
+
server.max-http-header-size=20971520
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
@@ -11,7 +11,7 @@ spring.jackson.time-zone=GMT+8
spring.datasource.url=jdbc:mysql://ip:3306/db?characterEncoding=utf8&useSSL=true
spring.datasource.username=username
spring.datasource.password=password
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
diff --git a/mybatis/src/main/resources/config/banner-girl.txt b/mybatis/src/main/resources/config/banner-girl.txt
index c826bcd3..5c648ca3 100644
--- a/mybatis/src/main/resources/config/banner-girl.txt
+++ b/mybatis/src/main/resources/config/banner-girl.txt
@@ -16,4 +16,4 @@
...::: ::::::::::::' ``::.
```` ':. ':::::::::' ::::..
'.:::::' ':'````..
-:: Spring Boot :: (v1.5.8.RELEASE)
\ No newline at end of file
+:: Spring Boot :: (v2.0.0.RELEASE)
\ No newline at end of file
diff --git a/order/pom.xml b/order/pom.xml
new file mode 100644
index 00000000..fed4e2b0
--- /dev/null
+++ b/order/pom.xml
@@ -0,0 +1,66 @@
+
+
+ * Date: 16/4/2 12:39
+ * Copyright(©) 2015 by xiaomo.
+ */
+@Entity
+@Table(name = "adminUser")
+@Data
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
+@AllArgsConstructor
+@NoArgsConstructor
+public class OrderModel extends BaseModel implements Serializable {
+
+ @Column(name = "UserName")
+ private String userName;
+
+ @Column(name = "Password")
+ private String password;
+
+ @Column(name = "Status")
+ private int status = 1;
+
+ @Column(name = "Salt")
+ private String salt;
+
+}
diff --git a/order/src/main/java/info/xiaomo/order/service/OrderService.java b/order/src/main/java/info/xiaomo/order/service/OrderService.java
new file mode 100644
index 00000000..b3543f4d
--- /dev/null
+++ b/order/src/main/java/info/xiaomo/order/service/OrderService.java
@@ -0,0 +1,9 @@
+package info.xiaomo.order.service;
+
+/**
+ * @author xiaomo
+ */
+public interface OrderService {
+
+
+}
diff --git a/order/src/main/java/info/xiaomo/order/service/impl/OrderServiceImpl.java b/order/src/main/java/info/xiaomo/order/service/impl/OrderServiceImpl.java
new file mode 100644
index 00000000..d7b60d04
--- /dev/null
+++ b/order/src/main/java/info/xiaomo/order/service/impl/OrderServiceImpl.java
@@ -0,0 +1,12 @@
+package info.xiaomo.order.service.impl;
+
+import info.xiaomo.order.service.OrderService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author xiaomo
+ */
+@Service
+public class OrderServiceImpl implements OrderService {
+
+}
diff --git a/pom.xml b/pom.xml
index 2606c187..5b1f7919 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016年4月1日 15:38
diff --git a/rabbitmq/src/main/resources/config/application.properties b/rabbitmq/src/main/resources/config/application.properties
index e2c21445..b3ab7a48 100644
--- a/rabbitmq/src/main/resources/config/application.properties
+++ b/rabbitmq/src/main/resources/config/application.properties
@@ -1,6 +1,6 @@
logging.config=classpath:config/logback-dev.xml
server.port=8080
-server.session.timeout=1800
+
server.max-http-header-size=20971520
# \u914D\u7F6E\u8FD9\u4E2A\u503C\u5C31\u53EF\u4EE5\u683C\u5F0F\u5316\u65F6\u95F4
diff --git a/redis/pom.xml b/redis/pom.xml
index 7b14e167..3ed31182 100644
--- a/redis/pom.xml
+++ b/redis/pom.xml
@@ -5,7 +5,7 @@
* Date: 2016年4月1日 15:38
diff --git a/redis/src/main/java/info/xiaomo/redis/controller/TestController.java b/redis/src/main/java/info/xiaomo/redis/controller/TestController.java
index 49543886..1590409a 100644
--- a/redis/src/main/java/info/xiaomo/redis/controller/TestController.java
+++ b/redis/src/main/java/info/xiaomo/redis/controller/TestController.java
@@ -12,10 +12,10 @@
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016年11月14日 17:25
diff --git a/redis/src/main/java/info/xiaomo/redis/dao/CommonRedisDao.java b/redis/src/main/java/info/xiaomo/redis/dao/CommonRedisDao.java
index 202a4b95..97cd82e6 100644
--- a/redis/src/main/java/info/xiaomo/redis/dao/CommonRedisDao.java
+++ b/redis/src/main/java/info/xiaomo/redis/dao/CommonRedisDao.java
@@ -9,10 +9,10 @@
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016年11月14日 17:59
diff --git a/redis/src/main/java/info/xiaomo/redis/dao/impl/CommonRedisDaoImpl.java b/redis/src/main/java/info/xiaomo/redis/dao/impl/CommonRedisDaoImpl.java
index 7a1ebf21..b9ecb6ea 100644
--- a/redis/src/main/java/info/xiaomo/redis/dao/impl/CommonRedisDaoImpl.java
+++ b/redis/src/main/java/info/xiaomo/redis/dao/impl/CommonRedisDaoImpl.java
@@ -18,10 +18,10 @@
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016年11月14日 18:00
diff --git a/redis/src/main/resources/config/application.properties b/redis/src/main/resources/config/application.properties
index b25e5713..7721fe42 100644
--- a/redis/src/main/resources/config/application.properties
+++ b/redis/src/main/resources/config/application.properties
@@ -1,6 +1,6 @@
logging.config=classpath:config/logback-dev.xml
server.port=8080
-server.session.timeout=1800
+
server.max-http-header-size=20971520
# redis
diff --git a/scheduled/pom.xml b/scheduled/pom.xml
index b4bff7da..fa18839a 100644
--- a/scheduled/pom.xml
+++ b/scheduled/pom.xml
@@ -5,7 +5,7 @@
- * Date: 2016年4月1日 15:38
+ * Date: 2016年4月1日 15:31
* Description: 任务启动器
* Copyright(©) 2015 by xiaomo.
**/
@@ -29,7 +29,7 @@
@EnableScheduling
@EnableAsync
public class ScheduledMain {
- public static void main(String[] args) throws Exception {
+ public static void main(String[] args) {
SpringApplication.run(ScheduledMain.class, args);
}
diff --git a/scheduled/src/main/resources/config/application.properties b/scheduled/src/main/resources/config/application.properties
index 2bbf0e38..7d2d7151 100644
--- a/scheduled/src/main/resources/config/application.properties
+++ b/scheduled/src/main/resources/config/application.properties
@@ -1,6 +1,6 @@
logging.config=classpath:config/logback-dev.xml
server.port=8080
-server.session.timeout=1800
+
server.max-http-header-size=20971520
# \u914D\u7F6E\u8FD9\u4E2A\u503C\u5C31\u53EF\u4EE5\u683C\u5F0F\u5316\u65F6\u95F4
diff --git a/security/pom.xml b/security/pom.xml
index bf01534e..2c3b2bda 100644
--- a/security/pom.xml
+++ b/security/pom.xml
@@ -5,7 +5,7 @@
* Date: 2016年4月1日 15:38
diff --git a/security/src/main/resources/config/application.properties b/security/src/main/resources/config/application.properties
index e32aee62..8d858203 100644
--- a/security/src/main/resources/config/application.properties
+++ b/security/src/main/resources/config/application.properties
@@ -1,6 +1,6 @@
logging.config=classpath:config/logback-dev.xml
server.port=8080
-server.session.timeout=1800
+
server.max-http-header-size=20971520
# \u914D\u7F6E\u8FD9\u4E2A\u503C\u5C31\u53EF\u4EE5\u683C\u5F0F\u5316\u65F6\u95F4
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
diff --git a/socket/pom.xml b/socket/pom.xml
index c7509645..3739f943 100644
--- a/socket/pom.xml
+++ b/socket/pom.xml
@@ -5,7 +5,7 @@
* Date: 2016年4月1日 15:38
diff --git a/socket/src/main/java/info/xiaomo/chat/socket/MyWebSocket.java b/socket/src/main/java/info/xiaomo/chat/socket/MyWebSocket.java
index 769f0ecf..57dcd631 100644
--- a/socket/src/main/java/info/xiaomo/chat/socket/MyWebSocket.java
+++ b/socket/src/main/java/info/xiaomo/chat/socket/MyWebSocket.java
@@ -19,11 +19,11 @@
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016年11月3日 16:36
diff --git a/socket/src/main/resources/config/application.properties b/socket/src/main/resources/config/application.properties
index 453a78fb..d1e72d0f 100644
--- a/socket/src/main/resources/config/application.properties
+++ b/socket/src/main/resources/config/application.properties
@@ -1,6 +1,6 @@
logging.config=classpath:config/logback-dev.xml
server.port=8081
-server.session.timeout=1800
+
server.max-http-header-size=20971520
diff --git a/thymeleaf/pom.xml b/thymeleaf/pom.xml
index 6a7376b3..6d1b1f53 100644
--- a/thymeleaf/pom.xml
+++ b/thymeleaf/pom.xml
@@ -5,7 +5,7 @@
* Date: 2016年12月1日 15:38
diff --git a/thymeleaf/src/main/java/info/xiaomo/thymeleaf/controller/ThymeleafController.java b/thymeleaf/src/main/java/info/xiaomo/thymeleaf/controller/ThymeleafController.java
index 9e0613e0..ef573df5 100644
--- a/thymeleaf/src/main/java/info/xiaomo/thymeleaf/controller/ThymeleafController.java
+++ b/thymeleaf/src/main/java/info/xiaomo/thymeleaf/controller/ThymeleafController.java
@@ -8,10 +8,10 @@
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016年11月16日 10:19
diff --git a/thymeleaf/src/main/resources/config/application.properties b/thymeleaf/src/main/resources/config/application.properties
index 9a461544..fec3b903 100644
--- a/thymeleaf/src/main/resources/config/application.properties
+++ b/thymeleaf/src/main/resources/config/application.properties
@@ -1,6 +1,6 @@
logging.config=classpath:config/logback-dev.xml
server.port=8080
-server.session.timeout=1800
+
server.max-http-header-size=20971520
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
diff --git a/thymeleaf/src/main/resources/config/banner-girl.txt b/thymeleaf/src/main/resources/config/banner-girl.txt
index c826bcd3..5c648ca3 100644
--- a/thymeleaf/src/main/resources/config/banner-girl.txt
+++ b/thymeleaf/src/main/resources/config/banner-girl.txt
@@ -16,4 +16,4 @@
...::: ::::::::::::' ``::.
```` ':. ':::::::::' ::::..
'.:::::' ':'````..
-:: Spring Boot :: (v1.5.8.RELEASE)
\ No newline at end of file
+:: Spring Boot :: (v2.0.0.RELEASE)
\ No newline at end of file
diff --git a/website/pom.xml b/website/pom.xml
index 5e3a88d4..3a00bf4f 100644
--- a/website/pom.xml
+++ b/website/pom.xml
@@ -5,7 +5,7 @@
* Date: 2016年4月1日 15:38
@@ -48,9 +48,9 @@
@EnableCaching
@EnableSwagger2
@Controller
-public class XiaomoMain extends WebMvcConfigurerAdapter {
+public class XiaomoMain implements WebMvcConfigurer {
- public static void main(String[] args) throws Exception {
+ public static void main(String[] args) {
SpringApplication.run(XiaomoMain.class, args);
}
diff --git a/website/src/main/java/info/xiaomo/website/controller/AdminUserController.java b/website/src/main/java/info/xiaomo/website/controller/AdminUserController.java
index 980f2cc1..c79e934b 100644
--- a/website/src/main/java/info/xiaomo/website/controller/AdminUserController.java
+++ b/website/src/main/java/info/xiaomo/website/controller/AdminUserController.java
@@ -28,10 +28,10 @@
* |╭---╮把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 16/4/2 12:47
@@ -56,7 +56,7 @@ public AdminUserController(AdminUserService service) {
* @return Result
*/
@RequestMapping(value = "login/{userName}/{password}", method = RequestMethod.POST)
- @ApiOperation(value = "获取用户信息", notes = "根据用户帐号和密码登录后台", httpMethod = "POST", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+ @ApiOperation(value = "获取用户信息", notes = "根据用户帐号和密码登录后台", httpMethod = "POST")
@ApiImplicitParams({
@ApiImplicitParam(name = "userName", value = "用户名", required = true, dataType = "Result", paramType = "path"),
@ApiImplicitParam(name = "password", value = "用户名", required = true, dataType = "Result", paramType = "path")
@@ -65,13 +65,13 @@ public AdminUserController(AdminUserService service) {
@ApiResponse(code = 404, message = "Not Found"),
@ApiResponse(code = 400, message = "No Name Provided"),
})
- public Result login(@PathVariable("userName") String userName, @PathVariable("password") String password) {
+ public Result
* Date: 2016/4/1117:40
@@ -50,14 +50,14 @@ public ChangeLogController(ChangeLogService service) {
*/
@Override
@RequestMapping(value = "findById/{id}", method = RequestMethod.GET)
- @ApiOperation(value = "通过id查找", notes = "通过id查找", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+ @ApiOperation(value = "通过id查找", notes = "通过id查找", httpMethod = "GET")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "唯一id", required = true, dataType = "Long", paramType = "path")
})
public Result findById(@PathVariable("id") Long id) {
ChangeLogModel changeLogModel = service.findById(id);
if (changeLogModel == null) {
- return new Result(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage());
+ return new Result(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage());
}
return new Result(changeLogModel);
}
@@ -69,16 +69,16 @@ public Result findById(@PathVariable("id") Long id) {
*/
@Override
@RequestMapping(value = "findByName/{name}", method = RequestMethod.GET)
- @ApiOperation(value = "通过名字查找", notes = "通过名字查找", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+ @ApiOperation(value = "通过名字查找", notes = "通过名字查找", httpMethod = "GET")
@ApiImplicitParams({
@ApiImplicitParam(name = "name", value = "更新日志内容", required = true, dataType = "String", paramType = "path")
})
public Result findByName(@PathVariable("name") String name) {
ChangeLogModel model = service.findByName(name);
if (model == null) {
- return new Result(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage());
+ return new Result(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage());
}
- return new Result(model);
+ return new Result(model);
}
/**
@@ -143,11 +143,11 @@ public Result
* Date: 2016/4/1119:55
@@ -49,7 +49,7 @@ public LinkController(LinkService service) {
* @return model
*/
@RequestMapping(value = "findById/{id}", method = RequestMethod.GET)
- @ApiOperation(value = "通过id查找", notes = "通过id查找", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+ @ApiOperation(value = "通过id查找", notes = "通过id查找", httpMethod = "GET")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "唯一id", required = true, dataType = "Long", paramType = "path")
})
@@ -69,7 +69,7 @@ public Result findLinkById(@PathVariable("id") Long id) {
*/
@Override
@RequestMapping(value = "findByName/{name}", method = RequestMethod.GET)
- @ApiOperation(value = "根据名字查找", notes = "根据名字查找", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+ @ApiOperation(value = "根据名字查找", notes = "根据名字查找", httpMethod = "GET")
@ApiImplicitParams({
@ApiImplicitParam(name = "name", value = "友情链接名字", required = true, dataType = "String", paramType = "path")
})
@@ -144,7 +144,7 @@ public Result
* Date: 2016年11月14日 11:06
diff --git a/website/src/main/java/info/xiaomo/website/controller/TechnologyController.java b/website/src/main/java/info/xiaomo/website/controller/TechnologyController.java
index 24bfe974..46601a9a 100644
--- a/website/src/main/java/info/xiaomo/website/controller/TechnologyController.java
+++ b/website/src/main/java/info/xiaomo/website/controller/TechnologyController.java
@@ -20,10 +20,9 @@
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016年11月3日 14:36
@@ -45,21 +44,21 @@ public TechnologyController(TechnologyService service) {
@Override
- @ApiOperation(value = "根据id查找技术", notes = "根据id查找技术", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+ @ApiOperation(value = "根据id查找技术", notes = "根据id查找技术", httpMethod = "GET")
@RequestMapping(value = "/findById/{id}", method = RequestMethod.GET)
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "唯一Id", required = true, dataType = "Long", paramType = "path")
})
- public Result findById(@PathVariable Long id) {
+ public Result
* Date: 2016年4月1日 17:51
@@ -56,28 +56,26 @@ public UserController(UserService service) {
* @param id id
* @return result
*/
- @ApiOperation(value = "查找用户", notes = "查找用户", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+ @ApiOperation(value = "查找用户", notes = "查找用户", httpMethod = "GET")
@RequestMapping(value = "findById/{id}", method = RequestMethod.GET)
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "唯一id", required = true, dataType = "Long", paramType = "path"),
})
+ @SuppressWarnings("unchecked")
public Result findUserById(@PathVariable("id") Long id) {
- UserModel userModel = service.findUserById(id);
- if (userModel == null) {
- return new Result(CodeConst.USER_NOT_FOUND.getResultCode(), CodeConst.USER_NOT_FOUND.getMessage());
- }
- return new Result(userModel);
+ Optional
* Date: 2016年11月3日 14:36
@@ -34,8 +30,8 @@
@RequestMapping("/works")
@RestController
-@Api(value = "作品相关api", description = "作品相关api")
-public class WorksController extends BaseController {
+@Api(value = "作品相关api")
+public class WorksController {
private final WorksService service;
@@ -45,145 +41,75 @@ public WorksController(WorksService service) {
}
- @Override
@RequestMapping(value = "/findById/{id}", method = RequestMethod.GET)
- @ApiOperation(value = "根据id查找作品", notes = "根据id查找作品", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+ @ApiOperation(value = "根据id查找作品", notes = "根据id查找作品", httpMethod = "GET")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "唯一id", required = true, dataType = "Long", paramType = "path"),
})
- public Result findById(@PathVariable Long id) {
+ public Result
* Date: 16/4/2 13:08
diff --git a/website/src/main/java/info/xiaomo/website/dao/ChangeLogDao.java b/website/src/main/java/info/xiaomo/website/dao/ChangeLogDao.java
index 21028b52..0953d493 100644
--- a/website/src/main/java/info/xiaomo/website/dao/ChangeLogDao.java
+++ b/website/src/main/java/info/xiaomo/website/dao/ChangeLogDao.java
@@ -8,10 +8,10 @@
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016/4/1119:52
diff --git a/website/src/main/java/info/xiaomo/website/dao/LinkDao.java b/website/src/main/java/info/xiaomo/website/dao/LinkDao.java
index 1329e963..53fbf585 100644
--- a/website/src/main/java/info/xiaomo/website/dao/LinkDao.java
+++ b/website/src/main/java/info/xiaomo/website/dao/LinkDao.java
@@ -8,10 +8,10 @@
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016/4/1119:52
diff --git a/website/src/main/java/info/xiaomo/website/dao/TechnologyDao.java b/website/src/main/java/info/xiaomo/website/dao/TechnologyDao.java
index 97c11036..923c7678 100644
--- a/website/src/main/java/info/xiaomo/website/dao/TechnologyDao.java
+++ b/website/src/main/java/info/xiaomo/website/dao/TechnologyDao.java
@@ -16,10 +16,10 @@
* |╭---╮把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 16/4/2 13:08
diff --git a/website/src/main/java/info/xiaomo/website/dao/UserDao.java b/website/src/main/java/info/xiaomo/website/dao/UserDao.java
index ca9aa978..810462b6 100644
--- a/website/src/main/java/info/xiaomo/website/dao/UserDao.java
+++ b/website/src/main/java/info/xiaomo/website/dao/UserDao.java
@@ -16,10 +16,10 @@
* |╭---╮把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 16/4/3 10:53
diff --git a/website/src/main/java/info/xiaomo/website/dao/WorksDao.java b/website/src/main/java/info/xiaomo/website/dao/WorksDao.java
index f617e1ab..0d6a1e89 100644
--- a/website/src/main/java/info/xiaomo/website/dao/WorksDao.java
+++ b/website/src/main/java/info/xiaomo/website/dao/WorksDao.java
@@ -16,10 +16,10 @@
* |╭---╮把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 16/4/2 13:08
diff --git a/website/src/main/java/info/xiaomo/website/dao/base/CommonDao.java b/website/src/main/java/info/xiaomo/website/dao/base/CommonDao.java
index 520951e4..f208448f 100644
--- a/website/src/main/java/info/xiaomo/website/dao/base/CommonDao.java
+++ b/website/src/main/java/info/xiaomo/website/dao/base/CommonDao.java
@@ -13,10 +13,10 @@
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016年4月1日 20:46
diff --git a/website/src/main/java/info/xiaomo/website/interceptor/LoginInterceptor.java b/website/src/main/java/info/xiaomo/website/interceptor/LoginInterceptor.java
index 9d17b72d..a981ef75 100644
--- a/website/src/main/java/info/xiaomo/website/interceptor/LoginInterceptor.java
+++ b/website/src/main/java/info/xiaomo/website/interceptor/LoginInterceptor.java
@@ -7,14 +7,14 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
/**
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016年11月21日 10:42
diff --git a/website/src/main/java/info/xiaomo/website/model/AdminModel.java b/website/src/main/java/info/xiaomo/website/model/AdminModel.java
index 5755900a..7209d379 100644
--- a/website/src/main/java/info/xiaomo/website/model/AdminModel.java
+++ b/website/src/main/java/info/xiaomo/website/model/AdminModel.java
@@ -21,10 +21,10 @@
* |╭---╮把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 16/4/2 12:39
diff --git a/website/src/main/java/info/xiaomo/website/model/ChangeLogModel.java b/website/src/main/java/info/xiaomo/website/model/ChangeLogModel.java
index bbf7eac4..bfc74198 100644
--- a/website/src/main/java/info/xiaomo/website/model/ChangeLogModel.java
+++ b/website/src/main/java/info/xiaomo/website/model/ChangeLogModel.java
@@ -13,10 +13,10 @@
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016/4/517:17
diff --git a/website/src/main/java/info/xiaomo/website/model/LinkModel.java b/website/src/main/java/info/xiaomo/website/model/LinkModel.java
index a7d3198d..5907fff0 100644
--- a/website/src/main/java/info/xiaomo/website/model/LinkModel.java
+++ b/website/src/main/java/info/xiaomo/website/model/LinkModel.java
@@ -13,10 +13,10 @@
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016/4/1119:47
diff --git a/website/src/main/java/info/xiaomo/website/model/TechnologyModel.java b/website/src/main/java/info/xiaomo/website/model/TechnologyModel.java
index 8426806c..ad3d9e05 100644
--- a/website/src/main/java/info/xiaomo/website/model/TechnologyModel.java
+++ b/website/src/main/java/info/xiaomo/website/model/TechnologyModel.java
@@ -12,10 +12,10 @@
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016年11月3日 14:27
diff --git a/website/src/main/java/info/xiaomo/website/model/UserModel.java b/website/src/main/java/info/xiaomo/website/model/UserModel.java
index ef37578a..1dfba5b9 100644
--- a/website/src/main/java/info/xiaomo/website/model/UserModel.java
+++ b/website/src/main/java/info/xiaomo/website/model/UserModel.java
@@ -13,10 +13,10 @@
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016年4月1日 17:36
diff --git a/website/src/main/java/info/xiaomo/website/model/WorksModel.java b/website/src/main/java/info/xiaomo/website/model/WorksModel.java
index 066ffff3..6fef0f0e 100644
--- a/website/src/main/java/info/xiaomo/website/model/WorksModel.java
+++ b/website/src/main/java/info/xiaomo/website/model/WorksModel.java
@@ -12,10 +12,10 @@
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016年11月3日 14:15
diff --git a/website/src/main/java/info/xiaomo/website/service/AdminUserService.java b/website/src/main/java/info/xiaomo/website/service/AdminUserService.java
index d5bdf1b0..18ee9d15 100644
--- a/website/src/main/java/info/xiaomo/website/service/AdminUserService.java
+++ b/website/src/main/java/info/xiaomo/website/service/AdminUserService.java
@@ -18,10 +18,10 @@
* |╭---╮把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 16/4/2 13:04
diff --git a/website/src/main/java/info/xiaomo/website/service/ChangeLogService.java b/website/src/main/java/info/xiaomo/website/service/ChangeLogService.java
index a06a2e54..5339b40c 100644
--- a/website/src/main/java/info/xiaomo/website/service/ChangeLogService.java
+++ b/website/src/main/java/info/xiaomo/website/service/ChangeLogService.java
@@ -9,10 +9,10 @@
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016/4/1119:49
diff --git a/website/src/main/java/info/xiaomo/website/service/LinkService.java b/website/src/main/java/info/xiaomo/website/service/LinkService.java
index d537e68d..6c97007f 100644
--- a/website/src/main/java/info/xiaomo/website/service/LinkService.java
+++ b/website/src/main/java/info/xiaomo/website/service/LinkService.java
@@ -10,10 +10,10 @@
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016/4/1119:49
diff --git a/website/src/main/java/info/xiaomo/website/service/TechnologyService.java b/website/src/main/java/info/xiaomo/website/service/TechnologyService.java
index 1f5c2215..5165cfb1 100644
--- a/website/src/main/java/info/xiaomo/website/service/TechnologyService.java
+++ b/website/src/main/java/info/xiaomo/website/service/TechnologyService.java
@@ -10,10 +10,10 @@
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016年11月3日 14:33
diff --git a/website/src/main/java/info/xiaomo/website/service/UserService.java b/website/src/main/java/info/xiaomo/website/service/UserService.java
index ab9a2d47..cc244a90 100644
--- a/website/src/main/java/info/xiaomo/website/service/UserService.java
+++ b/website/src/main/java/info/xiaomo/website/service/UserService.java
@@ -6,15 +6,16 @@
import org.springframework.data.domain.Page;
import java.util.List;
+import java.util.Optional;
/**
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016年4月1日 17:45
@@ -27,7 +28,7 @@ public interface UserService {
* @param id id
* @return UserModel
*/
- UserModel findUserById(Long id);
+ Optional
* Date: 2016年11月3日 14:33
diff --git a/website/src/main/java/info/xiaomo/website/service/impl/AdminUserServiceImpl.java b/website/src/main/java/info/xiaomo/website/service/impl/AdminUserServiceImpl.java
index aa7d1a21..dcebc65b 100644
--- a/website/src/main/java/info/xiaomo/website/service/impl/AdminUserServiceImpl.java
+++ b/website/src/main/java/info/xiaomo/website/service/impl/AdminUserServiceImpl.java
@@ -12,6 +12,7 @@
import java.util.Date;
import java.util.List;
+import java.util.Optional;
/**
* │\__╭╭╭╭╭__/│
@@ -25,10 +26,10 @@
* |╭---╮把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 16/4/2 13:34
@@ -52,7 +53,8 @@ public AdminModel findAdminUserByUserName(String userName) {
@Override
public AdminModel findAdminUserById(Long id) {
- return dao.findOne(id);
+ Optional
* Date: 2016年4月11日 19:49
@@ -37,7 +38,8 @@ public ChangeLogServiceImpl(ChangeLogDao dao) {
@Override
public ChangeLogModel findById(Long id) {
- return dao.findOne(id);
+ Optional
* Date: 2016年4月11日 19:50
@@ -37,7 +37,8 @@ public LinkServiceImpl(LinkDao dao) {
@Override
public LinkModel findById(Long id) {
- return dao.findOne(id);
+ Optional
* Date: 2016年11月3日 14:34
@@ -42,12 +43,13 @@ public List
* Date: 2016年4月1日 17:46
@@ -38,8 +39,8 @@ public UserServiceImpl(UserDao dao) {
}
@Override
- public UserModel findUserById(Long id) {
- return dao.findOne(id);
+ public Optional
* Date: 2016年11月3日 14:34
@@ -42,12 +43,13 @@ public List
* Date: 2016/4/511:00
diff --git a/website/src/main/java/info/xiaomo/website/view/AdminUserView.java b/website/src/main/java/info/xiaomo/website/view/AdminUserView.java
index 47ff5be8..63ac1226 100644
--- a/website/src/main/java/info/xiaomo/website/view/AdminUserView.java
+++ b/website/src/main/java/info/xiaomo/website/view/AdminUserView.java
@@ -4,10 +4,10 @@
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016年11月21日 11:12
diff --git a/website/src/main/java/info/xiaomo/website/view/ChangeLogView.java b/website/src/main/java/info/xiaomo/website/view/ChangeLogView.java
index 77570ec4..05900fdd 100644
--- a/website/src/main/java/info/xiaomo/website/view/ChangeLogView.java
+++ b/website/src/main/java/info/xiaomo/website/view/ChangeLogView.java
@@ -4,10 +4,10 @@
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016年11月21日 11:12
diff --git a/website/src/main/java/info/xiaomo/website/view/LinkView.java b/website/src/main/java/info/xiaomo/website/view/LinkView.java
index e2bd5fae..42ccd3c7 100644
--- a/website/src/main/java/info/xiaomo/website/view/LinkView.java
+++ b/website/src/main/java/info/xiaomo/website/view/LinkView.java
@@ -4,10 +4,10 @@
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016年11月21日 11:12
diff --git a/website/src/main/java/info/xiaomo/website/view/TechnologyView.java b/website/src/main/java/info/xiaomo/website/view/TechnologyView.java
index cbbfabca..bdf5121b 100644
--- a/website/src/main/java/info/xiaomo/website/view/TechnologyView.java
+++ b/website/src/main/java/info/xiaomo/website/view/TechnologyView.java
@@ -4,10 +4,10 @@
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016年11月21日 11:12
diff --git a/website/src/main/java/info/xiaomo/website/view/UserView.java b/website/src/main/java/info/xiaomo/website/view/UserView.java
index d2e55dfa..2e6aea81 100644
--- a/website/src/main/java/info/xiaomo/website/view/UserView.java
+++ b/website/src/main/java/info/xiaomo/website/view/UserView.java
@@ -4,10 +4,10 @@
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016年11月21日 11:12
diff --git a/website/src/main/java/info/xiaomo/website/view/WorksView.java b/website/src/main/java/info/xiaomo/website/view/WorksView.java
index 9f93238f..4b4a5f67 100644
--- a/website/src/main/java/info/xiaomo/website/view/WorksView.java
+++ b/website/src/main/java/info/xiaomo/website/view/WorksView.java
@@ -4,10 +4,10 @@
* 把今天最好的表现当作明天最新的起点..〜
* いま 最高の表現 として 明日最新の始発..〜
* Today the best performance as tomorrow newest starter!
- * Created by IntelliJ IDEA.
+
*
* @author : xiaomo
- * github: https://github.com/xiaomoinfo
+ * github: https://github.com/houko
* email: xiaomo@xiaomo.info
*
* Date: 2016年11月21日 11:12
diff --git a/website/src/main/resources/config/application.properties b/website/src/main/resources/config/application.properties
index 71bb2fbe..f830f53d 100644
--- a/website/src/main/resources/config/application.properties
+++ b/website/src/main/resources/config/application.properties
@@ -1,6 +1,6 @@
logging.config=classpath:config/logback-dev.xml
server.port=8080
-server.session.timeout=1800
+
server.max-http-header-size=20971520
#datasource
@@ -8,7 +8,7 @@ spring.datasource.url=jdbc:mysql://ip/db?characterEncoding=utf8&useSSL=true
# ?useUnicode=true&characterEncoding=UTF-8
spring.datasource.username=username
spring.datasource.password=password
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
# \u914D\u7F6E\u8FD9\u4E2A\u503C\u5C31\u53EF\u4EE5\u683C\u5F0F\u5316\u65F6\u95F4
#spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
#spring.jackson.time-zone=GMT+8
diff --git a/website/src/main/resources/config/banner-girl.txt b/website/src/main/resources/config/banner-girl.txt
index 7e149757..934b7d76 100644
--- a/website/src/main/resources/config/banner-girl.txt
+++ b/website/src/main/resources/config/banner-girl.txt
@@ -17,4 +17,4 @@
...::: ::::::::::::' ``::.
```` ':. ':::::::::' ::::..
'.:::::' ':'````..
-:: Spring Boot :: (v1.5.8.RELEASE)
\ No newline at end of file
+:: Spring Boot :: (v2.0.0.RELEASE)
\ No newline at end of file
diff --git a/website/src/test/java/info/xiaomo/test/MailTests.java b/website/src/test/java/info/xiaomo/test/MailTests.java
deleted file mode 100644
index 3bff1dd0..00000000
--- a/website/src/test/java/info/xiaomo/test/MailTests.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package info.xiaomo.test;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.FileSystemResource;
-import org.springframework.mail.SimpleMailMessage;
-import org.springframework.mail.javamail.JavaMailSender;
-import org.springframework.mail.javamail.MimeMessageHelper;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import javax.mail.internet.MimeMessage;
-import java.io.File;
-
-
-@RunWith(SpringJUnit4ClassRunner.class)
-public class MailTests {
-
- @Autowired
- private JavaMailSender mailSender;
-
-
- @Test
- public void sendSimpleMail() throws Exception {
-
- SimpleMailMessage message = new SimpleMailMessage();
- message.setFrom("dyc87112@qq.com");
- message.setTo("dyc87112@qq.com");
- message.setSubject("主题:简单邮件");
- message.setText("测试邮件内容");
-
- mailSender.send(message);
- }
-
- @Test
- public void sendAttachmentsMail() throws Exception {
-
- MimeMessage mimeMessage = mailSender.createMimeMessage();
-
- MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, true);
- helper.setFrom("dyc87112@qq.com");
- helper.setTo("dyc87112@qq.com");
- helper.setSubject("主题:有附件");
- helper.setText("有附件的邮件");
-
- FileSystemResource file = new FileSystemResource(new File("weixin.jpg"));
- helper.addAttachment("附件-1.jpg", file);
- helper.addAttachment("附件-2.jpg", file);
-
- mailSender.send(mimeMessage);
- }
-
- @Test
- public void sendInlineMail() throws Exception {
-
- MimeMessage mimeMessage = mailSender.createMimeMessage();
-
- MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, true);
- helper.setFrom("dyc87112@qq.com");
- helper.setTo("dyc87112@qq.com");
- helper.setSubject("主题:嵌入静态资源");
- helper.setText("", true);
-
- FileSystemResource file = new FileSystemResource(new File("weixin.jpg"));
- helper.addInline("weixin", file);
-
- mailSender.send(mimeMessage);
- }
-
-
-}
diff --git a/website/src/test/resources/application.properties b/website/src/test/resources/application.properties
deleted file mode 100644
index 41c59d16..00000000
--- a/website/src/test/resources/application.properties
+++ /dev/null
@@ -1,33 +0,0 @@
-logging.config=classpath:config/logback-dev.xml
-server.port=8080
-server.session.timeout=1800
-server.max-http-header-size=20971520
-
-#datasource
-spring.datasource.url=jdbc:mysql://ip/\u6570\u636E\u5E93?characterEncoding=utf8&useSSL=true
-# ?useUnicode=true&characterEncoding=UTF-8
-spring.datasource.username=\u4F60\u7684\u5E10\u53F7
-spring.datasource.password=\u4F60\u7684\u5BC6\u7801
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-# \u914D\u7F6E\u8FD9\u4E2A\u503C\u5C31\u53EF\u4EE5\u683C\u5F0F\u5316\u65F6\u95F4
-#spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
-#spring.jackson.time-zone=GMT+8
-
-#jpa
-spring.jpa.database-platform=org.hibernate.dialect.MySQL5Dialect
-spring.jpa.hibernate.ddl-auto=update
-spring.jpa.show-sql=true
-spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
-
-
-#\u90AE\u4EF6
-spring.mail.host=smtp.qq.com
-spring.mail.username=83387856@qq.com
-spring.mail.password=,
-spring.mail.properties.mail.smtp.auth=true
-spring.mail.properties.mail.smtp.starttls.enable=true
-spring.mail.properties.mail.smtp.starttls.required=true
-
-#spring.data.mongodb.uri=mongodb://name:pass@localhost:27017/test
-
-