feature 添加docker-compose.yml

docker-compose.yml

@@ -0,0 +1,62 @@
+version: '3'
+services:
+    eiam-console:
+        build:
+            context: ./eiam-console/
+            dockerfile: Dockerfile
+        environment:
+            MYSQL_HOST: 192.168.56.107
+            MYSQL_USER: root
+            MYSQL_PASSWORD: admin
+            ES_HOST: 192.168.56.107
+            REDIS_HOST: 192.168.56.107
+            REDIS_PASSWORD: 12345678
+        ports:
+            - 1898:1898
+        image: eiam-console
+        restart: always
+    eiam-openapi:
+        build:
+            context: ./eiam-openapi/
+            dockerfile: Dockerfile
+        environment:
+            MYSQL_HOST: 192.168.56.107
+            MYSQL_USER: root
+            MYSQL_PASSWORD: admin
+            ES_HOST: 192.168.56.107
+            REDIS_HOST: 192.168.56.107
+            REDIS_PASSWORD: 12345678
+        image: eiam-openapi
+        restart: always
+        ports:
+            - 1988:1988
+    eiam-portal:
+        build:
+            context: ./eiam-portal/
+            dockerfile: Dockerfile
+        environment:
+            MYSQL_HOST: 192.168.56.107
+            MYSQL_USER: root
+            MYSQL_PASSWORD: admin
+            ES_HOST: 192.168.56.107
+            REDIS_HOST: 192.168.56.107
+            REDIS_PASSWORD: 12345678
+        image: eiam-portal
+        restart: always
+        ports:
+            - 1989:1989
+    eiam-synchronizer:
+        build:
+            context: ./eiam-synchronizer/
+            dockerfile: Dockerfile
+        environment:
+            MYSQL_HOST: 192.168.56.107
+            MYSQL_USER: root
+            MYSQL_PASSWORD: admin
+            ES_HOST: 192.168.56.107
+            REDIS_HOST: 192.168.56.107
+            REDIS_PASSWORD: 12345678
+        image: eiam-synchronizer
+        restart: always
+        ports:
+            - 1986:1986

eiam-console/source.list

@@ -0,0 +1,10 @@
+deb http://mirrors.aliyun.com/ubuntu/ trusty main restricted universe multiverse
+deb http://mirrors.aliyun.com/ubuntu/ trusty-security main restricted universe multiverse
+deb http://mirrors.aliyun.com/ubuntu/ trusty-updates main restricted universe multiverse
+deb http://mirrors.aliyun.com/ubuntu/ trusty-proposed main restricted universe multiverse
+deb http://mirrors.aliyun.com/ubuntu/ trusty-backports main restricted universe multiverse
+deb-src http://mirrors.aliyun.com/ubuntu/ trusty main restricted universe multiverse
+deb-src http://mirrors.aliyun.com/ubuntu/ trusty-security main restricted universe multiverse
+deb-src http://mirrors.aliyun.com/ubuntu/ trusty-updates main restricted universe multiverse
+deb-src http://mirrors.aliyun.com/ubuntu/ trusty-proposed main restricted universe multiverse
+deb-src http://mirrors.aliyun.com/ubuntu/ trusty-backports main restricted universe multiverse

eiam-console/src/main/resources/application.yml

@@ -54,9 +54,9 @@ spring:
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://localhost:3306/eiam_develop?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true
+    url: jdbc:mysql://${MYSQL_HOST:localhost}:${MYSQL_PORT:3306}/eiam_develop?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true
-    username: 'eiam'
+    username: ${MYSQL_USER:'eiam'}
-    password: ''
+    password: ${MYSQL_PASSWORD:''}
     hikari:
       auto-commit: true
       connection-test-query: SELECT 1
@@ -68,9 +68,9 @@ spring:
       pool-name: eiam
   #reids
   redis:
-    host: localhost
+    host: ${REDIS_HOST:localhost}
-    port: 6379
+    port: ${REDIS_PORT:6379}
-    password: ''
+    password: ${REDIS_PASSWORD:''}
     database: 9
     lettuce:
       pool:
@@ -82,9 +82,9 @@ spring:
     timeout: 5000ms
   #elasticsearch
   elasticsearch:
-    uris: "http://localhost:9200"
+    uris: "http://${ES_HOST:localhost}:${ES_PORT:9200}"
-    username: "elastic"
+    username: ${ES_USER:"elastic"}
-    password: ""
+    password: ${ES_PASSWORD:""}
     socket-timeout: 30000s
     connection-timeout: 10000s
   data:
@@ -156,7 +156,7 @@ springdoc:
 #TopIAM
 topiam:
   server:
-    console-public-base-url:
+    console-public-base-url: https://localhost:1898
-    portal-public-base-url:
+    portal-public-base-url:  https://localhost:1989
-    openapi-public-base-url:
+    openapi-public-base-url: https://localhost:1988
-    synchronizer-public-base-url:
+    synchronizer-public-base-url: https://localhost:1986

eiam-core/src/main/java/cn/topiam/employee/core/configuration/EiamElasticsearchConfiguration.java

@@ -17,6 +17,8 @@
  */
 package cn.topiam.employee.core.configuration;
 
+import java.time.Duration;
+
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
 import org.elasticsearch.client.RestClientBuilder;
@@ -24,8 +26,6 @@ import org.springframework.boot.autoconfigure.elasticsearch.RestClientBuilderCus
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import java.time.Duration;
-
 /**
  * EiamElasticsearchConfiguration
  *

eiam-openapi/src/main/resources/application.yml

@@ -54,9 +54,9 @@ spring:
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://localhost:3306/eiam_develop?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true
+    url: jdbc:mysql://${MYSQL_HOST:localhost}:${MYSQL_PORT:3306}/eiam_develop?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true
-    username: 'eiam'
+    username: ${MYSQL_USER:'eiam'}
-    password: ''
+    password: ${MYSQL_PASSWORD:''}
     hikari:
       auto-commit: true
       connection-test-query: SELECT 1
@@ -68,9 +68,9 @@ spring:
       pool-name: eiam
   #reids
   redis:
-    host: localhost
+    host: ${REDIS_HOST:localhost}
-    port: 6379
+    port: ${REDIS_PORT:6379}
-    password: ''
+    password: ${REDIS_PASSWORD:''}
     database: 9
     lettuce:
       pool:
@@ -82,9 +82,9 @@ spring:
     timeout: 5000ms
   #elasticsearch
   elasticsearch:
-    uris: "http://localhost:9200"
+    uris: "http://${ES_HOST:localhost}:${ES_PORT:9200}"
-    username: "elastic"
+    username: ${ES_USER:"elastic"}
-    password: ""
+    password: ${ES_PASSWORD:""}
     socket-timeout: 30000s
     connection-timeout: 10000s
   data:
@@ -156,7 +156,7 @@ springdoc:
 #TopIAM
 topiam:
   server:
-    console-public-base-url:
+    console-public-base-url: https://localhost:1898
-    portal-public-base-url:
+    portal-public-base-url:  https://localhost:1989
-    openapi-public-base-url:
+    openapi-public-base-url: https://localhost:1988
-    synchronizer-public-base-url:
+    synchronizer-public-base-url: https://localhost:1986

eiam-portal/src/main/resources/application.yml

@@ -54,9 +54,9 @@ spring:
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://localhost:3306/eiam_develop?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true
+    url: jdbc:mysql://${MYSQL_HOST:localhost}:${MYSQL_PORT:3306}/eiam_develop?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true
-    username: 'eiam'
+    username: ${MYSQL_USER:'eiam'}
-    password: ''
+    password: ${MYSQL_PASSWORD:''}
     hikari:
       auto-commit: true
       connection-test-query: SELECT 1
@@ -68,9 +68,9 @@ spring:
       pool-name: eiam
   #reids
   redis:
-    host: localhost
+    host: ${REDIS_HOST:localhost}
-    port: 6379
+    port: ${REDIS_PORT:6379}
-    password: ''
+    password: ${REDIS_PASSWORD:''}
     database: 9
     lettuce:
       pool:
@@ -82,9 +82,9 @@ spring:
     timeout: 5000ms
   #elasticsearch
   elasticsearch:
-    uris: "http://localhost:9200"
+    uris: "http://${ES_HOST:localhost}:${ES_PORT:9200}"
-    username: "elastic"
+    username: ${ES_USER:"elastic"}
-    password: ""
+    password: ${ES_PASSWORD:""}
     socket-timeout: 30000s
     connection-timeout: 10000s
   data:
@@ -158,7 +158,7 @@ topiam:
   demo:
     open: true
   server:
-    console-public-base-url: https://eiam-console.topiam.cn
+    console-public-base-url: https://localhost:1898
-    portal-public-base-url:  https://eiam-portal.topiam.cn:8080
+    portal-public-base-url: https://localhost:1989
-    openapi-public-base-url:  https://eiam-openapi.topiam.cn
+    openapi-public-base-url: https://localhost:1988
-    synchronizer-public-base-url:  https://eia2m-synchronizer.topiam.cn
+    synchronizer-public-base-url: https://localhost:1986

eiam-synchronizer/src/main/resources/application.yml

@@ -54,9 +54,9 @@ spring:
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://localhost:3306/eiam_develop?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true
+    url: jdbc:mysql://${MYSQL_HOST:localhost}:${MYSQL_PORT:3306}/eiam_develop?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true
-    username: 'eiam'
+    username: ${MYSQL_USER:'eiam'}
-    password: ''
+    password: ${MYSQL_PASSWORD:''}
     hikari:
       auto-commit: true
       connection-test-query: SELECT 1
@@ -68,9 +68,9 @@ spring:
       pool-name: eiam
   #reids
   redis:
-    host: localhost
+    host: ${REDIS_HOST:localhost}
-    port: 6379
+    port: ${REDIS_PORT:6379}
-    password: ''
+    password: ${REDIS_PASSWORD:''}
     database: 9
     lettuce:
       pool:
@@ -156,7 +156,7 @@ springdoc:
 #TopIAM
 topiam:
   server:
-    console-public-base-url:
+    console-public-base-url: https://localhost:1898
-    portal-public-base-url:
+    portal-public-base-url: https://localhost:1989
-    openapi-public-base-url:
+    openapi-public-base-url: https://localhost:1988
-    synchronizer-public-base-url:
+    synchronizer-public-base-url: https://localhost:1986