整合多数据源(待完善)
This commit is contained in:
@@ -2,7 +2,6 @@ package com.xwbing;
|
||||
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
import org.springframework.transaction.annotation.EnableTransactionManagement;
|
||||
|
||||
/**
|
||||
* 项目名称: boot-module-demo
|
||||
@@ -10,9 +9,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
|
||||
* 作者: boot-module-demo
|
||||
* 说明: 启动类
|
||||
*/
|
||||
//@EnableRabbit
|
||||
@SpringBootApplication
|
||||
@EnableTransactionManagement
|
||||
//@Configuration 定义为配置类,相当于xml文件中的<beans></beans>
|
||||
//@ComponentScan 组件扫描
|
||||
//@EnableAutoConfiguration 借助@Import的帮助,将所有符合自动配置条件的bean定义加载到IoC容器
|
||||
|
||||
@@ -3,7 +3,10 @@ package com.xwbing.controller.rest;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.xwbing.annotation.LogInfo;
|
||||
import com.xwbing.domain.entity.ExpressInfo;
|
||||
import com.xwbing.domain.entity.sys.SysUser;
|
||||
import com.xwbing.domain.entity.vo.ExpressInfoVo;
|
||||
import com.xwbing.domain.mapper.SysUserMapper;
|
||||
import com.xwbing.exception.BusinessException;
|
||||
import com.xwbing.rabbit.Sender;
|
||||
import com.xwbing.redis.RedisService;
|
||||
import com.xwbing.service.rest.CookieSessionService;
|
||||
@@ -16,6 +19,7 @@ import com.xwbing.util.RestMessage;
|
||||
import io.swagger.annotations.Api;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
@@ -46,7 +50,14 @@ public class TestControl {
|
||||
private CookieSessionService cookieSessionService;
|
||||
@Resource
|
||||
private Sender sender;
|
||||
|
||||
@Resource
|
||||
private SysUserMapper sysUserMapper;
|
||||
@Transactional
|
||||
@PostMapping("save")
|
||||
public void save(@RequestBody SysUser sysUser) {
|
||||
int save = sysUserMapper.save(sysUser);
|
||||
System.out.println("shiwi");
|
||||
}
|
||||
@GetMapping("send")
|
||||
public void sendM(@RequestParam String[] msg) {
|
||||
sender.sendM(msg);
|
||||
|
||||
@@ -162,7 +162,7 @@ public class SysUserControl {
|
||||
List<SysAuthority> button = new ArrayList<>();
|
||||
List<SysAuthority> menu = new ArrayList<>();
|
||||
List<SysAuthority> list;
|
||||
if (CommonEnum.YesOrNoEnum.YES.getCode().equalsIgnoreCase(sysUser.getAdmin())) {
|
||||
if (CommonEnum.YesOrNoEnum.YES.getCode().equalsIgnoreCase(sysUser.getIsAdmin())) {
|
||||
list = sysAuthorityService.listByEnable(CommonEnum.YesOrNoEnum.YES.getCode());
|
||||
} else {
|
||||
list = sysUserService.listAuthorityByIdAndEnable(sysUser.getId(), CommonEnum.YesOrNoEnum.YES.getCode());
|
||||
@@ -195,7 +195,7 @@ public class SysUserControl {
|
||||
if (old == null) {
|
||||
return JsonResult.toJSONObj("该用户不存在");
|
||||
}
|
||||
if (CommonEnum.YesOrNoEnum.YES.getCode().equalsIgnoreCase(old.getAdmin())) {
|
||||
if (CommonEnum.YesOrNoEnum.YES.getCode().equalsIgnoreCase(old.getIsAdmin())) {
|
||||
return JsonResult.toJSONObj("不能对管理员进行操作");
|
||||
}
|
||||
String[] ids = roleIds.split(",");
|
||||
|
||||
@@ -83,7 +83,7 @@ public class UrlPermissionsInterceptor extends HandlerInterceptorAdapter {
|
||||
String userName = (String) CommonDataUtil.getData(token);
|
||||
SysUser user = sysUserService.getByUserName(userName);
|
||||
List<SysAuthority> sysAuthorities;
|
||||
if (CommonConstant.IS_ENABLE.equalsIgnoreCase(user.getAdmin())) {
|
||||
if (CommonConstant.IS_ENABLE.equalsIgnoreCase(user.getIsAdmin())) {
|
||||
sysAuthorities = sysAuthorityService.listByEnable(CommonEnum.YesOrNoEnum.YES.getCode());
|
||||
} else {
|
||||
sysAuthorities = sysUserService.listAuthorityByIdAndEnable(user.getId(), "Y");
|
||||
|
||||
@@ -7,7 +7,6 @@ server:
|
||||
|
||||
#spring
|
||||
spring:
|
||||
#datasource
|
||||
# datasource:
|
||||
# driver-class-name: com.mysql.jdbc.Driver
|
||||
# url: jdbc:mysql://127.0.0.1:3306/springboot2?useUnicode=true&characterEncoding=utf8
|
||||
@@ -61,8 +60,9 @@ spring:
|
||||
size: 1
|
||||
#mybatis
|
||||
mybatis:
|
||||
mapper-locations:
|
||||
config-location:
|
||||
mapper-locations: #classpath:mapper/*.xml
|
||||
type-aliases-package: #com.xwbing.domain.entity
|
||||
config-location: # classpath:mybatisConfig.xml
|
||||
#log
|
||||
logging:
|
||||
config: classpath:log4j2.xml
|
||||
|
||||
Reference in New Issue
Block a user