Skip to content

Commit

Permalink
fix(project): for releasing
Browse files Browse the repository at this point in the history
  • Loading branch information
MageekChiu committed Jun 17, 2022
1 parent d8e730c commit 16b4822
Show file tree
Hide file tree
Showing 46 changed files with 137 additions and 149 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ For more, please visit [demo](docs/en/details/demo_nacos.md)

## Developer Guide

- [DEVELOPER Guide](docs/en/details/developer_guide.md) :Introduce how to use AppActive, including basic samples,
- [DEVELOPER Guide](docs/en/details/developer_guide_nacos.md) :Introduce how to use AppActive, including basic samples,
support plug-ins, version management, use effects.

## Change Log
Expand Down
16 changes: 8 additions & 8 deletions appactive-demo/common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@

<artifactId>common</artifactId>
<groupId>io.appactive.demo</groupId>
<version>0.3</version>
<version>0.2.1</version>

<parent>
<artifactId>appactive-demo</artifactId>
<groupId>com.alibaba.msha</groupId>
<version>0.3</version>
<version>0.2.1</version>
</parent>

<dependencies>
Expand Down Expand Up @@ -77,33 +77,33 @@
<dependency>
<groupId>com.alibaba.msha</groupId>
<artifactId>client-bridge-rpc-apache-dubbo2</artifactId>
<version>0.3</version>
<version>0.2.1</version>
</dependency>
<dependency>
<groupId>com.alibaba.msha</groupId>
<artifactId>client-bridge-rpc-apache-dubbo2-metainfo</artifactId>
<version>0.3</version>
<version>0.2.1</version>
</dependency>
<dependency>
<groupId>com.alibaba.msha</groupId>
<artifactId>client-spi-metainfo</artifactId>
<version>0.3</version>
<version>0.2.1</version>
</dependency>
<dependency>
<groupId>com.alibaba.msha</groupId>
<artifactId>client-rule</artifactId>
<version>0.3</version>
<version>0.2.1</version>
</dependency>

<dependency>
<groupId>com.alibaba.msha</groupId>
<artifactId>client-bridge-rpc-springcloud-nacos</artifactId>
<version>0.3</version>
<version>0.2.1</version>
</dependency>
<dependency>
<groupId>com.alibaba.msha</groupId>
<artifactId>client-bridge-rpc-springcloud-common</artifactId>
<version>0.3</version>
<version>0.2.1</version>
</dependency>
</dependencies>

Expand Down
14 changes: 7 additions & 7 deletions appactive-demo/docker-compose-nacos-quick.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ services:
gateway:
container_name: gateway
hostname: gateway
image: appactiveio/gateway:0.3
image: appactiveio/gateway:0.2.1
ports:
- "80:80"
- "8090:8090"

storage:
restart: on-failure:3
image: appactiveio/storage:0.3
image: appactiveio/storage:0.2.1
container_name: storage
hostname: storage
environment:
Expand All @@ -63,7 +63,7 @@ services:

storage-unit:
restart: on-failure:3
image: appactiveio/storage:0.3
image: appactiveio/storage:0.2.1
container_name: storage-unit
hostname: storage-unit
environment:
Expand All @@ -89,7 +89,7 @@ services:

product:
restart: on-failure:3
image: appactiveio/product:0.3
image: appactiveio/product:0.2.1
container_name: product
hostname: product
environment:
Expand All @@ -115,7 +115,7 @@ services:

product-unit:
restart: on-failure:3
image: appactiveio/product:0.3
image: appactiveio/product:0.2.1
container_name: product-unit
hostname: product-unit
environment:
Expand All @@ -141,7 +141,7 @@ services:

frontend:
restart: on-failure:3
image: appactiveio/frontend:0.3
image: appactiveio/frontend:0.2.1
container_name: frontend
hostname: frontend
environment:
Expand All @@ -166,7 +166,7 @@ services:

frontend-unit:
restart: on-failure:3
image: appactiveio/frontend:0.3
image: appactiveio/frontend:0.2.1
container_name: frontend-unit
hostname: frontend-unit
environment:
Expand Down
14 changes: 7 additions & 7 deletions appactive-demo/docker-compose-nacos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ services:
gateway:
container_name: gateway
hostname: gateway
image: app-active/gateway:0.3
image: app-active/gateway:0.2.1
ports:
- "80:80"
- "8090:8090"

storage:
build: ./storage
restart: on-failure:3
image: app-active/storage:0.3
image: app-active/storage:0.2.1
container_name: storage
hostname: storage
environment:
Expand All @@ -64,7 +64,7 @@ services:

storage-unit:
restart: on-failure:3
image: app-active/storage:0.3
image: app-active/storage:0.2.1
container_name: storage-unit
hostname: storage-unit
environment:
Expand All @@ -91,7 +91,7 @@ services:
product:
build: ./product
restart: on-failure:3
image: app-active/product:0.3
image: app-active/product:0.2.1
container_name: product
hostname: product
environment:
Expand All @@ -117,7 +117,7 @@ services:

product-unit:
restart: on-failure:3
image: app-active/product:0.3
image: app-active/product:0.2.1
container_name: product-unit
hostname: product-unit
environment:
Expand All @@ -144,7 +144,7 @@ services:
frontend:
build: ./frontend
restart: on-failure:3
image: app-active/frontend:0.3
image: app-active/frontend:0.2.1
container_name: frontend
hostname: frontend
environment:
Expand All @@ -169,7 +169,7 @@ services:

frontend-unit:
restart: on-failure:3
image: app-active/frontend:0.3
image: app-active/frontend:0.2.1
container_name: frontend-unit
hostname: frontend-unit
environment:
Expand Down
14 changes: 7 additions & 7 deletions appactive-demo/docker-compose-quick.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ services:
gateway:
container_name: gateway
hostname: gateway
image: appactiveio/gateway:0.3
image: appactiveio/gateway:0.2.1
ports:
- "80:80"
- "8090:8090"

storage:
restart: on-failure:3
image: appactiveio/storage:0.3
image: appactiveio/storage:0.2.1
container_name: storage
hostname: storage
environment:
Expand All @@ -57,7 +57,7 @@ services:

storage-unit:
restart: on-failure:3
image: appactiveio/storage:0.3
image: appactiveio/storage:0.2.1
container_name: storage-unit
hostname: storage-unit
environment:
Expand All @@ -79,7 +79,7 @@ services:

product:
restart: on-failure:3
image: appactiveio/product:0.3
image: appactiveio/product:0.2.1
container_name: product
hostname: product
environment:
Expand All @@ -101,7 +101,7 @@ services:

product-unit:
restart: on-failure:3
image: appactiveio/product:0.3
image: appactiveio/product:0.2.1
container_name: product-unit
hostname: product-unit
environment:
Expand All @@ -123,7 +123,7 @@ services:

frontend:
restart: on-failure:3
image: appactiveio/frontend:0.3
image: appactiveio/frontend:0.2.1
container_name: frontend
hostname: frontend
environment:
Expand All @@ -144,7 +144,7 @@ services:

frontend-unit:
restart: on-failure:3
image: appactiveio/frontend:0.3
image: appactiveio/frontend:0.2.1
container_name: frontend-unit
hostname: frontend-unit
environment:
Expand Down
14 changes: 7 additions & 7 deletions appactive-demo/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ services:
gateway:
container_name: gateway
hostname: gateway
image: app-active/gateway:0.3
image: app-active/gateway:0.2.1
ports:
- "80:80"
- "8090:8090"

storage:
build: ./storage
restart: on-failure:3
image: app-active/storage:0.3
image: app-active/storage:0.2.1
container_name: storage
hostname: storage
environment:
Expand All @@ -58,7 +58,7 @@ services:

storage-unit:
restart: on-failure:3
image: app-active/storage:0.3
image: app-active/storage:0.2.1
container_name: storage-unit
hostname: storage-unit
environment:
Expand All @@ -81,7 +81,7 @@ services:
product:
build: ./product
restart: on-failure:3
image: app-active/product:0.3
image: app-active/product:0.2.1
container_name: product
hostname: product
environment:
Expand All @@ -103,7 +103,7 @@ services:

product-unit:
restart: on-failure:3
image: app-active/product:0.3
image: app-active/product:0.2.1
container_name: product-unit
hostname: product-unit
environment:
Expand All @@ -126,7 +126,7 @@ services:
frontend:
build: ./frontend
restart: on-failure:3
image: app-active/frontend:0.3
image: app-active/frontend:0.2.1
container_name: frontend
hostname: frontend
environment:
Expand All @@ -147,7 +147,7 @@ services:

frontend-unit:
restart: on-failure:3
image: app-active/frontend:0.3
image: app-active/frontend:0.2.1
container_name: frontend-unit
hostname: frontend-unit
environment:
Expand Down
4 changes: 2 additions & 2 deletions appactive-demo/frontend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM openjdk:8-jdk-alpine

WORKDIR /app
COPY target/frontend-0.3.jar /app
COPY target/frontend-0.2.1.jar /app
# 设置文件夹操作权限
RUN chown -R root:root /app/* && \
chmod a+rw -R /app/*
Expand All @@ -15,5 +15,5 @@ ENV TZ=Asia/Shanghai \
LANG="en_US.UTF-8"

ENTRYPOINT ["sh", "-c"]
CMD ["java -jar /app/frontend-0.3.jar"]
CMD ["java -jar /app/frontend-0.2.1.jar"]
#CMD ["sleep 10m"]
8 changes: 4 additions & 4 deletions appactive-demo/frontend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@

<artifactId>frontend</artifactId>
<groupId>io.appactive.demo</groupId>
<version>0.3</version>
<version>0.2.1</version>

<parent>
<artifactId>appactive-demo</artifactId>
<groupId>com.alibaba.msha</groupId>
<version>0.3</version>
<version>0.2.1</version>
</parent>

<properties>
Expand All @@ -41,7 +41,7 @@
<dependency>
<groupId>io.appactive.demo</groupId>
<artifactId>common</artifactId>
<version>0.3</version>
<version>0.2.1</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
Expand Down Expand Up @@ -69,7 +69,7 @@
<dependency>
<groupId>com.alibaba.msha</groupId>
<artifactId>client-bridge-servlet</artifactId>
<version>0.3</version>
<version>0.2.1</version>
</dependency>

</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion appactive-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>msha-appactive</artifactId>
<groupId>com.alibaba.msha</groupId>
<version>0.3</version>
<version>0.2.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
4 changes: 2 additions & 2 deletions appactive-demo/product/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM openjdk:8-jdk-alpine

WORKDIR /app
COPY target/product-0.3.jar /app
COPY target/product-0.2.1.jar /app
# 设置文件夹操作权限
RUN chown -R root:root /app/* && \
chmod a+rw -R /app/*
Expand All @@ -15,4 +15,4 @@ ENV TZ=Asia/Shanghai \
LANG="en_US.UTF-8"

ENTRYPOINT ["sh", "-c"]
CMD ["java -jar /app/product-0.3.jar"]
CMD ["java -jar /app/product-0.2.1.jar"]
Loading

0 comments on commit 16b4822

Please sign in to comment.