新增模块

hx-saas-project/pom.xml

@@ -0,0 +1,116 @@
+<?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>fjhx-cloud</artifactId>
+        <groupId>com.fjhx</groupId>
+        <version>3.2.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>hx-saas-project</artifactId>
+    <packaging>pom</packaging>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+
+        <bladex.version>2.8.2.RELEASE</bladex.version>
+        <hx.version>3.2.0</hx.version>
+    </properties>
+
+    <modules>
+        <module>saas-storage</module>
+    </modules>
+
+    <dependencyManagement>
+
+        <dependencies>
+
+            <!-- blade -->
+            <dependency>
+                <groupId>org.springblade.platform</groupId>
+                <artifactId>blade-bom</artifactId>
+                <version>${bladex.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>com.fjhx</groupId>
+                <artifactId>hx-tool</artifactId>
+                <version>${hx.version}</version>
+            </dependency>
+
+            <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>
+            </dependency>
+
+            <dependency>
+                <groupId>com.fjhx</groupId>
+                <artifactId>storage-api</artifactId>
+                <version>${hx.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.fjhx</groupId>
+                <artifactId>service-file-api</artifactId>
+                <version>${hx.version}</version>
+            </dependency>
+
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-tool</artifactId>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+            </resource>
+        </resources>
+        <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>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

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

@@ -0,0 +1,37 @@
+<?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>hx-saas-project</artifactId>
+        <groupId>com.fjhx</groupId>
+        <version>3.2.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>storage</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-tool</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>storage-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-tenant</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>

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

@@ -0,0 +1,18 @@
+package com.fjhx;
+
+import org.springblade.core.launch.BladeApplication;
+import org.springframework.cloud.client.SpringCloudApplication;
+
+/**
+ * 杰生模块启动器
+ */
+@SpringCloudApplication
+public class HxStorageApplication {
+
+    private static final String APP_NAME = "storage";
+
+    public static void main(String[] args) {
+        BladeApplication.run(APP_NAME, HxStorageApplication.class, args);
+    }
+
+}

hx-saas-project/saas-storage/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-storage/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-storage/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-service/storage/src/main/java/com/fjhx/purchase/service/impl/PurchaseContractServiceImpl.java

@@ -1,11 +1,8 @@
 package com.fjhx.purchase.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.utils.DateUtil;
 import com.fjhx.utils.ListUtil;
-import com.fjhx.utils.WrapperUtil;
 import com.fjhx.entity.purchase.PurchaseContract;
 import com.fjhx.purchase.mapper.PurchaseContractMapper;
 import com.fjhx.purchase.service.PurchaseContractService;

pom.xml

@@ -12,6 +12,7 @@
         <module>bladex</module>
         <module>bladex-tool</module>
         <module>hx-common</module>
+        <module>hx-saas-project</module>
         <module>hx-service</module>
         <module>hx-service-api</module>
     </modules>