fix: code & vm
This commit is contained in:
hucs
@@ -6,8 +6,8 @@ import com.starry.admin.utils.SecurityUtils;
|
||||
import com.starry.common.utils.StringUtils;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import net.sf.jsqlparser.expression.Expression;
|
||||
import net.sf.jsqlparser.expression.LongValue;
|
||||
import net.sf.jsqlparser.expression.NullValue;
|
||||
import net.sf.jsqlparser.expression.StringValue;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.Arrays;
|
||||
@@ -38,7 +38,7 @@ public class MyTenantLineHandler implements TenantLineHandler {
|
||||
if (StrUtil.isBlankIfStr(tenantId)) {
|
||||
return new NullValue();
|
||||
}
|
||||
return new LongValue(tenantId);
|
||||
return new StringValue(tenantId);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -15,10 +15,8 @@ import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
@@ -135,6 +133,9 @@ public class SysMenuController {
|
||||
public R getSimpleMenus() {
|
||||
// 获得菜单列表，只要开启状态的
|
||||
List<SimpleMenu> menus = menuService.selectSimpleMenuList();
|
||||
//TODO 移除公共模块
|
||||
List<Long> forbidList = Arrays.asList(26L, 48L, 47L, 19L);
|
||||
List<SimpleMenu> menuList = menus.stream().filter(ca -> !forbidList.contains(ca.getId()) || !forbidList.contains(ca.getParentId())).collect(Collectors.toList());
|
||||
return R.ok(menus);
|
||||
}
|
||||
}
|
||||
|
||||
102
play-admin/src/main/resources/application-test.yml
Normal file
102
play-admin/src/main/resources/application-test.yml
Normal file
@@ -0,0 +1,102 @@
|
||||
# 服务名
|
||||
spring:
|
||||
application:
|
||||
name: admin-tenant
|
||||
|
||||
# druid数据源配置
|
||||
datasource:
|
||||
type: com.alibaba.druid.pool.DruidDataSource
|
||||
# 配置MySQL的驱动程序类
|
||||
driver-class-name: com.p6spy.engine.spy.P6SpyDriver
|
||||
# 数据库连接地址(以MySql为例)
|
||||
url: jdbc:p6spy:mysql://122.51.20.105:3306/play-with?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
|
||||
# 数据库对应的用户名
|
||||
username: root
|
||||
# 数据库对应的密码
|
||||
password: KdaKRZ2trpdhNePa
|
||||
druid:
|
||||
enable: true
|
||||
db-type: mysql
|
||||
# 配置监控统计拦截的filters，stat是sql监控，wall是防火墙(如果不添加则监控无效)，添加log4j需要引入jar包
|
||||
filters: stat,wall,config
|
||||
# 连接池最大活跃连接数
|
||||
max-active: 100
|
||||
# 连接池初始化连接数量
|
||||
initial-size: 1
|
||||
# 配置获取连接等待超时的时间
|
||||
max-wait: 60000
|
||||
# 连接池最小空闲数
|
||||
min-idle: 1
|
||||
# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
|
||||
timeBetweenEvictionRunsMillis: 60000
|
||||
# 配置一个连接在池中最小生存的时间，单位是毫秒
|
||||
minEvictableIdleTimeMillis: 300000
|
||||
# 指定空闲连接检查、废弃连接清理、空闲连接池大小调整之间的操作时间间隔
|
||||
time-between-eviction-runs-millis: 60000
|
||||
# 指定一个空闲连接最少空闲多久后可被清除
|
||||
min-evictable-idle-time-millis: 300000
|
||||
# 连接是否有效的查询语句
|
||||
validation-query: select 'x'
|
||||
test-while-idle: true
|
||||
test-on-borrow: false
|
||||
test-on-return: false
|
||||
# 打开 PSCache，并且指定每个连接上 PSCache 的大小
|
||||
pool-prepared-statements: true
|
||||
max-open-prepared-statements: 50
|
||||
max-pool-prepared-statement-per-connection-size: 20
|
||||
# 配置 DruidStatFilter
|
||||
web-stat-filter:
|
||||
enabled: true #\u662F\u5426\u542F\u7528StatFilter\u9ED8\u8BA4\u503Ctrue
|
||||
# 排除一些不必要的url，比如.js,/jslib/等
|
||||
exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
|
||||
# 过滤规则
|
||||
url-pattern: /*
|
||||
# 配置 DruidStatViewServlet
|
||||
stat-view-servlet:
|
||||
# 手动重置监控数据
|
||||
enabled: true
|
||||
# IP白名单，没有配置或者为空，则允许所有访问
|
||||
allow: 127.0.0.1
|
||||
# IP黑名单，若白名单也存在，则优先使用
|
||||
deny:
|
||||
# 配置druid登录用户名、密码
|
||||
login-username: admin
|
||||
login-password: admin
|
||||
# HTML 中 Reset All 按钮
|
||||
reset-enable: true
|
||||
redis:
|
||||
host: 122.51.20.105 # Redis服务器地址
|
||||
database: 10 # Redis数据库索引（默认为0）
|
||||
port: 19087 # Redis服务器连接端口
|
||||
password: arcikXa7ZkEBGtLf
|
||||
timeout: 3000ms # 连接超时时间（毫秒）
|
||||
|
||||
|
||||
|
||||
# 全局日志级别
|
||||
logging:
|
||||
level:
|
||||
root: info
|
||||
|
||||
jwt:
|
||||
tokenHeader: X-Token #JWT存储的请求头
|
||||
tokenHead: Bearer #JWT负载中拿到开头
|
||||
secret: yz-admin-secret #JWT加解密使用的密钥
|
||||
expiration: 3600 #JWT的超期限时间秒(60*60*24)
|
||||
|
||||
# xl自定义配置
|
||||
xl:
|
||||
login:
|
||||
authCode:
|
||||
# 登录验证码是否开启，开发环境配置false方便测试
|
||||
enable: false
|
||||
# 腾讯云cos配置
|
||||
cos:
|
||||
baseUrl: https://admin-125966.cos.ap-guangzhou.myqcloud.com
|
||||
secretId: AKIDdHsLgtxoSs3sWw73lz
|
||||
secretKey: zZxBD0b4QcZGmdFcotm
|
||||
regionName: ap-guangzhou
|
||||
bucketName: admin-125966
|
||||
folderPrefix: /upload
|
||||
|
||||
|
||||
Reference in New Issue
Block a user