diff --git a/xlcs-parent/pom.xml b/xlcs-parent/pom.xml
index 8bb425e..30378f7 100644
--- a/xlcs-parent/pom.xml
+++ b/xlcs-parent/pom.xml
@@ -40,7 +40,7 @@
2.10.1
2.3.0
2.0.9
- 3.4.1
+ 3.4.0
2.0
8
8
diff --git a/xlcs-parent/service-gateway/Dockerfile b/xlcs-parent/service-gateway/Dockerfile
index be6151b..06cd840 100644
--- a/xlcs-parent/service-gateway/Dockerfile
+++ b/xlcs-parent/service-gateway/Dockerfile
@@ -1,6 +1,57 @@
-FROM openjdk:8-jdk-alpine
+FROM apache/skywalking-java-agent:9.1.0-java8
LABEL authors="yovinchen"
-VOLUME /tmp
-ADD ./target/service-gateway.jar service-gateway.jar
-ENTRYPOINT ["java","-jar","/service-gateway.jar", "&"]
+LABEL name="service-gateway"
+
+ARG APP_NAME="service-gateway"
+ARG JAR_FILE="${APP_NAME}.jar"
+ARG WORK_PATH="/skywalking"
+
+ENV JAR_FILE=${JAR_FILE}
+ENV SW_AGENT_NAME=${APP_NAME}
+ENV SW_AGENT_COLLECTOR_BACKEND_SERVICES="10.211.55.50:11800"
+
+RUN rm /skywalking/agent/plugins/apm-armeria-* \
+ /skywalking/agent/plugins/apm-cxf-* \
+ /skywalking/agent/plugins/apm-dubbo-* \
+ /skywalking/agent/plugins/apm-elasticsearch-* \
+ /skywalking/agent/plugins/apm-feign-* \
+ /skywalking/agent/plugins/apm-grizzly-* \
+ /skywalking/agent/plugins/apm-grpc-* \
+ /skywalking/agent/plugins/apm-h2-* \
+ /skywalking/agent/plugins/apm-hbase-* \
+ /skywalking/agent/plugins/apm-httpclient-* \
+ /skywalking/agent/plugins/apm-httpClient-* \
+ /skywalking/agent/plugins/apm-mongodb-* \
+ /skywalking/agent/plugins/apm-mysql-* \
+ /skywalking/agent/plugins/apm-netty-socketio-* \
+ /skywalking/agent/plugins/apm-nutz-http-* \
+ /skywalking/agent/plugins/apm-nutz-mvc-annotation-* \
+ /skywalking/agent/plugins/apm-okhttp-* \
+ /skywalking/agent/plugins/apm-play-* \
+ /skywalking/agent/plugins/apm-rocketmq-* \
+ /skywalking/agent/plugins/apm-spring-cloud-feign-* \
+ /skywalking/agent/plugins/apm-spring-core-patch-* \
+ /skywalking/agent/plugins/apm-springmvc-annotation-* \
+ /skywalking/agent/plugins/apm-tomcat-* \
+ /skywalking/agent/plugins/apm-xxl-job-* \
+ /skywalking/agent/plugins/micronaut-http-client-* \
+ /skywalking/agent/plugins/micronaut-http-server-* \
+ /skywalking/agent/plugins/spring-webflux-5.x-webclient-* \
+ /skywalking/agent/plugins/websphere-liberty-* \
+ /skywalking/agent/plugins/graphql-* \
+ /skywalking/agent/plugins/jedis-* \
+ /skywalking/agent/plugins/jsonrpc4j-* \
+ /skywalking/agent/plugins/motan-* \
+ /skywalking/agent/plugins/nats-* \
+ /skywalking/agent/plugins/okhttp-* \
+ /skywalking/agent/plugins/sofa-rpc-* \
+ /skywalking/agent/plugins/thrift-*
+
+RUN cp /skywalking/agent/optional-plugins/apm-spring-cloud-gateway-*.jar /skywalking/agent/plugins/
+
+COPY ./target/$JAR_FILE $JAR_FILE
+
+WORKDIR $WORK_PATH
+ENTRYPOINT exec java -jar $JAR_FILE
+
diff --git a/xlcs-parent/service-gateway/pom.xml b/xlcs-parent/service-gateway/pom.xml
index 6a2bfe9..840a29c 100644
--- a/xlcs-parent/service-gateway/pom.xml
+++ b/xlcs-parent/service-gateway/pom.xml
@@ -24,7 +24,6 @@
apm-toolkit-trace
9.1.0
-
@@ -43,10 +42,6 @@
com.alibaba.cloud
spring-cloud-starter-alibaba-nacos-discovery
-
- org.springframework.boot
- spring-boot-starter-aop
-
com.alibaba.cloud
spring-cloud-starter-alibaba-nacos-config
diff --git a/xlcs-parent/service/pom.xml b/xlcs-parent/service/pom.xml
index 96ae0ba..9b6f9f5 100644
--- a/xlcs-parent/service/pom.xml
+++ b/xlcs-parent/service/pom.xml
@@ -37,18 +37,16 @@
-
-
+
+ org.springframework.boot
+ spring-boot-starter-aop
+
org.apache.skywalking
apm-toolkit-trace
9.1.0
-
- org.springframework.boot
- spring-boot-starter-aop
-
diff --git a/xlcs-parent/service/service-acl/Dockerfile b/xlcs-parent/service/service-acl/Dockerfile
index bdf442a..fab140b 100644
--- a/xlcs-parent/service/service-acl/Dockerfile
+++ b/xlcs-parent/service/service-acl/Dockerfile
@@ -1,5 +1,35 @@
-FROM openjdk:8-jdk-alpine
+FROM apache/skywalking-java-agent:9.1.0-java8
LABEL authors="yovinchen"
-VOLUME /tmp
-ADD ./target/service-acl.jar service-acl.jar
-ENTRYPOINT ["java","-jar","/service-acl.jar", "&"]
+
+ARG APP_NAME="service-acl"
+ARG JAR_FILE="${APP_NAME}.jar"
+ARG WORK_PATH="/skywalking"
+
+ENV JAR_FILE=${JAR_FILE}
+ENV SW_AGENT_NAME=${APP_NAME}
+ENV SW_AGENT_COLLECTOR_BACKEND_SERVICES="10.211.55.50:11800"
+
+RUN rm /skywalking/agent/plugins/apm-cxf-* \
+ /skywalking/agent/plugins/apm-dubbo-* \
+ /skywalking/agent/plugins/apm-grizzly-* \
+ /skywalking/agent/plugins/apm-grpc-* \
+ /skywalking/agent/plugins/apm-h2-* \
+ /skywalking/agent/plugins/apm-hbase-* \
+ /skywalking/agent/plugins/apm-mongodb-* \
+ /skywalking/agent/plugins/apm-netty-socketio-* \
+ /skywalking/agent/plugins/apm-nutz-http-* \
+ /skywalking/agent/plugins/apm-play-* \
+ /skywalking/agent/plugins/apm-rocketmq-* \
+ /skywalking/agent/plugins/micronaut-http-client-* \
+ /skywalking/agent/plugins/micronaut-http-server-* \
+ /skywalking/agent/plugins/websphere-liberty-* \
+ /skywalking/agent/plugins/graphql-* \
+ /skywalking/agent/plugins/motan-* \
+ /skywalking/agent/plugins/nats-* \
+ /skywalking/agent/plugins/sofa-rpc-* \
+ /skywalking/agent/plugins/thrift-*
+
+COPY ./target/$JAR_FILE $JAR_FILE
+
+WORKDIR $WORK_PATH
+ENTRYPOINT exec java -jar $JAR_FILE
diff --git a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/controller/RoleController.java b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/controller/RoleController.java
index aa43584..df2bab9 100644
--- a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/controller/RoleController.java
+++ b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/controller/RoleController.java
@@ -1,12 +1,12 @@
package com.yovinchen.xlcs.acl.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yovinchen.xlcs.acl.service.PermissionService;
import com.yovinchen.xlcs.acl.service.RoleService;
import com.yovinchen.xlcs.common.result.Result;
import com.yovinchen.xlcs.model.acl.Role;
import com.yovinchen.xlcs.vo.acl.RoleQueryVo;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -103,7 +103,6 @@ public class RoleController {
@ApiOperation(value = "根据id列表删除角色")
@DeleteMapping("batchRemove")
public Result batchRemove(@RequestBody List idList) {
- // TODO
try {
boolean result = roleService.removeByIds(idList);
return result ? Result.ok(null) : Result.fail(null);
@@ -116,7 +115,6 @@ public class RoleController {
@ApiOperation(value = "获取一个角色的所有权限列表")
@GetMapping("toAssign/{id}")
public Result toAssign(@PathVariable Long id) {
-// TODO
try {
Map result = permissionService.getPermissionById(id);
return Result.ok(result);
diff --git a/xlcs-parent/service/service-acl/src/main/resources/application.yml b/xlcs-parent/service/service-acl/src/main/resources/application.yml
index d8fc938..7266200 100644
--- a/xlcs-parent/service/service-acl/src/main/resources/application.yml
+++ b/xlcs-parent/service/service-acl/src/main/resources/application.yml
@@ -1,5 +1,3 @@
-server:
- port: 8201
spring:
application:
name: service-acl
@@ -11,5 +9,7 @@ spring:
server-addr: 82.157.68.223:8848
username: nacos
password: nacos
+server:
+ port: 8201
application:
version: v1.0.0
diff --git a/xlcs-parent/service/service-acl/src/main/resources/logback-spring.xml b/xlcs-parent/service/service-acl/src/main/resources/logback-spring.xml
index 1bb2098..7000feb 100644
--- a/xlcs-parent/service/service-acl/src/main/resources/logback-spring.xml
+++ b/xlcs-parent/service/service-acl/src/main/resources/logback-spring.xml
@@ -12,6 +12,7 @@
+
diff --git a/xlcs-parent/service/service-activity/Dockerfile b/xlcs-parent/service/service-activity/Dockerfile
index 868fb2d..8b7a3b8 100644
--- a/xlcs-parent/service/service-activity/Dockerfile
+++ b/xlcs-parent/service/service-activity/Dockerfile
@@ -1,5 +1,35 @@
-FROM openjdk:8-jdk-alpine
+FROM apache/skywalking-java-agent:9.1.0-java8
LABEL authors="yovinchen"
-VOLUME /tmp
-ADD ./target/service-activity.jar service-activity.jar
-ENTRYPOINT ["java","-jar","/service-activity.jar", "&"]
+
+ARG APP_NAME="service-activity"
+ARG JAR_FILE="${APP_NAME}.jar"
+ARG WORK_PATH="/skywalking"
+
+ENV JAR_FILE=${JAR_FILE}
+ENV SW_AGENT_NAME=${APP_NAME}
+ENV SW_AGENT_COLLECTOR_BACKEND_SERVICES="10.211.55.50:11800"
+
+RUN rm /skywalking/agent/plugins/apm-cxf-* \
+ /skywalking/agent/plugins/apm-dubbo-* \
+ /skywalking/agent/plugins/apm-grizzly-* \
+ /skywalking/agent/plugins/apm-grpc-* \
+ /skywalking/agent/plugins/apm-h2-* \
+ /skywalking/agent/plugins/apm-hbase-* \
+ /skywalking/agent/plugins/apm-mongodb-* \
+ /skywalking/agent/plugins/apm-netty-socketio-* \
+ /skywalking/agent/plugins/apm-nutz-http-* \
+ /skywalking/agent/plugins/apm-play-* \
+ /skywalking/agent/plugins/apm-rocketmq-* \
+ /skywalking/agent/plugins/micronaut-http-client-* \
+ /skywalking/agent/plugins/micronaut-http-server-* \
+ /skywalking/agent/plugins/websphere-liberty-* \
+ /skywalking/agent/plugins/graphql-* \
+ /skywalking/agent/plugins/motan-* \
+ /skywalking/agent/plugins/nats-* \
+ /skywalking/agent/plugins/sofa-rpc-* \
+ /skywalking/agent/plugins/thrift-*
+
+COPY ./target/$JAR_FILE $JAR_FILE
+
+WORKDIR $WORK_PATH
+ENTRYPOINT exec java -jar $JAR_FILE
diff --git a/xlcs-parent/service/service-cart/Dockerfile b/xlcs-parent/service/service-cart/Dockerfile
index ae01fcb..50a7ab8 100644
--- a/xlcs-parent/service/service-cart/Dockerfile
+++ b/xlcs-parent/service/service-cart/Dockerfile
@@ -1,5 +1,36 @@
-FROM openjdk:8-jdk-alpine
+FROM apache/skywalking-java-agent:9.1.0-java8
LABEL authors="yovinchen"
-VOLUME /tmp
-ADD ./target/service-cart.jar service-cart.jar
-ENTRYPOINT ["java","-jar","/service-cart.jar", "&"]
+
+ARG APP_NAME="service-cart"
+ARG JAR_FILE="${APP_NAME}.jar"
+ARG WORK_PATH="/skywalking"
+
+ENV JAR_FILE=${JAR_FILE}
+ENV SW_AGENT_NAME=${APP_NAME}
+ENV SW_AGENT_COLLECTOR_BACKEND_SERVICES="10.211.55.50:11800"
+
+RUN rm /skywalking/agent/plugins/apm-cxf-* \
+ /skywalking/agent/plugins/apm-dubbo-* \
+ /skywalking/agent/plugins/apm-grizzly-* \
+ /skywalking/agent/plugins/apm-grpc-* \
+ /skywalking/agent/plugins/apm-h2-* \
+ /skywalking/agent/plugins/apm-hbase-* \
+ /skywalking/agent/plugins/apm-mongodb-* \
+ /skywalking/agent/plugins/apm-netty-socketio-* \
+ /skywalking/agent/plugins/apm-nutz-http-* \
+ /skywalking/agent/plugins/apm-play-* \
+ /skywalking/agent/plugins/apm-rocketmq-* \
+ /skywalking/agent/plugins/micronaut-http-client-* \
+ /skywalking/agent/plugins/micronaut-http-server-* \
+ /skywalking/agent/plugins/websphere-liberty-* \
+ /skywalking/agent/plugins/graphql-* \
+ /skywalking/agent/plugins/motan-* \
+ /skywalking/agent/plugins/nats-* \
+ /skywalking/agent/plugins/sofa-rpc-* \
+ /skywalking/agent/plugins/thrift-*
+
+COPY ./target/$JAR_FILE $JAR_FILE
+
+WORKDIR $WORK_PATH
+ENTRYPOINT exec java -jar $JAR_FILE
+
diff --git a/xlcs-parent/service/service-home/Dockerfile b/xlcs-parent/service/service-home/Dockerfile
index ccfeb1e..ea02e4e 100644
--- a/xlcs-parent/service/service-home/Dockerfile
+++ b/xlcs-parent/service/service-home/Dockerfile
@@ -1,5 +1,35 @@
-FROM openjdk:8-jdk-alpine
+FROM apache/skywalking-java-agent:9.1.0-java8
LABEL authors="yovinchen"
-VOLUME /tmp
-ADD ./target/service-home.jar service-home.jar
-ENTRYPOINT ["java","-jar","/service-home.jar", "&"]
+
+ARG APP_NAME="service-home"
+ARG JAR_FILE="${APP_NAME}.jar"
+ARG WORK_PATH="/skywalking"
+
+ENV JAR_FILE=${JAR_FILE}
+ENV SW_AGENT_NAME=${APP_NAME}
+ENV SW_AGENT_COLLECTOR_BACKEND_SERVICES="10.211.55.50:11800"
+
+RUN rm /skywalking/agent/plugins/apm-cxf-* \
+ /skywalking/agent/plugins/apm-dubbo-* \
+ /skywalking/agent/plugins/apm-grizzly-* \
+ /skywalking/agent/plugins/apm-grpc-* \
+ /skywalking/agent/plugins/apm-h2-* \
+ /skywalking/agent/plugins/apm-hbase-* \
+ /skywalking/agent/plugins/apm-mongodb-* \
+ /skywalking/agent/plugins/apm-netty-socketio-* \
+ /skywalking/agent/plugins/apm-nutz-http-* \
+ /skywalking/agent/plugins/apm-play-* \
+ /skywalking/agent/plugins/apm-rocketmq-* \
+ /skywalking/agent/plugins/micronaut-http-client-* \
+ /skywalking/agent/plugins/micronaut-http-server-* \
+ /skywalking/agent/plugins/websphere-liberty-* \
+ /skywalking/agent/plugins/graphql-* \
+ /skywalking/agent/plugins/motan-* \
+ /skywalking/agent/plugins/nats-* \
+ /skywalking/agent/plugins/sofa-rpc-* \
+ /skywalking/agent/plugins/thrift-*
+
+COPY ./target/$JAR_FILE $JAR_FILE
+
+WORKDIR $WORK_PATH
+ENTRYPOINT exec java -jar $JAR_FILE
diff --git a/xlcs-parent/service/service-order/Dockerfile b/xlcs-parent/service/service-order/Dockerfile
index 7bd2d16..635411c 100644
--- a/xlcs-parent/service/service-order/Dockerfile
+++ b/xlcs-parent/service/service-order/Dockerfile
@@ -1,5 +1,35 @@
-FROM openjdk:8-jdk-alpine
+FROM apache/skywalking-java-agent:9.1.0-java8
LABEL authors="yovinchen"
-VOLUME /tmp
-ADD ./target/service-order.jar service-order.jar
-ENTRYPOINT ["java","-jar","/service-order.jar", "&"]
+
+ARG APP_NAME="service-order"
+ARG JAR_FILE="${APP_NAME}.jar"
+ARG WORK_PATH="/skywalking"
+
+ENV JAR_FILE=${JAR_FILE}
+ENV SW_AGENT_NAME=${APP_NAME}
+ENV SW_AGENT_COLLECTOR_BACKEND_SERVICES="10.211.55.50:11800"
+
+RUN rm /skywalking/agent/plugins/apm-cxf-* \
+ /skywalking/agent/plugins/apm-dubbo-* \
+ /skywalking/agent/plugins/apm-grizzly-* \
+ /skywalking/agent/plugins/apm-grpc-* \
+ /skywalking/agent/plugins/apm-h2-* \
+ /skywalking/agent/plugins/apm-hbase-* \
+ /skywalking/agent/plugins/apm-mongodb-* \
+ /skywalking/agent/plugins/apm-netty-socketio-* \
+ /skywalking/agent/plugins/apm-nutz-http-* \
+ /skywalking/agent/plugins/apm-play-* \
+ /skywalking/agent/plugins/apm-rocketmq-* \
+ /skywalking/agent/plugins/micronaut-http-client-* \
+ /skywalking/agent/plugins/micronaut-http-server-* \
+ /skywalking/agent/plugins/websphere-liberty-* \
+ /skywalking/agent/plugins/graphql-* \
+ /skywalking/agent/plugins/motan-* \
+ /skywalking/agent/plugins/nats-* \
+ /skywalking/agent/plugins/sofa-rpc-* \
+ /skywalking/agent/plugins/thrift-*
+
+COPY ./target/$JAR_FILE $JAR_FILE
+
+WORKDIR $WORK_PATH
+ENTRYPOINT exec java -jar $JAR_FILE
diff --git a/xlcs-parent/service/service-payment/Dockerfile b/xlcs-parent/service/service-payment/Dockerfile
index b04938c..efecddf 100644
--- a/xlcs-parent/service/service-payment/Dockerfile
+++ b/xlcs-parent/service/service-payment/Dockerfile
@@ -1,5 +1,35 @@
-FROM openjdk:8-jdk-alpine
+FROM apache/skywalking-java-agent:9.1.0-java8
LABEL authors="yovinchen"
-VOLUME /tmp
-ADD ./target/service-payment.jar service-order.jar
-ENTRYPOINT ["java","-jar","/service-payment.jar", "&"]
+
+ARG APP_NAME="service-payment"
+ARG JAR_FILE="${APP_NAME}.jar"
+ARG WORK_PATH="/skywalking"
+
+ENV JAR_FILE=${JAR_FILE}
+ENV SW_AGENT_NAME=${APP_NAME}
+ENV SW_AGENT_COLLECTOR_BACKEND_SERVICES="10.211.55.50:11800"
+
+RUN rm /skywalking/agent/plugins/apm-cxf-* \
+ /skywalking/agent/plugins/apm-dubbo-* \
+ /skywalking/agent/plugins/apm-grizzly-* \
+ /skywalking/agent/plugins/apm-grpc-* \
+ /skywalking/agent/plugins/apm-h2-* \
+ /skywalking/agent/plugins/apm-hbase-* \
+ /skywalking/agent/plugins/apm-mongodb-* \
+ /skywalking/agent/plugins/apm-netty-socketio-* \
+ /skywalking/agent/plugins/apm-nutz-http-* \
+ /skywalking/agent/plugins/apm-play-* \
+ /skywalking/agent/plugins/apm-rocketmq-* \
+ /skywalking/agent/plugins/micronaut-http-client-* \
+ /skywalking/agent/plugins/micronaut-http-server-* \
+ /skywalking/agent/plugins/websphere-liberty-* \
+ /skywalking/agent/plugins/graphql-* \
+ /skywalking/agent/plugins/motan-* \
+ /skywalking/agent/plugins/nats-* \
+ /skywalking/agent/plugins/sofa-rpc-* \
+ /skywalking/agent/plugins/thrift-*
+
+COPY ./target/$JAR_FILE $JAR_FILE
+
+WORKDIR $WORK_PATH
+ENTRYPOINT exec java -jar $JAR_FILE
diff --git a/xlcs-parent/service/service-product/Dockerfile b/xlcs-parent/service/service-product/Dockerfile
index 1f56042..c28c6f4 100644
--- a/xlcs-parent/service/service-product/Dockerfile
+++ b/xlcs-parent/service/service-product/Dockerfile
@@ -1,5 +1,35 @@
-FROM openjdk:8-jdk-alpine
+FROM apache/skywalking-java-agent:9.1.0-java8
LABEL authors="yovinchen"
-VOLUME /tmp
-ADD ./target/service-product.jar service-product.jar
-ENTRYPOINT ["java","-jar","/service-product.jar", "&"]
+
+ARG APP_NAME="service-product"
+ARG JAR_FILE="${APP_NAME}.jar"
+ARG WORK_PATH="/skywalking"
+
+ENV JAR_FILE=${JAR_FILE}
+ENV SW_AGENT_NAME=${APP_NAME}
+ENV SW_AGENT_COLLECTOR_BACKEND_SERVICES="10.211.55.50:11800"
+
+RUN rm /skywalking/agent/plugins/apm-cxf-* \
+ /skywalking/agent/plugins/apm-dubbo-* \
+ /skywalking/agent/plugins/apm-grizzly-* \
+ /skywalking/agent/plugins/apm-grpc-* \
+ /skywalking/agent/plugins/apm-h2-* \
+ /skywalking/agent/plugins/apm-hbase-* \
+ /skywalking/agent/plugins/apm-mongodb-* \
+ /skywalking/agent/plugins/apm-netty-socketio-* \
+ /skywalking/agent/plugins/apm-nutz-http-* \
+ /skywalking/agent/plugins/apm-play-* \
+ /skywalking/agent/plugins/apm-rocketmq-* \
+ /skywalking/agent/plugins/micronaut-http-client-* \
+ /skywalking/agent/plugins/micronaut-http-server-* \
+ /skywalking/agent/plugins/websphere-liberty-* \
+ /skywalking/agent/plugins/graphql-* \
+ /skywalking/agent/plugins/motan-* \
+ /skywalking/agent/plugins/nats-* \
+ /skywalking/agent/plugins/sofa-rpc-* \
+ /skywalking/agent/plugins/thrift-*
+
+COPY ./target/$JAR_FILE $JAR_FILE
+
+WORKDIR $WORK_PATH
+ENTRYPOINT exec java -jar $JAR_FILE
diff --git a/xlcs-parent/service/service-search/Dockerfile b/xlcs-parent/service/service-search/Dockerfile
index 51f1f90..7378205 100644
--- a/xlcs-parent/service/service-search/Dockerfile
+++ b/xlcs-parent/service/service-search/Dockerfile
@@ -1,5 +1,36 @@
-FROM openjdk:8-jdk-alpine
+FROM apache/skywalking-java-agent:9.1.0-java8
LABEL authors="yovinchen"
-VOLUME /tmp
-ADD ./target/service-search.jar service-search.jar
-ENTRYPOINT ["java","-jar","/service-search.jar", "&"]
+
+ARG APP_NAME="service-search"
+ARG JAR_FILE="${APP_NAME}.jar"
+ARG WORK_PATH="/skywalking"
+
+ENV JAR_FILE=${JAR_FILE}
+ENV SW_AGENT_NAME=${APP_NAME}
+ENV SW_AGENT_COLLECTOR_BACKEND_SERVICES="10.211.55.50:11800"
+
+RUN rm /skywalking/agent/plugins/apm-cxf-* \
+ /skywalking/agent/plugins/apm-dubbo-* \
+ /skywalking/agent/plugins/apm-grizzly-* \
+ /skywalking/agent/plugins/apm-grpc-* \
+ /skywalking/agent/plugins/apm-h2-* \
+ /skywalking/agent/plugins/apm-hbase-* \
+ /skywalking/agent/plugins/apm-mongodb-* \
+ /skywalking/agent/plugins/apm-netty-socketio-* \
+ /skywalking/agent/plugins/apm-nutz-http-* \
+ /skywalking/agent/plugins/apm-play-* \
+ /skywalking/agent/plugins/apm-rocketmq-* \
+ /skywalking/agent/plugins/micronaut-http-client-* \
+ /skywalking/agent/plugins/micronaut-http-server-* \
+ /skywalking/agent/plugins/websphere-liberty-* \
+ /skywalking/agent/plugins/graphql-* \
+ /skywalking/agent/plugins/motan-* \
+ /skywalking/agent/plugins/nats-* \
+ /skywalking/agent/plugins/sofa-rpc-* \
+ /skywalking/agent/plugins/thrift-*
+
+COPY ./target/$JAR_FILE $JAR_FILE
+
+WORKDIR $WORK_PATH
+ENTRYPOINT exec java -jar $JAR_FILE
+
diff --git a/xlcs-parent/service/service-sys/Dockerfile b/xlcs-parent/service/service-sys/Dockerfile
index 243b9e6..5fbc520 100644
--- a/xlcs-parent/service/service-sys/Dockerfile
+++ b/xlcs-parent/service/service-sys/Dockerfile
@@ -1,5 +1,36 @@
-FROM openjdk:8-jdk-alpine
+FROM apache/skywalking-java-agent:9.1.0-java8
LABEL authors="yovinchen"
-VOLUME /tmp
-ADD ./target/service-sys.jar service-sys.jar
-ENTRYPOINT ["java","-jar","/service-sys.jar", "&"]
+
+ARG APP_NAME="service-sys"
+ARG JAR_FILE="${APP_NAME}.jar"
+ARG WORK_PATH="/skywalking"
+
+ENV JAR_FILE=${JAR_FILE}
+ENV SW_AGENT_NAME=${APP_NAME}
+ENV SW_AGENT_COLLECTOR_BACKEND_SERVICES="10.211.55.50:11800"
+
+RUN rm /skywalking/agent/plugins/apm-cxf-* \
+ /skywalking/agent/plugins/apm-dubbo-* \
+ /skywalking/agent/plugins/apm-grizzly-* \
+ /skywalking/agent/plugins/apm-grpc-* \
+ /skywalking/agent/plugins/apm-h2-* \
+ /skywalking/agent/plugins/apm-hbase-* \
+ /skywalking/agent/plugins/apm-mongodb-* \
+ /skywalking/agent/plugins/apm-netty-socketio-* \
+ /skywalking/agent/plugins/apm-nutz-http-* \
+ /skywalking/agent/plugins/apm-play-* \
+ /skywalking/agent/plugins/apm-rocketmq-* \
+ /skywalking/agent/plugins/micronaut-http-client-* \
+ /skywalking/agent/plugins/micronaut-http-server-* \
+ /skywalking/agent/plugins/websphere-liberty-* \
+ /skywalking/agent/plugins/graphql-* \
+ /skywalking/agent/plugins/motan-* \
+ /skywalking/agent/plugins/nats-* \
+ /skywalking/agent/plugins/sofa-rpc-* \
+ /skywalking/agent/plugins/thrift-*
+
+COPY ./target/$JAR_FILE $JAR_FILE
+
+WORKDIR $WORK_PATH
+ENTRYPOINT exec java -jar $JAR_FILE
+
diff --git a/xlcs-parent/service/service-user/Dockerfile b/xlcs-parent/service/service-user/Dockerfile
index f4e1a79..2cf21c6 100644
--- a/xlcs-parent/service/service-user/Dockerfile
+++ b/xlcs-parent/service/service-user/Dockerfile
@@ -1,5 +1,37 @@
-FROM openjdk:8-jdk-alpine
+FROM apache/skywalking-java-agent:9.1.0-java8
LABEL authors="yovinchen"
-VOLUME /tmp
-ADD ./target/service-user.jar service-user.jar
-ENTRYPOINT ["java","-jar","/service-user.jar", "&"]
+
+ARG APP_NAME="service-user"
+ARG JAR_FILE="${APP_NAME}.jar"
+ARG WORK_PATH="/skywalking"
+
+ENV JAR_FILE=${JAR_FILE}
+ENV SW_AGENT_NAME=${APP_NAME}
+ENV SW_AGENT_COLLECTOR_BACKEND_SERVICES="10.211.55.50:11800"
+
+RUN rm /skywalking/agent/plugins/apm-cxf-* \
+ /skywalking/agent/plugins/apm-dubbo-* \
+ /skywalking/agent/plugins/apm-grizzly-* \
+ /skywalking/agent/plugins/apm-grpc-* \
+ /skywalking/agent/plugins/apm-h2-* \
+ /skywalking/agent/plugins/apm-hbase-* \
+ /skywalking/agent/plugins/apm-mongodb-* \
+ /skywalking/agent/plugins/apm-netty-socketio-* \
+ /skywalking/agent/plugins/apm-nutz-http-* \
+ /skywalking/agent/plugins/apm-play-* \
+ /skywalking/agent/plugins/apm-rocketmq-* \
+ /skywalking/agent/plugins/micronaut-http-client-* \
+ /skywalking/agent/plugins/micronaut-http-server-* \
+ /skywalking/agent/plugins/websphere-liberty-* \
+ /skywalking/agent/plugins/graphql-* \
+ /skywalking/agent/plugins/motan-* \
+ /skywalking/agent/plugins/nats-* \
+ /skywalking/agent/plugins/sofa-rpc-* \
+ /skywalking/agent/plugins/thrift-*
+
+COPY ./target/$JAR_FILE $JAR_FILE
+
+WORKDIR $WORK_PATH
+ENTRYPOINT exec java -jar $JAR_FILE
+
+
diff --git a/xlcs-user/pages/login/login.vue b/xlcs-user/pages/login/login.vue
index 1986f31..62db27e 100644
--- a/xlcs-user/pages/login/login.vue
+++ b/xlcs-user/pages/login/login.vue
@@ -1,7 +1,7 @@
- 欢迎登陆小鹿超市
+ 欢迎登录小鹿超市