From 8b3c4bce785c19fe6435efff292afafc08b44683 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 15 十一月 2024 19:59:07 +0800
Subject: [PATCH] 多数据源
---
billion-ui/vue.config.js | 2 +-
billion-generator/src/main/java/com/billion/generator/controller/GenController.java | 4 ++++
billion-admin/src/main/resources/application-druid.yml | 10 +++++-----
billion-main/src/main/java/com/billion/main/bs/workshop/service/impl/BsWorkshopServiceImpl.java | 3 +++
4 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/billion-admin/src/main/resources/application-druid.yml b/billion-admin/src/main/resources/application-druid.yml
index c2c5b3c..18bb86d 100644
--- a/billion-admin/src/main/resources/application-druid.yml
+++ b/billion-admin/src/main/resources/application-druid.yml
@@ -6,16 +6,16 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://192.168.0.189:3306/billion-db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://192.168.0.189:3306/billion-db-base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: 123456
# 浠庡簱鏁版嵁婧�
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
- enabled: false
- url:
- username:
- password:
+ enabled: true
+ url: jdbc:mysql://192.168.0.189:3306/billion-db-self?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ username: root
+ password: 123456
# 鍒濆杩炴帴鏁�
initialSize: 5
# 鏈�灏忚繛鎺ユ睜鏁伴噺
diff --git a/billion-generator/src/main/java/com/billion/generator/controller/GenController.java b/billion-generator/src/main/java/com/billion/generator/controller/GenController.java
index 164a57b..cbf2afc 100644
--- a/billion-generator/src/main/java/com/billion/generator/controller/GenController.java
+++ b/billion-generator/src/main/java/com/billion/generator/controller/GenController.java
@@ -6,6 +6,9 @@
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletResponse;
+
+import com.billion.common.annotation.DataSource;
+import com.billion.common.enums.DataSourceType;
import org.apache.commons.io.IOUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -84,6 +87,7 @@
*/
@PreAuthorize("@ss.hasPermi('tool:gen:list')")
@GetMapping("/db/list")
+ @DataSource(value = DataSourceType.SLAVE)
public TableDataInfo dataList(GenTable genTable)
{
startPage();
diff --git a/billion-main/src/main/java/com/billion/main/bs/workshop/service/impl/BsWorkshopServiceImpl.java b/billion-main/src/main/java/com/billion/main/bs/workshop/service/impl/BsWorkshopServiceImpl.java
index 8e4c028..1c2b28c 100644
--- a/billion-main/src/main/java/com/billion/main/bs/workshop/service/impl/BsWorkshopServiceImpl.java
+++ b/billion-main/src/main/java/com/billion/main/bs/workshop/service/impl/BsWorkshopServiceImpl.java
@@ -3,6 +3,8 @@
import java.util.List;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.billion.common.annotation.DataSource;
+import com.billion.common.enums.DataSourceType;
import com.billion.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -17,6 +19,7 @@
* @date 2024-11-12
*/
@Service
+@DataSource(value = DataSourceType.SLAVE)
public class BsWorkshopServiceImpl extends ServiceImpl<BsWorkshopMapper, BsWorkshop> implements IBsWorkshopService
{
@Autowired
diff --git a/billion-ui/vue.config.js b/billion-ui/vue.config.js
index 2f331d6..e0fddbe 100644
--- a/billion-ui/vue.config.js
+++ b/billion-ui/vue.config.js
@@ -36,7 +36,7 @@
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- target: `http://localhost:8080`,
+ target: `http://localhost:8083`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
--
Gitblit v1.9.3