diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZhyFileManageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZhyFileManageController.java index 653b2c7..c03eea5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZhyFileManageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZhyFileManageController.java @@ -70,8 +70,7 @@ import javax.servlet.http.HttpServletResponse; import java.util.regex.Pattern; import java.util.stream.Stream; -import static com.ruoyi.common.constant.Constants.ARTICLE_PDF_DIR; -import static com.ruoyi.common.constant.Constants.FILE_MANAGER_DIR; +import static com.ruoyi.common.constant.Constants.*; @RestController @RequestMapping("/system/fileManage") @@ -2717,7 +2716,8 @@ public class ZhyFileManageController extends BaseController { // 获取当前日期并格式化 SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd_HHmmss"); String formattedDate = dateFormat.format(new Date()); - + System.out.println(FILE_MANAGER_DIR); + System.out.println(TUPUDATA_ROOT); // 定义基础目录 File baseDir = new File(FILE_MANAGER_DIR); // 如果基础目录不存在，则创建它（包括所有必需的父目录） diff --git a/ruoyi-api/src/main/java/com/ruoyi/api/controller/LoginController.java b/ruoyi-api/src/main/java/com/ruoyi/api/controller/LoginController.java index 08485e9..3e5becf 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/api/controller/LoginController.java +++ b/ruoyi-api/src/main/java/com/ruoyi/api/controller/LoginController.java @@ -11,7 +11,14 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.core.redis.RedisCache; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.framework.web.service.SysLoginService; import com.ruoyi.framework.web.service.TokenService; +import com.ruoyi.system.service.ISysDeptService; +import com.ruoyi.system.service.ISysPostService; +import com.ruoyi.system.service.ISysRoleService; +import com.ruoyi.system.service.ISysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import cn.dev33.satoken.stp.StpUtil; @@ -30,6 +37,9 @@ public class LoginController extends BaseController { ZhyUserMapper zhyUserMapper; @Autowired + private ISysUserService userService; + + @Autowired private TokenService tokenService; @Autowired @@ -38,108 +48,89 @@ public class LoginController extends BaseController { @Autowired private RedisCache redisCache; + @Autowired + private ISysRoleService roleService; + + @Autowired + private ISysDeptService deptService; + + @Autowired + private ISysPostService postService; + @Autowired + private SysLoginService loginService; @PostMapping("/doLogin") public AjaxResult doLogin(@RequestBody ZhyUserEntity userEntity) { //存放返回结果 - ZhyUserEntity zhyUserEntity = null; - LoginUser loginUser = new LoginUser(); - SysUser user = new SysUser(); - - //判断登录方式，用户名 - if (!userEntity.getUserName().equals("")) { - zhyUserEntity = zhyUserMapper.selectUserByNumber(userEntity); - } - if (zhyUserEntity == null) { - return AjaxResult.error("账号不存在"); - } - - if (!zhyUserEntity.getPassWord().equals(userEntity.getPassWord())) { - return AjaxResult.error("账号或密码错误"); - } - zhyUserEntity.setPassWord(null); // 清除密码字段，避免安全风险 - - System.out.println("-----------------aaaaaaaaaaaaaaaaaa"); - System.out.println(zhyUserEntity.getId()); - - user.setUserName(userEntity.getUserName()); - user.setUserId(zhyUserEntity.getId()); - loginUser.setUser(user); - loginUser.setUserId(zhyUserEntity.getId()); - loginUser.setLoginTime(new Date().getTime()); - - String a = tokenService.createToken(loginUser); //a是token - //通过token获取uuid - - zhyUserEntity.setToken(a); - - ZhyLoginInfo ll = new ZhyLoginInfo(); - ll.setLoginTime(new Date()); - ll.setUid(zhyUserEntity.getId()); - int aa = zhyUserMapper.insertLogin(ll); - - return AjaxResult.success("成功登录", zhyUserEntity); - } - - @PostMapping("/doLogin1") - public AjaxResult doLogin1(@RequestBody ZhyUserEntity userEntity) { - //存放返回结果 - ZhyUserEntity zhyUserEntity = null; LoginUser loginUser = new LoginUser(); SysUser user = new SysUser(); //判断登录方式，用户名 - if (!userEntity.getUserName().equals("")) { - zhyUserEntity = zhyUserMapper.selectUserByNumber(userEntity); + if (userEntity.getUserName().equals("")) { + return AjaxResult.error("输入为空"); } - if (zhyUserEntity == null) { + SysUser sysUser = userService.selectUserByUserName(userEntity.getUserName()); + if (sysUser == null){ return AjaxResult.error("账号不存在"); } - if (!zhyUserEntity.getPassWord().equals(userEntity.getPassWord())) { + ZhyUserEntity zhyUserEntity = new ZhyUserEntity(); + zhyUserEntity.setPassWord(sysUser.getPassword()); + + + // 校验密码：使用 matches 而不是 equals + if (!SecurityUtils.matchesPassword(userEntity.getPassWord(), sysUser.getPassword())) { return AjaxResult.error("账号或密码错误"); } zhyUserEntity.setPassWord(null); // 清除密码字段，避免安全风险 - System.out.println("-----------------aaaaaaaaaaaaaaaaaa"); - System.out.println(zhyUserEntity.getId()); - user.setUserName(userEntity.getUserName()); - user.setUserId(zhyUserEntity.getId()); + user.setUserName(sysUser.getUserName()); + user.setUserId(sysUser.getUserId()); loginUser.setUser(user); - - loginUser.setUserId(zhyUserEntity.getId()); + loginUser.setUserId(sysUser.getUserId()); loginUser.setLoginTime(new Date().getTime()); - String a = tokenService.createToken(loginUser); //a是token //通过token获取uuid zhyUserEntity.setToken(a); - - ZhyLoginInfo ll = new ZhyLoginInfo(); - ll.setLoginTime(new Date()); - ll.setUid(zhyUserEntity.getId()); - int aa = zhyUserMapper.insertLogin(ll); - return AjaxResult.success("成功登录", zhyUserEntity); } @PostMapping("/doRegister") public SaResult doRegister(@RequestBody ZhyUserEntity userEntity) { - ZhyUserEntity name = null; - name = zhyUserMapper.selectUserByUser(userEntity); - if (name != null) { - return SaResult.error("用户已存在"); - } else { - userEntity.setCreateTime(new Date()); -// userEntity.setIdType(userEntity.); - System.out.println(userEntity.getIdType()); - System.out.println(userEntity.getSpecialized()); - zhyUserMapper.insertUser(userEntity); - StpUtil.login(userEntity.getId());//登录 - return SaResult.ok("成功注册"); + + SysUser user = new SysUser(); + user.setPassword(userEntity.getPassWord()); + user.setUserName(userEntity.getUserName()); +// user.setDeptId(); +// deptService.checkDeptDataScope(user.getDeptId()); +// roleService.checkRoleDataScope(user.getRoleIds()); + if (!userService.checkUserNameUnique(user)) + { + return SaResult.error("新增用户'" + user.getUserName() + "'失败，登录账号已存在"); } + + user.setCreateBy("admin"); + user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); + userService.insertUser(user); + return SaResult.ok("成功注册"); + + +// ZhyUserEntity name = null; +// name = zhyUserMapper.selectUserByUser(userEntity); +// if (name != null) { +// return SaResult.error("用户已存在"); +// } else { +// userEntity.setCreateTime(new Date()); +//// userEntity.setIdType(userEntity.); +// System.out.println(userEntity.getIdType()); +// System.out.println(userEntity.getSpecialized()); +// zhyUserMapper.insertUser(userEntity); +// StpUtil.login(userEntity.getId());//登录 +// return SaResult.ok("成功注册"); +// } } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java index fd665f4..ec25d39 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java @@ -182,7 +182,7 @@ public static final String indexPathBattle = "D:\\project\\gyx\\tupudata\\battl // public static final String indexPathBattle = "C:\\tupudata\\battleManager\\index"; public static final String outPath = "D:\\project\\gyx\\tupudata\\fileOut\\"; - public static final String TUPUDATA_ROOT = "C:/D/project/gyx/tupudata"; + public static String TUPUDATA_ROOT = "C:/D/project/gyx/tupudata"; /** * 文章 PDF 存储目录