wwwwww 部署微服务接口

config.xml

@@ -38,11 +38,11 @@
 	  git clone -b master $para2 eam_practice04/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd eam_practice04/
-      mvn clean package -Peamweb
-      cd eam-app/eam-app-eamweb
-      mvn -Peamweb docker:build
-      mvn -Peamweb docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/eam-app-eamweb.yaml iBizPractice --with-registry-auth
+      mvn clean package -Pwebapi
+      cd eam-provider/eam-provider-webapi
+      mvn -Pwebapi docker:build
+      mvn -Pwebapi docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/eam-provider-webapi.yaml iBizPractice --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

eam-app/eam-app-eamweb/src/main/docker/Dockerfile

@@ -2,13 +2,13 @@
 FROM openjdk:8-jre-alpine
 
 ENV SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \
-    IBZ_SLEEP=0 \
+    IBIZ_SLEEP=0 \
     JAVA_OPTS=""
 
-CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
-    sleep ${IBZ_SLEEP} && \
+CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
+    sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /eam-app-eamweb.jar
 
-EXPOSE 30009
+EXPOSE 8080
 
 ADD eam-app-eamweb.jar /eam-app-eamweb.jar

eam-app/eam-app-eamweb/src/main/docker/eam-app-eamweb.yaml

@@ -3,21 +3,9 @@ services:
   eam-app-eamweb:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/eam-app-eamweb:latest
     ports:
-      - "30009:30009"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=practice.ibizlab.cn
-      - SERVER_PORT=30009
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
-      - SPRING_REDIS_HOST=172.16.100.243
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_30c03252a
-      - SPRING_DATASOURCE_PASSWORD=@7@dd7d0
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_30c03252a?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_30c03252a
     deploy:
       mode: replicated
       replicas: 1

eam-boot/src/main/java/cn/ibizlab/eam/config/DevBootSecurityConfig.java

@@ -101,7 +101,10 @@ public class DevBootSecurityConfig extends WebSecurityConfigurerAdapter {
                         "/**/fonts/**",
                         "/**/js/**",
                         "/**/img/**",
-                        "/"
+                        "/",
+                        "webjars/**",
+                        "/swagger-resources/**",
+                        "/v2/**"
                 ).permitAll()
                     //放行登录请求
                    .antMatchers( HttpMethod.POST,"/"+loginPath).permitAll()

eam-provider/eam-provider-webapi/src/main/docker/Dockerfile

@@ -2,13 +2,13 @@
 FROM openjdk:8-jre-alpine
 
 ENV SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \
-    IBZ_SLEEP=0 \
+    IBIZ_SLEEP=0 \
     JAVA_OPTS=""
 
-CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
-    sleep ${IBZ_SLEEP} && \
+CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
+    sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /eam-provider-webapi.jar
 
-EXPOSE 8081
+EXPOSE 20009
 
 ADD eam-provider-webapi.jar /eam-provider-webapi.jar

eam-provider/eam-provider-webapi/src/main/docker/eam-provider-webapi.yaml

@@ -3,9 +3,21 @@ services:
   eam-provider-webapi:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/eam-provider-webapi:latest
     ports:
-      - "8081:8081"
+      - "20009:20009"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=practice.ibizlab.cn
+      - SERVER_PORT=20009
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
+      - SPRING_REDIS_HOST=172.16.100.243
+      - SPRING_REDIS_PORT=6379
+      - SPRING_REDIS_DATABASE=0
+      - SPRING_DATASOURCE_USERNAME=a_LAB01_30c03252a
+      - SPRING_DATASOURCE_PASSWORD=@7@dd7d0
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_30c03252a?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_30c03252a
     deploy:
       mode: replicated
       replicas: 1

eam-provider/eam-provider-webapi/src/main/java/cn/ibizlab/eam/webapi/config/WebApiSecurityConfig.java

@@ -106,7 +106,10 @@ public class WebApiSecurityConfig extends WebSecurityConfigurerAdapter {
                         "/**/fonts/**",
                         "/**/js/**",
                         "/**/img/**",
-                        "/"
+                        "/",
+                        "webjars/**",
+                        "/swagger-resources/**",
+                        "/v2/**"
                 ).permitAll()
                 //放行登录请求
                 .antMatchers( HttpMethod.POST,"/"+loginPath).permitAll()