#update
This commit is contained in:
3
.idea/workspace.xml
generated
3
.idea/workspace.xml
generated
@@ -7,7 +7,10 @@
|
|||||||
<list default="true" id="84ac1b15-3cfa-4375-9957-45b7b581d04e" name="Changes" comment="#update">
|
<list default="true" id="84ac1b15-3cfa-4375-9957-45b7b581d04e" name="Changes" comment="#update">
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/maibu-admin/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-admin/src/main/resources/application-dev.yml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/maibu-admin/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-admin/src/main/resources/application-dev.yml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/maibu-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-admin/src/main/resources/application.yml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/maibu-admin/src/main/resources/logback.xml" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-admin/src/main/resources/logback.xml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/maibu-admin/src/main/resources/logback.xml" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-admin/src/main/resources/logback.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/maibu-admin/src/main/resources/sharding-sphere-config.yaml" beforeDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/config/RuoYiConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/config/RuoYiConfig.java" afterDir="false" />
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ spring:
|
|||||||
datasource:
|
datasource:
|
||||||
type: com.alibaba.druid.pool.DruidDataSource
|
type: com.alibaba.druid.pool.DruidDataSource
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
url: jdbc:mysql://localhost:3306/fastbee?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
url: jdbc:mysql://1.95.137.212:3306/fastbee?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||||
username: fastbee
|
username: fastbee
|
||||||
password: maibu520
|
password: maibu520
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
# 项目相关配置
|
# 项目相关配置
|
||||||
fastbee:
|
maibu:
|
||||||
name: fastbee # 名称
|
name: maibu # 名称
|
||||||
version: 3.8.5 # 版本
|
version: 4.0.0 # 版本
|
||||||
copyrightYear: 2023 # 版权年份
|
copyrightYear: 2023 # 版权年份
|
||||||
demoEnabled: true # 实例演示开关
|
demoEnabled: true # 实例演示开关
|
||||||
# 文件路径,以uploadPath结尾 示例( Windows配置 D:/uploadPath,Linux配置 /uploadPath)
|
# 文件路径,以uploadPath结尾 示例( Windows配置 D:/uploadPath,Linux配置 /uploadPath)
|
||||||
|
|||||||
@@ -132,7 +132,7 @@
|
|||||||
</appender>
|
</appender>
|
||||||
|
|
||||||
<!-- 系统模块日志级别控制 -->
|
<!-- 系统模块日志级别控制 -->
|
||||||
<logger name="com.fastbee" level="debug" />
|
<logger name="com.maibu" level="debug" />
|
||||||
<!-- Spring日志级别控制 -->
|
<!-- Spring日志级别控制 -->
|
||||||
<logger name="org.springframework" level="warn" />
|
<logger name="org.springframework" level="warn" />
|
||||||
|
|
||||||
|
|||||||
@@ -1,59 +0,0 @@
|
|||||||
mode:
|
|
||||||
type: Standalone
|
|
||||||
repository:
|
|
||||||
type: JDBC
|
|
||||||
props:
|
|
||||||
# 是否显示 ShardingSpher 的sql,用于Debug
|
|
||||||
sql-show: true
|
|
||||||
datasource:
|
|
||||||
# 配置真实数据源
|
|
||||||
names: ds0,ds1
|
|
||||||
ds0: # 配置 mysql 数据源
|
|
||||||
type: com.alibaba.druid.pool.DruidDataSource
|
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
|
||||||
url: jdbc:mysql://localhost:3306/fastbee?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
|
||||||
username: root
|
|
||||||
password: fastbee
|
|
||||||
filters: stat,wall
|
|
||||||
filter:
|
|
||||||
stat:
|
|
||||||
enabled: true
|
|
||||||
# 慢SQL记录
|
|
||||||
log-slow-sql: true
|
|
||||||
slow-sql-millis: 1000
|
|
||||||
merge-sql: true
|
|
||||||
wall:
|
|
||||||
config:
|
|
||||||
multi-statement-allow: true
|
|
||||||
ds1: # 配置 mysql 数据源
|
|
||||||
type: com.alibaba.druid.pool.DruidDataSource
|
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
|
||||||
url: jdbc:mysql://localhost:3306/information_schema?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
|
||||||
username: root
|
|
||||||
password: fastbee
|
|
||||||
|
|
||||||
rules: # 配置表规则
|
|
||||||
sharding:
|
|
||||||
# 表策略配置
|
|
||||||
tables:
|
|
||||||
# iot_device_log 是逻辑表
|
|
||||||
iot_device_log:
|
|
||||||
actualDataNodes: ds0.iot_device_log_$->{2024..2030}0$->{1..9},ds0.iot_device_log_$->{2024..2030}1$->{0..2}
|
|
||||||
tableStrategy:
|
|
||||||
# 使用标准分片策略
|
|
||||||
standard:
|
|
||||||
# 配置分片字段
|
|
||||||
shardingColumn: create_time
|
|
||||||
# 分片算法名称,不支持大写字母和下划线,否则启动就会报错
|
|
||||||
shardingAlgorithmName: time-sharding-algorithm
|
|
||||||
# 分片算法配置
|
|
||||||
shardingAlgorithms:
|
|
||||||
# 分片算法名称,不支持大写字母和下划线,否则启动就会报错
|
|
||||||
time-sharding-algorithm:
|
|
||||||
# 类型:自定义策略
|
|
||||||
type: CLASS_BASED
|
|
||||||
props:
|
|
||||||
# 分片策略
|
|
||||||
strategy: standard
|
|
||||||
# 分片算法类
|
|
||||||
algorithmClassName: com.fastbee.framework.config.sharding.TimeShardingAlgorithm
|
|
||||||
@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
|
|||||||
* @author ruoyi
|
* @author ruoyi
|
||||||
*/
|
*/
|
||||||
@Component
|
@Component
|
||||||
@ConfigurationProperties(prefix = "fastbee")
|
@ConfigurationProperties(prefix = "maibu")
|
||||||
public class RuoYiConfig
|
public class RuoYiConfig
|
||||||
{
|
{
|
||||||
/** 项目名称 */
|
/** 项目名称 */
|
||||||
|
|||||||
Reference in New Issue
Block a user