yml依赖

2024-08-10 13:21:52 +08:00 · 2024-08-10 13:21:52 +08:00 · e06beb4a6e
parent 1066721965
commit e06beb4a6e
13 changed files with 71 additions and 23 deletions
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/BonusBaseApplication.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/BonusBaseApplication.java
@ -3,11 +3,9 @@ package com.bonus.base;
 import com.bonus.common.security.annotation.EnableCustomConfig;
 import com.bonus.common.security.annotation.EnableRyFeignClients;
 import com.bonus.common.swagger.annotation.EnableCustomSwagger2;
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.context.annotation.Configuration;

 /**
 * @author : 阮世耀
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/BmAgreementService.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/BmAgreementService.java
@ -1,6 +1,6 @@
 package com.bonus.base.service;

-import com.baomidou.dynamic.datasource.annotation.DS;
+//import com.baomidou.dynamic.datasource.annotation.DS;
 import org.springframework.stereotype.Service;

 import org.springframework.beans.factory.annotation.Autowired;
@ -19,7 +19,7 @@ import java.util.List;
 * @version : 1.0
 */
@Service
-@DS("master")
+//@DS("master")
 public class BmAgreementService{

    @Resource
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/BmCustomerTypeService.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/BmCustomerTypeService.java
@ -1,6 +1,5 @@
 package com.bonus.base.service;

-import com.baomidou.dynamic.datasource.annotation.DS;
 import org.springframework.stereotype.Service;

 import org.springframework.beans.factory.annotation.Autowired;
@ -16,7 +15,6 @@ import com.bonus.base.mapper.BmCustomerTypeMapper;
 * @version : 1.0
 */
@Service
-@DS("master")
 public class BmCustomerTypeService{

    @Autowired
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/BmProjectService.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/BmProjectService.java
@ -1,6 +1,5 @@
 package com.bonus.base.service;

-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.bonus.base.mapper.BmProjectMapper;
 import org.springframework.stereotype.Service;

@ -18,7 +17,6 @@ import java.util.List;
 *@version : 1.0
 */
@Service
-@DS("master")
 public class BmProjectService{

    @Autowired
--- a/bonus-modules/bonus-base/src/main/resources/bootstrap.yml
+++ b/bonus-modules/bonus-base/src/main/resources/bootstrap.yml
@ -4,6 +4,29 @@ server:

 # Spring
 spring:
+  redis:
+    host: localhost
+    port: 6379
+  datasource:
+    druid:
+      stat-view-servlet:
+        enabled: true
+        loginUsername: admin
+        loginPassword: Bonus@Max2024
+    dynamic:
+      strict: false
+      primary: master
+      datasource:
+        master:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          url: jdbc:mysql://192.168.0.56:3306/bns-smartwh?allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false
+          username: Bonus@git
+          password: Passw0rd!
+        two:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          url: jdbc:mysql:///192.168.0.56:3306/bns-smartwh?allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false
+          username: Bonus@git
+          password: Passw0rd!
  servlet:
    multipart:
      max-file-size: 5GB
--- a/scripts/auth_bootstrap.yml
+++ b/scripts/auth_bootstrap.yml
@ -15,11 +15,11 @@ spring:
      discovery:
        # 服务注册地址
        server-addr: 192.168.0.56:8848
-        namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc
+        namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66
      config:
        # 配置中心地址
        server-addr: 192.168.0.56:8848
-        namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc
+        namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66
        # 配置文件格式
        file-extension: yml
        # 共享配置
--- a/scripts/base_bootstrap.yml
+++ b/scripts/base_bootstrap.yml
@ -0,0 +1,31 @@
+# Tomcat
+server:
+  port: 18088
+
+# Spring
+spring: 
+  application:
+    # 应用名称
+    name: bonus-base
+  profiles:
+    # 环境配置
+    active: dev
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 192.168.0.56:8848
+        namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66
+      config:
+        # 配置中心地址
+        server-addr: 192.168.0.56:8848
+        namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+system:
+  supports:
+    phoneLogin: true
+    emailLogin: true
--- a/scripts/file_bootstrap.yml
+++ b/scripts/file_bootstrap.yml
@ -15,11 +15,11 @@ spring:
      discovery:
        # 服务注册地址
        server-addr: 192.168.0.56:8848
-        namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc
+        namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66
      config:
        # 配置中心地址
        server-addr: 192.168.0.56:8848
-        namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc
+        namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66
        # 配置文件格式
        file-extension: yml
        # 共享配置
--- a/scripts/gateway_bootstrap.yml
+++ b/scripts/gateway_bootstrap.yml
@ -16,11 +16,11 @@ spring:
      discovery:
        # 服务注册地址
        server-addr: 192.168.0.56:8848
-        namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc
+        namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66
      config:
        # 配置中心地址
        server-addr: 192.168.0.56:8848
-        namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc
+        namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66
        # 配置文件格式
        file-extension: yml
        # 共享配置
@ -37,7 +37,7 @@ spring:
        ds1:
          nacos:
            server-addr: 192.168.0.56:8848
-            namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc
+            namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66
            dataId: sentinel-bonus-gateway
            groupId: DEFAULT_GROUP
            data-type: json
--- a/scripts/gen_bootstrap.yml
+++ b/scripts/gen_bootstrap.yml
@ -15,11 +15,11 @@ spring:
      discovery:
        # 服务注册地址
        server-addr: 192.168.0.56:8848
-        namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc
+        namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66
      config:
        # 配置中心地址
        server-addr: 192.168.0.56:8848
-        namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc
+        namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66
        # 配置文件格式
        file-extension: yml
        # 共享配置
--- a/scripts/job_bootstrap.yml
+++ b/scripts/job_bootstrap.yml
@ -15,11 +15,11 @@ spring:
      discovery:
        # 服务注册地址
        server-addr: 192.168.0.56:8848
-        namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc
+        namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66
      config:
        # 配置中心地址
        server-addr: 192.168.0.56:8848
-        namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc
+        namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66
        # 配置文件格式
        file-extension: yml
        # 共享配置
--- a/scripts/system_bootstrap.yml
+++ b/scripts/system_bootstrap.yml
@ -15,11 +15,11 @@ spring:
      discovery:
        # 服务注册地址
        server-addr: 192.168.0.56:8848
-        namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc
+        namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66
      config:
        # 配置中心地址
        server-addr: 192.168.0.56:8848
-        namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc
+        namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66
        # 配置文件格式
        file-extension: yml
        # 共享配置
--- a/scripts/visual_bootstrap.yml
+++ b/scripts/visual_bootstrap.yml
@ -15,11 +15,11 @@ spring:
      discovery:
        # 服务注册地址
        server-addr: 192.168.0.56:8848
-        namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc
+        namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66
      config:
        # 配置中心地址
        server-addr: 192.168.0.56:8848
-        namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc
+        namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66
        # 配置文件格式
        file-extension: yml
        # 共享配置