diff --git a/README.md b/README.md index b12a0e1..085554f 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,8 @@ 以此项目来进行骨架的生成 #### 软件架构 -软件架构说明 + +单体项目生成骨架,具备基本功能,如:后台管理界面,权限认证。 #### 安装教程 diff --git a/sparchetype/src/main/java/com/songpeng/common/utils/IdUtil.java b/sparchetype/src/main/java/com/songpeng/common/utils/IdUtil.java index 4c4c34d..813d91b 100644 --- a/sparchetype/src/main/java/com/songpeng/common/utils/IdUtil.java +++ b/sparchetype/src/main/java/com/songpeng/common/utils/IdUtil.java @@ -65,8 +65,8 @@ public final class IdUtil { private static long lastEpoch = 0; - public static long nextId() { - return nextId(System.currentTimeMillis() / 1000); + public static String nextId() { + return String.valueOf(nextId(System.currentTimeMillis() / 1000)); } private static synchronized long nextId(long epochSecond) { diff --git a/sparchetype/src/main/java/com/songpeng/system/controller/admin/SysUserController.java b/sparchetype/src/main/java/com/songpeng/system/controller/admin/SysUserController.java index 4ca640a..e88709b 100644 --- a/sparchetype/src/main/java/com/songpeng/system/controller/admin/SysUserController.java +++ b/sparchetype/src/main/java/com/songpeng/system/controller/admin/SysUserController.java @@ -10,7 +10,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import java.util.HashMap; import java.util.Map; @@ -49,4 +51,5 @@ public class SysUserController { sysUserService.add(sysUser, roles); return ApiResponse.ok(); } + } diff --git a/sparchetype/src/main/java/com/songpeng/system/domain/SysUser.java b/sparchetype/src/main/java/com/songpeng/system/domain/SysUser.java index 7a0fd46..901fc7b 100644 --- a/sparchetype/src/main/java/com/songpeng/system/domain/SysUser.java +++ b/sparchetype/src/main/java/com/songpeng/system/domain/SysUser.java @@ -18,7 +18,7 @@ public class SysUser implements Serializable { @Id @Column(name = "ID") - private Long id; + private String id; @Column(name = "NAME") private String name; @Column(name = "USERNAME") @@ -26,11 +26,11 @@ public class SysUser implements Serializable { @Column(name = "PASSWORD") private String password; - public Long getId() { + public String getId() { return id; } - public void setId(Long id) { + public void setId(String id) { this.id = id; } diff --git a/sparchetype/src/main/java/com/songpeng/system/service/SysUserService.java b/sparchetype/src/main/java/com/songpeng/system/service/SysUserService.java index fafa670..e793c11 100644 --- a/sparchetype/src/main/java/com/songpeng/system/service/SysUserService.java +++ b/sparchetype/src/main/java/com/songpeng/system/service/SysUserService.java @@ -9,6 +9,7 @@ import java.util.Map; /** * UserService + * * @author songpeng * @date 2019/4/20. */ @@ -16,6 +17,7 @@ public interface SysUserService { /** * 获取用户分页 + * * @param pageRequest * @return */ @@ -23,6 +25,7 @@ public interface SysUserService { /** * 获取用户信息(包含权限) + * * @param paramMap * @return */ diff --git a/sparchetype/src/main/java/com/songpeng/system/service/impl/SysUserServiceImpl.java b/sparchetype/src/main/java/com/songpeng/system/service/impl/SysUserServiceImpl.java index 21e5468..b77b13c 100644 --- a/sparchetype/src/main/java/com/songpeng/system/service/impl/SysUserServiceImpl.java +++ b/sparchetype/src/main/java/com/songpeng/system/service/impl/SysUserServiceImpl.java @@ -76,4 +76,5 @@ public class SysUserServiceImpl implements SysUserService, UserDetailsService { LOGGER.info("user insert id: {}", sysUser.getId()); sysUserMapper.insertSelective(sysUser); } + } diff --git a/sparchetype/src/main/resources/static/img/blog/home-bg-old.jpg b/sparchetype/src/main/resources/static/img/blog/home-bg-old.jpg new file mode 100644 index 0000000..a4d2108 Binary files /dev/null and b/sparchetype/src/main/resources/static/img/blog/home-bg-old.jpg differ diff --git a/sparchetype/src/main/resources/templates/admin/index.html b/sparchetype/src/main/resources/templates/admin/index.html index 753e9e2..ee07bec 100644 --- a/sparchetype/src/main/resources/templates/admin/index.html +++ b/sparchetype/src/main/resources/templates/admin/index.html @@ -1,5 +1,5 @@ - + diff --git a/sparchetype/src/main/resources/templates/admin/main.html b/sparchetype/src/main/resources/templates/admin/main.html index 453d80e..b770d11 100644 --- a/sparchetype/src/main/resources/templates/admin/main.html +++ b/sparchetype/src/main/resources/templates/admin/main.html @@ -1,5 +1,5 @@ - + diff --git a/sparchetype/src/main/resources/templates/client/blog/include.html b/sparchetype/src/main/resources/templates/client/blog/include.html index e0b24fb..aada81a 100644 --- a/sparchetype/src/main/resources/templates/client/blog/include.html +++ b/sparchetype/src/main/resources/templates/client/blog/include.html @@ -1,4 +1,3 @@ - diff --git a/sparchetype/src/main/resources/templates/client/blog/index.html b/sparchetype/src/main/resources/templates/client/blog/index.html index 8a4aae8..7358e14 100644 --- a/sparchetype/src/main/resources/templates/client/blog/index.html +++ b/sparchetype/src/main/resources/templates/client/blog/index.html @@ -1,18 +1,18 @@ - + - +
+ style="background-image: url('/img/blog/home-bg-old.jpg')">

SongPeng Blog

- 宋鹏的博客 + 博客
@@ -31,6 +31,7 @@
+
@@ -38,45 +39,46 @@ var limit = 10; var currentPage = 0; var total; - $(function(){ + $(function () { bindList(0); }); function nextPage() { bindList(currentPage * limit) } + function bindList(offset) { $.ajax({ - url : 'blog/open/list?type=article&limit=10&offset=' + offset, - method : 'get', - dataType : 'json', - success : function(data) { - var rows = data.rows; - total = data.total; - var htmlText = ""; - for (i = 0; i < rows.length; i++) { - htmlText += '
'; - htmlText += ''; - htmlText += '

'; - htmlText += rows[i].title; - htmlText += '

'; - htmlText += '
'; - htmlText += ''; - htmlText += '
'; - htmlText += '
'; - } - $("#incomeNum").append(htmlText); - document.getElementById("flagLoad").style.display = "block"; - currentPage++; - if (total <= currentPage * limit) { - document.getElementById("flagLoaded").style.display = "block"; - document.getElementById("flagLoad").style.display = "none"; - } + url: 'blog/open/list?type=article&limit=10&offset=' + offset, + method: 'get', + dataType: 'json', + success: function (data) { + var rows = data.rows; + total = data.total; + var htmlText = ""; + for (i = 0; i < rows.length; i++) { + htmlText += '
'; + htmlText += ''; + htmlText += '

'; + htmlText += rows[i].title; + htmlText += '

'; + htmlText += '
'; + htmlText += ''; + htmlText += '
'; + htmlText += '
'; } - }); + $("#incomeNum").append(htmlText); + document.getElementById("flagLoad").style.display = "block"; + currentPage++; + if (total <= currentPage * limit) { + document.getElementById("flagLoaded").style.display = "block"; + document.getElementById("flagLoad").style.display = "none"; + } + } + }); }