diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e25237c..d40d2a1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,7 +7,10 @@
+
+
+
diff --git a/maibu-admin/src/main/resources/application-dev.yml b/maibu-admin/src/main/resources/application-dev.yml
index 268b461..a7558b7 100644
--- a/maibu-admin/src/main/resources/application-dev.yml
+++ b/maibu-admin/src/main/resources/application-dev.yml
@@ -3,7 +3,7 @@ spring:
datasource:
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
+ url: jdbc:mysql://1.95.137.212:3306/fastbee?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: fastbee
password: maibu520
diff --git a/maibu-admin/src/main/resources/application.yml b/maibu-admin/src/main/resources/application.yml
index 9c2b9a0..0c03286 100644
--- a/maibu-admin/src/main/resources/application.yml
+++ b/maibu-admin/src/main/resources/application.yml
@@ -1,7 +1,7 @@
# 项目相关配置
-fastbee:
- name: fastbee # 名称
- version: 3.8.5 # 版本
+maibu:
+ name: maibu # 名称
+ version: 4.0.0 # 版本
copyrightYear: 2023 # 版权年份
demoEnabled: true # 实例演示开关
# 文件路径,以uploadPath结尾 示例( Windows配置 D:/uploadPath,Linux配置 /uploadPath)
diff --git a/maibu-admin/src/main/resources/logback.xml b/maibu-admin/src/main/resources/logback.xml
index 9526755..0000ba6 100644
--- a/maibu-admin/src/main/resources/logback.xml
+++ b/maibu-admin/src/main/resources/logback.xml
@@ -132,7 +132,7 @@
-
+
diff --git a/maibu-admin/src/main/resources/sharding-sphere-config.yaml b/maibu-admin/src/main/resources/sharding-sphere-config.yaml
deleted file mode 100644
index 1b33482..0000000
--- a/maibu-admin/src/main/resources/sharding-sphere-config.yaml
+++ /dev/null
@@ -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
diff --git a/maibu-common/src/main/java/com/maibu/config/RuoYiConfig.java b/maibu-common/src/main/java/com/maibu/config/RuoYiConfig.java
index 0e12bfa..237b8fe 100644
--- a/maibu-common/src/main/java/com/maibu/config/RuoYiConfig.java
+++ b/maibu-common/src/main/java/com/maibu/config/RuoYiConfig.java
@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
* @author ruoyi
*/
@Component
-@ConfigurationProperties(prefix = "fastbee")
+@ConfigurationProperties(prefix = "maibu")
public class RuoYiConfig
{
/** 项目名称 */