环境配置

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

@@ -1,5 +1,5 @@
 spring:
   redis:
-    host: 172.192.10.105
-    port: 30013
-    password:
+    host: 192.168.20.135
+    port: 6379
+    password: admin

common-cloud/ruoyi-auth/src/main/resources/bootstrap.yml

@@ -14,11 +14,11 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: ${env-nacos-server:172.192.10.105:30003}
+        server-addr: ${env-nacos-server:192.168.20.210:8848}
         namespace: ${env-nacos-namespace:2c519718-1e09-4de4-9af5-d07f837372d6}
       config:
         # 配置中心地址
-        server-addr: ${env-nacos-server:172.192.10.105:30003}
+        server-addr: ${env-nacos-server:192.168.20.210:8848}
         namespace: ${env-nacos-namespace:2c519718-1e09-4de4-9af5-d07f837372d6}
         # 配置文件格式
         file-extension: yml

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

@@ -1,8 +1,8 @@
 spring:
   redis:
-    host: 172.192.10.105
-    port: 30013
-    password:
+    host: 192.168.20.210
+    port: 6379
+    password: admin
   cloud:
     gateway:
       discovery:

common-cloud/ruoyi-gateway/src/main/resources/bootstrap.yml

@@ -6,7 +6,7 @@ server:
 spring: 
   application:
     # 应用名称
-    name: ems-gateway
+    name: ruoyi-gateway
   profiles:
     # 环境配置
     active: prod
@@ -14,11 +14,11 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: ${env-nacos-server:172.192.10.105:30003}
+        server-addr: ${env-nacos-server:192.168.20.210:8848}
         namespace: ${env-nacos-namespace:2c519718-1e09-4de4-9af5-d07f837372d6}
       config:
         # 配置中心地址
-        server-addr: ${env-nacos-server:172.192.10.105:30003}
+        server-addr: ${env-nacos-server:192.168.20.210:8848}
         namespace: ${env-nacos-namespace:2c519718-1e09-4de4-9af5-d07f837372d6}
         # 配置文件格式
         file-extension: yml

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

@@ -4,9 +4,9 @@ spring:
     pathmatch:
       matching-strategy: ant_path_matcher
   redis:
-    host: 172.192.10.105
-    port: 30013
-    password:
+    host: 192.168.20.210
+    port: 8848
+    password: admin
   datasource:
     druid:
       stat-view-servlet:
@@ -33,7 +33,7 @@ spring:
         # 主库数据源
         master:
           driver-class-name: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://172.192.10.105:30002/sys_ct?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          url: jdbc:mysql://192.168.20.210:3306/sys_ct?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
           username: root
           password: root
           # 从库数据源

common-cloud/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml

@@ -6,7 +6,7 @@ server:
 spring:
   application:
     # 应用名称
-    name: ems-system
+    name: ruoyi-system
   profiles:
     # 环境配置
     active: prod
@@ -14,11 +14,11 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: ${env-nacos-server:172.192.10.105:30003}
+        server-addr: ${env-nacos-server:192.168.20.135:8848}
         namespace: ${env-nacos-namespace:2c519718-1e09-4de4-9af5-d07f837372d6}
       config:
         # 配置中心地址
-        server-addr: ${env-nacos-server:172.192.10.105:30003}
+        server-addr: ${env-nacos-server:192.168.20.135:8848}
         namespace: ${env-nacos-namespace:2c519718-1e09-4de4-9af5-d07f837372d6}
         # 配置文件格式
         file-extension: yml

ems/docker/cloud/docker-compose.yml

@@ -0,0 +1,110 @@
+services:
+  ems-gateway:
+    image: ruoyi-gateway:1.0
+    container_name: ems-gateway
+    ports:
+      - "9100:9100/tcp"
+    restart: always
+    networks:
+      - ems_default
+    deploy:
+      resources:
+        limits:
+          memory: 1024M
+    environment:
+      - NACOS_SERVER=192.168.20.210:8848
+      - NACOS_NAMESPACE=2c519718-1e09-4de4-9af5-d07f837372d6
+      - TZ=Asia/Shanghai
+
+  ems-auth:
+    image: ruoyi-auth:1.0
+    container_name: ems-auth
+    ports:
+      - "9200:9200/tcp"
+    restart: always
+    networks:
+      - ems_default
+    deploy:
+      resources:
+        limits:
+          memory: 1024M
+    environment:
+      - NACOS_SERVER=192.168.20.210:8848
+      - NACOS_NAMESPACE=2c519718-1e09-4de4-9af5-d07f837372d6
+      - TZ=Asia/Shanghai
+    depends_on:
+      - ems-gateway
+
+  ems-system:
+    image: ruoyi-system:1.0
+    container_name: ems-system
+    ports:
+      - "9201:9201/tcp"
+    restart: always
+    networks:
+      - ems_default
+    deploy:
+      resources:
+        limits:
+          memory: 1024M
+    environment:
+      - NACOS_SERVER=192.168.20.210:8848
+      - NACOS_NAMESPACE=2c519718-1e09-4de4-9af5-d07f837372d6
+      - TZ=Asia/Shanghai
+    depends_on:
+      - ems-gateway
+
+  ems-server:
+    image: ems-server:1.0
+    container_name: ems-server
+    ports:
+      - "9202:9202/tcp"
+    restart: always
+    networks:
+      - ems_default
+    deploy:
+      resources:
+        limits:
+          memory: 1024M
+    environment:
+      - NACOS_SERVER=192.168.20.210:8848
+      - NACOS_NAMESPACE=2c519718-1e09-4de4-9af5-d07f837372d6
+      - TZ=Asia/Shanghai
+    depends_on:
+      - ems-gateway
+
+  ems-dev-adapter:
+    image: ems-dev-adapter:1.0
+    container_name: ems-dev-adapter
+    ports:
+      - "9203:9203/tcp"
+    restart: always
+    networks:
+      - ems_default
+    deploy:
+      resources:
+        limits:
+          memory: 1024M
+    environment:
+      - NACOS_SERVER=192.168.20.210:8848
+      - NACOS_NAMESPACE=2c519718-1e09-4de4-9af5-d07f837372d6
+      - TZ=Asia/Shanghai
+    depends_on:
+      - ems-server
+
+  ems-ui:
+    image: ems-ui:1.0
+    container_name: ems-ui
+    ports:
+      - "8050:8050/tcp"
+    restart: always
+    networks:
+      - ems_default
+    environment:
+      - TZ=Asia/Shanghai
+    depends_on:
+      - ems-server
+
+networks:
+  ems_default:
+    external: true

ems/docker/cloud/ems-auth/Dockerfile

@@ -0,0 +1,31 @@
+########################################################
+#   docker build -t ruoyi-auth:1.0 .
+########################################################
+
+FROM openjdk:8
+
+MAINTAINER learshaw@gmail.com
+
+# 创建目录
+RUN mkdir -p /opt/ems/ruoyi-auth
+WORKDIR /opt/ems/ruoyi-auth
+
+# 添加
+COPY ruoyi-auth.jar /opt/ems/ruoyi-auth/
+
+# 声明端口
+EXPOSE 9200
+
+# 环境变量
+ENV GRPC_PORT_OFFSET=1000
+ENV NACOS_SERVER=0.0.0.0:8848
+ENV NACOS_NAMESPACE=ems
+ENV SPRING_PROFILES_ACTIVE=prod
+
+# 启动服务
+ENTRYPOINT java -Dnacos.server.grpc.port.offset=$GRPC_PORT_OFFSET -jar ruoyi-auth.jar \
+  --spring.profiles.active=$SPRING_PROFILES_ACTIVE \
+  --spring.cloud.nacos.discovery.server-addr=$NACOS_SERVER \
+  --spring.cloud.nacos.discovery.namespace=$NACOS_NAMESPACE \
+  --spring.cloud.nacos.config.server-addr=$NACOS_SERVER \
+  --spring.cloud.nacos.config.namespace=$NACOS_NAMESPACE

ems/docker/cloud/ems-auth/docker-compose.yml

@@ -0,0 +1,17 @@
+services:
+  ems-auth:
+    image: ruoyi-auth:1.0
+    container_name: ems-auth
+    ports:
+      - "9200:9200/tcp"
+    restart: always
+    networks:
+      - ems_default
+    environment:
+      - NACOS_SERVER=192.168.20.210:8848
+      - NACOS_NAMESPACE=2c519718-1e09-4de4-9af5-d07f837372d6
+      - TZ=Asia/Shanghai
+
+networks:
+  ems_default:
+    external: true

ems/docker/cloud/ems-dev-adapter/Dockerfile

@@ -0,0 +1,31 @@
+########################################################
+#   docker build -t ems-dev-adapter:1.0 .
+########################################################
+
+FROM openjdk:8
+
+MAINTAINER learshaw@gmail.com
+
+# 创建目录
+RUN mkdir -p /opt/ems/ems-dev-adapter
+WORKDIR /opt/ems/ems-dev-adapter
+
+# 添加
+COPY ems-dev-adapter.jar /opt/ems/ems-dev-adapter/
+
+# 声明端口
+EXPOSE 9203
+
+# 环境变量
+ENV GRPC_PORT_OFFSET=1000
+ENV NACOS_SERVER=0.0.0.0:8848
+ENV NACOS_NAMESPACE=public
+ENV SPRING_PROFILES_ACTIVE=prod
+
+# 启动服务
+ENTRYPOINT java -Dnacos.server.grpc.port.offset=$GRPC_PORT_OFFSET -jar ems-dev-adapter.jar \
+  --spring.profiles.active=$SPRING_PROFILES_ACTIVE \
+  --spring.cloud.nacos.discovery.server-addr=$NACOS_SERVER \
+  --spring.cloud.nacos.discovery.namespace=$NACOS_NAMESPACE \
+  --spring.cloud.nacos.config.server-addr=$NACOS_SERVER \
+  --spring.cloud.nacos.config.namespace=$NACOS_NAMESPACE

ems/docker/cloud/ems-dev-adapter/docker-compose.yml

@@ -0,0 +1,17 @@
+services:
+  ems-dev-adapter:
+    image: ems-dev-adapter:1.0
+    container_name: ems-dev-adapter
+    ports:
+      - "9203:9203/tcp"
+    restart: always
+    networks:
+      - ems_default
+    environment:
+      - NACOS_SERVER=192.168.20.210:8848
+      - NACOS_NAMESPACE=2c519718-1e09-4de4-9af5-d07f837372d6
+      - TZ=Asia/Shanghai
+
+networks:
+  ems_default:
+    external: true

ems/docker/cloud/ems-gateway/Dockerfile

@@ -0,0 +1,31 @@
+########################################################
+#   docker build -t ruoyi-gateway:1.0 .
+########################################################
+
+FROM openjdk:8
+
+MAINTAINER learshaw@gmail.com
+
+# 创建目录
+RUN mkdir -p /opt/ems/ruoyi-gateway
+WORKDIR /opt/ems/ruoyi-gateway
+
+# 添加
+COPY ruoyi-gateway.jar /opt/ems/ruoyi-gateway/
+
+# 声明端口
+EXPOSE 9100
+
+# 环境变量
+ENV GRPC_PORT_OFFSET=1000
+ENV NACOS_SERVER=0.0.0.0:8848
+ENV NACOS_NAMESPACE=ems
+ENV SPRING_PROFILES_ACTIVE=prod
+
+# 启动网关服务
+ENTRYPOINT java -Dnacos.server.grpc.port.offset=$GRPC_PORT_OFFSET -jar ruoyi-gateway.jar \
+  --spring.profiles.active=$SPRING_PROFILES_ACTIVE \
+  --spring.cloud.nacos.discovery.server-addr=$NACOS_SERVER \
+  --spring.cloud.nacos.discovery.namespace=$NACOS_NAMESPACE \
+  --spring.cloud.nacos.config.server-addr=$NACOS_SERVER \
+  --spring.cloud.nacos.config.namespace=$NACOS_NAMESPACE

ems/docker/cloud/ems-gateway/docker-compose.yml

@@ -0,0 +1,18 @@
+services:
+  ems-gateway:
+    image: ruoyi-gateway:1.0
+    container_name: ems-gateway
+    ports:
+      - "9100:9100/tcp"
+    restart: always
+    networks:
+      - ems_default
+    environment:
+      - GRPC_PORT_OFFSET=1
+      - NACOS_SERVER=192.168.20.210:8848
+      - NACOS_NAMESPACE=2c519718-1e09-4de4-9af5-d07f837372d6
+      - TZ=Asia/Shanghai
+
+networks:
+  ems_default:
+    external: true

ems/docker/cloud/ems-server/Dockerfile

@@ -0,0 +1,31 @@
+########################################################
+#   docker build -t ems-server:1.0 .
+########################################################
+
+FROM openjdk:8
+
+MAINTAINER learshaw@gmail.com
+
+# 创建目录
+RUN mkdir -p /opt/ems/ems-server
+WORKDIR /opt/ems/ems-server
+
+# 添加
+COPY ems-server.jar /opt/ems/ems-server/
+
+# 声明端口
+EXPOSE 9202
+
+# 环境变量
+ENV GRPC_PORT_OFFSET=1000
+ENV NACOS_SERVER=0.0.0.0:8848
+ENV NACOS_NAMESPACE=ems
+ENV SPRING_PROFILES_ACTIVE=prod
+
+# 启动服务
+ENTRYPOINT java -Dnacos.server.grpc.port.offset=$GRPC_PORT_OFFSET -jar ems-server.jar \
+  --spring.profiles.active=$SPRING_PROFILES_ACTIVE \
+  --spring.cloud.nacos.discovery.server-addr=$NACOS_SERVER \
+  --spring.cloud.nacos.discovery.namespace=$NACOS_NAMESPACE \
+  --spring.cloud.nacos.config.server-addr=$NACOS_SERVER \
+  --spring.cloud.nacos.config.namespace=$NACOS_NAMESPACE

ems/docker/cloud/ems-server/docker-compose.yml

@@ -0,0 +1,17 @@
+services:
+  ems-server:
+    image: ems-server:1.0
+    container_name: ems-server
+    ports:
+      - "9202:9202/tcp"
+    restart: always
+    networks:
+      - ems_default
+    environment:
+      - NACOS_SERVER=192.168.20.210:8848
+      - NACOS_NAMESPACE=2c519718-1e09-4de4-9af5-d07f837372d6
+      - TZ=Asia/Shanghai
+
+networks:
+  ems_default:
+    external: true

ems/docker/cloud/ems-system/Dockerfile

@@ -0,0 +1,31 @@
+########################################################
+#   docker build -t ruoyi-system:1.0 .
+########################################################
+
+FROM openjdk:8
+
+MAINTAINER learshaw@gmail.com
+
+# 创建目录
+RUN mkdir -p /opt/ems/ruoyi-system
+WORKDIR /opt/ems/ruoyi-system
+
+# 添加
+COPY ruoyi-system.jar /opt/ems/ruoyi-system/
+
+# 声明端口
+EXPOSE 9201
+
+# 环境变量
+ENV GRPC_PORT_OFFSET=1000
+ENV NACOS_SERVER=0.0.0.0:8848
+ENV NACOS_NAMESPACE=ems
+ENV SPRING_PROFILES_ACTIVE=prod
+
+# 启动网关服务
+ENTRYPOINT java -Dnacos.server.grpc.port.offset=$GRPC_PORT_OFFSET -jar ruoyi-system.jar \
+  --spring.profiles.active=$SPRING_PROFILES_ACTIVE \
+  --spring.cloud.nacos.discovery.server-addr=$NACOS_SERVER \
+  --spring.cloud.nacos.discovery.namespace=$NACOS_NAMESPACE \
+  --spring.cloud.nacos.config.server-addr=$NACOS_SERVER \
+  --spring.cloud.nacos.config.namespace=$NACOS_NAMESPACE

ems/docker/cloud/ems-system/docker-compose.yml

@@ -0,0 +1,17 @@
+services:
+  ems-system:
+    image: ruoyi-system:1.0
+    container_name: ems-system
+    ports:
+      - "9201:9201/tcp"
+    restart: always
+    networks:
+      - ems_default
+    environment:
+      - NACOS_SERVER=192.168.20.210:8848
+      - NACOS_NAMESPACE=2c519718-1e09-4de4-9af5-d07f837372d6
+      - TZ=Asia/Shanghai
+
+networks:
+  ems_default:
+    external: true

ems/docker/cloud/ems-ui/Dockerfile

@@ -0,0 +1,20 @@
+########################################################
+#   docker build -t ems-ui:1.0 .
+########################################################
+
+FROM nginx-env:1.0
+
+MAINTAINER learshaw@gmail.com
+
+# 目录
+WORKDIR /opt
+
+# 添加
+ADD ems-ui.tar.gz /opt/
+COPY ems.conf /etc/nginx/conf.d/
+
+# 声明端口
+EXPOSE 8050
+
+# 启动服务
+CMD ["nginx", "-g", "daemon off;"]

ems/docker/cloud/ems-ui/docker-compose.yml

@@ -0,0 +1,15 @@
+services:
+  ems-ui:
+    image: ems-ui:1.0
+    container_name: ems-ui
+    ports:
+      - "8050:8050/tcp"
+    restart: always
+    networks:
+      - ems_default
+    environment:
+      - TZ=Asia/Shanghai
+
+networks:
+  ems_default:
+    external: true

ems/ems-cloud/docker/Dockerfile

@@ -1,30 +0,0 @@
-########################################################
-#   docker build -t ems-server:1.0 .
-########################################################
-
-FROM openjdk:8
-
-MAINTAINER learshaw@gmail.com
-
-# 创建目录
-RUN mkdir -p /usr/local/java && \
-    mkdir -p /opt/ems/{ruoyi-gateway,ruoyi-auth,ruoyi-system,ems-server,ems-dev-adapter}
-WORKDIR /opt/ems
-
-# 添加
-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
-
-CMD ["sh", "/opt/ems/start-all.sh"]

ems/ems-cloud/docker/docker-run.sh

@@ -1,8 +0,0 @@
-# /bin/bash
-docker run -itd --name ems-server --privileged=true \
-  -p 0.0.0.0:9100:9100 \
-  -p 0.0.0.0:9200:9200 \
-  -p 0.0.0.0:9201:9201 \
-  -p 0.0.0.0:9202:9202 \
-  -p 0.0.0.0:9203:9203 \
-  ems-server:1.0

ems/ems-cloud/docker/start-all.sh

@@ -1,32 +0,0 @@
-#!/bin/bash
-nohup java -Dfile.encoding=UTF-8 -Duser.timezone=Asia/Shanghai -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 -Duser.timezone=Asia/Shanghai -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 -Duser.timezone=Asia/Shanghai -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 -Duser.timezone=Asia/Shanghai -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 -Duser.timezone=Asia/Shanghai -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

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

@@ -4,9 +4,9 @@ spring:
     pathmatch:
       matching-strategy: ant_path_matcher
   redis:
-    host: 172.192.10.105
-    port: 30013
-    password:
+    host: 192.168.20.210
+    port: 6379
+    password: admin
   datasource:
     druid:
       stat-view-servlet:
@@ -33,7 +33,7 @@ spring:
         # 主库数据源
         master:
           driver-class-name: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://172.192.10.105:30002/ems_ct?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          url: jdbc:mysql://192.168.20.210:3306/ems_ct?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
           username: root
           password: root
           # 从库数据源

ems/ems-cloud/ems-dev-adapter/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: ${env-nacos-server:172.192.10.105:30003}
+        server-addr: ${env-nacos-server:192.168.20.210:8848}
         namespace: ${env-nacos-namespace:2c519718-1e09-4de4-9af5-d07f837372d6}
       config:
         # 配置中心地址
-        server-addr: ${env-nacos-server:172.192.10.105:30003}
+        server-addr: ${env-nacos-server:192.168.20.210:8848}
         namespace: ${env-nacos-namespace:2c519718-1e09-4de4-9af5-d07f837372d6}
         # 配置文件格式
         file-extension: yml

ems/ems-cloud/ems-server/src/main/resources/application-local.yml

@@ -4,9 +4,9 @@ spring:
     pathmatch:
       matching-strategy: ant_path_matcher
   redis:
-    host: 172.192.10.105
-    port: 30013
-    password:
+    host: 192.168.20.210
+    port: 6379
+    password: admin
   datasource:
     druid:
       stat-view-servlet:
@@ -33,7 +33,7 @@ spring:
         # 主库数据源
         master:
           driver-class-name: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://172.192.10.105:30002/ems_ct?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          url: jdbc:mysql://192.168.20.210:3306/ems_ct?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
           username: root
           password: root
           # 从库数据源

ems/ems-cloud/ems-server/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: ${env-nacos-server:172.192.10.105:30003}
+        server-addr: ${env-nacos-server:192.168.20.135:8848}
         namespace: ${env-nacos-namespace:2c519718-1e09-4de4-9af5-d07f837372d6}
       config:
         # 配置中心地址
-        server-addr: ${env-nacos-server:172.192.10.105:30003}
+        server-addr: ${env-nacos-server:192.168.20.135:8848}
         namespace: ${env-nacos-namespace:2c519718-1e09-4de4-9af5-d07f837372d6}
         # 配置文件格式
         file-extension: yml

ems/sql/ems_init_data.sql

@@ -295,9 +295,9 @@ INSERT INTO `adm_op_energy_strategy_param` (`strategy_code`, `param_group`, `par
 
 
 -- 对象模型表
-INSERT INTO `adm_ems_obj_model` (`model_code`, `model_name`, `obj_type`, `ability_handler`, `event_handler`) VALUES ('M_W2_QF_GEEKOPEN', 'GeekOpen断路器', 2, 'http://172.192.13.95:9203/ems-dev-adapter/circuit-breaker/GeekOpen/abilityCall', NULL);
+INSERT INTO `adm_ems_obj_model` (`model_code`, `model_name`, `obj_type`, `ability_handler`, `event_handler`) VALUES ('M_W2_QF_GEEKOPEN', 'GeekOpen断路器', 2, 'http://192.168.20.210:9203/ems-dev-adapter/circuit-breaker/GeekOpen/abilityCall', NULL);
+INSERT INTO `adm_ems_obj_model` (`model_code`, `model_name`, `obj_type`, `ability_handler`, `event_handler`) VALUES ('M_W2_QS_KEKA_86', 'KEKA开关（86型）', 2, 'http://192.168.20.210:9203/ems-dev-adapter/button-switch/keka/86ButtonSwitchCall', NULL);
 INSERT INTO `adm_ems_obj_model` (`model_code`, `model_name`, `obj_type`, `ability_handler`, `event_handler`) VALUES ('M_Z040_DC-EVSE_TLD', '特来电直流桩', 2, NULL, NULL);
-INSERT INTO `adm_ems_obj_model` (`model_code`, `model_name`, `obj_type`, `ability_handler`, `event_handler`) VALUES ('M_W2_QS_KEKA_86', 'KEKA开关（86型）', 2, NULL, NULL);
 
 -- 对象属性DEMO数据
 INSERT INTO `adm_ems_obj_attr` (`model_code`, `attr_group`, `attr_key`, `attr_name`, `attr_unit`, `attr_value_type`) VALUES ('M_W2_QF_GEEKOPEN', 'Base', 'version', '固件版本号', NULL, 'Value');

ems/sql/ems_server.sql

@@ -574,6 +574,28 @@ CREATE TABLE `adm_area_weather_forecast` (
 
 
 -- ----------------------------
+-- 定时任务调度表
+-- ----------------------------
+drop table if exists sys_job;
+create table sys_job (
+    job_id              bigint(20)    not null auto_increment    comment '任务ID',
+    job_name            varchar(64)   default ''                 comment '任务名称',
+    job_group           varchar(64)   default 'DEFAULT'          comment '任务组名',
+    invoke_target       varchar(500)  not null                   comment '调用目标字符串',
+    cron_expression     varchar(255)  default ''                 comment 'cron执行表达式',
+    misfire_policy      varchar(20)   default '3'                comment '计划执行错误策略（1立即执行 2执行一次 3放弃执行）',
+    concurrent          char(1)       default '1'                comment '是否并发执行（0允许 1禁止）',
+    status              char(1)       default '0'                comment '状态（0正常 1暂停）',
+    create_by           varchar(64)   default ''                 comment '创建者',
+    create_time         datetime                                 comment '创建时间',
+    update_by           varchar(64)   default ''                 comment '更新者',
+    update_time         datetime                                 comment '更新时间',
+    remark              varchar(500)  default ''                 comment '备注信息',
+    primary key (job_id, job_name, job_group)
+) engine=innodb auto_increment=100 comment = '定时任务调度表';
+
+
+-- ----------------------------
 -- 能源设施表
 -- ----------------------------
 drop table if exists adm_ems_facs;