diff --git a/pom.xml b/pom.xml index 4d038fe..17c3b93 100644 --- a/pom.xml +++ b/pom.xml @@ -168,12 +168,6 @@ ${sf.version} - - com.smarterFramework - sf-order - ${sf.version} - - com.smarterFramework sf-payment @@ -232,7 +226,6 @@ sf-oauth sf-payment sf-service - sf-order sf-vertx sf-vertx-api diff --git a/sf-admin/pom.xml b/sf-admin/pom.xml index 4a09d6e..405cdd8 100644 --- a/sf-admin/pom.xml +++ b/sf-admin/pom.xml @@ -66,11 +66,6 @@ sf-oauth - - com.smarterFramework - sf-order - - com.smarterFramework sf-payment diff --git a/sf-common/src/main/java/com/sf/common/exception/ServiceException.java b/sf-common/src/main/java/com/sf/common/exception/ServiceException.java index d5734fd..68041cb 100644 --- a/sf-common/src/main/java/com/sf/common/exception/ServiceException.java +++ b/sf-common/src/main/java/com/sf/common/exception/ServiceException.java @@ -5,7 +5,7 @@ package com.sf.common.exception; * * @author ztzh */ -public final class ServiceException extends RuntimeException +public class ServiceException extends RuntimeException { private static final long serialVersionUID = 1L; diff --git a/sf-common/src/main/java/com/sf/common/utils/AppUtils.java b/sf-common/src/main/java/com/sf/common/utils/AppUtils.java deleted file mode 100644 index b32137b..0000000 --- a/sf-common/src/main/java/com/sf/common/utils/AppUtils.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.sf.common.utils; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; - -import javax.servlet.http.HttpServletRequest; - -/** - * 功能描述: 应用工具类 - * - * @author a_kun - * @date 2024/4/22 15:48 - */ -@Slf4j -@Component -public class AppUtils { - - public static String getAppCodeFromRequestHeader(){ - ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); - HttpServletRequest request = servletRequestAttributes.getRequest(); - return request.getHeader("appCode"); - } - - -} diff --git a/sf-common/src/main/java/com/sf/common/utils/http/RequestUtils.java b/sf-common/src/main/java/com/sf/common/utils/http/RequestUtils.java index a5eb338..c3f05bb 100644 --- a/sf-common/src/main/java/com/sf/common/utils/http/RequestUtils.java +++ b/sf-common/src/main/java/com/sf/common/utils/http/RequestUtils.java @@ -1,6 +1,5 @@ package com.sf.common.utils.http; -import com.sf.common.utils.StringUtils; import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -9,17 +8,9 @@ import javax.servlet.http.HttpServletRequest; public class RequestUtils { - public static String getHeader(String code){ - HttpServletRequest request = null; - try { - RequestAttributes requestAttributes1 = RequestContextHolder.getRequestAttributes(); - request = ((ServletRequestAttributes) requestAttributes1).getRequest(); - } catch (Exception e) { - throw new SecurityException("获取header中获取appCode信息"); - } - if(StringUtils.isBlank(request.getHeader(code))){ - throw new SecurityException("参数异常appCode为空"); - } - return request.getHeader(code); + public static String getHeader(String key) { + RequestAttributes requestAttributes1 = RequestContextHolder.getRequestAttributes(); + HttpServletRequest request = ((ServletRequestAttributes) requestAttributes1).getRequest(); + return request.getHeader(key); } } diff --git a/sf-order/pom.xml b/sf-order/pom.xml deleted file mode 100644 index d95e016..0000000 --- a/sf-order/pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - smarterFramework - com.smarterFramework - 1.0.0 - - 4.0.0 - - sf-order - - - 订单模块 - - - - - - - com.smarterFramework - sf-common - - - com.smarterFramework - sf-framework - - - - - - \ No newline at end of file diff --git a/sf-payment/pom.xml b/sf-payment/pom.xml index 680816a..d73f026 100644 --- a/sf-payment/pom.xml +++ b/sf-payment/pom.xml @@ -26,10 +26,6 @@ com.smarterFramework sf-framework - - com.smarterFramework - sf-order - com.smarterFramework sf-service diff --git a/sf-payment/src/main/java/com/sf/payment/service/impl/HuaweiPaymentServiceImpl.java b/sf-payment/src/main/java/com/sf/payment/service/impl/HuaweiPaymentServiceImpl.java index e52dee1..7082c8b 100644 --- a/sf-payment/src/main/java/com/sf/payment/service/impl/HuaweiPaymentServiceImpl.java +++ b/sf-payment/src/main/java/com/sf/payment/service/impl/HuaweiPaymentServiceImpl.java @@ -8,13 +8,12 @@ import cn.hutool.http.HttpUtil; import com.alibaba.fastjson2.JSON; import com.auth0.jwt.JWT; import com.auth0.jwt.interfaces.DecodedJWT; -import com.sf.common.enums.RequestHeaderEnums; import com.sf.common.utils.DateUtils; import com.sf.common.utils.SecurityUtils; import com.sf.common.utils.SnowflakeIdWorker; -import com.sf.common.utils.http.RequestUtils; -import com.sf.order.domain.OrderInfo; -import com.sf.order.service.IOrderInfoService; +import com.sf.service.index.utils.AppUtils; +import com.sf.service.order.domain.OrderInfo; +import com.sf.service.order.service.IOrderInfoService; import com.sf.payment.config.HuaweiPaymentConfig; import com.sf.payment.constant.GoodsConstants; import com.sf.payment.domain.*; @@ -218,7 +217,7 @@ public class HuaweiPaymentServiceImpl implements IHuaweiPaymentService { private void createOrder(PurchaseOrderPayload appPurchaseOrderPayload, GoodsMessages goods) { Long userId = SecurityUtils.getUserId(); OrderInfo orderInfo = new OrderInfo(); - orderInfo.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode())); + orderInfo.setAppCode(AppUtils.getAppCodeFromRequestHeader()); orderInfo.setOrderNo(snowflakeIdWorker.nextId()); orderInfo.setOrderStatus(4L); orderInfo.setPayType(1L); diff --git a/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentApplyEnvironmentController.java b/sf-service/src/main/java/com/sf/service/deployment/controller/DeploymentApplyEnvironmentController.java similarity index 75% rename from sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentApplyEnvironmentController.java rename to sf-service/src/main/java/com/sf/service/deployment/controller/DeploymentApplyEnvironmentController.java index 53b31fa..c8781a4 100644 --- a/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentApplyEnvironmentController.java +++ b/sf-service/src/main/java/com/sf/service/deployment/controller/DeploymentApplyEnvironmentController.java @@ -1,15 +1,10 @@ -package com.sf.system.deployment.controller; +package com.sf.service.deployment.controller; import java.util.List; -import javax.servlet.ServletRequest; -import javax.servlet.ServletRequestAttributeEvent; -import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.sf.common.enums.RequestHeaderEnums; -import com.sf.common.utils.StringUtils; -import com.sf.common.utils.http.RequestUtils; -import com.sf.system.deployment.domain.DeploymentApplyEnvironment; +import com.sf.service.deployment.domain.DeploymentApplyEnvironment; +import com.sf.service.index.utils.AppUtils; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -24,23 +19,19 @@ import com.sf.common.annotation.Log; import com.sf.common.core.controller.BaseController; import com.sf.common.core.domain.AjaxResult; import com.sf.common.enums.BusinessType; -import com.sf.deployment.service.IDeploymentApplyEnvironmentService; +import com.sf.service.deployment.service.IDeploymentApplyEnvironmentService; import com.sf.common.utils.poi.ExcelUtil; import com.sf.common.core.page.TableDataInfo; -import org.springframework.web.context.request.RequestAttributes; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; /** * 环境维护Controller - * + * * @author ztzh * @date 2024-04-19 */ @RestController @RequestMapping("/deployment/environment") -public class DeploymentApplyEnvironmentController extends BaseController -{ +public class DeploymentApplyEnvironmentController extends BaseController { @Autowired private IDeploymentApplyEnvironmentService deploymentApplyEnvironmentService; @@ -49,9 +40,8 @@ public class DeploymentApplyEnvironmentController extends BaseController */ @PreAuthorize("@ss.hasPermi('deployment:environment:list')") @GetMapping("/list") - public TableDataInfo list(DeploymentApplyEnvironment deploymentApplyEnvironment) - { - deploymentApplyEnvironment.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode())); + public TableDataInfo list(DeploymentApplyEnvironment deploymentApplyEnvironment) { + deploymentApplyEnvironment.setAppCode(AppUtils.getAppCodeFromRequestHeader()); startPage(); List list = deploymentApplyEnvironmentService.selectDeploymentApplyEnvironmentList(deploymentApplyEnvironment); return getDataTable(list); @@ -63,8 +53,7 @@ public class DeploymentApplyEnvironmentController extends BaseController @PreAuthorize("@ss.hasPermi('deployment:environment:export')") @Log(title = "环境维护", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, DeploymentApplyEnvironment deploymentApplyEnvironment) - { + public void export(HttpServletResponse response, DeploymentApplyEnvironment deploymentApplyEnvironment) { List list = deploymentApplyEnvironmentService.selectDeploymentApplyEnvironmentList(deploymentApplyEnvironment); ExcelUtil util = new ExcelUtil(DeploymentApplyEnvironment.class); util.exportExcel(response, list, "环境维护数据"); @@ -75,8 +64,7 @@ public class DeploymentApplyEnvironmentController extends BaseController */ @PreAuthorize("@ss.hasPermi('deployment:environment:query')") @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { + public AjaxResult getInfo(@PathVariable("id") Long id) { return success(deploymentApplyEnvironmentService.selectDeploymentApplyEnvironmentById(id)); } @@ -86,9 +74,8 @@ public class DeploymentApplyEnvironmentController extends BaseController @PreAuthorize("@ss.hasPermi('deployment:environment:add')") @Log(title = "环境维护", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody DeploymentApplyEnvironment deploymentApplyEnvironment) - { - deploymentApplyEnvironment.setAppCode( RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode())); + public AjaxResult add(@RequestBody DeploymentApplyEnvironment deploymentApplyEnvironment) { + deploymentApplyEnvironment.setAppCode(AppUtils.getAppCodeFromRequestHeader()); return toAjax(deploymentApplyEnvironmentService.insertDeploymentApplyEnvironment(deploymentApplyEnvironment)); } @@ -98,8 +85,7 @@ public class DeploymentApplyEnvironmentController extends BaseController @PreAuthorize("@ss.hasPermi('deployment:environment:edit')") @Log(title = "环境维护", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody DeploymentApplyEnvironment deploymentApplyEnvironment) - { + public AjaxResult edit(@RequestBody DeploymentApplyEnvironment deploymentApplyEnvironment) { return toAjax(deploymentApplyEnvironmentService.updateDeploymentApplyEnvironment(deploymentApplyEnvironment)); } @@ -108,9 +94,8 @@ public class DeploymentApplyEnvironmentController extends BaseController */ @PreAuthorize("@ss.hasPermi('deployment:environment:remove')") @Log(title = "环境维护", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(deploymentApplyEnvironmentService.deleteDeploymentApplyEnvironmentByIds(ids)); } } diff --git a/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentModuleListController.java b/sf-service/src/main/java/com/sf/service/deployment/controller/DeploymentModuleListController.java similarity index 88% rename from sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentModuleListController.java rename to sf-service/src/main/java/com/sf/service/deployment/controller/DeploymentModuleListController.java index fbcdc89..7d60695 100644 --- a/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentModuleListController.java +++ b/sf-service/src/main/java/com/sf/service/deployment/controller/DeploymentModuleListController.java @@ -1,4 +1,4 @@ -package com.sf.system.deployment.controller; +package com.sf.service.deployment.controller; import java.io.InputStream; import java.net.URL; @@ -6,12 +6,16 @@ import java.util.List; import java.util.concurrent.TimeUnit; import javax.servlet.http.HttpServletResponse; +import cn.hutool.core.lang.Assert; import com.sf.common.core.redis.RedisCache; import com.sf.common.enums.RequestHeaderEnums; import com.sf.common.utils.http.RequestUtils; import com.sf.common.utils.openssl.AES256Util; import com.sf.common.utils.uuid.UUID; -import com.sf.system.deployment.domain.rqs.ModuleListByCoreRequest; +import com.sf.service.deployment.domain.DeploymentModuleList; +import com.sf.service.deployment.domain.rqs.ModuleListByCoreRequest; +import com.sf.service.deployment.service.IDeploymentModuleListService; +import com.sf.service.index.utils.AppUtils; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.FileCopyUtils; @@ -27,8 +31,6 @@ import com.sf.common.annotation.Log; import com.sf.common.core.controller.BaseController; import com.sf.common.core.domain.AjaxResult; import com.sf.common.enums.BusinessType; -import com.sf.system.deployment.domain.DeploymentModuleList; -import com.sf.system.deployment.service.IDeploymentModuleListService; import com.sf.common.utils.poi.ExcelUtil; import com.sf.common.core.page.TableDataInfo; @@ -52,7 +54,7 @@ public class DeploymentModuleListController extends BaseController { @PreAuthorize("@ss.hasPermi('deployment:module:list')") @GetMapping("/list") public TableDataInfo list(DeploymentModuleList deploymentModuleList) { - deploymentModuleList.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode())); + deploymentModuleList.setAppCode(AppUtils.getAppCodeFromRequestHeader()); startPage(); List list = deploymentModuleListService.selectDeploymentModuleListList(deploymentModuleList); return getDataTable(list); @@ -64,7 +66,7 @@ public class DeploymentModuleListController extends BaseController { @GetMapping("/qurey/list") public AjaxResult queryByCore(ModuleListByCoreRequest request) { DeploymentModuleList deploymentModuleList = new DeploymentModuleList(); - deploymentModuleList.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode())); + deploymentModuleList.setAppCode(AppUtils.getAppCodeFromRequestHeader()); deploymentModuleList.setSysType(request.getSysType()); List list = deploymentModuleListService.selectDeploymentModuleListList(deploymentModuleList); return success(list); @@ -76,14 +78,12 @@ public class DeploymentModuleListController extends BaseController { @GetMapping("/qurey/file") public AjaxResult queryByCore(ModuleListByCoreRequest request, HttpServletResponse response) { DeploymentModuleList deploymentModuleList = new DeploymentModuleList(); - deploymentModuleList.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode())); + deploymentModuleList.setAppCode(AppUtils.getAppCodeFromRequestHeader()); String authorization = RequestUtils.getHeader(RequestHeaderEnums.AUTHORIZATION.getCode()); deploymentModuleList.setSysType(request.getSysType()); deploymentModuleList.setModuleType(request.getModuleType()); List list = deploymentModuleListService.selectDeploymentModuleListList(deploymentModuleList); - if (list.isEmpty() && null == list.get(0)) { - throw new SecurityException("无可用模块包"); - } + Assert.notEmpty(list,"无可用模块包"); try { String password = UUID.randomUUID().toString().trim().replaceAll("-", ""); //加密 @@ -104,7 +104,7 @@ public class DeploymentModuleListController extends BaseController { String authorization = RequestUtils.getHeader(RequestHeaderEnums.AUTHORIZATION.getCode()); String cacheObject = redisCache.getCacheObject(authorization + request.getModuleType()); return success(UUID.randomUUID().toString().trim().replaceAll("-", "") + cacheObject + UUID.randomUUID().toString().trim().replaceAll("-", "")) - ; + ; } @@ -136,7 +136,7 @@ public class DeploymentModuleListController extends BaseController { @Log(title = "H5模块包", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody DeploymentModuleList deploymentModuleList) { - deploymentModuleList.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode())); + deploymentModuleList.setAppCode(AppUtils.getAppCodeFromRequestHeader()); return toAjax(deploymentModuleListService.insertDeploymentModuleList(deploymentModuleList)); } diff --git a/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentServicePublishController.java b/sf-service/src/main/java/com/sf/service/deployment/controller/DeploymentServicePublishController.java similarity index 83% rename from sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentServicePublishController.java rename to sf-service/src/main/java/com/sf/service/deployment/controller/DeploymentServicePublishController.java index 0dd8fa3..76388a6 100644 --- a/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentServicePublishController.java +++ b/sf-service/src/main/java/com/sf/service/deployment/controller/DeploymentServicePublishController.java @@ -1,17 +1,14 @@ -package com.sf.system.deployment.controller; +package com.sf.service.deployment.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.sf.common.enums.RequestHeaderEnums; import com.sf.common.utils.DateUtils; -import com.sf.common.utils.StringUtils; -import com.sf.common.utils.http.RequestUtils; -import com.sf.system.deployment.domain.DeploymentServicePublish; -import com.sf.system.deployment.service.IDeploymentServicePublishService; +import com.sf.service.deployment.domain.DeploymentServicePublish; +import com.sf.service.deployment.service.IDeploymentServicePublishService; +import com.sf.service.index.utils.AppUtils; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.unit.DataUnit; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; @@ -29,14 +26,13 @@ import com.sf.common.core.page.TableDataInfo; /** * 发布列表Controller - * + * * @author ztzh * @date 2024-04-19 */ @RestController @RequestMapping("/deployment/publish") -public class DeploymentServicePublishController extends BaseController -{ +public class DeploymentServicePublishController extends BaseController { @Autowired private IDeploymentServicePublishService deploymentServicePublishService; @@ -45,9 +41,8 @@ public class DeploymentServicePublishController extends BaseController */ @PreAuthorize("@ss.hasPermi('deployment:publish:list')") @GetMapping("/list") - public TableDataInfo list(DeploymentServicePublish deploymentServicePublish) - { - deploymentServicePublish.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode())); + public TableDataInfo list(DeploymentServicePublish deploymentServicePublish) { + deploymentServicePublish.setAppCode(AppUtils.getAppCodeFromRequestHeader()); startPage(); List list = deploymentServicePublishService.selectDeploymentServicePublishList(deploymentServicePublish); return getDataTable(list); @@ -59,8 +54,7 @@ public class DeploymentServicePublishController extends BaseController @PreAuthorize("@ss.hasPermi('deployment:publish:export')") @Log(title = "发布列表", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, DeploymentServicePublish deploymentServicePublish) - { + public void export(HttpServletResponse response, DeploymentServicePublish deploymentServicePublish) { List list = deploymentServicePublishService.selectDeploymentServicePublishList(deploymentServicePublish); ExcelUtil util = new ExcelUtil(DeploymentServicePublish.class); util.exportExcel(response, list, "发布列表数据"); @@ -71,8 +65,7 @@ public class DeploymentServicePublishController extends BaseController */ @PreAuthorize("@ss.hasPermi('deployment:publish:query')") @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { + public AjaxResult getInfo(@PathVariable("id") Long id) { return success(deploymentServicePublishService.selectDeploymentServicePublishById(id)); } @@ -82,9 +75,8 @@ public class DeploymentServicePublishController extends BaseController @PreAuthorize("@ss.hasPermi('deployment:publish:add')") @Log(title = "发布列表", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody DeploymentServicePublish deploymentServicePublish) - { - deploymentServicePublish.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode())); + public AjaxResult add(@RequestBody DeploymentServicePublish deploymentServicePublish) { + deploymentServicePublish.setAppCode(AppUtils.getAppCodeFromRequestHeader()); return toAjax(deploymentServicePublishService.insertDeploymentServicePublish(deploymentServicePublish)); } @@ -94,8 +86,7 @@ public class DeploymentServicePublishController extends BaseController @PreAuthorize("@ss.hasPermi('deployment:publish:edit')") @Log(title = "发布列表", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody DeploymentServicePublish deploymentServicePublish) - { + public AjaxResult edit(@RequestBody DeploymentServicePublish deploymentServicePublish) { return toAjax(deploymentServicePublishService.updateDeploymentServicePublish(deploymentServicePublish)); } @@ -104,9 +95,8 @@ public class DeploymentServicePublishController extends BaseController */ @PreAuthorize("@ss.hasPermi('deployment:publish:remove')") @Log(title = "发布列表", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(deploymentServicePublishService.deleteDeploymentServicePublishByIds(ids)); } @@ -127,8 +117,7 @@ public class DeploymentServicePublishController extends BaseController */ @PreAuthorize("@ss.hasPermi('deployment:publish:sold:out')") @GetMapping(value = "/sold/out/{id}") - public AjaxResult soldOut(@PathVariable("id") Long id) - { + public AjaxResult soldOut(@PathVariable("id") Long id) { DeploymentServicePublish deploymentServicePublish = deploymentServicePublishService.selectDeploymentServicePublishById(id); // deploymentServicePublish.setUpdateBy(getUsername()); deploymentServicePublish.setUpdateTime(DateUtils.getNowDate()); diff --git a/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentWhitelistInfoController.java b/sf-service/src/main/java/com/sf/service/deployment/controller/DeploymentWhitelistInfoController.java similarity index 81% rename from sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentWhitelistInfoController.java rename to sf-service/src/main/java/com/sf/service/deployment/controller/DeploymentWhitelistInfoController.java index 8619710..b5d3951 100644 --- a/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentWhitelistInfoController.java +++ b/sf-service/src/main/java/com/sf/service/deployment/controller/DeploymentWhitelistInfoController.java @@ -1,12 +1,11 @@ -package com.sf.system.deployment.controller; +package com.sf.service.deployment.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.sf.common.enums.RequestHeaderEnums; -import com.sf.common.utils.http.RequestUtils; -import com.sf.system.deployment.domain.DeploymentWhitelistInfo; -import com.sf.system.deployment.service.IDeploymentWhitelistInfoService; +import com.sf.service.deployment.domain.DeploymentWhitelistInfo; +import com.sf.service.deployment.service.IDeploymentWhitelistInfoService; +import com.sf.service.index.utils.AppUtils; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -26,14 +25,13 @@ import com.sf.common.core.page.TableDataInfo; /** * 白名单列表Controller - * + * * @author ztzh * @date 2024-05-06 */ @RestController @RequestMapping("/deployment/whitelist") -public class DeploymentWhitelistInfoController extends BaseController -{ +public class DeploymentWhitelistInfoController extends BaseController { @Autowired private IDeploymentWhitelistInfoService deploymentWhitelistInfoService; @@ -42,9 +40,8 @@ public class DeploymentWhitelistInfoController extends BaseController */ @PreAuthorize("@ss.hasPermi('deployment:whitelist:list')") @GetMapping("/list") - public TableDataInfo list(DeploymentWhitelistInfo deploymentWhitelistInfo) - { - deploymentWhitelistInfo.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode())); + public TableDataInfo list(DeploymentWhitelistInfo deploymentWhitelistInfo) { + deploymentWhitelistInfo.setAppCode(AppUtils.getAppCodeFromRequestHeader()); startPage(); List list = deploymentWhitelistInfoService.selectDeploymentWhitelistInfoList(deploymentWhitelistInfo); return getDataTable(list); @@ -56,9 +53,8 @@ public class DeploymentWhitelistInfoController extends BaseController @PreAuthorize("@ss.hasPermi('deployment:whitelist:export')") @Log(title = "白名单列表", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, DeploymentWhitelistInfo deploymentWhitelistInfo) - { - deploymentWhitelistInfo.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode())); + public void export(HttpServletResponse response, DeploymentWhitelistInfo deploymentWhitelistInfo) { + deploymentWhitelistInfo.setAppCode(AppUtils.getAppCodeFromRequestHeader()); List list = deploymentWhitelistInfoService.selectDeploymentWhitelistInfoList(deploymentWhitelistInfo); ExcelUtil util = new ExcelUtil(DeploymentWhitelistInfo.class); util.exportExcel(response, list, "白名单列表数据"); @@ -69,8 +65,7 @@ public class DeploymentWhitelistInfoController extends BaseController */ @PreAuthorize("@ss.hasPermi('deployment:whitelist:query')") @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { + public AjaxResult getInfo(@PathVariable("id") Long id) { return success(deploymentWhitelistInfoService.selectDeploymentWhitelistInfoById(id)); } @@ -80,9 +75,8 @@ public class DeploymentWhitelistInfoController extends BaseController @PreAuthorize("@ss.hasPermi('deployment:whitelist:add')") @Log(title = "白名单列表", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody DeploymentWhitelistInfo deploymentWhitelistInfo) - { - deploymentWhitelistInfo.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode())); + public AjaxResult add(@RequestBody DeploymentWhitelistInfo deploymentWhitelistInfo) { + deploymentWhitelistInfo.setAppCode(AppUtils.getAppCodeFromRequestHeader()); return toAjax(deploymentWhitelistInfoService.insertDeploymentWhitelistInfo(deploymentWhitelistInfo)); } @@ -92,8 +86,7 @@ public class DeploymentWhitelistInfoController extends BaseController @PreAuthorize("@ss.hasPermi('deployment:whitelist:edit')") @Log(title = "白名单列表", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody DeploymentWhitelistInfo deploymentWhitelistInfo) - { + public AjaxResult edit(@RequestBody DeploymentWhitelistInfo deploymentWhitelistInfo) { return toAjax(deploymentWhitelistInfoService.updateDeploymentWhitelistInfo(deploymentWhitelistInfo)); } @@ -102,11 +95,11 @@ public class DeploymentWhitelistInfoController extends BaseController */ @PreAuthorize("@ss.hasPermi('deployment:whitelist:remove')") @Log(title = "白名单列表", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(deploymentWhitelistInfoService.deleteDeploymentWhitelistInfoByIds(ids)); } + /** * 发布功能 */ @@ -115,13 +108,13 @@ public class DeploymentWhitelistInfoController extends BaseController public AjaxResult publish(@PathVariable("id") Long id) throws Exception { return success(deploymentWhitelistInfoService.publish(id)); } + /** * 下架功能 */ @PreAuthorize("@ss.hasPermi('deployment:whitelist:sold:out')") @GetMapping(value = "/sold/out/{id}") - public AjaxResult soldOut(@PathVariable("id") Long id) - { + public AjaxResult soldOut(@PathVariable("id") Long id) { return success(deploymentWhitelistInfoService.soldOut(id)); } diff --git a/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentWhitelistListController.java b/sf-service/src/main/java/com/sf/service/deployment/controller/DeploymentWhitelistListController.java similarity index 96% rename from sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentWhitelistListController.java rename to sf-service/src/main/java/com/sf/service/deployment/controller/DeploymentWhitelistListController.java index 0f0c786..33808bd 100644 --- a/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentWhitelistListController.java +++ b/sf-service/src/main/java/com/sf/service/deployment/controller/DeploymentWhitelistListController.java @@ -1,4 +1,4 @@ -package com.sf.system.deployment.controller; +package com.sf.service.deployment.controller; import java.io.IOException; import java.util.List; @@ -6,8 +6,8 @@ import javax.servlet.http.HttpServletResponse; import cn.hutool.core.util.ObjectUtil; import com.sf.common.exception.ServiceException; -import com.sf.system.deployment.domain.DeploymentWhitelistList; -import com.sf.system.deployment.service.IDeploymentWhitelistListService; +import com.sf.service.deployment.domain.DeploymentWhitelistList; +import com.sf.service.deployment.service.IDeploymentWhitelistListService; import org.springframework.http.MediaType; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sf-system/src/main/java/com/sf/system/deployment/controller/SysApkInfoController.java b/sf-service/src/main/java/com/sf/service/deployment/controller/SysApkInfoController.java similarity index 75% rename from sf-system/src/main/java/com/sf/system/deployment/controller/SysApkInfoController.java rename to sf-service/src/main/java/com/sf/service/deployment/controller/SysApkInfoController.java index 8d3561a..5658f8c 100644 --- a/sf-system/src/main/java/com/sf/system/deployment/controller/SysApkInfoController.java +++ b/sf-service/src/main/java/com/sf/service/deployment/controller/SysApkInfoController.java @@ -1,16 +1,14 @@ -package com.sf.system.deployment.controller; +package com.sf.service.deployment.controller; import com.sf.common.annotation.Log; import com.sf.common.core.controller.BaseController; import com.sf.common.core.domain.AjaxResult; import com.sf.common.core.page.TableDataInfo; import com.sf.common.enums.BusinessType; -import com.sf.common.enums.RequestHeaderEnums; -import com.sf.common.utils.StringUtils; -import com.sf.common.utils.http.RequestUtils; import com.sf.common.utils.poi.ExcelUtil; -import com.sf.system.deployment.domain.SysApkInfo; -import com.sf.system.deployment.service.ISysApkInfoService; +import com.sf.service.deployment.domain.SysApkInfo; +import com.sf.service.deployment.service.ISysApkInfoService; +import com.sf.service.index.utils.AppUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -20,14 +18,13 @@ import java.util.List; /** * 安装包管理（新）Controller - * + * * @author ztzh * @date 2024-04-11 */ @RestController @RequestMapping("/deploy/INFO") -public class SysApkInfoController extends BaseController -{ +public class SysApkInfoController extends BaseController { @Autowired private ISysApkInfoService sysApkInfoService; @@ -36,9 +33,8 @@ public class SysApkInfoController extends BaseController */ @PreAuthorize("@ss.hasPermi('deploy:INFO:list')") @GetMapping("/list") - public TableDataInfo list(SysApkInfo sysApkInfo) - { - sysApkInfo.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode())); + public TableDataInfo list(SysApkInfo sysApkInfo) { + sysApkInfo.setAppCode(AppUtils.getAppCodeFromRequestHeader()); startPage(); List list = sysApkInfoService.selectSysApkInfoList(sysApkInfo); return getDataTable(list); @@ -50,8 +46,7 @@ public class SysApkInfoController extends BaseController @PreAuthorize("@ss.hasPermi('deploy:INFO:export')") @Log(title = "安装包管理（新）", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, SysApkInfo sysApkInfo) - { + public void export(HttpServletResponse response, SysApkInfo sysApkInfo) { List list = sysApkInfoService.selectSysApkInfoList(sysApkInfo); ExcelUtil util = new ExcelUtil(SysApkInfo.class); util.exportExcel(response, list, "安装包管理（新）数据"); @@ -62,8 +57,7 @@ public class SysApkInfoController extends BaseController */ @PreAuthorize("@ss.hasPermi('deploy:INFO:query')") @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { + public AjaxResult getInfo(@PathVariable("id") Long id) { return success(sysApkInfoService.selectSysApkInfoById(id)); } @@ -73,9 +67,8 @@ public class SysApkInfoController extends BaseController @PreAuthorize("@ss.hasPermi('deploy:INFO:add')") @Log(title = "安装包管理（新）", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody SysApkInfo sysApkInfo) - { - sysApkInfo.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode())); + public AjaxResult add(@RequestBody SysApkInfo sysApkInfo) { + sysApkInfo.setAppCode(AppUtils.getAppCodeFromRequestHeader()); sysApkInfo.setCreated(getUsername()); sysApkInfo.setModified(getUsername()); return toAjax(sysApkInfoService.insertSysApkInfo(sysApkInfo)); @@ -87,8 +80,7 @@ public class SysApkInfoController extends BaseController @PreAuthorize("@ss.hasPermi('deploy:INFO:edit')") @Log(title = "安装包管理（新）", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody SysApkInfo sysApkInfo) - { + public AjaxResult edit(@RequestBody SysApkInfo sysApkInfo) { sysApkInfo.setModified(getUsername()); return toAjax(sysApkInfoService.updateSysApkInfo(sysApkInfo)); } @@ -98,9 +90,8 @@ public class SysApkInfoController extends BaseController */ @PreAuthorize("@ss.hasPermi('deploy:INFO:remove')") @Log(title = "安装包管理（新）", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(sysApkInfoService.deleteSysApkInfoByIds(ids)); } } diff --git a/sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentApplyEnvironment.java b/sf-service/src/main/java/com/sf/service/deployment/domain/DeploymentApplyEnvironment.java similarity index 98% rename from sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentApplyEnvironment.java rename to sf-service/src/main/java/com/sf/service/deployment/domain/DeploymentApplyEnvironment.java index 7e2872d..23d7a0c 100644 --- a/sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentApplyEnvironment.java +++ b/sf-service/src/main/java/com/sf/service/deployment/domain/DeploymentApplyEnvironment.java @@ -1,4 +1,4 @@ -package com.sf.system.deployment.domain; +package com.sf.service.deployment.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentModuleList.java b/sf-service/src/main/java/com/sf/service/deployment/domain/DeploymentModuleList.java similarity index 99% rename from sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentModuleList.java rename to sf-service/src/main/java/com/sf/service/deployment/domain/DeploymentModuleList.java index 4231824..b590f1e 100644 --- a/sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentModuleList.java +++ b/sf-service/src/main/java/com/sf/service/deployment/domain/DeploymentModuleList.java @@ -1,4 +1,4 @@ -package com.sf.system.deployment.domain; +package com.sf.service.deployment.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentServicePublish.java b/sf-service/src/main/java/com/sf/service/deployment/domain/DeploymentServicePublish.java similarity index 99% rename from sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentServicePublish.java rename to sf-service/src/main/java/com/sf/service/deployment/domain/DeploymentServicePublish.java index 716094f..c972ddb 100644 --- a/sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentServicePublish.java +++ b/sf-service/src/main/java/com/sf/service/deployment/domain/DeploymentServicePublish.java @@ -1,4 +1,4 @@ -package com.sf.system.deployment.domain; +package com.sf.service.deployment.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentWhitelistInfo.java b/sf-service/src/main/java/com/sf/service/deployment/domain/DeploymentWhitelistInfo.java similarity index 96% rename from sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentWhitelistInfo.java rename to sf-service/src/main/java/com/sf/service/deployment/domain/DeploymentWhitelistInfo.java index c515aaf..a74d30c 100644 --- a/sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentWhitelistInfo.java +++ b/sf-service/src/main/java/com/sf/service/deployment/domain/DeploymentWhitelistInfo.java @@ -1,9 +1,8 @@ -package com.sf.system.deployment.domain; +package com.sf.service.deployment.domain; import java.util.Date; import java.util.List; -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentWhitelistList.java b/sf-service/src/main/java/com/sf/service/deployment/domain/DeploymentWhitelistList.java similarity index 98% rename from sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentWhitelistList.java rename to sf-service/src/main/java/com/sf/service/deployment/domain/DeploymentWhitelistList.java index a24aae5..84159e0 100644 --- a/sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentWhitelistList.java +++ b/sf-service/src/main/java/com/sf/service/deployment/domain/DeploymentWhitelistList.java @@ -1,4 +1,4 @@ -package com.sf.system.deployment.domain; +package com.sf.service.deployment.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/sf-system/src/main/java/com/sf/system/deployment/domain/SysApkInfo.java b/sf-service/src/main/java/com/sf/service/deployment/domain/SysApkInfo.java similarity index 99% rename from sf-system/src/main/java/com/sf/system/deployment/domain/SysApkInfo.java rename to sf-service/src/main/java/com/sf/service/deployment/domain/SysApkInfo.java index b08bd48..b308099 100644 --- a/sf-system/src/main/java/com/sf/system/deployment/domain/SysApkInfo.java +++ b/sf-service/src/main/java/com/sf/service/deployment/domain/SysApkInfo.java @@ -1,4 +1,4 @@ -package com.sf.system.deployment.domain; +package com.sf.service.deployment.domain; import com.sf.common.annotation.Excel; import com.sf.common.core.domain.BaseEntity; diff --git a/sf-system/src/main/java/com/sf/system/deployment/domain/rqs/AddWhiteMemberRequest.java b/sf-service/src/main/java/com/sf/service/deployment/domain/rqs/AddWhiteMemberRequest.java old mode 100755 new mode 100644 similarity index 81% rename from sf-system/src/main/java/com/sf/system/deployment/domain/rqs/AddWhiteMemberRequest.java rename to sf-service/src/main/java/com/sf/service/deployment/domain/rqs/AddWhiteMemberRequest.java index 05984bf..7cc9768 --- a/sf-system/src/main/java/com/sf/system/deployment/domain/rqs/AddWhiteMemberRequest.java +++ b/sf-service/src/main/java/com/sf/service/deployment/domain/rqs/AddWhiteMemberRequest.java @@ -1,4 +1,4 @@ -package com.sf.system.deployment.domain.rqs; +package com.sf.service.deployment.domain.rqs; import lombok.Data; diff --git a/sf-system/src/main/java/com/sf/system/deployment/domain/rqs/ModuleListByCoreRequest.java b/sf-service/src/main/java/com/sf/service/deployment/domain/rqs/ModuleListByCoreRequest.java old mode 100755 new mode 100644 similarity index 84% rename from sf-system/src/main/java/com/sf/system/deployment/domain/rqs/ModuleListByCoreRequest.java rename to sf-service/src/main/java/com/sf/service/deployment/domain/rqs/ModuleListByCoreRequest.java index 30adbdb..ffac33a --- a/sf-system/src/main/java/com/sf/system/deployment/domain/rqs/ModuleListByCoreRequest.java +++ b/sf-service/src/main/java/com/sf/service/deployment/domain/rqs/ModuleListByCoreRequest.java @@ -1,4 +1,4 @@ -package com.sf.system.deployment.domain.rqs; +package com.sf.service.deployment.domain.rqs; import lombok.Data; diff --git a/sf-system/src/main/java/com/sf/system/deployment/mapper/DeploymentApplyEnvironmentMapper.java b/sf-service/src/main/java/com/sf/service/deployment/mapper/DeploymentApplyEnvironmentMapper.java similarity index 93% rename from sf-system/src/main/java/com/sf/system/deployment/mapper/DeploymentApplyEnvironmentMapper.java rename to sf-service/src/main/java/com/sf/service/deployment/mapper/DeploymentApplyEnvironmentMapper.java index 905b7cc..8931022 100644 --- a/sf-system/src/main/java/com/sf/system/deployment/mapper/DeploymentApplyEnvironmentMapper.java +++ b/sf-service/src/main/java/com/sf/service/deployment/mapper/DeploymentApplyEnvironmentMapper.java @@ -1,6 +1,6 @@ -package com.sf.deployment.mapper; +package com.sf.service.deployment.mapper; -import com.sf.system.deployment.domain.DeploymentApplyEnvironment; +import com.sf.service.deployment.domain.DeploymentApplyEnvironment; import java.util.List; diff --git a/sf-system/src/main/java/com/sf/system/deployment/mapper/DeploymentModuleListMapper.java b/sf-service/src/main/java/com/sf/service/deployment/mapper/DeploymentModuleListMapper.java similarity index 92% rename from sf-system/src/main/java/com/sf/system/deployment/mapper/DeploymentModuleListMapper.java rename to sf-service/src/main/java/com/sf/service/deployment/mapper/DeploymentModuleListMapper.java index 614b741..b8d4a24 100644 --- a/sf-system/src/main/java/com/sf/system/deployment/mapper/DeploymentModuleListMapper.java +++ b/sf-service/src/main/java/com/sf/service/deployment/mapper/DeploymentModuleListMapper.java @@ -1,7 +1,8 @@ -package com.sf.system.deployment.mapper; +package com.sf.service.deployment.mapper; import java.util.List; -import com.sf.system.deployment.domain.DeploymentModuleList; + +import com.sf.service.deployment.domain.DeploymentModuleList; /** * H5模块包Mapper接口 diff --git a/sf-system/src/main/java/com/sf/system/deployment/mapper/DeploymentServicePublishMapper.java b/sf-service/src/main/java/com/sf/service/deployment/mapper/DeploymentServicePublishMapper.java similarity index 92% rename from sf-system/src/main/java/com/sf/system/deployment/mapper/DeploymentServicePublishMapper.java rename to sf-service/src/main/java/com/sf/service/deployment/mapper/DeploymentServicePublishMapper.java index cf459aa..2274166 100644 --- a/sf-system/src/main/java/com/sf/system/deployment/mapper/DeploymentServicePublishMapper.java +++ b/sf-service/src/main/java/com/sf/service/deployment/mapper/DeploymentServicePublishMapper.java @@ -1,6 +1,6 @@ -package com.sf.system.deployment.mapper; +package com.sf.service.deployment.mapper; -import com.sf.system.deployment.domain.DeploymentServicePublish; +import com.sf.service.deployment.domain.DeploymentServicePublish; import java.util.List; diff --git a/sf-system/src/main/java/com/sf/system/deployment/mapper/DeploymentWhitelistInfoMapper.java b/sf-service/src/main/java/com/sf/service/deployment/mapper/DeploymentWhitelistInfoMapper.java similarity index 92% rename from sf-system/src/main/java/com/sf/system/deployment/mapper/DeploymentWhitelistInfoMapper.java rename to sf-service/src/main/java/com/sf/service/deployment/mapper/DeploymentWhitelistInfoMapper.java index 1f0e884..28719b0 100644 --- a/sf-system/src/main/java/com/sf/system/deployment/mapper/DeploymentWhitelistInfoMapper.java +++ b/sf-service/src/main/java/com/sf/service/deployment/mapper/DeploymentWhitelistInfoMapper.java @@ -1,7 +1,7 @@ -package com.sf.system.deployment.mapper; +package com.sf.service.deployment.mapper; -import com.sf.system.deployment.domain.DeploymentWhitelistInfo; -import com.sf.system.deployment.domain.DeploymentWhitelistList; +import com.sf.service.deployment.domain.DeploymentWhitelistInfo; +import com.sf.service.deployment.domain.DeploymentWhitelistList; import java.util.List; diff --git a/sf-system/src/main/java/com/sf/system/deployment/mapper/DeploymentWhitelistListMapper.java b/sf-service/src/main/java/com/sf/service/deployment/mapper/DeploymentWhitelistListMapper.java similarity index 93% rename from sf-system/src/main/java/com/sf/system/deployment/mapper/DeploymentWhitelistListMapper.java rename to sf-service/src/main/java/com/sf/service/deployment/mapper/DeploymentWhitelistListMapper.java index d242af0..8b3448e 100644 --- a/sf-system/src/main/java/com/sf/system/deployment/mapper/DeploymentWhitelistListMapper.java +++ b/sf-service/src/main/java/com/sf/service/deployment/mapper/DeploymentWhitelistListMapper.java @@ -1,6 +1,6 @@ -package com.sf.system.deployment.mapper; +package com.sf.service.deployment.mapper; -import com.sf.system.deployment.domain.DeploymentWhitelistList; +import com.sf.service.deployment.domain.DeploymentWhitelistList; import java.util.List; diff --git a/sf-system/src/main/java/com/sf/system/deployment/mapper/SysApkInfoMapper.java b/sf-service/src/main/java/com/sf/service/deployment/mapper/SysApkInfoMapper.java similarity index 93% rename from sf-system/src/main/java/com/sf/system/deployment/mapper/SysApkInfoMapper.java rename to sf-service/src/main/java/com/sf/service/deployment/mapper/SysApkInfoMapper.java index 71ce17f..4562d36 100644 --- a/sf-system/src/main/java/com/sf/system/deployment/mapper/SysApkInfoMapper.java +++ b/sf-service/src/main/java/com/sf/service/deployment/mapper/SysApkInfoMapper.java @@ -1,7 +1,7 @@ -package com.sf.system.deployment.mapper; +package com.sf.service.deployment.mapper; -import com.sf.system.deployment.domain.SysApkInfo; +import com.sf.service.deployment.domain.SysApkInfo; import java.util.List; diff --git a/sf-system/src/main/java/com/sf/system/deployment/service/IDeploymentApplyEnvironmentService.java b/sf-service/src/main/java/com/sf/service/deployment/service/IDeploymentApplyEnvironmentService.java similarity index 93% rename from sf-system/src/main/java/com/sf/system/deployment/service/IDeploymentApplyEnvironmentService.java rename to sf-service/src/main/java/com/sf/service/deployment/service/IDeploymentApplyEnvironmentService.java index 3f8d855..b8c9deb 100644 --- a/sf-system/src/main/java/com/sf/system/deployment/service/IDeploymentApplyEnvironmentService.java +++ b/sf-service/src/main/java/com/sf/service/deployment/service/IDeploymentApplyEnvironmentService.java @@ -1,6 +1,6 @@ -package com.sf.deployment.service; +package com.sf.service.deployment.service; -import com.sf.system.deployment.domain.DeploymentApplyEnvironment; +import com.sf.service.deployment.domain.DeploymentApplyEnvironment; import java.util.List; diff --git a/sf-system/src/main/java/com/sf/system/deployment/service/IDeploymentModuleListService.java b/sf-service/src/main/java/com/sf/service/deployment/service/IDeploymentModuleListService.java similarity index 92% rename from sf-system/src/main/java/com/sf/system/deployment/service/IDeploymentModuleListService.java rename to sf-service/src/main/java/com/sf/service/deployment/service/IDeploymentModuleListService.java index 3e503b1..9a3073c 100644 --- a/sf-system/src/main/java/com/sf/system/deployment/service/IDeploymentModuleListService.java +++ b/sf-service/src/main/java/com/sf/service/deployment/service/IDeploymentModuleListService.java @@ -1,7 +1,8 @@ -package com.sf.system.deployment.service; +package com.sf.service.deployment.service; import java.util.List; -import com.sf.system.deployment.domain.DeploymentModuleList; + +import com.sf.service.deployment.domain.DeploymentModuleList; /** * H5模块包Service接口 diff --git a/sf-system/src/main/java/com/sf/system/deployment/service/IDeploymentServicePublishService.java b/sf-service/src/main/java/com/sf/service/deployment/service/IDeploymentServicePublishService.java similarity index 92% rename from sf-system/src/main/java/com/sf/system/deployment/service/IDeploymentServicePublishService.java rename to sf-service/src/main/java/com/sf/service/deployment/service/IDeploymentServicePublishService.java index e307482..be2b185 100644 --- a/sf-system/src/main/java/com/sf/system/deployment/service/IDeploymentServicePublishService.java +++ b/sf-service/src/main/java/com/sf/service/deployment/service/IDeploymentServicePublishService.java @@ -1,8 +1,7 @@ -package com.sf.system.deployment.service; +package com.sf.service.deployment.service; -import com.sf.system.deployment.domain.DeploymentServicePublish; +import com.sf.service.deployment.domain.DeploymentServicePublish; -import java.io.IOException; import java.util.List; /** diff --git a/sf-system/src/main/java/com/sf/system/deployment/service/IDeploymentWhitelistInfoService.java b/sf-service/src/main/java/com/sf/service/deployment/service/IDeploymentWhitelistInfoService.java similarity index 93% rename from sf-system/src/main/java/com/sf/system/deployment/service/IDeploymentWhitelistInfoService.java rename to sf-service/src/main/java/com/sf/service/deployment/service/IDeploymentWhitelistInfoService.java index 5f337e7..296a233 100644 --- a/sf-system/src/main/java/com/sf/system/deployment/service/IDeploymentWhitelistInfoService.java +++ b/sf-service/src/main/java/com/sf/service/deployment/service/IDeploymentWhitelistInfoService.java @@ -1,6 +1,6 @@ -package com.sf.system.deployment.service; +package com.sf.service.deployment.service; -import com.sf.system.deployment.domain.DeploymentWhitelistInfo; +import com.sf.service.deployment.domain.DeploymentWhitelistInfo; import java.util.List; diff --git a/sf-system/src/main/java/com/sf/system/deployment/service/IDeploymentWhitelistListService.java b/sf-service/src/main/java/com/sf/service/deployment/service/IDeploymentWhitelistListService.java similarity index 94% rename from sf-system/src/main/java/com/sf/system/deployment/service/IDeploymentWhitelistListService.java rename to sf-service/src/main/java/com/sf/service/deployment/service/IDeploymentWhitelistListService.java index b6bd394..ae10c3f 100644 --- a/sf-system/src/main/java/com/sf/system/deployment/service/IDeploymentWhitelistListService.java +++ b/sf-service/src/main/java/com/sf/service/deployment/service/IDeploymentWhitelistListService.java @@ -1,6 +1,6 @@ -package com.sf.system.deployment.service; +package com.sf.service.deployment.service; -import com.sf.system.deployment.domain.DeploymentWhitelistList; +import com.sf.service.deployment.domain.DeploymentWhitelistList; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; diff --git a/sf-system/src/main/java/com/sf/system/deployment/service/ISysApkInfoService.java b/sf-service/src/main/java/com/sf/service/deployment/service/ISysApkInfoService.java similarity index 93% rename from sf-system/src/main/java/com/sf/system/deployment/service/ISysApkInfoService.java rename to sf-service/src/main/java/com/sf/service/deployment/service/ISysApkInfoService.java index 1925ff2..7127dd4 100644 --- a/sf-system/src/main/java/com/sf/system/deployment/service/ISysApkInfoService.java +++ b/sf-service/src/main/java/com/sf/service/deployment/service/ISysApkInfoService.java @@ -1,7 +1,7 @@ -package com.sf.system.deployment.service; +package com.sf.service.deployment.service; -import com.sf.system.deployment.domain.SysApkInfo; +import com.sf.service.deployment.domain.SysApkInfo; import java.util.List; diff --git a/sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentApplyEnvironmentServiceImpl.java b/sf-service/src/main/java/com/sf/service/deployment/service/impl/DeploymentApplyEnvironmentServiceImpl.java similarity index 90% rename from sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentApplyEnvironmentServiceImpl.java rename to sf-service/src/main/java/com/sf/service/deployment/service/impl/DeploymentApplyEnvironmentServiceImpl.java index 47945cc..9e84138 100644 --- a/sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentApplyEnvironmentServiceImpl.java +++ b/sf-service/src/main/java/com/sf/service/deployment/service/impl/DeploymentApplyEnvironmentServiceImpl.java @@ -1,12 +1,12 @@ -package com.sf.deployment.service.impl; +package com.sf.service.deployment.service.impl; import java.util.List; import com.sf.common.utils.DateUtils; -import com.sf.system.deployment.domain.DeploymentApplyEnvironment; +import com.sf.service.deployment.domain.DeploymentApplyEnvironment; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.sf.deployment.mapper.DeploymentApplyEnvironmentMapper; -import com.sf.deployment.service.IDeploymentApplyEnvironmentService; +import com.sf.service.deployment.mapper.DeploymentApplyEnvironmentMapper; +import com.sf.service.deployment.service.IDeploymentApplyEnvironmentService; /** * 环境维护Service业务层处理 diff --git a/sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentModuleListServiceImpl.java b/sf-service/src/main/java/com/sf/service/deployment/service/impl/DeploymentModuleListServiceImpl.java similarity index 89% rename from sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentModuleListServiceImpl.java rename to sf-service/src/main/java/com/sf/service/deployment/service/impl/DeploymentModuleListServiceImpl.java index 12de1f6..f7a4f30 100644 --- a/sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentModuleListServiceImpl.java +++ b/sf-service/src/main/java/com/sf/service/deployment/service/impl/DeploymentModuleListServiceImpl.java @@ -1,12 +1,12 @@ -package com.sf.system.deployment.service.impl; +package com.sf.service.deployment.service.impl; import java.util.List; import com.sf.common.utils.DateUtils; +import com.sf.service.deployment.domain.DeploymentModuleList; +import com.sf.service.deployment.mapper.DeploymentModuleListMapper; +import com.sf.service.deployment.service.IDeploymentModuleListService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.sf.system.deployment.mapper.DeploymentModuleListMapper; -import com.sf.system.deployment.domain.DeploymentModuleList; -import com.sf.system.deployment.service.IDeploymentModuleListService; /** * H5模块包Service业务层处理 @@ -15,7 +15,7 @@ import com.sf.system.deployment.service.IDeploymentModuleListService; * @date 2024-04-22 */ @Service -public class DeploymentModuleListServiceImpl implements IDeploymentModuleListService +public class DeploymentModuleListServiceImpl implements IDeploymentModuleListService { @Autowired private DeploymentModuleListMapper deploymentModuleListMapper; diff --git a/sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentServicePublishServiceImpl.java b/sf-service/src/main/java/com/sf/service/deployment/service/impl/DeploymentServicePublishServiceImpl.java similarity index 90% rename from sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentServicePublishServiceImpl.java rename to sf-service/src/main/java/com/sf/service/deployment/service/impl/DeploymentServicePublishServiceImpl.java index bde7b26..833ade6 100644 --- a/sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentServicePublishServiceImpl.java +++ b/sf-service/src/main/java/com/sf/service/deployment/service/impl/DeploymentServicePublishServiceImpl.java @@ -1,6 +1,5 @@ -package com.sf.system.deployment.service.impl; +package com.sf.service.deployment.service.impl; -import java.io.IOException; import java.util.List; import com.sf.common.constant.HttpStatus; @@ -9,14 +8,13 @@ import com.sf.common.utils.DateUtils; import com.sf.common.utils.file.QRCodeUtils; import com.sf.file.domain.SysOss; import com.sf.file.service.ISysOssService; -import com.sf.system.deployment.domain.DeploymentServicePublish; -import com.sf.system.deployment.domain.SysApkInfo; -import com.sf.system.deployment.mapper.DeploymentServicePublishMapper; -import com.sf.system.deployment.service.IDeploymentServicePublishService; -import com.sf.system.deployment.service.ISysApkInfoService; +import com.sf.service.deployment.domain.DeploymentServicePublish; +import com.sf.service.deployment.domain.SysApkInfo; +import com.sf.service.deployment.mapper.DeploymentServicePublishMapper; +import com.sf.service.deployment.service.IDeploymentServicePublishService; +import com.sf.service.deployment.service.ISysApkInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; diff --git a/sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentWhitelistInfoServiceImpl.java b/sf-service/src/main/java/com/sf/service/deployment/service/impl/DeploymentWhitelistInfoServiceImpl.java similarity index 92% rename from sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentWhitelistInfoServiceImpl.java rename to sf-service/src/main/java/com/sf/service/deployment/service/impl/DeploymentWhitelistInfoServiceImpl.java index c302145..6bdddb3 100644 --- a/sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentWhitelistInfoServiceImpl.java +++ b/sf-service/src/main/java/com/sf/service/deployment/service/impl/DeploymentWhitelistInfoServiceImpl.java @@ -1,13 +1,13 @@ -package com.sf.system.deployment.service.impl; +package com.sf.service.deployment.service.impl; import java.util.List; import com.sf.common.utils.DateUtils; -import com.sf.system.deployment.domain.DeploymentWhitelistInfo; -import com.sf.system.deployment.domain.DeploymentWhitelistList; -import com.sf.system.deployment.mapper.DeploymentWhitelistInfoMapper; -import com.sf.system.deployment.mapper.DeploymentWhitelistListMapper; -import com.sf.system.deployment.service.IDeploymentWhitelistInfoService; +import com.sf.service.deployment.domain.DeploymentWhitelistInfo; +import com.sf.service.deployment.domain.DeploymentWhitelistList; +import com.sf.service.deployment.mapper.DeploymentWhitelistInfoMapper; +import com.sf.service.deployment.mapper.DeploymentWhitelistListMapper; +import com.sf.service.deployment.service.IDeploymentWhitelistInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentWhitelistListServiceImpl.java b/sf-service/src/main/java/com/sf/service/deployment/service/impl/DeploymentWhitelistListServiceImpl.java similarity index 78% rename from sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentWhitelistListServiceImpl.java rename to sf-service/src/main/java/com/sf/service/deployment/service/impl/DeploymentWhitelistListServiceImpl.java index 812b7ad..b006c85 100644 --- a/sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentWhitelistListServiceImpl.java +++ b/sf-service/src/main/java/com/sf/service/deployment/service/impl/DeploymentWhitelistListServiceImpl.java @@ -1,70 +1,66 @@ -package com.sf.system.deployment.service.impl; +package com.sf.service.deployment.service.impl; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.List; +import cn.hutool.core.lang.Assert; import com.sf.common.enums.RequestHeaderEnums; import com.sf.common.utils.DateUtils; import com.sf.common.utils.StringUtils; import com.sf.common.utils.http.RequestUtils; -import com.sf.system.deployment.domain.DeploymentWhitelistList; -import com.sf.system.deployment.mapper.DeploymentWhitelistListMapper; -import com.sf.system.deployment.service.IDeploymentWhitelistListService; +import com.sf.service.deployment.domain.DeploymentWhitelistList; +import com.sf.service.deployment.mapper.DeploymentWhitelistListMapper; +import com.sf.service.deployment.service.IDeploymentWhitelistListService; +import com.sf.service.index.utils.AppUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; /** * 白名单成员列Service业务层处理 - * + * * @author ztzh * @date 2024-05-06 */ @Service -public class DeploymentWhitelistListServiceImpl implements IDeploymentWhitelistListService -{ +public class DeploymentWhitelistListServiceImpl implements IDeploymentWhitelistListService { @Autowired private DeploymentWhitelistListMapper deploymentWhitelistListMapper; /** * 查询白名单成员列 - * + * * @param id 白名单成员列主键 * @return 白名单成员列 */ @Override - public DeploymentWhitelistList selectDeploymentWhitelistListById(Long id) - { + public DeploymentWhitelistList selectDeploymentWhitelistListById(Long id) { return deploymentWhitelistListMapper.selectDeploymentWhitelistListById(id); } /** * 查询白名单成员列列表 - * + * * @param deploymentWhitelistList 白名单成员列 * @return 白名单成员列 */ @Override - public List selectDeploymentWhitelistListList(DeploymentWhitelistList deploymentWhitelistList) - { + public List selectDeploymentWhitelistListList(DeploymentWhitelistList deploymentWhitelistList) { return deploymentWhitelistListMapper.selectDeploymentWhitelistListList(deploymentWhitelistList); } /** * 新增白名单成员列 * - * @param member 白名单成员列 + * @param member 白名单成员列 * @param username * @return 结果 */ @Override - public int insertDeploymentWhitelistList(DeploymentWhitelistList member, String username) - { - if(null == member.getWhitelistId()){ - throw new SecurityException("参数异常WhitelistId为空"); - } - member.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode())); + public int insertDeploymentWhitelistList(DeploymentWhitelistList member, String username) { + Assert.notNull(member.getWhitelistId(), "WhitelistId不能为空"); + member.setAppCode(AppUtils.getAppCodeFromRequestHeader()); member.setCreated(username); member.setCreateTime(DateUtils.getNowDate()); member.setModified(username); @@ -75,38 +71,35 @@ public class DeploymentWhitelistListServiceImpl implements IDeploymentWhitelistL /** * 修改白名单成员列 - * + * * @param deploymentWhitelistList 白名单成员列 * @return 结果 */ @Override - public int updateDeploymentWhitelistList(DeploymentWhitelistList deploymentWhitelistList) - { + public int updateDeploymentWhitelistList(DeploymentWhitelistList deploymentWhitelistList) { deploymentWhitelistList.setUpdateTime(DateUtils.getNowDate()); return deploymentWhitelistListMapper.updateDeploymentWhitelistList(deploymentWhitelistList); } /** * 批量删除白名单成员列 - * + * * @param ids 需要删除的白名单成员列主键 * @return 结果 */ @Override - public int deleteDeploymentWhitelistListByIds(Long[] ids) - { + public int deleteDeploymentWhitelistListByIds(Long[] ids) { return deploymentWhitelistListMapper.deleteDeploymentWhitelistListByIds(ids); } /** * 删除白名单成员列信息 - * + * * @param id 白名单成员列主键 * @return 结果 */ @Override - public int deleteDeploymentWhitelistListById(Long id) - { + public int deleteDeploymentWhitelistListById(Long id) { return deploymentWhitelistListMapper.deleteDeploymentWhitelistListById(id); } @@ -119,7 +112,7 @@ public class DeploymentWhitelistListServiceImpl implements IDeploymentWhitelistL } catch (IOException e) { e.printStackTrace(); } - content.replaceAll("/n",""); + content.replaceAll("/n", ""); String[] split = StringUtils.split(content, ","); for (String user : split) { DeploymentWhitelistList menber = new DeploymentWhitelistList(); diff --git a/sf-system/src/main/java/com/sf/system/deployment/service/impl/SysApkInfoServiceImpl.java b/sf-service/src/main/java/com/sf/service/deployment/service/impl/SysApkInfoServiceImpl.java similarity index 91% rename from sf-system/src/main/java/com/sf/system/deployment/service/impl/SysApkInfoServiceImpl.java rename to sf-service/src/main/java/com/sf/service/deployment/service/impl/SysApkInfoServiceImpl.java index b0513ec..3d495d9 100644 --- a/sf-system/src/main/java/com/sf/system/deployment/service/impl/SysApkInfoServiceImpl.java +++ b/sf-service/src/main/java/com/sf/service/deployment/service/impl/SysApkInfoServiceImpl.java @@ -1,9 +1,9 @@ -package com.sf.system.deployment.service.impl; +package com.sf.service.deployment.service.impl; import com.sf.common.utils.DateUtils; -import com.sf.system.deployment.domain.SysApkInfo; -import com.sf.system.deployment.mapper.SysApkInfoMapper; -import com.sf.system.deployment.service.ISysApkInfoService; +import com.sf.service.deployment.domain.SysApkInfo; +import com.sf.service.deployment.mapper.SysApkInfoMapper; +import com.sf.service.deployment.service.ISysApkInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/sf-service/src/main/java/com/sf/service/exception/AppCodeNotFoundException.java b/sf-service/src/main/java/com/sf/service/exception/AppCodeNotFoundException.java new file mode 100644 index 0000000..aba439f --- /dev/null +++ b/sf-service/src/main/java/com/sf/service/exception/AppCodeNotFoundException.java @@ -0,0 +1,60 @@ +package com.sf.service.exception; + +import com.sf.common.exception.ServiceException; + +/** + * 功能描述: 未找到appCode + * + * @author a_kun + * @date 2024/5/14 9:16 + */ +public class AppCodeNotFoundException extends ServiceException { + + private static final long serialVersionUID = 1L; + + /** + * 错误码 + */ + private Integer code; + + /** + * 错误提示 + */ + private String message; + + + /** + * 空构造方法，避免反序列化问题 + */ + public AppCodeNotFoundException() {} + + public AppCodeNotFoundException(String message) + { + this.message = message; + } + + public AppCodeNotFoundException(String message, Integer code) + { + this.message = message; + this.code = code; + } + + @Override + public String getMessage() + { + return message; + } + + public Integer getCode() + { + return code; + } + + public ServiceException setMessage(String message) + { + this.message = message; + return this; + } + + +} diff --git a/sf-service/src/main/java/com/sf/service/gateway/controller/GatewayConfigController.java b/sf-service/src/main/java/com/sf/service/gateway/controller/GatewayConfigController.java index e6e1808..3c006ee 100644 --- a/sf-service/src/main/java/com/sf/service/gateway/controller/GatewayConfigController.java +++ b/sf-service/src/main/java/com/sf/service/gateway/controller/GatewayConfigController.java @@ -5,7 +5,7 @@ import com.sf.common.annotation.Log; import com.sf.common.core.controller.BaseController; import com.sf.common.core.domain.AjaxResult; import com.sf.common.enums.BusinessType; -import com.sf.common.utils.AppUtils; +import com.sf.service.index.utils.AppUtils; import com.sf.service.gateway.domain.GatewayConfig; import com.sf.service.gateway.enums.GatewayDataStatus; import com.sf.service.gateway.service.IGatewayConfigService; diff --git a/sf-service/src/main/java/com/sf/service/gateway/controller/GatewayInterfaceInfoController.java b/sf-service/src/main/java/com/sf/service/gateway/controller/GatewayInterfaceInfoController.java index 7394d6e..0397cf4 100644 --- a/sf-service/src/main/java/com/sf/service/gateway/controller/GatewayInterfaceInfoController.java +++ b/sf-service/src/main/java/com/sf/service/gateway/controller/GatewayInterfaceInfoController.java @@ -5,7 +5,7 @@ import java.util.function.Function; import java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; -import com.sf.common.utils.AppUtils; +import com.sf.service.index.utils.AppUtils; import com.sf.file.domain.SysOss; import com.sf.file.service.ISysOssService; import com.sf.service.gateway.domain.GatewayInterfaceInfo; diff --git a/sf-service/src/main/java/com/sf/service/gateway/controller/GatewayRouteController.java b/sf-service/src/main/java/com/sf/service/gateway/controller/GatewayRouteController.java index 09de60d..f8a0e5d 100644 --- a/sf-service/src/main/java/com/sf/service/gateway/controller/GatewayRouteController.java +++ b/sf-service/src/main/java/com/sf/service/gateway/controller/GatewayRouteController.java @@ -6,7 +6,7 @@ import java.util.Map; import java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; -import com.sf.common.utils.AppUtils; +import com.sf.service.index.utils.AppUtils; import com.sf.service.gateway.domain.GatewayRoute; import com.sf.service.gateway.domain.dto.InsertOrUpdateGatewayRouteDTO; import com.sf.service.gateway.domain.dto.QueryGatewayRouteDTO; diff --git a/sf-service/src/main/java/com/sf/service/gateway/controller/GatewayServerController.java b/sf-service/src/main/java/com/sf/service/gateway/controller/GatewayServerController.java index be1cad2..e4f8d52 100644 --- a/sf-service/src/main/java/com/sf/service/gateway/controller/GatewayServerController.java +++ b/sf-service/src/main/java/com/sf/service/gateway/controller/GatewayServerController.java @@ -5,7 +5,7 @@ import java.util.function.Function; import java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; -import com.sf.common.utils.AppUtils; +import com.sf.service.index.utils.AppUtils; import com.sf.service.gateway.domain.*; import com.sf.service.gateway.domain.dto.QueryGatewayServerDTO; import com.sf.service.gateway.domain.dto.UpdateDataStatusDTO; diff --git a/sf-service/src/main/java/com/sf/service/gateway/controller/GatewayStrategyController.java b/sf-service/src/main/java/com/sf/service/gateway/controller/GatewayStrategyController.java index 0372627..9e1138d 100644 --- a/sf-service/src/main/java/com/sf/service/gateway/controller/GatewayStrategyController.java +++ b/sf-service/src/main/java/com/sf/service/gateway/controller/GatewayStrategyController.java @@ -6,11 +6,10 @@ import java.util.Map; import java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; -import com.sf.common.utils.AppUtils; +import com.sf.service.index.utils.AppUtils; import com.sf.service.gateway.domain.GatewayStrategy; import com.sf.service.gateway.domain.dto.QueryGatewayStrategyDTO; import com.sf.service.gateway.domain.dto.UpdateDataStatusDTO; -import com.sf.service.gateway.domain.vo.GatewayInterfaceInfoListVO; import com.sf.service.gateway.domain.vo.GatewayStrategyListVO; import com.sf.service.gateway.enums.GatewayDataStatus; import com.sf.service.gateway.service.IGatewayStrategyService; diff --git a/sf-service/src/main/java/com/sf/service/gateway/service/impl/GatewayConfigServiceImpl.java b/sf-service/src/main/java/com/sf/service/gateway/service/impl/GatewayConfigServiceImpl.java index f47816b..25f0008 100644 --- a/sf-service/src/main/java/com/sf/service/gateway/service/impl/GatewayConfigServiceImpl.java +++ b/sf-service/src/main/java/com/sf/service/gateway/service/impl/GatewayConfigServiceImpl.java @@ -6,7 +6,7 @@ import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.sf.common.constant.HttpStatus; import com.sf.common.exception.ServiceException; -import com.sf.common.utils.AppUtils; +import com.sf.service.index.utils.AppUtils; import com.sf.common.utils.DateUtils; import com.sf.common.utils.SecurityUtils; import com.sf.service.gateway.domain.*; diff --git a/sf-service/src/main/java/com/sf/service/gateway/service/impl/GatewayInterfaceInfoServiceImpl.java b/sf-service/src/main/java/com/sf/service/gateway/service/impl/GatewayInterfaceInfoServiceImpl.java index b071f07..f7856af 100644 --- a/sf-service/src/main/java/com/sf/service/gateway/service/impl/GatewayInterfaceInfoServiceImpl.java +++ b/sf-service/src/main/java/com/sf/service/gateway/service/impl/GatewayInterfaceInfoServiceImpl.java @@ -17,6 +17,7 @@ import com.sf.service.gateway.mapper.GatewayInterfaceInfoMapper; import com.sf.service.gateway.mapper.GatewayInterfaceLinkStrategyMapper; import com.sf.service.gateway.service.IGatewayInterfaceInfoService; import com.sf.service.gateway.service.IGatewayStrategyService; +import com.sf.service.index.utils.AppUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Service; diff --git a/sf-service/src/main/java/com/sf/service/gateway/service/impl/GatewayRouteServiceImpl.java b/sf-service/src/main/java/com/sf/service/gateway/service/impl/GatewayRouteServiceImpl.java index 564a328..61e195d 100644 --- a/sf-service/src/main/java/com/sf/service/gateway/service/impl/GatewayRouteServiceImpl.java +++ b/sf-service/src/main/java/com/sf/service/gateway/service/impl/GatewayRouteServiceImpl.java @@ -5,7 +5,7 @@ import java.util.*; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; import com.alibaba.fastjson2.JSON; -import com.sf.common.utils.AppUtils; +import com.sf.service.index.utils.AppUtils; import com.sf.common.utils.DateUtils; import com.sf.common.utils.SecurityUtils; import com.sf.common.utils.URLUtils; diff --git a/sf-service/src/main/java/com/sf/service/goods/controller/GoodsMessagesController.java b/sf-service/src/main/java/com/sf/service/goods/controller/GoodsMessagesController.java index 9baf45a..6f38578 100644 --- a/sf-service/src/main/java/com/sf/service/goods/controller/GoodsMessagesController.java +++ b/sf-service/src/main/java/com/sf/service/goods/controller/GoodsMessagesController.java @@ -3,10 +3,9 @@ package com.sf.service.goods.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.sf.common.enums.RequestHeaderEnums; -import com.sf.common.utils.http.RequestUtils; import com.sf.service.goods.domain.GoodsMessages; import com.sf.service.goods.service.IGoodsMessagesService; +import com.sf.service.index.utils.AppUtils; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -32,8 +31,7 @@ import com.sf.common.core.page.TableDataInfo; */ @RestController @RequestMapping("/service/goods") -public class GoodsMessagesController extends BaseController -{ +public class GoodsMessagesController extends BaseController { @Autowired private IGoodsMessagesService goodsMessagesService; @@ -41,9 +39,8 @@ public class GoodsMessagesController extends BaseController * 查询商品信息列表 */ @GetMapping("/list") - public TableDataInfo list(GoodsMessages goodsMessages) - { - goodsMessages.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode())); + public TableDataInfo list(GoodsMessages goodsMessages) { + goodsMessages.setAppCode(AppUtils.getAppCodeFromRequestHeader()); startPage(); List list = goodsMessagesService.selectGoodsMessagesList(goodsMessages); return getDataTable(list); @@ -55,8 +52,7 @@ public class GoodsMessagesController extends BaseController @PreAuthorize("@ss.hasPermi('service:goods:export')") @Log(title = "商品信息", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, GoodsMessages goodsMessages) - { + public void export(HttpServletResponse response, GoodsMessages goodsMessages) { List list = goodsMessagesService.selectGoodsMessagesList(goodsMessages); ExcelUtil util = new ExcelUtil(GoodsMessages.class); util.exportExcel(response, list, "商品信息数据"); @@ -67,8 +63,7 @@ public class GoodsMessagesController extends BaseController */ @PreAuthorize("@ss.hasPermi('service:goods:query')") @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { + public AjaxResult getInfo(@PathVariable("id") Long id) { return success(goodsMessagesService.selectGoodsMessagesById(id)); } @@ -78,9 +73,8 @@ public class GoodsMessagesController extends BaseController @PreAuthorize("@ss.hasPermi('service:goods:add')") @Log(title = "商品信息", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody GoodsMessages goodsMessages) - { - goodsMessages.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode())); + public AjaxResult add(@RequestBody GoodsMessages goodsMessages) { + goodsMessages.setAppCode(AppUtils.getAppCodeFromRequestHeader()); return toAjax(goodsMessagesService.insertGoodsMessages(goodsMessages)); } @@ -90,8 +84,7 @@ public class GoodsMessagesController extends BaseController @PreAuthorize("@ss.hasPermi('service:goods:edit')") @Log(title = "商品信息", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody GoodsMessages goodsMessages) - { + public AjaxResult edit(@RequestBody GoodsMessages goodsMessages) { return toAjax(goodsMessagesService.updateGoodsMessages(goodsMessages)); } @@ -101,8 +94,7 @@ public class GoodsMessagesController extends BaseController @PreAuthorize("@ss.hasPermi('service:goods:remove')") @Log(title = "商品信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { + public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(goodsMessagesService.deleteGoodsMessagesByIds(ids)); } } diff --git a/sf-admin/src/main/java/com/sf/index/controller/ApplyListInfoController.java b/sf-service/src/main/java/com/sf/service/index/controller/ApplyListInfoController.java similarity index 95% rename from sf-admin/src/main/java/com/sf/index/controller/ApplyListInfoController.java rename to sf-service/src/main/java/com/sf/service/index/controller/ApplyListInfoController.java index bfc6939..5490f75 100644 --- a/sf-admin/src/main/java/com/sf/index/controller/ApplyListInfoController.java +++ b/sf-service/src/main/java/com/sf/service/index/controller/ApplyListInfoController.java @@ -1,7 +1,9 @@ -package com.sf.index.controller; +package com.sf.service.index.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.sf.service.index.service.IApplyListInfoService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -16,8 +18,7 @@ import com.sf.common.annotation.Log; import com.sf.common.core.controller.BaseController; import com.sf.common.core.domain.AjaxResult; import com.sf.common.enums.BusinessType; -import com.sf.index.domain.ApplyListInfo; -import com.sf.index.service.IApplyListInfoService; +import com.sf.service.index.domain.ApplyListInfo; import com.sf.common.utils.poi.ExcelUtil; import com.sf.common.core.page.TableDataInfo; diff --git a/sf-admin/src/main/java/com/sf/index/domain/ApplyListInfo.java b/sf-service/src/main/java/com/sf/service/index/domain/ApplyListInfo.java similarity index 98% rename from sf-admin/src/main/java/com/sf/index/domain/ApplyListInfo.java rename to sf-service/src/main/java/com/sf/service/index/domain/ApplyListInfo.java index 47eaa62..9e5eda6 100644 --- a/sf-admin/src/main/java/com/sf/index/domain/ApplyListInfo.java +++ b/sf-service/src/main/java/com/sf/service/index/domain/ApplyListInfo.java @@ -1,4 +1,4 @@ -package com.sf.index.domain; +package com.sf.service.index.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/sf-admin/src/main/java/com/sf/index/mapper/ApplyListInfoMapper.java b/sf-service/src/main/java/com/sf/service/index/mapper/ApplyListInfoMapper.java similarity index 93% rename from sf-admin/src/main/java/com/sf/index/mapper/ApplyListInfoMapper.java rename to sf-service/src/main/java/com/sf/service/index/mapper/ApplyListInfoMapper.java index f7a1911..e54b540 100644 --- a/sf-admin/src/main/java/com/sf/index/mapper/ApplyListInfoMapper.java +++ b/sf-service/src/main/java/com/sf/service/index/mapper/ApplyListInfoMapper.java @@ -1,7 +1,7 @@ -package com.sf.index.mapper; +package com.sf.service.index.mapper; import java.util.List; -import com.sf.index.domain.ApplyListInfo; +import com.sf.service.index.domain.ApplyListInfo; /** * 应用列Mapper接口 diff --git a/sf-admin/src/main/java/com/sf/index/service/IApplyListInfoService.java b/sf-service/src/main/java/com/sf/service/index/service/IApplyListInfoService.java similarity index 93% rename from sf-admin/src/main/java/com/sf/index/service/IApplyListInfoService.java rename to sf-service/src/main/java/com/sf/service/index/service/IApplyListInfoService.java index ff17ecd..1a9b5f4 100644 --- a/sf-admin/src/main/java/com/sf/index/service/IApplyListInfoService.java +++ b/sf-service/src/main/java/com/sf/service/index/service/IApplyListInfoService.java @@ -1,7 +1,7 @@ -package com.sf.index.service; +package com.sf.service.index.service; import java.util.List; -import com.sf.index.domain.ApplyListInfo; +import com.sf.service.index.domain.ApplyListInfo; /** * 应用列Service接口 diff --git a/sf-admin/src/main/java/com/sf/index/service/impl/ApplyListInfoServiceImpl.java b/sf-service/src/main/java/com/sf/service/index/service/impl/ApplyListInfoServiceImpl.java similarity index 91% rename from sf-admin/src/main/java/com/sf/index/service/impl/ApplyListInfoServiceImpl.java rename to sf-service/src/main/java/com/sf/service/index/service/impl/ApplyListInfoServiceImpl.java index c77d3e8..f61a4f4 100644 --- a/sf-admin/src/main/java/com/sf/index/service/impl/ApplyListInfoServiceImpl.java +++ b/sf-service/src/main/java/com/sf/service/index/service/impl/ApplyListInfoServiceImpl.java @@ -1,13 +1,13 @@ -package com.sf.index.service.impl; +package com.sf.service.index.service.impl; import java.util.List; import com.sf.common.utils.DateUtils; import com.sf.common.utils.uuid.IdUtils; +import com.sf.service.index.service.IApplyListInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.sf.index.mapper.ApplyListInfoMapper; -import com.sf.index.domain.ApplyListInfo; -import com.sf.index.service.IApplyListInfoService; +import com.sf.service.index.mapper.ApplyListInfoMapper; +import com.sf.service.index.domain.ApplyListInfo; /** * 应用列Service业务层处理 @@ -16,7 +16,7 @@ import com.sf.index.service.IApplyListInfoService; * @date 2024-04-11 */ @Service -public class ApplyListInfoServiceImpl implements IApplyListInfoService +public class ApplyListInfoServiceImpl implements IApplyListInfoService { @Autowired private ApplyListInfoMapper applyListInfoMapper; diff --git a/sf-service/src/main/java/com/sf/service/index/utils/AppUtils.java b/sf-service/src/main/java/com/sf/service/index/utils/AppUtils.java new file mode 100644 index 0000000..6afb2c2 --- /dev/null +++ b/sf-service/src/main/java/com/sf/service/index/utils/AppUtils.java @@ -0,0 +1,40 @@ +package com.sf.service.index.utils; + +import com.sf.common.utils.http.RequestUtils; +import com.sf.service.exception.AppCodeNotFoundException; +import io.netty.handler.codec.HeadersUtils; +import lombok.experimental.UtilityClass; +import lombok.extern.slf4j.Slf4j; +import org.apache.tomcat.util.http.HeaderUtil; +import org.springframework.stereotype.Component; +import org.springframework.util.Assert; +import org.springframework.util.StringUtils; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; + +/** + * 功能描述: 应用工具类 + * + * @author a_kun + * @date 2024/4/22 15:48 + */ +@Slf4j +@UtilityClass +public class AppUtils { + + private static final String APP_CODE = "appCode"; + + private static final int APP_CODE_NOT_FOUND_ERROR_CODE = 4030; + + public static String getAppCodeFromRequestHeader() { + String appCode = RequestUtils.getHeader(APP_CODE); + if (StringUtils.hasText(appCode)) { + return appCode; + } + throw new AppCodeNotFoundException("AppCode Not found", APP_CODE_NOT_FOUND_ERROR_CODE); + } + + +} diff --git a/sf-order/src/main/java/com/sf/order/controller/OrderInfoController.java b/sf-service/src/main/java/com/sf/service/order/controller/OrderInfoController.java similarity index 83% rename from sf-order/src/main/java/com/sf/order/controller/OrderInfoController.java rename to sf-service/src/main/java/com/sf/service/order/controller/OrderInfoController.java index 37b7d23..11c8daf 100644 --- a/sf-order/src/main/java/com/sf/order/controller/OrderInfoController.java +++ b/sf-service/src/main/java/com/sf/service/order/controller/OrderInfoController.java @@ -1,18 +1,17 @@ -package com.sf.order.controller; +package com.sf.service.order.controller; import com.sf.common.annotation.Log; import com.sf.common.core.controller.BaseController; import com.sf.common.core.domain.AjaxResult; import com.sf.common.core.page.TableDataInfo; import com.sf.common.enums.BusinessType; -import com.sf.common.enums.RequestHeaderEnums; -import com.sf.common.utils.http.RequestUtils; import com.sf.common.utils.poi.ExcelUtil; -import com.sf.order.domain.OrderInfo; -import com.sf.order.domain.dto.OrderCreateDto; -import com.sf.order.domain.req.OrderListReqVo; -import com.sf.order.domain.res.OrderListResVo; -import com.sf.order.service.IOrderInfoService; +import com.sf.service.index.utils.AppUtils; +import com.sf.service.order.domain.OrderInfo; +import com.sf.service.order.domain.dto.OrderCreateDto; +import com.sf.service.order.domain.req.OrderListReqVo; +import com.sf.service.order.domain.res.OrderListResVo; +import com.sf.service.order.service.IOrderInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -37,7 +36,7 @@ public class OrderInfoController extends BaseController { */ @GetMapping("/list") public TableDataInfo list(OrderListReqVo vo) { - vo.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode())); + vo.setAppCode(AppUtils.getAppCodeFromRequestHeader()); startPage(); List list = orderInfoService.queryList(vo); return getDataTable(list); @@ -48,7 +47,7 @@ public class OrderInfoController extends BaseController { */ @GetMapping("/myOrderList") public TableDataInfo myOrderList(OrderListReqVo vo) { - vo.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode())); + vo.setAppCode(AppUtils.getAppCodeFromRequestHeader()); vo.setUserId(getUserId()); // startPage(); List list = orderInfoService.queryList(vo); @@ -82,7 +81,7 @@ public class OrderInfoController extends BaseController { @Log(title = "创建订单基础信息", businessType = BusinessType.INSERT) @PostMapping(value = "/createOrder") public AjaxResult createOrder(@RequestBody OrderCreateDto orderCreateDto) { - orderCreateDto.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode())); + orderCreateDto.setAppCode(AppUtils.getAppCodeFromRequestHeader()); return AjaxResult.success(orderInfoService.createOrder(orderCreateDto)); } diff --git a/sf-order/src/main/java/com/sf/order/domain/OrderInfo.java b/sf-service/src/main/java/com/sf/service/order/domain/OrderInfo.java similarity index 99% rename from sf-order/src/main/java/com/sf/order/domain/OrderInfo.java rename to sf-service/src/main/java/com/sf/service/order/domain/OrderInfo.java index ca65473..e57fba4 100644 --- a/sf-order/src/main/java/com/sf/order/domain/OrderInfo.java +++ b/sf-service/src/main/java/com/sf/service/order/domain/OrderInfo.java @@ -1,4 +1,4 @@ -package com.sf.order.domain; +package com.sf.service.order.domain; import com.fasterxml.jackson.annotation.JsonFormat; import com.sf.common.annotation.Excel; diff --git a/sf-order/src/main/java/com/sf/order/domain/dto/OrderCreateDto.java b/sf-service/src/main/java/com/sf/service/order/domain/dto/OrderCreateDto.java similarity index 97% rename from sf-order/src/main/java/com/sf/order/domain/dto/OrderCreateDto.java rename to sf-service/src/main/java/com/sf/service/order/domain/dto/OrderCreateDto.java index 3107020..84fcd79 100644 --- a/sf-order/src/main/java/com/sf/order/domain/dto/OrderCreateDto.java +++ b/sf-service/src/main/java/com/sf/service/order/domain/dto/OrderCreateDto.java @@ -1,4 +1,4 @@ -package com.sf.order.domain.dto; +package com.sf.service.order.domain.dto; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/sf-order/src/main/java/com/sf/order/domain/req/OrderListReqVo.java b/sf-service/src/main/java/com/sf/service/order/domain/req/OrderListReqVo.java similarity index 90% rename from sf-order/src/main/java/com/sf/order/domain/req/OrderListReqVo.java rename to sf-service/src/main/java/com/sf/service/order/domain/req/OrderListReqVo.java index b640967..9a69f67 100644 --- a/sf-order/src/main/java/com/sf/order/domain/req/OrderListReqVo.java +++ b/sf-service/src/main/java/com/sf/service/order/domain/req/OrderListReqVo.java @@ -1,4 +1,4 @@ -package com.sf.order.domain.req; +package com.sf.service.order.domain.req; import com.sf.common.core.domain.BaseEntity; import lombok.Data; diff --git a/sf-order/src/main/java/com/sf/order/domain/res/OrderListResVo.java b/sf-service/src/main/java/com/sf/service/order/domain/res/OrderListResVo.java similarity index 97% rename from sf-order/src/main/java/com/sf/order/domain/res/OrderListResVo.java rename to sf-service/src/main/java/com/sf/service/order/domain/res/OrderListResVo.java index 85533be..cad3082 100644 --- a/sf-order/src/main/java/com/sf/order/domain/res/OrderListResVo.java +++ b/sf-service/src/main/java/com/sf/service/order/domain/res/OrderListResVo.java @@ -1,4 +1,4 @@ -package com.sf.order.domain.res; +package com.sf.service.order.domain.res; import com.fasterxml.jackson.annotation.JsonFormat; import com.sf.common.annotation.Excel; diff --git a/sf-order/src/main/java/com/sf/order/mapper/OrderInfoMapper.java b/sf-service/src/main/java/com/sf/service/order/mapper/OrderInfoMapper.java similarity index 87% rename from sf-order/src/main/java/com/sf/order/mapper/OrderInfoMapper.java rename to sf-service/src/main/java/com/sf/service/order/mapper/OrderInfoMapper.java index 342981a..79348cb 100644 --- a/sf-order/src/main/java/com/sf/order/mapper/OrderInfoMapper.java +++ b/sf-service/src/main/java/com/sf/service/order/mapper/OrderInfoMapper.java @@ -1,8 +1,8 @@ -package com.sf.order.mapper; +package com.sf.service.order.mapper; -import com.sf.order.domain.OrderInfo; -import com.sf.order.domain.req.OrderListReqVo; -import com.sf.order.domain.res.OrderListResVo; +import com.sf.service.order.domain.OrderInfo; +import com.sf.service.order.domain.req.OrderListReqVo; +import com.sf.service.order.domain.res.OrderListResVo; import java.util.List; diff --git a/sf-order/src/main/java/com/sf/order/service/IOrderInfoService.java b/sf-service/src/main/java/com/sf/service/order/service/IOrderInfoService.java similarity index 85% rename from sf-order/src/main/java/com/sf/order/service/IOrderInfoService.java rename to sf-service/src/main/java/com/sf/service/order/service/IOrderInfoService.java index 9904bb6..75f1e4f 100644 --- a/sf-order/src/main/java/com/sf/order/service/IOrderInfoService.java +++ b/sf-service/src/main/java/com/sf/service/order/service/IOrderInfoService.java @@ -1,10 +1,10 @@ -package com.sf.order.service; +package com.sf.service.order.service; -import com.sf.order.domain.OrderInfo; -import com.sf.order.domain.dto.OrderCreateDto; -import com.sf.order.domain.req.OrderListReqVo; -import com.sf.order.domain.res.OrderListResVo; +import com.sf.service.order.domain.OrderInfo; +import com.sf.service.order.domain.dto.OrderCreateDto; +import com.sf.service.order.domain.req.OrderListReqVo; +import com.sf.service.order.domain.res.OrderListResVo; import java.util.List; diff --git a/sf-order/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java b/sf-service/src/main/java/com/sf/service/order/service/impl/OrderInfoServiceImpl.java similarity index 91% rename from sf-order/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java rename to sf-service/src/main/java/com/sf/service/order/service/impl/OrderInfoServiceImpl.java index 655d09e..a16a8ff 100644 --- a/sf-order/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java +++ b/sf-service/src/main/java/com/sf/service/order/service/impl/OrderInfoServiceImpl.java @@ -1,14 +1,14 @@ -package com.sf.order.service.impl; +package com.sf.service.order.service.impl; import com.sf.common.exception.ServiceException; import com.sf.common.utils.DateUtils; import com.sf.common.utils.SnowflakeIdWorker; -import com.sf.order.domain.OrderInfo; -import com.sf.order.domain.dto.OrderCreateDto; -import com.sf.order.domain.req.OrderListReqVo; -import com.sf.order.domain.res.OrderListResVo; -import com.sf.order.mapper.OrderInfoMapper; -import com.sf.order.service.IOrderInfoService; +import com.sf.service.order.domain.OrderInfo; +import com.sf.service.order.domain.dto.OrderCreateDto; +import com.sf.service.order.domain.req.OrderListReqVo; +import com.sf.service.order.domain.res.OrderListResVo; +import com.sf.service.order.mapper.OrderInfoMapper; +import com.sf.service.order.service.IOrderInfoService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/sf-system/src/main/resources/mapper/system/deployment/DeploymentApplyEnvironmentMapper.xml b/sf-service/src/main/resources/mapper/deployment/DeploymentApplyEnvironmentMapper.xml similarity index 98% rename from sf-system/src/main/resources/mapper/system/deployment/DeploymentApplyEnvironmentMapper.xml rename to sf-service/src/main/resources/mapper/deployment/DeploymentApplyEnvironmentMapper.xml index 0438c2c..827d954 100644 --- a/sf-system/src/main/resources/mapper/system/deployment/DeploymentApplyEnvironmentMapper.xml +++ b/sf-service/src/main/resources/mapper/deployment/DeploymentApplyEnvironmentMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/sf-system/src/main/resources/mapper/system/deployment/DeploymentModuleListMapper.xml b/sf-service/src/main/resources/mapper/deployment/DeploymentModuleListMapper.xml similarity index 98% rename from sf-system/src/main/resources/mapper/system/deployment/DeploymentModuleListMapper.xml rename to sf-service/src/main/resources/mapper/deployment/DeploymentModuleListMapper.xml index e8cc2f3..c8ca735 100644 --- a/sf-system/src/main/resources/mapper/system/deployment/DeploymentModuleListMapper.xml +++ b/sf-service/src/main/resources/mapper/deployment/DeploymentModuleListMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/sf-system/src/main/resources/mapper/system/deployment/DeploymentServicePublishMapper.xml b/sf-service/src/main/resources/mapper/deployment/DeploymentServicePublishMapper.xml similarity index 99% rename from sf-system/src/main/resources/mapper/system/deployment/DeploymentServicePublishMapper.xml rename to sf-service/src/main/resources/mapper/deployment/DeploymentServicePublishMapper.xml index c2623bb..38b2a94 100644 --- a/sf-system/src/main/resources/mapper/system/deployment/DeploymentServicePublishMapper.xml +++ b/sf-service/src/main/resources/mapper/deployment/DeploymentServicePublishMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/sf-system/src/main/resources/mapper/system/deployment/DeploymentWhitelistInfoMapper.xml b/sf-service/src/main/resources/mapper/deployment/DeploymentWhitelistInfoMapper.xml similarity index 99% rename from sf-system/src/main/resources/mapper/system/deployment/DeploymentWhitelistInfoMapper.xml rename to sf-service/src/main/resources/mapper/deployment/DeploymentWhitelistInfoMapper.xml index b1f28ce..72c76ef 100644 --- a/sf-system/src/main/resources/mapper/system/deployment/DeploymentWhitelistInfoMapper.xml +++ b/sf-service/src/main/resources/mapper/deployment/DeploymentWhitelistInfoMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/sf-system/src/main/resources/mapper/system/deployment/DeploymentWhitelistListMapper.xml b/sf-service/src/main/resources/mapper/deployment/DeploymentWhitelistListMapper.xml similarity index 98% rename from sf-system/src/main/resources/mapper/system/deployment/DeploymentWhitelistListMapper.xml rename to sf-service/src/main/resources/mapper/deployment/DeploymentWhitelistListMapper.xml index 63868a8..aaab2f9 100644 --- a/sf-system/src/main/resources/mapper/system/deployment/DeploymentWhitelistListMapper.xml +++ b/sf-service/src/main/resources/mapper/deployment/DeploymentWhitelistListMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/sf-system/src/main/resources/mapper/system/deployment/SysApkInfoMapper.xml b/sf-service/src/main/resources/mapper/deployment/SysApkInfoMapper.xml similarity index 98% rename from sf-system/src/main/resources/mapper/system/deployment/SysApkInfoMapper.xml rename to sf-service/src/main/resources/mapper/deployment/SysApkInfoMapper.xml index d741c83..e7d7bc1 100644 --- a/sf-system/src/main/resources/mapper/system/deployment/SysApkInfoMapper.xml +++ b/sf-service/src/main/resources/mapper/deployment/SysApkInfoMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/sf-admin/src/main/resources/mapper/index/ApplyListInfoMapper.xml b/sf-service/src/main/resources/mapper/index/ApplyListInfoMapper.xml similarity index 96% rename from sf-admin/src/main/resources/mapper/index/ApplyListInfoMapper.xml rename to sf-service/src/main/resources/mapper/index/ApplyListInfoMapper.xml index 6ab3a1f..319dded 100644 --- a/sf-admin/src/main/resources/mapper/index/ApplyListInfoMapper.xml +++ b/sf-service/src/main/resources/mapper/index/ApplyListInfoMapper.xml @@ -1,92 +1,92 @@ - - - - - - - - - - - - - - - - - - - - select id, app_code, app_name, app_desc, picture, order_num, is_delete, created, modified, create_time, update_time from APPLY_LIST_INFO - - - - - - - - insert into APPLY_LIST_INFO - - app_code, - app_name, - app_desc, - picture, - order_num, - is_delete, - created, - modified, - create_time, - update_time, - - - #{appCode}, - #{appName}, - #{appDesc}, - #{picture}, - #{orderNum}, - #{isDelete}, - #{created}, - #{modified}, - #{createTime}, - #{updateTime}, - - - - - update APPLY_LIST_INFO - - app_code = #{appCode}, - app_name = #{appName}, - app_desc = #{appDesc}, - picture = #{picture}, - order_num = #{orderNum}, - is_delete = #{isDelete}, - created = #{created}, - modified = #{modified}, - create_time = #{createTime}, - update_time = #{updateTime}, - - where id = #{id} - - - - delete from APPLY_LIST_INFO where id = #{id} - - - - delete from APPLY_LIST_INFO where id in - - #{id} - - + + + + + + + + + + + + + + + + + + + + select id, app_code, app_name, app_desc, picture, order_num, is_delete, created, modified, create_time, update_time from APPLY_LIST_INFO + + + + + + + + insert into APPLY_LIST_INFO + + app_code, + app_name, + app_desc, + picture, + order_num, + is_delete, + created, + modified, + create_time, + update_time, + + + #{appCode}, + #{appName}, + #{appDesc}, + #{picture}, + #{orderNum}, + #{isDelete}, + #{created}, + #{modified}, + #{createTime}, + #{updateTime}, + + + + + update APPLY_LIST_INFO + + app_code = #{appCode}, + app_name = #{appName}, + app_desc = #{appDesc}, + picture = #{picture}, + order_num = #{orderNum}, + is_delete = #{isDelete}, + created = #{created}, + modified = #{modified}, + create_time = #{createTime}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from APPLY_LIST_INFO where id = #{id} + + + + delete from APPLY_LIST_INFO where id in + + #{id} + + \ No newline at end of file diff --git a/sf-order/src/main/resources/mapper/order/OrderInfoMapper.xml b/sf-service/src/main/resources/mapper/order/OrderInfoMapper.xml similarity index 99% rename from sf-order/src/main/resources/mapper/order/OrderInfoMapper.xml rename to sf-service/src/main/resources/mapper/order/OrderInfoMapper.xml index 3a208c6..ec2ad1d 100644 --- a/sf-order/src/main/resources/mapper/order/OrderInfoMapper.xml +++ b/sf-service/src/main/resources/mapper/order/OrderInfoMapper.xml @@ -2,7 +2,7 @@ - +