启用多数据库源;新增ERP对接模块

pom.xml

@@ -354,6 +354,13 @@
                 <version>${revision}</version>
             </dependency>
 
+            <!-- 盈派支付 ERP 数据对接模块 -->
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>yingpaipay-erp</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 
@@ -362,6 +369,7 @@
         <module>ruoyi-common</module>
         <module>ruoyi-extend</module>
         <module>ruoyi-modules</module>
+        <module>yingpaipay-api</module>
     </modules>
     <packaging>pom</packaging>
 

ruoyi-admin/pom.xml

@@ -93,6 +93,12 @@
             <artifactId>ruoyi-workflow</artifactId>
         </dependency>
 
+        <!--  盈派支付ERP模块  -->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>yingpaipay-erp</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-client</artifactId>

ruoyi-admin/src/main/resources/application-dev.yml

@@ -1,7 +1,7 @@
 --- # 监控中心配置
 spring.boot.admin.client:
   # 增加客户端开关
-  enabled: true
+  enabled: false
   url: http://localhost:9090/admin
   instance:
     service-host-type: IP
@@ -13,7 +13,7 @@ spring.boot.admin.client:
 
 --- # snail-job 配置
 snail-job:
-  enabled: true
+  enabled: false
   # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务
   group: "ruoyi_group"
   # SnailJob 接入验证令牌 详见 script/sql/ry_job.sql `sj_group_config` 表
@@ -46,9 +46,16 @@ spring:
           type: ${spring.datasource.type}
           driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
           # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
-          url: jdbc:sqlserver://localhost:1433;DatabaseName=ry-vue;SelectMethod=cursor;encrypt=false
-          username: SA
-          password: root
+          url: jdbc:sqlserver://10.0.0.5:1433;DatabaseName=HS_ERP_Order;SelectMethod=cursor;encrypt=false
+          username: sa
+          password: abc,123
+        # HTSail_Alu 数据源 (yingpaipay-erp 模块专用)
+        htsail_alu:
+          type: ${spring.datasource.type}
+          driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+          url: jdbc:sqlserver://10.0.0.5:1433;DatabaseName=HTSail_Alu;SelectMethod=cursor;encrypt=false
+          username: sa
+          password: abc,123
 #        # 从库数据源
 #        slave:
 #          lazy: true
@@ -95,11 +102,12 @@ spring:
 spring.data:
   redis:
     # 地址
-    host: localhost
+    host: 127.0.0.1
     # 端口，默认为6379
     port: 6379
     # 数据库索引
-    database: 0
+    database: 14
+    username: ruoyi
     # redis 密码必须配置
     password: ruoyi123
     # 连接超时时间
@@ -110,7 +118,7 @@ spring.data:
 # redisson 配置
 redisson:
   # redis key前缀
-  keyPrefix:
+  keyPrefix: huasheng-erp-order-system
   # 线程池数量
   threads: 4
   # Netty线程池数量

ruoyi-admin/src/main/resources/application-prod.yml

@@ -4,7 +4,7 @@ spring.servlet.multipart.location: /ruoyi/server/temp
 --- # 监控中心配置
 spring.boot.admin.client:
   # 增加客户端开关
-  enabled: true
+  enabled: false
   url: http://localhost:9090/admin
   instance:
     service-host-type: IP
@@ -16,7 +16,7 @@ spring.boot.admin.client:
 
 --- # snail-job 配置
 snail-job:
-  enabled: true
+  enabled: false
   # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务
   group: "ruoyi_group"
   # SnailJob 接入验证令牌 详见 script/sql/ry_job.sql `sj_group_config`表
@@ -49,9 +49,16 @@ spring:
           type: ${spring.datasource.type}
           driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
           # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
-          url: jdbc:sqlserver://localhost:1433;DatabaseName=ry-vue;SelectMethod=cursor;encrypt=false
-          username: SA
-          password: root
+          url: jdbc:sqlserver://192.168.1.250:1433;DatabaseName=HS_ERP_Order;SelectMethod=cursor;encrypt=false
+          username: sa
+          password: abc,123
+        # HTSail_Alu 数据源 (yingpaipay-erp 模块专用)
+        htsail_alu:
+          type: ${spring.datasource.type}
+          driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+          url: jdbc:sqlserver://192.168.1.250:1433;DatabaseName=HTSail_Alu;SelectMethod=cursor;encrypt=false
+          username: sa
+          password: abc,123
 #        # 从库数据源
 #        slave:
 #          lazy: true

ruoyi-admin/src/main/resources/application.yml

@@ -207,6 +207,8 @@ springdoc:
       packages-to-scan: org.dromara.generator
     - group: 5.工作流模块
       packages-to-scan: org.dromara.workflow
+    - group: 6.原ERP系统数据对接模块
+      packages-to-scan: org.dromara.yingpaipay
 
 # 防止XSS攻击
 xss:

ruoyi-modules/pom.xml

@@ -15,6 +15,7 @@
         <module>ruoyi-job</module>
         <module>ruoyi-system</module>
         <module>ruoyi-workflow</module>
+        <module>yingpaipay-erp</module>
     </modules>
 
     <artifactId>ruoyi-modules</artifactId>

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/package-info.java

@@ -1 +0,0 @@
-package org.dromara.demo.domain;

ruoyi-modules/yingpaipay-erp/pom.xml

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-modules</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>yingpaipay-erp</artifactId>
+
+    <description>
+        原ERP系统数据对接模块 - 使用 HTSail_Alu 数据库
+    </description>
+
+    <dependencies>
+
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-doc</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-mybatis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-log</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-security</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-excel</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>

ruoyi-modules/yingpaipay-erp/src/main/java/org/dromara/yingpaipay/config/YingpaipayDataSourceConfig.java

@@ -0,0 +1,15 @@
+package org.dromara.yingpaipay.config;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 盈派支付ERP数据源配置
+ * 该模块所有 Mapper 均使用 htsail_alu 数据源 (HTSail_Alu 数据库)
+ */
+@DS("htsail_alu")
+@Configuration
+@MapperScan("org.dromara.yingpaipay.mapper")
+public class YingpaipayDataSourceConfig {
+}

yingpaipay-api/pom.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-vue-plus</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <modules>
+    </modules>
+
+    <artifactId>yingpaipay-api</artifactId>
+    <packaging>pom</packaging>
+
+    <description>
+        盈派支付 - 跨模块公共接口定义父模块（Remote API、VO、常量）
+    </description>
+
+</project>