FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

合并website和api模块 · JavaCodeMood/SpringBootUnity@4dd981e · GitHub

/ SpringBootUnity Public
forked from houko/SpringBootUnity

Commit 4dd981e

Browse files
houko
committed
合并website和api模块
1 parent 9a30cd5 commit 4dd981e

12 files changed

Lines changed: 78 additions & 43 deletions

File tree

‎core/src/main/java/info/xiaomo/core/untils/FileUtil.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -838,9 +838,4 @@ public static boolean isImage(String imageName) {
838838
|| "png".equals(fileType) || "PNG".equals(fileType));
839839
}
840840

841-
public static void main(String args[]) throws Exception {
842-
System.out.println(TimeUtil.getDateNow(TimeUtil.DATE_FORMAT_STRING));
843-
System.out.println(getType("E:\\oscchina\\xiaomoBlogJava\\core\\src\\main\\java\\info\\xiaomo\\core\\constant\\GenderConst.java"));
844-
}
845-
846841
}

‎core/src/main/java/info/xiaomo/core/untils/StringUtil.java‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -799,7 +799,7 @@ public static String null2SZero(String str) {
799799
* @return
800800
*/
801801
public static String stringToUnicode(String text) {
802-
String result = "";
802+
StringBuffer result = new StringBuffer();
803803
int input;
804804
StringReader isr;
805805
try {
@@ -809,14 +809,14 @@ public static String stringToUnicode(String text) {
809809
}
810810
try {
811811
while ((input = isr.read()) != -1) {
812-
result = result + "&#x" + Integer.toHexString(input) + ";";
812+
result.append("&#x").append(input).append(";");
813813

814814
}
815815
} catch (IOException e) {
816816
return "-2";
817817
}
818818
isr.close();
819-
return result;
819+
return result.toString();
820820

821821
}
822822

@@ -828,23 +828,21 @@ public static String gb2utf(String inStr) {
828828
char temChr;
829829
int ascInt;
830830
int i;
831-
String result = "";
831+
StringBuilder stringBuffer = new StringBuilder();
832832
if (inStr == null) {
833833
inStr = "";
834834
}
835835
for (i = 0; i < inStr.length(); i++) {
836836
temChr = inStr.charAt(i);
837837
ascInt = temChr;
838-
//System.out.println("1=="+ascInt);
839-
//System.out.println("1=="+Integer.toBinaryString(ascInt));
840838
if (Integer.toHexString(ascInt).length() > 2) {
841-
result = result + "&#x" + Integer.toHexString(ascInt) + ";";
839+
stringBuffer.append("&#x").append(Integer.toHexString(ascInt)).append(";");
842840
} else {
843-
result = result + temChr;
841+
stringBuffer.append(temChr);
844842
}
845843

846844
}
847-
return result;
845+
return stringBuffer.toString();
848846
}
849847

850848
/**

‎core/src/main/java/info/xiaomo/core/untils/TimeUtil.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -502,8 +502,6 @@ public static String getDateFromNow(int afterDay, String pattern) {
502502
*/
503503
public static String getNowForFileName(int afterDay) {
504504
GregorianCalendar calendar = new GregorianCalendar();
505-
// Date DATE = calendar.getTime();
506-
507505
SimpleDateFormat df = new SimpleDateFormat("yyyyMMddHHmmss");
508506

509507
calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) + afterDay);

multipleSource/src/main/java/info/xiaomo/multipleSource/MultipleSourceMain.java renamed to multipleSource/src/main/java/info/xiaomo/multiplesource/MultipleSourceMain.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package info.xiaomo.multipleSource;
1+
package info.xiaomo.multiplesource;
22

33
import org.springframework.beans.factory.annotation.Qualifier;
44
import org.springframework.boot.SpringApplication;

multipleSource/src/main/java/info/xiaomo/multipleSource/controller/MultipleSourceController.java renamed to multipleSource/src/main/java/info/xiaomo/multiplesource/controller/MultipleSourceController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package info.xiaomo.multipleSource.controller;
1+
package info.xiaomo.multiplesource.controller;
22

33
import info.xiaomo.core.base.Result;
4-
import info.xiaomo.multipleSource.sql.Sql;
4+
import info.xiaomo.multiplesource.sql.Sql;
55
import org.springframework.beans.factory.annotation.Autowired;
66
import org.springframework.beans.factory.annotation.Qualifier;
77
import org.springframework.jdbc.core.JdbcTemplate;

multipleSource/src/main/java/info/xiaomo/multipleSource/domain/User.java renamed to multipleSource/src/main/java/info/xiaomo/multiplesource/domain/User.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package info.xiaomo.multipleSource.domain;
1+
package info.xiaomo.multiplesource.domain;
22

33

44
import lombok.Data;

multipleSource/src/main/java/info/xiaomo/multipleSource/sql/Sql.java renamed to multipleSource/src/main/java/info/xiaomo/multiplesource/sql/Sql.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package info.xiaomo.multipleSource.sql;
1+
package info.xiaomo.multiplesource.sql;
22

33
/**
44
* 把今天最好的表现当作明天最新的起点．．～

‎mybatis/src/main/java/info/xiaomo/mybatis/mapper/UserMapper.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,24 @@ public interface UserMapper {
2020

2121
/**
2222
* 根据名字查
23+
* @param name
24+
* @return user
2325
*/
2426
@Select("SELECT * FROM USER WHERE NAME = #{name}")
2527
User findByName(@Param("name") String name);
2628

29+
/**
30+
* 插入
31+
*
32+
* @param name
33+
* @param age
34+
* @return
35+
*/
2736
@Insert("INSERT INTO USER(NAME, AGE) VALUES(#{name}, #{age})")
2837
int insert(@Param("name") String name, @Param("age") Integer age);
2938

3039
/**
3140
* 查所有
32-
*
3341
* @return
3442
*/
3543
@Select("SELECT * FROM USER WHERE 1=1")

‎website/src/main/java/info/xiaomo/website/controller/LinkController.java‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -176,24 +176,6 @@ public Result findById(@PathVariable Long id) {
176176
return null;
177177
}
178178

179-
180-
// /**
181-
// * 返回所有 带分页
182-
// *
183-
// * @param start start
184-
// * @param pageSize pageSize
185-
// * @return 分页数据
186-
// */
187-
// @RequestMapping("findAll")
188-
// public Result findAll(@RequestParam(value = "start", defaultValue = "1") int start, @RequestParam(value = "pageSize", defaultValue = "10") int pageSize) {
189-
// Page<LinkModel> pages = service.findAll(start, pageSize);
190-
// if (pages == null || pages.getSize() <= 0) {
191-
// return new Result<>(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage());
192-
// }
193-
// return new Result<>(pages);
194-
// }
195-
196-
197179
/**
198180
* 添加链接
199181
*

‎website/src/main/java/info/xiaomo/website/dao/AdminUserDao.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,19 @@
2121
* @author : xiaomo
2222
* github: https://github.com/xiaomoinfo
2323
* email: xiaomo@xiaomo.info
24-
24+
* <p>
2525
* Date: 16/4/2 13:08
2626
* Copyright(©) 2015 by xiaomo.
2727
*/
2828
@Repository
2929
public interface AdminUserDao extends JpaRepository<AdminModel, Long> {
3030

31+
/**
32+
* 根据名字查用户
33+
*
34+
* @param s
35+
* @return
36+
*/
3137
AdminModel findAdminUserByUserName(String s);
3238

3339
}

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL