diff --git a/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletAdviceFeedbackController.java b/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletAdviceFeedbackController.java index c0970ab..20a3425 100644 --- a/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletAdviceFeedbackController.java +++ b/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletAdviceFeedbackController.java @@ -60,8 +60,10 @@ public class PlayletAdviceFeedbackController extends BaseController list.forEach(model->{ if(model.getUserId() != null){ PlayletUser user = iPlayletUserService.getById(model.getUserId()); - model.setUserName(user.getNickName()); - model.setUserPhone(user.getPhone()); + if(user != null){ + model.setUserName(user.getNickName()); + model.setUserPhone(user.getPhone()); + } } }); return getDataTable(list); diff --git a/playlet-admin/src/main/java/com/playlet/web/service/app/PlayletUserAppService.java b/playlet-admin/src/main/java/com/playlet/web/service/app/PlayletUserAppService.java index 01c6e38..61b2a46 100644 --- a/playlet-admin/src/main/java/com/playlet/web/service/app/PlayletUserAppService.java +++ b/playlet-admin/src/main/java/com/playlet/web/service/app/PlayletUserAppService.java @@ -46,6 +46,6 @@ public interface PlayletUserAppService { PlayletUser onlyLoginByOpenid(String openid); - PlayletUser addPlayletUser(PlayletUser playletUser); + PlayletUser addPlayletUser(PlayletUser playletUser) throws Exception; } diff --git a/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletUserAppServiceImpl.java b/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletUserAppServiceImpl.java index 3dab46e..ac99334 100644 --- a/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletUserAppServiceImpl.java +++ b/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletUserAppServiceImpl.java @@ -30,7 +30,14 @@ public class PlayletUserAppServiceImpl implements PlayletUserAppService { @Override - public PlayletUser addPlayletUser(PlayletUser playletUser) { + public PlayletUser addPlayletUser(PlayletUser playletUser) throws Exception{ + String alreadyCode = stringRedisTemplate.opsForValue().get(RedisConstants.SMS_CODE_PREFIX + playletUser.getPhone()); + if(StringUtils.isEmpty(alreadyCode)){ + throw new Exception("验证码已过期!"); + } + if(!alreadyCode.equals(playletUser.getCode())){ + throw new Exception("短信验证码错误!"); + } playletUser.setCreateBy(PlayletConstants.DEFAULT_CREATE); playletUser.setCreateTime(new Date()); iPlayletUserService.save(playletUser); diff --git a/playlet-admin/src/main/resources/templates/system/playlet/item/add.html b/playlet-admin/src/main/resources/templates/system/playlet/item/add.html index 0d62b75..1fffe81 100644 --- a/playlet-admin/src/main/resources/templates/system/playlet/item/add.html +++ b/playlet-admin/src/main/resources/templates/system/playlet/item/add.html @@ -7,12 +7,6 @@
-
- -
- -
-
@@ -76,6 +70,12 @@
+
+ +
+ +
+
diff --git a/playlet-admin/src/main/resources/templates/system/playlet/item/item.html b/playlet-admin/src/main/resources/templates/system/playlet/item/item.html index 4d973ea..615e8d4 100644 --- a/playlet-admin/src/main/resources/templates/system/playlet/item/item.html +++ b/playlet-admin/src/main/resources/templates/system/playlet/item/item.html @@ -82,11 +82,19 @@ }, { field: 'coverPic', - title: '视频封面图' + title: '视频封面图', + formatter: function(value) { + if (value != null && value !== ''){return '详情图片';} + else {return '无'} + } }, { field: 'connectSite', - title: '连接地址' + title: '连接地址', + formatter: function(value) { + if (value != null && value !== ''){return '详情图片';} + else {return '无'} + } }, { field: 'releaseDate',