diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/TestController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/TestController.java deleted file mode 100644 index 9299840c..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/TestController.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.mdd.admin.controller; - -import com.mdd.common.core.AjaxResult; -import com.mdd.common.plugin.sms.SmsDriver; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.Map; - -@RestController -@RequestMapping("api/test") -public class TestController { - - @GetMapping("/sms") - public Object sms() { - - Map params = new LinkedHashMap<>(); - // 阿里云的 - params.put("user_name", "刘明"); - params.put("sex", "先生"); - params.put("order_sn", "2202665565668741"); - params.put("gg", "YT8314171250428"); - params.put("eee", "圆通快递"); - - // 腾讯云的 - - - (new SmsDriver()) - .setMobile("15627119239") -// .setTemplateCode("SMS_222463029") - .setTemplateCode("1074928") - .setTemplateParam(params) - .sendSms(); - return AjaxResult.success(); - } - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/CopyrightController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/CopyrightController.java index f7ddd8e0..4cf72b55 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/CopyrightController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/CopyrightController.java @@ -11,7 +11,7 @@ import java.util.Map; /** * 网站版权配置管理 */ -@RestController +@RestController("settingCopyrightController") @RequestMapping("api/setting/copyright") public class CopyrightController { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/DictDataController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/DictDataController.java index 45adedbb..6bca5748 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/DictDataController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/DictDataController.java @@ -19,7 +19,7 @@ import java.util.Map; /** * 字典数据配置管理 */ -@RestController +@RestController("settingDictDataController") @RequestMapping("api/setting/dict/data") public class DictDataController { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/DictTypeController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/DictTypeController.java index f2cdbc79..3cc66f78 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/DictTypeController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/DictTypeController.java @@ -17,7 +17,7 @@ import java.util.Map; /** * 字典类型配置管理 */ -@RestController +@RestController("settingDictTypeController") @RequestMapping("api/setting/dict/type") public class DictTypeController { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/LoginController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/LoginController.java new file mode 100644 index 00000000..ca1faeda --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/LoginController.java @@ -0,0 +1,22 @@ +package com.mdd.admin.controller.setting; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController("settingLoginController") +@RequestMapping("api/setting/login") +public class LoginController { + + @GetMapping("/detail") + public Object detail() { + return null; + } + + @PostMapping("/save") + public Object save() { + return null; + } + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/NoticeController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/NoticeController.java index acb19ec5..8f8caea7 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/NoticeController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/NoticeController.java @@ -15,7 +15,7 @@ import java.util.Map; /** * 通知设置管理 */ -@RestController +@RestController("settingNoticeController") @RequestMapping("api/setting/notice") public class NoticeController { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/ProtocolController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/ProtocolController.java index 8d76f191..5ba1b8e4 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/ProtocolController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/ProtocolController.java @@ -10,7 +10,7 @@ import java.util.Map; /** * 政策协议配置管理 */ -@RestController +@RestController("settingProtocolController") @RequestMapping("api/setting/protocol") public class ProtocolController { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SearchController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SearchController.java new file mode 100644 index 00000000..68cc72ad --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SearchController.java @@ -0,0 +1,12 @@ +package com.mdd.admin.controller.setting; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 热搜设置 + */ +@RestController("settingSearchController") +@RequestMapping("api/setting/search") +public class SearchController { +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SmsController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SmsController.java index ef46ecc1..0905028b 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SmsController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SmsController.java @@ -12,7 +12,7 @@ import java.util.Map; /** * 短信设置管理 */ -@RestController +@RestController("settingSmsController") @RequestMapping("api/setting/sms") public class SmsController { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/StorageController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/StorageController.java index a36f1ae7..82a27bd0 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/StorageController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/StorageController.java @@ -12,7 +12,7 @@ import java.util.Map; /** * 存储方式配置管理 */ -@RestController +@RestController("settingStorageController") @RequestMapping("api/setting/storage") public class StorageController { diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/UserController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/UserController.java new file mode 100644 index 00000000..06441eba --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/UserController.java @@ -0,0 +1,25 @@ +package com.mdd.admin.controller.setting; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 用户设置管理 + */ +@RestController("settingUserController") +@RequestMapping("api/setting/user") +public class UserController { + + @GetMapping("/detail") + public Object detail() { + return null; + } + + @PostMapping("/save") + public Object save() { + return null; + } + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/WebsiteController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/WebsiteController.java index 853ff71b..6b843d10 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/WebsiteController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/WebsiteController.java @@ -10,7 +10,7 @@ import java.util.Map; /** * 网站信息配置管理 */ -@RestController +@RestController("settingWebsiteController") @RequestMapping("api/setting/website") public class WebsiteController { diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/decorate/impl/DecorateTabbarServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/decorate/impl/DecorateTabbarServiceImpl.java index b03c9438..93430ddc 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/decorate/impl/DecorateTabbarServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/decorate/impl/DecorateTabbarServiceImpl.java @@ -69,7 +69,6 @@ public class DecorateTabbarServiceImpl implements IDecorateTabbarService { for (String obj : ArrayUtil.objectToListAsStr(params.get("list"))) { Map item = ToolsUtil.jsonToMap(obj); - System.out.println(item); DecorateTabbar model = new DecorateTabbar(); model.setName(item.get("name")); model.setSelected(UrlUtil.toRelativeUrl(item.get("selected")));