Browse Source

手写签名

dev
wangqing 4 years ago
parent
commit
9e37bc06a7
  1. 5
      tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserLoginController.java
  2. 1
      tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectLogicController.java
  3. 6
      tduck-api/src/main/resources/application-prod1.yml
  4. 3
      tduck-project/src/main/java/com/tduck/cloud/project/entity/enums/ProjectItemTypeEnum.java
  5. 1
      tduck-project/src/main/java/com/tduck/cloud/project/entity/struct/DescTextExpandStruct.java
  6. 14
      tduck-project/src/main/java/com/tduck/cloud/project/entity/struct/SignPadExpandStruct.java

5
tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserLoginController.java

@ -224,7 +224,10 @@ public class UserLoginController {
* @return * @return
*/ */
@GetMapping("/login/wx/qrcode/result") @GetMapping("/login/wx/qrcode/result")
public Result<LoginUserVO> queryWxLoginResult(@RequestParam String loginId, HttpServletRequest request) { public Result<LoginUserVO> 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); Long userId = redisUtils.get(StrUtil.format(WxMpRedisKeyConstants.WX_MP_LOGIN_QRCODE, loginId), Long.class);
if (ObjectUtil.isNull(userId)) { if (ObjectUtil.isNull(userId)) {
return Result.success(); return Result.success();

1
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)); return Result.success(projectLogicService.removeById(userProjectLogicEntity));
} }
@Login
@GetMapping("/user/project/logic/list") @GetMapping("/user/project/logic/list")
public Result queryProjectItem(@RequestParam @NotBlank String projectKey) { public Result queryProjectItem(@RequestParam @NotBlank String projectKey) {
List<UserProjectLogicEntity> entityList = projectLogicService.list(Wrappers.<UserProjectLogicEntity>lambdaQuery().eq(UserProjectLogicEntity::getProjectKey, projectKey)); List<UserProjectLogicEntity> entityList = projectLogicService.list(Wrappers.<UserProjectLogicEntity>lambdaQuery().eq(UserProjectLogicEntity::getProjectKey, projectKey));

6
tduck-api/src/main/resources/application-prod1.yml

@ -56,9 +56,9 @@ platform:
validateCodeTemplateId: 808150 validateCodeTemplateId: 808150
retrievePwdValidateCodeTemplateId: 809014 retrievePwdValidateCodeTemplateId: 809014
front: front:
baseUrl: http://tduck.smileyi.top/ baseUrl: https://tduck.smileyi.top/
resetPwdUrl: http://tduck.smileyi.top/forget/password?code={}&email={} resetPwdUrl: https://tduck.smileyi.top/forget/password?code={}&email={}
updateEmailUrl: http://localhost:8888/account/forget/validate?type=updateEmail&code={}&email={} updateEmailUrl: https://localhost:8888/account/forget/validate?type=updateEmail&code={}&email={}
wx: wx:
mp: mp:

3
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("IMAGE", "图片展示", ImageExpandStruct.class),
IMAGE_SELECT("IMAGE_SELECT","图片选择",ImageSelectExpandStruct.class), IMAGE_SELECT("IMAGE_SELECT","图片选择",ImageSelectExpandStruct.class),
IMAGE_CAROUSEL("IMAGE_CAROUSEL","图片选择",ImageCarouselExpandStruct.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 @EnumValue
@JsonValue @JsonValue

1
tduck-project/src/main/java/com/tduck/cloud/project/entity/struct/DescTextExpandStruct.java

@ -5,6 +5,7 @@ import lombok.Data;
/** /**
* 文字描述组件属性 * 文字描述组件属性
* @author smalljop
*/ */
@Data @Data
public class DescTextExpandStruct { public class DescTextExpandStruct {

14
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 {
}
Loading…
Cancel
Save