|
@@ -1,7 +1,9 @@
|
|
|
package com.ruoyi.web.controller.system;
|
|
package com.ruoyi.web.controller.system;
|
|
|
|
|
|
|
|
import com.ruoyi.common.annotation.Anonymous;
|
|
import com.ruoyi.common.annotation.Anonymous;
|
|
|
|
|
+import com.ruoyi.common.constant.Constants;
|
|
|
import com.ruoyi.common.utils.SecurityUtils;
|
|
import com.ruoyi.common.utils.SecurityUtils;
|
|
|
|
|
+import com.ruoyi.web.service.SysLoginService;
|
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -28,7 +30,7 @@ public class SysRegisterController extends BaseController
|
|
|
private SysRegisterService registerService;
|
|
private SysRegisterService registerService;
|
|
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
|
- private ISysConfigService configService;
|
|
|
|
|
|
|
+ private SysLoginService sysLoginService;
|
|
|
|
|
|
|
|
@PostMapping("/registry")
|
|
@PostMapping("/registry")
|
|
|
@ApiOperation("注册完善")
|
|
@ApiOperation("注册完善")
|
|
@@ -36,7 +38,13 @@ public class SysRegisterController extends BaseController
|
|
|
public AjaxResult registry(@RequestBody RegisterBody user)
|
|
public AjaxResult registry(@RequestBody RegisterBody user)
|
|
|
{
|
|
{
|
|
|
String msg = registerService.register(user, null);
|
|
String msg = registerService.register(user, null);
|
|
|
- return StringUtils.isEmpty(msg) ? success() : error(msg);
|
|
|
|
|
|
|
+ if(StringUtils.isEmpty(msg)) {
|
|
|
|
|
+ // 生成token
|
|
|
|
|
+ AjaxResult ajax = AjaxResult.success();
|
|
|
|
|
+ ajax.put(Constants.TOKEN, sysLoginService.loginInner(user.getUsername(), user.getPassword()));
|
|
|
|
|
+ return ajax;
|
|
|
|
|
+ }
|
|
|
|
|
+ return error(msg);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@PostMapping("/improve")
|
|
@PostMapping("/improve")
|