This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git
The following commit(s) were added to refs/heads/master by this push:
new ebe746dbf Update online boutique demo (#1176)
ebe746dbf is described below
commit ebe746dbf7ccddfc530ca3150ab8e35aeb33e98a
Author: Ken Liu <[email protected]>
AuthorDate: Wed Aug 21 15:12:45 2024 +0800
Update online boutique demo (#1176)
---
.licenserc.yaml | 3 +-
online_bontique_demo/.mvn/settings.xml | 28 ++
.../.mvn/wrapper/MavenWrapperDownloader.java | 117 +++++++
.../.mvn/wrapper/maven-wrapper.properties | 2 +
online_bontique_demo/Dockerfile | 28 ++
online_bontique_demo/README.md | 12 +
online_bontique_demo/adService/pom.xml | 31 +-
.../adService/src/main/resources/application.yml | 12 +-
online_bontique_demo/cartService/pom.xml | 30 +-
.../cartService/src/main/resources/application.yml | 11 +-
online_bontique_demo/checkoutService/pom.xml | 31 +-
.../src/main/resources/application.yml | 11 +-
online_bontique_demo/common/pom.xml | 19 --
online_bontique_demo/currencyService/pom.xml | 30 +-
.../src/main/resources/application.yml | 11 +-
online_bontique_demo/emailService/pom.xml | 31 +-
.../src/main/resources/application.yml | 13 +-
online_bontique_demo/frontend/pom.xml | 55 +++-
.../dubbo/shop/frontend/FrontendController.java | 30 +-
.../frontend/src/main/resources/application.yml | 6 +-
online_bontique_demo/mvnw | 310 ++++++++++++++++++
online_bontique_demo/mvnw.cmd | 182 +++++++++++
online_bontique_demo/paymentService/pom.xml | 31 +-
.../src/main/resources/application.yml | 11 +-
online_bontique_demo/pom.xml | 71 ----
.../productCatalogsService/Dockerfile | 22 ++
.../productCatalogsService/pom.xml | 30 +-
.../src/main/resources/application.yml | 11 +-
online_bontique_demo/recommendationService/pom.xml | 31 +-
.../src/main/resources/application.yml | 11 +-
online_bontique_demo/release/build.sh | 42 +++
.../release/kubernetes_manifests.yaml | 361 +++++++++++++++++++++
online_bontique_demo/shippingService/pom.xml | 42 ++-
.../src/main/resources/application.yml | 8 +-
pom.xml | 1 +
35 files changed, 1423 insertions(+), 252 deletions(-)
diff --git a/.licenserc.yaml b/.licenserc.yaml
index 7d0d1b51f..dd98fe8f3 100644
--- a/.licenserc.yaml
+++ b/.licenserc.yaml
@@ -59,7 +59,7 @@ header:
- '.repository/'
- 'compiler/**'
- '.gitmodules'
- - '.mvn'
+ - '**/.mvn/*'
- 'mvnw'
- 'mvnw.cmd'
- 'LICENSE'
@@ -79,6 +79,7 @@ header:
- '**/*.xml'
- '**/*.properties'
- '**/*.yml'
+ - '**/*.yaml'
comment: on-failure
diff --git a/online_bontique_demo/.mvn/settings.xml
b/online_bontique_demo/.mvn/settings.xml
new file mode 100644
index 000000000..8b7b1dc56
--- /dev/null
+++ b/online_bontique_demo/.mvn/settings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
http://maven.apache.org/xsd/settings-1.0.0.xsd";>
+
+ <profiles>
+ <profile>
+ <id>apache</id>
+ <repositories>
+ <repository>
+ <id>apache.snapshots.https</id>
+ <name>Apache Development Snapshot Repository</name>
+
<url>https://repository.apache.org/content/repositories/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ </profile>
+ </profiles>
+
+ <activeProfiles>
+ <activeProfile>apache</activeProfile>
+ </activeProfiles>
+</settings>
diff --git a/online_bontique_demo/.mvn/wrapper/MavenWrapperDownloader.java
b/online_bontique_demo/.mvn/wrapper/MavenWrapperDownloader.java
new file mode 100644
index 000000000..b901097f2
--- /dev/null
+++ b/online_bontique_demo/.mvn/wrapper/MavenWrapperDownloader.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2007-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+ private static final String WRAPPER_VERSION = "0.5.6";
+ /**
+ * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl'
is provided.
+ */
+ private static final String DEFAULT_DOWNLOAD_URL =
"https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/";
+ + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+ /**
+ * Path to the maven-wrapper.properties file, which might contain a
downloadUrl property to
+ * use instead of the default one.
+ */
+ private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+ ".mvn/wrapper/maven-wrapper.properties";
+
+ /**
+ * Path where the maven-wrapper.jar will be saved to.
+ */
+ private static final String MAVEN_WRAPPER_JAR_PATH =
+ ".mvn/wrapper/maven-wrapper.jar";
+
+ /**
+ * Name of the property which should be used to override the default
download url for the wrapper.
+ */
+ private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+ public static void main(String args[]) {
+ System.out.println("- Downloader started");
+ File baseDirectory = new File(args[0]);
+ System.out.println("- Using base directory: " +
baseDirectory.getAbsolutePath());
+
+ // If the maven-wrapper.properties exists, read it and check if it
contains a custom
+ // wrapperUrl parameter.
+ File mavenWrapperPropertyFile = new File(baseDirectory,
MAVEN_WRAPPER_PROPERTIES_PATH);
+ String url = DEFAULT_DOWNLOAD_URL;
+ if(mavenWrapperPropertyFile.exists()) {
+ FileInputStream mavenWrapperPropertyFileInputStream = null;
+ try {
+ mavenWrapperPropertyFileInputStream = new
FileInputStream(mavenWrapperPropertyFile);
+ Properties mavenWrapperProperties = new Properties();
+
mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+ url =
mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+ } catch (IOException e) {
+ System.out.println("- ERROR loading '" +
MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+ } finally {
+ try {
+ if(mavenWrapperPropertyFileInputStream != null) {
+ mavenWrapperPropertyFileInputStream.close();
+ }
+ } catch (IOException e) {
+ // Ignore ...
+ }
+ }
+ }
+ System.out.println("- Downloading from: " + url);
+
+ File outputFile = new File(baseDirectory.getAbsolutePath(),
MAVEN_WRAPPER_JAR_PATH);
+ if(!outputFile.getParentFile().exists()) {
+ if(!outputFile.getParentFile().mkdirs()) {
+ System.out.println(
+ "- ERROR creating output directory '" +
outputFile.getParentFile().getAbsolutePath() + "'");
+ }
+ }
+ System.out.println("- Downloading to: " +
outputFile.getAbsolutePath());
+ try {
+ downloadFileFromURL(url, outputFile);
+ System.out.println("Done");
+ System.exit(0);
+ } catch (Throwable e) {
+ System.out.println("- Error downloading");
+ e.printStackTrace();
+ System.exit(1);
+ }
+ }
+
+ private static void downloadFileFromURL(String urlString, File
destination) throws Exception {
+ if (System.getenv("MVNW_USERNAME") != null &&
System.getenv("MVNW_PASSWORD") != null) {
+ String username = System.getenv("MVNW_USERNAME");
+ char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+ Authenticator.setDefault(new Authenticator() {
+ @Override
+ protected PasswordAuthentication getPasswordAuthentication() {
+ return new PasswordAuthentication(username, password);
+ }
+ });
+ }
+ URL website = new URL(urlString);
+ ReadableByteChannel rbc;
+ rbc = Channels.newChannel(website.openStream());
+ FileOutputStream fos = new FileOutputStream(destination);
+ fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+ fos.close();
+ rbc.close();
+ }
+
+}
diff --git a/online_bontique_demo/.mvn/wrapper/maven-wrapper.properties
b/online_bontique_demo/.mvn/wrapper/maven-wrapper.properties
new file mode 100755
index 000000000..5d43cd338
--- /dev/null
+++ b/online_bontique_demo/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
diff --git a/online_bontique_demo/Dockerfile b/online_bontique_demo/Dockerfile
new file mode 100644
index 000000000..ca0cea465
--- /dev/null
+++ b/online_bontique_demo/Dockerfile
@@ -0,0 +1,28 @@
+# This is the demo Dockerfile for the generated template project, please
change accordingly before building image from it.
+# Run the following command to build image: docker build -f ./Dockerfile
--build-arg APP_FILE=quickstart-service--0.0.1-SNAPSHOT.jar -t demo:latest .
+FROM openjdk:17-jdk-alpine AS builder
+
+# Set the working directory to /build
+WORKDIR /build
+COPY . /build
+
+RUN chmod +x ./mvnw
+RUN ./mvnw clean package -U -DskipTests
+
+# JAR file will be specified by passing in a build time argument to docker
build
+ARG APP_DIR
+ARG APP_FILE
+ARG APP_PORT
+
+# Remember to change the port according to the RPC protocol you select
+EXPOSE ${APP_PORT}
+
+# copy the JAR file into the root and rename
+RUN cp ./${APP_DIR}/target/${APP_FILE} app.jar
+
+FROM openjdk:17-jdk-alpine
+
+COPY --from=builder /build/app.jar app.jar
+
+# Run java with the jar file when the container starts up
+CMD ["java","-jar","app.jar"]
diff --git a/online_bontique_demo/README.md b/online_bontique_demo/README.md
new file mode 100644
index 000000000..1b4a86393
--- /dev/null
+++ b/online_bontique_demo/README.md
@@ -0,0 +1,12 @@
+```shell
+docker build --build-arg APP_FILE=adService-1.0-SNAPSHOT.jar -t
sca-registry.cn-hangzhou.cr.aliyuncs.com/dubbo/online-boutique-ad-service:1.0 .
+docker build --build-arg APP_FILE=cartService-1.0-SNAPSHOT.jar -t
sca-registry.cn-hangzhou.cr.aliyuncs.com/dubbo/online-boutique-cart-service:1.0
.
+docker build --build-arg APP_FILE=checkoutService-1.0-SNAPSHOT.jar -t
sca-registry.cn-hangzhou.cr.aliyuncs.com/dubbo/online-boutique-checkout-service:1.0
.
+docker build --build-arg APP_FILE=currencyService-1.0-SNAPSHOT.jar -t
sca-registry.cn-hangzhou.cr.aliyuncs.com/dubbo/online-boutique-currency-service:1.0
.
+docker build --build-arg APP_FILE=emailService-1.0-SNAPSHOT.jar -t
sca-registry.cn-hangzhou.cr.aliyuncs.com/dubbo/online-boutique-email-service:1.0
.
+docker build --build-arg APP_FILE=frontendService-1.0-SNAPSHOT.jar -t
sca-registry.cn-hangzhou.cr.aliyuncs.com/dubbo/online-boutique-frontend-service:1.0
.
+docker build --build-arg APP_FILE=paymentService-1.0-SNAPSHOT.jar -t
sca-registry.cn-hangzhou.cr.aliyuncs.com/dubbo/online-boutique-payment-service:1.0
.
+docker build --build-arg APP_FILE=productCatalogsService-1.0-SNAPSHOT.jar -t
sca-registry.cn-hangzhou.cr.aliyuncs.com/dubbo/online-boutique-productCatalog-service:1.0
.
+docker build --build-arg APP_FILE=recommendationService-1.0-SNAPSHOT.jar -t
sca-registry.cn-hangzhou.cr.aliyuncs.com/dubbo/online-boutique-ad-service:1.0 .
+docker build --build-arg APP_FILE=shippingService-1.0-SNAPSHOT.jar -t
sca-registry.cn-hangzhou.cr.aliyuncs.com/dubbo/online-boutique-ad-service:1.0 .
+```
diff --git a/online_bontique_demo/adService/pom.xml
b/online_bontique_demo/adService/pom.xml
index 3c78278d0..302d28e69 100644
--- a/online_bontique_demo/adService/pom.xml
+++ b/online_bontique_demo/adService/pom.xml
@@ -33,28 +33,47 @@
</properties>
<dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>common</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <artifactId>dubbo-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>interface</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <artifactId>dubbo-nacos-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
+ <artifactId>spring-boot-starter-log4j2</artifactId>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-nacos-spring-boot-starter</artifactId>
+ <artifactId>common</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>interface</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
diff --git a/online_bontique_demo/adService/src/main/resources/application.yml
b/online_bontique_demo/adService/src/main/resources/application.yml
index 6dc9313b8..6926cb936 100644
--- a/online_bontique_demo/adService/src/main/resources/application.yml
+++ b/online_bontique_demo/adService/src/main/resources/application.yml
@@ -13,22 +13,14 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-server:
- port: 8081
-spring:
- application:
- name: AdsServiceImpl
- autoconfigure:
- exclude:
org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
-
dubbo:
application:
logger: slf4j
- name: ${spring.application.name}
+ name: adService
qos-enable: false
check-serializable: false
registry:
- address: nacos://${nacos.address:127.0.0.1}:8848
+ address:
nacos://${nacos.address:127.0.0.1}:8848?username=nacos&password=nacos
protocol:
port: 20880
name: tri
diff --git a/online_bontique_demo/cartService/pom.xml
b/online_bontique_demo/cartService/pom.xml
index 426aeda6b..ef3d1729e 100644
--- a/online_bontique_demo/cartService/pom.xml
+++ b/online_bontique_demo/cartService/pom.xml
@@ -33,28 +33,46 @@
</properties>
<dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>interface</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <artifactId>dubbo-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>common</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <artifactId>dubbo-nacos-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
+ <artifactId>spring-boot-starter-log4j2</artifactId>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-nacos-spring-boot-starter</artifactId>
+ <artifactId>interface</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>common</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git
a/online_bontique_demo/cartService/src/main/resources/application.yml
b/online_bontique_demo/cartService/src/main/resources/application.yml
index e1d741ee2..1add57f17 100644
--- a/online_bontique_demo/cartService/src/main/resources/application.yml
+++ b/online_bontique_demo/cartService/src/main/resources/application.yml
@@ -13,21 +13,14 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-server:
- port: 8082
-spring:
- application:
- name: CartServiceImpl
- autoconfigure:
- exclude:
org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
dubbo:
application:
logger: slf4j
- name: ${spring.application.name}
+ name: cartService
qos-enable: false
check-serializable: false
registry:
- address: nacos://${nacos.address:127.0.0.1}:8848
+ address:
nacos://${nacos.address:127.0.0.1}:8848?username=nacos&password=nacos
protocol:
port: 20881
name: tri
diff --git a/online_bontique_demo/checkoutService/pom.xml
b/online_bontique_demo/checkoutService/pom.xml
index 623d9146f..2e372187e 100644
--- a/online_bontique_demo/checkoutService/pom.xml
+++ b/online_bontique_demo/checkoutService/pom.xml
@@ -33,27 +33,46 @@
</properties>
<dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>interface</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <artifactId>dubbo-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>common</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <artifactId>dubbo-nacos-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
+ <artifactId>spring-boot-starter-log4j2</artifactId>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-nacos-spring-boot-starter</artifactId>
+ <artifactId>interface</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>common</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git
a/online_bontique_demo/checkoutService/src/main/resources/application.yml
b/online_bontique_demo/checkoutService/src/main/resources/application.yml
index 532f6bcb8..3f16677d9 100644
--- a/online_bontique_demo/checkoutService/src/main/resources/application.yml
+++ b/online_bontique_demo/checkoutService/src/main/resources/application.yml
@@ -13,21 +13,14 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-server:
- port: 8083
-spring:
- application:
- name: productCatalogServiceImpl
- autoconfigure:
- exclude:
org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
dubbo:
application:
logger: slf4j
- name: ${spring.application.name}
+ name: checkoutService
qos-enable: false
check-serializable: false
registry:
- address: nacos://${nacos.address:127.0.0.1}:8848
+ address:
nacos://${nacos.address:127.0.0.1}:8848?username=nacos&password=nacos
protocol:
port: 20882
name: tri
diff --git a/online_bontique_demo/common/pom.xml
b/online_bontique_demo/common/pom.xml
index 6c0b05913..2533f517f 100644
--- a/online_bontique_demo/common/pom.xml
+++ b/online_bontique_demo/common/pom.xml
@@ -37,25 +37,6 @@
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-spring-boot-starter</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-log4j2</artifactId>
- </dependency>
</dependencies>
</project>
diff --git a/online_bontique_demo/currencyService/pom.xml
b/online_bontique_demo/currencyService/pom.xml
index 4a3ac0ee8..31bc83c86 100644
--- a/online_bontique_demo/currencyService/pom.xml
+++ b/online_bontique_demo/currencyService/pom.xml
@@ -33,28 +33,46 @@
</properties>
<dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>interface</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <artifactId>dubbo-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>common</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <artifactId>dubbo-nacos-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
+ <artifactId>spring-boot-starter-log4j2</artifactId>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-nacos-spring-boot-starter</artifactId>
+ <artifactId>interface</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>common</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
diff --git
a/online_bontique_demo/currencyService/src/main/resources/application.yml
b/online_bontique_demo/currencyService/src/main/resources/application.yml
index 1e22e5971..1156d4602 100644
--- a/online_bontique_demo/currencyService/src/main/resources/application.yml
+++ b/online_bontique_demo/currencyService/src/main/resources/application.yml
@@ -13,21 +13,14 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-server:
- port: 8084
-spring:
- application:
- name: currencyServiceImpl
- autoconfigure:
- exclude:
org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
dubbo:
application:
logger: slf4j
- name: ${spring.application.name}
+ name: currencyService
qos-enable: false
check-serializable: false
registry:
- address: nacos://${nacos.address:127.0.0.1}:8848
+ address:
nacos://${nacos.address:127.0.0.1}:8848?username=nacos&password=nacos
protocol:
port: 20883
name: tri
diff --git a/online_bontique_demo/emailService/pom.xml
b/online_bontique_demo/emailService/pom.xml
index 0a2319c8c..c5578a3ba 100644
--- a/online_bontique_demo/emailService/pom.xml
+++ b/online_bontique_demo/emailService/pom.xml
@@ -33,27 +33,46 @@
</properties>
<dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>interface</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <artifactId>dubbo-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>common</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <artifactId>dubbo-nacos-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
+ <artifactId>spring-boot-starter-log4j2</artifactId>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-nacos-spring-boot-starter</artifactId>
+ <artifactId>interface</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>common</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
diff --git
a/online_bontique_demo/emailService/src/main/resources/application.yml
b/online_bontique_demo/emailService/src/main/resources/application.yml
index 51aed12de..42905b1c3 100644
--- a/online_bontique_demo/emailService/src/main/resources/application.yml
+++ b/online_bontique_demo/emailService/src/main/resources/application.yml
@@ -13,21 +13,14 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-server:
- port: 8085
-spring:
- application:
- name: emailCatalogServiceImpl
- autoconfigure:
- exclude:
org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
dubbo:
application:
logger: slf4j
- name: ${spring.application.name}
+ name: emailCatalogService
qos-enable: false
check-serializable: false
registry:
- address: nacos://${nacos.address:127.0.0.1}:8848
+ address:
nacos://${nacos.address:127.0.0.1}:8848?username=nacos&password=nacos
protocol:
port: 20884
- name: tri
\ No newline at end of file
+ name: tri
diff --git a/online_bontique_demo/frontend/pom.xml
b/online_bontique_demo/frontend/pom.xml
index 667fc3897..d76d04c7d 100644
--- a/online_bontique_demo/frontend/pom.xml
+++ b/online_bontique_demo/frontend/pom.xml
@@ -39,15 +39,13 @@
</dependency>
<dependency>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>interface</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>common</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <artifactId>dubbo-spring-boot-starter</artifactId>
</dependency>
<dependency>
@@ -55,58 +53,80 @@
<artifactId>dubbo-nacos-spring-boot-starter</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-log4j2</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>interface</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>adService</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>shippingService</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>cartService</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>recommendationService</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>productCatalogsService</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>currencyService</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>paymentService</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>emailService</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>checkoutService</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
@@ -125,7 +145,14 @@
</compilerArgs>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
</plugins>
</build>
+
+
</project>
diff --git
a/online_bontique_demo/frontend/src/main/java/org/apache/dubbo/shop/frontend/FrontendController.java
b/online_bontique_demo/frontend/src/main/java/org/apache/dubbo/shop/frontend/FrontendController.java
index 161509e6f..5ac107a60 100644
---
a/online_bontique_demo/frontend/src/main/java/org/apache/dubbo/shop/frontend/FrontendController.java
+++
b/online_bontique_demo/frontend/src/main/java/org/apache/dubbo/shop/frontend/FrontendController.java
@@ -58,7 +58,7 @@ import java.util.concurrent.ExecutionException;
@Controller
public class FrontendController {
-
+
@DubboReference
private ShippingService shippingService;
@DubboReference
@@ -77,7 +77,7 @@ public class FrontendController {
private CheckoutService checkoutService;
@DubboReference
private AdsService adsService;
-
+
@PostMapping("/cart/add")
public String addItemToCart(@RequestParam String productId, @RequestParam
Integer quantity, @RequestParam String userId) {
CartItem item = new CartItem(productId, quantity);
@@ -85,7 +85,7 @@ public class FrontendController {
cartService.addItem(request.getUserId(), request.getItem());
return "redirect:/cart"; // 重定向到购物车页面或其他页面
}
-
+
@GetMapping("/cart")
public String getCart(Model model, String userId) throws
ExecutionException, InterruptedException {
model.addAttribute("is_cymbal_brand", false);
@@ -93,10 +93,10 @@ public class FrontendController {
Cart cart = cartService.getCart("1");
model.addAttribute("items", cart);
List<CartItem> items = cart.getItems();
-
+
Map<Product, Integer> productQuantityMap = new HashMap<>();
int totalQuantity = 0;
-
+
List<String> productIds = new ArrayList<>();
for (CartItem item : items) {
totalQuantity += item.getQuantity();
@@ -106,12 +106,12 @@ public class FrontendController {
productQuantityMap.put(product, item.getQuantity());
}
}
-
+
Money totalCost = new Money("USD", 0L, 0);
for (Map.Entry<Product, Integer> entry :
productQuantityMap.entrySet()) {
totalCost = MoneyUtils.sum(totalCost,
MoneyUtils.multiplySlow(entry.getKey().getPriceUsd(), entry.getValue()));
}
-
+
ListRecommendationsResponse recommendations =
recommendationService.listRecommendations(new ListRecommendationsRequest("1",
productIds));
List<Product> products = new ArrayList<>();
for (String productId : recommendations.getProductIds()) {
@@ -122,22 +122,22 @@ public class FrontendController {
model.addAttribute("productQuantityMap", productQuantityMap);
model.addAttribute("total_cost", totalCost);
model.addAttribute("shipping_cost", shippingService.getQuote(new
GetQuoteRequest(new Address(), items)));
-
+
return "cart";
}
-
+
@PostMapping("/cart/empty")
public String emptyCart(String userId) {
cartService.emptyCart("1");
return "redirect:/cart";
}
-
+
@PostMapping("/cart/checkout")
public String checkout(String userId) {
cartService.emptyCart("1");
- return "redirect:/static";
+ return "redirect:/";
}
-
+
@GetMapping("/products")
public String listProducts(Model model) {
ListProductsResponse response = productCatalogService.listProducts(new
Empty());
@@ -152,7 +152,7 @@ public class FrontendController {
model.addAttribute(checkoutService.placeOrder(new
PlaceOrderRequest()).getOrder());
return "order";
}
-
+
@GetMapping("/ad")
public String getAds(@RequestParam List<String> contextKeys, Model model) {
AdRequest request = new AdRequest(contextKeys);
@@ -160,8 +160,8 @@ public class FrontendController {
model.addAttribute("ads", ads);
return "ad";
}
-
- @GetMapping({"/static"})
+
+ @GetMapping({"/"})
public String listUser(Model model) {
model.addAttribute("is_cymbal_brand", false);
ListProductsResponse response = productCatalogService.listProducts(new
Empty());
diff --git a/online_bontique_demo/frontend/src/main/resources/application.yml
b/online_bontique_demo/frontend/src/main/resources/application.yml
index 51db0b2bd..82f789810 100644
--- a/online_bontique_demo/frontend/src/main/resources/application.yml
+++ b/online_bontique_demo/frontend/src/main/resources/application.yml
@@ -35,7 +35,9 @@ dubbo:
qos-enable: false
check-serializable: false
registry:
- address: nacos://${nacos.address:127.0.0.1}:8848
+ address:
nacos://${nacos.address:127.0.0.1}:8848?username=nacos&password=nacos
protocol:
port: 20889
- name: tri
\ No newline at end of file
+ name: tri
+ consumer:
+ check: false
diff --git a/online_bontique_demo/mvnw b/online_bontique_demo/mvnw
new file mode 100755
index 000000000..41c0f0c23
--- /dev/null
+++ b/online_bontique_demo/mvnw
@@ -0,0 +1,310 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+# JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+# M2_HOME - location of maven2's installed home dir
+# MAVEN_OPTS - parameters passed to the Java VM when running Maven
+# e.g. to debug Maven itself, use
+# set MAVEN_OPTS=-Xdebug
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+ if [ -f /etc/mavenrc ] ; then
+ . /etc/mavenrc
+ fi
+
+ if [ -f "$HOME/.mavenrc" ] ; then
+ . "$HOME/.mavenrc"
+ fi
+
+fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ MINGW*) mingw=true;;
+ Darwin*) darwin=true
+ # Use /usr/libexec/java_home if available, otherwise fall back to
/Library/Java/Home
+ # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+ if [ -z "$JAVA_HOME" ]; then
+ if [ -x "/usr/libexec/java_home" ]; then
+ export JAVA_HOME="`/usr/libexec/java_home`"
+ else
+ export JAVA_HOME="/Library/Java/Home"
+ fi
+ fi
+ ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
+ fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+ ## resolve links - $0 may be a link to maven's home
+ PRG="$0"
+
+ # need this for relative symlinks
+ while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG="`dirname "$PRG"`/$link"
+ fi
+ done
+
+ saveddir=`pwd`
+
+ M2_HOME=`dirname "$PRG"`/..
+
+ # make it fully qualified
+ M2_HOME=`cd "$M2_HOME" && pwd`
+
+ cd "$saveddir"
+ # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --unix "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME="`(cd "$M2_HOME"; pwd)`"
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+ javaExecutable="`which javac`"
+ if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^
]*\)'`" = "no" ]; then
+ # readlink(1) is not available as standard on Solaris 10.
+ readLink=`which readlink`
+ if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+ if $darwin ; then
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+ else
+ javaExecutable="`readlink -f \"$javaExecutable\"`"
+ fi
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+ JAVA_HOME="$javaHome"
+ export JAVA_HOME
+ fi
+ fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD="`which java`"
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly." >&2
+ echo " We cannot execute $JAVACMD" >&2
+ exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+ echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+ if [ -z "$1" ]
+ then
+ echo "Path not specified to find_maven_basedir"
+ return 1
+ fi
+
+ basedir="$1"
+ wdir="$1"
+ while [ "$wdir" != '/' ] ; do
+ if [ -d "$wdir"/.mvn ] ; then
+ basedir=$wdir
+ break
+ fi
+ # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+ if [ -d "${wdir}" ]; then
+ wdir=`cd "$wdir/.."; pwd`
+ fi
+ # end of workaround
+ done
+ echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+ if [ -f "$1" ]; then
+ echo "$(tr -s '\n' ' ' < "$1")"
+ fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+ exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from
Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in
binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found .mvn/wrapper/maven-wrapper.jar"
+ fi
+else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+ fi
+ if [ -n "$MVNW_REPOURL" ]; then
+
jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ else
+
jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar";
+ fi
+ while IFS="=" read key value; do
+ case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+ esac
+ done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Downloading from: $jarUrl"
+ fi
+ wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+ if $cygwin; then
+ wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+ fi
+
+ if command -v wget > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found wget ... using wget"
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ wget "$jarUrl" -O "$wrapperJarPath"
+ else
+ wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD
"$jarUrl" -O "$wrapperJarPath"
+ fi
+ elif command -v curl > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found curl ... using curl"
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ curl -o "$wrapperJarPath" "$jarUrl" -f
+ else
+ curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath"
"$jarUrl" -f
+ fi
+
+ else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Falling back to using Java to download"
+ fi
+ javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+ # For Cygwin, switch paths to Windows format before running javac
+ if $cygwin; then
+ javaClass=`cygpath --path --windows "$javaClass"`
+ fi
+ if [ -e "$javaClass" ]; then
+ if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ];
then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Compiling MavenWrapperDownloader.java ..."
+ fi
+ # Compiling the Java class
+ ("$JAVA_HOME/bin/javac" "$javaClass")
+ fi
+ if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ];
then
+ # Running the downloader
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Running MavenWrapperDownloader.java ..."
+ fi
+ ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader
"$MAVEN_PROJECTBASEDIR")
+ fi
+ fi
+ fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+ echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config")
$MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --path --windows "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+ MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+ $MAVEN_OPTS \
+ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+ "-Dmaven.home=${M2_HOME}"
"-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+ ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/online_bontique_demo/mvnw.cmd b/online_bontique_demo/mvnw.cmd
new file mode 100755
index 000000000..86115719e
--- /dev/null
+++ b/online_bontique_demo/mvnw.cmd
@@ -0,0 +1,182 @@
+@REM
----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+@REM
+@REM http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM
----------------------------------------------------------------------------
+
+@REM
----------------------------------------------------------------------------
+@REM Maven Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM
----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd
ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another
setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder
".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto
endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do
set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set
DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar";
+
+FOR /F "tokens=1,2 delims==" %%A IN
("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+ IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from
Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in
binary data.
+if exist %WRAPPER_JAR% (
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Found %WRAPPER_JAR%
+ )
+) else (
+ if not "%MVNW_REPOURL%" == "" (
+ SET
DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ )
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Couldn't find %WRAPPER_JAR%, downloading it ...
+ echo Downloading from: %DOWNLOAD_URL%
+ )
+
+ powershell -Command "&{"^
+ "$webclient = new-object System.Net.WebClient;"^
+ "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and
[string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+ "$webclient.Credentials = new-object
System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+ "}"^
+ "[Net.ServicePointManager]::SecurityProtocol =
[Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%',
'%WRAPPER_JAR%')"^
+ "}"
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Finished downloading %WRAPPER_JAR%
+ )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS%
-classpath %WRAPPER_JAR%
"-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER%
%MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd
ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%
diff --git a/online_bontique_demo/paymentService/pom.xml
b/online_bontique_demo/paymentService/pom.xml
index 76de4f95d..a14830fe4 100644
--- a/online_bontique_demo/paymentService/pom.xml
+++ b/online_bontique_demo/paymentService/pom.xml
@@ -33,27 +33,46 @@
</properties>
<dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>interface</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <artifactId>dubbo-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>common</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <artifactId>dubbo-nacos-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
+ <artifactId>spring-boot-starter-log4j2</artifactId>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-nacos-spring-boot-starter</artifactId>
+ <artifactId>interface</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>common</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
diff --git
a/online_bontique_demo/paymentService/src/main/resources/application.yml
b/online_bontique_demo/paymentService/src/main/resources/application.yml
index f333f9a52..ad0cab364 100644
--- a/online_bontique_demo/paymentService/src/main/resources/application.yml
+++ b/online_bontique_demo/paymentService/src/main/resources/application.yml
@@ -13,21 +13,14 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-server:
- port: 8086
-spring:
- application:
- name: productCatalogServiceImpl
- autoconfigure:
- exclude:
org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
dubbo:
application:
logger: slf4j
- name: ${spring.application.name}
+ name: paymentService
qos-enable: false
check-serializable: false
registry:
- address: nacos://${nacos.address:127.0.0.1}:8848
+ address:
nacos://${nacos.address:127.0.0.1}:8848?username=nacos&password=nacos
protocol:
port: 20885
name: tri
diff --git a/online_bontique_demo/pom.xml b/online_bontique_demo/pom.xml
index 7fcbbb2f6..9be1fa40f 100644
--- a/online_bontique_demo/pom.xml
+++ b/online_bontique_demo/pom.xml
@@ -50,14 +50,6 @@
<dependencyManagement>
<dependencies>
-
- <!--Thymeleaf模版-->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-thymeleaf</artifactId>
- <version>${spring-boot.version}</version>
- </dependency>
-
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
@@ -65,19 +57,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
-
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- <version>${spring-boot.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-bom</artifactId>
@@ -88,15 +67,6 @@
</dependencies>
</dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo</artifactId>
- <version>${dubbo.version}</version>
- </dependency>
-
- </dependencies>
-
<build>
<pluginManagement>
<plugins>
@@ -112,48 +82,7 @@
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>com.diffplug.spotless</groupId>
- <artifactId>spotless-maven-plugin</artifactId>
- <version>2.43.0</version>
- <configuration>
- <java>
- <eclipse>
-
<file>/home/heliang/Code/online_bontique_demo/code-style.xml</file>
- </eclipse>
- <licenseHeader>
-
<file>/home/heliang/Code/online_bontique_demo/license-header</file>
- </licenseHeader>
- </java>
- <pom>
- <sortPom>
- <encoding>UTF-8</encoding>
- <nrOfIndentSpace>4</nrOfIndentSpace>
- <keepBlankLines>true</keepBlankLines>
- <indentBlankLines>false</indentBlankLines>
-
<indentSchemaLocation>true</indentSchemaLocation>
-
<spaceBeforeCloseEmptyElement>true</spaceBeforeCloseEmptyElement>
- <sortModules>false</sortModules>
- <sortExecutions>false</sortExecutions>
-
<predefinedSortOrder>custom_1</predefinedSortOrder>
-
<expandEmptyElements>false</expandEmptyElements>
- <sortProperties>false</sortProperties>
- </sortPom>
- </pom>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>apply</goal>
- </goals>
- <phase>compile</phase>
- </execution>
- </executions>
- </plugin>
-
</plugins>
-
</pluginManagement>
</build>
diff --git a/online_bontique_demo/productCatalogsService/Dockerfile
b/online_bontique_demo/productCatalogsService/Dockerfile
new file mode 100644
index 000000000..34bc9f423
--- /dev/null
+++ b/online_bontique_demo/productCatalogsService/Dockerfile
@@ -0,0 +1,22 @@
+# This is the demo Dockerfile for the generated template project, please
change accordingly before building image from it.
+# Run the following command to build image: docker build -f ./Dockerfile
--build-arg APP_FILE=quickstart-service--0.0.1-SNAPSHOT.jar -t demo:latest .
+FROM openjdk:17-jdk-alpine
+
+# Set the working directory to /build
+WORKDIR /build
+COPY . /build
+
+RUN chmod +x ../mvnw
+RUN ./mvnw clean package -U -DskipTests
+
+# JAR file will be specified by passing in a build time argument to docker
build
+ARG APP_FILE
+
+# Remember to change the port according to the RPC protocol you select
+EXPOSE 8087
+
+# copy the JAR file into the root and rename
+RUN cp ./target/${APP_FILE} app.jar
+
+# Run java with the jar file when the container starts up
+CMD ["java","-jar","app.jar"]
diff --git a/online_bontique_demo/productCatalogsService/pom.xml
b/online_bontique_demo/productCatalogsService/pom.xml
index 30475184b..92f1484bb 100644
--- a/online_bontique_demo/productCatalogsService/pom.xml
+++ b/online_bontique_demo/productCatalogsService/pom.xml
@@ -33,27 +33,45 @@
</properties>
<dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>interface</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <artifactId>dubbo-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>common</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <artifactId>dubbo-nacos-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
+ <artifactId>spring-boot-starter-log4j2</artifactId>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-nacos-spring-boot-starter</artifactId>
+ <artifactId>interface</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>common</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git
a/online_bontique_demo/productCatalogsService/src/main/resources/application.yml
b/online_bontique_demo/productCatalogsService/src/main/resources/application.yml
index 3c0a42105..c0b0eb6ca 100644
---
a/online_bontique_demo/productCatalogsService/src/main/resources/application.yml
+++
b/online_bontique_demo/productCatalogsService/src/main/resources/application.yml
@@ -13,21 +13,14 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-server:
- port: 8087
-spring:
- application:
- name: productCatalogServiceImpl
- autoconfigure:
- exclude:
org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
dubbo:
application:
logger: slf4j
- name: ${spring.application.name}
+ name: productCatalogsService
qos-enable: false
check-serializable: false
registry:
- address: nacos://${nacos.address:127.0.0.1}:8848
+ address:
nacos://${nacos.address:127.0.0.1}:8848?username=nacos&password=nacos
protocol:
port: 20886
name: tri
diff --git a/online_bontique_demo/recommendationService/pom.xml
b/online_bontique_demo/recommendationService/pom.xml
index 93d6baf65..6d03679d4 100644
--- a/online_bontique_demo/recommendationService/pom.xml
+++ b/online_bontique_demo/recommendationService/pom.xml
@@ -33,27 +33,46 @@
</properties>
<dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>interface</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <artifactId>dubbo-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>common</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <artifactId>dubbo-nacos-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
+ <artifactId>spring-boot-starter-log4j2</artifactId>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-nacos-spring-boot-starter</artifactId>
+ <artifactId>interface</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>common</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
diff --git
a/online_bontique_demo/recommendationService/src/main/resources/application.yml
b/online_bontique_demo/recommendationService/src/main/resources/application.yml
index 9afd45532..88762affe 100644
---
a/online_bontique_demo/recommendationService/src/main/resources/application.yml
+++
b/online_bontique_demo/recommendationService/src/main/resources/application.yml
@@ -13,21 +13,14 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-server:
- port: 8088
-spring:
- application:
- name: recommendationServiceImpl
- autoconfigure:
- exclude:
org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
dubbo:
application:
logger: slf4j
- name: ${spring.application.name}
+ name: recommendationService
qos-enable: false
check-serializable: false
registry:
- address: nacos://${nacos.address:127.0.0.1}:8848
+ address:
nacos://${nacos.address:127.0.0.1}:8848?username=nacos&password=nacos
protocol:
port: 20887
name: tri
diff --git a/online_bontique_demo/release/build.sh
b/online_bontique_demo/release/build.sh
new file mode 100644
index 000000000..50448d392
--- /dev/null
+++ b/online_bontique_demo/release/build.sh
@@ -0,0 +1,42 @@
+# build adService
+docker build --build-arg APP_DIR=adService --build-arg APP_PORT=20880
--build-arg APP_FILE=adService-1.0-SNAPSHOT.jar -f ../Dockerfile -t
ken222/online-boutique-ad-service:1.0 ../
+
+# build cartService
+docker build --build-arg APP_DIR=cartService --build-arg APP_PORT=20881
--build-arg APP_FILE=cartService-1.0-SNAPSHOT.jar -f ../Dockerfile -t
ken222/online-boutique-cart-service:1.0 ../
+
+# build checkoutService
+docker build --build-arg APP_DIR=checkoutService --build-arg APP_PORT=20882
--build-arg APP_FILE=checkoutService-1.0-SNAPSHOT.jar -f ../Dockerfile -t
ken222/online-boutique-checkout-service:1.0 ../
+
+# build currencyService
+docker build --build-arg APP_DIR=currencyService --build-arg APP_PORT=20883
--build-arg APP_FILE=currencyService-1.0-SNAPSHOT.jar -f ../Dockerfile -t
ken222/online-boutique-currency-service:1.0 ../
+
+# build emailService
+docker build --build-arg APP_DIR=emailService --build-arg APP_PORT=20884
--build-arg APP_FILE=emailService-1.0-SNAPSHOT.jar -f ../Dockerfile -t
ken222/online-boutique-email-service:1.0 ../
+
+# build frontend
+docker build --build-arg APP_DIR=frontend --build-arg APP_PORT=9000
--build-arg APP_FILE=frontend-1.0-SNAPSHOT.jar -f ../Dockerfile -t
ken222/online-boutique-frontend-service:1.0 ../
+
+# build paymentService
+docker build --build-arg APP_DIR=paymentService --build-arg APP_PORT=20885
--build-arg APP_FILE=paymentService-1.0-SNAPSHOT.jar -f ../Dockerfile -t
ken222/online-boutique-payment-service:1.0 ../
+
+# build productCatalogsService
+docker build --build-arg APP_DIR=productCatalogsService --build-arg
APP_PORT=20886 --build-arg APP_FILE=productCatalogsService-1.0-SNAPSHOT.jar -f
../Dockerfile -t ken222/online-boutique-productcatalog-service:1.0 ../
+
+# build recommendationService
+docker build --build-arg APP_DIR=recommendationService --build-arg
APP_PORT=20887 --build-arg APP_FILE=recommendationService-1.0-SNAPSHOT.jar -f
../Dockerfile -t ken222/online-boutique-recommendation-service:1.0 ../
+
+# build shippingService
+docker build --build-arg APP_DIR=shippingService --build-arg APP_PORT=20888
--build-arg APP_FILE=shippingService-1.0-SNAPSHOT.jar -f ../Dockerfile -t
ken222/online-boutique-shipping-service:1.0 ../
+
+docker push ken222/online-boutique-ad-service:1.0
+docker push ken222/online-boutique-cart-service:1.0
+docker push ken222/online-boutique-checkout-service:1.0
+docker push ken222/online-boutique-currency-service:1.0
+docker push ken222/online-boutique-email-service:1.0
+docker push ken222/online-boutique-frontend-service:1.0
+docker push ken222/online-boutique-payment-service:1.0
+docker push ken222/online-boutique-productcatalog-service:1.0
+docker push ken222/online-boutique-recommendation-service:1.0
+docker push ken222/online-boutique-shipping-service:1.0
+
+
diff --git a/online_bontique_demo/release/kubernetes_manifests.yaml
b/online_bontique_demo/release/kubernetes_manifests.yaml
new file mode 100644
index 000000000..6cee5ada8
--- /dev/null
+++ b/online_bontique_demo/release/kubernetes_manifests.yaml
@@ -0,0 +1,361 @@
+# Namespace
+apiVersion: v1
+kind: Namespace
+metadata:
+ name: dubbo-boutique-demo
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+ name: dubbo-system
+---
+
+# Nacos
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: nacos
+ namespace: dubbo-system
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app: nacos
+ template:
+ metadata:
+ labels:
+ app: nacos
+ spec:
+ containers:
+ - name: consumer
+ image:
nacos-registry.cn-hangzhou.cr.aliyuncs.com/nacos/nacos-server:v2.1.2
+ imagePullPolicy: Always
+ resources:
+ requests:
+ memory: "2Gi"
+ cpu: "500m"
+ ports:
+ - containerPort: 8848
+ name: client
+ - containerPort: 9848
+ name: client-rpc
+ env:
+ - name: NACOS_SERVER_PORT
+ value: "8848"
+ - name: NACOS_APPLICATION_PORT
+ value: "8848"
+ - name: PREFER_HOST_MODE
+ value: "hostname"
+ - name: MODE
+ value: "standalone"
+ - name: NACOS_AUTH_ENABLE
+ value: "true"
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: nacos
+ namespace: dubbo-system
+spec:
+ type: ClusterIP
+ sessionAffinity: None
+ selector:
+ app: nacos
+ ports:
+ - port: 8848
+ name: server
+ targetPort: 8848
+ - port: 9848
+ name: client-rpc
+ targetPort: 9848
+---
+
+# App frontend
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: frontend
+ namespace: dubbo-boutique-demo
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app: frontend
+ template:
+ metadata:
+ labels:
+ app: frontend
+ spec:
+ containers:
+ - name: frontend
+ image:
sca-registry.cn-hangzhou.cr.aliyuncs.com/dubbo/online-boutique-frontend-service:1.0
+ imagePullPolicy: Always
+ ports:
+ - name: dubbo
+ containerPort: 20889
+ protocol: TCP
+ env:
+ - name: JAVA_TOOL_OPTIONS
+ value: "-Dnacos.address=nacos.dubbo-system.svc"
+---
+
+# App ad-service
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: ad-service
+ namespace: dubbo-boutique-demo
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app: ad-service
+ template:
+ metadata:
+ labels:
+ app: ad-service
+ spec:
+ containers:
+ - name: ad-service
+ image:
sca-registry.cn-hangzhou.cr.aliyuncs.com/dubbo/online-boutique-ad-service:1.0
+ imagePullPolicy: Always
+ ports:
+ - name: dubbo
+ containerPort: 20880
+ protocol: TCP
+ env:
+ - name: JAVA_TOOL_OPTIONS
+ value: "-Dnacos.address=nacos.dubbo-system.svc"
+---
+
+# App cart-service
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: cart-service
+ namespace: dubbo-boutique-demo
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app: cart-service
+ template:
+ metadata:
+ labels:
+ app: cart-service
+ spec:
+ containers:
+ - name: cart-service
+ image:
sca-registry.cn-hangzhou.cr.aliyuncs.com/dubbo/online-boutique-cart-service:1.0
+ imagePullPolicy: Always
+ ports:
+ - name: dubbo
+ containerPort: 20881
+ protocol: TCP
+ env:
+ - name: JAVA_TOOL_OPTIONS
+ value: "-Dnacos.address=nacos.dubbo-system.svc"
+---
+
+# App checkout-service
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: checkout-service
+ namespace: dubbo-boutique-demo
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app: checkout-service
+ template:
+ metadata:
+ labels:
+ app: checkout-service
+ spec:
+ containers:
+ - name: checkout-service
+ image:
sca-registry.cn-hangzhou.cr.aliyuncs.com/dubbo/online-boutique-checkout-service:1.0
+ imagePullPolicy: Always
+ ports:
+ - name: dubbo
+ containerPort: 20882
+ protocol: TCP
+ env:
+ - name: JAVA_TOOL_OPTIONS
+ value: "-Dnacos.address=nacos.dubbo-system.svc"
+---
+
+# App currency-service
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: currency-service
+ namespace: dubbo-boutique-demo
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app: currency-service
+ template:
+ metadata:
+ labels:
+ app: currency-service
+ spec:
+ containers:
+ - name: currency-service
+ image:
sca-registry.cn-hangzhou.cr.aliyuncs.com/dubbo/online-boutique-currency-service:1.0
+ imagePullPolicy: Always
+ ports:
+ - name: dubbo
+ containerPort: 20883
+ protocol: TCP
+ env:
+ - name: JAVA_TOOL_OPTIONS
+ value: "-Dnacos.address=nacos.dubbo-system.svc"
+---
+
+# App email-service
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: email-service
+ namespace: dubbo-boutique-demo
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app: email-service
+ template:
+ metadata:
+ labels:
+ app: email-service
+ spec:
+ containers:
+ - name: email-service
+ image:
sca-registry.cn-hangzhou.cr.aliyuncs.com/dubbo/online-boutique-email-service:1.0
+ imagePullPolicy: Always
+ ports:
+ - name: dubbo
+ containerPort: 20884
+ protocol: TCP
+ env:
+ - name: JAVA_TOOL_OPTIONS
+ value: "-Dnacos.address=nacos.dubbo-system.svc"
+---
+
+# App payment-service
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: payment-service
+ namespace: dubbo-boutique-demo
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app: payment-service
+ template:
+ metadata:
+ labels:
+ app: payment-service
+ spec:
+ containers:
+ - name: payment-service
+ image:
sca-registry.cn-hangzhou.cr.aliyuncs.com/dubbo/online-boutique-payment-service:1.0
+ imagePullPolicy: Always
+ ports:
+ - name: dubbo
+ containerPort: 20885
+ protocol: TCP
+ env:
+ - name: JAVA_TOOL_OPTIONS
+ value: "-Dnacos.address=nacos.dubbo-system.svc"
+---
+
+# App product-catalogs-service
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: product-catalogs-service
+ namespace: dubbo-boutique-demo
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app: product-catalogs-service
+ template:
+ metadata:
+ labels:
+ app: product-catalogs-service
+ spec:
+ containers:
+ - name: product-catalogs-service
+ image:
sca-registry.cn-hangzhou.cr.aliyuncs.com/dubbo/online-boutique-productcatalog-service:1.0
+ imagePullPolicy: Always
+ ports:
+ - name: dubbo
+ containerPort: 20886
+ protocol: TCP
+ env:
+ - name: JAVA_TOOL_OPTIONS
+ value: "-Dnacos.address=nacos.dubbo-system.svc"
+---
+
+# App recommendation-service
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: recommendation-service
+ namespace: dubbo-boutique-demo
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app: recommendation-service
+ template:
+ metadata:
+ labels:
+ app: recommendation-service
+ spec:
+ containers:
+ - name: recommendation-service
+ image:
sca-registry.cn-hangzhou.cr.aliyuncs.com/dubbo/online-boutique-recommendation-service:1.0
+ imagePullPolicy: Always
+ ports:
+ - name: dubbo
+ containerPort: 20887
+ protocol: TCP
+ env:
+ - name: JAVA_TOOL_OPTIONS
+ value: "-Dnacos.address=nacos.dubbo-system.svc"
+---
+
+# App shipping-service
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: shipping-service
+ namespace: dubbo-boutique-demo
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app: shipping-service
+ template:
+ metadata:
+ labels:
+ app: shipping-service
+ spec:
+ containers:
+ - name: shipping-service
+ image:
sca-registry.cn-hangzhou.cr.aliyuncs.com/dubbo/online-boutique-shipping-service:1.0
+ imagePullPolicy: Always
+ ports:
+ - name: dubbo
+ containerPort: 20888
+ protocol: TCP
+ env:
+ - name: JAVA_TOOL_OPTIONS
+ value: "-Dnacos.address=nacos.dubbo-system.svc"
+---
diff --git a/online_bontique_demo/shippingService/pom.xml
b/online_bontique_demo/shippingService/pom.xml
index cb448d905..dfb38d8d2 100644
--- a/online_bontique_demo/shippingService/pom.xml
+++ b/online_bontique_demo/shippingService/pom.xml
@@ -33,6 +33,26 @@
</properties>
<dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-spring-boot-starter</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-nacos-spring-boot-starter</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-log4j2</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>interface</artifactId>
@@ -45,10 +65,28 @@
<version>1.0-SNAPSHOT</version>
</dependency>
+
<dependency>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-nacos-spring-boot-starter</artifactId>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
diff --git
a/online_bontique_demo/shippingService/src/main/resources/application.yml
b/online_bontique_demo/shippingService/src/main/resources/application.yml
index 807760857..6fe78fc86 100644
--- a/online_bontique_demo/shippingService/src/main/resources/application.yml
+++ b/online_bontique_demo/shippingService/src/main/resources/application.yml
@@ -13,21 +13,17 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-server:
- port: 8089
spring:
- application:
- name: productCatalogServiceImpl
autoconfigure:
exclude:
org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
dubbo:
application:
logger: slf4j
- name: ${spring.application.name}
+ name: shippingService
qos-enable: false
check-serializable: false
registry:
- address: nacos://${nacos.address:127.0.0.1}:8848
+ address:
nacos://${nacos.address:127.0.0.1}:8848?username=nacos&password=nacos
protocol:
port: 20888
name: tri
diff --git a/pom.xml b/pom.xml
index f4bee1f9e..d6e3ea7e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,7 @@
<module>3-extensions</module>
<module>4-governance</module>
<module>tools</module>
+ <module>online_bontique_demo</module>
</modules>
<build>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
