Merge remote-tracking branch 'origin/master'

# Conflicts:
#	yt-middle/middle-platform/src/main/java/com/ytpm/middle/service/impl/DeptServiceImpl.java

yt-app/app-service/src/main/java/com/ytpm/service/impl/AdServiceImpl.java

@@ -2,6 +2,7 @@ package com.ytpm.service.impl;
 
 import cn.hutool.core.util.IdUtil;
 import com.ytpm.advertise.enums.AdPlatformTypeEnum;
+import com.ytpm.advertise.enums.AdSourceTypeEnum;
 import com.ytpm.agent.enums.UserStatusEnum;
 import com.ytpm.app.model.YtDyzAdRecord;
 import com.ytpm.app.model.YtDyzUser;
@@ -49,9 +50,11 @@ public class AdServiceImpl implements AdService {
         }
         saveRecordAndChangeUser(param, user);
         //调用风控广告校验
-        Result<?> result = riskFeign.checkAdRisk(user);
-        if(result.getCode()!=200){
-            throw new CustomerException(result.getMessage());
+        if(AdSourceTypeEnum.rewarded_video.getAdSourceType() == param.getAdSourceType()){
+            Result<?> result = riskFeign.checkAdRisk(user);
+            if(result.getCode()!=200){
+                throw new CustomerException(result.getMessage());
+            }
         }
         return Result.resultOk(RepMessage.SAVE_SUCCESS);
     }

yt-middle/middle-platform/src/main/java/com/ytpm/middle/service/impl/DeptServiceImpl.java

@@ -46,7 +46,7 @@ public class DeptServiceImpl implements DeptService {
     @Override
     public Result<String> addOne(MiddleDeptParam param) {
         YtMiddleDept old = deptMapper.selectByName(param.getDeptName());
-        if (Objects.nonNull(old)) {
+        if(Objects.nonNull(old)){
             return Result.resultErr(RepMessage.OBJECT_ALREADY_EXIST);
         }
         YtMiddleDept dept = new YtMiddleDept();
@@ -64,7 +64,7 @@ public class DeptServiceImpl implements DeptService {
         List<DropDownVO> all = deptMapper.getAllDeptList();
         DropDownVO parent = all.stream().filter(s -> Objects.isNull(s.getParentId())).collect(Collectors.toList()).get(0);
         List<DropDownVO> next = all.stream().filter(s -> Objects.nonNull(s.getParentId())).collect(Collectors.toList());
-        recursionChildOption(parent, next);
+        recursionChildOption(parent,next);
         return Result.resultObjOk(parent);
     }
 
@@ -74,8 +74,8 @@ public class DeptServiceImpl implements DeptService {
     @Override
     public Result<String> updateOne(MiddleDeptParam param) {
         YtMiddleDept old = deptMapper.selectPrimary(param.getDeptId());
-        if (Objects.nonNull(old)) {
-            return Result.resultErr(RepMessage.OBJECT_ALREADY_EXIST);
+        if(Objects.isNull(old)){
+            return Result.resultErr(RepMessage.OBJECT_NOT_EXIST);
         }
         YtMiddleDept dept = new YtMiddleDept();
         BeanUtils.copyProperties(param, dept);
@@ -115,10 +115,10 @@ public class DeptServiceImpl implements DeptService {
      */
     private void recursionChildOption(DropDownVO parent, List<DropDownVO> next) {
         List<DropDownVO> collect = next.stream().filter(s -> Objects.equals(s.getParentId(), parent.getOptionVal())).collect(Collectors.toList());
-        if (CollUtil.isEmpty(collect)) return;
+        if(CollUtil.isEmpty(collect))return;
         parent.setChildren(collect);
         for (DropDownVO vo : next) {
-            recursionChildOption(vo, next);
+            recursionChildOption(vo,next);
         }
     }
 }

yt-middle/middle-platform/src/main/java/com/ytpm/middle/service/impl/UserServiceImpl.java

@@ -18,6 +18,7 @@ import com.ytpm.middle.view.MiddleUserInfo;
 import com.ytpm.oauth.model.YtPlatformUser;
 import com.ytpm.util.IDUtil;
 import org.springframework.beans.BeanUtils;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -58,6 +59,8 @@ public class UserServiceImpl implements UserService {
         user.setUserId(IDUtil.generateFlowID("middle_"));
         user.setUserType(99);
         user.setRegistryTime(new Date());
+        BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
+        user.setEncryptPwd(encoder.encode(param.getPassword()));
         userMapper.insertOne(user);
         param.setUserId(user.getUserId());
         //新增用户角色信息
@@ -79,6 +82,8 @@ public class UserServiceImpl implements UserService {
         //修改用户信息
         YtPlatformUser user = new YtPlatformUser();
         BeanUtils.copyProperties(param, user);
+        BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
+        user.setEncryptPwd(encoder.encode(param.getPassword()));
         userMapper.updateById(user);
         param.setUserId(user.getUserId());
         //角色列表先删后增