Browse Source

调整dmp-admin为SpringCloud应用,添加配置文件

lijie 3 years ago
parent
commit
d827118964

+ 21 - 0
dmp-admin/pom.xml

@@ -83,6 +83,27 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-amqp</artifactId>
         </dependency>
+        <!-- 注册中心 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>HdrHistogram</artifactId>
+                    <groupId>org.hdrhistogram</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>guava</artifactId>
+                    <groupId>com.google.guava</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- 配置中心 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-config</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

+ 2 - 0
dmp-admin/src/main/java/com/persagy/dmp/admin/AdminApp.java

@@ -12,6 +12,7 @@ import org.apache.shiro.mgt.SecurityManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 
@@ -24,6 +25,7 @@ import javax.persistence.EntityManager;
  */
 @Slf4j
 @SpringBootApplication
+@EnableDiscoveryClient
 public class AdminApp {
 
 	public static void main(String[] args) {

+ 0 - 9
dmp-admin/src/main/resources/application-dev.yml

@@ -1,9 +0,0 @@
-server:
-  port: 8839
-persagy:
-  dmp:
-    server: http://192.168.64.18:9930
-    exchange: exchange-dmp
-    admin:
-      routingKey: routing-dmp-admin
-      queue: queue-dmp-admin

+ 0 - 43
dmp-admin/src/main/resources/application.yml

@@ -1,43 +0,0 @@
-server:
-  port: 8839
-persagy:
-  dmp:
-    server: http://192.168.64.18:9930
-#    server: http://39.102.40.239:9970
-    exchange: exchange-dmp
-    admin:
-      routingKey: routing-dmp-admin
-      queue: queue-dmp-admin
-spring:
-  application:
-    name: dmp-admin
-  profiles:
-    active:
-    - dev
-  datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.64.15:9934/dmp_admin?useUnicode=true&characterEncoding=utf-8&mysqlEncoding=utf8&useSSL=false
-    username: root
-    password: brzj123456
-    type: com.alibaba.druid.pool.DruidDataSource
-  jpa:
-    show-sql: true
-    hibernate:
-      ddl-auto: none
-  rabbitmq:
-    host: 192.168.64.15
-    port: 9936
-    username: admin
-    password: brzj123456
-    virtual-host: /test
-  redis:
-    database: 10
-    host: 192.168.64.15
-    password: brzj123456
-    port: 9944
-    timeout: 6000
-    pool:
-      max-idle: 200
-      min-idle: 5
-      max-active: 1024
-      max-wait: 1000

dmp-admin/src/main/resources/application-aliyun-test.yml → dmp-admin/src/main/resources/bootstrap-aliyun-test.yml


+ 7 - 0
dmp-admin/src/main/resources/bootstrap-dev.yml

@@ -0,0 +1,7 @@
+server:
+  port: 8839
+spring:
+  cloud:
+    config:
+      profile: dev2
+      uri: http://192.168.64.18:9932

dmp-admin/src/main/resources/application-test.yml → dmp-admin/src/main/resources/bootstrap-test.yml


+ 7 - 0
dmp-admin/src/main/resources/bootstrap.yml

@@ -0,0 +1,7 @@
+server:
+  port: 8839
+spring:
+  application:
+    name: dmp-admin
+  profiles:
+    active: dev

+ 2 - 5
dmp-alarm/src/main/resources/bootstrap.yml

@@ -2,7 +2,7 @@ spring:
   application:
     name: dmp-alarm
   profiles:
-    active: log-dev
+    active: dev
   cloud:
     config:
 #      profile: dev2
@@ -14,7 +14,4 @@ spring:
 #      uri: http://192.168.64.18:9932
 persagy:
   log:
-    path: ../logs/dmp-alarm/
-eureka:
-  client:
-    register-with-eureka: false
+    path: ../logs/dmp-alarm/

+ 3 - 3
dmp-alarm/src/main/resources/logback-spring.xml

@@ -30,7 +30,7 @@
     <logger name="com.netflix" level="WARN"/>
     <logger name="org.apache.http" level="INFO"/>
 
-    <springProfile name="log-dev">
+    <springProfile name="dev">
         <logger name="org.hibernate.SQL" level="DEBUG"/>
         <logger name="org.hibernate.type.descriptor.sql.BasicBinder" level="TRACE"/>
         <root level="info">
@@ -38,7 +38,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="log-test">
+    <springProfile name="test">
         <logger name="org.hibernate.SQL" level="DEBUG"/>
         <logger name="org.hibernate.type.descriptor.sql.BasicBinder" level="TRACE"/>
         <root level="info">
@@ -46,7 +46,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="log-prod">
+    <springProfile name="prod">
         <root level="info">
             <appender-ref ref="file"/>
         </root>

+ 36 - 0
docker/dockerfiles/dmp-alarm/Dockerfile

@@ -0,0 +1,36 @@
+#构建此镜像的基础镜像
+FROM java:8-jre
+#指定作者名称
+MAINTAINER lijie<lijie@persagy.com>
+
+#定义标签属性
+LABEL tier=backend
+LABEL product=dmp
+LABEL project=dmp-alarm
+LABEL name=数据中台-dic
+
+#设置环境变量
+ENV JAVA_OPTS -Dfile.encoding=UTF-8 -Xms2048m -Xmx2048m
+ENV TZ Asia/Shanghai
+#ARG 可以接收docker build命令中以--build-arg 指定的参数
+ARG WORKER_HOME
+
+#执行的命令
+RUN apt-get install -y --no-install-recommends tzdata && rm -rf /var/lib/apt/lists/*
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime	&& echo 'Asia/Shanghai' > /etc/timezone
+
+RUN mkdir -p $WORKER_HOME/config
+
+#复制文件到容器内
+COPY *.jar $WORKER_HOME/app.jar
+COPY entrypoint.sh $WORKER_HOME/
+COPY version.txt $WORKER_HOME/
+COPY config/* $WORKER_HOME/config/
+#设置工作目录
+WORKDIR $WORKER_HOME
+
+#查看上述复制的文件,是否复制成功
+RUN ls
+
+#启动执行
+ENTRYPOINT ["sh","./entrypoint.sh"]

+ 3 - 0
docker/dockerfiles/dmp-alarm/entrypoint.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+echo "entrypoint run..."
+java -jar $JAVA_OPTS -Deureka.client.service-url.defaultZone=$EUREKA_CLIENT_DEFAULT_ZONE -Dspring.cloud.config.profile=$SPRING_CLOUD_CONFIG_PROFILE -Dspring.cloud.config.uri=$SPRING_CLOUD_CONFIG_URI app.jar

+ 1 - 1
docker/dockerfiles/dmp-dic/entrypoint.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 echo "entrypoint run..."
-java -jar $JAVA_OPTS -Dcsp.sentinel.dashboard.server=$SENTINEL_DASHBOARD_SERVER -Dcsp.sentinel.api.port=$SENTINEL_LOCAL_API_PORT -Dcsp.sentinel.heartbeat.client.ip=$SENTINEL_HEARTBEAT_CLIENT_IP app.jar
+java -jar $JAVA_OPTS -Deureka.client.service-url.defaultZone=$EUREKA_CLIENT_DEFAULT_ZONE -Dspring.cloud.config.profile=$SPRING_CLOUD_CONFIG_PROFILE -Dspring.cloud.config.uri=$SPRING_CLOUD_CONFIG_URI app.jar

+ 1 - 1
docker/dockerfiles/dmp-org/entrypoint.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 echo "entrypoint run..."
-java -jar $JAVA_OPTS -Dcsp.sentinel.dashboard.server=$SENTINEL_DASHBOARD_SERVER -Dcsp.sentinel.api.port=$SENTINEL_LOCAL_API_PORT -Dcsp.sentinel.heartbeat.client.ip=$SENTINEL_HEARTBEAT_CLIENT_IP app.jar
+java -jar $JAVA_OPTS -Deureka.client.service-url.defaultZone=$EUREKA_CLIENT_DEFAULT_ZONE -Dspring.cloud.config.profile=$SPRING_CLOUD_CONFIG_PROFILE -Dspring.cloud.config.uri=$SPRING_CLOUD_CONFIG_URI app.jar

+ 1 - 1
docker/dockerfiles/dmp-rwd-edit/entrypoint.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 echo "entrypoint run..."
-java -jar $JAVA_OPTS -Dcsp.sentinel.dashboard.server=$SENTINEL_DASHBOARD_SERVER -Dcsp.sentinel.api.port=$SENTINEL_LOCAL_API_PORT -Dcsp.sentinel.heartbeat.client.ip=$SENTINEL_HEARTBEAT_CLIENT_IP app.jar
+java -jar $JAVA_OPTS -Deureka.client.service-url.defaultZone=$EUREKA_CLIENT_DEFAULT_ZONE -Dspring.cloud.config.profile=$SPRING_CLOUD_CONFIG_PROFILE -Dspring.cloud.config.uri=$SPRING_CLOUD_CONFIG_URI app.jar

+ 1 - 1
docker/dockerfiles/dmp-rwd/entrypoint.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 echo "entrypoint run..."
-java -jar $JAVA_OPTS -Dcsp.sentinel.dashboard.server=$SENTINEL_DASHBOARD_SERVER -Dcsp.sentinel.api.port=$SENTINEL_LOCAL_API_PORT -Dcsp.sentinel.heartbeat.client.ip=$SENTINEL_HEARTBEAT_CLIENT_IP app.jar
+java -jar $JAVA_OPTS -Deureka.client.service-url.defaultZone=$EUREKA_CLIENT_DEFAULT_ZONE -Dspring.cloud.config.profile=$SPRING_CLOUD_CONFIG_PROFILE -Dspring.cloud.config.uri=$SPRING_CLOUD_CONFIG_URI app.jar

+ 70 - 0
docker/k8sfiles/dmp-admin-dev.yml

@@ -0,0 +1,70 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: dmp-admin
+  labels:
+    app: dmp-admin
+spec:
+  selector:
+    app: dmp-admin
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: dmp-admin
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: dmp-admin
+  template:
+    metadata:
+      labels:
+        app: dmp-admin
+    spec:
+      containers:
+      - name: dmp-admin
+        image: labisenlin.persagy.com/library/dmp-admin:latest
+        imagePullPolicy: Always
+        env:
+        - name: TZ
+          value: Asia/Shanghai
+        - name: SERVER_PORT
+          value: "8833"
+        - name: SPRING_CLOUD_CONFIG_URI
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-admin
+              key: spring.cloud.config.uri
+        - name: SPRING_PROFILES_ACTIVE
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-admin
+              key: spring.profiles.active
+        - name: SPRING_CLOUD_CONFIG_PROFILE
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-admin
+              key: spring.cloud.config.profile
+        - name: EUREKA_CLIENT_FETCH_REGISTRY
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-admin
+              key: eureka.client.fetch-registry
+        - name: EUREKA_CLIENT_REGISTER_WITH_EUREKA
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-admin
+              key: eureka.client.register-with-eureka
+        - name: EUREKA_CLIENT_DEFAULT_ZONE
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-admin
+              key: eureka.client.default.zone
+        - name: EUREKA_INSTANCE_IP_ADDRESS
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-admin
+              key: eureka.instance.ip.address

+ 77 - 0
docker/k8sfiles/dmp-admin.yml

@@ -0,0 +1,77 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: dmp-alarm
+  labels:
+    app: dmp-alarm
+spec:
+  selector:
+    app: dmp-alarm
+  ports:
+  - port: 8833
+    targetPort: 8833
+    name: server-port
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: dmp-alarm
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: dmp-alarm
+  template:
+    metadata:
+      labels:
+        app: dmp-alarm
+    spec:
+      containers:
+      - name: dmp-alarm
+        image: labisenlin.persagy.com/library/dmp-alarm:latest
+        imagePullPolicy: Always
+        ports:
+        - containerPort: 8833
+          name: server-port
+        env:
+        - name: TZ
+          value: Asia/Shanghai
+        - name: SERVER_PORT
+          value: "8833"
+        - name: SPRING_CLOUD_CONFIG_URI
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-alarm
+              key: spring.cloud.config.uri
+        - name: SPRING_PROFILES_ACTIVE
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-alarm
+              key: spring.profiles.active
+        - name: SPRING_CLOUD_CONFIG_PROFILE
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-alarm
+              key: spring.cloud.config.profile
+        - name: EUREKA_CLIENT_FETCH_REGISTRY
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-alarm
+              key: eureka.client.fetch-registry
+        - name: EUREKA_CLIENT_REGISTER_WITH_EUREKA
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-alarm
+              key: eureka.client.register-with-eureka
+        - name: EUREKA_CLIENT_DEFAULT_ZONE
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-alarm
+              key: eureka.client.default.zone
+        - name: EUREKA_INSTANCE_IP_ADDRESS
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-alarm
+              key: eureka.instance.ip.address

+ 70 - 0
docker/k8sfiles/dmp-alarm-dev.yml

@@ -0,0 +1,70 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: dmp-alarm
+  labels:
+    app: dmp-alarm
+spec:
+  selector:
+    app: dmp-alarm
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: dmp-alarm
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: dmp-alarm
+  template:
+    metadata:
+      labels:
+        app: dmp-alarm
+    spec:
+      containers:
+      - name: dmp-alarm
+        image: labisenlin.persagy.com/library/dmp-alarm:latest
+        imagePullPolicy: Always
+        env:
+        - name: TZ
+          value: Asia/Shanghai
+        - name: SERVER_PORT
+          value: "8833"
+        - name: SPRING_CLOUD_CONFIG_URI
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-alarm
+              key: spring.cloud.config.uri
+        - name: SPRING_PROFILES_ACTIVE
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-alarm
+              key: spring.profiles.active
+        - name: SPRING_CLOUD_CONFIG_PROFILE
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-alarm
+              key: spring.cloud.config.profile
+        - name: EUREKA_CLIENT_FETCH_REGISTRY
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-alarm
+              key: eureka.client.fetch-registry
+        - name: EUREKA_CLIENT_REGISTER_WITH_EUREKA
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-alarm
+              key: eureka.client.register-with-eureka
+        - name: EUREKA_CLIENT_DEFAULT_ZONE
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-alarm
+              key: eureka.client.default.zone
+        - name: EUREKA_INSTANCE_IP_ADDRESS
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-alarm
+              key: eureka.instance.ip.address

+ 77 - 0
docker/k8sfiles/dmp-alarm.yml

@@ -0,0 +1,77 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: dmp-alarm
+  labels:
+    app: dmp-alarm
+spec:
+  selector:
+    app: dmp-alarm
+  ports:
+  - port: 8833
+    targetPort: 8833
+    name: server-port
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: dmp-alarm
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: dmp-alarm
+  template:
+    metadata:
+      labels:
+        app: dmp-alarm
+    spec:
+      containers:
+      - name: dmp-alarm
+        image: labisenlin.persagy.com/library/dmp-alarm:latest
+        imagePullPolicy: Always
+        ports:
+        - containerPort: 8833
+          name: server-port
+        env:
+        - name: TZ
+          value: Asia/Shanghai
+        - name: SERVER_PORT
+          value: "8833"
+        - name: SPRING_CLOUD_CONFIG_URI
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-alarm
+              key: spring.cloud.config.uri
+        - name: SPRING_PROFILES_ACTIVE
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-alarm
+              key: spring.profiles.active
+        - name: SPRING_CLOUD_CONFIG_PROFILE
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-alarm
+              key: spring.cloud.config.profile
+        - name: EUREKA_CLIENT_FETCH_REGISTRY
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-alarm
+              key: eureka.client.fetch-registry
+        - name: EUREKA_CLIENT_REGISTER_WITH_EUREKA
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-alarm
+              key: eureka.client.register-with-eureka
+        - name: EUREKA_CLIENT_DEFAULT_ZONE
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-alarm
+              key: eureka.client.default.zone
+        - name: EUREKA_INSTANCE_IP_ADDRESS
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-alarm
+              key: eureka.instance.ip.address