Pre Merge pull request !336 from tgooogt/master

ruoyi-auth/Dockerfile

@@ -0,0 +1,15 @@
+FROM hub.iot.chinamobile.com/oneos/oneos_jdk:1.8.0_271
+LABEL maintainer=tangang
+
+
+#启动自行加载   服务名-prod.yml配置
+ENV PARAMS="--server.port=8080 --spring.profiles.active=prod --spring.cloud.nacos.discovery.server-addr=his-nacos.oneos-tg:8848 --spring.cloud.nacos.config.server-addr=his-nacos.oneos-tg:8848  --spring.cloud.nacos.config.file-extension=yml"
+
+# 基础镜像已经修改完时区，这里注释掉
+# RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+
+COPY ruoyi-auth/target/*.jar /app.jar
+EXPOSE 8080
+
+#
+ENTRYPOINT ["/bin/sh","-c","java -Dfile.encoding=utf8 -Djava.security.egd=file:/dev/./urandom -jar /app.jar $PARAMS"]

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

@@ -9,15 +9,19 @@ spring:
     name: ruoyi-auth
   profiles:
     # 环境配置
-    active: dev
+    active: prod
   cloud:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: his-nacos.oneos-tg:8848
+        username: nacos
+        password: nacos
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: his-nacos.oneos-tg:8848
+        username: nacos
+        password: nacos
         # 配置文件格式
         file-extension: yml
         # 共享配置

ruoyi-gateway/Dockerfile

@@ -0,0 +1,15 @@
+FROM hub.iot.chinamobile.com/oneos/oneos_jdk:1.8.0_271
+LABEL maintainer=tangang
+
+
+#启动自行加载   服务名-prod.yml配置
+ENV PARAMS="--server.port=8080 --spring.profiles.active=prod --spring.cloud.nacos.discovery.server-addr=his-nacos.oneos-tg:8848 --spring.cloud.nacos.config.server-addr=his-nacos.oneos-tg:8848 --spring.cloud.nacos.config.namespace=prod --spring.cloud.nacos.config.file-extension=yml"
+
+# 基础镜像已经修改完时区，这里注释掉
+# RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+
+COPY ruoyi-gateway/target/*.jar /app.jar
+EXPOSE 8080
+
+#
+ENTRYPOINT ["/bin/sh","-c","java -Dfile.encoding=utf8 -Djava.security.egd=file:/dev/./urandom -jar /app.jar ${PARAMS}"]

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

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: his-nacos.oneos-tg:8848
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: his-nacos.oneos-tg:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置
@@ -33,7 +33,7 @@ spring:
       datasource:
         ds1:
           nacos:
-            server-addr: 127.0.0.1:8848
+            server-addr: his-nacos.oneos-tg:8848
             dataId: sentinel-ruoyi-gateway
             groupId: DEFAULT_GROUP
             data-type: json