diff --git a/admin/src/utils/request/index.ts b/admin/src/utils/request/index.ts index 228d41f6..e8ec36f3 100644 --- a/admin/src/utils/request/index.ts +++ b/admin/src/utils/request/index.ts @@ -35,7 +35,7 @@ const axiosHooks: AxiosHooks = { config.params = {} } config.headers = headers - config.url = config.url?.replace(".", "/") + // config.url = config.url?.replace(".", "/") return config }, requestInterceptorsCatchHook(err) { diff --git a/admin/src/views/channel/wx_oa/menu.vue b/admin/src/views/channel/wx_oa/menu.vue index c237265b..49141cf0 100644 --- a/admin/src/views/channel/wx_oa/menu.vue +++ b/admin/src/views/channel/wx_oa/menu.vue @@ -31,10 +31,10 @@ getOaMenuFunc() - + 保存 - + 发布 diff --git a/admin/src/views/decoration/pages/index.vue b/admin/src/views/decoration/pages/index.vue index 9e53000c..00ce37a4 100644 --- a/admin/src/views/decoration/pages/index.vue +++ b/admin/src/views/decoration/pages/index.vue @@ -23,7 +23,7 @@ @update:content="updateContent" /> - + 保存 diff --git a/admin/src/views/decoration/pc_details.vue b/admin/src/views/decoration/pc_details.vue index 000cb813..9dd40c7b 100644 --- a/admin/src/views/decoration/pc_details.vue +++ b/admin/src/views/decoration/pc_details.vue @@ -11,7 +11,7 @@ > 返回 - 保存 + 保存
diff --git a/admin/src/views/decoration/tabbar.vue b/admin/src/views/decoration/tabbar.vue index 3ea6f63e..9a2e22d4 100644 --- a/admin/src/views/decoration/tabbar.vue +++ b/admin/src/views/decoration/tabbar.vue @@ -34,7 +34,7 @@
- + 保存 diff --git a/server/like-admin/src/main/java/com/mdd/admin/LikeAdminInterceptor.java b/server/like-admin/src/main/java/com/mdd/admin/LikeAdminInterceptor.java index 7e891238..cbf0ee81 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/LikeAdminInterceptor.java +++ b/server/like-admin/src/main/java/com/mdd/admin/LikeAdminInterceptor.java @@ -73,7 +73,8 @@ public class LikeAdminInterceptor implements HandlerInterceptor { if (StringUtils.isNotNull(env) && env.equals("true")) { String prefix = "/adminapi/"; String route = request.getRequestURI().replaceFirst(prefix, ""); - String auths = route.replace("/", ":"); +// String auths = route.replace("/", ":"); + String auths = route; List ignoreUrl = Arrays.asList("system:login", "system:logout"); if (request.getMethod().equals("POST") && !ignoreUrl.contains(auths)) { String message = "演示环境不支持修改数据，请下载源码本地部署体验"; @@ -208,8 +209,8 @@ public class LikeAdminInterceptor implements HandlerInterceptor { // 路由转权限 String prefix = "/adminapi/"; String route = uri.replaceFirst(prefix, ""); - String auths = route.replace("/", ":"); - +// String auths = route.replace("/", ":"); + String auths = route; // 校验权限 StpUtil.checkPermission(auths); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/config/stp/StpInterConfig.java b/server/like-admin/src/main/java/com/mdd/admin/config/stp/StpInterConfig.java index 02957cf2..6ecf24fc 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/config/stp/StpInterConfig.java +++ b/server/like-admin/src/main/java/com/mdd/admin/config/stp/StpInterConfig.java @@ -68,7 +68,8 @@ public class StpInterConfig implements StpInterface { for (SystemMenu item : systemAuthMenus) { if (StringUtils.isNotNull(item.getPerms()) && StringUtils.isNotEmpty(item.getPerms())) { - perms.add(item.getPerms().trim().replace("/", ":")); +// perms.add(item.getPerms().trim().replace("/", ":")); + perms.add(item.getPerms().trim()); } } diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/ArtCateController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/ArtCateController.java index 29057403..96b82e39 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/ArtCateController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/ArtCateController.java @@ -21,7 +21,7 @@ import javax.annotation.Resource; import java.util.List; @RestController -@RequestMapping("/adminapi/article/articleCate") +@RequestMapping({"/adminapi/article/articleCate", "/adminapi/article.articleCate"}) @Api(tags = "文章分类管理") public class ArtCateController { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/ArticleController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/ArticleController.java index 1249a93b..bb615175 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/ArticleController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/ArticleController.java @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @RestController -@RequestMapping("adminapi/article/article") +@RequestMapping({"adminapi/article/article", "adminapi/article.article"}) @Api(tags = "文章数据管理") public class ArticleController { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/CrontabController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/CrontabController.java index 18be180d..bb47eafa 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/CrontabController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/CrontabController.java @@ -24,7 +24,7 @@ import java.text.SimpleDateFormat; import java.util.*; @RestController -@RequestMapping("/adminapi/crontab/crontab") +@RequestMapping("/adminapi/crontab.crontab") @Api(tags = "计划任务管理") public class CrontabController { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/adminapi/auth/AdminController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/adminapi/auth/AdminController.java index b686cc17..3e446f31 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/adminapi/auth/AdminController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/adminapi/auth/AdminController.java @@ -21,7 +21,7 @@ import java.util.Map; @Slf4j @RestController -@RequestMapping("adminapi/auth/admin") +@RequestMapping({"adminapi/auth/admin", "adminapi/auth.admin"}) @Api(tags = "管理员详情管理") public class AdminController { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelH5Controller.java b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelH5Controller.java index c5910200..65b70c65 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelH5Controller.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelH5Controller.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @RestController -@RequestMapping("/adminapi/channel/web_page_setting") +@RequestMapping("/adminapi/channel.web_page_setting") @Api(tags = "移动渠道设置") public class ChannelH5Controller { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelMpController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelMpController.java index c5fcdbb4..e81bdb7e 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelMpController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelMpController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @RestController -@RequestMapping("/adminapi/channel/mnp_settings") +@RequestMapping("/adminapi/channel.mnp_settings") @Api(tags = "微信程序渠道") public class ChannelMpController { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOaController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOaController.java index 62de44a8..47afe4c4 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOaController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOaController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @RestController -@RequestMapping("/adminapi/channel/official_account_setting") +@RequestMapping("/adminapi/channel.official_account_setting") @Api(tags = "公众号渠道设置") public class ChannelOaController { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOaMenuController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOaMenuController.java index 56f62bcc..daad9afb 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOaMenuController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOaMenuController.java @@ -11,7 +11,7 @@ import javax.annotation.Resource; import java.util.List; @RestController -@RequestMapping("/adminapi/channel/official_account_menu") +@RequestMapping("/adminapi/channel.official_account_menu") @Api(tags = "公众号菜单管理") public class ChannelOaMenuController { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOaReplyController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOaReplyController.java index 88cca0a7..9a6d1f3f 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOaReplyController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOaReplyController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @RestController -@RequestMapping("/adminapi/channel/official_account_reply") +@RequestMapping("/adminapi/channel.official_account_reply") @Api(tags = "公众号回复") public class ChannelOaReplyController { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOpController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOpController.java index 25e4dc73..6931e335 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOpController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOpController.java @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @RestController -@RequestMapping("/adminapi/channel/open_setting/") +@RequestMapping("/adminapi/channel.open_setting/") @Api(tags = "微信开放渠道") public class ChannelOpController { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DecorateDataController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DecorateDataController.java index 1c2fb22a..3b7da90a 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DecorateDataController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DecorateDataController.java @@ -16,7 +16,7 @@ import javax.annotation.Resource; import java.util.List; @RestController -@RequestMapping("/adminapi/decorate/data") +@RequestMapping("/adminapi/decorate.data") @Api(tags = "装修数据管理") public class DecorateDataController { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DecoratePagesController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DecoratePagesController.java index e292f18e..56f01370 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DecoratePagesController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DecoratePagesController.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @RestController -@RequestMapping("/adminapi/decorate/page") +@RequestMapping("/adminapi/decorate.page") @Api(tags = "装修页面管理") public class DecoratePagesController { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DecorateTabbarController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DecorateTabbarController.java index e528a32e..a4d66255 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DecorateTabbarController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DecorateTabbarController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @RestController -@RequestMapping("/adminapi/decorate/tabbar") +@RequestMapping("/adminapi/decorate.tabbar") @Api(tags = "装修导航管理") public class DecorateTabbarController { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/finance/FinanceRechargerController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/finance/FinanceRechargerController.java index ba42f840..283a5ab1 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/finance/FinanceRechargerController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/finance/FinanceRechargerController.java @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @RestController -@RequestMapping("/adminapi/recharge/recharge") +@RequestMapping({"/adminapi/recharge/recharge", "/adminapi/recharge.recharge"}) @Api("充值记录管理") public class FinanceRechargerController { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/finance/FinanceRefundController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/finance/FinanceRefundController.java index e27544a2..28215bde 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/finance/FinanceRefundController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/finance/FinanceRefundController.java @@ -5,6 +5,7 @@ import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.validate.finance.FinanceRefundSearchValidate; import com.mdd.admin.vo.finance.FinanceRefundListVo; import com.mdd.admin.vo.finance.FinanceRefundLogVo; +import com.mdd.common.aop.NotPower; import com.mdd.common.core.AjaxResult; import com.mdd.common.core.PageResult; import com.mdd.common.validator.annotation.IDMust; @@ -20,13 +21,14 @@ import javax.annotation.Resource; import java.util.List; @RestController -@RequestMapping("/adminapi/finance/refund") +@RequestMapping("/adminapi/finance.refund") @Api("退款记录管理") public class FinanceRefundController { @Resource IFinanceRefundService iFinanceRefundService; + @NotPower @GetMapping("/stat") @ApiOperation("退还统计") public AjaxResult stat() { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/finance/FinanceWalletController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/finance/FinanceWalletController.java index feffc869..830e5632 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/finance/FinanceWalletController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/finance/FinanceWalletController.java @@ -4,6 +4,7 @@ import com.mdd.admin.service.IFinanceWalletService; import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.validate.finance.FinanceWalletSearchValidate; import com.mdd.admin.vo.finance.FinanceWalletListVo; +import com.mdd.common.aop.NotPower; import com.mdd.common.core.AjaxResult; import com.mdd.common.core.PageResult; import io.swagger.annotations.Api; @@ -17,7 +18,7 @@ import javax.annotation.Resource; import java.util.Map; @RestController -@RequestMapping("/adminapi/finance/account_log") +@RequestMapping("/adminapi/finance.account_log") @Api("余额明细管理") public class FinanceWalletController { @@ -33,6 +34,7 @@ public class FinanceWalletController { } + @NotPower @GetMapping("/getUmChangeType") @ApiOperation("记录列表") public AjaxResult> getUmChangeType() { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/marketing/MarketingRechargeController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/marketing/MarketingRechargeController.java index 96d50b16..622c43c7 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/marketing/MarketingRechargeController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/marketing/MarketingRechargeController.java @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @RestController -@RequestMapping("adminapi/recharge/recharge") +@RequestMapping({"adminapi/recharge/recharge", "adminapi/recharge.recharge"}) @Api("营销充值管理") public class MarketingRechargeController { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/monitor/MonitorServerController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/monitor/MonitorServerController.java index 5313acda..07921fe0 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/monitor/MonitorServerController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/monitor/MonitorServerController.java @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.Map; @RestController -@RequestMapping("adminapi/setting/system.system") +@RequestMapping("adminapi/setting.system.system") @Api(tags = "监控服务管理") public class MonitorServerController { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingDictDataController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingDictDataController.java index 51b1f510..841db3b1 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingDictDataController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingDictDataController.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; @RestController -@RequestMapping("/adminapi/setting/dict.dict_data") +@RequestMapping("/adminapi/setting.dict.dict_data") @Api(tags = "配置字典数据") public class SettingDictDataController { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingDictTypeController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingDictTypeController.java index 1e7f964c..9e90d9a3 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingDictTypeController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingDictTypeController.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.Map; @RestController -@RequestMapping("/adminapi/setting/dict.dict_type") +@RequestMapping("/adminapi/setting.dict.dict_type") @Api(tags = "配置字典类型") public class SettingDictTypeController { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingLoginController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingLoginController.java index 621bd69f..1d05f0d7 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingLoginController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingLoginController.java @@ -14,7 +14,7 @@ import javax.annotation.Resource; import java.util.Map; @RestController -@RequestMapping("/adminapi/setting/user.user") +@RequestMapping("/adminapi/setting.user.user") @Api(tags = "配置用户登录") public class SettingLoginController { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingNoticeController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingNoticeController.java index 15a42b36..28197858 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingNoticeController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingNoticeController.java @@ -17,7 +17,7 @@ import java.util.List; import java.util.Map; @RestController -@RequestMapping("/adminapi/notice/notice") +@RequestMapping("/adminapi/notice.notice") @Api(tags = "配置消息通知") public class SettingNoticeController { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingPayConfigController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingPayConfigController.java index 3ba4e33a..1c1c6ed6 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingPayConfigController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingPayConfigController.java @@ -17,7 +17,7 @@ import javax.annotation.Resource; import java.util.List; @RestController -@RequestMapping("/adminapi/setting/pay.pay_config") +@RequestMapping("/adminapi/setting.pay.pay_config") @Api(tags = "配置支付参数") public class SettingPayConfigController { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingPayWayController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingPayWayController.java index af12475f..3a1439f0 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingPayWayController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingPayWayController.java @@ -19,7 +19,7 @@ import java.util.HashMap; import java.util.List; @RestController -@RequestMapping("/adminapi/setting/pay.pay_way") +@RequestMapping("/adminapi/setting.pay.pay_way") @Api(tags = "配置支付参数") public class SettingPayWayController { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingSearchController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingSearchController.java index c06b28e3..4648f891 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingSearchController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingSearchController.java @@ -14,7 +14,7 @@ import javax.annotation.Resource; import java.util.Map; @RestController -@RequestMapping("/adminapi/setting/hot_search") +@RequestMapping("/adminapi/setting.hot_search") @Api(tags = "配置热门搜索") public class SettingSearchController { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingSmsController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingSmsController.java index a98836c5..994bda53 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingSmsController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingSmsController.java @@ -16,7 +16,7 @@ import java.util.Map; * 短信设置管理 */ @RestController -@RequestMapping("/adminapi/notice/sms_config") +@RequestMapping("/adminapi/notice.sms_config") @Api(tags = "配置短信引擎") public class SettingSmsController { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingStorageController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingStorageController.java index 088ff917..5d619f42 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingStorageController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingStorageController.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.Map; @RestController -@RequestMapping("/adminapi/setting/storage") +@RequestMapping("/adminapi/setting.storage") @Api(tags = "配置存储方式") public class SettingStorageController { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingUserController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingUserController.java index f597bc4a..b8e11411 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingUserController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingUserController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @RestController -@RequestMapping("/adminapi/setting/user.user") +@RequestMapping("/adminapi/setting.user.user") @Api(tags = "配置用户参数") public class SettingUserController { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingWebsiteController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingWebsiteController.java index 54501a23..dd40780d 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingWebsiteController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingWebsiteController.java @@ -20,7 +20,7 @@ import javax.annotation.Resource; import java.util.List; @RestController -@RequestMapping("adminapi/setting/web.web_setting") +@RequestMapping("adminapi/setting.web.web_setting") @Api(tags = "配置网站信息") public class SettingWebsiteController { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/system/DeptController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/system/DeptController.java index 6eb85076..13a302cb 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/system/DeptController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/system/DeptController.java @@ -19,7 +19,7 @@ import javax.annotation.Resource; import java.util.List; @RestController -@RequestMapping("/adminapi/dept/dept") +@RequestMapping("/adminapi/dept.dept") @Api(tags = "系统部门管理") public class DeptController { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/system/JobsController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/system/JobsController.java index 968c7299..6bea69a0 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/system/JobsController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/system/JobsController.java @@ -23,7 +23,7 @@ import javax.annotation.Resource; import java.util.List; @RestController -@RequestMapping("/adminapi/dept/jobs") +@RequestMapping("/adminapi/dept.jobs") @Api(tags = "系统岗位管理") public class JobsController { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthAdminController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthAdminController.java index 08a44165..28f9bcb0 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthAdminController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthAdminController.java @@ -27,7 +27,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @RestController -@RequestMapping("/adminapi/auth/admin") +@RequestMapping("/adminapi/auth.admin") @Api(tags = "系统用户管理") public class SystemAuthAdminController { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthMenuController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthMenuController.java index 721c557e..9974821a 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthMenuController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthMenuController.java @@ -21,7 +21,7 @@ import javax.annotation.Resource; import java.util.List; @RestController -@RequestMapping("/adminapi/auth/menu") +@RequestMapping("/adminapi/auth.menu") @Api(tags = "系统菜单管理") public class SystemAuthMenuController { @@ -55,6 +55,7 @@ public class SystemAuthMenuController { + @NotPower @GetMapping("/all") @ApiOperation(value="获取菜单列表") public AjaxResult all() { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthRoleController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthRoleController.java index 1cee747d..a0e14aef 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthRoleController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthRoleController.java @@ -20,7 +20,7 @@ import javax.annotation.Resource; import java.util.List; @RestController -@RequestMapping("/adminapi/auth/role") +@RequestMapping("/adminapi/auth.role") @Api(tags = "系统角色管理") public class SystemAuthRoleController { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemCacheController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemCacheController.java index 4c9a54f3..3993e5aa 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemCacheController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemCacheController.java @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @RestController -@RequestMapping("/adminapi/setting/system.cache") +@RequestMapping("/adminapi/setting.system.cache") @Api(tags = "系统缓存管理") public class SystemCacheController { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemLogsController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemLogsController.java index 9332882b..5f57c946 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemLogsController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemLogsController.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @RestController -@RequestMapping("/adminapi/setting/system.log") +@RequestMapping("/adminapi/setting.system.log") @Api(tags = "系统日志管理") public class SystemLogsController {