diff --git a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserLoginController.java b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserLoginController.java index 48f07db..b972163 100644 --- a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserLoginController.java +++ b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserLoginController.java @@ -224,7 +224,10 @@ public class UserLoginController { * @return */ @GetMapping("/login/wx/qrcode/result") - public Result queryWxLoginResult(@RequestParam String loginId, HttpServletRequest request) { + public Result queryWxLoginResult(@RequestParam(required = false) String loginId, HttpServletRequest request) { + if (StrUtil.isBlank(loginId)) { + return Result.success(); + } Long userId = redisUtils.get(StrUtil.format(WxMpRedisKeyConstants.WX_MP_LOGIN_QRCODE, loginId), Long.class); if (ObjectUtil.isNull(userId)) { return Result.success(); diff --git a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectLogicController.java b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectLogicController.java index 9ce9e4b..9e77f51 100644 --- a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectLogicController.java +++ b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectLogicController.java @@ -39,7 +39,6 @@ public class UserProjectLogicController { return Result.success(projectLogicService.removeById(userProjectLogicEntity)); } - @Login @GetMapping("/user/project/logic/list") public Result queryProjectItem(@RequestParam @NotBlank String projectKey) { List entityList = projectLogicService.list(Wrappers.lambdaQuery().eq(UserProjectLogicEntity::getProjectKey, projectKey)); diff --git a/tduck-api/src/main/resources/application-prod1.yml b/tduck-api/src/main/resources/application-prod1.yml index 661f71a..1cbf967 100644 --- a/tduck-api/src/main/resources/application-prod1.yml +++ b/tduck-api/src/main/resources/application-prod1.yml @@ -56,9 +56,9 @@ platform: validateCodeTemplateId: 808150 retrievePwdValidateCodeTemplateId: 809014 front: - baseUrl: http://tduck.smileyi.top/ - resetPwdUrl: http://tduck.smileyi.top/forget/password?code={}&email={} - updateEmailUrl: http://localhost:8888/account/forget/validate?type=updateEmail&code={}&email={} + baseUrl: https://tduck.smileyi.top/ + resetPwdUrl: https://tduck.smileyi.top/forget/password?code={}&email={} + updateEmailUrl: https://localhost:8888/account/forget/validate?type=updateEmail&code={}&email={} wx: mp: diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/entity/enums/ProjectItemTypeEnum.java b/tduck-project/src/main/java/com/tduck/cloud/project/entity/enums/ProjectItemTypeEnum.java index 5966f50..cb3c9cb 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/entity/enums/ProjectItemTypeEnum.java +++ b/tduck-project/src/main/java/com/tduck/cloud/project/entity/enums/ProjectItemTypeEnum.java @@ -36,7 +36,8 @@ public enum ProjectItemTypeEnum { IMAGE("IMAGE", "图片展示", ImageExpandStruct.class), IMAGE_SELECT("IMAGE_SELECT","图片选择",ImageSelectExpandStruct.class), IMAGE_CAROUSEL("IMAGE_CAROUSEL","图片选择",ImageCarouselExpandStruct.class), - DESC_TEXT("DESC_TEXT","文字描述",DescTextExpandStruct.class); + DESC_TEXT("DESC_TEXT","文字描述",DescTextExpandStruct.class), + SIGN_PAD("SIGN_PAD","手写签名",SignPadExpandStruct.class); @EnumValue @JsonValue diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/entity/struct/DescTextExpandStruct.java b/tduck-project/src/main/java/com/tduck/cloud/project/entity/struct/DescTextExpandStruct.java index 0c82fc1..1628b30 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/entity/struct/DescTextExpandStruct.java +++ b/tduck-project/src/main/java/com/tduck/cloud/project/entity/struct/DescTextExpandStruct.java @@ -5,6 +5,7 @@ import lombok.Data; /** * 文字描述组件属性 + * @author smalljop */ @Data public class DescTextExpandStruct { diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/entity/struct/SignPadExpandStruct.java b/tduck-project/src/main/java/com/tduck/cloud/project/entity/struct/SignPadExpandStruct.java new file mode 100644 index 0000000..4a8a7ba --- /dev/null +++ b/tduck-project/src/main/java/com/tduck/cloud/project/entity/struct/SignPadExpandStruct.java @@ -0,0 +1,14 @@ +package com.tduck.cloud.project.entity.struct; + + +import lombok.Data; + +/** + * 手写签名组件属性 + * @author smalljop + */ +@Data +public class SignPadExpandStruct { + + +}