diff --git a/Cpop-Core/src/main/java/com/cpop/core/gateway/miniProgram/MiniProgramAuthenticationFilter.java b/Cpop-Core/src/main/java/com/cpop/core/gateway/miniProgram/MiniProgramAuthenticationFilter.java index 26a1514..8e17739 100644 --- a/Cpop-Core/src/main/java/com/cpop/core/gateway/miniProgram/MiniProgramAuthenticationFilter.java +++ b/Cpop-Core/src/main/java/com/cpop/core/gateway/miniProgram/MiniProgramAuthenticationFilter.java @@ -1,5 +1,6 @@ package com.cpop.core.gateway.miniProgram; +import com.cpop.common.utils.StringUtils; import com.cpop.core.base.enums.UserType; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.security.authentication.AbstractAuthenticationToken; @@ -42,14 +43,28 @@ public class MiniProgramAuthenticationFilter extends AbstractAuthenticationProce throw new RuntimeException(e); } String principal = (String) authenticationBean.get("phone"); + if (StringUtils.isBlank(principal)){ + throw new AuthenticationServiceException("登录手机号为空"); + } String openId = (String) authenticationBean.get("openId"); + if (StringUtils.isBlank(openId)){ + throw new AuthenticationServiceException("登录openId为空"); + } String appId = (String) authenticationBean.get("appId"); + if (StringUtils.isBlank(appId)){ + throw new AuthenticationServiceException("登录appId为空"); + } String brandId = (String) authenticationBean.get("brandId"); + if (StringUtils.isBlank(brandId)){ + throw new AuthenticationServiceException("登录brandId为空"); + } String nickName = (String) authenticationBean.get("nickName"); String avatar = (String) authenticationBean.get("avatar"); String sourceType = (String) authenticationBean.get("sourceType"); - UserType userType = UserType.valueOf(authenticationBean.get("userType").toString()); - //传递信息 + if (StringUtils.isBlank(sourceType)){ + throw new AuthenticationServiceException("登录sourceType为空"); + } + UserType userType = UserType.valueOf(authenticationBean.get("userType").toString());//传递信息 HashMap credentials = new HashMap<>(2); credentials.put("appId", appId); credentials.put("openId", openId); diff --git a/Cpop-Core/src/main/java/com/cpop/core/handler/LoginFailureHandler.java b/Cpop-Core/src/main/java/com/cpop/core/handler/LoginFailureHandler.java index 540764f..078741f 100644 --- a/Cpop-Core/src/main/java/com/cpop/core/handler/LoginFailureHandler.java +++ b/Cpop-Core/src/main/java/com/cpop/core/handler/LoginFailureHandler.java @@ -2,6 +2,7 @@ package com.cpop.core.handler; import com.alibaba.fastjson.JSONObject; import com.cpop.common.constant.Constants; +import com.cpop.common.utils.StringUtils; import com.cpop.common.utils.ip.IpUtils; import com.cpop.core.base.R; import com.cpop.core.base.entity.LoginForm; @@ -54,8 +55,10 @@ public class LoginFailureHandler implements AuthenticationFailureHandler { result = R.fail(errorMessage); } if (loginUser.getUserType() == UserType.OAM_USER || loginUser.getUserType() == UserType.MINI_USER) { - //添加登录失败日志 - coreService.insertOperationLog(Constants.FAIL, OperationLogEnum.SYSTEM_LOGIN, loginUser, errorMessage); + if (StringUtils.isNotBlank(loginFormBo.getUsername())){ + //添加登录失败日志 + coreService.insertOperationLog(Constants.FAIL, OperationLogEnum.SYSTEM_LOGIN, loginUser, errorMessage); + } } outputStream.write(JSONObject.toJSONString(result).getBytes(StandardCharsets.UTF_8)); outputStream.flush(); diff --git a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/bo/LearnNowPayLaterUserSignPlansBo.java b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/bo/LearnNowPayLaterUserSignPlansBo.java index b649bff..a676a58 100644 --- a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/bo/LearnNowPayLaterUserSignPlansBo.java +++ b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/bo/LearnNowPayLaterUserSignPlansBo.java @@ -68,4 +68,10 @@ public class LearnNowPayLaterUserSignPlansBo { */ @ApiModelProperty(value = "旧模板id") private String oldTemplateId; + + /** + * 顾问名 + */ + @ApiModelProperty(value = "顾问名") + private String counselor; } diff --git a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/WebBusinessDataController.java b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/BackstageBusinessDataController.java similarity index 98% rename from Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/WebBusinessDataController.java rename to Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/BackstageBusinessDataController.java index 91e68ee..9ebb8a2 100644 --- a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/WebBusinessDataController.java +++ b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/BackstageBusinessDataController.java @@ -28,7 +28,7 @@ import java.util.List; @RestController @Api(tags = "果酱模块化官网 业务数据表接口") @RequestMapping("/backstage/businessData") -public class WebBusinessDataController { +public class BackstageBusinessDataController { @Autowired private BusinessDataService businessDataService; diff --git a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/WebBusinessIntroController.java b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/BackstageBusinessIntroController.java similarity index 98% rename from Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/WebBusinessIntroController.java rename to Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/BackstageBusinessIntroController.java index 75e92a8..61317b0 100644 --- a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/WebBusinessIntroController.java +++ b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/BackstageBusinessIntroController.java @@ -28,7 +28,7 @@ import java.util.List; @RestController @Api(tags = "果酱模块化官网 业务介绍表接口") @RequestMapping("/backstage/businessIntro") -public class WebBusinessIntroController { +public class BackstageBusinessIntroController { @Autowired private BusinessIntroService businessIntroService; diff --git a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/WebCompanyIntroController.java b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/BackstageCompanyIntroController.java similarity index 98% rename from Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/WebCompanyIntroController.java rename to Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/BackstageCompanyIntroController.java index f523e96..a5796e9 100644 --- a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/WebCompanyIntroController.java +++ b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/BackstageCompanyIntroController.java @@ -28,7 +28,7 @@ import java.util.List; @RestController @Api(tags = "果酱模块化官网 公司简介表接口") @RequestMapping("/backstage/companyIntro") -public class WebCompanyIntroController { +public class BackstageCompanyIntroController { @Autowired private CompanyIntroService companyIntroService; diff --git a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/WebCooperationController.java b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/BackstageCooperationController.java similarity index 98% rename from Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/WebCooperationController.java rename to Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/BackstageCooperationController.java index 8667be3..234e64a 100644 --- a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/WebCooperationController.java +++ b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/BackstageCooperationController.java @@ -28,7 +28,7 @@ import java.util.List; @RestController @Api(tags = "果酱模块化官网 合作平台表接口") @RequestMapping("/backstage/cooperation") -public class WebCooperationController { +public class BackstageCooperationController { @Autowired private CooperationService cooperationService; diff --git a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/WebCooperationTypeController.java b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/BackstageCooperationTypeController.java similarity index 98% rename from Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/WebCooperationTypeController.java rename to Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/BackstageCooperationTypeController.java index 912e74e..ac21054 100644 --- a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/WebCooperationTypeController.java +++ b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/BackstageCooperationTypeController.java @@ -29,7 +29,7 @@ import java.util.List; @RestController @Api(tags = "果酱模块化官网 合作类别表接口") @RequestMapping("/backstage/cooperationType") -public class WebCooperationTypeController { +public class BackstageCooperationTypeController { @Autowired private CooperationTypeService cooperationTypeService; diff --git a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/WebDevelopmentController.java b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/BackstageDevelopmentController.java similarity index 98% rename from Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/WebDevelopmentController.java rename to Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/BackstageDevelopmentController.java index 5082fca..ad45af2 100644 --- a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/WebDevelopmentController.java +++ b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/BackstageDevelopmentController.java @@ -23,7 +23,7 @@ import java.util.List; @RestController @Api(tags = "果酱模块化官网 发展历程表接口") @RequestMapping("/backstage/development") -public class WebDevelopmentController { +public class BackstageDevelopmentController { @Autowired private DevelopmentService developmentService; diff --git a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/WebNavigationController.java b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/BackstageNavigationController.java similarity index 98% rename from Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/WebNavigationController.java rename to Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/BackstageNavigationController.java index 4e2d1cd..c97c829 100644 --- a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/WebNavigationController.java +++ b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/BackstageNavigationController.java @@ -30,7 +30,7 @@ import java.util.List; @RestController @Api(tags = "果酱模块化官网 导航栏表接口") @RequestMapping("/backstage/navigation") -public class WebNavigationController { +public class BackstageNavigationController { @Autowired private NavigationService navigationService; diff --git a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/WebProductController.java b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/BackstageWebProductController.java similarity index 97% rename from Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/WebProductController.java rename to Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/BackstageWebProductController.java index 45d5a7d..a2f232a 100644 --- a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/WebProductController.java +++ b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/BackstageWebProductController.java @@ -27,8 +27,8 @@ import java.util.List; */ @RestController @Api(tags = "果酱模块化官网 核心产品表接口") -@RequestMapping("/backstage/product") -public class WebProductController { +@RequestMapping("/backstage/webProduct") +public class BackstageWebProductController { @Autowired private WebProductService productService; diff --git a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/entity/EasyLearnOrder.java b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/entity/EasyLearnOrder.java index f6964aa..966bff7 100644 --- a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/entity/EasyLearnOrder.java +++ b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/entity/EasyLearnOrder.java @@ -109,6 +109,11 @@ public class EasyLearnOrder extends BaseEntity implements Serializable { */ private String templateId; + /** + * 顾问 + */ + private String counselor; + /** * 逻辑删除（0否1是） */ diff --git a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/service/impl/EasyLearnOrderServiceImpl.java b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/service/impl/EasyLearnOrderServiceImpl.java index 7d53dc4..9e8dd50 100644 --- a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/service/impl/EasyLearnOrderServiceImpl.java +++ b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/service/impl/EasyLearnOrderServiceImpl.java @@ -744,7 +744,8 @@ public class EasyLearnOrderServiceImpl extends ServiceImpl