调整依赖, 将 web.account 模块作为一个独立的模块, 它不依赖其他模块, 其他模块可以依赖它

web/src/main/java/cn/reghao/devops/web/account/controller/MenuController.java

@@ -87,6 +87,6 @@ public class MenuController {
         if (menu != null) {
             map.remove(menu.getPos());
         }*/
-        return WebResult.failWithMsg("not implement");
+        return WebResult.failWithMsg("接口未实现");
     }
 }

web/src/main/java/cn/reghao/devops/web/account/controller/page/RolePageController.java

@@ -3,7 +3,6 @@ package cn.reghao.devops.web.account.controller.page;
 import cn.reghao.devops.web.account.model.po.User;
 import cn.reghao.devops.web.account.model.vo.RoleVO;
 import cn.reghao.devops.web.account.service.RoleService;
-import cn.reghao.devops.web.util.db.PageSort;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.data.domain.Page;
@@ -37,7 +36,7 @@ public class RolePageController {
         if (name != null) {
             page = roleService.getByPage(null, name);
         } else {
-            PageRequest pageRequest = PageSort.pageRequest();
+            PageRequest pageRequest = PageRequest.of(0, 100);
             page = roleService.getByPage(pageRequest, null);
         }
 

web/src/main/java/cn/reghao/devops/web/account/controller/page/UserPageController.java

@@ -7,7 +7,6 @@ import cn.reghao.devops.web.account.service.AccountService;
 import cn.reghao.devops.web.account.service.AccountSessionService;
 import cn.reghao.devops.web.account.service.RoleService;
 import cn.reghao.devops.web.account.service.UserContext;
-import cn.reghao.devops.web.util.db.PageSort;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.data.domain.Page;
@@ -62,7 +61,7 @@ public class UserPageController {
             List<UserVO> list = accountService.getByMatchScreenName(screenName);
             page = new PageImpl<>(list);
         } else {
-            PageRequest pageRequest = PageSort.pageRequest();
+            PageRequest pageRequest = PageRequest.of(0, 100);
             page = accountService.getUserVOByPage(pageRequest);
         }
 

web/src/main/java/cn/reghao/devops/web/account/model/po/Menu.java

@@ -1,6 +1,6 @@
 package cn.reghao.devops.web.account.model.po;
 
-import cn.reghao.devops.web.util.db.BaseEntity;
+import cn.reghao.devops.web.account.util.BaseEntity;
 import lombok.*;
 
 import javax.persistence.*;

web/src/main/java/cn/reghao/devops/web/account/model/po/Role.java

@@ -1,6 +1,6 @@
 package cn.reghao.devops.web.account.model.po;
 
-import cn.reghao.devops.web.util.db.BaseEntity;
+import cn.reghao.devops.web.account.util.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

web/src/main/java/cn/reghao/devops/web/account/model/po/User.java

@@ -1,6 +1,6 @@
 package cn.reghao.devops.web.account.model.po;
 
-import cn.reghao.devops.web.util.db.BaseEntity;
+import cn.reghao.devops.web.account.util.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.*;
 import org.springframework.security.core.GrantedAuthority;

web/src/main/java/cn/reghao/devops/web/account/service/CodeService.java

@@ -1,7 +1,7 @@
 package cn.reghao.devops.web.account.service;
 
-import cn.reghao.devops.web.util.CaptchaUtil;
-import cn.reghao.devops.web.util.CacheKeys;
+import cn.reghao.devops.web.account.util.CaptchaUtil;
+import cn.reghao.devops.web.account.util.CacheKeys;
 import cn.reghao.jutil.jdk.security.RandomString;
 import com.github.benmanes.caffeine.cache.Cache;
 import lombok.extern.slf4j.Slf4j;

web/src/main/java/cn/reghao/devops/web/account/service/PubkeyService.java

@@ -1,7 +1,7 @@
 package cn.reghao.devops.web.account.service;
 
 import cn.reghao.devops.web.account.model.dto.RsaPubkey;
-import cn.reghao.devops.web.util.CacheKeys;
+import cn.reghao.devops.web.account.util.CacheKeys;
 import cn.reghao.jutil.jdk.security.RandomString;
 import cn.reghao.jutil.jdk.security.RsaCryptor;
 import com.github.benmanes.caffeine.cache.Cache;

web/src/main/java/cn/reghao/devops/web/account/service/impl/AccountAuthServiceImpl.java

@@ -8,7 +8,7 @@ import cn.reghao.devops.web.account.model.po.User;
 import cn.reghao.devops.web.account.service.AccountAuthService;
 import cn.reghao.devops.web.account.service.CodeService;
 import cn.reghao.devops.web.account.service.PubkeyService;
-import cn.reghao.devops.web.util.CacheKeys;
+import cn.reghao.devops.web.account.util.CacheKeys;
 import cn.reghao.jutil.web.ServletUtil;
 import com.github.benmanes.caffeine.cache.Cache;
 import org.springframework.security.core.Authentication;

web/src/main/java/cn/reghao/devops/web/account/util/BaseEntity.java

@@ -0,0 +1,56 @@
+package cn.reghao.devops.web.account.util;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.annotations.CreationTimestamp;
+import org.hibernate.annotations.UpdateTimestamp;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * @author reghao
+ * @date 2019-10-18 14:42:48
+ */
+@MappedSuperclass
+@Getter
+@Setter
+public class BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @Id
+    // 采用 id 字段自增方式
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    // 使用额外的 seq 表
+    //@SequenceGenerator(name = "seqGen", sequenceName = "seq")
+    protected Integer id;
+    // 逻辑删除
+    @Column(nullable = false)
+    private Boolean deleted;
+    @CreationTimestamp
+    @Column(nullable = false, updatable = false)
+    protected LocalDateTime createTime;
+    @UpdateTimestamp
+    @Column(nullable = false)
+    protected LocalDateTime updateTime;
+
+    public BaseEntity() {
+        this.deleted = false;
+        this.createTime = LocalDateTime.now();
+        this.updateTime = LocalDateTime.now();
+    }
+
+    public void setNull() {
+        //this.setId(null);
+        this.setDeleted(null);
+        this.setCreateTime(null);
+        this.setUpdateTime(null);
+    }
+
+    public void setEntity(BaseEntity entity) {
+        this.id = entity.getId();
+        this.deleted = entity.getDeleted();
+        this.createTime = entity.getCreateTime();
+        this.updateTime = LocalDateTime.now();
+    }
+}

web/src/main/java/cn/reghao/devops/web/util/CacheKeys.java → web/src/main/java/cn/reghao/devops/web/account/util/CacheKeys.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.web.util;
+package cn.reghao.devops.web.account.util;
 
 import cn.reghao.jutil.web.ServletUtil;
 

web/src/main/java/cn/reghao/devops/web/util/CaptchaUtil.java → web/src/main/java/cn/reghao/devops/web/account/util/CaptchaUtil.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.web.util;
+package cn.reghao.devops.web.account.util;
 
 import javax.imageio.ImageIO;
 import java.awt.*;