将 oss-web 名字更改为 oss-console, 包名也更改为 cn.reghao.oss.console

oss-web/bin/restart.sh → oss-console/bin/restart.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 app_dir=`pwd`
-app_name='oss-web.jar'
+app_name='oss-console.jar'
 
 pid=`ps aux | grep ${app_name} | grep -v 'grep' | tr -s ' '| cut -d ' ' -f 2`
 echo "process id: "${pid}

oss-web/bin/shutdown.sh → oss-console/bin/shutdown.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-app_name='oss-web.jar'
+app_name='oss-console.jar'
 
 pid=`ps aux | grep ${app_name} | grep -v 'grep' | tr -s ' '| cut -d ' ' -f 2`
 echo "process id: "${pid}

oss-web/bin/start.sh → oss-console/bin/start.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
 app_dir=`pwd`
-app_name='oss-web.jar'
+app_name='oss-console.jar'
 nohup java -jar ${app_dir}"/"${app_name} > console.log 2>&1 &

oss-web/pom.xml → oss-console/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>cn.reghao.oss</groupId>
-    <artifactId>oss-web</artifactId>
+    <artifactId>oss-console</artifactId>
     <version>1.0.0</version>
     <packaging>jar</packaging>
 
@@ -175,7 +175,7 @@
     </profiles>
 
     <build>
-        <finalName>oss-web</finalName>
+        <finalName>oss-console</finalName>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>

oss-web/src/main/java/cn/reghao/oss/web/OssConsoleApplication.java → oss-console/src/main/java/cn/reghao/oss/console/OssConsoleApplication.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.web;
+package cn.reghao.oss.console;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -7,7 +7,7 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 @SpringBootApplication
 @EnableJpaRepositories
-@EntityScan({"cn.reghao.oss.web"})
+@EntityScan({"cn.reghao.oss.console"})
 public class OssConsoleApplication {
 	public static void main(String[] args) {
 		SpringApplication.run(OssConsoleApplication.class, args);

oss-web/src/main/java/cn/reghao/oss/web/account/controller/AccountAuthController.java → oss-console/src/main/java/cn/reghao/oss/console/account/controller/AccountAuthController.java

@@ -1,14 +1,14 @@
-package cn.reghao.oss.web.account.controller;
+package cn.reghao.oss.console.account.controller;
 
 import cn.reghao.jutil.jdk.jvm.JVM;
 import cn.reghao.jutil.jdk.jvm.model.JvmInfo;
 import cn.reghao.jutil.jdk.machine.id.MachineIdLinux;
-import cn.reghao.oss.web.account.model.constant.RoleType;
-import cn.reghao.oss.web.account.model.po.Menu;
-import cn.reghao.oss.web.account.model.po.User;
-import cn.reghao.oss.web.account.service.HomeService;
-import cn.reghao.oss.web.account.service.UserContext;
-import cn.reghao.oss.web.sys.db.repository.SysMessageRepository;
+import cn.reghao.oss.console.account.model.constant.RoleType;
+import cn.reghao.oss.console.account.model.po.Menu;
+import cn.reghao.oss.console.account.model.po.User;
+import cn.reghao.oss.console.account.service.HomeService;
+import cn.reghao.oss.console.account.service.UserContext;
+import cn.reghao.oss.console.sys.db.repository.SysMessageRepository;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Controller;

oss-web/src/main/java/cn/reghao/oss/web/account/controller/AccountCodeController.java → oss-console/src/main/java/cn/reghao/oss/console/account/controller/AccountCodeController.java

@@ -1,8 +1,8 @@
-package cn.reghao.oss.web.account.controller;
+package cn.reghao.oss.console.account.controller;
 
-import cn.reghao.oss.web.account.model.dto.RsaPubkey;
-import cn.reghao.oss.web.account.service.CodeService;
-import cn.reghao.oss.web.account.service.PubkeyService;
+import cn.reghao.oss.console.account.model.dto.RsaPubkey;
+import cn.reghao.oss.console.account.service.CodeService;
+import cn.reghao.oss.console.account.service.PubkeyService;
 import cn.reghao.jutil.jdk.result.WebResult;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;

oss-web/src/main/java/cn/reghao/oss/web/account/controller/AccountProfileController.java → oss-console/src/main/java/cn/reghao/oss/console/account/controller/AccountProfileController.java

@@ -1,12 +1,12 @@
-package cn.reghao.oss.web.account.controller;
+package cn.reghao.oss.console.account.controller;
 
-import cn.reghao.oss.web.account.model.dto.UpdatePasswordDto;
-import cn.reghao.oss.web.account.model.dto.CreateAccountDto;
+import cn.reghao.oss.console.account.model.dto.UpdatePasswordDto;
+import cn.reghao.oss.console.account.model.dto.CreateAccountDto;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.jdk.result.WebResult;
-import cn.reghao.oss.web.account.model.dto.AccountProfile;
-import cn.reghao.oss.web.account.model.dto.AccountRole;
-import cn.reghao.oss.web.account.service.AccountService;
+import cn.reghao.oss.console.account.model.dto.AccountProfile;
+import cn.reghao.oss.console.account.model.dto.AccountRole;
+import cn.reghao.oss.console.account.service.AccountService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.MediaType;

oss-web/src/main/java/cn/reghao/oss/web/account/controller/FileController.java → oss-console/src/main/java/cn/reghao/oss/console/account/controller/FileController.java

@@ -1,6 +1,6 @@
-package cn.reghao.oss.web.account.controller;
+package cn.reghao.oss.console.account.controller;
 
-import cn.reghao.oss.web.account.service.FileService;
+import cn.reghao.oss.console.account.service.FileService;
 import cn.reghao.jutil.jdk.result.WebResult;
 import cn.reghao.jutil.web.ServletUtil;
 import org.springframework.http.MediaType;

oss-web/src/main/java/cn/reghao/oss/web/account/controller/MenuController.java → oss-console/src/main/java/cn/reghao/oss/console/account/controller/MenuController.java

@@ -1,10 +1,10 @@
-package cn.reghao.oss.web.account.controller;
+package cn.reghao.oss.console.account.controller;
 
 import cn.reghao.jutil.jdk.result.Result;
-import cn.reghao.oss.web.account.db.query.MenuQuery;
-import cn.reghao.oss.web.account.model.dto.MenuDTO;
-import cn.reghao.oss.web.account.model.po.Menu;
-import cn.reghao.oss.web.account.service.impl.MenuServiceImpl;
+import cn.reghao.oss.console.account.db.query.MenuQuery;
+import cn.reghao.oss.console.account.model.dto.MenuDTO;
+import cn.reghao.oss.console.account.model.po.Menu;
+import cn.reghao.oss.console.account.service.impl.MenuServiceImpl;
 import cn.reghao.jutil.jdk.result.WebResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

oss-web/src/main/java/cn/reghao/oss/web/account/controller/RoleController.java → oss-console/src/main/java/cn/reghao/oss/console/account/controller/RoleController.java

@@ -1,9 +1,9 @@
-package cn.reghao.oss.web.account.controller;
+package cn.reghao.oss.console.account.controller;
 
-import cn.reghao.oss.web.account.db.query.MenuQuery;
-import cn.reghao.oss.web.account.model.po.Menu;
-import cn.reghao.oss.web.account.model.po.Role;
-import cn.reghao.oss.web.account.service.RoleService;
+import cn.reghao.oss.console.account.db.query.MenuQuery;
+import cn.reghao.oss.console.account.model.po.Menu;
+import cn.reghao.oss.console.account.model.po.Role;
+import cn.reghao.oss.console.account.service.RoleService;
 import cn.reghao.jutil.jdk.result.WebResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

oss-web/src/main/java/cn/reghao/oss/web/account/controller/page/MenuPageController.java → oss-console/src/main/java/cn/reghao/oss/console/account/controller/page/MenuPageController.java

@@ -1,10 +1,10 @@
-package cn.reghao.oss.web.account.controller.page;
+package cn.reghao.oss.console.account.controller.page;
 
-import cn.reghao.oss.web.account.db.query.MenuQuery;
-import cn.reghao.oss.web.account.db.query.RoleQuery;
-import cn.reghao.oss.web.account.model.dto.MenuDTO;
-import cn.reghao.oss.web.account.model.po.Role;
-import cn.reghao.oss.web.account.model.po.Menu;
+import cn.reghao.oss.console.account.db.query.MenuQuery;
+import cn.reghao.oss.console.account.db.query.RoleQuery;
+import cn.reghao.oss.console.account.model.dto.MenuDTO;
+import cn.reghao.oss.console.account.model.po.Role;
+import cn.reghao.oss.console.account.model.po.Menu;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;

oss-web/src/main/java/cn/reghao/oss/web/account/controller/page/RolePageController.java → oss-console/src/main/java/cn/reghao/oss/console/account/controller/page/RolePageController.java

@@ -1,9 +1,9 @@
-package cn.reghao.oss.web.account.controller.page;
+package cn.reghao.oss.console.account.controller.page;
 
-import cn.reghao.oss.web.account.db.query.RoleQuery;
-import cn.reghao.oss.web.account.model.po.User;
-import cn.reghao.oss.web.account.model.vo.RoleVO;
-import cn.reghao.oss.web.util.db.PageSort;
+import cn.reghao.oss.console.account.db.query.RoleQuery;
+import cn.reghao.oss.console.account.model.po.User;
+import cn.reghao.oss.console.account.model.vo.RoleVO;
+import cn.reghao.oss.console.util.db.PageSort;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.data.domain.Page;

oss-web/src/main/java/cn/reghao/oss/web/account/controller/page/UserPageController.java → oss-console/src/main/java/cn/reghao/oss/console/account/controller/page/UserPageController.java

@@ -1,13 +1,13 @@
-package cn.reghao.oss.web.account.controller.page;
-
-import cn.reghao.oss.web.account.db.query.RoleQuery;
-import cn.reghao.oss.web.account.db.query.UserQuery;
-import cn.reghao.oss.web.account.model.po.Role;
-import cn.reghao.oss.web.account.model.po.User;
-import cn.reghao.oss.web.account.model.vo.UserVO;
-import cn.reghao.oss.web.account.service.AccountSessionService;
-import cn.reghao.oss.web.account.service.UserContext;
-import cn.reghao.oss.web.util.db.PageSort;
+package cn.reghao.oss.console.account.controller.page;
+
+import cn.reghao.oss.console.account.db.query.RoleQuery;
+import cn.reghao.oss.console.account.db.query.UserQuery;
+import cn.reghao.oss.console.account.model.po.Role;
+import cn.reghao.oss.console.account.model.po.User;
+import cn.reghao.oss.console.account.model.vo.UserVO;
+import cn.reghao.oss.console.account.service.AccountSessionService;
+import cn.reghao.oss.console.account.service.UserContext;
+import cn.reghao.oss.console.util.db.PageSort;
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

oss-web/src/main/java/cn/reghao/oss/web/account/db/query/MenuQuery.java → oss-console/src/main/java/cn/reghao/oss/console/account/db/query/MenuQuery.java

@@ -1,6 +1,6 @@
-package cn.reghao.oss.web.account.db.query;
+package cn.reghao.oss.console.account.db.query;
 
-import cn.reghao.oss.web.account.model.po.Menu;
+import cn.reghao.oss.console.account.model.po.Menu;
 import cn.reghao.jutil.jdk.db.BaseQuery;
 
 import java.util.*;

oss-web/src/main/java/cn/reghao/oss/web/account/db/query/MenuQueryImpl.java → oss-console/src/main/java/cn/reghao/oss/console/account/db/query/MenuQueryImpl.java

@@ -1,7 +1,7 @@
-package cn.reghao.oss.web.account.db.query;
+package cn.reghao.oss.console.account.db.query;
 
-import cn.reghao.oss.web.account.db.repository.MenuRepository;
-import cn.reghao.oss.web.account.model.po.Menu;
+import cn.reghao.oss.console.account.db.repository.MenuRepository;
+import cn.reghao.oss.console.account.model.po.Menu;
 import org.springframework.stereotype.Service;
 
 import java.util.*;

oss-web/src/main/java/cn/reghao/oss/web/account/db/query/RoleQuery.java → oss-console/src/main/java/cn/reghao/oss/console/account/db/query/RoleQuery.java

@@ -1,8 +1,8 @@
-package cn.reghao.oss.web.account.db.query;
+package cn.reghao.oss.console.account.db.query;
 
-import cn.reghao.oss.web.account.model.po.Role;
-import cn.reghao.oss.web.account.model.po.User;
-import cn.reghao.oss.web.account.model.vo.RoleVO;
+import cn.reghao.oss.console.account.model.po.Role;
+import cn.reghao.oss.console.account.model.po.User;
+import cn.reghao.oss.console.account.model.vo.RoleVO;
 import cn.reghao.jutil.jdk.db.BaseQuery;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;

oss-web/src/main/java/cn/reghao/oss/web/account/db/query/RoleQueryImpl.java → oss-console/src/main/java/cn/reghao/oss/console/account/db/query/RoleQueryImpl.java

@@ -1,10 +1,10 @@
-package cn.reghao.oss.web.account.db.query;
+package cn.reghao.oss.console.account.db.query;
 
-import cn.reghao.oss.web.account.db.repository.RoleRepository;
-import cn.reghao.oss.web.account.db.repository.UserRepository;
-import cn.reghao.oss.web.account.model.po.Role;
-import cn.reghao.oss.web.account.model.po.User;
-import cn.reghao.oss.web.account.model.vo.RoleVO;
+import cn.reghao.oss.console.account.db.repository.RoleRepository;
+import cn.reghao.oss.console.account.db.repository.UserRepository;
+import cn.reghao.oss.console.account.model.po.Role;
+import cn.reghao.oss.console.account.model.po.User;
+import cn.reghao.oss.console.account.model.vo.RoleVO;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.jpa.domain.Specification;

oss-web/src/main/java/cn/reghao/oss/web/account/db/query/UserQuery.java → oss-console/src/main/java/cn/reghao/oss/console/account/db/query/UserQuery.java

@@ -1,8 +1,8 @@
-package cn.reghao.oss.web.account.db.query;
+package cn.reghao.oss.console.account.db.query;
 
-import cn.reghao.oss.web.account.model.po.Role;
-import cn.reghao.oss.web.account.model.po.User;
-import cn.reghao.oss.web.account.model.vo.UserVO;
+import cn.reghao.oss.console.account.model.po.Role;
+import cn.reghao.oss.console.account.model.po.User;
+import cn.reghao.oss.console.account.model.vo.UserVO;
 import cn.reghao.jutil.jdk.db.BaseQuery;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;

oss-web/src/main/java/cn/reghao/oss/web/account/db/query/UserQueryImpl.java → oss-console/src/main/java/cn/reghao/oss/console/account/db/query/UserQueryImpl.java

@@ -1,11 +1,11 @@
-package cn.reghao.oss.web.account.db.query;
+package cn.reghao.oss.console.account.db.query;
 
-import cn.reghao.oss.web.account.db.repository.RoleRepository;
-import cn.reghao.oss.web.account.db.repository.UserRepository;
-import cn.reghao.oss.web.account.model.po.Role;
-import cn.reghao.oss.web.account.model.po.User;
-import cn.reghao.oss.web.account.model.po.UserAuthority;
-import cn.reghao.oss.web.account.model.vo.UserVO;
+import cn.reghao.oss.console.account.db.repository.RoleRepository;
+import cn.reghao.oss.console.account.db.repository.UserRepository;
+import cn.reghao.oss.console.account.model.po.Role;
+import cn.reghao.oss.console.account.model.po.User;
+import cn.reghao.oss.console.account.model.po.UserAuthority;
+import cn.reghao.oss.console.account.model.vo.UserVO;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.jpa.domain.Specification;

oss-web/src/main/java/cn/reghao/oss/web/account/db/repository/DiskFileRepository.java → oss-console/src/main/java/cn/reghao/oss/console/account/db/repository/DiskFileRepository.java

@@ -1,6 +1,6 @@
-package cn.reghao.oss.web.account.db.repository;
+package cn.reghao.oss.console.account.db.repository;
 
-import cn.reghao.oss.web.account.model.po.DiskFile;
+import cn.reghao.oss.console.account.model.po.DiskFile;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;

oss-web/src/main/java/cn/reghao/oss/web/account/db/repository/MenuRepository.java → oss-console/src/main/java/cn/reghao/oss/console/account/db/repository/MenuRepository.java

@@ -1,6 +1,6 @@
-package cn.reghao.oss.web.account.db.repository;
+package cn.reghao.oss.console.account.db.repository;
 
-import cn.reghao.oss.web.account.model.po.Menu;
+import cn.reghao.oss.console.account.model.po.Menu;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;

oss-web/src/main/java/cn/reghao/oss/web/account/db/repository/RoleRepository.java → oss-console/src/main/java/cn/reghao/oss/console/account/db/repository/RoleRepository.java

@@ -1,6 +1,6 @@
-package cn.reghao.oss.web.account.db.repository;
+package cn.reghao.oss.console.account.db.repository;
 
-import cn.reghao.oss.web.account.model.po.Role;
+import cn.reghao.oss.console.account.model.po.Role;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

oss-web/src/main/java/cn/reghao/oss/web/account/db/repository/UserRepository.java → oss-console/src/main/java/cn/reghao/oss/console/account/db/repository/UserRepository.java

@@ -1,6 +1,6 @@
-package cn.reghao.oss.web.account.db.repository;
+package cn.reghao.oss.console.account.db.repository;
 
-import cn.reghao.oss.web.account.model.po.User;
+import cn.reghao.oss.console.account.model.po.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

oss-web/src/main/java/cn/reghao/oss/web/account/model/constant/DataStatus.java → oss-console/src/main/java/cn/reghao/oss/console/account/model/constant/DataStatus.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.web.account.model.constant;
+package cn.reghao.oss.console.account.model.constant;
 
 /**
  * @author reghao

oss-web/src/main/java/cn/reghao/oss/web/account/model/constant/MenuType.java → oss-console/src/main/java/cn/reghao/oss/console/account/model/constant/MenuType.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.web.account.model.constant;
+package cn.reghao.oss.console.account.model.constant;
 
 /**
  * 菜单类型

oss-web/src/main/java/cn/reghao/oss/web/account/model/constant/RoleType.java → oss-console/src/main/java/cn/reghao/oss/console/account/model/constant/RoleType.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.web.account.model.constant;
+package cn.reghao.oss.console.account.model.constant;
 
 /**
  * 角色类型

oss-web/src/main/java/cn/reghao/oss/web/account/model/constant/UserGender.java → oss-console/src/main/java/cn/reghao/oss/console/account/model/constant/UserGender.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.web.account.model.constant;
+package cn.reghao.oss.console.account.model.constant;
 
 import java.util.HashMap;
 import java.util.Map;

oss-web/src/main/java/cn/reghao/oss/web/account/model/dto/AccountLoginDto.java → oss-console/src/main/java/cn/reghao/oss/console/account/model/dto/AccountLoginDto.java

@@ -1,6 +1,5 @@
-package cn.reghao.oss.web.account.model.dto;
+package cn.reghao.oss.console.account.model.dto;
 
-import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
 import org.hibernate.validator.constraints.Length;

oss-web/src/main/java/cn/reghao/oss/web/account/model/dto/AccountProfile.java → oss-console/src/main/java/cn/reghao/oss/console/account/model/dto/AccountProfile.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.web.account.model.dto;
+package cn.reghao.oss.console.account.model.dto;
 
 import lombok.Data;
 

oss-web/src/main/java/cn/reghao/oss/web/account/model/dto/AccountRole.java → oss-console/src/main/java/cn/reghao/oss/console/account/model/dto/AccountRole.java

@@ -1,6 +1,6 @@
-package cn.reghao.oss.web.account.model.dto;
+package cn.reghao.oss.console.account.model.dto;
 
-import cn.reghao.oss.web.account.model.po.Role;
+import cn.reghao.oss.console.account.model.po.Role;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;

oss-web/src/main/java/cn/reghao/oss/web/account/model/dto/CreateAccountDto.java → oss-console/src/main/java/cn/reghao/oss/console/account/model/dto/CreateAccountDto.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.web.account.model.dto;
+package cn.reghao.oss.console.account.model.dto;
 
 import lombok.Getter;
 import lombok.Setter;

oss-web/src/main/java/cn/reghao/oss/web/account/model/dto/MenuAddDTO.java → oss-console/src/main/java/cn/reghao/oss/console/account/model/dto/MenuAddDTO.java

@@ -1,6 +1,6 @@
-package cn.reghao.oss.web.account.model.dto;
+package cn.reghao.oss.console.account.model.dto;
 
-import cn.reghao.oss.web.account.model.po.Menu;
+import cn.reghao.oss.console.account.model.po.Menu;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 

oss-web/src/main/java/cn/reghao/oss/web/account/model/dto/MenuDTO.java → oss-console/src/main/java/cn/reghao/oss/console/account/model/dto/MenuDTO.java

@@ -1,7 +1,7 @@
-package cn.reghao.oss.web.account.model.dto;
+package cn.reghao.oss.console.account.model.dto;
 
-import cn.reghao.oss.web.account.model.po.Menu;
-import cn.reghao.oss.web.account.model.po.Role;
+import cn.reghao.oss.console.account.model.po.Menu;
+import cn.reghao.oss.console.account.model.po.Role;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import lombok.NoArgsConstructor;

oss-web/src/main/java/cn/reghao/oss/web/account/model/dto/MenuUpdateDTO.java → oss-console/src/main/java/cn/reghao/oss/console/account/model/dto/MenuUpdateDTO.java

@@ -1,6 +1,6 @@
-package cn.reghao.oss.web.account.model.dto;
+package cn.reghao.oss.console.account.model.dto;
 
-import cn.reghao.oss.web.account.model.po.Menu;
+import cn.reghao.oss.console.account.model.po.Menu;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 

oss-web/src/main/java/cn/reghao/oss/web/account/model/dto/RoleDTO.java → oss-console/src/main/java/cn/reghao/oss/console/account/model/dto/RoleDTO.java

@@ -1,6 +1,6 @@
-package cn.reghao.oss.web.account.model.dto;
+package cn.reghao.oss.console.account.model.dto;
 
-import cn.reghao.oss.web.account.model.po.Role;
+import cn.reghao.oss.console.account.model.po.Role;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.hibernate.validator.constraints.Length;

oss-web/src/main/java/cn/reghao/oss/web/account/model/dto/RsaPubkey.java → oss-console/src/main/java/cn/reghao/oss/console/account/model/dto/RsaPubkey.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.web.account.model.dto;
+package cn.reghao.oss.console.account.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

oss-web/src/main/java/cn/reghao/oss/web/account/model/dto/UpdatePasswordDto.java → oss-console/src/main/java/cn/reghao/oss/console/account/model/dto/UpdatePasswordDto.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.web.account.model.dto;
+package cn.reghao.oss.console.account.model.dto;
 
 import lombok.Getter;
 import lombok.Setter;

oss-web/src/main/java/cn/reghao/oss/web/account/model/dto/UserUpdateDTO.java → oss-console/src/main/java/cn/reghao/oss/console/account/model/dto/UserUpdateDTO.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.web.account.model.dto;
+package cn.reghao.oss.console.account.model.dto;
 
 import lombok.Data;
 

oss-web/src/main/java/cn/reghao/oss/web/account/model/po/DiskFile.java → oss-console/src/main/java/cn/reghao/oss/console/account/model/po/DiskFile.java

@@ -1,6 +1,6 @@
-package cn.reghao.oss.web.account.model.po;
+package cn.reghao.oss.console.account.model.po;
 
-import cn.reghao.oss.web.util.db.BaseEntity;
+import cn.reghao.oss.console.util.db.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

oss-web/src/main/java/cn/reghao/oss/web/account/model/po/Menu.java → oss-console/src/main/java/cn/reghao/oss/console/account/model/po/Menu.java

@@ -1,8 +1,7 @@
-package cn.reghao.oss.web.account.model.po;
+package cn.reghao.oss.console.account.model.po;
 
-import cn.reghao.oss.web.util.db.BaseEntity;
+import cn.reghao.oss.console.util.db.BaseEntity;
 import lombok.*;
-import org.hibernate.annotations.Proxy;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotBlank;

oss-web/src/main/java/cn/reghao/oss/web/account/model/po/Role.java → oss-console/src/main/java/cn/reghao/oss/console/account/model/po/Role.java

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

oss-web/src/main/java/cn/reghao/oss/web/account/model/po/User.java → oss-console/src/main/java/cn/reghao/oss/console/account/model/po/User.java

@@ -1,6 +1,6 @@
-package cn.reghao.oss.web.account.model.po;
+package cn.reghao.oss.console.account.model.po;
 
-import cn.reghao.oss.web.util.db.BaseEntity;
+import cn.reghao.oss.console.util.db.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.*;
 import org.hibernate.annotations.Proxy;

oss-web/src/main/java/cn/reghao/oss/web/account/model/po/UserAuthority.java → oss-console/src/main/java/cn/reghao/oss/console/account/model/po/UserAuthority.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.web.account.model.po;
+package cn.reghao.oss.console.account.model.po;
 
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.SpringSecurityCoreVersion;

oss-web/src/main/java/cn/reghao/oss/web/account/model/vo/MenuVO.java → oss-console/src/main/java/cn/reghao/oss/console/account/model/vo/MenuVO.java

@@ -1,6 +1,6 @@
-package cn.reghao.oss.web.account.model.vo;
+package cn.reghao.oss.console.account.model.vo;
 
-import cn.reghao.oss.web.account.model.po.Menu;
+import cn.reghao.oss.console.account.model.po.Menu;
 import lombok.Data;
 
 import java.io.Serializable;

oss-web/src/main/java/cn/reghao/oss/web/account/model/vo/RoleVO.java → oss-console/src/main/java/cn/reghao/oss/console/account/model/vo/RoleVO.java

@@ -1,6 +1,6 @@
-package cn.reghao.oss.web.account.model.vo;
+package cn.reghao.oss.console.account.model.vo;
 
-import cn.reghao.oss.web.account.model.po.Role;
+import cn.reghao.oss.console.account.model.po.Role;
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import lombok.Data;
 

oss-web/src/main/java/cn/reghao/oss/web/account/model/vo/UserVO.java → oss-console/src/main/java/cn/reghao/oss/console/account/model/vo/UserVO.java

@@ -1,7 +1,7 @@
-package cn.reghao.oss.web.account.model.vo;
+package cn.reghao.oss.console.account.model.vo;
 
-import cn.reghao.oss.web.account.model.constant.UserGender;
-import cn.reghao.oss.web.account.model.po.User;
+import cn.reghao.oss.console.account.model.constant.UserGender;
+import cn.reghao.oss.console.account.model.po.User;
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import lombok.Data;
 

oss-web/src/main/java/cn/reghao/oss/web/account/security/ExceptionAuthenticationEntryPoint.java → oss-console/src/main/java/cn/reghao/oss/console/account/security/ExceptionAuthenticationEntryPoint.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.web.account.security;
+package cn.reghao.oss.console.account.security;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.core.AuthenticationException;

oss-web/src/main/java/cn/reghao/oss/web/account/security/WebSecurityConfig.java → oss-console/src/main/java/cn/reghao/oss/console/account/security/WebSecurityConfig.java

@@ -1,9 +1,9 @@
-package cn.reghao.oss.web.account.security;
+package cn.reghao.oss.console.account.security;
 
-import cn.reghao.oss.web.account.security.filter.LoginRedirectFilter;
-import cn.reghao.oss.web.account.security.form.AccountAuthFilter;
-import cn.reghao.oss.web.account.security.form.AccountAuthProvider;
-import cn.reghao.oss.web.account.service.AccountAuthService;
+import cn.reghao.oss.console.account.security.filter.LoginRedirectFilter;
+import cn.reghao.oss.console.account.security.form.AccountAuthFilter;
+import cn.reghao.oss.console.account.security.form.AccountAuthProvider;
+import cn.reghao.oss.console.account.service.AccountAuthService;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.access.hierarchicalroles.RoleHierarchy;

oss-web/src/main/java/cn/reghao/oss/web/account/security/encoder/Md5PasswordEncoder.java → oss-console/src/main/java/cn/reghao/oss/console/account/security/encoder/Md5PasswordEncoder.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.web.account.security.encoder;
+package cn.reghao.oss.console.account.security.encoder;
 
 import cn.reghao.jutil.jdk.security.Md5Cryptor;
 import org.springframework.security.crypto.password.PasswordEncoder;

oss-web/src/main/java/cn/reghao/oss/web/account/security/exceptioin/AccountLoginException.java → oss-console/src/main/java/cn/reghao/oss/console/account/security/exceptioin/AccountLoginException.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.web.account.security.exceptioin;
+package cn.reghao.oss.console.account.security.exceptioin;
 
 import org.springframework.security.core.AuthenticationException;
 

oss-web/src/main/java/cn/reghao/oss/web/account/security/filter/LoginRedirectFilter.java → oss-console/src/main/java/cn/reghao/oss/console/account/security/filter/LoginRedirectFilter.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.web.account.security.filter;
+package cn.reghao.oss.console.account.security.filter;
 
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;

oss-web/src/main/java/cn/reghao/oss/web/account/security/form/AccountAuthFilter.java → oss-console/src/main/java/cn/reghao/oss/console/account/security/form/AccountAuthFilter.java

@@ -1,7 +1,7 @@
-package cn.reghao.oss.web.account.security.form;
+package cn.reghao.oss.console.account.security.form;
 
-import cn.reghao.oss.web.account.model.dto.AccountLoginDto;
-import cn.reghao.oss.web.account.service.AccountAuthService;
+import cn.reghao.oss.console.account.model.dto.AccountLoginDto;
+import cn.reghao.oss.console.account.service.AccountAuthService;
 import cn.reghao.jutil.web.ServletUtil;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;

oss-web/src/main/java/cn/reghao/oss/web/account/security/form/AccountAuthProvider.java → oss-console/src/main/java/cn/reghao/oss/console/account/security/form/AccountAuthProvider.java

@@ -1,6 +1,6 @@
-package cn.reghao.oss.web.account.security.form;
+package cn.reghao.oss.console.account.security.form;
 
-import cn.reghao.oss.web.account.service.AccountAuthService;
+import cn.reghao.oss.console.account.service.AccountAuthService;
 import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;

oss-web/src/main/java/cn/reghao/oss/web/account/security/form/AccountAuthToken.java → oss-console/src/main/java/cn/reghao/oss/console/account/security/form/AccountAuthToken.java

@@ -1,6 +1,6 @@
-package cn.reghao.oss.web.account.security.form;
+package cn.reghao.oss.console.account.security.form;
 
-import cn.reghao.oss.web.account.model.po.User;
+import cn.reghao.oss.console.account.model.po.User;
 import org.springframework.security.authentication.AbstractAuthenticationToken;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.SpringSecurityCoreVersion;

oss-web/src/main/java/cn/reghao/oss/web/account/security/handler/AuthFailHandlerImpl.java → oss-console/src/main/java/cn/reghao/oss/console/account/security/handler/AuthFailHandlerImpl.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.web.account.security.handler;
+package cn.reghao.oss.console.account.security.handler;
 
 import cn.reghao.jutil.jdk.result.WebResult;
 import org.springframework.security.core.AuthenticationException;

oss-web/src/main/java/cn/reghao/oss/web/account/security/handler/AuthSuccessHandlerImpl.java → oss-console/src/main/java/cn/reghao/oss/console/account/security/handler/AuthSuccessHandlerImpl.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.web.account.security.handler;
+package cn.reghao.oss.console.account.security.handler;
 
 import cn.reghao.jutil.jdk.result.WebResult;
 import cn.reghao.jutil.web.ServletUtil;

oss-web/src/main/java/cn/reghao/oss/web/account/security/handler/LogoutHandlerImpl.java → oss-console/src/main/java/cn/reghao/oss/console/account/security/handler/LogoutHandlerImpl.java

@@ -1,6 +1,6 @@
-package cn.reghao.oss.web.account.security.handler;
+package cn.reghao.oss.console.account.security.handler;
 
-import cn.reghao.oss.web.account.service.AccountAuthService;
+import cn.reghao.oss.console.account.service.AccountAuthService;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.authentication.logout.LogoutHandler;
 import org.springframework.stereotype.Component;

oss-web/src/main/java/cn/reghao/oss/web/account/security/handler/LogoutSuccessHandlerImpl.java → oss-console/src/main/java/cn/reghao/oss/console/account/security/handler/LogoutSuccessHandlerImpl.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.web.account.security.handler;
+package cn.reghao.oss.console.account.security.handler;
 
 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;

oss-web/src/main/java/cn/reghao/oss/web/account/security/session/SecuritySessionConfig.java → oss-console/src/main/java/cn/reghao/oss/console/account/security/session/SecuritySessionConfig.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.web.account.security.session;
+package cn.reghao.oss.console.account.security.session;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

oss-web/src/main/java/cn/reghao/oss/web/account/security/session/SessionExpiredStrategy.java → oss-console/src/main/java/cn/reghao/oss/console/account/security/session/SessionExpiredStrategy.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.web.account.security.session;
+package cn.reghao.oss.console.account.security.session;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.web.session.SessionInformationExpiredEvent;

oss-web/src/main/java/cn/reghao/oss/web/account/service/AccountAuthService.java → oss-console/src/main/java/cn/reghao/oss/console/account/service/AccountAuthService.java

@@ -1,7 +1,7 @@
-package cn.reghao.oss.web.account.service;
+package cn.reghao.oss.console.account.service;
 
-import cn.reghao.oss.web.account.model.dto.AccountLoginDto;
-import cn.reghao.oss.web.account.security.form.AccountAuthToken;
+import cn.reghao.oss.console.account.model.dto.AccountLoginDto;
+import cn.reghao.oss.console.account.security.form.AccountAuthToken;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.validation.annotation.Validated;

oss-web/src/main/java/cn/reghao/oss/web/account/service/AccountService.java → oss-console/src/main/java/cn/reghao/oss/console/account/service/AccountService.java

@@ -1,8 +1,8 @@
-package cn.reghao.oss.web.account.service;
+package cn.reghao.oss.console.account.service;
 
-import cn.reghao.oss.web.account.model.dto.CreateAccountDto;
-import cn.reghao.oss.web.account.model.dto.AccountProfile;
-import cn.reghao.oss.web.account.model.dto.AccountRole;
+import cn.reghao.oss.console.account.model.dto.CreateAccountDto;
+import cn.reghao.oss.console.account.model.dto.AccountProfile;
+import cn.reghao.oss.console.account.model.dto.AccountRole;
 import cn.reghao.jutil.jdk.result.Result;
 
 /**

oss-web/src/main/java/cn/reghao/oss/web/account/service/AccountSessionService.java → oss-console/src/main/java/cn/reghao/oss/console/account/service/AccountSessionService.java

@@ -1,7 +1,7 @@
-package cn.reghao.oss.web.account.service;
+package cn.reghao.oss.console.account.service;
 
-import cn.reghao.oss.web.account.db.repository.UserRepository;
-import cn.reghao.oss.web.account.model.po.User;
+import cn.reghao.oss.console.account.db.repository.UserRepository;
+import cn.reghao.oss.console.account.model.po.User;
 import org.springframework.security.core.session.SessionInformation;
 import org.springframework.security.core.session.SessionRegistry;
 import org.springframework.stereotype.Service;

oss-web/src/main/java/cn/reghao/oss/web/account/service/CodeService.java → oss-console/src/main/java/cn/reghao/oss/console/account/service/CodeService.java

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

oss-web/src/main/java/cn/reghao/oss/web/account/service/FileService.java → oss-console/src/main/java/cn/reghao/oss/console/account/service/FileService.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.web.account.service;
+package cn.reghao.oss.console.account.service;
 
 import org.springframework.web.multipart.MultipartFile;
 

oss-web/src/main/java/cn/reghao/oss/web/account/service/HomeService.java → oss-console/src/main/java/cn/reghao/oss/console/account/service/HomeService.java

@@ -1,8 +1,8 @@
-package cn.reghao.oss.web.account.service;
+package cn.reghao.oss.console.account.service;
 
-import cn.reghao.oss.web.account.db.query.RoleQuery;
-import cn.reghao.oss.web.account.model.po.Menu;
-import cn.reghao.oss.web.account.model.po.Role;
+import cn.reghao.oss.console.account.db.query.RoleQuery;
+import cn.reghao.oss.console.account.model.po.Menu;
+import cn.reghao.oss.console.account.model.po.Role;
 import org.springframework.stereotype.Service;
 
 import java.util.*;

oss-web/src/main/java/cn/reghao/oss/web/account/service/MenuService.java → oss-console/src/main/java/cn/reghao/oss/console/account/service/MenuService.java

@@ -1,8 +1,8 @@
-package cn.reghao.oss.web.account.service;
+package cn.reghao.oss.console.account.service;
 
 import cn.reghao.jutil.jdk.result.Result;
-import cn.reghao.oss.web.account.model.dto.MenuDTO;
-import cn.reghao.oss.web.account.model.po.Menu;
+import cn.reghao.oss.console.account.model.dto.MenuDTO;
+import cn.reghao.oss.console.account.model.po.Menu;
 
 /**
  * @author reghao

oss-web/src/main/java/cn/reghao/oss/web/account/service/PubkeyService.java → oss-console/src/main/java/cn/reghao/oss/console/account/service/PubkeyService.java

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

oss-web/src/main/java/cn/reghao/oss/web/account/service/RoleService.java → oss-console/src/main/java/cn/reghao/oss/console/account/service/RoleService.java

@@ -1,7 +1,7 @@
-package cn.reghao.oss.web.account.service;
+package cn.reghao.oss.console.account.service;
 
-import cn.reghao.oss.web.account.model.po.Menu;
-import cn.reghao.oss.web.account.model.po.Role;
+import cn.reghao.oss.console.account.model.po.Menu;
+import cn.reghao.oss.console.account.model.po.Role;
 
 import java.util.Set;
 

oss-web/src/main/java/cn/reghao/oss/web/account/service/UserContext.java → oss-console/src/main/java/cn/reghao/oss/console/account/service/UserContext.java

@@ -1,7 +1,7 @@
-package cn.reghao.oss.web.account.service;
+package cn.reghao.oss.console.account.service;
 
-import cn.reghao.oss.web.account.model.po.User;
-import cn.reghao.oss.web.account.security.form.AccountAuthToken;
+import cn.reghao.oss.console.account.model.po.User;
+import cn.reghao.oss.console.account.security.form.AccountAuthToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 

oss-web/src/main/java/cn/reghao/oss/web/account/service/impl/AccountAuthServiceImpl.java → oss-console/src/main/java/cn/reghao/oss/console/account/service/impl/AccountAuthServiceImpl.java

@@ -1,14 +1,14 @@
-package cn.reghao.oss.web.account.service.impl;
-
-import cn.reghao.oss.web.account.db.repository.UserRepository;
-import cn.reghao.oss.web.account.model.dto.AccountLoginDto;
-import cn.reghao.oss.web.account.model.po.User;
-import cn.reghao.oss.web.account.security.exceptioin.AccountLoginException;
-import cn.reghao.oss.web.account.security.form.AccountAuthToken;
-import cn.reghao.oss.web.account.service.AccountAuthService;
-import cn.reghao.oss.web.account.service.CodeService;
-import cn.reghao.oss.web.account.service.PubkeyService;
-import cn.reghao.oss.web.util.CacheKeys;
+package cn.reghao.oss.console.account.service.impl;
+
+import cn.reghao.oss.console.account.db.repository.UserRepository;
+import cn.reghao.oss.console.account.model.dto.AccountLoginDto;
+import cn.reghao.oss.console.account.model.po.User;
+import cn.reghao.oss.console.account.security.exceptioin.AccountLoginException;
+import cn.reghao.oss.console.account.security.form.AccountAuthToken;
+import cn.reghao.oss.console.account.service.AccountAuthService;
+import cn.reghao.oss.console.account.service.CodeService;
+import cn.reghao.oss.console.account.service.PubkeyService;
+import cn.reghao.oss.console.util.CacheKeys;
 import cn.reghao.jutil.web.ServletUtil;
 import com.github.benmanes.caffeine.cache.Cache;
 import org.springframework.security.core.Authentication;

oss-web/src/main/java/cn/reghao/oss/web/account/service/impl/AccountServiceImpl.java → oss-console/src/main/java/cn/reghao/oss/console/account/service/impl/AccountServiceImpl.java

@@ -1,17 +1,17 @@
-package cn.reghao.oss.web.account.service.impl;
-
-import cn.reghao.oss.web.account.db.repository.RoleRepository;
-import cn.reghao.oss.web.account.db.repository.UserRepository;
-import cn.reghao.oss.web.account.model.constant.RoleType;
-import cn.reghao.oss.web.account.model.dto.CreateAccountDto;
-import cn.reghao.oss.web.account.model.po.Role;
-import cn.reghao.oss.web.account.service.AccountService;
-import cn.reghao.oss.web.account.service.AccountSessionService;
+package cn.reghao.oss.console.account.service.impl;
+
+import cn.reghao.oss.console.account.db.repository.RoleRepository;
+import cn.reghao.oss.console.account.db.repository.UserRepository;
+import cn.reghao.oss.console.account.model.constant.RoleType;
+import cn.reghao.oss.console.account.model.dto.CreateAccountDto;
+import cn.reghao.oss.console.account.model.po.Role;
+import cn.reghao.oss.console.account.service.AccountService;
+import cn.reghao.oss.console.account.service.AccountSessionService;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.jdk.security.RandomString;
-import cn.reghao.oss.web.account.model.dto.AccountProfile;
-import cn.reghao.oss.web.account.model.dto.AccountRole;
-import cn.reghao.oss.web.account.model.po.User;
+import cn.reghao.oss.console.account.model.dto.AccountProfile;
+import cn.reghao.oss.console.account.model.dto.AccountRole;
+import cn.reghao.oss.console.account.model.po.User;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.security.crypto.password.PasswordEncoder;

oss-web/src/main/java/cn/reghao/oss/web/account/service/impl/FileServiceImpl.java → oss-console/src/main/java/cn/reghao/oss/console/account/service/impl/FileServiceImpl.java

@@ -1,8 +1,8 @@
-package cn.reghao.oss.web.account.service.impl;
+package cn.reghao.oss.console.account.service.impl;
 
-import cn.reghao.oss.web.account.db.repository.DiskFileRepository;
-import cn.reghao.oss.web.account.model.po.DiskFile;
-import cn.reghao.oss.web.account.service.FileService;
+import cn.reghao.oss.console.account.db.repository.DiskFileRepository;
+import cn.reghao.oss.console.account.model.po.DiskFile;
+import cn.reghao.oss.console.account.service.FileService;
 import cn.reghao.jutil.jdk.security.DigestUtil;
 import cn.reghao.jutil.web.ServletUtil;
 import org.apache.commons.io.FileUtils;

oss-web/src/main/java/cn/reghao/oss/web/account/service/impl/MenuServiceImpl.java → oss-console/src/main/java/cn/reghao/oss/console/account/service/impl/MenuServiceImpl.java

@@ -1,14 +1,14 @@
-package cn.reghao.oss.web.account.service.impl;
+package cn.reghao.oss.console.account.service.impl;
 
-import cn.reghao.oss.web.account.db.repository.MenuRepository;
-import cn.reghao.oss.web.account.db.repository.RoleRepository;
-import cn.reghao.oss.web.account.model.constant.MenuType;
-import cn.reghao.oss.web.account.service.MenuService;
+import cn.reghao.oss.console.account.db.repository.MenuRepository;
+import cn.reghao.oss.console.account.db.repository.RoleRepository;
+import cn.reghao.oss.console.account.model.constant.MenuType;
+import cn.reghao.oss.console.account.service.MenuService;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.jdk.result.ResultStatus;
-import cn.reghao.oss.web.account.model.dto.MenuDTO;
-import cn.reghao.oss.web.account.model.po.Menu;
-import cn.reghao.oss.web.account.model.po.Role;
+import cn.reghao.oss.console.account.model.dto.MenuDTO;
+import cn.reghao.oss.console.account.model.po.Menu;
+import cn.reghao.oss.console.account.model.po.Role;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

oss-web/src/main/java/cn/reghao/oss/web/account/service/impl/RoleServiceImpl.java → oss-console/src/main/java/cn/reghao/oss/console/account/service/impl/RoleServiceImpl.java

@@ -1,13 +1,13 @@
-package cn.reghao.oss.web.account.service.impl;
+package cn.reghao.oss.console.account.service.impl;
 
-import cn.reghao.oss.web.account.db.query.RoleQuery;
-import cn.reghao.oss.web.account.db.repository.MenuRepository;
-import cn.reghao.oss.web.account.db.repository.RoleRepository;
-import cn.reghao.oss.web.account.model.constant.RoleType;
-import cn.reghao.oss.web.account.model.po.Menu;
-import cn.reghao.oss.web.account.model.po.Role;
-import cn.reghao.oss.web.account.model.po.User;
-import cn.reghao.oss.web.account.service.RoleService;
+import cn.reghao.oss.console.account.db.query.RoleQuery;
+import cn.reghao.oss.console.account.db.repository.MenuRepository;
+import cn.reghao.oss.console.account.db.repository.RoleRepository;
+import cn.reghao.oss.console.account.model.constant.RoleType;
+import cn.reghao.oss.console.account.model.po.Menu;
+import cn.reghao.oss.console.account.model.po.Role;
+import cn.reghao.oss.console.account.model.po.User;
+import cn.reghao.oss.console.account.service.RoleService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

oss-web/src/main/java/cn/reghao/oss/web/app/controller/AudioFileController.java → oss-console/src/main/java/cn/reghao/oss/console/app/controller/AudioFileController.java

@@ -1,10 +1,9 @@
-package cn.reghao.oss.web.app.controller;
+package cn.reghao.oss.console.app.controller;
 
 import cn.reghao.jutil.jdk.result.WebResult;
 import cn.reghao.oss.api.dto.media.AudioInfo;
 import cn.reghao.oss.api.dto.media.AudioUrl;
-import cn.reghao.oss.api.dto.media.ImageUrlDto;
-import cn.reghao.oss.web.app.service.media.AudioService;
+import cn.reghao.oss.console.app.service.media.AudioService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.MediaType;

oss-web/src/main/java/cn/reghao/oss/web/app/controller/ImageFileController.java → oss-console/src/main/java/cn/reghao/oss/console/app/controller/ImageFileController.java

@@ -1,8 +1,8 @@
-package cn.reghao.oss.web.app.controller;
+package cn.reghao.oss.console.app.controller;
 
 import cn.reghao.jutil.jdk.result.WebResult;
 import cn.reghao.oss.api.dto.media.ImageUrlDto;
-import cn.reghao.oss.web.app.service.media.ImageService;
+import cn.reghao.oss.console.app.service.media.ImageService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.MediaType;

oss-web/src/main/java/cn/reghao/oss/web/app/controller/MediaController.java → oss-console/src/main/java/cn/reghao/oss/console/app/controller/MediaController.java

@@ -1,7 +1,7 @@
-package cn.reghao.oss.web.app.controller;
+package cn.reghao.oss.console.app.controller;
 
 import cn.reghao.jutil.jdk.result.WebResult;
-import cn.reghao.oss.web.app.service.media.MediaService;
+import cn.reghao.oss.console.app.service.media.MediaService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.MediaType;

oss-web/src/main/java/cn/reghao/oss/web/app/controller/OssController.java → oss-console/src/main/java/cn/reghao/oss/console/app/controller/OssController.java

@@ -1,11 +1,11 @@
-package cn.reghao.oss.web.app.controller;
+package cn.reghao.oss.console.app.controller;
 
 import cn.reghao.jutil.jdk.result.WebResult;
 import cn.reghao.oss.api.dto.DownloadUrl;
 import cn.reghao.oss.api.dto.ObjectChannel;
 import cn.reghao.oss.api.dto.ObjectInfo;
 import cn.reghao.oss.api.dto.ServerInfo;
-import cn.reghao.oss.web.app.service.OssService;
+import cn.reghao.oss.console.app.service.OssService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.MediaType;

oss-web/src/main/java/cn/reghao/oss/web/app/controller/VideoFileController.java → oss-console/src/main/java/cn/reghao/oss/console/app/controller/VideoFileController.java

@@ -1,9 +1,9 @@
-package cn.reghao.oss.web.app.controller;
+package cn.reghao.oss.console.app.controller;
 
 import cn.reghao.jutil.jdk.result.WebResult;
 import cn.reghao.oss.api.dto.media.VideoInfo;
 import cn.reghao.oss.api.dto.media.VideoUrlDto;
-import cn.reghao.oss.web.app.service.media.VideoService;
+import cn.reghao.oss.console.app.service.media.VideoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.MediaType;

oss-web/src/main/java/cn/reghao/oss/web/app/controller/page/KeyAuthController.java → oss-console/src/main/java/cn/reghao/oss/console/app/controller/page/KeyAuthController.java

@@ -1,9 +1,9 @@
-package cn.reghao.oss.web.app.controller.page;
+package cn.reghao.oss.console.app.controller.page;
 
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.jdk.result.WebResult;
-import cn.reghao.oss.web.app.model.dto.KeyAuthDto;
-import cn.reghao.oss.web.app.service.UserKeyService;
+import cn.reghao.oss.console.app.model.dto.KeyAuthDto;
+import cn.reghao.oss.console.app.service.UserKeyService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.MediaType;

oss-web/src/main/java/cn/reghao/oss/web/app/controller/page/StoreChannelController.java → oss-console/src/main/java/cn/reghao/oss/console/app/controller/page/StoreChannelController.java

@@ -1,9 +1,9 @@
-package cn.reghao.oss.web.app.controller.page;
+package cn.reghao.oss.console.app.controller.page;
 
 import cn.reghao.jutil.jdk.result.WebResult;
-import cn.reghao.oss.web.app.model.dto.ChannelScopeDto;
-import cn.reghao.oss.web.app.model.dto.UploadChannelDto;
-import cn.reghao.oss.web.app.service.UploadChannelService;
+import cn.reghao.oss.console.app.model.dto.ChannelScopeDto;
+import cn.reghao.oss.console.app.model.dto.UploadChannelDto;
+import cn.reghao.oss.console.app.service.UploadChannelService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

oss-web/src/main/java/cn/reghao/oss/web/app/controller/page/StoreChannelPageController.java → oss-console/src/main/java/cn/reghao/oss/console/app/controller/page/StoreChannelPageController.java

@@ -1,17 +1,14 @@
-package cn.reghao.oss.web.app.controller.page;
+package cn.reghao.oss.console.app.controller.page;
 
-import cn.reghao.jutil.jdk.converter.ByteConverter;
-import cn.reghao.jutil.jdk.converter.ByteType;
 import cn.reghao.oss.api.constant.ObjectScope;
 import cn.reghao.oss.api.constant.ObjectType;
-import cn.reghao.oss.web.app.db.repository.UploadChannelRepository;
-import cn.reghao.oss.web.app.model.po.UploadChannel;
-import cn.reghao.oss.web.app.model.vo.KeyValue;
-import cn.reghao.oss.web.app.model.vo.UploadChannelVo;
-import cn.reghao.oss.web.app.service.UploadChannelService;
-import cn.reghao.oss.web.app.service.UserNodeService;
-import cn.reghao.oss.web.util.DefaultSetting;
-import cn.reghao.oss.web.util.db.PageSort;
+import cn.reghao.oss.console.app.model.po.UploadChannel;
+import cn.reghao.oss.console.app.model.vo.KeyValue;
+import cn.reghao.oss.console.app.model.vo.UploadChannelVo;
+import cn.reghao.oss.console.app.service.UploadChannelService;
+import cn.reghao.oss.console.app.service.UserNodeService;
+import cn.reghao.oss.console.util.DefaultSetting;
+import cn.reghao.oss.console.util.db.PageSort;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

oss-web/src/main/java/cn/reghao/oss/web/app/controller/page/StoreNodeController.java → oss-console/src/main/java/cn/reghao/oss/console/app/controller/page/StoreNodeController.java

@@ -1,10 +1,10 @@
-package cn.reghao.oss.web.app.controller.page;
+package cn.reghao.oss.console.app.controller.page;
 
 import cn.reghao.jutil.jdk.result.Result;
-import cn.reghao.oss.web.app.model.dto.StoreNodeUpdateDto;
+import cn.reghao.oss.console.app.model.dto.StoreNodeUpdateDto;
 import cn.reghao.jutil.jdk.result.WebResult;
-import cn.reghao.oss.web.app.model.po.StoreNode;
-import cn.reghao.oss.web.app.service.StoreNodeService;
+import cn.reghao.oss.console.app.model.po.StoreNode;
+import cn.reghao.oss.console.app.service.StoreNodeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

oss-web/src/main/java/cn/reghao/oss/web/app/controller/page/StoreNodePageController.java → oss-console/src/main/java/cn/reghao/oss/console/app/controller/page/StoreNodePageController.java

@@ -1,9 +1,9 @@
-package cn.reghao.oss.web.app.controller.page;
+package cn.reghao.oss.console.app.controller.page;
 
-import cn.reghao.oss.web.app.db.repository.StoreNodeRepository;
-import cn.reghao.oss.web.app.model.po.StoreNode;
-import cn.reghao.oss.web.util.DefaultSetting;
-import cn.reghao.oss.web.util.db.PageSort;
+import cn.reghao.oss.console.app.db.repository.StoreNodeRepository;
+import cn.reghao.oss.console.app.model.po.StoreNode;
+import cn.reghao.oss.console.util.DefaultSetting;
+import cn.reghao.oss.console.util.db.PageSort;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.data.domain.Page;

oss-web/src/main/java/cn/reghao/oss/web/app/controller/page/StoreObjectPageController.java → oss-console/src/main/java/cn/reghao/oss/console/app/controller/page/StoreObjectPageController.java

@@ -1,10 +1,10 @@
-package cn.reghao.oss.web.app.controller.page;
+package cn.reghao.oss.console.app.controller.page;
 
-import cn.reghao.oss.web.app.db.repository.UploadChannelRepository;
-import cn.reghao.oss.web.app.model.po.UploadChannel;
-import cn.reghao.oss.web.app.service.StoreNodeService;
-import cn.reghao.oss.web.util.DefaultSetting;
-import cn.reghao.oss.web.util.db.PageSort;
+import cn.reghao.oss.console.app.db.repository.UploadChannelRepository;
+import cn.reghao.oss.console.app.model.po.UploadChannel;
+import cn.reghao.oss.console.app.service.StoreNodeService;
+import cn.reghao.oss.console.util.DefaultSetting;
+import cn.reghao.oss.console.util.db.PageSort;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.data.domain.Page;

oss-web/src/main/java/cn/reghao/oss/web/app/controller/page/UserKeyController.java → oss-console/src/main/java/cn/reghao/oss/console/app/controller/page/UserKeyController.java

@@ -1,9 +1,9 @@
-package cn.reghao.oss.web.app.controller.page;
+package cn.reghao.oss.console.app.controller.page;
 
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.jdk.result.WebResult;
-import cn.reghao.oss.web.app.model.dto.UserKeyDto;
-import cn.reghao.oss.web.app.service.UserKeyService;
+import cn.reghao.oss.console.app.model.dto.UserKeyDto;
+import cn.reghao.oss.console.app.service.UserKeyService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.MediaType;

oss-web/src/main/java/cn/reghao/oss/web/app/controller/page/UserKeyPageController.java → oss-console/src/main/java/cn/reghao/oss/console/app/controller/page/UserKeyPageController.java

@@ -1,9 +1,9 @@
-package cn.reghao.oss.web.app.controller.page;
+package cn.reghao.oss.console.app.controller.page;
 
-import cn.reghao.oss.web.app.model.po.UserKey;
-import cn.reghao.oss.web.app.model.vo.KeyValue;
-import cn.reghao.oss.web.app.service.StoreNodeService;
-import cn.reghao.oss.web.app.service.UserKeyService;
+import cn.reghao.oss.console.app.model.po.UserKey;
+import cn.reghao.oss.console.app.model.vo.KeyValue;
+import cn.reghao.oss.console.app.service.StoreNodeService;
+import cn.reghao.oss.console.app.service.UserKeyService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;

oss-web/src/main/java/cn/reghao/oss/web/app/controller/page/UserStoreNodeController.java → oss-console/src/main/java/cn/reghao/oss/console/app/controller/page/UserStoreNodeController.java

@@ -1,10 +1,9 @@
-package cn.reghao.oss.web.app.controller.page;
+package cn.reghao.oss.console.app.controller.page;
 
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.jdk.result.WebResult;
-import cn.reghao.oss.web.app.model.dto.UserNodeDto;
-import cn.reghao.oss.web.app.model.po.StoreNode;
-import cn.reghao.oss.web.app.service.UserNodeService;
+import cn.reghao.oss.console.app.model.dto.UserNodeDto;
+import cn.reghao.oss.console.app.service.UserNodeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.MediaType;

oss-web/src/main/java/cn/reghao/oss/web/app/controller/page/UserStoreNodePageController.java → oss-console/src/main/java/cn/reghao/oss/console/app/controller/page/UserStoreNodePageController.java

@@ -1,9 +1,9 @@
-package cn.reghao.oss.web.app.controller.page;
+package cn.reghao.oss.console.app.controller.page;
 
-import cn.reghao.oss.web.app.model.po.StoreNode;
-import cn.reghao.oss.web.app.model.vo.KeyValue;
-import cn.reghao.oss.web.app.service.StoreNodeService;
-import cn.reghao.oss.web.app.service.UserNodeService;
+import cn.reghao.oss.console.app.model.po.StoreNode;
+import cn.reghao.oss.console.app.model.vo.KeyValue;
+import cn.reghao.oss.console.app.service.StoreNodeService;
+import cn.reghao.oss.console.app.service.UserNodeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;

oss-web/src/main/java/cn/reghao/oss/web/app/db/repository/StoreNodeRepository.java → oss-console/src/main/java/cn/reghao/oss/console/app/db/repository/StoreNodeRepository.java

@@ -1,6 +1,6 @@
-package cn.reghao.oss.web.app.db.repository;
+package cn.reghao.oss.console.app.db.repository;
 
-import cn.reghao.oss.web.app.model.po.StoreNode;
+import cn.reghao.oss.console.app.model.po.StoreNode;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;

oss-web/src/main/java/cn/reghao/oss/web/app/db/repository/UploadChannelRepository.java → oss-console/src/main/java/cn/reghao/oss/console/app/db/repository/UploadChannelRepository.java

@@ -1,8 +1,7 @@
-package cn.reghao.oss.web.app.db.repository;
+package cn.reghao.oss.console.app.db.repository;
 
-import cn.reghao.oss.web.app.model.po.UploadChannel;
+import cn.reghao.oss.console.app.model.po.UploadChannel;
 import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 

oss-web/src/main/java/cn/reghao/oss/web/app/db/repository/UserKeyRepository.java → oss-console/src/main/java/cn/reghao/oss/console/app/db/repository/UserKeyRepository.java

@@ -1,6 +1,6 @@
-package cn.reghao.oss.web.app.db.repository;
+package cn.reghao.oss.console.app.db.repository;
 
-import cn.reghao.oss.web.app.model.po.UserKey;
+import cn.reghao.oss.console.app.model.po.UserKey;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;

oss-web/src/main/java/cn/reghao/oss/web/app/db/repository/UserNodeRepository.java → oss-console/src/main/java/cn/reghao/oss/console/app/db/repository/UserNodeRepository.java

@@ -1,6 +1,6 @@
-package cn.reghao.oss.web.app.db.repository;
+package cn.reghao.oss.console.app.db.repository;
 
-import cn.reghao.oss.web.app.model.po.UserNode;
+import cn.reghao.oss.console.app.model.po.UserNode;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 /**

oss-web/src/main/java/cn/reghao/oss/web/app/model/constant/AppType.java → oss-console/src/main/java/cn/reghao/oss/console/app/model/constant/AppType.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.web.app.model.constant;
+package cn.reghao.oss.console.app.model.constant;
 
 /**
  * 应用类型列表

oss-web/src/main/java/cn/reghao/oss/web/app/model/constant/BuildStatus.java → oss-console/src/main/java/cn/reghao/oss/console/app/model/constant/BuildStatus.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.web.app.model.constant;
+package cn.reghao.oss.console.app.model.constant;
 
 /**
  * 构建状态

oss-web/src/main/java/cn/reghao/oss/web/app/model/constant/DeployStatus.java → oss-console/src/main/java/cn/reghao/oss/console/app/model/constant/DeployStatus.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.web.app.model.constant;
+package cn.reghao.oss.console.app.model.constant;
 
 /**
  * 部署状态

oss-web/src/main/java/cn/reghao/oss/web/app/model/constant/build/CompileType.java → oss-console/src/main/java/cn/reghao/oss/console/app/model/constant/build/CompileType.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.web.app.model.constant.build;
+package cn.reghao.oss.console.app.model.constant.build;
 
 /**
  * 编译方式类型

oss-web/src/main/java/cn/reghao/oss/web/app/model/constant/build/RepoAuthType.java → oss-console/src/main/java/cn/reghao/oss/console/app/model/constant/build/RepoAuthType.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.web.app.model.constant.build;
+package cn.reghao.oss.console.app.model.constant.build;
 
 /**
  * @author reghao