Merge pull request #464 from sofastack/youji-dev

format service samples
sofastack · Jan 11, 2024 · bd5a950 · bd5a950
2 parents 2614f26 + 39518ca
commit bd5a950
Show file tree

Hide file tree

Showing 45 changed files with 50 additions and 46 deletions.
diff --git a/samples/springboot-samples/pom.xml b/samples/springboot-samples/pom.xml
@@ -38,9 +38,9 @@
         <module>web/tomcat</module>
         <module>web/webflux/base</module>
         <module>web/webflux/biz</module>
-        <module>service/sample-service-base</module>
-        <module>service/sample-service-biz</module>
-        <module>service/sample-service-biz2</module>
+        <module>service/base</module>
+        <module>service/biz1</module>
+        <module>service/biz2</module>
         <module>slimming/log4j2</module>
         <module>msg/kafka/base</module>
         <module>msg/kafka/biz1</module>

diff --git a/samples/springboot-samples/service/README.md b/samples/springboot-samples/service/README.md
@@ -112,11 +112,11 @@ curl http://localhost:8080
 
 #### 验证模块调用基座
 
-访问 biz 的 web 服务
+访问 biz1 的 web 服务
 ```shell
-curl http://localhost:8080/biz/
+curl http://localhost:8080/biz1/
 ```
-返回 `hello to ark dynamic deploy`
+返回 `hello to ark biz1 dynamic deploy`
 
 且日志里能看到对基座base的调用都是成功的，证明模块通过 @AutowiredFromBase 或者 SpringServiceFinder.getBaseService() 方式调用基座是成功的
 
@@ -126,11 +126,11 @@ curl http://localhost:8080/biz/
 ```shell
 curl http://localhost:8080/biz2/
 ```
-返回 `hello to ark2 dynamic deploy`
+返回 `hello to ark biz2 dynamic deploy`
 
 且日志里能看到对模块biz的调用都是成功的，证明模块通过 @AutowiredFromBiz 或者 SpringServiceFinder.getModuleService 方式调用模块biz是成功的
 
 ## 注意事项
 这里主要使用简单应用做验证，如果复杂应用，需要注意模块做好瘦身，基座有的依赖，模块尽可能设置成 provided，尽可能使用基座的依赖。
-这里验证模块功能时，web接口后需要加上斜号，例如curl http://localhost:8080/biz/ ，而不是 http://localhost:8080/biz
+这里验证模块功能时，web接口后需要加上斜号，例如curl http://localhost:8080/biz1/ ，而不是 http://localhost:8080/biz1
 
diff --git a/...ample-service-base/base-bootstrap/pom.xml → ...mples/service/base/base-bootstrap/pom.xml b/...ample-service-base/base-bootstrap/pom.xml → ...mples/service/base/base-bootstrap/pom.xml
@@ -3,7 +3,7 @@
          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>sample-service-base</artifactId>
+        <artifactId>base</artifactId>
         <groupId>com.alipay.sofa.service</groupId>
         <version>0.0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
@@ -41,7 +41,7 @@
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa.service</groupId>
-            <artifactId>biz-facade</artifactId>
+            <artifactId>biz1-facade</artifactId>
         </dependency>
 
         <dependency>

diff --git a/...com/alipay/sofa/base/BaseApplication.java → ...com/alipay/sofa/base/BaseApplication.java b/...com/alipay/sofa/base/BaseApplication.java → ...com/alipay/sofa/base/BaseApplication.java
diff --git a/.../java/com/alipay/sofa/base/EnvClient.java → .../java/com/alipay/sofa/base/EnvClient.java b/.../java/com/alipay/sofa/base/EnvClient.java → .../java/com/alipay/sofa/base/EnvClient.java
diff --git a/...alipay/sofa/base/impl/AppServiceImpl.java → ...alipay/sofa/base/impl/AppServiceImpl.java b/...alipay/sofa/base/impl/AppServiceImpl.java → ...alipay/sofa/base/impl/AppServiceImpl.java
diff --git a/...pay/sofa/base/impl/SampleServiceImpl.java → ...pay/sofa/base/impl/SampleServiceImpl.java b/...pay/sofa/base/impl/SampleServiceImpl.java → ...pay/sofa/base/impl/SampleServiceImpl.java
diff --git a/.../sofa/base/impl/SampleServiceImplNew.java → .../sofa/base/impl/SampleServiceImplNew.java b/.../sofa/base/impl/SampleServiceImplNew.java → .../sofa/base/impl/SampleServiceImplNew.java
diff --git a/...ipay/sofa/base/rest/SampleController.java → ...ipay/sofa/base/rest/SampleController.java b/...ipay/sofa/base/rest/SampleController.java → ...ipay/sofa/base/rest/SampleController.java
diff --git a/.../springboot-samples/service/base/base-bootstrap/src/main/resources/application.properties b/.../springboot-samples/service/base/base-bootstrap/src/main/resources/application.properties
@@ -0,0 +1,3 @@
+spring.application.name=base
+logging.file.path=./service/logs/
+logging.path=./service/logs/
diff --git a/...e/sample-service-base/base-facade/pom.xml → ...-samples/service/base/base-facade/pom.xml b/...e/sample-service-base/base-facade/pom.xml → ...-samples/service/base/base-facade/pom.xml
@@ -3,7 +3,7 @@
          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>sample-service-base</artifactId>
+        <artifactId>base</artifactId>
         <groupId>com.alipay.sofa.service</groupId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
@@ -16,4 +16,4 @@
         <maven.compiler.target>8</maven.compiler.target>
     </properties>
 
-</project>
+</project>
diff --git a/...m/alipay/sofa/base/facade/AppService.java → ...m/alipay/sofa/base/facade/AppService.java b/...m/alipay/sofa/base/facade/AppService.java → ...m/alipay/sofa/base/facade/AppService.java
diff --git a/...lipay/sofa/base/facade/SampleService.java → ...lipay/sofa/base/facade/SampleService.java b/...lipay/sofa/base/facade/SampleService.java → ...lipay/sofa/base/facade/SampleService.java
diff --git a/...mples/service/sample-service-base/pom.xml → ...s/springboot-samples/service/base/pom.xml b/...mples/service/sample-service-base/pom.xml → ...s/springboot-samples/service/base/pom.xml
@@ -14,7 +14,7 @@
 		<relativePath>../../pom.xml</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.alipay.sofa.service</groupId>
-	<artifactId>sample-service-base</artifactId>
+	<artifactId>base</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>sample-service-base</name>
 	<description>sample-service-base</description>
@@ -34,7 +34,7 @@
 			</dependency>
 			<dependency>
 				<groupId>com.alipay.sofa.service</groupId>
-				<artifactId>biz-facade</artifactId>
+				<artifactId>biz1-facade</artifactId>
 				<version>0.0.1-SNAPSHOT</version>
 			</dependency>
 		</dependencies>

diff --git a/.../sample-service-biz/biz-bootstrap/pom.xml → ...mples/service/biz1/biz1-bootstrap/pom.xml b/.../sample-service-biz/biz-bootstrap/pom.xml → ...mples/service/biz1/biz1-bootstrap/pom.xml
@@ -3,13 +3,13 @@
          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>sample-service-biz</artifactId>
+        <artifactId>biz1</artifactId>
         <groupId>com.alipay.sofa.service</groupId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>biz-bootstrap</artifactId>
+    <artifactId>biz1-bootstrap</artifactId>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -19,7 +19,7 @@
     <dependencies>
         <dependency>
             <groupId>com.alipay.sofa.service</groupId>
-            <artifactId>biz-facade</artifactId>
+            <artifactId>biz1-facade</artifactId>
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa.service</groupId>
@@ -72,13 +72,13 @@
                 <configuration>
                     <skipArkExecutable>true</skipArkExecutable>
                     <outputDirectory>target</outputDirectory>
-                    <bizName>biz</bizName>
+                    <bizName>biz1</bizName>
                     <!-- 单host下需更换 web context path -->
-                    <webContextPath>biz</webContextPath>
+                    <webContextPath>biz1</webContextPath>
                     <declaredMode>true</declaredMode>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 
-</project>
+</project>
diff --git a/...a/com/alipay/sofa/biz/BizApplication.java → ...a/com/alipay/sofa/biz/BizApplication.java b/...a/com/alipay/sofa/biz/BizApplication.java → ...a/com/alipay/sofa/biz/BizApplication.java
diff --git a/.../java/com/alipay/sofa/biz/TestClient.java → .../java/com/alipay/sofa/biz/TestClient.java b/.../java/com/alipay/sofa/biz/TestClient.java → .../java/com/alipay/sofa/biz/TestClient.java
diff --git a/...lipay/sofa/biz/rest/SampleController.java → ...lipay/sofa/biz/rest/SampleController.java b/...lipay/sofa/biz/rest/SampleController.java → ...lipay/sofa/biz/rest/SampleController.java
@@ -56,6 +56,6 @@ public String hello() {
             System.out.println(result1);
         }
 
-        return "hello to ark dynamic deploy";
+        return "hello to ark biz1 dynamic deploy";
     }
 }
diff --git a/...pay/sofa/biz/service/StudentProvider.java → ...pay/sofa/biz/service/StudentProvider.java b/...pay/sofa/biz/service/StudentProvider.java → ...pay/sofa/biz/service/StudentProvider.java
diff --git a/...pay/sofa/biz/service/TeacherProvider.java → ...pay/sofa/biz/service/TeacherProvider.java b/...pay/sofa/biz/service/TeacherProvider.java → ...pay/sofa/biz/service/TeacherProvider.java
diff --git a/.../springboot-samples/service/biz1/biz1-bootstrap/src/main/resources/application.properties b/.../springboot-samples/service/biz1/biz1-bootstrap/src/main/resources/application.properties
@@ -0,0 +1,3 @@
+spring.application.name=biz
+logging.file.path=./service/logs/
+logging.path=./service/logs/
diff --git a/...ice/sample-service-biz/biz-facade/pom.xml → ...-samples/service/biz1/biz1-facade/pom.xml b/...ice/sample-service-biz/biz-facade/pom.xml → ...-samples/service/biz1/biz1-facade/pom.xml
@@ -3,17 +3,17 @@
          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>sample-service-biz</artifactId>
+        <artifactId>biz1</artifactId>
         <groupId>com.alipay.sofa.service</groupId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>biz-facade</artifactId>
+    <artifactId>biz1-facade</artifactId>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
     </properties>
 
-</project>
+</project>
diff --git a/...ava/com/alipay/sofa/biz/facade/Param.java → ...ava/com/alipay/sofa/biz/facade/Param.java b/...ava/com/alipay/sofa/biz/facade/Param.java → ...ava/com/alipay/sofa/biz/facade/Param.java
diff --git a/...va/com/alipay/sofa/biz/facade/People.java → ...va/com/alipay/sofa/biz/facade/People.java b/...va/com/alipay/sofa/biz/facade/People.java → ...va/com/alipay/sofa/biz/facade/People.java
diff --git a/.../com/alipay/sofa/biz/facade/Provider.java → .../com/alipay/sofa/biz/facade/Provider.java b/.../com/alipay/sofa/biz/facade/Provider.java → .../com/alipay/sofa/biz/facade/Provider.java
diff --git a/...va/com/alipay/sofa/biz/facade/Result.java → ...va/com/alipay/sofa/biz/facade/Result.java b/...va/com/alipay/sofa/biz/facade/Result.java → ...va/com/alipay/sofa/biz/facade/Result.java
diff --git a/...a/com/alipay/sofa/biz/facade/Student.java → ...a/com/alipay/sofa/biz/facade/Student.java b/...a/com/alipay/sofa/biz/facade/Student.java → ...a/com/alipay/sofa/biz/facade/Student.java
diff --git a/...a/com/alipay/sofa/biz/facade/Teacher.java → ...a/com/alipay/sofa/biz/facade/Teacher.java b/...a/com/alipay/sofa/biz/facade/Teacher.java → ...a/com/alipay/sofa/biz/facade/Teacher.java
diff --git a/...amples/service/sample-service-biz/pom.xml → ...s/springboot-samples/service/biz1/pom.xml b/...amples/service/sample-service-biz/pom.xml → ...s/springboot-samples/service/biz1/pom.xml
@@ -4,8 +4,8 @@
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
     <modules>
-        <module>biz-bootstrap</module>
-        <module>biz-facade</module>
+        <module>biz1-bootstrap</module>
+        <module>biz1-facade</module>
     </modules>
     <parent>
         <groupId>com.alipay.sofa</groupId>
@@ -14,7 +14,7 @@
         <relativePath>../../pom.xml</relativePath> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.alipay.sofa.service</groupId>
-    <artifactId>sample-service-biz</artifactId>
+    <artifactId>biz1</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>sample-service-biz</name>
     <description>sample-service-biz</description>
@@ -23,12 +23,12 @@
         <dependencies>
             <dependency>
                 <groupId>com.alipay.sofa.service</groupId>
-                <artifactId>biz-facade</artifactId>
+                <artifactId>biz1-facade</artifactId>
                 <version>0.0.1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.alipay.sofa.service</groupId>
-                <artifactId>biz-bootstrap</artifactId>
+                <artifactId>biz1-bootstrap</artifactId>
                 <version>0.0.1-SNAPSHOT</version>
             </dependency>
             <dependency>

diff --git a/...ample-service-biz2/biz2-bootstrap/pom.xml → ...mples/service/biz2/biz2-bootstrap/pom.xml b/...ample-service-biz2/biz2-bootstrap/pom.xml → ...mples/service/biz2/biz2-bootstrap/pom.xml
@@ -3,7 +3,7 @@
          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>sample-service-biz2</artifactId>
+        <artifactId>biz2</artifactId>
         <groupId>com.alipay.sofa.service</groupId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
@@ -23,7 +23,7 @@
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa.service</groupId>
-            <artifactId>biz-facade</artifactId>
+            <artifactId>biz1-facade</artifactId>
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa.service</groupId>
@@ -85,4 +85,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
diff --git a/...com/alipay/sofa/biz2/Biz2Application.java → ...com/alipay/sofa/biz2/Biz2Application.java b/...com/alipay/sofa/biz2/Biz2Application.java → ...com/alipay/sofa/biz2/Biz2Application.java
diff --git a/...java/com/alipay/sofa/biz2/TestClient.java → ...java/com/alipay/sofa/biz2/TestClient.java b/...java/com/alipay/sofa/biz2/TestClient.java → ...java/com/alipay/sofa/biz2/TestClient.java
diff --git a/...ipay/sofa/biz2/rest/SampleController.java → ...ipay/sofa/biz2/rest/SampleController.java b/...ipay/sofa/biz2/rest/SampleController.java → ...ipay/sofa/biz2/rest/SampleController.java
@@ -33,13 +33,13 @@ public class SampleController {
     @AutowiredFromBase
     private AppService appService;
 
-    @AutowiredFromBiz(bizName = "biz", bizVersion = "0.0.1-SNAPSHOT", name = "studentProvider")
+    @AutowiredFromBiz(bizName = "biz1", bizVersion = "0.0.1-SNAPSHOT", name = "studentProvider")
     private Provider studentProvider;
 
-    @AutowiredFromBiz(bizName = "biz", name = "teacherProvider")
+    @AutowiredFromBiz(bizName = "biz1", name = "teacherProvider")
     private Provider teacherProvider;
 
-    @AutowiredFromBiz(bizName = "biz", bizVersion = "0.0.1-SNAPSHOT")
+    @AutowiredFromBiz(bizName = "biz1", bizVersion = "0.0.1-SNAPSHOT")
     private List<Provider> providers;
 
     @RequestMapping(value = "/", method = RequestMethod.GET)
@@ -85,6 +85,6 @@ public String hello() {
             Result result2 = providerMap.get(beanName).provide(new Param());
         }
 
-        return "hello to ark2 dynamic deploy";
+        return "hello to ark biz2 dynamic deploy";
     }
 }
diff --git a/...y/sofa/biz2/service/DefaultProcessor.java → ...y/sofa/biz2/service/DefaultProcessor.java b/...y/sofa/biz2/service/DefaultProcessor.java → ...y/sofa/biz2/service/DefaultProcessor.java
diff --git a/...y/sofa/biz2/service/SpecialProcessor.java → ...y/sofa/biz2/service/SpecialProcessor.java b/...y/sofa/biz2/service/SpecialProcessor.java → ...y/sofa/biz2/service/SpecialProcessor.java
diff --git a/.../springboot-samples/service/biz2/biz2-bootstrap/src/main/resources/application.properties b/.../springboot-samples/service/biz2/biz2-bootstrap/src/main/resources/application.properties
@@ -0,0 +1,3 @@
+spring.application.name=biz2
+logging.file.path=./service/logs/
+logging.path=./service/logs/
diff --git a/...e/sample-service-biz2/biz2-facade/pom.xml → ...-samples/service/biz2/biz2-facade/pom.xml b/...e/sample-service-biz2/biz2-facade/pom.xml → ...-samples/service/biz2/biz2-facade/pom.xml
@@ -3,7 +3,7 @@
          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>sample-service-biz2</artifactId>
+        <artifactId>biz2</artifactId>
         <groupId>com.alipay.sofa.service</groupId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
@@ -16,4 +16,4 @@
         <maven.compiler.target>8</maven.compiler.target>
     </properties>
 
-</project>
+</project>
diff --git a/...ava/com/alipay/sofa/biz2/facade/Data.java → ...ava/com/alipay/sofa/biz2/facade/Data.java b/...ava/com/alipay/sofa/biz2/facade/Data.java → ...ava/com/alipay/sofa/biz2/facade/Data.java
diff --git a/...om/alipay/sofa/biz2/facade/Processor.java → ...om/alipay/sofa/biz2/facade/Processor.java b/...om/alipay/sofa/biz2/facade/Processor.java → ...om/alipay/sofa/biz2/facade/Processor.java
diff --git a/.../com/alipay/sofa/biz2/facade/Request.java → .../com/alipay/sofa/biz2/facade/Request.java b/.../com/alipay/sofa/biz2/facade/Request.java → .../com/alipay/sofa/biz2/facade/Request.java
diff --git a/...com/alipay/sofa/biz2/facade/Response.java → ...com/alipay/sofa/biz2/facade/Response.java b/...com/alipay/sofa/biz2/facade/Response.java → ...com/alipay/sofa/biz2/facade/Response.java
diff --git a/...mples/service/sample-service-biz2/pom.xml → ...s/springboot-samples/service/biz2/pom.xml b/...mples/service/sample-service-biz2/pom.xml → ...s/springboot-samples/service/biz2/pom.xml
@@ -14,7 +14,7 @@
         <relativePath>../../pom.xml</relativePath> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.alipay.sofa.service</groupId>
-    <artifactId>sample-service-biz2</artifactId>
+    <artifactId>biz2</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>sample-service-biz2</name>
     <description>sample-service-biz2</description>
@@ -28,12 +28,12 @@
             </dependency>
             <dependency>
                 <groupId>com.alipay.sofa.service</groupId>
-                <artifactId>biz-facade</artifactId>
+                <artifactId>biz1-facade</artifactId>
                 <version>0.0.1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.alipay.sofa.service</groupId>
-                <artifactId>biz-bootstrap</artifactId>
+                <artifactId>biz1-bootstrap</artifactId>
                 <version>0.0.1-SNAPSHOT</version>
             </dependency>
             <dependency>

diff --git a/...ples/service/sample-service-base/base-bootstrap/src/main/resources/application.properties b/...ples/service/sample-service-base/base-bootstrap/src/main/resources/application.properties
diff --git a/...amples/service/sample-service-biz/biz-bootstrap/src/main/resources/application.properties b/...amples/service/sample-service-biz/biz-bootstrap/src/main/resources/application.properties
diff --git a/...ples/service/sample-service-biz2/biz2-bootstrap/src/main/resources/application.properties b/...ples/service/sample-service-biz2/biz2-bootstrap/src/main/resources/application.properties