Merge remote-tracking branch 'origin/dev' into dev

Dockerfile

@@ -0,0 +1,58 @@
+FROM openjdk:8-jdk-alpine
+
+ARG ARG_APP_NAME
+ARG ARG_DEPLOY_PATH
+ARG ROOT_PATH
+ARG APP_MODULE_PATH=""
+
+ARG PORT
+
+
+ENV TIME_ZONE Asia/Shanghai
+
+ENV APP_NAME=${ARG_APP_NAME}
+
+ENV DEPLOY_PATH=${ARG_DEPLOY_PATH}
+
+ENV APP_LOG_DIR=/data/${APP_NAME}/logs/app
+
+ENV TOMCAT_LOG_DIR=/data/${APP_NAME}/logs/tomcat
+
+ENV HEAP_DUMP_PATH=/data/${APP_NAME}/logs/heap-dump
+
+ENV RUOYI_UPLOAD_PATH=/data/${APP_NAME}/ruoyi/uploadPath
+
+ENV JVM_OPTION_THREAD_STACK_SIZE=512k
+
+ENV JVM_OPTION_NETWORK_ADDRESS_CACHE_TTL=10
+
+ENV JVM_OPTION_MAX_DIRECT_MEMORY_SIZE=512m
+
+ENV JVM_OPTION_MAX_METASPACE_SIZE=256m
+
+ENV JVM_OPTION_RESERVED_CODE_CACHE_SIZE=256m
+
+ENV JVM_MAX_GC_PAUSE_MILLS=50
+
+ENV SERVER_PORT=${PORT}
+
+ENV JAVA_OPTS = ""
+WORKDIR ${DEPLOY_PATH}/${APP_NAME}
+RUN ln -snf /usr/share/zoneinfo/$TIME_ZONE /etc/localtime
+
+RUN mkdir -p ${APP_LOG_DIR}
+
+RUN mkdir -p ${TOMCAT_LOG_DIR}
+
+RUN mkdir -p ${HEAP_DUMP_PATH}
+
+RUN mkdir -p ${RUOYI_UPLOAD_PATH}
+
+RUN apk add --update font-adobe-100dpi ttf-dejavu fontconfig
+
+ADD ${ROOT_PATH}${APP_MODULE_PATH}/target/${APP_NAME}.jar ./
+
+EXPOSE ${SERVER_PORT}
+
+
+ENTRYPOINT ["/bin/sh","-c","java -XX:ThreadStackSize=512k -Dfile.encoding=UTF-8 -Xms512m -Xmx1024m -XX:MaxMetaspaceSize=512m -XX:+PrintGCDetails -XX:NewRatio=1 -XX:+UseParallelOldGC -jar $APP_NAME.jar"]

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

@@ -12,13 +12,15 @@ spring:
     active: zlpt_cloud_dev
   cloud:
     nacos:
+      username: nacos
+      password: Bonus@admin123!
       discovery:
         # 服务注册地址
-        server-addr: 192.168.0.14:8848
+        server-addr: 192.168.1.3:8848
         namespace: zlpt_cloud_dev
       config:
         # 配置中心地址
-        server-addr: 192.168.0.14:8848
+        server-addr: 192.168.1.3:8848
         namespace: zlpt_cloud_dev
         # 配置文件格式
         file-extension: yml

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

@@ -12,16 +12,18 @@ spring:
     active: zlpt_cloud_dev
   cloud:
     nacos:
+      username: nacos
+      password: Bonus@admin123!
       discovery:
         # 服务注册地址
 #        server-addr: 192.168.0.14:8848
-        server-addr: 10.40.92.74:8848
-#        namespace: zlpt_cloud_dev
+        server-addr: 192.168.1.3:8848
+        namespace: zlpt_cloud_dev
       config:
         # 配置中心地址
 #        server-addr: 192.168.0.14:8848
-        server-addr: 10.40.92.74:8848
-#        namespace: zlpt_cloud_dev
+        server-addr: 192.168.1.3:8848
+        namespace: zlpt_cloud_dev
         # 配置文件格式
         file-extension: yml
         # 共享配置
@@ -38,7 +40,7 @@ spring:
         ds1:
           nacos:
 #            server-addr: 192.168.0.14:8848
-            server-addr: 10.40.92.74:8848
+            server-addr: 192.168.1.3:8848
             dataId: sentinel-zlpt-gateway
             groupId: DEFAULT_GROUP
             data-type: json

zlpt-modules/zlpt-bigScreen/src/main/resources/bootstrap.yml

@@ -12,13 +12,15 @@ spring:
     active: zlpt_cloud_dev
   cloud:
     nacos:
+      username: nacos
+      password: Bonus@admin123!
       discovery:
         # 服务注册地址
-        server-addr: 192.168.0.14:8848
+        server-addr: 192.168.1.3:8848
         namespace: zlpt_cloud_dev
       config:
         # 配置中心地址
-        server-addr: 192.168.0.14:8848
+        server-addr: 192.168.1.3:8848
         namespace: zlpt_cloud_dev
         # 配置文件格式
         file-extension: yml

zlpt-modules/zlpt-company/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 10086
+  port: 9502
 
 # Spring
 spring: 
@@ -13,15 +13,17 @@ spring:
 #    active: default
   cloud:
     nacos:
+      username: nacos
+      password: Bonus@admin123!
       discovery:
         # 服务注册地址
 #        server-addr: 192.168.0.14:8848
-        server-addr: 10.40.92.74:8848
+        server-addr: 192.168.1.3:8848
 #        namespace: zlpt_cloud_dev
       config:
         # 配置中心地址
 #        server-addr: 192.168.0.14:8848
-        server-addr: 10.40.92.74:8848
+        server-addr: 192.168.1.3:8848
 #        namespace: zlpt_cloud_dev
         # 配置文件格式
         file-extension: yml

zlpt-modules/zlpt-equip/src/main/resources/bootstrap.yml

@@ -12,13 +12,15 @@ spring:
     active: zlpt_cloud_dev
   cloud:
     nacos:
+      username: nacos
+      password: Bonus@admin123!
       discovery:
         # 服务注册地址
-        server-addr: 10.40.92.74:8848
+        server-addr: 192.168.1.3:8848
 #        namespace: zlpt_cloud_dev
       config:
         # 配置中心地址
-        server-addr: 10.40.92.74:8848
+        server-addr: 192.168.1.3:8848
 #        namespace: zlpt_cloud_dev
         # 配置文件格式
         file-extension: yml

zlpt-modules/zlpt-file/src/main/resources/bootstrap.yml

@@ -36,13 +36,15 @@ spring:
     active: zlpt_cloud_dev
   cloud:
     nacos:
+      username: nacos
+      password: Bonus@admin123!
       discovery:
         # 服务注册地址
-        server-addr: 192.168.0.14:8848
+        server-addr: 192.168.1.3:8848
         namespace: zlpt_cloud_dev
       config:
         # 配置中心地址
-        server-addr: 192.168.0.14:8848
+        server-addr: 192.168.1.3:8848
         namespace: zlpt_cloud_dev
         # 配置文件格式
         file-extension: yml

zlpt-modules/zlpt-gen/src/main/resources/bootstrap.yml

@@ -12,13 +12,15 @@ spring:
     active: zlpt_cloud_dev
   cloud:
     nacos:
+      username: nacos
+      password: Bonus@admin123!
       discovery:
         # 服务注册地址
-        server-addr: 192.168.0.14:8848
+        server-addr: 192.168.1.3:8848
         namespace: zlpt_cloud_dev
       config:
         # 配置中心地址
-        server-addr: 192.168.0.14:8848
+        server-addr: 192.168.1.3:8848
         namespace: zlpt_cloud_dev
         # 配置文件格式
         file-extension: yml

zlpt-modules/zlpt-home/src/main/resources/bootstrap.yml

@@ -13,13 +13,15 @@ spring:
     active: zlpt_cloud_dev
   cloud:
     nacos:
+      username: nacos
+      password: Bonus@admin123!
       discovery:
         # 服务注册地址
-        server-addr: 192.168.0.14:8848
+        server-addr: 192.168.1.3:8848
         namespace: zlpt_cloud_dev
       config:
         # 配置中心地址
-        server-addr: 192.168.0.14:8848
+        server-addr: 192.168.1.3:8848
         namespace: zlpt_cloud_dev
         # 配置文件格式
         file-extension: yml

zlpt-modules/zlpt-order/src/main/resources/bootstrap.yml

@@ -12,13 +12,15 @@ spring:
     active: zlpt_cloud_dev
   cloud:
     nacos:
+      username: nacos
+      password: Bonus@admin123!
       discovery:
         # 服务注册地址
-        server-addr: 192.168.0.14:8848
+        server-addr: 192.168.1.3:8848
         namespace: zlpt_cloud_dev
       config:
         # 配置中心地址
-        server-addr: 192.168.0.14:8848
+        server-addr: 192.168.1.3:8848
         namespace: zlpt_cloud_dev
         # 配置文件格式
         file-extension: yml

zlpt-modules/zlpt-system/src/main/resources/bootstrap.yml

@@ -34,13 +34,15 @@ spring:
     active: zlpt_cloud_dev
   cloud:
     nacos:
+      username: nacos
+      password: Bonus@admin123!
       discovery:
         # 服务注册地址
-        server-addr: 192.168.0.14:8848
+        server-addr: 192.168.1.3:8848
         namespace: zlpt_cloud_dev
       config:
         # 配置中心地址
-        server-addr: 192.168.0.14:8848
+        server-addr: 192.168.1.3:8848
         namespace: zlpt_cloud_dev
         # 配置文件格式
         file-extension: yml

zlpt-visual/zlpt-monitor/src/main/resources/bootstrap.yml

@@ -12,13 +12,15 @@ spring:
     active: zlpt_cloud_dev
   cloud:
     nacos:
+      username: nacos
+      password: Bonus@admin123!
       discovery:
         # 服务注册地址
-        server-addr: 192.168.0.14:8848
+        server-addr: 192.168.1.3:8848
         namespace: zlpt_cloud_dev
       config:
         # 配置中心地址
-        server-addr: 192.168.0.14:8848
+        server-addr: 192.168.1.3:8848
         namespace: zlpt_cloud_dev
         # 配置文件格式
         file-extension: yml