From 54503ab26796f4d30c7f0799d3cf792314c0dbcc Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Wed, 19 Jun 2024 14:53:03 +0800
Subject: [PATCH] 6/19

---
 pom.xml                                |  2 +-
 src/main/resources/application-pro.yml | 30 ++++++++++++++++++++++++++
 src/main/resources/application.yml     |  5 +++--
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index be5c678..3dc595d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 
     <artifactId>ss-common-warehouse</artifactId>
     <groupId>ss-common-warehouse</groupId>
-    <version>0.0.1</version>
+    <version>2.0.1</version>
 
     <dependencies>
         <dependency>
diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml
index e69de29..b6a8b2f 100644
--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@@ -0,0 +1,30 @@
+spring:
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://127.0.0.1:3306/ss_warehouse?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+    username: root
+    password: 1LAiGz$t1*Iw
+  cloud:
+    nacos:
+      discovery:
+        #        namespace: supervise
+        server-addr: 127.0.0.1:8848
+  redis:
+    database: 3  # Redis数据库索引（默认为0）
+    host: 127.0.0.1
+    jedis:
+      pool:
+        max-active: -1  #连接池最大连接数（使用负值表示没有限制）
+        max-idle: 8  #连接池中的最大空闲连接
+        max-wait: -1   # 连接池最大阻塞等待时间（使用负值表示没有限制）
+        min-idle: 0  # 连接池中的最小空闲连接
+    password: 123456
+    port: 6379
+    timeout: 0  # 连接超时时间（毫秒）
+image:
+  upload:
+    path: D:/webapps/lipinka/yythmall-ui/upload/
+  url:
+    prefix: https://supervise.yxtsoft.com/lpk/upload/
+import:
+  filePath: D:/yxt-supervise-gf/upload/
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9002cdf..46186ec 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,8 +1,9 @@
 spring:
   application:
-    name: ss-warehouse
+    name: ss-common-warehouse
   profiles:
     active: dev
+#    active: pro
   messages:
     # 国际化资源文件路径
     basename: i18n/messages
@@ -17,7 +18,7 @@ spring:
       enabled: true
 
 server:
-  port: 7301
+  port: 6213
   max-http-header-size: 102400
   undertow:
     max-http-post-size: -1