From 045a77013cb010ad70ffc60454f2d6cd1e5fd2d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Wed, 18 Sep 2024 08:47:26 +0800
Subject: [PATCH] 'commit'

---
 .gitignore                                    |  2 ++
 ds-base/pom.xml                               | 20 -------------------
 .../main/resource/application_dev.properties  |  2 --
 .../main/resource/application_pro.properties  |  5 +----
 操作文档/5、k8s集群.md                 | 10 +---------
 5 files changed, 4 insertions(+), 35 deletions(-)

diff --git a/.gitignore b/.gitignore
index ef95282c..74c76d12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,6 @@
 /ds-base/lib/
 /ds-build/target/
 /ds-build/lib/
+/ds-base/.idea/
+/ds-build/.idea/
 /备份/
diff --git a/ds-base/pom.xml b/ds-base/pom.xml
index 8da0d78d..f6ba70c2 100644
--- a/ds-base/pom.xml
+++ b/ds-base/pom.xml
@@ -113,26 +113,6 @@
             <version>2.4</version>
             <classifier>jdk15</classifier>
         </dependency>
-        <!--引用Mongodb的JFinal插件-->
-        <!-- https://mvnrepository.com/artifact/com.cybermkd/MongodbPlugin -->
-        <dependency>
-            <groupId>com.cybermkd</groupId>
-            <artifactId>MongodbPlugin</artifactId>
-            <version>1.0.8.2</version>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/org.mongodb/mongo-java-driver -->
-        <dependency>
-            <groupId>org.mongodb</groupId>
-            <artifactId>mongo-java-driver</artifactId>
-            <version>3.12.14</version>
-        </dependency>
-
-        <!--科拓签名用的包-->
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>21.0</version>
-        </dependency>
 
         <!--日志logback-->
         <dependency>
diff --git a/ds-base/src/main/resource/application_dev.properties b/ds-base/src/main/resource/application_dev.properties
index d78813a9..b89edf79 100644
--- a/ds-base/src/main/resource/application_dev.properties
+++ b/ds-base/src/main/resource/application_dev.properties
@@ -15,5 +15,3 @@ excelExportTemplatePathSuffix=/ExcelExportTemplate/
 #  导入excel 的模板配置路径
 ExcelImportTemplatePathSuffix=/ExcelImportTemplate/
 
-#mongodb
-mongodbUri=mongodb://yltcharge:yltcharge@10.10.14.210:27017/yltcharge
diff --git a/ds-base/src/main/resource/application_pro.properties b/ds-base/src/main/resource/application_pro.properties
index 47e5f3d5..62447393 100644
--- a/ds-base/src/main/resource/application_pro.properties
+++ b/ds-base/src/main/resource/application_pro.properties
@@ -13,7 +13,4 @@ CookieMd5SingPwd=DsideaL4r5t6y7u
 #  导出excel 的模板配置路径
 excelExportTemplatePathSuffix=/ExcelExportTemplate/
 #  导入excel 的模板配置路径
-ExcelImportTemplatePathSuffix=/ExcelImportTemplate/
-
-#mongodb
-mongodbUri=mongodb://yltcharge:yltcharge@dds-bp176c45f561f0041.mongodb.rds.aliyuncs.com:3717,dds-bp176c45f561f0042.mongodb.rds.aliyuncs.com:3717/yltcharge?replicaSet=mgset-36440453
+ExcelImportTemplatePathSuffix=/ExcelImportTemplate/
\ No newline at end of file
diff --git a/操作文档/5、k8s集群.md b/操作文档/5、k8s集群.md
index 1beaba85..579b5654 100644
--- a/操作文档/5、k8s集群.md
+++ b/操作文档/5、k8s集群.md
@@ -791,15 +791,7 @@ https://blog.csdn.net/nuptaxin/article/details/124008353
 
 
 
-### 七、其它软件安装
-
-$mysql$,$redis$,$MongoDB$,$Minio$
-
-这四个组件，不建议使用$K8S$进行安装管理，建议采用非$K8S$,非$Docker$方式进行部署，采用原始方式进行安装配置，这样性能最高！
-
-
-
-### 八、资料
+### 七、资料
 
 $K8S$可能会产生垃圾或者僵尸$pod$，在删除$rc$的时候，相应的$pod$没有被删除，手动删除$pod$后会自动重新创建，这时一般需要先删除掉相关联的$resources$