diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/BasicsController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/BasicsController.java index 09df8c87..fb721140 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/BasicsController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/BasicsController.java @@ -1,7 +1,7 @@ package com.hxkj.admin.controller.setting; import com.hxkj.admin.config.aop.Log; -import com.hxkj.admin.service.setting.IBasicsService; +import com.hxkj.admin.service.setting.ISettingBasicsService; import com.hxkj.common.core.AjaxResult; import org.springframework.web.bind.annotation.*; @@ -16,7 +16,7 @@ import java.util.Map; public class BasicsController { @Resource - IBasicsService iBasicsService; + ISettingBasicsService iBasicsService; /** * “获取”网站信息 diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/StorageController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/StorageController.java index 2fdfe97b..39754ca2 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/StorageController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/StorageController.java @@ -1,7 +1,7 @@ package com.hxkj.admin.controller.setting; import com.baomidou.mybatisplus.core.toolkit.Assert; -import com.hxkj.admin.service.setting.IStorageService; +import com.hxkj.admin.service.setting.ISettingStorageService; import com.hxkj.common.core.AjaxResult; import org.springframework.web.bind.annotation.*; @@ -14,7 +14,7 @@ import java.util.Map; public class StorageController { @Resource - IStorageService iStorageService; + ISettingStorageService iStorageService; /** * 存储列表 diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemAdminController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/AdminController.java similarity index 99% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemAdminController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/system/AdminController.java index 59e71783..ff2ffef4 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemAdminController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/AdminController.java @@ -21,7 +21,7 @@ import java.util.Map; */ @RestController @RequestMapping("api/system/admin") -public class SystemAdminController { +public class AdminController { @Resource ISystemAdminService iSystemAdminService; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemDeptController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/DeptController.java similarity index 98% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemDeptController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/system/DeptController.java index 766c4dee..a2d2edd8 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemDeptController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/DeptController.java @@ -18,7 +18,7 @@ import java.util.Map; */ @RestController @RequestMapping("api/system/dept") -public class SystemDeptController { +public class DeptController { @Resource ISystemDeptService iSystemDeptService; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLogController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/LogController.java similarity index 97% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLogController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/system/LogController.java index 55ad07cb..a3f84679 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLogController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/LogController.java @@ -20,7 +20,7 @@ import java.util.Map; */ @RestController @RequestMapping("api/system/log") -public class SystemLogController { +public class LogController { @Resource ISystemLogServer iSystemLogServer; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLoginController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/LoginController.java similarity index 98% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLoginController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/system/LoginController.java index 2f7172b8..af3d4d29 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLoginController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/LoginController.java @@ -20,7 +20,7 @@ import java.util.Map; */ @RestController @RequestMapping("api/system") -public class SystemLoginController { +public class LoginController { @Resource ISystemLoginService iSystemLoginService; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemMenuController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/MenuController.java similarity index 98% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemMenuController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/system/MenuController.java index 5040d5f2..6f6c7067 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemMenuController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/MenuController.java @@ -18,7 +18,7 @@ import javax.annotation.Resource; */ @RestController @RequestMapping("api/system/menu") -public class SystemMenuController { +public class MenuController { @Resource ISystemMenuService iSystemMenuService; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemPostController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/PostController.java similarity index 98% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemPostController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/system/PostController.java index f124010d..bd704370 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemPostController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/PostController.java @@ -16,7 +16,7 @@ import java.util.Map; @RestController @RequestMapping("api/system/post") -public class SystemPostController { +public class PostController { @Resource ISystemPostService iSystemPostService; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemRoleController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/RoleController.java similarity index 98% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemRoleController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/system/RoleController.java index 175d8d1a..6c71bd4f 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemRoleController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/RoleController.java @@ -18,7 +18,7 @@ import javax.annotation.Resource; */ @RestController @RequestMapping("api/system/role") -public class SystemRoleController { +public class RoleController { @Resource ISystemRoleService iSystemRoleService; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/IBasicsService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingBasicsService.java similarity index 94% rename from server/like-admin/src/main/java/com/hxkj/admin/service/setting/IBasicsService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingBasicsService.java index e2c37e73..5d84c4cb 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/IBasicsService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingBasicsService.java @@ -5,7 +5,7 @@ import java.util.Map; /** * 基础配置服务接口类 */ -public interface IBasicsService { +public interface ISettingBasicsService { /** * 获取网站信息 diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/IStorageService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingStorageService.java similarity index 94% rename from server/like-admin/src/main/java/com/hxkj/admin/service/setting/IStorageService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingStorageService.java index d1843ae7..7fe61714 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/IStorageService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingStorageService.java @@ -6,7 +6,7 @@ import java.util.Map; /** * 存储配置接口类 */ -public interface IStorageService { +public interface ISettingStorageService { /** * 存储列表 diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/BasicsServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingBasicsServiceImpl.java similarity index 95% rename from server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/BasicsServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingBasicsServiceImpl.java index c0550ce3..f71395e7 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/BasicsServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingBasicsServiceImpl.java @@ -1,6 +1,6 @@ package com.hxkj.admin.service.setting.impl; -import com.hxkj.admin.service.setting.IBasicsService; +import com.hxkj.admin.service.setting.ISettingBasicsService; import com.hxkj.common.utils.ConfigUtil; import com.hxkj.common.utils.UrlUtil; import org.springframework.stereotype.Service; @@ -12,7 +12,7 @@ import java.util.Map; * 基础配置服务实现类 */ @Service -public class BasicsServiceImpl implements IBasicsService { +public class SettingBasicsServiceImpl implements ISettingBasicsService { /** * 获取网站信息 diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/StorageServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingStorageServiceImpl.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/StorageServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingStorageServiceImpl.java index 5e40e923..4c5ee856 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/StorageServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingStorageServiceImpl.java @@ -2,7 +2,7 @@ package com.hxkj.admin.service.setting.impl; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.Assert; -import com.hxkj.admin.service.setting.IStorageService; +import com.hxkj.admin.service.setting.ISettingStorageService; import com.hxkj.common.utils.ConfigUtil; import org.springframework.stereotype.Service; @@ -12,7 +12,7 @@ import java.util.*; * 存储配置实现类 */ @Service -public class StorageServiceImpl implements IStorageService { +public class SettingStorageServiceImpl implements ISettingStorageService { /** * 存储列表 @@ -26,7 +26,7 @@ public class StorageServiceImpl implements IStorageService { List> list = new LinkedList<>(); Map local = new LinkedHashMap<>(); - local.put("alias", "qiniu"); + local.put("alias", "local"); local.put("describe", "存储在本地服务器"); local.put("status", engine.equals("local") ? 1 : 0); list.add(local);