Merge branch 'sit' of http://8.152.195.41:3000/alien/alien_cloud into sit

alien-lawyer/src/main/java/shop/alien/lawyer/controller/LawyerUserLogInController.java

@@ -63,7 +63,7 @@ public class LawyerUserLogInController {
     public R<LawyerUserVo> login(@RequestBody LawyerUserDto lawyerUserDto) {
         log.info("LawyerUserLogInController.login?lawyerUserDto={}", lawyerUserDto);
         LawyerUser lawyerUser = lawyerUserMapper.selectOne(new LambdaQueryWrapper<LawyerUser>()
-                .eq(LawyerUser::getPhone, lawyerUserDto.getPhone()));
+                .eq(LawyerUser::getPhone, lawyerUserDto.getPhone()).eq(LawyerUser::getDeleteFlag, 0));
         if (null == lawyerUser) {
             return R.fail("当前账号不存在，请先去注册账号！");
         }

alien-store/src/main/java/shop/alien/store/service/LifeUserLearningVideoService.java

@@ -5,12 +5,14 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import shop.alien.entity.result.R;
 import shop.alien.entity.store.LifeUserLearningVideo;
 
+import java.io.IOException;
+
 public interface LifeUserLearningVideoService extends IService<LifeUserLearningVideo> {
 
     /**
      * 新增学习视频
      */
-    R<String> add(LifeUserLearningVideo lifeUserLearningVideo);
+    R<String> add(LifeUserLearningVideo lifeUserLearningVideo) throws IOException, InterruptedException;
 
     /**
      * 根据ID删除学习视频

alien-store/src/main/java/shop/alien/store/service/impl/LifeUserLearningVideoServiceImpl.java

@@ -12,6 +12,9 @@ import shop.alien.entity.result.R;
 import shop.alien.entity.store.LifeUserLearningVideo;
 import shop.alien.mapper.LifeUserLearningVideoMapper;
 import shop.alien.store.service.LifeUserLearningVideoService;
+import shop.alien.util.common.VideoDurationFFmpeg;
+
+import java.io.IOException;
 
 @Service
 @RequiredArgsConstructor
@@ -19,8 +22,10 @@ import shop.alien.store.service.LifeUserLearningVideoService;
 public class LifeUserLearningVideoServiceImpl extends ServiceImpl<LifeUserLearningVideoMapper, LifeUserLearningVideo> implements LifeUserLearningVideoService {
 
     @Override
-    public R<String> add(LifeUserLearningVideo lifeUserLearningVideo) {
+    public R<String> add(LifeUserLearningVideo lifeUserLearningVideo) throws IOException, InterruptedException {
         log.info("LifeUserLearningVideoServiceImpl.add, param={}", lifeUserLearningVideo);
+        long videoDuration = VideoDurationFFmpeg.getVideoDuration(lifeUserLearningVideo.getVideoUrl());
+        lifeUserLearningVideo.setVideoDuration(String.valueOf(videoDuration));
         boolean result = this.save(lifeUserLearningVideo);
         if (result) {
             return R.success("新增成功");