docker-stack.yml

@@ -0,0 +1,34 @@
+# stack 不支持基于第2版写的docker-compose.yml ，version版本至少为3
+version: '3'
+services:
+  redis:
+    image: redis
+    #    ports:
+    #      - 6379:6379
+    restart: always
+    deploy:
+      replicas: 2
+
+  api:
+    restart: on-failure
+    depends_on:
+      - interlock_redis
+    image: registry.cn-hangzhou.aliyuncs.com/interlock/api:1.0
+    #    ports:
+    #      - 8520:8520
+    deploy:
+      replicas: 2
+  #    environment:
+  #      - BACKEND_URL=http://interlockapi:8520
+
+  ui:
+    restart: on-failure
+    depends_on:
+      - interlock_api
+    image: registry.cn-hangzhou.aliyuncs.com/interlock/ui:1.0
+    ports:
+      - 8092:8092
+    deploy:
+      replicas: 3
+#    volumes:
+#      - ./nginx.conf:/etc/nginx/nginx.conf

jeecg-module-system/jeecg-system-start/Dockerfile

@@ -11,6 +11,6 @@ WORKDIR /jeecg-boot
 EXPOSE 8520
 
 #ADD ./src/main/resources/jeecg ./config/jeecg
-ADD ./target/jeecg-system-start-3.4.3.jar ./
+ADD ./jeecg-system-start-3.4.3.jar ./
 
-CMD sleep 60;java -Djava.security.egd=file:/dev/./urandom -jar jeecg-system-start-3.4.3.jar
+CMD sleep 60;java -Djava.security.egd=file:/dev/./urandom -jar jeecg-system-start-3.4.3.jar

jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -183,6 +183,12 @@ spring:
           url: jdbc:postgresql://119.3.168.55:5432/interlock?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: postgres
           password: 302201
+
+#    打包时修改该配置 改成正式数据库
+#          url: jdbc:postgresql://127.0.0.1:5436/interlock?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+#          username: postgres
+#          password: cfc1280b9735f2a1d67
+
           driver-class-name: org.postgresql.Driver
 #          url: jdbc:mysql://119.3.168.55:3306/interlock?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
 #          username: root
@@ -200,6 +206,17 @@ spring:
     host: 119.3.168.55
     port: 6380
     password: 123qx
+
+#    打包时修改该配置 改成正式redis
+#    host: 127.0.0.1
+#    port: 6379
+#    password:
+
+#    docker配置
+#    host: interlock_redis
+#    port: 6379
+#    password:
+
 #mybatis plus 设置
 mybatis-plus:
   mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
@@ -281,8 +298,13 @@ jeecg:
     logRetentionDays: 30
   #分布式锁配置
   redisson:
-    address: 127.0.0.1:6379
-    password:
+#    docker配置
+#    address: http://interlock_redis:6379
+#    打包时修改该配置 改成正式数据库
+#    address: 127.0.0.1:6379
+#    password:
+    address: 119.3.168.55:6380
+    password: 123qx
     type: STANDALONE
     enabled: true
 #cas单点登录
@@ -364,3 +386,8 @@ postgresql:
   url: jdbc:postgresql://119.3.168.55:5432/interlock
   username: postgres
   password: 302201
+
+#    打包时修改该配置 改成正式数据库
+#  url: jdbc:postgresql://127.0.0.1:5436/interlock
+#  username: postgres
+#  password: cfc1280b9735f2a1d67

jeecg-module-system/jeecg-system-start/src/main/resources/logback-spring.xml

@@ -67,6 +67,7 @@
 	<logger name="java.sql.PreparedStatement" level="DEBUG" />
 
 	<!-- 日志输出级别 -->
+<!--	打包时修改该配置 改成ERROR-->
 	<root level="INFO">
 		<appender-ref ref="STDOUT" />
 		<appender-ref ref="FILE" />
@@ -74,4 +75,4 @@
 		<appender-ref ref="FILE_HTML" />
 	</root>
 
-</configuration>
+</configuration>