构建提交

common-cloud/ruoyi-gateway/src/main/resources/application-local.yml

@@ -29,11 +29,18 @@ spring:
             - StripPrefix=1
         # 能源管理
         - id: ems-server
-          uri: http://localhost:9202
+          uri: http://127.0.0.1:9202
           predicates:
             - Path=/ems/**
           filters:
             - StripPrefix=0
+        # 能源-设备适配器
+        - id: ems-dev-adapter
+          uri: http://127.0.0.1:9203
+          predicates:
+            - Path=/ems-dev-adapter/**
+          filters:
+            - StripPrefix=0
         # 定时任务
         - id: ruoyi-job
           uri: lb://ruoyi-job

ems/ems-cloud/Dockerfile

@@ -0,0 +1,37 @@
+########################################################
+#   docker build -t ems-server:1.0 .
+########################################################
+
+FROM centos-base:7.6.1810
+
+MAINTAINER learshaw@gmail.com
+
+# 创建目录
+RUN mkdir -p /usr/local/java && \
+    mkdir -p /opt/ems/{ruoyi-gateway,ruoyi-auth,auth-system,ems-server,ems-dev-adapter}
+WORKDIR /opt/ems
+
+# 添加JDK
+ADD jdk-8u333-linux-x64.tar.gz /usr/local/java/
+COPY ruoyi-gateway.jar /opt/ems/ruoyi-gateway/
+COPY ruoyi-auth.jar /opt/ems/ruoyi-auth/
+COPY ruoyi-system.jar /opt/ems/ruoyi-system/
+COPY ems-server.jar /opt/ems/ems-server/
+COPY ems-dev-adapter.jar /opt/ems/ems-dev-adapter/
+COPY start-all.sh /opt/ems/
+RUN chmod 755 /opt/ems/start-all.sh
+
+# 端口
+EXPOSE 9100
+EXPOSE 9200
+EXPOSE 9201
+EXPOSE 9202
+EXPOSE 9203
+
+# 设置环境变量
+ENV JAVA_HOME /usr/local/java/jdk1.8.0_333
+ENV JRE_HOME /usr/local/java/jdk1.8.0_333/jre
+ENV CLASSPATH .:${JAVA_HOME}/lib:${JRE_HOME}/lib
+ENV PATH $JAVA_HOME/bin:$PATH
+
+CMD ["sh", "/opt/ems/start-all.sh"]

ems/ems-cloud/ems-dev-adapter/src/main/resources/application-local.yml

@@ -46,7 +46,7 @@ spring:
 mqtt:
   server:
     host: tcp://xt.wenhq.top:8581
-    client_id: ems-dev-adapter
+    client_id: mqtt_dev_adapter
   executor:
     msgHandle:
       corePoolSize: 20

ems/ems-cloud/start-all.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+nohup java -Dfile.encoding=UTF-8 -jar \
+-Dnacos.server.grpc.port.offset=1 \
+-Dspring.cloud.nacos.discovery.ip=172.192.13.95 \
+/opt/ems/ruoyi-gateway/ruoyi-gateway.jar >> /var/log/ruoyi-gateway.log 2>&1 &
+echo "ruoyi-gateway start! PID: $!"
+
+nohup java -Dfile.encoding=UTF-8 -jar \
+-Dnacos.server.grpc.port.offset=1 \
+-Dspring.cloud.nacos.discovery.ip=172.192.13.95 \
+/opt/ems/ruoyi-auth/ruoyi-auth.jar >> /var/log/ruoyi-auth.log 2>&1 &
+echo "ruoyi-auth start! PID: $!"
+
+nohup java -Dfile.encoding=UTF-8 -jar \
+-Dnacos.server.grpc.port.offset=1 \
+-Dspring.cloud.nacos.discovery.ip=172.192.13.95 \
+/opt/ems/ruoyi-system/ruoyi-system.jar >> /var/log/ruoyi-auth.log 2>&1 &
+echo "ruoyi-system start! PID: $!"
+
+nohup java -Dfile.encoding=UTF-8 -jar \
+-Dnacos.server.grpc.port.offset=1 \
+-Dspring.cloud.nacos.discovery.ip=172.192.13.95 \
+/opt/ems/ems-dev-adapter/ems-dev-adapter.jar >> /var/log/ems-dev-adapter.log 2>&1 &
+echo "ems-dev-adapter start! PID: $!"
+
+nohup java -Dfile.encoding=UTF-8 -jar \
+-Dnacos.server.grpc.port.offset=1 \
+-Dspring.cloud.nacos.discovery.ip=172.192.13.95 \
+/opt/ems/ems-server/ems-server.jar >> /var/log/ems-erver.log 2>&1 &
+echo "ems-server start! PID: $!"
+
+tail -f /var/log/ems-erver.log