Skip to content

Commit 11b4633

Browse files
authored
Merge pull request houko#23 from houko/develop
change comment
2 parents 196bc7d + 0bd8847 commit 11b4633

File tree

102 files changed

+189
-198
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+189
-198
lines changed

Readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ http://localhost:808/doc.html bootstrap-ui
112112

113113

114114
### 问题反馈
115-
1. 欢迎提[issue](https://github.com/xiaomoinfo/SpringBootUnity/issues)一起完善这个项目。
115+
1. 欢迎提[issue](https://github.com/houko/SpringBootUnity/issues)一起完善这个项目。
116116
2. QQ: 83387856
117117
4. 个人主站: https://xiaomo.info
118118

async/src/main/java/info/xiaomo/anysc/AsyncMain.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
* 把今天最好的表现当作明天最新的起点..~
1414
* いま 最高の表現 として 明日最新の始発..~
1515
* Today the best performance as tomorrow newest starter!
16-
* Created by IntelliJ IDEA.
16+
1717
*
1818
* @author : xiaomo
19-
* github: https://github.com/xiaomoinfo
19+
* github: https://github.com/houko
2020
2121
* <p>
2222
* Date: 2016/4/1 15:38

async/src/main/java/info/xiaomo/anysc/controller/TestController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
* 把今天最好的表现当作明天最新的起点..~
1515
* いま 最高の表現 として 明日最新の始発..~
1616
* Today the best performance as tomorrow newest starter!
17-
* Created by IntelliJ IDEA.
17+
1818
*
1919
* @author : xiaomo
20-
* github: https://github.com/xiaomoinfo
20+
* github: https://github.com/houko
2121
2222
* <p>
2323
* Date: 2016/11/15 15:12

core/src/main/java/info/xiaomo/core/base/AuthOperate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import java.util.Date;
66

77
/**
8-
* @author : xiaomo (https://xiaomo.info) (https://github.com/xiaomoinfo)
8+
* @author : xiaomo (https://xiaomo.info) (https://github.com/houko)
99
* @version : 2017/1/13 9:51
1010
*/
1111
public interface AuthOperate {

core/src/main/java/info/xiaomo/core/base/BaseController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import java.util.List;
1111

1212
/**
13-
* @author : xiaomo (https://xiaomo.info) (https://github.com/xiaomoinfo)
13+
* @author : xiaomo (https://xiaomo.info) (https://github.com/houko)
1414
* @version : 2017/1/11 16:41
1515
*/
1616
@RestController

core/src/main/java/info/xiaomo/core/base/BaseDao.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import org.springframework.stereotype.Repository;
55

66
/**
7-
* @author : xiaomo (https://xiaomo.info) (https://github.com/xiaomoinfo)
7+
* @author : xiaomo (https://xiaomo.info) (https://github.com/houko)
88
* @version : 2017/1/13 11:23
99
*/
1010
@Repository

core/src/main/java/info/xiaomo/core/base/BaseModel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
* 把今天最好的表现当作明天最新的起点..~
1111
* いま 最高の表現 として 明日最新の始発..~
1212
* Today the best performance as tomorrow newest starter!
13-
* Created by IntelliJ IDEA.
13+
1414
*
1515
* @author : xiaomo
16-
* github: https://github.com/xiaomoinfo
16+
* github: https://github.com/houko
1717
1818
* <p>
1919
* Date: 2016/4/1 20:37

core/src/main/java/info/xiaomo/core/base/BaseService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import java.util.List;
77

88
/**
9-
* @author : xiaomo (https://xiaomo.info) (https://github.com/xiaomoinfo)
9+
* @author : xiaomo (https://xiaomo.info) (https://github.com/houko)
1010
* @version : 2017/1/11 16:42
1111
*/
1212
@Service

core/src/main/java/info/xiaomo/core/base/Result.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
* 把今天最好的表现当作明天最新的起点..~
77
* いま 最高の表現 として 明日最新の始発..~
88
* Today the best performance as tomorrow newest starter!
9-
* Created by IntelliJ IDEA.
9+
1010
*
1111
* @author : xiaomo
12-
* github: https://github.com/xiaomoinfo
12+
* github: https://github.com/houko
1313
1414
* <p>
1515
* Date: 2016/10/31 15:25

core/src/main/java/info/xiaomo/core/constant/CodeConst.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
* 把今天最好的表现当作明天最新的起点..~
55
* いま 最高の表現 として 明日最新の始発..~
66
* Today the best performance as tomorrow newest starter!
7-
* Created by IntelliJ IDEA.
7+
88
*
99
* @author : xiaomo
10-
* github: https://github.com/xiaomoinfo
10+
* github: https://github.com/houko
1111
1212
* <p>
1313
* Date: 2016/10/29 10:59

core/src/main/java/info/xiaomo/core/constant/GenderConst.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
* 把今天最好的表现当作明天最新的起点..~
55
* いま 最高の表現 として 明日最新の始発..~
66
* Today the best performance as tomorrow newest starter!
7-
* Created by IntelliJ IDEA.
7+
88
*
99
* @author : xiaomo
10-
* github: https://github.com/xiaomoinfo
10+
* github: https://github.com/houko
1111
1212
* <p>
1313
* Date: 2016/1/12 16:37

core/src/main/java/info/xiaomo/core/exception/UserNotFoundException.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
* |╭---╮把今天最好的表现当作明天最新的起点..~
1313
* いま 最高の表現 として 明日最新の始発..~
1414
* Today the best performance as tomorrow newest starter!
15-
* Created by IntelliJ IDEA.
15+
1616
*
1717
* @author : xiaomo
18-
* github: https://github.com/xiaomoinfo
18+
* github: https://github.com/houko
1919
2020
* <p>
2121
* Date: 16/4/3 11:08

core/src/main/java/info/xiaomo/core/field/LoginField.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
* 把今天最好的表现当作明天最新的起点..~
55
* いま 最高の表現 として 明日最新の始発..~
66
* Today the best performance as tomorrow newest starter!
7-
* Created by IntelliJ IDEA.
7+
88
*
99
* @author : xiaomo
10-
* github: https://github.com/xiaomoinfo
10+
* github: https://github.com/houko
1111
* email: [email protected](83387856)
1212
* Date: 2016/1/8 13:16
1313
* Description: QQ登录常量类

core/src/main/java/info/xiaomo/core/filter/CorsFilter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
* 把今天最好的表现当作明天最新的起点..~
1111
* いま 最高の表現 として 明日最新の始発..~
1212
* Today the best performance as tomorrow newest starter!
13-
* Created by IntelliJ IDEA.
13+
1414
*
1515
* @author : xiaomo
16-
* github: https://github.com/xiaomoinfo
16+
* github: https://github.com/houko
1717
1818
* <p>
1919
* Date: 2016/4/1516:25

core/src/main/java/info/xiaomo/core/untils/AuthUtil.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
* 把今天最好的表现当作明天最新的起点..~
77
* いま 最高の表現 として 明日最新の始発..~
88
* Today the best performance as tomorrow newest starter!
9-
* Created by IntelliJ IDEA.
9+
1010
*
1111
* @author : xiaomo
12-
* github: https://github.com/xiaomoinfo
12+
* github: https://github.com/houko
1313
1414
* <p>
1515
* Date: 2016/11/31 9:50

core/src/main/java/info/xiaomo/core/untils/CastUtil.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.io.*;
44
import java.nio.ByteBuffer;
5+
import java.nio.charset.StandardCharsets;
56
import java.util.HashMap;
67
import java.util.Hashtable;
78
import java.util.Iterator;
@@ -10,10 +11,10 @@
1011
* 把今天最好的表现当作明天最新的起点..~
1112
* いま 最高の表現 として 明日最新の始発..~
1213
* Today the best performance as tomorrow newest starter!
13-
* Created by IntelliJ IDEA.
14+
1415
*
1516
* @author : xiaomo
16-
* github: https://github.com/xiaomoinfo
17+
* github: https://github.com/houko
1718
1819
* <p>
1920
* Date: 2016/11/22 14:55
@@ -162,7 +163,7 @@ public static String objectToString(Object obj) {
162163
ObjectOutputStream e = new ObjectOutputStream(out);
163164
e.writeObject(obj);
164165
byte[] bytes = out.toByteArray();
165-
return new String(bytes, "ISO-8859-1");
166+
return new String(bytes, StandardCharsets.ISO_8859_1);
166167
} catch (IOException var4) {
167168
var4.printStackTrace();
168169
return null;
@@ -172,7 +173,7 @@ public static String objectToString(Object obj) {
172173

173174
public static Object stringToObject(String string) {
174175
try {
175-
byte[] e = string.getBytes("ISO-8859-1");
176+
byte[] e = string.getBytes(StandardCharsets.ISO_8859_1);
176177
ByteArrayInputStream in = new ByteArrayInputStream(e);
177178
ObjectInputStream ois = new ObjectInputStream(in);
178179
return ois.readObject();
@@ -290,7 +291,7 @@ public static int[] stringToInts(String str, String regex) {
290291
}
291292

292293
public static String bytesToHexString(byte[] src) {
293-
StringBuilder stringBuilder = new StringBuilder("");
294+
StringBuilder stringBuilder = new StringBuilder();
294295
if (src != null && src.length > 0) {
295296
for (byte aSrc : src) {
296297
int v = aSrc & 255;

core/src/main/java/info/xiaomo/core/untils/DownUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import java.net.URLConnection;
1111

1212
/**
13-
* @author : xiaomo (https://xiaomo.info) (https://github.com/xiaomoinfo)
13+
* @author : xiaomo (https://xiaomo.info) (https://github.com/houko)
1414
* @created : 2016/12/26 13:25
1515
*/
1616
@Slf4j

core/src/main/java/info/xiaomo/core/untils/HtmlUtil.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
* 把今天最好的表现当作明天最新的起点..~
88
* いま 最高の表現 として 明日最新の始発..~
99
* Today the best performance as tomorrow newest starter!
10-
* Created by IntelliJ IDEA.
1110
* <p>
1211
*
1312
* @author : xiaomo

core/src/main/java/info/xiaomo/core/untils/LunarCalendarUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import java.util.GregorianCalendar;
66

77
/**
8-
* @author : xiaomo (https://xiaomo.info) (https://github.com/xiaomoinfo)
8+
* @author : xiaomo (https://xiaomo.info) (https://github.com/houko)
99
* @version : 2017/1/14 9:59
1010
*/
1111

core/src/main/java/info/xiaomo/core/untils/MailUtil.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
* 把今天最好的表现当作明天最新的起点..~
1313
* いま 最高の表現 として 明日最新の始発..~
1414
* Today the best performance as tomorrow newest starter!
15-
* Created by IntelliJ IDEA.
15+
1616
*
1717
* @author : xiaomo
18-
* github: https://github.com/xiaomoinfo
18+
* github: https://github.com/houko
1919
2020
* <p>
2121
* Date: 2016/4/511:00

core/src/main/java/info/xiaomo/core/untils/Md5Util.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
* |╭---╮把今天最好的表现当作明天最新的起点..~
1515
* いま 最高の表現 として 明日最新の始発..~
1616
* Today the best performance as tomorrow newest starter!
17-
* Created by IntelliJ IDEA.
17+
1818
*
1919
* @author : xiaomo
20-
* github: https://github.com/xiaomoinfo
20+
* github: https://github.com/houko
2121
2222
* <p>
2323
* Date: 16/4/3 10:03

core/src/main/java/info/xiaomo/core/untils/SerializeUtil.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package info.xiaomo.core.untils;
22

33
import java.io.*;
4+
import java.nio.charset.StandardCharsets;
45

56
/**
67
* │\__╭╭╭╭╭__/│
@@ -14,10 +15,10 @@
1415
* |╭---╮把今天最好的表现当作明天最新的起点..~
1516
* いま 最高の表現 として 明日最新の始発..~
1617
* Today the best performance as tomorrow newest starter!
17-
* Created by IntelliJ IDEA.
18+
1819
*
1920
* @author : xiaomo
20-
* github: https://github.com/xiaomoinfo
21+
* github: https://github.com/houko
2122
2223
* <p>
2324
* Date: 15/9/6 16:05
@@ -40,7 +41,7 @@ public static String serialize(Object object) {
4041
oos = new ObjectOutputStream(baos);
4142
oos.writeObject(object);
4243
byte[] bytes = baos.toByteArray();
43-
return new String(bytes, "utf-8");
44+
return new String(bytes, StandardCharsets.UTF_8);
4445
} catch (Exception e) {
4546
e.printStackTrace();
4647
}
@@ -51,7 +52,7 @@ public static String serialize(Object object) {
5152
* 反序列化
5253
*/
5354
public static Object unserialize(String s) throws UnsupportedEncodingException {
54-
byte[] bytes = s.getBytes("utf-8");
55+
byte[] bytes = s.getBytes(StandardCharsets.UTF_8);
5556
ByteArrayInputStream bais;
5657
try {
5758
//反序列化

core/src/main/java/info/xiaomo/core/untils/SqlUtil.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
* 把今天最好的表现当作明天最新的起点..~
1010
* いま 最高の表現 として 明日最新の始発..~
1111
* Today the best performance as tomorrow newest starter!
12-
* Created by IntelliJ IDEA.
1312
* <p>
1413
*
1514
* @author : xiaomo

crawler/src/main/java/info/xiaomo/crawler/CrawlerMain.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
* 把今天最好的表现当作明天最新的起点..~
1313
* いま 最高の表現 として 明日最新の始発..~
1414
* Today the best performance as tomorrow newest starter!
15-
* Created by IntelliJ IDEA.
15+
1616
* <p>
1717
*
1818
* @author : xiaomo
19-
* github: https://github.com/xiaomoinfo
19+
* github: https://github.com/houko
2020
2121
* <p>
2222
* Date: 2016/4/1 15:38

crawler/src/main/java/info/xiaomo/crawler/dao/ShikigamaDao.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.springframework.stereotype.Repository;
66

77
/**
8-
* @author : xiaomo (https://xiaomo.info) (https://github.com/xiaomoinfo)
8+
* @author : xiaomo (https://xiaomo.info) (https://github.com/houko)
99
* @created : 2016/12/24 15:55
1010
*/
1111
@Repository

crawler/src/main/java/info/xiaomo/crawler/model/MitamaModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import info.xiaomo.core.base.BaseModel;
55

66
/**
7-
* @author : xiaomo (https://xiaomo.info) (https://github.com/xiaomoinfo)
7+
* @author : xiaomo (https://xiaomo.info) (https://github.com/houko)
88
* @created : 2016/12/24 18:06
99
* 御魂模型
1010
*/

crawler/src/main/java/info/xiaomo/crawler/model/ShikigamiModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import javax.persistence.Table;
88

99
/**
10-
* @author : xiaomo (https://xiaomo.info) (https://github.com/xiaomoinfo)
10+
* @author : xiaomo (https://xiaomo.info) (https://github.com/houko)
1111
* @created : 2016/12/24 15:09
1212
*/
1313

crawler/src/main/java/info/xiaomo/crawler/schedule/ScheduledTasks.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import java.util.List;
1616

1717
/**
18-
* @author : xiaomo (https://xiaomo.info) (https://github.com/xiaomoinfo)
18+
* @author : xiaomo (https://xiaomo.info) (https://github.com/houko)
1919
* @created : 2016/12/24 15:59
2020
*/
2121
@Component

crawler/src/main/java/info/xiaomo/crawler/service/ShikigamaService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import java.util.List;
66

77
/**
8-
* @author : xiaomo (https://xiaomo.info) (https://github.com/xiaomoinfo)
8+
* @author : xiaomo (https://xiaomo.info) (https://github.com/houko)
99
* @created : 2016/12/24 15:54
1010
*/
1111
public interface ShikigamaService {

crawler/src/main/java/info/xiaomo/crawler/service/impl/ShikigamaServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import java.util.List;
1212

1313
/**
14-
* @author : xiaomo (https://xiaomo.info) (https://github.com/xiaomoinfo)
14+
* @author : xiaomo (https://xiaomo.info) (https://github.com/houko)
1515
* @created : 2016/12/24 15:54
1616
*/
1717
@Service

crawler/src/main/java/info/xiaomo/crawler/spider/OnnmyoujiSpider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import java.util.List;
1212

1313
/**
14-
* @author : xiaomo (https://xiaomo.info) (https://github.com/xiaomoinfo)
14+
* @author : xiaomo (https://xiaomo.info) (https://github.com/houko)
1515
* @created : 2016/12/24 15:05
1616
* 阴阳师获取数据
1717
*/

0 commit comments

Comments
 (0)