--------去掉对es的支持和依赖,默认去掉对hive的包依赖,maven依赖关系优化,页面位置调整,增加build.bat的支持,支持jar直接启动,去掉历史遗留的无用前端代码,依赖的maven包升级--------

This commit is contained in:
暮光:城中城
2021-11-17 22:31:46 +08:00
parent 5bdf1ec0c6
commit 085b76f4b4
200 changed files with 1412 additions and 56618 deletions

View File

@@ -34,14 +34,6 @@ public class DocSystemController {
return modelAndView;
}
@AuthMan
@GetMapping("/doc-swagger")
public ModelAndView swagger() {
ModelAndView modelAndView = new ModelAndView("/document.html");
modelAndView.setStatus(HttpStatus.OK);
return modelAndView;
}
@AuthMan
@GetMapping("/doc-swagger-plus")
public ModelAndView swaggerPlus() {

View File

@@ -1,5 +1,6 @@
package com.zyplayer.doc.manage.web.manage;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.RandomUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.zyplayer.doc.core.json.DocResponseJson;
@@ -77,7 +78,7 @@ public class LoginController {
}
}
Set<String> userAuthSet = userAuthService.getUserAuthSet(userInfo.getId());
String accessToken = RandomUtil.simpleUUID();
String accessToken = IdUtil.simpleUUID();
DocUserDetails userDetails = new DocUserDetails(userInfo.getId(), userInfo.getUserName(), userInfo.getPassword(), true, userAuthSet);
DocUserUtil.setCurrentUser(accessToken, userDetails);
// 放入cookie过期时间24小时

View File

@@ -23,7 +23,7 @@ import com.zyplayer.doc.manage.web.manage.vo.AuthInfoVo;
import com.zyplayer.doc.manage.web.manage.vo.UserAuthVo;
import com.zyplayer.doc.manage.web.manage.vo.UserInfoAuthVo;
import org.apache.commons.lang.StringUtils;
import org.dozer.Mapper;
import com.github.dozermapper.core.Mapper;
import org.springframework.util.DigestUtils;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -120,7 +120,7 @@ public class UserInfoController {
QueryWrapper<UserInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("user_no", userInfo.getUserNo());
queryWrapper.ne(userId > 0, "id", userInfo.getId());
int count = userInfoService.count(queryWrapper);
long count = userInfoService.count(queryWrapper);
if (count > 0) {
return DocResponseJson.warn("改用户账号已存在");
}