From 6682b0313e8378f3ac10b323034ebda19feeb9f1 Mon Sep 17 00:00:00 2001
From: han0 <wslshanlin@sina.com>
Date: Wed, 15 Nov 2023 11:22:22 +0800
Subject: [PATCH] =?UTF-8?q?deploy:=20=E6=96=B0=E5=A2=9E=20docker=20compose?=
 =?UTF-8?q?=20=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml                 | 16 ++++++++++++++++
 src/main/resources/application.yml | 21 ++++++++++-----------
 2 files changed, 26 insertions(+), 11 deletions(-)
 create mode 100644 docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..2222a08
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,16 @@
+version: "3"
+services:
+  application:
+    container_name: material-manage-service
+    restart: always
+    image: openjdk:11.0.12
+    volumes:
+      - /opt/app/material-manage-service/app.jar:/app.jar
+      - /opt/app/material-manage-service/logs:/logs
+      - /opt/files/material-manage-service:/files
+      - /etc/localtime:/etc/localtime
+    ports:
+      - "9882:9882"
+    environment:
+      - TZ="Asia/Shanghai"
+    entrypoint: java -server -Xms256m -Xmx256m -jar app.jar --spring.profiles.active=test
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c9e9981..987270b 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -30,6 +30,8 @@ mybatis-plus:
     configuration:
         jdbc-type-for-null: 'null'
         log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+
     global-config:
         banner: false
         db-config:
@@ -64,6 +66,7 @@ sa-token:
     token-style: random-32
 server:
     port: 9882
+
 mjkf-xinke:
     config:
         common:
@@ -71,9 +74,10 @@ mjkf-xinke:
             front-url: http://localhost:9881
         ten:
             default-ten-id: -1
-            enabled: true
+            enabled: false
             ignore-table-names: ''
             ten-id-column-name: TENANT_ID
+
 spring:
     datasource:
         druid:
@@ -129,13 +133,8 @@ spring:
             max-request-size: 100MB
     application:
         name: material-manage-service
-snowy:
-    config:
-        common:
-            backend-url: http://localhost:8192
-            front-url: http://localhost:8181
-        ten:
-            default-ten-id: -1
-            enabled: true
-            ignore-table-names: ''
-            ten-id-column-name: TENANT_ID
\ No newline at end of file
+
+proxy:
+    solr:
+        servlet_url: /solr/*    # 这里不能写ip地址,只写接口后半段即可
+        target_url: http://localhost:50000   # 真实服务器接口地址
\ No newline at end of file