From 53147cf1d95bce843a0148784d18caff46ba5937 Mon Sep 17 00:00:00 2001
From: yuehanhan <2408148542@qq.com>
Date: Wed, 11 Dec 2024 21:47:35 +0800
Subject: [PATCH] =?UTF-8?q?system=E6=8B=86=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 26 +++++
 .../shopgoods-file-common/pom.xml             |  6 ++
 .../shopgoods-file-remote/pom.xml             |  6 ++
 .../shopgoods-file-server/pom.xml             |  4 +
 shopgoods-modules/shopgoods-system/pom.xml    | 77 +--------------
 .../shopgoods-system-common/pom.xml           | 27 +++++
 .../src/main/java/com/shopgoods/Main.java     |  7 ++
 .../shopgoods-system-remote/pom.xml           | 27 +++++
 .../system/remote/RemoteLogService.java       | 41 ++++++++
 .../system/remote/RemoteUserService.java      | 49 +++++++++
 .../factory/RemoteLogFallbackFactory.java     | 42 ++++++++
 .../factory/RemoteUserFallbackFactory.java    | 47 +++++++++
 ...ot.autoconfigure.AutoConfiguration.imports |  2 +
 .../shopgoods-system-server/pom.xml           | 99 +++++++++++++++++++
 .../server}/ShopGoodsSystemApplication.java   |  6 +-
 .../controller/SysConfigController.java       | 20 ++--
 .../server}/controller/SysDeptController.java | 20 ++--
 .../controller/SysDictDataController.java     | 22 ++---
 .../controller/SysDictTypeController.java     | 20 ++--
 .../controller/SysLogininforController.java   | 17 ++--
 .../server}/controller/SysMenuController.java | 18 ++--
 .../controller/SysNoticeController.java       | 18 ++--
 .../controller/SysOperlogController.java      | 17 ++--
 .../server}/controller/SysPostController.java | 20 ++--
 .../controller/SysProfileController.java      | 17 ++--
 .../server}/controller/SysRoleController.java | 20 ++--
 .../server}/controller/SysUserController.java | 37 +++----
 .../controller/SysUserOnlineController.java   | 19 ++--
 .../system/server}/domain/SysConfig.java      | 11 ++-
 .../system/server}/domain/SysMenu.java        | 13 +--
 .../system/server}/domain/SysNotice.java      | 11 ++-
 .../system/server}/domain/SysPost.java        | 13 +--
 .../system/server}/domain/SysRoleDept.java    |  2 +-
 .../system/server}/domain/SysRoleMenu.java    |  2 +-
 .../system/server}/domain/SysUserOnline.java  |  2 +-
 .../system/server}/domain/SysUserPost.java    |  2 +-
 .../system/server}/domain/SysUserRole.java    |  2 +-
 .../system/server}/domain/vo/MetaVo.java      |  2 +-
 .../system/server}/domain/vo/RouterVo.java    |  3 +-
 .../system/server}/domain/vo/TreeSelect.java  |  9 +-
 .../server}/mapper/SysConfigMapper.java       |  5 +-
 .../system/server}/mapper/SysDeptMapper.java  |  7 +-
 .../server}/mapper/SysDictDataMapper.java     |  7 +-
 .../server}/mapper/SysDictTypeMapper.java     |  5 +-
 .../server}/mapper/SysLogininforMapper.java   |  5 +-
 .../system/server}/mapper/SysMenuMapper.java  |  7 +-
 .../server}/mapper/SysNoticeMapper.java       |  5 +-
 .../server}/mapper/SysOperLogMapper.java      |  5 +-
 .../system/server}/mapper/SysPostMapper.java  |  5 +-
 .../server}/mapper/SysRoleDeptMapper.java     |  5 +-
 .../system/server}/mapper/SysRoleMapper.java  |  5 +-
 .../server}/mapper/SysRoleMenuMapper.java     |  5 +-
 .../system/server}/mapper/SysUserMapper.java  |  7 +-
 .../server}/mapper/SysUserPostMapper.java     |  5 +-
 .../server}/mapper/SysUserRoleMapper.java     |  7 +-
 .../server}/service/ISysConfigService.java    |  5 +-
 .../server}/service/ISysDeptService.java      |  5 +-
 .../server}/service/ISysDictDataService.java  |  5 +-
 .../server}/service/ISysDictTypeService.java  |  5 +-
 .../service/ISysLogininforService.java        |  5 +-
 .../server}/service/ISysMenuService.java      |  7 +-
 .../server}/service/ISysNoticeService.java    |  5 +-
 .../server}/service/ISysOperLogService.java   |  5 +-
 .../service/ISysPermissionService.java        |  6 +-
 .../server}/service/ISysPostService.java      |  5 +-
 .../server}/service/ISysRoleService.java      |  7 +-
 .../service/ISysUserOnlineService.java        |  2 +-
 .../server}/service/ISysUserService.java      |  5 +-
 .../service/impl/SysConfigServiceImpl.java    | 13 +--
 .../service/impl/SysDeptServiceImpl.java      | 15 +--
 .../service/impl/SysDictDataServiceImpl.java  |  9 +-
 .../service/impl/SysDictTypeServiceImpl.java  | 19 ++--
 .../impl/SysLogininforServiceImpl.java        |  9 +-
 .../service/impl/SysMenuServiceImpl.java      | 17 ++--
 .../service/impl/SysNoticeServiceImpl.java    |  9 +-
 .../service/impl/SysOperLogServiceImpl.java   |  9 +-
 .../impl/SysPermissionServiceImpl.java        | 15 +--
 .../service/impl/SysPostServiceImpl.java      |  9 +-
 .../service/impl/SysRoleServiceImpl.java      | 15 ++-
 .../impl/SysUserOnlineServiceImpl.java        |  4 +-
 .../service/impl/SysUserServiceImpl.java      | 29 +++---
 .../src/main/resources/banner.txt             |  0
 .../src/main/resources/bootstrap.yml          |  0
 .../src/main/resources/logback.xml            |  0
 .../mapper/system/SysConfigMapper.xml         |  0
 .../resources/mapper/system/SysDeptMapper.xml |  0
 .../mapper/system/SysDictDataMapper.xml       |  0
 .../mapper/system/SysDictTypeMapper.xml       |  0
 .../mapper/system/SysLogininforMapper.xml     |  0
 .../resources/mapper/system/SysMenuMapper.xml |  0
 .../mapper/system/SysNoticeMapper.xml         |  0
 .../mapper/system/SysOperLogMapper.xml        |  0
 .../resources/mapper/system/SysPostMapper.xml |  0
 .../mapper/system/SysRoleDeptMapper.xml       |  0
 .../resources/mapper/system/SysRoleMapper.xml |  0
 .../mapper/system/SysRoleMenuMapper.xml       |  0
 .../resources/mapper/system/SysUserMapper.xml |  0
 .../mapper/system/SysUserPostMapper.xml       |  0
 .../mapper/system/SysUserRoleMapper.xml       |  0
 .../main/java/com/shopgoods/system/Test.java  | 45 ---------
 100 files changed, 695 insertions(+), 477 deletions(-)
 create mode 100644 shopgoods-modules/shopgoods-system/shopgoods-system-common/pom.xml
 create mode 100644 shopgoods-modules/shopgoods-system/shopgoods-system-common/src/main/java/com/shopgoods/Main.java
 create mode 100644 shopgoods-modules/shopgoods-system/shopgoods-system-remote/pom.xml
 create mode 100644 shopgoods-modules/shopgoods-system/shopgoods-system-remote/src/main/java/com/shopgoods/system/remote/RemoteLogService.java
 create mode 100644 shopgoods-modules/shopgoods-system/shopgoods-system-remote/src/main/java/com/shopgoods/system/remote/RemoteUserService.java
 create mode 100644 shopgoods-modules/shopgoods-system/shopgoods-system-remote/src/main/java/com/shopgoods/system/remote/factory/RemoteLogFallbackFactory.java
 create mode 100644 shopgoods-modules/shopgoods-system/shopgoods-system-remote/src/main/java/com/shopgoods/system/remote/factory/RemoteUserFallbackFactory.java
 create mode 100644 shopgoods-modules/shopgoods-system/shopgoods-system-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
 create mode 100644 shopgoods-modules/shopgoods-system/shopgoods-system-server/pom.xml
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/ShopGoodsSystemApplication.java (96%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/controller/SysConfigController.java (88%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/controller/SysDeptController.java (88%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/controller/SysDictDataController.java (87%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/controller/SysDictTypeController.java (88%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/controller/SysLogininforController.java (86%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/controller/SysMenuController.java (90%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/controller/SysNoticeController.java (82%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/controller/SysOperlogController.java (83%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/controller/SysPostController.java (88%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/controller/SysProfileController.java (92%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/controller/SysRoleController.java (93%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/controller/SysUserController.java (93%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/controller/SysUserOnlineController.java (88%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/domain/SysConfig.java (98%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/domain/SysMenu.java (99%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/domain/SysNotice.java (98%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/domain/SysPost.java (98%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/domain/SysRoleDept.java (95%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/domain/SysRoleMenu.java (95%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/domain/SysUserOnline.java (97%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/domain/SysUserPost.java (95%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/domain/SysUserRole.java (95%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/domain/vo/MetaVo.java (97%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/domain/vo/RouterVo.java (98%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/domain/vo/TreeSelect.java (96%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/mapper/SysConfigMapper.java (97%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/mapper/SysDeptMapper.java (98%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/mapper/SysDictDataMapper.java (98%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/mapper/SysDictTypeMapper.java (97%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/mapper/SysLogininforMapper.java (95%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/mapper/SysMenuMapper.java (98%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/mapper/SysNoticeMapper.java (96%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/mapper/SysOperLogMapper.java (95%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/mapper/SysPostMapper.java (97%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/mapper/SysRoleDeptMapper.java (95%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/mapper/SysRoleMapper.java (98%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/mapper/SysRoleMenuMapper.java (95%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/mapper/SysUserMapper.java (98%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/mapper/SysUserPostMapper.java (95%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/mapper/SysUserRoleMapper.java (96%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/service/ISysConfigService.java (97%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/service/ISysDeptService.java (98%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/service/ISysDictDataService.java (96%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/service/ISysDictTypeService.java (97%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/service/ISysLogininforService.java (94%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/service/ISysMenuService.java (98%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/service/ISysNoticeService.java (96%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/service/ISysOperLogService.java (95%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/service/ISysPermissionService.java (92%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/service/ISysPostService.java (97%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/service/ISysRoleService.java (98%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/service/ISysUserOnlineService.java (96%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/service/ISysUserService.java (98%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/service/impl/SysConfigServiceImpl.java (99%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/service/impl/SysDeptServiceImpl.java (99%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/service/impl/SysDictDataServiceImpl.java (98%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/service/impl/SysDictTypeServiceImpl.java (99%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/service/impl/SysLogininforServiceImpl.java (96%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/service/impl/SysMenuServiceImpl.java (98%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/service/impl/SysNoticeServiceImpl.java (97%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/service/impl/SysOperLogServiceImpl.java (97%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/service/impl/SysPermissionServiceImpl.java (98%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/service/impl/SysPostServiceImpl.java (98%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/service/impl/SysRoleServiceImpl.java (98%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/service/impl/SysUserOnlineServiceImpl.java (97%)
 rename shopgoods-modules/shopgoods-system/{src/main/java/com/shopgoods/system => shopgoods-system-server/src/main/java/com/shopgoods/system/server}/service/impl/SysUserServiceImpl.java (98%)
 rename shopgoods-modules/shopgoods-system/{ => shopgoods-system-server}/src/main/resources/banner.txt (100%)
 rename shopgoods-modules/shopgoods-system/{ => shopgoods-system-server}/src/main/resources/bootstrap.yml (100%)
 rename shopgoods-modules/shopgoods-system/{ => shopgoods-system-server}/src/main/resources/logback.xml (100%)
 rename shopgoods-modules/shopgoods-system/{ => shopgoods-system-server}/src/main/resources/mapper/system/SysConfigMapper.xml (100%)
 rename shopgoods-modules/shopgoods-system/{ => shopgoods-system-server}/src/main/resources/mapper/system/SysDeptMapper.xml (100%)
 rename shopgoods-modules/shopgoods-system/{ => shopgoods-system-server}/src/main/resources/mapper/system/SysDictDataMapper.xml (100%)
 rename shopgoods-modules/shopgoods-system/{ => shopgoods-system-server}/src/main/resources/mapper/system/SysDictTypeMapper.xml (100%)
 rename shopgoods-modules/shopgoods-system/{ => shopgoods-system-server}/src/main/resources/mapper/system/SysLogininforMapper.xml (100%)
 rename shopgoods-modules/shopgoods-system/{ => shopgoods-system-server}/src/main/resources/mapper/system/SysMenuMapper.xml (100%)
 rename shopgoods-modules/shopgoods-system/{ => shopgoods-system-server}/src/main/resources/mapper/system/SysNoticeMapper.xml (100%)
 rename shopgoods-modules/shopgoods-system/{ => shopgoods-system-server}/src/main/resources/mapper/system/SysOperLogMapper.xml (100%)
 rename shopgoods-modules/shopgoods-system/{ => shopgoods-system-server}/src/main/resources/mapper/system/SysPostMapper.xml (100%)
 rename shopgoods-modules/shopgoods-system/{ => shopgoods-system-server}/src/main/resources/mapper/system/SysRoleDeptMapper.xml (100%)
 rename shopgoods-modules/shopgoods-system/{ => shopgoods-system-server}/src/main/resources/mapper/system/SysRoleMapper.xml (100%)
 rename shopgoods-modules/shopgoods-system/{ => shopgoods-system-server}/src/main/resources/mapper/system/SysRoleMenuMapper.xml (100%)
 rename shopgoods-modules/shopgoods-system/{ => shopgoods-system-server}/src/main/resources/mapper/system/SysUserMapper.xml (100%)
 rename shopgoods-modules/shopgoods-system/{ => shopgoods-system-server}/src/main/resources/mapper/system/SysUserPostMapper.xml (100%)
 rename shopgoods-modules/shopgoods-system/{ => shopgoods-system-server}/src/main/resources/mapper/system/SysUserRoleMapper.xml (100%)
 delete mode 100644 shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/Test.java

diff --git a/pom.xml b/pom.xml
index ea4c345..f1291e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -253,6 +253,29 @@
                 <version>${shopgoods.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.shopgoods</groupId>
+                <artifactId>shopgoods-file-remote</artifactId>
+                <version>${shopgoods.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.shopgoods</groupId>
+                <artifactId>shopgoods-file-common</artifactId>
+                <version>${shopgoods.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.shopgoods</groupId>
+                <artifactId>shopgoods-system-remote</artifactId>
+                <version>${shopgoods.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.shopgoods</groupId>
+                <artifactId>shopgoods-system-common</artifactId>
+                <version>${shopgoods.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -266,6 +289,9 @@
         <module>shopgoods-modules/shopgoods-file/shopgoods-file-common</module>
         <module>shopgoods-modules/shopgoods-file/shopgoods-file-remote</module>
         <module>shopgoods-modules/shopgoods-file/shopgoods-file-server</module>
+        <module>shopgoods-modules/shopgoods-system/shopgoods-system-common</module>
+        <module>shopgoods-modules/shopgoods-system/shopgoods-system-remote</module>
+        <module>shopgoods-modules/shopgoods-system/shopgoods-system-server</module>
     </modules>
     <packaging>pom</packaging>
 
diff --git a/shopgoods-modules/shopgoods-file/shopgoods-file-common/pom.xml b/shopgoods-modules/shopgoods-file/shopgoods-file-common/pom.xml
index 2e64536..523357b 100644
--- a/shopgoods-modules/shopgoods-file/shopgoods-file-common/pom.xml
+++ b/shopgoods-modules/shopgoods-file/shopgoods-file-common/pom.xml
@@ -18,4 +18,10 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+    <dependencies>
+        <dependency>
+            <groupId>com.shopgoods</groupId>
+            <artifactId>shopgoods-common-core</artifactId>
+        </dependency>
+    </dependencies>
 </project>
\ No newline at end of file
diff --git a/shopgoods-modules/shopgoods-file/shopgoods-file-remote/pom.xml b/shopgoods-modules/shopgoods-file/shopgoods-file-remote/pom.xml
index e31bd3f..3851ae0 100644
--- a/shopgoods-modules/shopgoods-file/shopgoods-file-remote/pom.xml
+++ b/shopgoods-modules/shopgoods-file/shopgoods-file-remote/pom.xml
@@ -18,4 +18,10 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+    <dependencies>
+        <dependency>
+            <groupId>com.shopgoods</groupId>
+            <artifactId>shopgoods-file-common</artifactId>
+        </dependency>
+    </dependencies>
 </project>
\ No newline at end of file
diff --git a/shopgoods-modules/shopgoods-file/shopgoods-file-server/pom.xml b/shopgoods-modules/shopgoods-file/shopgoods-file-server/pom.xml
index fccd07e..bbeb187 100644
--- a/shopgoods-modules/shopgoods-file/shopgoods-file-server/pom.xml
+++ b/shopgoods-modules/shopgoods-file/shopgoods-file-server/pom.xml
@@ -69,6 +69,10 @@
             <artifactId>shopgoods-api-system</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.shopgoods</groupId>
+            <artifactId>shopgoods-file-common</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/shopgoods-modules/shopgoods-system/pom.xml b/shopgoods-modules/shopgoods-system/pom.xml
index d962165..52a2ffa 100644
--- a/shopgoods-modules/shopgoods-system/pom.xml
+++ b/shopgoods-modules/shopgoods-system/pom.xml
@@ -9,85 +9,12 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 	
-    <artifactId>shopgoods-modules-system</artifactId>
+    <artifactId>shopgoods-system</artifactId>
 
     <description>
-        shopgoods-modules-system系统模块
+        shopgoods-system系统模块
     </description>
 	
-    <dependencies>
-    	
-    	<!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-        
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-        
-    	<!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-        
-    	<!-- SpringBoot Actuator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-        
-        <!-- Mysql Connector -->
-        <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>mysql-connector-j</artifactId>
-        </dependency>
-        
-        <!-- ShopGoods Common DataSource -->
-        <dependency>
-            <groupId>com.shopgoods</groupId>
-            <artifactId>shopgoods-common-datasource</artifactId>
-        </dependency>
-        
-        <!-- ShopGoods Common DataScope -->
-        <dependency>
-            <groupId>com.shopgoods</groupId>
-            <artifactId>shopgoods-common-datascope</artifactId>
-        </dependency>
-        
-        <!-- ShopGoods Common Log -->
-        <dependency>
-            <groupId>com.shopgoods</groupId>
-            <artifactId>shopgoods-common-log</artifactId>
-        </dependency>
-        
-        <!-- ShopGoods Common Swagger -->
-        <dependency>
-            <groupId>com.shopgoods</groupId>
-            <artifactId>shopgoods-common-swagger</artifactId>
-        </dependency>
 
-    </dependencies>
-
-    <build>
-        <finalName>${project.artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
    
 </project>
\ No newline at end of file
diff --git a/shopgoods-modules/shopgoods-system/shopgoods-system-common/pom.xml b/shopgoods-modules/shopgoods-system/shopgoods-system-common/pom.xml
new file mode 100644
index 0000000..fe918d3
--- /dev/null
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-common/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.shopgoods</groupId>
+        <artifactId>shopgoods-system</artifactId>
+        <version>3.6.5</version>
+<!--        <relativePath>../../../pom.xml</relativePath>-->
+    </parent>
+
+    <artifactId>shopgoods-system-common</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.shopgoods</groupId>
+            <artifactId>shopgoods-common-core</artifactId>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file
diff --git a/shopgoods-modules/shopgoods-system/shopgoods-system-common/src/main/java/com/shopgoods/Main.java b/shopgoods-modules/shopgoods-system/shopgoods-system-common/src/main/java/com/shopgoods/Main.java
new file mode 100644
index 0000000..6a323f4
--- /dev/null
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-common/src/main/java/com/shopgoods/Main.java
@@ -0,0 +1,7 @@
+package com.shopgoods;
+
+public class Main {
+    public static void main(String[] args) {
+        System.out.println("Hello world!");
+    }
+}
\ No newline at end of file
diff --git a/shopgoods-modules/shopgoods-system/shopgoods-system-remote/pom.xml b/shopgoods-modules/shopgoods-system/shopgoods-system-remote/pom.xml
new file mode 100644
index 0000000..e3f0de7
--- /dev/null
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-remote/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.shopgoods</groupId>
+        <artifactId>shopgoods-system</artifactId>
+        <version>3.6.5</version>
+<!--        <relativePath>../../../pom.xml</relativePath>-->
+    </parent>
+
+    <artifactId>shopgoods-system-remote</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.shopgoods</groupId>
+            <artifactId>shopgoods-system-common</artifactId>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file
diff --git a/shopgoods-modules/shopgoods-system/shopgoods-system-remote/src/main/java/com/shopgoods/system/remote/RemoteLogService.java b/shopgoods-modules/shopgoods-system/shopgoods-system-remote/src/main/java/com/shopgoods/system/remote/RemoteLogService.java
new file mode 100644
index 0000000..55ff0d0
--- /dev/null
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-remote/src/main/java/com/shopgoods/system/remote/RemoteLogService.java
@@ -0,0 +1,41 @@
+package com.shopgoods.system.remote;
+
+import com.shopgoods.common.core.constant.SecurityConstants;
+import com.shopgoods.common.core.constant.ServiceNameConstants;
+import com.shopgoods.common.core.domain.R;
+import com.shopgoods.system.api.domain.SysLogininfor;
+import com.shopgoods.system.api.domain.SysOperLog;
+import com.shopgoods.system.api.factory.RemoteLogFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+
+/**
+ * 日志服务
+ * 
+ * @author shopgoods
+ */
+@FeignClient(contextId = "remoteLogService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteLogFallbackFactory.class)
+public interface RemoteLogService
+{
+    /**
+     * 保存系统日志
+     *
+     * @param sysOperLog 日志实体
+     * @param source 请求来源
+     * @return 结果
+     */
+    @PostMapping("/operlog")
+    public R<Boolean> saveLog(@RequestBody SysOperLog sysOperLog, @RequestHeader(SecurityConstants.FROM_SOURCE) String source) throws Exception;
+
+    /**
+     * 保存访问记录
+     *
+     * @param sysLogininfor 访问实体
+     * @param source 请求来源
+     * @return 结果
+     */
+    @PostMapping("/logininfor")
+    public R<Boolean> saveLogininfor(@RequestBody SysLogininfor sysLogininfor, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+}
diff --git a/shopgoods-modules/shopgoods-system/shopgoods-system-remote/src/main/java/com/shopgoods/system/remote/RemoteUserService.java b/shopgoods-modules/shopgoods-system/shopgoods-system-remote/src/main/java/com/shopgoods/system/remote/RemoteUserService.java
new file mode 100644
index 0000000..fc950eb
--- /dev/null
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-remote/src/main/java/com/shopgoods/system/remote/RemoteUserService.java
@@ -0,0 +1,49 @@
+package com.shopgoods.system.remote;
+
+import com.shopgoods.common.core.constant.SecurityConstants;
+import com.shopgoods.common.core.constant.ServiceNameConstants;
+import com.shopgoods.common.core.domain.R;
+import com.shopgoods.system.api.domain.SysUser;
+import com.shopgoods.system.api.factory.RemoteUserFallbackFactory;
+import com.shopgoods.system.api.model.LoginUser;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 用户服务
+ * 
+ * @author shopgoods
+ */
+@FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class)
+public interface RemoteUserService
+{
+    /**
+     * 通过用户名查询用户信息
+     *
+     * @param username 用户名
+     * @param source 请求来源
+     * @return 结果
+     */
+    @GetMapping("/user/info/{username}")
+    public R<LoginUser> getUserInfo(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 注册用户信息
+     *
+     * @param sysUser 用户信息
+     * @param source 请求来源
+     * @return 结果
+     */
+    @PostMapping("/user/register")
+    public R<Boolean> registerUserInfo(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 记录用户登录IP地址和登录时间
+     *
+     * @param sysUser 用户信息
+     * @param source 请求来源
+     * @return 结果
+     */
+    @PutMapping("/user/recordlogin")
+    public R<Boolean> recordUserLogin(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+}
diff --git a/shopgoods-modules/shopgoods-system/shopgoods-system-remote/src/main/java/com/shopgoods/system/remote/factory/RemoteLogFallbackFactory.java b/shopgoods-modules/shopgoods-system/shopgoods-system-remote/src/main/java/com/shopgoods/system/remote/factory/RemoteLogFallbackFactory.java
new file mode 100644
index 0000000..fcee0d7
--- /dev/null
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-remote/src/main/java/com/shopgoods/system/remote/factory/RemoteLogFallbackFactory.java
@@ -0,0 +1,42 @@
+package com.shopgoods.system.remote.factory;
+
+import com.shopgoods.common.core.domain.R;
+import com.shopgoods.system.api.RemoteLogService;
+import com.shopgoods.system.api.domain.SysLogininfor;
+import com.shopgoods.system.api.domain.SysOperLog;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * 日志服务降级处理
+ * 
+ * @author shopgoods
+ */
+@Component
+public class RemoteLogFallbackFactory implements FallbackFactory<RemoteLogService>
+{
+    private static final Logger log = LoggerFactory.getLogger(RemoteLogFallbackFactory.class);
+
+    @Override
+    public RemoteLogService create(Throwable throwable)
+    {
+        log.error("日志服务调用失败:{}", throwable.getMessage());
+        return new RemoteLogService()
+        {
+            @Override
+            public R<Boolean> saveLog(SysOperLog sysOperLog, String source)
+            {
+                return R.fail("保存操作日志失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<Boolean> saveLogininfor(SysLogininfor sysLogininfor, String source)
+            {
+                return R.fail("保存登录日志失败:" + throwable.getMessage());
+            }
+        };
+
+    }
+}
diff --git a/shopgoods-modules/shopgoods-system/shopgoods-system-remote/src/main/java/com/shopgoods/system/remote/factory/RemoteUserFallbackFactory.java b/shopgoods-modules/shopgoods-system/shopgoods-system-remote/src/main/java/com/shopgoods/system/remote/factory/RemoteUserFallbackFactory.java
new file mode 100644
index 0000000..c0fc10c
--- /dev/null
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-remote/src/main/java/com/shopgoods/system/remote/factory/RemoteUserFallbackFactory.java
@@ -0,0 +1,47 @@
+package com.shopgoods.system.remote.factory;
+
+import com.shopgoods.common.core.domain.R;
+import com.shopgoods.system.api.RemoteUserService;
+import com.shopgoods.system.api.domain.SysUser;
+import com.shopgoods.system.api.model.LoginUser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * 用户服务降级处理
+ * 
+ * @author shopgoods
+ */
+@Component
+public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserService>
+{
+    private static final Logger log = LoggerFactory.getLogger(RemoteUserFallbackFactory.class);
+
+    @Override
+    public RemoteUserService create(Throwable throwable)
+    {
+        log.error("用户服务调用失败:{}", throwable.getMessage());
+        return new RemoteUserService()
+        {
+            @Override
+            public R<LoginUser> getUserInfo(String username, String source)
+            {
+                return R.fail("获取用户失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<Boolean> registerUserInfo(SysUser sysUser, String source)
+            {
+                return R.fail("注册用户失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<Boolean> recordUserLogin(SysUser sysUser, String source)
+            {
+                return R.fail("记录用户登录信息失败:" + throwable.getMessage());
+            }
+        };
+    }
+}
diff --git a/shopgoods-modules/shopgoods-system/shopgoods-system-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/shopgoods-modules/shopgoods-system/shopgoods-system-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..c97a956
--- /dev/null
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,2 @@
+com.shopgoods.system.remote.factory.RemoteUserFallbackFactory
+com.shopgoods.system.remote.factory.RemoteLogFallbackFactory
diff --git a/shopgoods-modules/shopgoods-system/shopgoods-system-server/pom.xml b/shopgoods-modules/shopgoods-system/shopgoods-system-server/pom.xml
new file mode 100644
index 0000000..6ab91bb
--- /dev/null
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/pom.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.shopgoods</groupId>
+        <artifactId>shopgoods-system</artifactId>
+        <version>3.6.5</version>
+<!--        <relativePath>../../../pom.xml</relativePath>-->
+    </parent>
+
+    <artifactId>shopgoods-system-server</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+
+        <!-- SpringCloud Alibaba Nacos -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+
+        <!-- SpringCloud Alibaba Nacos Config -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+
+        <!-- SpringCloud Alibaba Sentinel -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+        </dependency>
+
+        <!-- SpringBoot Actuator -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+
+        <!-- Mysql Connector -->
+        <dependency>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+        </dependency>
+
+        <!-- ShopGoods Common DataSource -->
+        <dependency>
+            <groupId>com.shopgoods</groupId>
+            <artifactId>shopgoods-common-datasource</artifactId>
+        </dependency>
+
+        <!-- ShopGoods Common DataScope -->
+        <dependency>
+            <groupId>com.shopgoods</groupId>
+            <artifactId>shopgoods-common-datascope</artifactId>
+        </dependency>
+
+        <!-- ShopGoods Common Log -->
+        <dependency>
+            <groupId>com.shopgoods</groupId>
+            <artifactId>shopgoods-common-log</artifactId>
+        </dependency>
+
+        <!-- ShopGoods Common Swagger -->
+        <dependency>
+            <groupId>com.shopgoods</groupId>
+            <artifactId>shopgoods-common-swagger</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.shopgoods</groupId>
+            <artifactId>shopgoods-system-common</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/ShopGoodsSystemApplication.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/ShopGoodsSystemApplication.java
similarity index 96%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/ShopGoodsSystemApplication.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/ShopGoodsSystemApplication.java
index 63abaa5..2005384 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/ShopGoodsSystemApplication.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/ShopGoodsSystemApplication.java
@@ -1,9 +1,9 @@
-package com.shopgoods.system;
+package com.shopgoods.system.server;
 
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
 import com.shopgoods.common.security.annotation.EnableCustomConfig;
 import com.shopgoods.common.security.annotation.EnableRyFeignClients;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 /**
  * 系统模块
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/controller/SysConfigController.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/controller/SysConfigController.java
similarity index 88%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/controller/SysConfigController.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/controller/SysConfigController.java
index da7131e..ac5fc97 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/controller/SysConfigController.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/controller/SysConfigController.java
@@ -1,17 +1,5 @@
-package com.shopgoods.system.controller;
+package com.shopgoods.system.server.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.shopgoods.common.core.utils.poi.ExcelUtil;
 import com.shopgoods.common.core.web.controller.BaseController;
 import com.shopgoods.common.core.web.domain.AjaxResult;
@@ -22,6 +10,12 @@ import com.shopgoods.common.security.annotation.RequiresPermissions;
 import com.shopgoods.common.security.utils.SecurityUtils;
 import com.shopgoods.system.domain.SysConfig;
 import com.shopgoods.system.service.ISysConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 参数配置 信息操作处理
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/controller/SysDeptController.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/controller/SysDeptController.java
similarity index 88%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/controller/SysDeptController.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/controller/SysDeptController.java
index 76b8c51..866603e 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/controller/SysDeptController.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/controller/SysDeptController.java
@@ -1,17 +1,5 @@
-package com.shopgoods.system.controller;
+package com.shopgoods.system.server.controller;
 
-import java.util.List;
-import org.apache.commons.lang3.ArrayUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.shopgoods.common.core.constant.UserConstants;
 import com.shopgoods.common.core.utils.StringUtils;
 import com.shopgoods.common.core.web.controller.BaseController;
@@ -22,6 +10,12 @@ import com.shopgoods.common.security.annotation.RequiresPermissions;
 import com.shopgoods.common.security.utils.SecurityUtils;
 import com.shopgoods.system.api.domain.SysDept;
 import com.shopgoods.system.service.ISysDeptService;
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 部门信息
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/controller/SysDictDataController.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/controller/SysDictDataController.java
similarity index 87%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/controller/SysDictDataController.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/controller/SysDictDataController.java
index 164556b..e12748c 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/controller/SysDictDataController.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/controller/SysDictDataController.java
@@ -1,18 +1,5 @@
-package com.shopgoods.system.controller;
+package com.shopgoods.system.server.controller;
 
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.shopgoods.common.core.utils.StringUtils;
 import com.shopgoods.common.core.utils.poi.ExcelUtil;
 import com.shopgoods.common.core.web.controller.BaseController;
@@ -25,6 +12,13 @@ import com.shopgoods.common.security.utils.SecurityUtils;
 import com.shopgoods.system.api.domain.SysDictData;
 import com.shopgoods.system.service.ISysDictDataService;
 import com.shopgoods.system.service.ISysDictTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 数据字典信息
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/controller/SysDictTypeController.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/controller/SysDictTypeController.java
similarity index 88%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/controller/SysDictTypeController.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/controller/SysDictTypeController.java
index c9c6544..7b46ca9 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/controller/SysDictTypeController.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/controller/SysDictTypeController.java
@@ -1,17 +1,5 @@
-package com.shopgoods.system.controller;
+package com.shopgoods.system.server.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.shopgoods.common.core.utils.poi.ExcelUtil;
 import com.shopgoods.common.core.web.controller.BaseController;
 import com.shopgoods.common.core.web.domain.AjaxResult;
@@ -22,6 +10,12 @@ import com.shopgoods.common.security.annotation.RequiresPermissions;
 import com.shopgoods.common.security.utils.SecurityUtils;
 import com.shopgoods.system.api.domain.SysDictType;
 import com.shopgoods.system.service.ISysDictTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 数据字典信息
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/controller/SysLogininforController.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/controller/SysLogininforController.java
similarity index 86%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/controller/SysLogininforController.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/controller/SysLogininforController.java
index 9939662..3ac3b03 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/controller/SysLogininforController.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/controller/SysLogininforController.java
@@ -1,15 +1,5 @@
-package com.shopgoods.system.controller;
+package com.shopgoods.system.server.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.shopgoods.common.core.constant.CacheConstants;
 import com.shopgoods.common.core.utils.poi.ExcelUtil;
 import com.shopgoods.common.core.web.controller.BaseController;
@@ -22,6 +12,11 @@ import com.shopgoods.common.security.annotation.InnerAuth;
 import com.shopgoods.common.security.annotation.RequiresPermissions;
 import com.shopgoods.system.api.domain.SysLogininfor;
 import com.shopgoods.system.service.ISysLogininforService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 系统访问记录
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/controller/SysMenuController.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/controller/SysMenuController.java
similarity index 90%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/controller/SysMenuController.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/controller/SysMenuController.java
index 4afbfaa..5ecbd87 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/controller/SysMenuController.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/controller/SysMenuController.java
@@ -1,16 +1,5 @@
-package com.shopgoods.system.controller;
+package com.shopgoods.system.server.controller;
 
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.shopgoods.common.core.constant.UserConstants;
 import com.shopgoods.common.core.utils.StringUtils;
 import com.shopgoods.common.core.web.controller.BaseController;
@@ -21,6 +10,11 @@ import com.shopgoods.common.security.annotation.RequiresPermissions;
 import com.shopgoods.common.security.utils.SecurityUtils;
 import com.shopgoods.system.domain.SysMenu;
 import com.shopgoods.system.service.ISysMenuService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 菜单信息
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/controller/SysNoticeController.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/controller/SysNoticeController.java
similarity index 82%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/controller/SysNoticeController.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/controller/SysNoticeController.java
index afc1837..01cd2d6 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/controller/SysNoticeController.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/controller/SysNoticeController.java
@@ -1,16 +1,5 @@
-package com.shopgoods.system.controller;
+package com.shopgoods.system.server.controller;
 
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.shopgoods.common.core.web.controller.BaseController;
 import com.shopgoods.common.core.web.domain.AjaxResult;
 import com.shopgoods.common.core.web.page.TableDataInfo;
@@ -20,6 +9,11 @@ import com.shopgoods.common.security.annotation.RequiresPermissions;
 import com.shopgoods.common.security.utils.SecurityUtils;
 import com.shopgoods.system.domain.SysNotice;
 import com.shopgoods.system.service.ISysNoticeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 公告 信息操作处理
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/controller/SysOperlogController.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/controller/SysOperlogController.java
similarity index 83%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/controller/SysOperlogController.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/controller/SysOperlogController.java
index c537912..bf1f082 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/controller/SysOperlogController.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/controller/SysOperlogController.java
@@ -1,15 +1,5 @@
-package com.shopgoods.system.controller;
+package com.shopgoods.system.server.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.shopgoods.common.core.utils.poi.ExcelUtil;
 import com.shopgoods.common.core.web.controller.BaseController;
 import com.shopgoods.common.core.web.domain.AjaxResult;
@@ -20,6 +10,11 @@ import com.shopgoods.common.security.annotation.InnerAuth;
 import com.shopgoods.common.security.annotation.RequiresPermissions;
 import com.shopgoods.system.api.domain.SysOperLog;
 import com.shopgoods.system.service.ISysOperLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 操作日志记录
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/controller/SysPostController.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/controller/SysPostController.java
similarity index 88%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/controller/SysPostController.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/controller/SysPostController.java
index 08ef0e6..5a46be8 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/controller/SysPostController.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/controller/SysPostController.java
@@ -1,17 +1,5 @@
-package com.shopgoods.system.controller;
+package com.shopgoods.system.server.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.shopgoods.common.core.utils.poi.ExcelUtil;
 import com.shopgoods.common.core.web.controller.BaseController;
 import com.shopgoods.common.core.web.domain.AjaxResult;
@@ -22,6 +10,12 @@ import com.shopgoods.common.security.annotation.RequiresPermissions;
 import com.shopgoods.common.security.utils.SecurityUtils;
 import com.shopgoods.system.domain.SysPost;
 import com.shopgoods.system.service.ISysPostService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 岗位信息操作处理
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/controller/SysProfileController.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/controller/SysProfileController.java
similarity index 92%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/controller/SysProfileController.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/controller/SysProfileController.java
index e54cbf3..fe834b6 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/controller/SysProfileController.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/controller/SysProfileController.java
@@ -1,15 +1,5 @@
-package com.shopgoods.system.controller;
+package com.shopgoods.system.server.controller;
 
-import java.util.Arrays;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
 import com.shopgoods.common.core.domain.R;
 import com.shopgoods.common.core.utils.StringUtils;
 import com.shopgoods.common.core.utils.file.FileTypeUtils;
@@ -25,6 +15,11 @@ import com.shopgoods.system.api.domain.SysFile;
 import com.shopgoods.system.api.domain.SysUser;
 import com.shopgoods.system.api.model.LoginUser;
 import com.shopgoods.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Arrays;
 
 /**
  * 个人信息 业务处理
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/controller/SysRoleController.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/controller/SysRoleController.java
similarity index 93%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/controller/SysRoleController.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/controller/SysRoleController.java
index e809c24..44acc7a 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/controller/SysRoleController.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/controller/SysRoleController.java
@@ -1,17 +1,5 @@
-package com.shopgoods.system.controller;
+package com.shopgoods.system.server.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.shopgoods.common.core.utils.poi.ExcelUtil;
 import com.shopgoods.common.core.web.controller.BaseController;
 import com.shopgoods.common.core.web.domain.AjaxResult;
@@ -27,6 +15,12 @@ import com.shopgoods.system.domain.SysUserRole;
 import com.shopgoods.system.service.ISysDeptService;
 import com.shopgoods.system.service.ISysRoleService;
 import com.shopgoods.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 角色信息
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/controller/SysUserController.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/controller/SysUserController.java
similarity index 93%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/controller/SysUserController.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/controller/SysUserController.java
index bb533e8..c5e60f3 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/controller/SysUserController.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/controller/SysUserController.java
@@ -1,22 +1,5 @@
-package com.shopgoods.system.controller;
+package com.shopgoods.system.server.controller;
 
-import java.io.IOException;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.lang3.ArrayUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
 import com.shopgoods.common.core.domain.R;
 import com.shopgoods.common.core.utils.StringUtils;
 import com.shopgoods.common.core.utils.poi.ExcelUtil;
@@ -33,12 +16,18 @@ import com.shopgoods.system.api.domain.SysDept;
 import com.shopgoods.system.api.domain.SysRole;
 import com.shopgoods.system.api.domain.SysUser;
 import com.shopgoods.system.api.model.LoginUser;
-import com.shopgoods.system.service.ISysConfigService;
-import com.shopgoods.system.service.ISysDeptService;
-import com.shopgoods.system.service.ISysPermissionService;
-import com.shopgoods.system.service.ISysPostService;
-import com.shopgoods.system.service.ISysRoleService;
-import com.shopgoods.system.service.ISysUserService;
+import com.shopgoods.system.service.*;
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * 用户信息
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/controller/SysUserOnlineController.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/controller/SysUserOnlineController.java
similarity index 88%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/controller/SysUserOnlineController.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/controller/SysUserOnlineController.java
index 402df6a..872302c 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/controller/SysUserOnlineController.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/controller/SysUserOnlineController.java
@@ -1,15 +1,5 @@
-package com.shopgoods.system.controller;
+package com.shopgoods.system.server.controller;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.shopgoods.common.core.constant.CacheConstants;
 import com.shopgoods.common.core.utils.StringUtils;
 import com.shopgoods.common.core.web.controller.BaseController;
@@ -22,6 +12,13 @@ import com.shopgoods.common.security.annotation.RequiresPermissions;
 import com.shopgoods.system.api.model.LoginUser;
 import com.shopgoods.system.domain.SysUserOnline;
 import com.shopgoods.system.service.ISysUserOnlineService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * 在线用户监控
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/domain/SysConfig.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/domain/SysConfig.java
similarity index 98%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/domain/SysConfig.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/domain/SysConfig.java
index 5a08a7c..b8b7fdc 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/domain/SysConfig.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/domain/SysConfig.java
@@ -1,12 +1,13 @@
-package com.shopgoods.system.domain;
+package com.shopgoods.system.server.domain;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.shopgoods.common.core.annotation.Excel;
 import com.shopgoods.common.core.annotation.Excel.ColumnType;
 import com.shopgoods.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
 
 /**
  * 参数配置表 sys_config
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/domain/SysMenu.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/domain/SysMenu.java
similarity index 99%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/domain/SysMenu.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/domain/SysMenu.java
index fa87ca5..a7e0038 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/domain/SysMenu.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/domain/SysMenu.java
@@ -1,13 +1,14 @@
-package com.shopgoods.system.domain;
+package com.shopgoods.system.server.domain;
+
+import com.shopgoods.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
-import java.util.ArrayList;
-import java.util.List;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.shopgoods.common.core.web.domain.BaseEntity;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 菜单权限表 sys_menu
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/domain/SysNotice.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/domain/SysNotice.java
similarity index 98%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/domain/SysNotice.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/domain/SysNotice.java
index a18149e..1556b8e 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/domain/SysNotice.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/domain/SysNotice.java
@@ -1,11 +1,12 @@
-package com.shopgoods.system.domain;
+package com.shopgoods.system.server.domain;
+
+import com.shopgoods.common.core.web.domain.BaseEntity;
+import com.shopgoods.common.core.xss.Xss;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.shopgoods.common.core.web.domain.BaseEntity;
-import com.shopgoods.common.core.xss.Xss;
 
 /**
  * 通知公告表 sys_notice
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/domain/SysPost.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/domain/SysPost.java
similarity index 98%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/domain/SysPost.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/domain/SysPost.java
index b9a9535..ef2d305 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/domain/SysPost.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/domain/SysPost.java
@@ -1,13 +1,14 @@
-package com.shopgoods.system.domain;
+package com.shopgoods.system.server.domain;
+
+import com.shopgoods.common.core.annotation.Excel;
+import com.shopgoods.common.core.annotation.Excel.ColumnType;
+import com.shopgoods.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.shopgoods.common.core.annotation.Excel;
-import com.shopgoods.common.core.annotation.Excel.ColumnType;
-import com.shopgoods.common.core.web.domain.BaseEntity;
 
 /**
  * 岗位表 sys_post
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/domain/SysRoleDept.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/domain/SysRoleDept.java
similarity index 95%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/domain/SysRoleDept.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/domain/SysRoleDept.java
index 86ffab8..67ec118 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/domain/SysRoleDept.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/domain/SysRoleDept.java
@@ -1,4 +1,4 @@
-package com.shopgoods.system.domain;
+package com.shopgoods.system.server.domain;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/domain/SysRoleMenu.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/domain/SysRoleMenu.java
similarity index 95%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/domain/SysRoleMenu.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/domain/SysRoleMenu.java
index 16e6a87..44ef2bb 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/domain/SysRoleMenu.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/domain/SysRoleMenu.java
@@ -1,4 +1,4 @@
-package com.shopgoods.system.domain;
+package com.shopgoods.system.server.domain;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/domain/SysUserOnline.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/domain/SysUserOnline.java
similarity index 97%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/domain/SysUserOnline.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/domain/SysUserOnline.java
index 3782ee5..5e78953 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/domain/SysUserOnline.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/domain/SysUserOnline.java
@@ -1,4 +1,4 @@
-package com.shopgoods.system.domain;
+package com.shopgoods.system.server.domain;
 
 /**
  * 当前在线会话
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/domain/SysUserPost.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/domain/SysUserPost.java
similarity index 95%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/domain/SysUserPost.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/domain/SysUserPost.java
index 060de7f..2576a32 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/domain/SysUserPost.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/domain/SysUserPost.java
@@ -1,4 +1,4 @@
-package com.shopgoods.system.domain;
+package com.shopgoods.system.server.domain;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/domain/SysUserRole.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/domain/SysUserRole.java
similarity index 95%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/domain/SysUserRole.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/domain/SysUserRole.java
index 1a3af1b..6d7445d 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/domain/SysUserRole.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/domain/SysUserRole.java
@@ -1,4 +1,4 @@
-package com.shopgoods.system.domain;
+package com.shopgoods.system.server.domain;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/domain/vo/MetaVo.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/domain/vo/MetaVo.java
similarity index 97%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/domain/vo/MetaVo.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/domain/vo/MetaVo.java
index c463e8e..d977eca 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/domain/vo/MetaVo.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/domain/vo/MetaVo.java
@@ -1,4 +1,4 @@
-package com.shopgoods.system.domain.vo;
+package com.shopgoods.system.server.domain.vo;
 
 import com.shopgoods.common.core.utils.StringUtils;
 
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/domain/vo/RouterVo.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/domain/vo/RouterVo.java
similarity index 98%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/domain/vo/RouterVo.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/domain/vo/RouterVo.java
index f206c7b..16440a7 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/domain/vo/RouterVo.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/domain/vo/RouterVo.java
@@ -1,6 +1,7 @@
-package com.shopgoods.system.domain.vo;
+package com.shopgoods.system.server.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+
 import java.util.List;
 
 /**
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/domain/vo/TreeSelect.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/domain/vo/TreeSelect.java
similarity index 96%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/domain/vo/TreeSelect.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/domain/vo/TreeSelect.java
index 6b89d0c..d8477e7 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/domain/vo/TreeSelect.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/domain/vo/TreeSelect.java
@@ -1,11 +1,12 @@
-package com.shopgoods.system.domain.vo;
+package com.shopgoods.system.server.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.shopgoods.system.api.domain.SysDept;
+import com.shopgoods.system.domain.SysMenu;
 
 import java.io.Serializable;
 import java.util.List;
 import java.util.stream.Collectors;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.shopgoods.system.api.domain.SysDept;
-import com.shopgoods.system.domain.SysMenu;
 
 /**
  * Treeselect树结构实体类
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysConfigMapper.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysConfigMapper.java
similarity index 97%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysConfigMapper.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysConfigMapper.java
index fb66b17..56650f2 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysConfigMapper.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysConfigMapper.java
@@ -1,7 +1,8 @@
-package com.shopgoods.system.mapper;
+package com.shopgoods.system.server.mapper;
+
+import com.shopgoods.system.domain.SysConfig;
 
 import java.util.List;
-import com.shopgoods.system.domain.SysConfig;
 
 /**
  * 参数配置 数据层
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysDeptMapper.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysDeptMapper.java
similarity index 98%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysDeptMapper.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysDeptMapper.java
index 2b82c54..2732020 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysDeptMapper.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysDeptMapper.java
@@ -1,8 +1,9 @@
-package com.shopgoods.system.mapper;
+package com.shopgoods.system.server.mapper;
+
+import com.shopgoods.system.api.domain.SysDept;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import org.apache.ibatis.annotations.Param;
-import com.shopgoods.system.api.domain.SysDept;
 
 /**
  * 部门管理 数据层
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysDictDataMapper.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysDictDataMapper.java
similarity index 98%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysDictDataMapper.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysDictDataMapper.java
index 3211619..a4ec764 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysDictDataMapper.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysDictDataMapper.java
@@ -1,8 +1,9 @@
-package com.shopgoods.system.mapper;
+package com.shopgoods.system.server.mapper;
+
+import com.shopgoods.system.api.domain.SysDictData;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import org.apache.ibatis.annotations.Param;
-import com.shopgoods.system.api.domain.SysDictData;
 
 /**
  * 字典表 数据层
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysDictTypeMapper.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysDictTypeMapper.java
similarity index 97%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysDictTypeMapper.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysDictTypeMapper.java
index 9e64b5d..e8bc806 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysDictTypeMapper.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysDictTypeMapper.java
@@ -1,7 +1,8 @@
-package com.shopgoods.system.mapper;
+package com.shopgoods.system.server.mapper;
+
+import com.shopgoods.system.api.domain.SysDictType;
 
 import java.util.List;
-import com.shopgoods.system.api.domain.SysDictType;
 
 /**
  * 字典表 数据层
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysLogininforMapper.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysLogininforMapper.java
similarity index 95%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysLogininforMapper.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysLogininforMapper.java
index 91bbbba..4ada548 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysLogininforMapper.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysLogininforMapper.java
@@ -1,7 +1,8 @@
-package com.shopgoods.system.mapper;
+package com.shopgoods.system.server.mapper;
+
+import com.shopgoods.system.api.domain.SysLogininfor;
 
 import java.util.List;
-import com.shopgoods.system.api.domain.SysLogininfor;
 
 /**
  * 系统访问日志情况信息 数据层
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysMenuMapper.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysMenuMapper.java
similarity index 98%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysMenuMapper.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysMenuMapper.java
index 325b798..53fefe6 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysMenuMapper.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysMenuMapper.java
@@ -1,8 +1,9 @@
-package com.shopgoods.system.mapper;
+package com.shopgoods.system.server.mapper;
+
+import com.shopgoods.system.domain.SysMenu;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import org.apache.ibatis.annotations.Param;
-import com.shopgoods.system.domain.SysMenu;
 
 /**
  * 菜单表 数据层
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysNoticeMapper.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysNoticeMapper.java
similarity index 96%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysNoticeMapper.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysNoticeMapper.java
index 4dda502..279fa73 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysNoticeMapper.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysNoticeMapper.java
@@ -1,7 +1,8 @@
-package com.shopgoods.system.mapper;
+package com.shopgoods.system.server.mapper;
+
+import com.shopgoods.system.domain.SysNotice;
 
 import java.util.List;
-import com.shopgoods.system.domain.SysNotice;
 
 /**
  * 通知公告表 数据层
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysOperLogMapper.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysOperLogMapper.java
similarity index 95%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysOperLogMapper.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysOperLogMapper.java
index 2e1be30..679fc37 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysOperLogMapper.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysOperLogMapper.java
@@ -1,7 +1,8 @@
-package com.shopgoods.system.mapper;
+package com.shopgoods.system.server.mapper;
+
+import com.shopgoods.system.api.domain.SysOperLog;
 
 import java.util.List;
-import com.shopgoods.system.api.domain.SysOperLog;
 
 /**
  * 操作日志 数据层
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysPostMapper.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysPostMapper.java
similarity index 97%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysPostMapper.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysPostMapper.java
index 2e5d426..3d50a6d 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysPostMapper.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysPostMapper.java
@@ -1,7 +1,8 @@
-package com.shopgoods.system.mapper;
+package com.shopgoods.system.server.mapper;
+
+import com.shopgoods.system.domain.SysPost;
 
 import java.util.List;
-import com.shopgoods.system.domain.SysPost;
 
 /**
  * 岗位信息 数据层
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysRoleDeptMapper.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysRoleDeptMapper.java
similarity index 95%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysRoleDeptMapper.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysRoleDeptMapper.java
index dea9a44..a8d2214 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysRoleDeptMapper.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysRoleDeptMapper.java
@@ -1,7 +1,8 @@
-package com.shopgoods.system.mapper;
+package com.shopgoods.system.server.mapper;
+
+import com.shopgoods.system.domain.SysRoleDept;
 
 import java.util.List;
-import com.shopgoods.system.domain.SysRoleDept;
 
 /**
  * 角色与部门关联表 数据层
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysRoleMapper.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysRoleMapper.java
similarity index 98%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysRoleMapper.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysRoleMapper.java
index a3d3796..217c309 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysRoleMapper.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysRoleMapper.java
@@ -1,7 +1,8 @@
-package com.shopgoods.system.mapper;
+package com.shopgoods.system.server.mapper;
+
+import com.shopgoods.system.api.domain.SysRole;
 
 import java.util.List;
-import com.shopgoods.system.api.domain.SysRole;
 
 /**
  * 角色表 数据层
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysRoleMenuMapper.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysRoleMenuMapper.java
similarity index 95%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysRoleMenuMapper.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysRoleMenuMapper.java
index e019916..7ee7e7d 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysRoleMenuMapper.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysRoleMenuMapper.java
@@ -1,7 +1,8 @@
-package com.shopgoods.system.mapper;
+package com.shopgoods.system.server.mapper;
+
+import com.shopgoods.system.domain.SysRoleMenu;
 
 import java.util.List;
-import com.shopgoods.system.domain.SysRoleMenu;
 
 /**
  * 角色与菜单关联表 数据层
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysUserMapper.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysUserMapper.java
similarity index 98%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysUserMapper.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysUserMapper.java
index 0a78f5b..4abfe7c 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysUserMapper.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysUserMapper.java
@@ -1,8 +1,9 @@
-package com.shopgoods.system.mapper;
+package com.shopgoods.system.server.mapper;
+
+import com.shopgoods.system.api.domain.SysUser;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import org.apache.ibatis.annotations.Param;
-import com.shopgoods.system.api.domain.SysUser;
 
 /**
  * 用户表 数据层
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysUserPostMapper.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysUserPostMapper.java
similarity index 95%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysUserPostMapper.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysUserPostMapper.java
index 7217390..4d74908 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysUserPostMapper.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysUserPostMapper.java
@@ -1,7 +1,8 @@
-package com.shopgoods.system.mapper;
+package com.shopgoods.system.server.mapper;
+
+import com.shopgoods.system.domain.SysUserPost;
 
 import java.util.List;
-import com.shopgoods.system.domain.SysUserPost;
 
 /**
  * 用户与岗位关联表 数据层
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysUserRoleMapper.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysUserRoleMapper.java
similarity index 96%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysUserRoleMapper.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysUserRoleMapper.java
index e304044..76fe1a0 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/mapper/SysUserRoleMapper.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/mapper/SysUserRoleMapper.java
@@ -1,8 +1,9 @@
-package com.shopgoods.system.mapper;
+package com.shopgoods.system.server.mapper;
+
+import com.shopgoods.system.domain.SysUserRole;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import org.apache.ibatis.annotations.Param;
-import com.shopgoods.system.domain.SysUserRole;
 
 /**
  * 用户与角色关联表 数据层
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/ISysConfigService.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/ISysConfigService.java
similarity index 97%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/ISysConfigService.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/ISysConfigService.java
index 0e48580..77c28cf 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/ISysConfigService.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/ISysConfigService.java
@@ -1,7 +1,8 @@
-package com.shopgoods.system.service;
+package com.shopgoods.system.server.service;
+
+import com.shopgoods.system.domain.SysConfig;
 
 import java.util.List;
-import com.shopgoods.system.domain.SysConfig;
 
 /**
  * 参数配置 服务层
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/ISysDeptService.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/ISysDeptService.java
similarity index 98%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/ISysDeptService.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/ISysDeptService.java
index e94e15f..0cd7ba8 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/ISysDeptService.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/ISysDeptService.java
@@ -1,9 +1,10 @@
-package com.shopgoods.system.service;
+package com.shopgoods.system.server.service;
 
-import java.util.List;
 import com.shopgoods.system.api.domain.SysDept;
 import com.shopgoods.system.domain.vo.TreeSelect;
 
+import java.util.List;
+
 /**
  * 部门管理 服务层
  * 
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/ISysDictDataService.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/ISysDictDataService.java
similarity index 96%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/ISysDictDataService.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/ISysDictDataService.java
index 2e87925..a4fb86f 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/ISysDictDataService.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/ISysDictDataService.java
@@ -1,7 +1,8 @@
-package com.shopgoods.system.service;
+package com.shopgoods.system.server.service;
+
+import com.shopgoods.system.api.domain.SysDictData;
 
 import java.util.List;
-import com.shopgoods.system.api.domain.SysDictData;
 
 /**
  * 字典 业务层
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/ISysDictTypeService.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/ISysDictTypeService.java
similarity index 97%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/ISysDictTypeService.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/ISysDictTypeService.java
index 53c2380..cb759fb 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/ISysDictTypeService.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/ISysDictTypeService.java
@@ -1,9 +1,10 @@
-package com.shopgoods.system.service;
+package com.shopgoods.system.server.service;
 
-import java.util.List;
 import com.shopgoods.system.api.domain.SysDictData;
 import com.shopgoods.system.api.domain.SysDictType;
 
+import java.util.List;
+
 /**
  * 字典 业务层
  * 
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/ISysLogininforService.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/ISysLogininforService.java
similarity index 94%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/ISysLogininforService.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/ISysLogininforService.java
index 40b7d00..2cecd86 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/ISysLogininforService.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/ISysLogininforService.java
@@ -1,7 +1,8 @@
-package com.shopgoods.system.service;
+package com.shopgoods.system.server.service;
+
+import com.shopgoods.system.api.domain.SysLogininfor;
 
 import java.util.List;
-import com.shopgoods.system.api.domain.SysLogininfor;
 
 /**
  * 系统访问日志情况信息 服务层
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/ISysMenuService.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/ISysMenuService.java
similarity index 98%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/ISysMenuService.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/ISysMenuService.java
index 8381515..d49091a 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/ISysMenuService.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/ISysMenuService.java
@@ -1,11 +1,12 @@
-package com.shopgoods.system.service;
+package com.shopgoods.system.server.service;
 
-import java.util.List;
-import java.util.Set;
 import com.shopgoods.system.domain.SysMenu;
 import com.shopgoods.system.domain.vo.RouterVo;
 import com.shopgoods.system.domain.vo.TreeSelect;
 
+import java.util.List;
+import java.util.Set;
+
 /**
  * 菜单 业务层
  * 
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/ISysNoticeService.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/ISysNoticeService.java
similarity index 96%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/ISysNoticeService.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/ISysNoticeService.java
index 85cc05a..632e315 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/ISysNoticeService.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/ISysNoticeService.java
@@ -1,7 +1,8 @@
-package com.shopgoods.system.service;
+package com.shopgoods.system.server.service;
+
+import com.shopgoods.system.domain.SysNotice;
 
 import java.util.List;
-import com.shopgoods.system.domain.SysNotice;
 
 /**
  * 公告 服务层
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/ISysOperLogService.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/ISysOperLogService.java
similarity index 95%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/ISysOperLogService.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/ISysOperLogService.java
index 0020760..c5f7436 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/ISysOperLogService.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/ISysOperLogService.java
@@ -1,7 +1,8 @@
-package com.shopgoods.system.service;
+package com.shopgoods.system.server.service;
+
+import com.shopgoods.system.api.domain.SysOperLog;
 
 import java.util.List;
-import com.shopgoods.system.api.domain.SysOperLog;
 
 /**
  * 操作日志 服务层
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/ISysPermissionService.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/ISysPermissionService.java
similarity index 92%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/ISysPermissionService.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/ISysPermissionService.java
index ce25134..afef354 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/ISysPermissionService.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/ISysPermissionService.java
@@ -1,9 +1,9 @@
-package com.shopgoods.system.service;
-
-import java.util.Set;
+package com.shopgoods.system.server.service;
 
 import com.shopgoods.system.api.domain.SysUser;
 
+import java.util.Set;
+
 /**
  * 权限信息 服务层
  * 
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/ISysPostService.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/ISysPostService.java
similarity index 97%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/ISysPostService.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/ISysPostService.java
index b4d7e35..606158b 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/ISysPostService.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/ISysPostService.java
@@ -1,7 +1,8 @@
-package com.shopgoods.system.service;
+package com.shopgoods.system.server.service;
+
+import com.shopgoods.system.domain.SysPost;
 
 import java.util.List;
-import com.shopgoods.system.domain.SysPost;
 
 /**
  * 岗位信息 服务层
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/ISysRoleService.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/ISysRoleService.java
similarity index 98%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/ISysRoleService.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/ISysRoleService.java
index c2812df..22fce45 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/ISysRoleService.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/ISysRoleService.java
@@ -1,9 +1,10 @@
-package com.shopgoods.system.service;
+package com.shopgoods.system.server.service;
+
+import com.shopgoods.system.api.domain.SysRole;
+import com.shopgoods.system.domain.SysUserRole;
 
 import java.util.List;
 import java.util.Set;
-import com.shopgoods.system.api.domain.SysRole;
-import com.shopgoods.system.domain.SysUserRole;
 
 /**
  * 角色业务层
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/ISysUserOnlineService.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/ISysUserOnlineService.java
similarity index 96%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/ISysUserOnlineService.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/ISysUserOnlineService.java
index 23a0671..1b81de7 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/ISysUserOnlineService.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/ISysUserOnlineService.java
@@ -1,4 +1,4 @@
-package com.shopgoods.system.service;
+package com.shopgoods.system.server.service;
 
 import com.shopgoods.system.api.model.LoginUser;
 import com.shopgoods.system.domain.SysUserOnline;
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/ISysUserService.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/ISysUserService.java
similarity index 98%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/ISysUserService.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/ISysUserService.java
index 263af33..2565aab 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/ISysUserService.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/ISysUserService.java
@@ -1,7 +1,8 @@
-package com.shopgoods.system.service;
+package com.shopgoods.system.server.service;
+
+import com.shopgoods.system.api.domain.SysUser;
 
 import java.util.List;
-import com.shopgoods.system.api.domain.SysUser;
 
 /**
  * 用户 业务层
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/impl/SysConfigServiceImpl.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/impl/SysConfigServiceImpl.java
similarity index 99%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/impl/SysConfigServiceImpl.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/impl/SysConfigServiceImpl.java
index 31c22e0..1bdbc85 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/impl/SysConfigServiceImpl.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/impl/SysConfigServiceImpl.java
@@ -1,10 +1,5 @@
-package com.shopgoods.system.service.impl;
+package com.shopgoods.system.server.service.impl;
 
-import java.util.Collection;
-import java.util.List;
-import javax.annotation.PostConstruct;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import com.shopgoods.common.core.constant.CacheConstants;
 import com.shopgoods.common.core.constant.UserConstants;
 import com.shopgoods.common.core.exception.ServiceException;
@@ -14,6 +9,12 @@ import com.shopgoods.common.redis.service.RedisService;
 import com.shopgoods.system.domain.SysConfig;
 import com.shopgoods.system.mapper.SysConfigMapper;
 import com.shopgoods.system.service.ISysConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PostConstruct;
+import java.util.Collection;
+import java.util.List;
 
 /**
  * 参数配置 服务层实现
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/impl/SysDeptServiceImpl.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/impl/SysDeptServiceImpl.java
similarity index 99%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/impl/SysDeptServiceImpl.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/impl/SysDeptServiceImpl.java
index 8ba0da3..e9bfac0 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/impl/SysDeptServiceImpl.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/impl/SysDeptServiceImpl.java
@@ -1,11 +1,5 @@
-package com.shopgoods.system.service.impl;
+package com.shopgoods.system.server.service.impl;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.stream.Collectors;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import com.shopgoods.common.core.constant.UserConstants;
 import com.shopgoods.common.core.exception.ServiceException;
 import com.shopgoods.common.core.text.Convert;
@@ -20,6 +14,13 @@ import com.shopgoods.system.domain.vo.TreeSelect;
 import com.shopgoods.system.mapper.SysDeptMapper;
 import com.shopgoods.system.mapper.SysRoleMapper;
 import com.shopgoods.system.service.ISysDeptService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 部门管理 服务实现
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/impl/SysDictDataServiceImpl.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/impl/SysDictDataServiceImpl.java
similarity index 98%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/impl/SysDictDataServiceImpl.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/impl/SysDictDataServiceImpl.java
index 55b61e0..7ad5de5 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/impl/SysDictDataServiceImpl.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/impl/SysDictDataServiceImpl.java
@@ -1,12 +1,13 @@
-package com.shopgoods.system.service.impl;
+package com.shopgoods.system.server.service.impl;
 
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import com.shopgoods.common.security.utils.DictUtils;
 import com.shopgoods.system.api.domain.SysDictData;
 import com.shopgoods.system.mapper.SysDictDataMapper;
 import com.shopgoods.system.service.ISysDictDataService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 字典 业务层处理
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/impl/SysDictTypeServiceImpl.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/impl/SysDictTypeServiceImpl.java
similarity index 99%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/impl/SysDictTypeServiceImpl.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/impl/SysDictTypeServiceImpl.java
index 2085988..67f6bbe 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/impl/SysDictTypeServiceImpl.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/impl/SysDictTypeServiceImpl.java
@@ -1,13 +1,5 @@
-package com.shopgoods.system.service.impl;
+package com.shopgoods.system.server.service.impl;
 
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import javax.annotation.PostConstruct;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import com.shopgoods.common.core.constant.UserConstants;
 import com.shopgoods.common.core.exception.ServiceException;
 import com.shopgoods.common.core.utils.StringUtils;
@@ -17,6 +9,15 @@ import com.shopgoods.system.api.domain.SysDictType;
 import com.shopgoods.system.mapper.SysDictDataMapper;
 import com.shopgoods.system.mapper.SysDictTypeMapper;
 import com.shopgoods.system.service.ISysDictTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.PostConstruct;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 字典 业务层处理
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/impl/SysLogininforServiceImpl.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/impl/SysLogininforServiceImpl.java
similarity index 96%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/impl/SysLogininforServiceImpl.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/impl/SysLogininforServiceImpl.java
index d473142..438792f 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/impl/SysLogininforServiceImpl.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/impl/SysLogininforServiceImpl.java
@@ -1,11 +1,12 @@
-package com.shopgoods.system.service.impl;
+package com.shopgoods.system.server.service.impl;
 
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import com.shopgoods.system.api.domain.SysLogininfor;
 import com.shopgoods.system.mapper.SysLogininforMapper;
 import com.shopgoods.system.service.ISysLogininforService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 系统访问日志情况信息 服务层处理
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/impl/SysMenuServiceImpl.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/impl/SysMenuServiceImpl.java
similarity index 98%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/impl/SysMenuServiceImpl.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/impl/SysMenuServiceImpl.java
index 861e82e..5218f59 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/impl/SysMenuServiceImpl.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/impl/SysMenuServiceImpl.java
@@ -1,15 +1,5 @@
-package com.shopgoods.system.service.impl;
+package com.shopgoods.system.server.service.impl;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import com.shopgoods.common.core.constant.Constants;
 import com.shopgoods.common.core.constant.UserConstants;
 import com.shopgoods.common.core.utils.StringUtils;
@@ -24,6 +14,11 @@ import com.shopgoods.system.mapper.SysMenuMapper;
 import com.shopgoods.system.mapper.SysRoleMapper;
 import com.shopgoods.system.mapper.SysRoleMenuMapper;
 import com.shopgoods.system.service.ISysMenuService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 菜单 业务层处理
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/impl/SysNoticeServiceImpl.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/impl/SysNoticeServiceImpl.java
similarity index 97%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/impl/SysNoticeServiceImpl.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/impl/SysNoticeServiceImpl.java
index 0cf0c5b..a4c4176 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/impl/SysNoticeServiceImpl.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/impl/SysNoticeServiceImpl.java
@@ -1,11 +1,12 @@
-package com.shopgoods.system.service.impl;
+package com.shopgoods.system.server.service.impl;
 
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import com.shopgoods.system.domain.SysNotice;
 import com.shopgoods.system.mapper.SysNoticeMapper;
 import com.shopgoods.system.service.ISysNoticeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 公告 服务层实现
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/impl/SysOperLogServiceImpl.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/impl/SysOperLogServiceImpl.java
similarity index 97%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/impl/SysOperLogServiceImpl.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/impl/SysOperLogServiceImpl.java
index 77aff13..e31d977 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/impl/SysOperLogServiceImpl.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/impl/SysOperLogServiceImpl.java
@@ -1,11 +1,12 @@
-package com.shopgoods.system.service.impl;
+package com.shopgoods.system.server.service.impl;
 
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import com.shopgoods.system.api.domain.SysOperLog;
 import com.shopgoods.system.mapper.SysOperLogMapper;
 import com.shopgoods.system.service.ISysOperLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 操作日志 服务层处理
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/impl/SysPermissionServiceImpl.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/impl/SysPermissionServiceImpl.java
similarity index 98%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/impl/SysPermissionServiceImpl.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/impl/SysPermissionServiceImpl.java
index 7ff788e..e20dd15 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/impl/SysPermissionServiceImpl.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/impl/SysPermissionServiceImpl.java
@@ -1,11 +1,5 @@
-package com.shopgoods.system.service.impl;
+package com.shopgoods.system.server.service.impl;
 
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 import com.shopgoods.common.core.constant.UserConstants;
 import com.shopgoods.common.core.utils.StringUtils;
 import com.shopgoods.system.api.domain.SysRole;
@@ -13,6 +7,13 @@ import com.shopgoods.system.api.domain.SysUser;
 import com.shopgoods.system.service.ISysMenuService;
 import com.shopgoods.system.service.ISysPermissionService;
 import com.shopgoods.system.service.ISysRoleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 /**
  * 用户权限处理
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/impl/SysPostServiceImpl.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/impl/SysPostServiceImpl.java
similarity index 98%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/impl/SysPostServiceImpl.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/impl/SysPostServiceImpl.java
index bd4128a..c906490 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/impl/SysPostServiceImpl.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/impl/SysPostServiceImpl.java
@@ -1,8 +1,5 @@
-package com.shopgoods.system.service.impl;
+package com.shopgoods.system.server.service.impl;
 
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import com.shopgoods.common.core.constant.UserConstants;
 import com.shopgoods.common.core.exception.ServiceException;
 import com.shopgoods.common.core.utils.StringUtils;
@@ -10,6 +7,10 @@ import com.shopgoods.system.domain.SysPost;
 import com.shopgoods.system.mapper.SysPostMapper;
 import com.shopgoods.system.mapper.SysUserPostMapper;
 import com.shopgoods.system.service.ISysPostService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 岗位信息 服务层处理
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/impl/SysRoleServiceImpl.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/impl/SysRoleServiceImpl.java
similarity index 98%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/impl/SysRoleServiceImpl.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/impl/SysRoleServiceImpl.java
index 4b13aab..43d5a34 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/impl/SysRoleServiceImpl.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/impl/SysRoleServiceImpl.java
@@ -1,13 +1,5 @@
-package com.shopgoods.system.service.impl;
+package com.shopgoods.system.server.service.impl;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import com.shopgoods.common.core.constant.UserConstants;
 import com.shopgoods.common.core.exception.ServiceException;
 import com.shopgoods.common.core.utils.SpringUtils;
@@ -24,6 +16,11 @@ import com.shopgoods.system.mapper.SysRoleMapper;
 import com.shopgoods.system.mapper.SysRoleMenuMapper;
 import com.shopgoods.system.mapper.SysUserRoleMapper;
 import com.shopgoods.system.service.ISysRoleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
 
 /**
  * 角色 业务层处理
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/impl/SysUserOnlineServiceImpl.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/impl/SysUserOnlineServiceImpl.java
similarity index 97%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/impl/SysUserOnlineServiceImpl.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/impl/SysUserOnlineServiceImpl.java
index 0c9f410..e79aac0 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/impl/SysUserOnlineServiceImpl.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/impl/SysUserOnlineServiceImpl.java
@@ -1,10 +1,10 @@
-package com.shopgoods.system.service.impl;
+package com.shopgoods.system.server.service.impl;
 
-import org.springframework.stereotype.Service;
 import com.shopgoods.common.core.utils.StringUtils;
 import com.shopgoods.system.api.model.LoginUser;
 import com.shopgoods.system.domain.SysUserOnline;
 import com.shopgoods.system.service.ISysUserOnlineService;
+import org.springframework.stereotype.Service;
 
 /**
  * 在线用户 服务层处理
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/impl/SysUserServiceImpl.java b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/impl/SysUserServiceImpl.java
similarity index 98%
rename from shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/impl/SysUserServiceImpl.java
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/impl/SysUserServiceImpl.java
index 1809499..7126fac 100644
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/service/impl/SysUserServiceImpl.java
+++ b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/java/com/shopgoods/system/server/service/impl/SysUserServiceImpl.java
@@ -1,15 +1,5 @@
-package com.shopgoods.system.service.impl;
+package com.shopgoods.system.server.service.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-import javax.validation.Validator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 import com.shopgoods.common.core.constant.UserConstants;
 import com.shopgoods.common.core.exception.ServiceException;
 import com.shopgoods.common.core.utils.SpringUtils;
@@ -22,14 +12,21 @@ import com.shopgoods.system.api.domain.SysUser;
 import com.shopgoods.system.domain.SysPost;
 import com.shopgoods.system.domain.SysUserPost;
 import com.shopgoods.system.domain.SysUserRole;
-import com.shopgoods.system.mapper.SysPostMapper;
-import com.shopgoods.system.mapper.SysRoleMapper;
-import com.shopgoods.system.mapper.SysUserMapper;
-import com.shopgoods.system.mapper.SysUserPostMapper;
-import com.shopgoods.system.mapper.SysUserRoleMapper;
+import com.shopgoods.system.mapper.*;
 import com.shopgoods.system.service.ISysConfigService;
 import com.shopgoods.system.service.ISysDeptService;
 import com.shopgoods.system.service.ISysUserService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import javax.validation.Validator;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 用户 业务层处理
diff --git a/shopgoods-modules/shopgoods-system/src/main/resources/banner.txt b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/resources/banner.txt
similarity index 100%
rename from shopgoods-modules/shopgoods-system/src/main/resources/banner.txt
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/resources/banner.txt
diff --git a/shopgoods-modules/shopgoods-system/src/main/resources/bootstrap.yml b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/resources/bootstrap.yml
similarity index 100%
rename from shopgoods-modules/shopgoods-system/src/main/resources/bootstrap.yml
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/resources/bootstrap.yml
diff --git a/shopgoods-modules/shopgoods-system/src/main/resources/logback.xml b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/resources/logback.xml
similarity index 100%
rename from shopgoods-modules/shopgoods-system/src/main/resources/logback.xml
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/resources/logback.xml
diff --git a/shopgoods-modules/shopgoods-system/src/main/resources/mapper/system/SysConfigMapper.xml b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/resources/mapper/system/SysConfigMapper.xml
similarity index 100%
rename from shopgoods-modules/shopgoods-system/src/main/resources/mapper/system/SysConfigMapper.xml
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/resources/mapper/system/SysConfigMapper.xml
diff --git a/shopgoods-modules/shopgoods-system/src/main/resources/mapper/system/SysDeptMapper.xml b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/resources/mapper/system/SysDeptMapper.xml
similarity index 100%
rename from shopgoods-modules/shopgoods-system/src/main/resources/mapper/system/SysDeptMapper.xml
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/resources/mapper/system/SysDeptMapper.xml
diff --git a/shopgoods-modules/shopgoods-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/resources/mapper/system/SysDictDataMapper.xml
similarity index 100%
rename from shopgoods-modules/shopgoods-system/src/main/resources/mapper/system/SysDictDataMapper.xml
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/resources/mapper/system/SysDictDataMapper.xml
diff --git a/shopgoods-modules/shopgoods-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/resources/mapper/system/SysDictTypeMapper.xml
similarity index 100%
rename from shopgoods-modules/shopgoods-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/resources/mapper/system/SysDictTypeMapper.xml
diff --git a/shopgoods-modules/shopgoods-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/resources/mapper/system/SysLogininforMapper.xml
similarity index 100%
rename from shopgoods-modules/shopgoods-system/src/main/resources/mapper/system/SysLogininforMapper.xml
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/resources/mapper/system/SysLogininforMapper.xml
diff --git a/shopgoods-modules/shopgoods-system/src/main/resources/mapper/system/SysMenuMapper.xml b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/resources/mapper/system/SysMenuMapper.xml
similarity index 100%
rename from shopgoods-modules/shopgoods-system/src/main/resources/mapper/system/SysMenuMapper.xml
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/resources/mapper/system/SysMenuMapper.xml
diff --git a/shopgoods-modules/shopgoods-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/resources/mapper/system/SysNoticeMapper.xml
similarity index 100%
rename from shopgoods-modules/shopgoods-system/src/main/resources/mapper/system/SysNoticeMapper.xml
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/resources/mapper/system/SysNoticeMapper.xml
diff --git a/shopgoods-modules/shopgoods-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/resources/mapper/system/SysOperLogMapper.xml
similarity index 100%
rename from shopgoods-modules/shopgoods-system/src/main/resources/mapper/system/SysOperLogMapper.xml
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/resources/mapper/system/SysOperLogMapper.xml
diff --git a/shopgoods-modules/shopgoods-system/src/main/resources/mapper/system/SysPostMapper.xml b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/resources/mapper/system/SysPostMapper.xml
similarity index 100%
rename from shopgoods-modules/shopgoods-system/src/main/resources/mapper/system/SysPostMapper.xml
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/resources/mapper/system/SysPostMapper.xml
diff --git a/shopgoods-modules/shopgoods-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/resources/mapper/system/SysRoleDeptMapper.xml
similarity index 100%
rename from shopgoods-modules/shopgoods-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/resources/mapper/system/SysRoleDeptMapper.xml
diff --git a/shopgoods-modules/shopgoods-system/src/main/resources/mapper/system/SysRoleMapper.xml b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/resources/mapper/system/SysRoleMapper.xml
similarity index 100%
rename from shopgoods-modules/shopgoods-system/src/main/resources/mapper/system/SysRoleMapper.xml
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/resources/mapper/system/SysRoleMapper.xml
diff --git a/shopgoods-modules/shopgoods-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/resources/mapper/system/SysRoleMenuMapper.xml
similarity index 100%
rename from shopgoods-modules/shopgoods-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/resources/mapper/system/SysRoleMenuMapper.xml
diff --git a/shopgoods-modules/shopgoods-system/src/main/resources/mapper/system/SysUserMapper.xml b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/resources/mapper/system/SysUserMapper.xml
similarity index 100%
rename from shopgoods-modules/shopgoods-system/src/main/resources/mapper/system/SysUserMapper.xml
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/resources/mapper/system/SysUserMapper.xml
diff --git a/shopgoods-modules/shopgoods-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/resources/mapper/system/SysUserPostMapper.xml
similarity index 100%
rename from shopgoods-modules/shopgoods-system/src/main/resources/mapper/system/SysUserPostMapper.xml
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/resources/mapper/system/SysUserPostMapper.xml
diff --git a/shopgoods-modules/shopgoods-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/resources/mapper/system/SysUserRoleMapper.xml
similarity index 100%
rename from shopgoods-modules/shopgoods-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
rename to shopgoods-modules/shopgoods-system/shopgoods-system-server/src/main/resources/mapper/system/SysUserRoleMapper.xml
diff --git a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/Test.java b/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/Test.java
deleted file mode 100644
index b1858ef..0000000
--- a/shopgoods-modules/shopgoods-system/src/main/java/com/shopgoods/system/Test.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.shopgoods.system;
-
-import java.util.Arrays;
-
-public class Test {
-
-    /**
-     * 有数组【3，56，23，12，21】，使用冒泡算法进行排序
-     */
-    public static void main(String[] args) {
-        int[] arr = {3, 56, 23, 12, 21};
-        for (int i = 0; i < arr.length - 1; i++) {
-            for (int j = 0; j < arr.length - 1 - i; j++) {
-                if (arr[j] > arr[j + 1]) {
-                    int temp = arr[j];
-                    arr[j] = arr[j + 1];
-                    arr[j + 1] = temp;
-
-                }
-            }
-            //打印每一轮的结果
-            System.out.println("第 "+(i+1)+"轮："+ Arrays.toString(arr));
-        }
-
-    }
-
-
-    /**
-     * 冒泡排序
-     */
-//    public static void main(String[] args) {
-//        int[] n={5,99,58,67,12};
-//        for (int i = 0; i < n.length-1; i++) {
-//            for (int j = 0; j < n.length-1-i; j++) {
-//                if (n[j] > n[j+1]){
-//                    int temp =n[j];
-//                    n[j] =n[j+1];
-//                    n[j+1] = temp;
-//                }
-//            }
-//            //打印结果
-//            System.out.println("第 "+(i+1)+"轮："+Arrays.toString(n));
-//        }
-//    }
-}