diff --git a/pom.xml b/pom.xml index 2f816b5..6c86ee9 100644 --- a/pom.xml +++ b/pom.xml @@ -124,7 +124,7 @@ com.xiang.starter xmc-common - 1.0 + 1.1 com.xiang.starter @@ -134,7 +134,7 @@ com.xiang.starter xmc-http-starter - 2.0-SNAPSHOT + 2.0 com.xiang.starter diff --git a/script/src/main/java/com/xiang/xservice/IndexController.java b/script/src/main/java/com/xiang/xservice/IndexController.java index 37b6b2f..74a8bb9 100644 --- a/script/src/main/java/com/xiang/xservice/IndexController.java +++ b/script/src/main/java/com/xiang/xservice/IndexController.java @@ -31,13 +31,13 @@ public class IndexController { @GetMapping("/index") public Result index() { String msg = "已激活环境：" + env + "，web端口启用：" + port + "使用datasource:" + url; - return Result.success(msg); + return Result.data(msg); } @GetMapping("/redisTest") private Result redisTest() { redisTemplate.opsForValue().set("2222", "231"); - return Result.success("redis获取到key为test的值为：" + redisTemplate.opsForValue().get("2222")); + return Result.data("redis获取到key为test的值为：" + redisTemplate.opsForValue().get("2222")); } } diff --git a/script/src/main/java/com/xiang/xservice/application/generator/controller/TemplateController.java b/script/src/main/java/com/xiang/xservice/application/generator/controller/TemplateController.java index 84ac70b..c5ab47b 100644 --- a/script/src/main/java/com/xiang/xservice/application/generator/controller/TemplateController.java +++ b/script/src/main/java/com/xiang/xservice/application/generator/controller/TemplateController.java @@ -8,6 +8,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * 模板管理控制器 * @@ -21,8 +23,8 @@ public class TemplateController { private final TemplateService templateService; @PostMapping("/all") - public Result getAllTemplates() throws Exception { - return Result.success(templateService.getAllTemplates()); + public Result> getAllTemplates() throws Exception { + return Result.data(templateService.getAllTemplates()); } } \ No newline at end of file diff --git a/script/src/main/java/com/xiang/xservice/application/generator/service/impl/CodeGenServiceImpl.java b/script/src/main/java/com/xiang/xservice/application/generator/service/impl/CodeGenServiceImpl.java index 01a4a51..170b1f5 100644 --- a/script/src/main/java/com/xiang/xservice/application/generator/service/impl/CodeGenServiceImpl.java +++ b/script/src/main/java/com/xiang/xservice/application/generator/service/impl/CodeGenServiceImpl.java @@ -50,7 +50,7 @@ public class CodeGenServiceImpl implements CodeGenService { // 3. generate the code by freemarker templates with parameters . // Freemarker根据参数和模板生成代码 Map result = getResultByParams(paramInfo.getOptions()); - return Result.success(result); + return Result.data(result); } catch (Exception e) { log.error("代码生成失败", e); return Result.error("代码生成失败: " + e.getMessage()); diff --git a/script/src/main/java/com/xiang/xservice/application/script/domain/controller/DynamicDomainController.java b/script/src/main/java/com/xiang/xservice/application/script/domain/controller/DynamicDomainController.java index ba28c70..fc169b9 100644 --- a/script/src/main/java/com/xiang/xservice/application/script/domain/controller/DynamicDomainController.java +++ b/script/src/main/java/com/xiang/xservice/application/script/domain/controller/DynamicDomainController.java @@ -37,7 +37,7 @@ public class DynamicDomainController { log.error("获取公网IP失败， time:{}", LocalDateTime.now(), e); return Result.error("获取公网IP失败"); } - return Result.success("获取公网IP成功", publicIp); + return Result.data(publicIp); } @PostMapping("/ddns") @@ -46,7 +46,7 @@ public class DynamicDomainController { String publicIp = IpUtils.getPublicIp(); log.info("获取公网IP成功，time:{}, ip:{}", LocalDateTime.now(), publicIp); IDomainService.dynamicDomainAnalysis(publicIp); - return Result.success("获取公网IP成功"); + return Result.data("获取公网IP成功"); } catch (Exception e) { log.error("获取公网IP失败， time:{}", LocalDateTime.now(), e); return Result.error("获取公网IP失败"); diff --git a/script/src/main/java/com/xiang/xservice/application/script/fwd/server/FwdDataController.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/server/FwdDataController.java index 7d4c351..14f8dbe 100644 --- a/script/src/main/java/com/xiang/xservice/application/script/fwd/server/FwdDataController.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/server/FwdDataController.java @@ -102,6 +102,6 @@ public class FwdDataController { } } } - return Result.success("success"); + return Result.data("success"); } } diff --git a/script/src/main/java/com/xiang/xservice/application/script/fwd/server/FwdOuterController.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/server/FwdOuterController.java index 2c9278e..ec7de5c 100644 --- a/script/src/main/java/com/xiang/xservice/application/script/fwd/server/FwdOuterController.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/server/FwdOuterController.java @@ -36,37 +36,37 @@ public class FwdOuterController { @GetMapping("/getShowProjects") public Result getShowProjects() { ProjectsResp showProjectsFromHttp = performServiceHttp.getShowProjectsFromHttp(new BaseRequest()); - return Result.success("查询成功!", showProjectsFromHttp); + return Result.data(showProjectsFromHttp); } @GetMapping("/getProjectInfo/{id}") public Result getProjectInfo(@PathVariable("id") Long id) { String token = fwdUserConfigMapper.getAvailableUser().get(0).getToken(); Perform performsByProjectIdFromHttp = performServiceHttp.getPerformsByProjectIdFromHttp(id, token); - return Result.success("查询成功!", performsByProjectIdFromHttp); + return Result.data(performsByProjectIdFromHttp); } @GetMapping("/getPerformsByProjectIdFromHttp/{id}") public Result getPerformsByProjectIdFromHttp(@PathVariable("id") Long id) { String token = fwdUserConfigMapper.getAvailableUser().get(0).getToken(); Perform performsByProjectIdFromHttp = performServiceHttp.getPerformsByProjectIdFromHttp(id, token); - return Result.success("查询成功!", performsByProjectIdFromHttp); + return Result.data(performsByProjectIdFromHttp); } @PostMapping("/createOrder") public Result createOrder(Long projectId) throws Exception { String token = fwdUserConfigMapper.getAvailableUser().get(0).getToken(); if (performService.createProjectOrder(projectId, FREQUENT_IDS, token)) { - return Result.success("下单成功!"); + return Result.data("下单成功!"); } return Result.error("下单失败!"); } @GetMapping("/getSeatPlanStatus") - public Result getSeatPlanStatu (@RequestParam List ids) { + public Result> getSeatPlanStatu (@RequestParam List ids) { String token = fwdUserConfigMapper.getAvailableUser().get(0).getToken(); List seatPlanStatusFromHttp = performServiceHttp.getSeatPlanStatusFromHttp(ids, token); - return Result.success("查询成功!", seatPlanStatusFromHttp); + return Result.data(seatPlanStatusFromHttp); } } diff --git a/script/src/main/java/com/xiang/xservice/application/script/xb/controller/XBController.java b/script/src/main/java/com/xiang/xservice/application/script/xb/controller/XBController.java index b0ec8e9..9bf1bac 100644 --- a/script/src/main/java/com/xiang/xservice/application/script/xb/controller/XBController.java +++ b/script/src/main/java/com/xiang/xservice/application/script/xb/controller/XBController.java @@ -1,7 +1,5 @@ package com.xiang.xservice.application.script.xb.controller; -import com.google.common.collect.Lists; -import com.xiang.xservice.basic.common.resp.Result; import com.xiang.xservice.application.script.xb.entity.pojo.xb.XbFundList; import com.xiang.xservice.application.script.xb.entity.request.xb.fund.QueryFundInfoReq; import com.xiang.xservice.application.script.xb.entity.request.xb.fund.QueryFundListReq; @@ -9,6 +7,7 @@ import com.xiang.xservice.application.script.xb.entity.request.xb.fund.QueryXbFu import com.xiang.xservice.application.script.xb.entity.response.xbyj.fund.FundInfo; import com.xiang.xservice.application.script.xb.entity.response.xbyj.fund.FundList; import com.xiang.xservice.application.script.xb.service.FundService; +import com.xiang.xservice.basic.common.resp.Result; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.CollectionUtils; import org.springframework.web.bind.annotation.PostMapping; @@ -31,28 +30,28 @@ public class XBController { private final FundService fundService; @PostMapping("/queryFundList") - public Result queryFundList(@RequestBody QueryXbFundListReq req) { + public Result> queryFundList(@RequestBody QueryXbFundListReq req) { List result = fundService.queryFundList(req.getType()); if (CollectionUtils.isEmpty(result)) { return Result.error("基金列表信息为空！"); } - return Result.success("success", result); + return Result.data(result); } @PostMapping("/queryList") - public Result queryList(@RequestBody QueryFundListReq req) { + public Result> queryList(@RequestBody QueryFundListReq req) { List result = fundService.queryTodayList(req.getDate(), req.getDataResources(), req.getDataSourceSwitch(), req.getCodeArr()); if (CollectionUtils.isEmpty(result)) { return Result.error("基金列表信息为空！"); } - return Result.success("success", result); + return Result.data(result); } @PostMapping("/queryFundInfo") public Result queryFundInfo(@RequestBody QueryFundInfoReq req) { FundInfo fundInfo = fundService.queryFundInfo(req.getCode()); if (Objects.nonNull(fundInfo)) { - return Result.success("success", Lists.newArrayList(fundInfo)); + return Result.data(fundInfo); } return Result.error("查询基金信息为空！"); }