#

vincentlu

21 小时以前 1bbfdfcecf243ba36512b59da80e41602ad50263

 zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/AuthController.java

@@ -1,12 +1,14 @@
package com.zy.acs.manager.system.controller;

import com.zy.acs.common.utils.Utils;
import com.zy.acs.framework.common.BaseRes;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.R;
import com.zy.acs.manager.common.annotation.OperationLog;
import com.zy.acs.manager.common.config.ConfigProperties;
import com.zy.acs.manager.common.domain.BusinessRes;
import com.zy.acs.manager.common.security.JwtSubject;
import com.zy.acs.manager.common.service.EmailService;
import com.zy.acs.manager.common.utils.JwtUtil;
import com.zy.acs.manager.manager.enums.StatusType;
import com.zy.acs.manager.system.controller.param.LoginParam;
@@ -21,7 +23,7 @@
import com.zy.acs.manager.system.service.TenantService;
import com.zy.acs.manager.system.service.UserLoginService;
import com.zy.acs.manager.system.service.UserService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
@@ -48,6 +50,8 @@
    private RoleMenuService roleMenuService;
    @Resource
    private TenantService tenantService;
    @Autowired
    private EmailService emailService;

    @GetMapping("/system/info")
    public R systemInfo() {
@@ -106,10 +110,10 @@
            if (!emailService.isValid(user.getEmail())) {
                return R.parse(BusinessRes.INVALID_EMAIL);
            }
            User one = userService.getByEmail(user.getEmail(), null);
            if (null != one  && !one.getId().equals(user.getId())) {
                return R.parse(BusinessRes.EMAIL_EXIT);
            }
//            User one = userService.getByEmail(user.getEmail(), null);
//            if (null != one  && !one.getId().equals(user.getId())) {
//                return R.parse(BusinessRes.EMAIL_EXIT);
//            }
        }
        if (userService.updateById(user)) {
            return R.ok("Save Success").add(userService.getById(user.getId()));