新增模块

hx-saas-project/pom.xml

@@ -1,135 +1,215 @@
 <?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"
+<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">
+    <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <artifactId>fjhx-cloud</artifactId>
         <groupId>com.fjhx</groupId>
         <version>3.2.0</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
+    <groupId>com.fjhx</groupId>
     <artifactId>hx-saas-project</artifactId>
+    <version>2.8.2.RELEASE</version>
     <packaging>pom</packaging>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-        <maven.plugin.version>3.8.1</maven.plugin.version>
+        <bladex.project.version>2.8.2.RELEASE</bladex.project.version>
+
         <java.version>1.8</java.version>
-        <bladex.version>2.8.2.RELEASE</bladex.version>
-        <hx.version>3.2.0</hx.version>
-        <rocketmq.version>4.9.0</rocketmq.version>
+        <maven.plugin.version>3.8.1</maven.plugin.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <netjson.version>2.4</netjson.version>
+        <flowable.version>6.4.2</flowable.version>
+
+        <spring.boot.version>2.3.12.RELEASE</spring.boot.version>
+        <spring.cloud.version>Hoxton.SR11</spring.cloud.version>
+        <spring.platform.version>Cairo-SR8</spring.platform.version>
+
+        <!-- 推荐使用Harbor -->
+        <docker.registry.url>192.168.0.157</docker.registry.url>
+        <docker.registry.host>http://${docker.registry.url}:2375</docker.registry.host>
+        <docker.username>admin</docker.username>
+        <docker.password>Harbor12345</docker.password>
+        <docker.namespace>blade</docker.namespace>
+        <docker.plugin.version>1.4.13</docker.plugin.version>
     </properties>
 
     <modules>
-        <module>saas-storage</module>
+		<module>saas-feign-api</module>
         <module>saas-entity</module>
-        <module>saas-feign-api</module>
-        <module>saas-rocketmq</module>
+        <module>saas-storage</module>
     </modules>
 
     <dependencyManagement>
-
         <dependencies>
-
             <!-- blade -->
             <dependency>
                 <groupId>org.springblade.platform</groupId>
                 <artifactId>blade-bom</artifactId>
-                <version>${bladex.version}</version>
+                <version>${bladex.project.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
 
-<!--            <dependency>-->
-<!--                <groupId>org.apache.rocketmq</groupId>-->
-<!--                <artifactId>rocketmq-client</artifactId>-->
-<!--                <version>4.5.2</version>-->
-<!--            </dependency>-->
-
-            <dependency>
-                <groupId>com.fjhx</groupId>
-                <artifactId>hx-tool</artifactId>
-                <version>${hx.version}</version>
-            </dependency>
-
+            <!-- spring -->
             <dependency>
-                <groupId>com.fjhx</groupId>
-                <artifactId>client-util</artifactId>
-                <version>${hx.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.fjhx</groupId>
-                <artifactId>product-library</artifactId>
-                <version>${hx.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.fjhx</groupId>
-                <artifactId>iot-management-api</artifactId>
-                <version>${hx.version}</version>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring.boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
-
             <dependency>
-                <groupId>com.fjhx</groupId>
-                <artifactId>storage-api</artifactId>
-                <version>${hx.version}</version>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring.cloud.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
-
             <dependency>
-                <groupId>com.fjhx</groupId>
-                <artifactId>service-file-api</artifactId>
-                <version>${hx.version}</version>
+                <groupId>io.spring.platform</groupId>
+                <artifactId>platform-bom</artifactId>
+                <version>${spring.platform.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
-
         </dependencies>
     </dependencyManagement>
 
     <dependencies>
+        <!-- blade -->
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-common</artifactId>
+            <version>${bladex.project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-tenant</artifactId>
+            <version>${bladex.project.version}</version>
+        </dependency>
 
+        <!-- 引入feign api -->
         <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>hx-tool</artifactId>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-user-api</artifactId>
+            <version>${bladex.project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-system-api</artifactId>
+            <version>${bladex.project.version}</version>
         </dependency>
 
+        <!-- 工具 -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <!--amqp-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
+        <finalName>${project.name}</finalName>
         <resources>
             <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*.xml</include>
-                </includes>
+                <directory>src/main/resources</directory>
             </resource>
             <resource>
-                <directory>src/main/resources</directory>
+                <directory>src/main/java</directory>
                 <includes>
-                    <include>**/*</include>
+                    <include>**/*.xml</include>
                 </includes>
             </resource>
         </resources>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-maven-plugin</artifactId>
+                    <version>${spring.boot.version}</version>
+                    <configuration>
+                        <fork>true</fork>
+                        <finalName>${project.build.finalName}</finalName>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>repackage</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>com.spotify</groupId>
+                    <artifactId>dockerfile-maven-plugin</artifactId>
+                    <version>${docker.plugin.version}</version>
+                    <configuration>
+                        <username>${docker.username}</username>
+                        <password>${docker.password}</password>
+                        <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
+                        <tag>${project.version}</tag>
+                        <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
+                        <buildArgs>
+                            <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
+                        </buildArgs>
+                    </configuration>
+                    <!--子服务添加如下配置，运行 mvn deploy 命令便会自动打包镜像-->
+                    <!--<executions>
+                        <execution>
+                            <id>default</id>
+                            <goals>
+                                <goal>build</goal>
+                                <goal>push</goal>
+                            </goals>
+                        </execution>
+                    </executions>-->
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-antrun-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <phase>package</phase>
+                            <goals>
+                                <goal>run</goal>
+                            </goals>
+                            <configuration>
+                                <tasks>
+                                    <!--suppress UnresolvedMavenProperty -->
+                                    <copy overwrite="true"
+                                          tofile="${session.executionRootDirectory}/target/${project.artifactId}.jar"
+                                          file="${project.build.directory}/${project.artifactId}.jar"/>
+                                </tasks>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
         <plugins>
             <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.3.1.RELEASE</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
             </plugin>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven.plugin.version}</version>
                 <configuration>
-                    <target>${java.version}</target>
                     <source>${java.version}</source>
+                    <target>${java.version}</target>
                     <encoding>UTF-8</encoding>
                     <compilerArgs>
                         <arg>-parameters</arg>
@@ -139,4 +219,29 @@
         </plugins>
     </build>
 
-</project>
+    <repositories>
+        <repository>
+            <id>aliyun-repos</id>
+            <url>https://maven.aliyun.com/nexus/content/groups/public/</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>blade-release</id>
+            <name>Release Repository</name>
+            <url>http://nexus.bladex.vip/repository/maven-releases/</url>
+        </repository>
+    </repositories>
+
+    <pluginRepositories>
+        <pluginRepository>
+            <id>aliyun-plugin</id>
+            <url>https://maven.aliyun.com/nexus/content/groups/public/</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
+
+</project>

hx-saas-project/saas-entity/pom.xml

@@ -5,15 +5,22 @@
     <parent>
         <artifactId>hx-saas-project</artifactId>
         <groupId>com.fjhx</groupId>
-        <version>3.2.0</version>
+        <version>2.8.2.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>saas-entity</artifactId>
-
+    <dependencies>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel</artifactId>
+            <version>3.0.5</version>
+        </dependency>
+    </dependencies>
     <groupId>com.fjhx</groupId>
     <name>${project.artifactId}</name>
     <version>2.8.2.RELEASE</version>
     <description>saas 实体</description>
     <packaging>jar</packaging>
-</project>
+
+</project>

hx-saas-project/saas-feign-api/pom.xml

@@ -5,10 +5,59 @@
     <parent>
         <artifactId>hx-saas-project</artifactId>
         <groupId>com.fjhx</groupId>
-        <version>3.2.0</version>
+        <version>2.8.2.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>saas-feign-api</artifactId>
+    <groupId>com.fjhx</groupId>
+    <name>${project.artifactId}</name>
+    <version>2.8.2.RELEASE</version>
+    <packaging>pom</packaging>
+    <description>saas 微服务API集合</description>
 
-</project>
+    <modules>
+        <module>saas-rocketmq-api</module>
+    </modules>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-mybatis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-tenant</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-core-auto</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- 实体 -->
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>saas-entity</artifactId>
+            <version>${bladex.project.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                    <finalName>${project.name}</finalName>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

hx-saas-project/saas-feign-api/saas-rocketmq-api/pom.xml

@@ -0,0 +1,18 @@
+<?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>
+        <artifactId>saas-feign-api</artifactId>
+        <groupId>com.fjhx</groupId>
+        <version>2.8.2.RELEASE</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>saas-business-api</artifactId>
+    <name>${project.artifactId}</name>
+    <version>2.8.2.RELEASE</version>
+    <description>saas 业务模块 微服务API</description>
+    <packaging>jar</packaging>
+
+</project>

hx-saas-project/saas-rocketmq/pom.xml

@@ -5,11 +5,65 @@
     <parent>
         <artifactId>hx-saas-project</artifactId>
         <groupId>com.fjhx</groupId>
-        <version>3.2.0</version>
+        <version>2.8.2.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <groupId>com.fjhx</groupId>
     <artifactId>saas-rocketmq</artifactId>
-    <description>saas 消息推送</description>
+    <name>${project.artifactId}</name>
+    <version>2.8.2.RELEASE</version>
     <packaging>jar</packaging>
-</project>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-core-boot</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-excel</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <configuration>
+                    <username>${docker.username}</username>
+                    <password>${docker.password}</password>
+                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
+                    <tag>${project.version}</tag>
+                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
+                    <buildArgs>
+                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
+                    </buildArgs>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+
+                <configuration>
+                    <includeSystemScope>true</includeSystemScope>
+                    <mainClass>com.fjhx.HxRocketMqApplication</mainClass>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

hx-saas-project/saas-rocketmq/src/main/java/com/fjhx/HxRocketMqApplication.java

@@ -0,0 +1,26 @@
+package com.fjhx;
+
+import org.springblade.core.cloud.feign.EnableBladeFeign;
+import org.springblade.core.launch.BladeApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.scheduling.annotation.EnableAsync;
+
+/**
+ * 消息通知模块启动器
+ */
+@EnableAsync
+@EnableBladeFeign
+@EnableDiscoveryClient
+@EnableCircuitBreaker
+@SpringBootApplication
+public class HxRocketMqApplication {
+
+    private static final String APP_NAME = "hx-rocketmq";
+
+    public static void main(String[] args) {
+        BladeApplication.run(APP_NAME, HxRocketMqApplication.class, args);
+    }
+
+}

hx-saas-project/saas-rocketmq/src/main/java/com/fjhx/config/RocketMQConfiguration.java

@@ -1,82 +0,0 @@
-//package com.fjhx.config;
-//
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.boot.context.properties.EnableConfigurationProperties;
-//import org.springframework.context.ApplicationEventPublisher;
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//
-//import javax.annotation.PostConstruct;
-//
-///**
-// * @author caozhoujun
-// * @version 1.2
-// * @date 2020/5/19
-// */
-//@Configuration
-//@EnableConfigurationProperties(RocketMQProperties.class)
-//@Slf4j
-//public class RocketMQConfiguration {
-//
-//    @Autowired
-//    private RocketMQProperties rocketMQProperties;
-//
-//    //事件监听
-//    @Autowired
-//    private ApplicationEventPublisher publisher = null;
-//
-//    /**
-//     * 容器初始化的时候 打印参数
-//     */
-//    @PostConstruct
-//    public void init() {
-//        System.out.println("--------Rocketmq初始化---------");
-//        System.err.println(rocketMQProperties.getNamesrvAddr());
-//        System.err.println(rocketMQProperties.getProducerGroupName());
-//        System.err.println(rocketMQProperties.getProducerInstanceName());
-//        System.err.println(rocketMQProperties.getProducerTranInstanceName());
-//    }
-//
-//    /**
-//     * 创建普通消息发送者实例
-//     * @return
-//     * @throws MQClientException
-//     */
-//    @Bean
-//    public DefaultMQProducer defaultProducer() throws MQClientException {
-//        DefaultMQProducer producer = new DefaultMQProducer(
-//                rocketMQProperties.getProducerGroupName());
-//        producer.setNamesrvAddr(rocketMQProperties.getNamesrvAddr());
-//        producer.setInstanceName(rocketMQProperties.getProducerInstanceName());
-//        producer.setVipChannelEnabled(false);
-//        producer.setRetryTimesWhenSendAsyncFailed(10);
-//        producer.start();
-//        log.info("rocketmq producer server is starting....");
-//        return producer;
-//    }
-//
-//    /**
-//     * 创建支持消息事务发送的实例
-//     * @return
-//     * @throws MQClientException
-//     */
-//    @Bean
-//    public TransactionMQProducer transactionProducer() throws MQClientException {
-//        TransactionMQProducer producer = new TransactionMQProducer(
-//                rocketMQProperties.getTransactionProducerGroupName());
-//        producer.setNamesrvAddr(rocketMQProperties.getNamesrvAddr());
-//        producer.setInstanceName(rocketMQProperties
-//                .getProducerTranInstanceName());
-//        producer.setRetryTimesWhenSendAsyncFailed(10);
-//        // 事务回查最小并发数
-//        producer.setCheckThreadPoolMinSize(2);
-//        // 事务回查最大并发数
-//        producer.setCheckThreadPoolMaxSize(2);
-//        // 队列数
-//        producer.setCheckRequestHoldMax(2000);
-//        producer.start();
-//        log.info("rocketmq transaction producer server is starting....");
-//        return producer;
-//    }
-//}

hx-saas-project/saas-rocketmq/src/main/java/com/fjhx/config/RocketMQProperties.java

@@ -1,33 +0,0 @@
-package com.fjhx.config;
-
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author caozhoujun
- * @version 1.2
- * @date 2020/5/19
- */
-@PropertySource("classpath:config/rocketmq.properties")
-@ConfigurationProperties(prefix = "suning.rocketmq")
-@Configuration
-@Setter
-@Getter
-@ToString
-@Accessors(chain = true)
-public class RocketMQProperties {
-    private String namesrvAddr;
-    private String producerGroupName;
-    private String transactionProducerGroupName;
-    private String producerInstanceName;
-    private String producerTranInstanceName;
-    private List<String> subscribe = new ArrayList<String>();
-}

hx-saas-project/saas-rocketmq/src/main/java/com/fjhx/config/TransactionListener.java

@@ -1,59 +0,0 @@
-//package com.fjhx.config;
-//
-//import java.util.concurrent.ConcurrentHashMap;
-//
-///**
-// * @author caozhoujun
-// * @version 1.2
-// * @date 2020/6/1
-// */
-//public class TransactionListener implements org.apache.rocketmq.client.producer.TransactionListener {
-//
-//    private ConcurrentHashMap<String,Integer> map = new ConcurrentHashMap<>();
-//    /**
-//     * 执行本地事务
-//     * @param message
-//     * @param o
-//     * @return
-//     */
-//    @Override
-//    public LocalTransactionState executeLocalTransaction(Message message, Object o) {
-//        String id = message.getTransactionId();
-//        //0:未知状态 1：执行成功  2：执行失败
-//        map.put(id,0);
-//        try {
-//            System.out.println("正在执行本地事务");
-//            Thread.sleep(5000);
-//            map.put(id,1);
-//            System.out.println("执行本地事务成功");
-//        } catch (InterruptedException e) {
-//            e.printStackTrace();
-//            map.put(id,2);
-//            System.out.println("执行本地事务失败");
-//            return LocalTransactionState.ROLLBACK_MESSAGE;
-//        }
-//        System.out.println(id);
-//        return LocalTransactionState.COMMIT_MESSAGE;
-//    }
-//
-//    /**
-//     * 执行消息回查
-//     * @param messageExt
-//     * @return
-//     */
-//    @Override
-//    public LocalTransactionState checkLocalTransaction(MessageExt messageExt) {
-//        System.out.println("执行消息回查");
-//        String id = messageExt.getTransactionId();
-//        Integer result = map.get(id);
-//        switch (result){
-//            case 0:
-//                return LocalTransactionState.UNKNOW;
-//            case 1:
-//                return LocalTransactionState.COMMIT_MESSAGE;
-//            case 2:
-//                return LocalTransactionState.ROLLBACK_MESSAGE;
-//        }
-//        return LocalTransactionState.UNKNOW;
-//    }
-//}

hx-saas-project/saas-rocketmq/src/main/java/com/fjhx/consumer/ConsumerServiceBigData.java

@@ -1,67 +0,0 @@
-//package com.quake.quake_qinxin.rocketmq.consumer;
-//
-//import com.quake.quake_qinxin.core.util.BigDataUtil;
-//import com.quake.quake_qinxin.core.util.UUIDUtil;
-//import com.quake.quake_qinxin.model.RocketmqMessageFail;
-//import com.quake.quake_qinxin.service.IRocketmqMessageFailService;
-//import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;
-//import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus;
-//import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently;
-//import org.apache.rocketmq.client.exception.MQClientException;
-//import org.apache.rocketmq.common.consumer.ConsumeFromWhere;
-//import org.apache.rocketmq.common.message.Message;
-//import org.apache.rocketmq.remoting.common.RemotingHelper;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Component;
-//
-//import java.io.UnsupportedEncodingException;
-//import java.util.Date;
-///**
-// * @author caozhoujun
-// * @version 1.2
-// * @date 2020/5/19
-// */
-//
-//@Component
-//public class ConsumerServiceBigData {
-//    @Autowired
-//    private IRocketmqMessageFailService service;
-//
-//    private DefaultMQPushConsumer consumer;
-//
-//    private String consumerGroup = "group_bigdata";
-//
-//    public ConsumerServiceBigData() throws MQClientException {
-//        consumer = new DefaultMQPushConsumer(consumerGroup);
-//        consumer.setNamesrvAddr("124.70.202.81:9876;124.70.177.208:9876;124.70.207.0:9876;124.70.188.19:9876");
-//        // 设置消费地点,从最后一个进行消费(其实就是消费策略)
-//        consumer.setConsumeFromWhere(ConsumeFromWhere.CONSUME_FROM_LAST_OFFSET);
-//        // 订阅主题的哪些标签
-//        consumer.subscribe("rocketmq_as", "data");
-//
-//        // 注册监听器
-//        consumer.registerMessageListener((MessageListenerConcurrently)
-//                (msgs, context) -> {
-//                    try {
-//                        // 获取Message
-//                        Message msg = msgs.get(0);
-//                        // 标签
-//                        String str = new String(msg.getBody(), RemotingHelper.DEFAULT_CHARSET);
-//                        String token = BigDataUtil.getHbaseToken();
-//                        String result = BigDataUtil.bigDataAddBath(str, token);
-//                        System.out.println("消费到大数据："+result);
-//                        if(result==null){
-//                            String rs = BigDataUtil.bigDataAddBath(str, token);
-//                            System.out.println("重试插入数据:"+str+"是否成功："+rs);
-//                        }
-//                        return ConsumeConcurrentlyStatus.CONSUME_SUCCESS;
-//                    } catch (UnsupportedEncodingException e) {
-//                        e.printStackTrace();
-//                        return ConsumeConcurrentlyStatus.RECONSUME_LATER;
-//                    }
-//                });
-//        consumer.start();
-//    }
-//}
-//
-//

hx-saas-project/saas-rocketmq/src/main/java/com/fjhx/consumer/ConsumerServiceERP.java

@@ -1,139 +0,0 @@
-//package com.quake.quake_qinxin.rocketmq.consumer;
-//import com.alibaba.fastjson.JSON;
-//import com.alibaba.fastjson.JSONObject;
-//import com.quake.quake_qinxin.core.util.*;
-//import com.quake.quake_qinxin.model.ESPContent;
-//import com.quake.quake_qinxin.model.ESPList;
-//import com.quake.quake_qinxin.model.SqlServerParam;
-//import com.quake.quake_qinxin.service.IRocketmqMessageService;
-//import net.sf.json.JSONArray;
-//import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;
-//import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus;
-//import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently;
-//import org.apache.rocketmq.client.exception.MQClientException;
-//import org.apache.rocketmq.common.consumer.ConsumeFromWhere;
-//import org.apache.rocketmq.common.message.Message;
-//import org.apache.rocketmq.remoting.common.RemotingHelper;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Component;
-//
-//import java.util.List;
-//
-///**
-// * @author caozhoujun
-// * @version 1.2
-// * @date 2020/6/22
-// */
-//@Component
-//public class ConsumerServiceERP {
-//
-//    @Autowired
-//    private IRocketmqMessageService service;
-//
-//    private DefaultMQPushConsumer consumer;
-//
-//    private String consumerGroup = "rocketmq_test_group_official_erp";
-//
-//
-//
-//    public ConsumerServiceERP() throws MQClientException {
-//        consumer = new DefaultMQPushConsumer(consumerGroup);
-//        consumer.setNamesrvAddr("124.70.202.81:9876;124.70.177.208:9876;124.70.207.0:9876;124.70.188.19:9876");
-//        // 设置消费地点,从最后一个进行消费(其实就是消费策略)
-//        consumer.setConsumeFromWhere(ConsumeFromWhere.CONSUME_FROM_LAST_OFFSET);
-//        // 订阅主题的哪些标签
-//        consumer.subscribe("rocketmq_erp", "erp");
-//        // 注册监听器
-//        consumer.registerMessageListener((MessageListenerConcurrently)
-//                (msgs, context) -> {
-//                    try {
-//                        // 获取Message
-//                        Message msg = msgs.get(0);
-//                        // 标签
-//                        String str = new String(msg.getBody(), RemotingHelper.DEFAULT_CHARSET);
-//                        System.out.println("消费erp数据" + str);
-//                        JSONObject jsonObject = JSONObject.parseObject(str);
-//                        String whodoesp = jsonObject.get("whodoesp").toString();
-//                        String receiveGroup = jsonObject.get("receiveGroup").toString();
-//                        JSONArray contentArray = JSONArray.fromObject(jsonObject.get("content"));
-//                        JSONArray listArray = JSONArray.fromObject(jsonObject.get("doList"));
-//                        ESPContent content = new ESPContent();
-//                        String uuid = UUIDUtil.getNum19();
-//                        for (int i = 0; i < listArray.size(); i++) {
-//                            List<List<ESPContent>> lists = StringUtil.groupList(contentArray);
-//                            System.out.println(lists);
-//                            ESPList espList = JSON.parseObject(listArray.get(i).toString(), ESPList.class);
-//                            for(List<ESPContent> espContents:lists){
-//                                System.out.println(getType(espContents));
-//                                try {
-//                                    WebsocketUtil.webSocketSendMessageByUsername(espList.getEspId(),StringUtil.toErsStr(whodoesp+"&"+uuid,espList, content, "start+"+receiveGroup));
-//                                    //WebsocketUtil.webSocketSendMessage(jsonObject.get("group").toString(), StringUtil.toErsStr(whodoesp+"&"+uuid,espList, content, "start+"+receiveGroup));
-//                                }catch (Exception e){
-//                                    System.out.println("websocket服务出现错误");
-//                                    EmailUtil.sendEmail("1164636026@qq.com","websocket服务出现错误,异常信息为："+e);
-//                                    EmailUtil.sendEmail("504178754@qq.com","websocket服务出现错误,异常信息为："+e);
-//                                }
-//                                for (int j = 0; j < espContents.size(); j++) {
-//                                    net.sf.json.JSONObject sfObject =  net.sf.json.JSONObject.fromObject(espContents.get(j));
-//                                    ESPContent espContent = (ESPContent) net.sf.json.JSONObject.toBean(sfObject, ESPContent.class);
-//                                    String param = StringUtil.toErsStr(whodoesp+"&"+uuid,espList, espContent, "");
-//                                    String result = WebsocketUtil.webSocketSendMessageByUsername(espList.getEspId(),param);
-//                                    //String result =  WebsocketUtil.webSocketSendMessage(jsonObject.get("group").toString(), param);
-//                                    System.out.println("websocket监听发送成功与否："+result+param);
-//                                    SqlServerParam p = SqlServerUtil.sqlServerParamStart(espContent,whodoesp,espList,uuid);
-//                                    try {
-//                                        SqlServerUtil.sqlServerSaveLog(JSON.toJSONString(p));
-//                                    }catch (Exception e){
-//                                        System.out.println("sqlServer服务出现错误");
-//                                        EmailUtil.sendEmail("1164636026@qq.com","sqlServer服务出现错误,异常信息为："+e);
-//                                        EmailUtil.sendEmail("504178754@qq.com","sqlServer服务出现错误,异常信息为："+e);
-//                                    }
-//                                    Thread.sleep(150);
-//                                }
-//                                WebsocketUtil.webSocketSendMessageByUsername(espList.getEspId(), StringUtil.toErsStr(whodoesp+"&"+uuid,espList, content, "end"));
-//                                //WebsocketUtil.webSocketSendMessage(jsonObject.get("group").toString(), StringUtil.toErsStr(whodoesp+"&"+uuid,espList, content, "end"));
-//                                Thread.sleep(200);
-//                            }
-////                            for (int j = 0; j < contentArray.size(); j++) {
-////                                ESPContent espContent = JSON.parseObject(contentArray.get(j).toString(), ESPContent.class);
-////                                String param = StringUtil.toErsStr(whodoesp+"&"+uuid,espList, espContent, "");
-////                                String result =  WebsocketUtil.webSocketSendMessage(jsonObject.get("group").toString(), param);
-////                                System.out.println("websocket监听发送成功与否："+result);
-////                                SqlServerParam p = SqlServerUtil.sqlServerParamStart(espContent,whodoesp,espList,uuid);
-////                                try {
-////                                    SqlServerUtil.sqlServerSaveLog(JSON.toJSONString(p));
-////                                }catch (Exception e){
-////                                    System.out.println("sqlServer服务出现错误");
-////                                    EmailUtil.sendEmail("1164636026@qq.com","sqlServer服务出现错误,异常信息为："+e);
-////                                    EmailUtil.sendEmail("504178754@qq.com","sqlServer服务出现错误,异常信息为："+e);
-////                                }
-////                                Thread.sleep(150);
-////                            }
-////                            WebsocketUtil.webSocketSendMessage(jsonObject.get("group").toString(), StringUtil.toErsStr(whodoesp+"&"+uuid,espList, content, "end"));
-//                        }
-//                        return ConsumeConcurrentlyStatus.CONSUME_SUCCESS;
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                        return ConsumeConcurrentlyStatus.CONSUME_SUCCESS;
-//                    }
-//
-//                });
-//        consumer.start();
-//    }
-//
-//    /**
-//     * 获取数据类型
-//     * @param object
-//     * @return
-//     */
-//    public static String getType(Object object){
-//        String typeName=object.getClass().getName();
-//        int length= typeName.lastIndexOf(".");
-//        String type =typeName.substring(length+1);
-//        return type;
-//    }
-//    public static void main(String[] args) {
-//        int a = 0;
-//        System.out.println(getType(a));
-//    }
-//}

hx-saas-project/saas-rocketmq/src/main/java/com/fjhx/consumer/ConsumerServiceMysql.java

@@ -1,96 +0,0 @@
-//package com.quake.quake_qinxin.rocketmq.consumer;
-//
-//import com.alibaba.fastjson.JSONObject;
-//import com.quake.quake_qinxin.core.util.UUIDUtil;
-//import com.quake.quake_qinxin.model.MysqlUtilModel;
-//import com.quake.quake_qinxin.service.IMysqlUtilModelService;
-//import net.sf.json.JSONArray;
-//import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;
-//import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus;
-//import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently;
-//import org.apache.rocketmq.client.exception.MQClientException;
-//import org.apache.rocketmq.common.consumer.ConsumeFromWhere;
-//import org.apache.rocketmq.common.message.Message;
-//import org.apache.rocketmq.remoting.common.RemotingHelper;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Component;
-//
-//import java.io.UnsupportedEncodingException;
-//import java.util.*;
-//
-///**
-// * @author caozhoujun
-// * @version 1.2
-// * @date 2020/6/22
-// */
-//@Component
-//public class ConsumerServiceMysql {
-//
-//    @Autowired
-//    private IMysqlUtilModelService service;
-//
-//    private DefaultMQPushConsumer consumer;
-//
-//    private String consumerGroup = "group_mysql";
-//
-//    /**
-//     * 消费
-//     * @throws MQClientException
-//     */
-//    public ConsumerServiceMysql() throws MQClientException {
-//        consumer = new DefaultMQPushConsumer(consumerGroup);
-//        consumer.setNamesrvAddr("124.70.202.81:9876;124.70.177.208:9876;124.70.207.0:9876;124.70.188.19:9876");
-//        // 设置消费地点,从最后一个进行消费(其实就是消费策略)
-//        consumer.setConsumeFromWhere(ConsumeFromWhere.CONSUME_FROM_LAST_OFFSET);
-//        // 订阅主题的哪些标签
-//        consumer.subscribe("rocketmq_as", "data");
-//        // 注册监听器
-//        consumer.registerMessageListener((MessageListenerConcurrently)
-//                (msgs, context) -> {
-//                    try {
-//                        // 获取Message
-//                        Message msg = msgs.get(0);
-//                        // 标签
-//                        String str = new String(msg.getBody(), RemotingHelper.DEFAULT_CHARSET);
-//                        JSONObject jsonObject = JSONObject.parseObject(str);
-//                        JSONArray array = JSONArray.fromObject(jsonObject.get("data"));
-//                        List<MysqlUtilModel> list = new ArrayList<>();
-//                        for (int i = 0; i <array.size(); i++) {
-//                            MysqlUtilModel mysqlUtilModel = new MysqlUtilModel();
-//                            mysqlUtilModel.setBody(array.get(i).toString());
-//                            mysqlUtilModel.setUuid(UUIDUtil.getNum19());
-//                            mysqlUtilModel.setCtime(new Date());
-//                            list.add(mysqlUtilModel);
-//                        }
-//                        insertPMeSendToPhoneInfo(list,jsonObject.get("table").toString());
-//                        return ConsumeConcurrentlyStatus.CONSUME_SUCCESS;
-//                    } catch (UnsupportedEncodingException e) {
-//                        e.printStackTrace();
-//                        return ConsumeConcurrentlyStatus.RECONSUME_LATER;
-//                    }
-//                });
-//        consumer.start();
-//    }
-//
-//    private static final int OPENID_PHONE_NUM = 800; //经实践，800一批插入相对较快，这个可以随便定义
-//    private void insertPMeSendToPhoneInfo(List<MysqlUtilModel> phoneList, String table){
-//        List<List<MysqlUtilModel>> ss = new ArrayList<>();
-//        int listSize=phoneList.size();
-//        int toIndex=OPENID_PHONE_NUM;
-//        for(int i = 0;i<phoneList.size();i+=OPENID_PHONE_NUM){
-//            if(i+OPENID_PHONE_NUM>listSize){//作用为toIndex最后没有800条数据则剩余几条newList中就装几条
-//                toIndex=listSize-i;
-//            }
-//            List<MysqlUtilModel> newPMeSendToPhoneInfo = phoneList.subList(i,i+toIndex);
-//            //批量插入
-//            try {
-//                Map<String,Object> map = new HashMap<>();
-//                map.put("list",newPMeSendToPhoneInfo);
-//                map.put("table",table);
-//                service.saveBatch(map);
-//            }catch (Exception e){
-//                System.out.println(newPMeSendToPhoneInfo);
-//            }
-//        }
-//    }
-//}

hx-saas-project/saas-rocketmq/src/main/java/com/fjhx/producer/ProducerController.java

@@ -1,187 +0,0 @@
-//package com.quake.quake_qinxin.rocketmq.producer;
-//
-//import com.alibaba.fastjson.JSONObject;
-//import com.quake.quake_qinxin.config.target.LoginToken;
-//import com.quake.quake_qinxin.core.http.HttpResult;
-//import com.quake.quake_qinxin.core.util.EmailUtil;
-//import com.quake.quake_qinxin.core.util.UUIDUtil;
-//import com.quake.quake_qinxin.rocketmq.config.RocketMQProperties;
-//import org.apache.rocketmq.client.exception.MQClientException;
-//import org.apache.rocketmq.client.producer.*;
-//import org.apache.rocketmq.common.message.Message;
-//import org.apache.rocketmq.common.message.MessageQueue;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.web.bind.annotation.PostMapping;
-//import org.springframework.web.bind.annotation.RequestBody;
-//import org.springframework.web.bind.annotation.RestController;
-//import java.util.List;
-//import java.util.concurrent.*;
-//
-///**
-// * @author caozhoujun
-// * @version 1.2
-// * @date 2020/5/19
-// */
-//@RestController
-//public class ProducerController {
-//    @Autowired
-//    private DefaultMQProducer defaultProducer;
-//
-//    @Autowired
-//    private RocketMQProperties rocketMQProperties;
-//
-//    private static final String TOPIC="rocketmq_test";
-//    private static final String TAG="rocketmq_official";
-//
-//    /**
-//     * 同步发送消息
-//     */
-//    @LoginToken
-//    @PostMapping("/sendSyncMessage")
-//    private  HttpResult sync(@RequestBody JSONObject map) throws Exception {
-//        if(!map.get("topic").toString().contains("rocketmq_erp")){
-//            if(!map.get("msg").toString().contains("table")||map.get("msg").toString()==null||"".equals(map.get("msg").toString())){
-//                return HttpResult.ok(1401,"消息格式有误","fail");
-//            }
-//        }
-//        try {
-//            //创建消息
-//            Message msg = new Message();
-//            msg.setTopic(map.get("topic").toString());
-//            msg.setTags(map.get("tag").toString());
-//            msg.setKeys(String.valueOf(UUIDUtil.getUUID()));
-//            msg.setBody(JSONObject.toJSONBytes(map.get("msg")));
-//            if(map.containsKey("level")){
-//                msg.setDelayTimeLevel(Integer.parseInt(map.get("level").toString()));
-//            }
-//            //同步发送消息
-//            SendResult result = defaultProducer.send(msg);
-//            if(result.toString().contains("SEND_OK")){
-//                return HttpResult.ok(1500,"success","发送成功",result);
-//            }
-//        }catch (Exception e){
-//            EmailUtil.sendEmail("1164636026@qq.com","rq服务出现错误,异常信息为："+e);
-//            EmailUtil.sendEmail("504178754@qq.com","rq服务出现错误,异常信息为："+e);
-//            e.printStackTrace();
-//            Thread.sleep(1000);
-//        }
-//      return HttpResult.error(1401,"fail","发送失败");
-//    }
-//    /**
-//     * 异步发送消息
-//     */
-//    @LoginToken
-//    @PostMapping("/sendAsyncMessage")
-//    private  HttpResult async(@RequestBody JSONObject map) throws Exception {
-//        if(!map.get("topic").toString().contains("rocketmq_erp")){
-//            if(!map.get("msg").toString().contains("table")||map.get("msg").toString()==null||"".equals(map.get("msg").toString())){
-//                return HttpResult.ok(1401,"消息格式有误","fail");
-//            }
-//        }
-//        //创建消息
-//        Message message = new Message(map.get("topic").toString(),map.get("tag").toString(),String.valueOf(UUIDUtil.getUUID()),JSONObject.toJSONBytes(map.get("msg")));
-//        //异步发送消息
-//        defaultProducer.send(message, new SendCallback() {
-//            @Override
-//            public void onSuccess(SendResult sendResult) {
-//                System.out.println("异步发送消息："+sendResult);
-//            }
-//            @Override
-//            public void onException(Throwable e) {
-//                e.printStackTrace();
-//                //补偿机制，根据业务情况进行使用，看是否进行重试
-//                try {
-//                    defaultProducer.setRetryTimesWhenSendFailed(5);
-//                    defaultProducer.send(message,5000L);
-//                } catch (Exception ex) {
-//                    ex.printStackTrace();
-//                }
-//            }
-//        });
-//        return HttpResult.ok(1500,"success","成功");
-//    }
-//    /**
-//     * 单项发送消息
-//     */
-//    @LoginToken
-//    @PostMapping("/sendOneWayMessage")
-//    private  HttpResult oneWay(@RequestBody JSONObject map) throws Exception {
-//        if(!map.get("topic").toString().contains("rocketmq_erp")){
-//            if(!map.get("msg").toString().contains("table")||map.get("msg").toString()==null||"".equals(map.get("msg").toString())){
-//                return HttpResult.ok(1401,"消息格式有误","fail");
-//            }
-//        }
-//        //创建消息
-//        Message message = new Message(map.get("topic").toString(),map.get("tag").toString(),String.valueOf(UUIDUtil.getUUID()),JSONObject.toJSONBytes(map.get("msg")));
-//        //同步发送消息
-//        defaultProducer.sendOneway(message);
-//        return HttpResult.ok(1500,"success","成功");
-//    }
-//    /**
-//     * 发送事务消息，暂时没有优化
-//     * @return
-//     */
-//    @LoginToken
-//    @PostMapping("/sendTransactionMess")
-//    public HttpResult sendTransactionMsg(@RequestBody JSONObject map) throws MQClientException {
-//        if(!map.get("topic").toString().contains("rocketmq_erp")){
-//            if(!map.get("msg").toString().contains("table")||map.get("msg").toString()==null||"".equals(map.get("msg").toString())){
-//                return HttpResult.ok(1401,"消息格式有误","fail");
-//            }
-//        }
-//        TransactionMQProducer producer = new TransactionMQProducer(rocketMQProperties.getTransactionProducerGroupName());
-//        producer.setNamesrvAddr(rocketMQProperties.getNamesrvAddr());
-//        TransactionListener transactionListener = new com.quake.quake_qinxin.rocketmq.config.TransactionListener();
-//        producer.setTransactionListener(transactionListener);
-//        producer.start();
-//        ExecutorService executorService = new ThreadPoolExecutor(
-//                2,
-//                5,
-//                100,
-//                TimeUnit.SECONDS,
-//                new ArrayBlockingQueue<Runnable>(
-//                        2000),
-//                        new ThreadFactory(){
-//                            @Override
-//                            public Thread newThread(Runnable runnable){
-//                                Thread thread = new Thread();
-//                                thread.setName("cliend-transaction-msg-check-thread");
-//                                return thread;
-//                            }
-//                        }
-//                );
-//        producer.setExecutorService(executorService);
-//        Message message = new Message(map.get("tag").toString(),map.get("topic").toString(),String.valueOf(UUIDUtil.getUUID()),JSONObject.toJSONBytes(map.get("msg")));
-//        SendResult result = producer.sendMessageInTransaction(message,"hello!");
-//        producer.shutdown();
-//        return HttpResult.ok(1500,"success","成功",result);
-//    }
-//
-//    /**
-//     * 支持顺序发送消息
-//     */
-//    @LoginToken
-//    @PostMapping("/sendMessOrder")
-//    public HttpResult sendMsgOrder(@RequestBody JSONObject map) {
-//        SendResult result=null;
-//        if(!map.get("topic").toString().contains("rocketmq_erp")){
-//            if(!map.get("msg").toString().contains("table")||map.get("msg").toString()==null||"".equals(map.get("msg").toString())){
-//                return HttpResult.ok(1401,"消息格式有误","fail");
-//            }
-//        }
-//        Message message = new Message( map.get("topic").toString(),map.get("tag").toString(),String.valueOf(UUIDUtil.getUUID()), JSONObject.toJSONBytes(map.get("msg")));
-//        try{
-//             result = defaultProducer.send(message, new MessageQueueSelector() {
-//                @Override
-//                public MessageQueue select(List<MessageQueue> mqs, Message msg, Object arg) {
-//                    int index = ((Integer) arg) % mqs.size();
-//                    return mqs.get(index);
-//                }
-//            },1);
-//        }
-//        catch (Exception e){
-//            e.printStackTrace();
-//        }
-//        return HttpResult.ok(1500,"success","成功",result);
-//    }
-//}

hx-saas-project/saas-rocketmq/src/main/resources/application-dev.yml

@@ -0,0 +1,13 @@
+# 服务器端口
+server:
+  port: 8301
+logging:
+  level:
+    org.springframework.data.mongodb.core: DEBUG
+# 数据源配置
+spring:
+  # 数据库
+  datasource:
+    url: ${blade.datasource.storage.dev.url}
+    username: ${blade.datasource.storage.dev.username}
+    password: ${blade.datasource.storage.dev.password}

hx-saas-project/saas-rocketmq/src/main/resources/application-prod.yml

@@ -0,0 +1,12 @@
+# 服务器端口
+server:
+  port: 8301
+
+# 数据源配置
+spring:
+  # 数据库
+  datasource:
+    url: ${blade.datasource.storage.prod.url}
+    username: ${blade.datasource.storage.prod.username}
+    password: ${blade.datasource.storage.prod.password}
+

hx-saas-project/saas-rocketmq/src/main/resources/application-test.yml

@@ -0,0 +1,11 @@
+# 服务器端口
+server:
+  port: 8301
+
+# 数据源配置
+spring:
+  # 数据库
+  datasource:
+    url: ${blade.datasource.storage.test.url}
+    username: ${blade.datasource.storage.test.username}
+    password: ${blade.datasource.storage.test.password}

hx-saas-project/saas-rocketmq/src/main/resources/rocketmq.properties

@@ -1,10 +0,0 @@
-
-hx.rocketmq.namesrvAddr=124.70.202.81:9876;124.70.177.208:9876;124.70.207.0:9876;124.70.188.19:9876
-
-hx.rocketmq.producerGroupName=user_group_p
-
-hx.rocketmq.transactionProducerGroupName=order_transaction
-
-hx.rocketmq.producerInstanceName=user_producer_instance
-
-hx.rocketmq.producerTranInstanceName=user_producer_transacition

hx-saas-project/saas-storage/pom.xml

@@ -5,15 +5,65 @@
     <parent>
         <artifactId>hx-saas-project</artifactId>
         <groupId>com.fjhx</groupId>
-        <version>3.2.0</version>
+        <version>2.8.2.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <groupId>com.fjhx</groupId>
     <artifactId>saas-storage</artifactId>
-    <description>saas 仓管</description>
+    <name>${project.artifactId}</name>
+    <version>2.8.2.RELEASE</version>
     <packaging>jar</packaging>
-    <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-    </properties>
-</project>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-core-boot</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-excel</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <configuration>
+                    <username>${docker.username}</username>
+                    <password>${docker.password}</password>
+                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
+                    <tag>${project.version}</tag>
+                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
+                    <buildArgs>
+                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
+                    </buildArgs>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+
+                <configuration>
+                    <includeSystemScope>true</includeSystemScope>
+                    <mainClass>com.fjhx.HxStorageApplication</mainClass>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

hx-saas-project/saas-storage/src/main/java/com/fjhx/HxStorageApplication.java

@@ -1,15 +1,23 @@
 package com.fjhx;
 
+import org.springblade.core.cloud.feign.EnableBladeFeign;
 import org.springblade.core.launch.BladeApplication;
-import org.springframework.cloud.client.SpringCloudApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.scheduling.annotation.EnableAsync;
 
 /**
- * 杰生模块启动器
+ * 仓管模块启动器
  */
-@SpringCloudApplication
+@EnableAsync
+@EnableBladeFeign
+@EnableDiscoveryClient
+@EnableCircuitBreaker
+@SpringBootApplication
 public class HxStorageApplication {
 
-    private static final String APP_NAME = "storage";
+    private static final String APP_NAME = "hx-storage";
 
     public static void main(String[] args) {
         BladeApplication.run(APP_NAME, HxStorageApplication.class, args);