fix: code & vm

This commit is contained in:
hucs
2024-03-22 16:46:41 +08:00
parent 994f32a342
commit 649e1ee2e5
533 changed files with 3940 additions and 9 deletions

8
.idea/.gitignore generated vendored Normal file
View File

@@ -0,0 +1,8 @@
# Default ignored files
/shelf/
/workspace.xml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml

25
.idea/compiler.xml generated Normal file
View File

@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<option name="BUILD_PROCESS_HEAP_SIZE" value="1200" />
<option name="BUILD_PROCESS_ADDITIONAL_VM_OPTIONS" value="-Xss4M" />
<annotationProcessing>
<profile default="true" name="Default" enabled="true" />
<profile name="Maven default annotation processors profile" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<module name="play-generator" />
<module name="play-common" />
<module name="play-admin" />
</profile>
</annotationProcessing>
</component>
<component name="JavacSettings">
<option name="ADDITIONAL_OPTIONS_OVERRIDE">
<module name="play-admin" options="-parameters" />
<module name="play-common" options="-parameters" />
<module name="play-generator" options="-parameters" />
</option>
</component>
</project>

6
.idea/dictionaries generated Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectDictionaryState">
<dictionary name="hucs" />
</component>
</project>

10
.idea/encodings.xml generated Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="file://$PROJECT_DIR$/play-admin/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/play-common/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/play-generator/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
</component>
</project>

View File

@@ -0,0 +1,77 @@
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="JavaDoc" enabled="true" level="WARNING" enabled_by_default="true">
<option name="TOP_LEVEL_CLASS_OPTIONS">
<value>
<option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
<option name="REQUIRED_TAGS" value="" />
</value>
</option>
<option name="INNER_CLASS_OPTIONS">
<value>
<option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
<option name="REQUIRED_TAGS" value="" />
</value>
</option>
<option name="METHOD_OPTIONS">
<value>
<option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
<option name="REQUIRED_TAGS" value="@return@param@throws or @exception" />
</value>
</option>
<option name="FIELD_OPTIONS">
<value>
<option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
<option name="REQUIRED_TAGS" value="" />
</value>
</option>
<option name="IGNORE_DEPRECATED" value="false" />
<option name="IGNORE_JAVADOC_PERIOD" value="true" />
<option name="IGNORE_DUPLICATED_THROWS" value="false" />
<option name="IGNORE_POINT_TO_ITSELF" value="false" />
<option name="myAdditionalJavadocTags" value="Description:,Date:,Author:" />
</inspection_tool>
<inspection_tool class="JavadocDeclaration" enabled="true" level="WARNING" enabled_by_default="true">
<option name="ADDITIONAL_TAGS" value="Description:,Date:,Author:" />
</inspection_tool>
<inspection_tool class="MissingJavadoc" enabled="true" level="WARNING" enabled_by_default="true">
<option name="PACKAGE_SETTINGS">
<Options>
<option name="ENABLED" value="false" />
</Options>
</option>
<option name="MODULE_SETTINGS">
<Options>
<option name="ENABLED" value="false" />
</Options>
</option>
<option name="TOP_LEVEL_CLASS_SETTINGS">
<Options>
<option name="ENABLED" value="false" />
</Options>
</option>
<option name="INNER_CLASS_SETTINGS">
<Options>
<option name="ENABLED" value="false" />
</Options>
</option>
<option name="METHOD_SETTINGS">
<Options>
<option name="REQUIRED_TAGS" value="@return@param@throws or @exception" />
<option name="ENABLED" value="false" />
</Options>
</option>
<option name="FIELD_SETTINGS">
<Options>
<option name="ENABLED" value="false" />
</Options>
</option>
</inspection_tool>
<inspection_tool class="ShellCheck" enabled="true" level="ERROR" enabled_by_default="true">
<shellcheck_settings value="SC1128,SC2239" />
</inspection_tool>
<inspection_tool class="SqlDialectInspection" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="SqlNoDataSourceInspection" enabled="false" level="WARNING" enabled_by_default="false" />
</profile>
</component>

20
.idea/jarRepositories.xml generated Normal file
View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
</component>
</project>

15
.idea/misc.xml generated Normal file
View File

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CodeInsightWorkspaceSettings">
<option name="optimizeImportsOnTheFly" value="true" />
</component>
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="MavenProjectsManager">
<option name="originalFiles">
<list>
<option value="$PROJECT_DIR$/pom.xml" />
</list>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8 (3)" project-jdk-type="JavaSDK" />
</project>

6
.idea/vcs.xml generated Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

View File

@@ -6,8 +6,8 @@ import com.starry.admin.utils.SecurityUtils;
import com.starry.common.utils.StringUtils; import com.starry.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.expression.Expression;
import net.sf.jsqlparser.expression.LongValue;
import net.sf.jsqlparser.expression.NullValue; import net.sf.jsqlparser.expression.NullValue;
import net.sf.jsqlparser.expression.StringValue;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.Arrays; import java.util.Arrays;
@@ -38,7 +38,7 @@ public class MyTenantLineHandler implements TenantLineHandler {
if (StrUtil.isBlankIfStr(tenantId)) { if (StrUtil.isBlankIfStr(tenantId)) {
return new NullValue(); return new NullValue();
} }
return new LongValue(tenantId); return new StringValue(tenantId);
} }
/** /**

View File

@@ -15,10 +15,8 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.Collections; import java.util.*;
import java.util.HashMap; import java.util.stream.Collectors;
import java.util.List;
import java.util.Map;
/** /**
* <p> * <p>
@@ -135,6 +133,9 @@ public class SysMenuController {
public R getSimpleMenus() { public R getSimpleMenus() {
// 获得菜单列表,只要开启状态的 // 获得菜单列表,只要开启状态的
List<SimpleMenu> menus = menuService.selectSimpleMenuList(); 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); return R.ok(menus);
} }
} }

View 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
# 配置监控统计拦截的filtersstat是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

View 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://127.0.0.1:3306/play-with?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
# 数据库对应的用户名
username: root
# 数据库对应的密码
password: Spinfo0123
druid:
enable: true
db-type: mysql
# 配置监控统计拦截的filtersstat是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: 127.0.0.1 # Redis服务器地址
database: 10 # Redis数据库索引默认为0
port: 6379 # Redis服务器连接端口
password: Spinfo@0123
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

View File

@@ -0,0 +1,96 @@
# 服务名
spring:
application:
name: admin-ucenter
# druid数据源配置
datasource:
type: com.alibaba.druid.pool.DruidDataSource
# 配置MySQL的驱动程序类
driver-class-name: com.mysql.cj.jdbc.Driver
# 数据库连接地址(以MySql为例)
url: jdbc:mysql://localhost:3306/admin?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
# 数据库对应的用户名
username: root
# 数据库对应的密码
password: root
druid:
# 配置监控统计拦截的filtersstat是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: localhost # Redis服务器地址
database: 0 # Redis数据库索引默认为0
port: 6379 # Redis服务器连接端口
password: yz_admin # Redis服务器连接密码默认为空
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

View 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
# 配置监控统计拦截的filtersstat是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

View File

@@ -0,0 +1,16 @@
server:
port: 7002
spring:
profiles:
active: test
# mybatis日志
mybatis-plus:
global-config:
# 逻辑删除
db-config:
logic-delete-field: deleted # 全局逻辑删除的实体字段名
logic-delete-value: 1
logic-not-delete-value: 0
# xml文件路径classpath* 代表所有模块的resources目录 classpath 不加星号代表当前模块下的resources目录
mapper-locations: classpath*:mapper/**/*.xml

Some files were not shown because too many files have changed in this diff Show More