--------去掉对es的支持和依赖，默认去掉对hive的包依赖，maven依赖关系优化，页面位置调整，增加build.bat的支持，支持jar直接启动，去掉历史遗留的无用前端代码，依赖的maven包升级--------
This commit is contained in:
暮光：城中城
@@ -1,8 +1,8 @@
|
||||
package com.zyplayer.doc.manage.framework.config;
|
||||
|
||||
import org.dozer.DozerBeanMapperBuilder;
|
||||
import org.dozer.DozerConverter;
|
||||
import org.dozer.Mapper;
|
||||
import com.github.dozermapper.core.Mapper;
|
||||
import com.github.dozermapper.core.DozerBeanMapperBuilder;
|
||||
import com.github.dozermapper.core.DozerConverter;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
|
||||
@@ -2,8 +2,6 @@ package com.zyplayer.doc.manage.framework.config;
|
||||
|
||||
import com.zyplayer.doc.db.framework.configuration.EnableDocDb;
|
||||
import com.zyplayer.doc.dubbo.framework.config.EnableDocDubbo;
|
||||
import com.zyplayer.doc.elasticsearch.framework.config.EnableDocEs;
|
||||
import com.zyplayer.doc.swagger.framework.configuration.EnableDocSwagger;
|
||||
import com.zyplayer.doc.swaggerplus.framework.config.EnableDocSwaggerPlus;
|
||||
import com.zyplayer.doc.wiki.framework.config.EnableDocWiki;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
@@ -16,25 +14,16 @@ import org.springframework.context.annotation.Configuration;
|
||||
*/
|
||||
@Configuration
|
||||
public class ZyplayerDocConfig {
|
||||
|
||||
// @EnableDocGrpc // grpc默认不开启
|
||||
// public class enableDocGrpc{}
|
||||
|
||||
@EnableDocWiki
|
||||
public class enableDocWiki{}
|
||||
|
||||
@EnableDocEs
|
||||
public class enableDocEs{}
|
||||
|
||||
@EnableDocDubbo
|
||||
public class enableDocDubbo{}
|
||||
|
||||
@EnableDocDb
|
||||
public class enableDocDb{}
|
||||
|
||||
// @EnableDocSwagger(selfDoc = false)
|
||||
// public class enableDocSwagger{}
|
||||
|
||||
@EnableDocSwaggerPlus
|
||||
public class enableDocSwaggerPlus{}
|
||||
}
|
||||
|
||||
@@ -1,99 +1,99 @@
|
||||
package com.zyplayer.doc.manage.framework.config.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
||||
import com.zyplayer.doc.data.repository.manage.entity.ZyplayerStorage;
|
||||
import com.zyplayer.doc.data.service.manage.ZyplayerStorageService;
|
||||
import com.zyplayer.doc.swagger.framework.service.MgStorage;
|
||||
import com.zyplayer.doc.swagger.framework.service.MgStorageService;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 申明为@Service之后网页上才能使用存储能力，同时需要在@EnableSwagger2的地方添加@EnableSwaggerMgUi注解，
|
||||
* 才能开启存储的接口<br/>
|
||||
* 开放存储能力的好处：<br/>
|
||||
* 所有网页的配置、调试值都可以存储到服务器的数据库中，便于团队所有人的调试，一人配置，所有人受益<br/>
|
||||
* 如果不开启的话，数据是存放在浏览器的localStorage中，每个人、每个浏览器都得配置一次才能使用<br/>
|
||||
*
|
||||
* @author 暮光：城中城
|
||||
* @since 2018年8月19日
|
||||
*/
|
||||
@Service
|
||||
public class MgStorageServiceImpl implements MgStorageService {
|
||||
|
||||
@Value("${zyplayer.doc.swagger.proxy-request.white-domain}")
|
||||
private String proxyRequestWhiteDomain;
|
||||
@Resource
|
||||
ZyplayerStorageService zyplayerStorageService;
|
||||
|
||||
/**
|
||||
* 使用数据库来存储，例： storageMapper.select(key);
|
||||
*/
|
||||
@Override
|
||||
public String get(String key) {
|
||||
QueryWrapper<ZyplayerStorage> wrapper = new QueryWrapper<>();
|
||||
wrapper.eq("doc_key", key);
|
||||
ZyplayerStorage zyplayerStorage = zyplayerStorageService.getOne(wrapper);
|
||||
if (zyplayerStorage == null) {
|
||||
return null;
|
||||
}
|
||||
return zyplayerStorage.getDocValue();
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<MgStorage> like(String key, String value) {
|
||||
QueryWrapper<ZyplayerStorage> wrapper = new QueryWrapper<>();
|
||||
wrapper.like(StringUtils.isNotBlank(key), "doc_key", key);
|
||||
wrapper.like(StringUtils.isNotBlank(value), "doc_value", value);
|
||||
List<ZyplayerStorage> storageList = zyplayerStorageService.list(wrapper);
|
||||
if (storageList == null || storageList.isEmpty()) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
return storageList.stream().map(val -> new MgStorage(val.getDocKey(), val.getDocValue())).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
/**
|
||||
* 使用数据库来存储，例： storageMapper.updateOrInsert(key, value);
|
||||
*/
|
||||
@Override
|
||||
public void put(String key, String value) {
|
||||
ZyplayerStorage entity = new ZyplayerStorage();
|
||||
entity.setDocValue(value);
|
||||
UpdateWrapper<ZyplayerStorage> updateWrapper = new UpdateWrapper<>();
|
||||
updateWrapper.eq("doc_key", key);
|
||||
boolean update = zyplayerStorageService.update(entity, updateWrapper);
|
||||
if (!update) {
|
||||
entity = new ZyplayerStorage();
|
||||
entity.setDocValue(value);
|
||||
entity.setDocKey(key);
|
||||
zyplayerStorageService.save(entity);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除一个key
|
||||
*/
|
||||
@Override
|
||||
public void remove(String key) {
|
||||
UpdateWrapper<ZyplayerStorage> queryWrapper = new UpdateWrapper<>();
|
||||
queryWrapper.eq("doc_key", key);
|
||||
zyplayerStorageService.remove(queryWrapper);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> getProxyRequestWhiteDomain() {
|
||||
if (StringUtils.isBlank(proxyRequestWhiteDomain)) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
return Arrays.asList(proxyRequestWhiteDomain.split(";"));
|
||||
}
|
||||
|
||||
}
|
||||
//package com.zyplayer.doc.manage.framework.config.impl;
|
||||
//
|
||||
//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
//import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
||||
//import com.zyplayer.doc.data.repository.manage.entity.ZyplayerStorage;
|
||||
//import com.zyplayer.doc.data.service.manage.ZyplayerStorageService;
|
||||
//import com.zyplayer.doc.swagger.framework.service.MgStorage;
|
||||
//import com.zyplayer.doc.swagger.framework.service.MgStorageService;
|
||||
//import org.apache.commons.lang.StringUtils;
|
||||
//import org.springframework.beans.factory.annotation.Value;
|
||||
//import org.springframework.stereotype.Service;
|
||||
//
|
||||
//import javax.annotation.Resource;
|
||||
//import java.util.Arrays;
|
||||
//import java.util.Collections;
|
||||
//import java.util.List;
|
||||
//import java.util.stream.Collectors;
|
||||
//
|
||||
///**
|
||||
// * 申明为@Service之后网页上才能使用存储能力，同时需要在@EnableSwagger2的地方添加@EnableSwaggerMgUi注解，
|
||||
// * 才能开启存储的接口<br/>
|
||||
// * 开放存储能力的好处：<br/>
|
||||
// * 所有网页的配置、调试值都可以存储到服务器的数据库中，便于团队所有人的调试，一人配置，所有人受益<br/>
|
||||
// * 如果不开启的话，数据是存放在浏览器的localStorage中，每个人、每个浏览器都得配置一次才能使用<br/>
|
||||
// *
|
||||
// * @author 暮光：城中城
|
||||
// * @since 2018年8月19日
|
||||
// */
|
||||
//@Service
|
||||
//public class MgStorageServiceImpl implements MgStorageService {
|
||||
//
|
||||
// @Value("${zyplayer.doc.swagger.proxy-request.white-domain}")
|
||||
// private String proxyRequestWhiteDomain;
|
||||
// @Resource
|
||||
// ZyplayerStorageService zyplayerStorageService;
|
||||
//
|
||||
// /**
|
||||
// * 使用数据库来存储，例： storageMapper.select(key);
|
||||
// */
|
||||
// @Override
|
||||
// public String get(String key) {
|
||||
// QueryWrapper<ZyplayerStorage> wrapper = new QueryWrapper<>();
|
||||
// wrapper.eq("doc_key", key);
|
||||
// ZyplayerStorage zyplayerStorage = zyplayerStorageService.getOne(wrapper);
|
||||
// if (zyplayerStorage == null) {
|
||||
// return null;
|
||||
// }
|
||||
// return zyplayerStorage.getDocValue();
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public List<MgStorage> like(String key, String value) {
|
||||
// QueryWrapper<ZyplayerStorage> wrapper = new QueryWrapper<>();
|
||||
// wrapper.like(StringUtils.isNotBlank(key), "doc_key", key);
|
||||
// wrapper.like(StringUtils.isNotBlank(value), "doc_value", value);
|
||||
// List<ZyplayerStorage> storageList = zyplayerStorageService.list(wrapper);
|
||||
// if (storageList == null || storageList.isEmpty()) {
|
||||
// return Collections.emptyList();
|
||||
// }
|
||||
// return storageList.stream().map(val -> new MgStorage(val.getDocKey(), val.getDocValue())).collect(Collectors.toList());
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * 使用数据库来存储，例： storageMapper.updateOrInsert(key, value);
|
||||
// */
|
||||
// @Override
|
||||
// public void put(String key, String value) {
|
||||
// ZyplayerStorage entity = new ZyplayerStorage();
|
||||
// entity.setDocValue(value);
|
||||
// UpdateWrapper<ZyplayerStorage> updateWrapper = new UpdateWrapper<>();
|
||||
// updateWrapper.eq("doc_key", key);
|
||||
// boolean update = zyplayerStorageService.update(entity, updateWrapper);
|
||||
// if (!update) {
|
||||
// entity = new ZyplayerStorage();
|
||||
// entity.setDocValue(value);
|
||||
// entity.setDocKey(key);
|
||||
// zyplayerStorageService.save(entity);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * 删除一个key
|
||||
// */
|
||||
// @Override
|
||||
// public void remove(String key) {
|
||||
// UpdateWrapper<ZyplayerStorage> queryWrapper = new UpdateWrapper<>();
|
||||
// queryWrapper.eq("doc_key", key);
|
||||
// zyplayerStorageService.remove(queryWrapper);
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public List<String> getProxyRequestWhiteDomain() {
|
||||
// if (StringUtils.isBlank(proxyRequestWhiteDomain)) {
|
||||
// return Collections.emptyList();
|
||||
// }
|
||||
// return Arrays.asList(proxyRequestWhiteDomain.split(";"));
|
||||
// }
|
||||
//
|
||||
//}
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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小时
|
||||
|
||||
@@ -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("改用户账号已存在");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user