jxkg-new.git - Gitblit

			@@ -1,11 +1,12 @@
			package com.ycl.jxkg.controller.student;

			import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
			import com.ycl.jxkg.base.BaseApiController;
			import com.ycl.jxkg.base.Result;
			import com.ycl.jxkg.domain.Message;
			import com.ycl.jxkg.domain.MessageUser;
			import com.ycl.jxkg.domain.User;
			import com.ycl.jxkg.domain.UserEventLog;
			import com.ycl.jxkg.domain.entity.Message;
			import com.ycl.jxkg.domain.entity.MessageUser;
			import com.ycl.jxkg.domain.entity.User;
			import com.ycl.jxkg.domain.entity.UserEventLog;
			import com.ycl.jxkg.domain.enums.RoleEnum;
			import com.ycl.jxkg.domain.enums.UserStatusEnum;
			import com.ycl.jxkg.event.UserEvent;
			@@ -15,12 +16,11 @@
			import com.ycl.jxkg.service.UserService;
			import com.ycl.jxkg.utils.DateTimeUtil;
			import com.ycl.jxkg.utils.PageInfoHelper;
			import com.ycl.jxkg.vo.student.user.*;
			import com.ycl.jxkg.domain.vo.student.user.*;
			import com.github.pagehelper.PageInfo;
			import lombok.RequiredArgsConstructor;
			import org.apache.commons.lang3.StringUtils;
			import org.springframework.beans.BeanUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.context.ApplicationEventPublisher;
			import org.springframework.web.bind.annotation.*;

			@@ -48,7 +48,6 @@
			return Result.ok(userVm);
			}


			@RequestMapping(value = "/register", method = RequestMethod.POST)
			public Result register(@RequestBody @Valid UserRegisterVO model) {
			User existUser = userService.getUserByUserName(model.getUserName());
			@@ -64,7 +63,6 @@
			user.setStatus(UserStatusEnum.Enable.getCode());
			user.setLastActiveTime(new Date());
			user.setCreateTime(new Date());
			user.setDeleted(false);
			userService.insertUser(user);
			UserEventLog userEventLog = new UserEventLog(user.getId(), user.getUserName(), user.getRealName(), new Date());
			userEventLog.setContent("欢迎 " + user.getUserName() + " 注册来到学之思开源考试系统");