Merge remote-tracking branch 'origin/main'

pom.xml

@@ -113,12 +113,16 @@
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>cn.com.tenlion</groupId>
+            <artifactId>interface-building-pictures</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
 
         <dependency>
-            <groupId>org.springframework</groupId>
+            <groupId>cn.com.tenlion</groupId>
-            <artifactId>spring-beans</artifactId>
+            <artifactId>module-building-pictures</artifactId>
-            <version>5.3.3</version>
+            <version>1.0-SNAPSHOT</version>
-            <scope>compile</scope>
         </dependency>
 
         <dependency>
@@ -126,7 +130,6 @@
             <artifactId>module-material-store</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-
     </dependencies>
 
     <build>

src/main/resources/application.yml

@@ -1,6 +1,6 @@
 server:
-  port: 8088
+  port: 8090
-  url: http://127.0.0.1:8088/businesscard
+  url: http://192.168.0.115:8090/businesscard
   system-title: 名片管理系统
   system-sub-title: 名片系统
   servlet:
@@ -28,8 +28,8 @@ spring:
       url: jdbc:mysql://49.232.216.45:3306/db_business_card?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false&serverTimezone=UTC
       db-type: mysql
       driver-class-name: com.mysql.cj.jdbc.Driver
-      username: liuyang
+      username: cuibaocheng
-      password: tsliuyang
+      password: 1qaz2wsx
       initial-size: 2
       min-idle: 2
       max-active: 10
@@ -67,6 +67,7 @@ logging:
     root: error
     com.cm: debug
     ink.wgink: debug
+    cn.com: debug
 
 swagger:
   base-package-list: ink.wgink,cn.com.tenlion
@@ -74,7 +75,7 @@ swagger:
 # 文件上传管理
 file:
   # 文件的保存路径
-  upload-path: D:\CF_work\ideaWorkSpace\uploadFiles
+  upload-path: D:\card
   # 图片类型
   image-types: png,jpg,jpeg,gif,blob
   # 视频类型
@@ -88,20 +89,19 @@ file:
   # 图片输出压缩质量，大于0，默认0.4
   image-output-quality: 0.4
   # 媒体最大时长（单位：秒）
-  media-max-duration:
+#  media-max-duration:
-    # 后台
+#    # 后台
-    backend:
+#    backend:
-      video: 10
+#      video: 10
-      audio: 60
+#      audio: 60
-    # 微信
+#    # 微信
-    wechat:
+#    wechat:
-      video: 10
+#      video: 10
-      audio: 60
+#      audio: 60
-    # app
+#    # app
-    app:
+#    app:
-      video: 10
+#      video: 10
-      audio: 60
+#      audio: 60
-
 open-platform:
   wechat:
     mini-app: