|
|
@ -26,6 +26,8 @@ import org.jeecg.common.system.query.QueryGenerator; |
|
|
|
import org.jeecg.common.system.util.JwtUtil; |
|
|
|
import org.jeecg.common.system.util.JwtUtil; |
|
|
|
import org.jeecg.common.system.vo.LoginUser; |
|
|
|
import org.jeecg.common.system.vo.LoginUser; |
|
|
|
import org.jeecg.common.util.*; |
|
|
|
import org.jeecg.common.util.*; |
|
|
|
|
|
|
|
import org.jeecg.modules.demo.collecttype.entity.CollectType; |
|
|
|
|
|
|
|
import org.jeecg.modules.demo.collecttype.service.ICollectTypeService; |
|
|
|
import org.jeecg.modules.system.entity.*; |
|
|
|
import org.jeecg.modules.system.entity.*; |
|
|
|
import org.jeecg.modules.system.model.DepartIdModel; |
|
|
|
import org.jeecg.modules.system.model.DepartIdModel; |
|
|
|
import org.jeecg.modules.system.model.SysUserSysDepartModel; |
|
|
|
import org.jeecg.modules.system.model.SysUserSysDepartModel; |
|
|
@ -90,6 +92,10 @@ public class SysUserController { |
|
|
|
@Autowired |
|
|
|
@Autowired |
|
|
|
private RedisUtil redisUtil; |
|
|
|
private RedisUtil redisUtil; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
|
|
|
|
private ICollectTypeService collectTypeService; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Value("${jeecg.path.upload}") |
|
|
|
@Value("${jeecg.path.upload}") |
|
|
|
private String upLoadPath; |
|
|
|
private String upLoadPath; |
|
|
|
|
|
|
|
|
|
|
@ -990,6 +996,21 @@ public class SysUserController { |
|
|
|
user.setStatus(CommonConstant.USER_UNFREEZE); |
|
|
|
user.setStatus(CommonConstant.USER_UNFREEZE); |
|
|
|
user.setDelFlag(CommonConstant.DEL_FLAG_0); |
|
|
|
user.setDelFlag(CommonConstant.DEL_FLAG_0); |
|
|
|
user.setActivitiSync(CommonConstant.ACT_SYNC_0); |
|
|
|
user.setActivitiSync(CommonConstant.ACT_SYNC_0); |
|
|
|
|
|
|
|
/*在创建一个用户之后给他分配一个默认商品收藏夹和我的设计收藏夹*/ |
|
|
|
|
|
|
|
/*================================开始===========================*/ |
|
|
|
|
|
|
|
CollectType collectType = new CollectType(); |
|
|
|
|
|
|
|
collectType.setCreateBy(user.getUsername()); |
|
|
|
|
|
|
|
collectType.setCollectTypeName("默认收藏夹"); |
|
|
|
|
|
|
|
collectType.setPid("0"); |
|
|
|
|
|
|
|
collectType.setHasChild("1"); |
|
|
|
|
|
|
|
collectTypeService.save(collectType); |
|
|
|
|
|
|
|
CollectType collectType1 = new CollectType(); |
|
|
|
|
|
|
|
collectType1.setCreateBy(user.getUsername()); |
|
|
|
|
|
|
|
collectType1.setCollectTypeName("我的设计"); |
|
|
|
|
|
|
|
collectType1.setPid("0"); |
|
|
|
|
|
|
|
collectType1.setHasChild("1"); |
|
|
|
|
|
|
|
collectTypeService.save(collectType1); |
|
|
|
|
|
|
|
/*================================结束===========================*/ |
|
|
|
sysUserService.addUserWithRole(user,"ee8626f80f7c2619917b6236f3a7f02b");//默认临时角色 VideoRecorder
|
|
|
|
sysUserService.addUserWithRole(user,"ee8626f80f7c2619917b6236f3a7f02b");//默认临时角色 VideoRecorder
|
|
|
|
result.success("注册成功"); |
|
|
|
result.success("注册成功"); |
|
|
|
} catch (Exception e) { |
|
|
|
} catch (Exception e) { |
|
|
|