调整 Maven 项目组织结构，为本项目设置父模块 io.github.entropy-cloud:nop-extensions 以便于做整体构建并新增其他扩展模块；将 ReportDemoBizModel 提取到独立的 nop-demo 子模块中，并以依赖形式引入到 nop-solon 等模块的演示中，从而实现代码复用，避免重复 copy 文件；

Author: flytreeleft

nop-demo/pom.xml

@@ -0,0 +1,33 @@
+<?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">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>io.github.entropy-cloud</groupId>
+        <artifactId>nop-extensions</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <groupId>io.github.entropy-cloud.extensions</groupId>
+    <artifactId>nop-demo</artifactId>
+
+    <dependencies>
+        <!-- 引入报表服务 -->
+        <dependency>
+            <groupId>io.github.entropy-cloud</groupId>
+            <artifactId>nop-report-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.github.entropy-cloud</groupId>
+            <artifactId>nop-report-service</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.github.entropy-cloud</groupId>
+            <artifactId>nop-report-web</artifactId>
+        </dependency>
+    </dependencies>
+</project>

nop-solon/nop-solon-demo/src/main/java/io/nop/solon/demo/biz/ReportDemoBizModel.java nop-demo/src/main/java/io/nop/extensions/demo/biz/ReportDemoBizModel.java

@@ -5,7 +5,7 @@
  * Gitee:  https://gitee.com/canonical-entropy/nop-entropy
  * Github: https://github.com/entropy-cloud/nop-entropy
  */
-package io.nop.solon.demo.biz;
+package io.nop.extensions.demo.biz;
 
 import io.nop.api.core.annotations.biz.BizModel;
 import io.nop.api.core.annotations.biz.BizQuery;

nop-solon/nop-solon-demo/src/main/resources/_vfs/nop/demo/_module nop-demo/src/main/resources/_vfs/nop/demo/_module

@@ -5,5 +5,5 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
         http://www.springframework.org/schema/beans/spring-beans-2.5.xsd" xmlns:ioc="ioc">
-    <bean id="io.nop.solon.demo.biz.ReportDemoBizModel" ioc:type="@bean:id" />
-</beans>
+    <bean id="io.nop.extensions.demo.biz.ReportDemoBizModel" ioc:type="@bean:id" />
+</beans>

nop-solon/nop-solon-demo/src/main/resources/_vfs/nop/demo/app.action-auth.xml nop-demo/src/main/resources/_vfs/nop/demo/app.action-auth.xml

@@ -6,7 +6,8 @@
     <parent>
         <groupId>io.github.entropy-cloud.extensions</groupId>
         <artifactId>nop-solon</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>nop-solon-demo</artifactId>
@@ -16,13 +17,16 @@
         <dependency>
             <groupId>org.noear</groupId>
             <artifactId>solon-api</artifactId>
-            <version>${solon.version}</version>
         </dependency>
 
         <dependency>
             <groupId>io.github.entropy-cloud.extensions</groupId>
             <artifactId>nop-solon-plugin</artifactId>
-            <version>1.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>io.github.entropy-cloud.extensions</groupId>
+            <artifactId>nop-demo</artifactId>
         </dependency>
 
         <!-- 以下所有包都是可选的 -->
@@ -146,4 +150,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>

nop-solon/nop-solon-demo/src/main/resources/_vfs/nop/demo/app.data-auth.xml nop-demo/src/main/resources/_vfs/nop/demo/app.data-auth.xml

@@ -6,7 +6,8 @@
     <parent>
         <groupId>io.github.entropy-cloud.extensions</groupId>
         <artifactId>nop-solon</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>nop-solon-plugin</artifactId>
@@ -15,7 +16,6 @@
         <dependency>
             <groupId>org.noear</groupId>
             <artifactId>solon.web.staticfiles</artifactId>
-            <version>${solon.version}</version>
         </dependency>
 
         <dependency>
@@ -49,4 +49,4 @@
         </dependency>
 
     </dependencies>
-</project>
+</project>

nop-solon/nop-solon-service-demo/src/main/resources/demo/beans/app-demo.beans.xml nop-demo/src/main/resources/_vfs/nop/demo/beans/app-demo.beans.xml

@@ -6,7 +6,8 @@
     <parent>
         <groupId>io.github.entropy-cloud.extensions</groupId>
         <artifactId>nop-solon</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>nop-solon-service-demo</artifactId>
@@ -15,13 +16,11 @@
         <dependency>
             <groupId>org.noear</groupId>
             <artifactId>solon-api</artifactId>
-            <version>${solon.version}</version>
         </dependency>
 
         <dependency>
             <groupId>io.github.entropy-cloud.extensions</groupId>
             <artifactId>nop-solon-plugin</artifactId>
-            <version>1.0-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <artifactId>antlr4</artifactId>
@@ -30,6 +29,11 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>io.github.entropy-cloud.extensions</groupId>
+            <artifactId>nop-demo</artifactId>
+        </dependency>
+
         <!-- 以下所有包都是可选的 -->
 
         <dependency>
@@ -112,4 +116,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>