Преглед на файлове

1.调整dmp-rwd-edit应用为springcloud应用
2.编写dmp-dic,dmp-org,dmp-rwd-edit的部署文件

lijie преди 4 години
родител
ревизия
f65624a90f
променени са 26 файла, в които са добавени 648 реда и са изтрити 67 реда
  1. 14 0
      dmp-dic/src/main/resources/bootstrap-dev.yml
  2. 1 1
      dmp-dic/src/main/resources/bootstrap.yml
  3. 36 0
      dmp-dic/src/main/resources/config/config.sql
  4. 3 3
      dmp-dic/src/main/resources/logback-spring.xml
  5. 14 0
      dmp-org/src/main/resources/bootstrap-dev.yml
  6. 65 0
      dmp-org/src/main/resources/config/config.sql
  7. 11 0
      dmp-rwd-edit/pom.xml
  8. 2 0
      dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/EditApp.java
  9. 0 24
      dmp-rwd-edit/src/main/resources/application-dev.yml
  10. 0 37
      dmp-rwd-edit/src/main/resources/application.yml
  11. 0 0
      dmp-rwd-edit/src/main/resources/bootstrap-aliyun-dev.yml
  12. 1 1
      dmp-rwd-edit/src/main/resources/application-aliyun-test.yml
  13. 10 0
      dmp-rwd-edit/src/main/resources/bootstrap-dev.yml
  14. 7 0
      dmp-rwd-edit/src/main/resources/bootstrap.yml
  15. 69 0
      dmp-rwd-edit/src/main/resources/config/config.sql
  16. 66 0
      dmp-rwd/src/main/resources/config/config.sql
  17. 36 0
      docker/dockerfiles/dmp-dic/Dockerfile
  18. 3 0
      docker/dockerfiles/dmp-dic/entrypoint.sh
  19. 36 0
      docker/dockerfiles/dmp-org/Dockerfile
  20. 3 0
      docker/dockerfiles/dmp-org/entrypoint.sh
  21. 36 0
      docker/dockerfiles/dmp-rwd-edit/Dockerfile
  22. 3 0
      docker/dockerfiles/dmp-rwd-edit/entrypoint.sh
  23. 77 0
      docker/k8sfiles/dmp-dic.yml
  24. 77 0
      docker/k8sfiles/dmp-org.yml
  25. 77 0
      docker/k8sfiles/dmp-rwd-edit.yml
  26. 1 1
      docker/k8sfiles/dmp-rwd.yml

+ 14 - 0
dmp-dic/src/main/resources/bootstrap-dev.yml

@@ -0,0 +1,14 @@
+spring:
+  application:
+    name: dmp-rwd
+  cloud:
+    config:
+      profile: dev2
+      uri: http://192.168.64.18:9932
+      allowOverride: true
+      overrideNone: true
+      overrideSystemProperties: false
+eureka:
+  client:
+    fetch-registry: true
+    register-with-eureka: false

+ 1 - 1
dmp-dic/src/main/resources/bootstrap.yml

@@ -2,7 +2,7 @@ spring:
   application:
     name: dmp-dic
   profiles:
-    active: log-dev
+    active: dev
   cloud:
     config:
       profile: dev

+ 36 - 0
dmp-dic/src/main/resources/config/config.sql

@@ -0,0 +1,36 @@
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'spring.redis.password', '${persagy.redis.password}', 'dmp-dic', 'default', 'master', 1, 'DMP', NULL FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='spring.redis.password' AND APPLICATION="dmp-dic");
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'spring.redis.database', '${persagy.redis.database}', 'dmp-dic', 'default', 'master', 1, 'DMP', NULL FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='spring.redis.database' AND APPLICATION="dmp-dic");
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'spring.redis.pool.max-active', '${persagy.redis.max-active}', 'dmp-dic', 'default', 'master', 1, 'DMP', NULL FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='spring.redis.pool.max-active' AND APPLICATION="dmp-dic");
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'spring.redis.pool.max-idle', '${persagy.redis.max-idle}', 'dmp-dic', 'default', 'master', 1, 'DMP', NULL FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='spring.redis.pool.max-idle' AND APPLICATION="dmp-dic");
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'spring.redis.pool.min-idle', '${persagy.redis.min-idle}', 'dmp-dic', 'default', 'master', 1, 'DMP', NULL FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='spring.redis.pool.min-idle' AND APPLICATION="dmp-dic");
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'persagy.dmp.exchange', 'exchange-dmp', 'dmp-dic', 'default', 'master', 1, 'DMP', NULL FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='persagy.dmp.exchange' AND APPLICATION="dmp-dic");
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'persagy.dmp.dic.routingKey', 'routing-dmp-dic', 'dmp-dic', 'default', 'master', 1, 'DMP', NULL FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='persagy.dmp.dic.routingKey' AND APPLICATION="dmp-dic");
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'persagy.dmp.org.routingKey', 'routing-dmp-org', 'dmp-dic', 'default', 'master', 1, 'DMP', NULL FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='persagy.dmp.org.routingKey' AND APPLICATION="dmp-dic");
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'persagy.dmp.rwd.routingKey', 'routing-dmp-rwd', 'dmp-dic', 'default', 'master', 1, 'DMP', NULL FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='persagy.dmp.rwd.routingKey' AND APPLICATION="dmp-dic");
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'persagy.dmp.alarm.routingKey', 'routing-dmp-alarm', 'dmp-dic', 'default', 'master', 1, 'DMP', NULL FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='persagy.dmp.alarm.routingKey' AND APPLICATION="dmp-dic");
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'persagy.dmp.task.routingKey', 'routing-dmp-task', 'dmp-dic', 'default', 'master', 1, 'DMP', NULL FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='persagy.dmp.task.routingKey' AND APPLICATION="dmp-dic");
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'server.port', '8830', 'dmp-dic', 'dev2', 'master', 1, 'DMP', NULL FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='server.port' AND APPLICATION="dmp-dic");
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'eureka.client.service-url.defaultZone', 'http://frame:123456@192.168.64.18:9931/eureka/', 'dmp-dic', 'dev2', 'master', 1, 'DMP', '注册中心地址' FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='eureka.client.service-url.defaultZone' AND APPLICATION="dmp-dic");
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'persagy.iot.data.server', 'http://localhost:9981', 'dmp-dic', 'dev2', 'master', 1, 'DMP', 'IOT数据查询服务' FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='persagy.iot.data.server' AND APPLICATION="dmp-dic");
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'persagy.iot.setting.server', 'http://localhost:9983', 'dmp-dic', 'dev2', 'master', 1, 'DMP', 'IOT控制服务' FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='persagy.iot.setting.server' AND APPLICATION="dmp-dic");
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'persagy.mysql.host', '192.168.64.15', 'dmp-dic', 'dev2', 'master', 1, 'DMP', NULL FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='persagy.mysql.host' AND APPLICATION="dmp-dic");
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'persagy.mysql.port', '9934', 'dmp-dic', 'dev2', 'master', 1, 'DMP', NULL FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='persagy.mysql.port' AND APPLICATION="dmp-dic");
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'persagy.mysql.database', 'dmp_dic', 'dmp-dic', 'dev2', 'master', 1, 'DMP', NULL FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='persagy.mysql.database' AND APPLICATION="dmp-dic");
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'persagy.mysql.username', 'root', 'dmp-dic', 'dev2', 'master', 1, 'DMP', NULL FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='persagy.mysql.username' AND APPLICATION="dmp-dic");
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'persagy.mysql.password', 'brzj123456', 'dmp-dic', 'dev2', 'master', 1, 'DMP', NULL FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='persagy.mysql.password' AND APPLICATION="dmp-dic");
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'persagy.mysql.initialSize', '10', 'dmp-dic', 'dev2', 'master', 1, 'DMP', NULL FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='persagy.mysql.initialSize' AND APPLICATION="dmp-dic");
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'persagy.mysql.maxActive', '300', 'dmp-dic', 'dev2', 'master', 1, 'DMP', NULL FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='persagy.mysql.maxActive' AND APPLICATION="dmp-dic");
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'persagy.rabbitmq.host', '192.168.64.15', 'dmp-dic', 'dev2', 'master', 1, 'DMP', NULL FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='persagy.rabbitmq.host' AND APPLICATION="dmp-dic");
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'persagy.rabbitmq.port', '9936', 'dmp-dic', 'dev2', 'master', 1, 'DMP', NULL FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='persagy.rabbitmq.port' AND APPLICATION="dmp-dic");
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'persagy.rabbitmq.username', 'admin', 'dmp-dic', 'dev2', 'master', 1, 'DMP', NULL FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='persagy.rabbitmq.username' AND APPLICATION="dmp-dic");
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'persagy.rabbitmq.password', 'brzj123456', 'dmp-dic', 'dev2', 'master', 1, 'DMP', NULL FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='persagy.rabbitmq.password' AND APPLICATION="dmp-dic");
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'persagy.rabbitmq.virtual-host', '/test', 'dmp-dic', 'dev2', 'master', 1, 'DMP', NULL FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='persagy.rabbitmq.virtual-host' AND APPLICATION="dmp-dic");
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'persagy.redis.host', '192.168.64.15', 'dmp-dic', 'dev2', 'master', 1, 'DMP', NULL FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='persagy.redis.host' AND APPLICATION="dmp-dic");
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'persagy.redis.port', '9944', 'dmp-dic', 'dev2', 'master', 1, 'DMP', NULL FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='persagy.redis.port' AND APPLICATION="dmp-dic");
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'persagy.redis.password', 'brzj123456', 'dmp-dic', 'dev2', 'master', 1, 'DMP', NULL FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='persagy.redis.password' AND APPLICATION="dmp-dic");
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'persagy.redis.database', '0', 'dmp-dic', 'dev2', 'master', 1, 'DMP', NULL FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='persagy.redis.database' AND APPLICATION="dmp-dic");
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'persagy.redis.max-active', '300', 'dmp-dic', 'dev2', 'master', 1, 'DMP', NULL FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='persagy.redis.max-active' AND APPLICATION="dmp-dic");
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'persagy.redis.max-idle', '30', 'dmp-dic', 'dev2', 'master', 1, 'DMP', NULL FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='persagy.redis.max-idle' AND APPLICATION="dmp-dic");
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'persagy.redis.min-idle', '10', 'dmp-dic', 'dev2', 'master', 1, 'DMP', NULL FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='persagy.redis.min-idle' AND APPLICATION="dmp-dic");
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'persagy.log.path', '.', 'dmp-dic', 'dev2', 'master', 1, 'DMP', '日志文件所在路径' FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='persagy.log.path' AND APPLICATION="dmp-dic");
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'persagy.dmp.dic.queue', 'queue-dmp-dic', 'dmp-dic', 'dev2', 'master', 1, 'DMP', NULL FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='persagy.dmp.dic.queue' AND APPLICATION="dmp-dic");

+ 3 - 3
dmp-dic/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>

+ 14 - 0
dmp-org/src/main/resources/bootstrap-dev.yml

@@ -0,0 +1,14 @@
+spring:
+  application:
+    name: dmp-rwd
+  cloud:
+    config:
+      profile: dev2
+      uri: http://192.168.64.18:9932
+      allowOverride: true
+      overrideNone: true
+      overrideSystemProperties: false
+eureka:
+  client:
+    fetch-registry: true
+    register-with-eureka: false

Файловите разлики са ограничени, защото са твърде много
+ 65 - 0
dmp-org/src/main/resources/config/config.sql


+ 11 - 0
dmp-rwd-edit/pom.xml

@@ -115,6 +115,17 @@
             <version>1.2.47</version>
             <scope>compile</scope>
         </dependency>
+        <!-- 注册中心 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+        </dependency>
+
+        <!-- 配置中心 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-config</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

+ 2 - 0
dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/EditApp.java

@@ -11,6 +11,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;
 
@@ -23,6 +24,7 @@ import javax.persistence.EntityManager;
  */
 @Slf4j
 @SpringBootApplication
+@EnableDiscoveryClient
 public class EditApp {
 
     public static void main(String[] args) {

+ 0 - 24
dmp-rwd-edit/src/main/resources/application-dev.yml

@@ -1,24 +0,0 @@
-server:
-  port: 8838
-spring:
-  datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.64.15:9934/dmp_rwdedit?useUnicode=true&characterEncoding=utf-8&mysqlEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
-    username: root
-    password: brzj123456
-    type: com.alibaba.druid.pool.DruidDataSource
-    jpa:
-      show-sql: true
-      hibernate:
-        ddl-auto: none
-  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

+ 0 - 37
dmp-rwd-edit/src/main/resources/application.yml

@@ -1,37 +0,0 @@
-server:
-  port: 8838
-persagy:
-  dmp:
-    server: http://192.168.64.18:9930
-    #    server: http://39.102.40.239:9970
-    exchange: exchange-dmp
-    admin:
-      routingKey: routing-dmp-rwdedit
-      queue: queue-dmp-rwdedit
-spring:
-  application:
-    name: dmp-rwdedit
-  profiles:
-    active:
-      - dev
-  datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.64.15:9934/dmp_rwdedit?useUnicode=true&characterEncoding=utf-8&mysqlEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
-    username: root
-    password: brzj123456
-    type: com.alibaba.druid.pool.DruidDataSource
-    jpa:
-      show-sql: true
-      hibernate:
-        ddl-auto: none
-  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-rwd-edit/src/main/resources/application-aliyun-dev.yml → dmp-rwd-edit/src/main/resources/bootstrap-aliyun-dev.yml


+ 1 - 1
dmp-rwd-edit/src/main/resources/application-aliyun-test.yml

@@ -10,7 +10,7 @@ persagy:
       queue: queue-dmp-rwdedit
 spring:
   application:
-    name: dmp-rwdedit
+    name: dmp-rwd-edit
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://localhost:9005/dmp_rwdedit?useUnicode=true&characterEncoding=utf-8&mysqlEncoding=utf8&useSSL=false

+ 10 - 0
dmp-rwd-edit/src/main/resources/bootstrap-dev.yml

@@ -0,0 +1,10 @@
+server:
+  port: 8838
+spring:
+  cloud:
+    config:
+      profile: dev2
+      uri: http://192.168.64.18:9932
+      allowOverride: true
+      overrideNone: true
+      overrideSystemProperties: false

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

@@ -0,0 +1,7 @@
+server:
+  port: 8838
+spring:
+  application:
+    name: dmp-rwd-edit
+  profiles:
+    active: dev

Файловите разлики са ограничени, защото са твърде много
+ 69 - 0
dmp-rwd-edit/src/main/resources/config/config.sql


Файловите разлики са ограничени, защото са твърде много
+ 66 - 0
dmp-rwd/src/main/resources/config/config.sql


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

@@ -0,0 +1,36 @@
+#构建此镜像的基础镜像
+FROM java:8-jre
+#指定作者名称
+MAINTAINER lijie<lijie@persagy.com>
+
+#定义标签属性
+LABEL tier=backend
+LABEL product=dmp
+LABEL project=dmp-dic
+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-dic/entrypoint.sh

@@ -0,0 +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

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

@@ -0,0 +1,36 @@
+#构建此镜像的基础镜像
+FROM java:8-jre
+#指定作者名称
+MAINTAINER lijie<lijie@persagy.com>
+
+#定义标签属性
+LABEL tier=backend
+LABEL product=dmp
+LABEL project=dmp-org
+LABEL name=数据中台-org
+
+#设置环境变量
+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-org/entrypoint.sh

@@ -0,0 +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

+ 36 - 0
docker/dockerfiles/dmp-rwd-edit/Dockerfile

@@ -0,0 +1,36 @@
+#构建此镜像的基础镜像
+FROM java:8-jre
+#指定作者名称
+MAINTAINER lijie<lijie@persagy.com>
+
+#定义标签属性
+LABEL tier=backend
+LABEL product=dmp
+LABEL project=dmp-rwd-edit
+LABEL name=数据中台-rwd-edit
+
+#设置环境变量
+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-rwd-edit/entrypoint.sh

@@ -0,0 +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

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

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

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

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

+ 77 - 0
docker/k8sfiles/dmp-rwd-edit.yml

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

+ 1 - 1
docker/k8sfiles/dmp-rwd.yml

@@ -30,7 +30,7 @@ spec:
     spec:
       containers:
       - name: dmp-rwd
-        image: labisenlin.persagy.com/library/dmp-rwd:4.0.12
+        image: labisenlin.persagy.com/library/dmp-rwd:latest
         imagePullPolicy: Always
         ports:
         - containerPort: 8832