diff --git a/doc/beiwang.md b/doc/beiwang.md index 2086f7f..84491a8 100644 --- a/doc/beiwang.md +++ b/doc/beiwang.md @@ -1,3 +1,4 @@ 1.把ruoyi-piao ruoyi-uia 拿过来 2.把数据库按结构、数据建好 3.因新版本，在IConfigService里加了 public SysConfig selectConfigByConfigKey(String configKey); +4.把mybatis 换成 mybatisplus diff --git a/doc/piaowudbbak.sh b/doc/piaowudbbak.sh index 1dafef5..335fee5 100644 --- a/doc/piaowudbbak.sh +++ b/doc/piaowudbbak.sh @@ -17,7 +17,7 @@ mkdir -p $BACKUP_DIR # 在MySQL容器内部执行 mysqldump 命令 docker exec $CONTAINER_NAME \ - sh -c "exec mysqldump -u$MYSQL_USER -p'$MYSQL_PASSWORD' $DATABASE_NAME" > "$BACKUP_DIR/piaoruo_bak_$DATE.sql" + sh -c "exec mysqldump -u$MYSQL_USER -p'$MYSQL_PASSWORD' $DATABASE_NAME" > "$BACKUP_DIR/piaowu_bak_$DATE.sql" # 检查是否成功导出 if [ $? -eq 0 ]; then @@ -32,4 +32,5 @@ find $BACKUP_DIR -type f -name "*.sql" -mtime +30 -exec rm {} \; #定时执行备份任务 cron -#0 1 * * * /mydata/docker/piaowu/mysql/piaowudbbak.sh >> /mydata/docker/piaowu/mysql/bak.log 2>&1 \ No newline at end of file +#0 1 * * * /mydata/docker/piaowu/mysql/piaowudbbak.sh >> /mydata/docker/piaowu/mysql/bak.log 2>&1 +#查看：crontab -l 编辑：crontab -e \ No newline at end of file diff --git a/ruoyi-piao/pom.xml b/ruoyi-piao/pom.xml index b8b0cf3..f1b13af 100644 --- a/ruoyi-piao/pom.xml +++ b/ruoyi-piao/pom.xml @@ -145,6 +145,12 @@ mybatis-plus-spring-boot4-starter 3.5.16 + + + com.baomidou + mybatis-plus-jsqlparser + 3.5.16 + diff --git a/ruoyi-piao/src/main/java/com/ruoyi/piao/config/AIConfig.java b/ruoyi-piao/src/main/java/com/ruoyi/piao/config/AIConfig.java new file mode 100644 index 0000000..4d5e47e --- /dev/null +++ b/ruoyi-piao/src/main/java/com/ruoyi/piao/config/AIConfig.java @@ -0,0 +1,15 @@ +package com.ruoyi.piao.config; + +import org.springframework.ai.chat.client.ChatClient; +import org.springframework.ai.chat.model.ChatModel; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class AIConfig { + + @Bean + public ChatClient chatClient(ChatModel chatModel) { + return ChatClient.create(chatModel); + } +} diff --git a/ruoyi-piao/src/main/java/com/ruoyi/piao/config/MybatisPlusConfig.java b/ruoyi-piao/src/main/java/com/ruoyi/piao/config/MybatisPlusConfig.java index 90da174..acec16e 100644 --- a/ruoyi-piao/src/main/java/com/ruoyi/piao/config/MybatisPlusConfig.java +++ b/ruoyi-piao/src/main/java/com/ruoyi/piao/config/MybatisPlusConfig.java @@ -2,9 +2,8 @@ package com.ruoyi.piao.config; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; import org.mybatis.spring.annotation.MapperScan; -import org.springframework.ai.chat.client.ChatClient; -import org.springframework.ai.chat.model.ChatModel; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -12,15 +11,10 @@ import org.springframework.context.annotation.Configuration; @MapperScan("com.ruoyi.piao.dao") public class MybatisPlusConfig { - @Bean - public ChatClient chatClient(ChatModel chatModel) { - return ChatClient.create(chatModel); - } - @Bean public MybatisPlusInterceptor mybatisPlusInterceptor() { MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); -// interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); + interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); return interceptor; } } diff --git a/ruoyi-piao/src/main/resources/logback.xml b/ruoyi-piao/src/main/resources/logback.xml index 9dfd80c..bd50164 100644 --- a/ruoyi-piao/src/main/resources/logback.xml +++ b/ruoyi-piao/src/main/resources/logback.xml @@ -73,7 +73,8 @@ - + + diff --git a/ruoyi-uia/src/views/HomePage.vue b/ruoyi-uia/src/views/HomePage.vue index 3777bb6..b3c852e 100644 --- a/ruoyi-uia/src/views/HomePage.vue +++ b/ruoyi-uia/src/views/HomePage.vue @@ -130,11 +130,12 @@ - + {{ vueStore.getters.nickName }} - + +