diff --git a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcServiceDataUpdateController.java b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcServiceDataUpdateController.java index 746824c4..dac4f5bd 100644 --- a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcServiceDataUpdateController.java +++ b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcServiceDataUpdateController.java @@ -13,21 +13,21 @@ import static com.xhpc.general.service.XhpcSmsServiceImpl.REDIS; * Date:2021-08-12 13 */ @RestController -@RequestMapping("/SDataUpdate") +@RequestMapping("/wwdata") public class XhpcServiceDataUpdateController { @Autowired IXhpcServiceDataUpdateService xhpcServiceDataUpdateService; - @GetMapping("/show") - public AjaxResult showList(){ + @GetMapping("/list") + public AjaxResult list(){ - return AjaxResult.success(xhpcServiceDataUpdateService.getServiceData()); + return AjaxResult.success(xhpcServiceDataUpdateService.list()); } @PostMapping("/update") - public AjaxResult updateDate(@RequestParam(required = false) String SOC, @RequestParam(required = false) String version, @RequestParam(required = false) String phone){ + public AjaxResult update(@RequestParam(required = false) String SOC, @RequestParam(required = false) String version, @RequestParam(required = false) String phone){ - return xhpcServiceDataUpdateService.updateServiceData(SOC, version, phone); + return xhpcServiceDataUpdateService.update(SOC, version, phone); } } diff --git a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/IXhpcServiceDataUpdateService.java b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/IXhpcServiceDataUpdateService.java index 0debc468..a9510c71 100644 --- a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/IXhpcServiceDataUpdateService.java +++ b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/IXhpcServiceDataUpdateService.java @@ -11,9 +11,9 @@ import java.util.Map; */ public interface IXhpcServiceDataUpdateService { - Map getServiceData(); + Map list(); - AjaxResult updateServiceData(String SOC, String version, String phone); + AjaxResult update(String SOC, String version, String phone); } diff --git a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/XhpcServiceDataUpdateServiceImpl.java b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/XhpcServiceDataUpdateServiceImpl.java index 8b9d9c7d..46532ae9 100644 --- a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/XhpcServiceDataUpdateServiceImpl.java +++ b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/XhpcServiceDataUpdateServiceImpl.java @@ -19,7 +19,7 @@ public class XhpcServiceDataUpdateServiceImpl implements IXhpcServiceDataUpdateS @Autowired private RedisService redisService; @Override - public Map getServiceData() { + public Map list() { Map list=new HashMap<>(); String cacheSOC = redisService.getCacheObject("global:SOC"); @@ -33,7 +33,7 @@ public class XhpcServiceDataUpdateServiceImpl implements IXhpcServiceDataUpdateS @Override - public AjaxResult updateServiceData(String SOC, String version, String phone) { + public AjaxResult update(String SOC, String version, String phone) { if(SOC!=null) { int soc = Integer.parseInt(SOC);