dengsixing 1 周之前
父節點
當前提交
18713c0272

+ 1 - 1
src/main/java/com/project/hyb/biz/service/impl/ArtArtworksServiceImpl.java

@@ -81,7 +81,7 @@ public class ArtArtworksServiceImpl extends ServiceImpl<ArtArtworksMapper, ArtAr
                         .eq(SysAttachments::getModules, "artwork")
                         .eq(SysAttachments::getCategory, 6));
         if(CollUtil.isNotEmpty(objs)){
-            bean.setModelFiles(imgs.stream().map(v->v.getServerpath() + v.getServername() + "." + v.getExtension()).collect(Collectors.toList()));
+            bean.setModelFiles(objs.stream().map(v->v.getServerpath() + v.getServername() + "." + v.getExtension()).collect(Collectors.toList()));
         }
 
         return bean;

+ 18 - 17
src/main/resources/application-test.yml

@@ -1,20 +1,21 @@
 spring:
-  dynamic:
-    #指定一个主数据源,primary表示是主数据源也可以认为是默认数据源,如果不加注解DS(“数据源名字”)则会去主数据源中查询
-    primary: system
-    datasource:
-      #第一个数据源配置
-      artmember:
-        url: jdbc:mysql://106.53.107.102:3306/artmember
-        username: root
-        password: mysql123!ROOT.
-        driver-class-name: com.mysql.cj.jdbc.Driver
-      #第二个数据源配置
-      artoffice_museum:
-        url: jdbc:mysql://106.53.107.102:3306/artoffice_museum
-        username: root
-        password: mysql123!ROOT.
-        driver-class-name: com.mysql.cj.jdbc.Driver
+  datasource:
+    dynamic:
+      #指定一个主数据源,primary表示是主数据源也可以认为是默认数据源,如果不加注解DS(“数据源名字”)则会去主数据源中查询
+      primary: system
+      datasource:
+        #第一个数据源配置
+        artmember:
+          url: jdbc:mysql://8.135.106.227:3306/artmember
+          username: root
+          password: 4dkk2021testproject%
+          driver-class-name: com.mysql.cj.jdbc.Driver
+        #第二个数据源配置
+        artoffice_museum:
+          url: jdbc:mysql://8.135.106.227:3306/artoffice_museum
+          username: root
+          password: 4dkk2021testproject%
+          driver-class-name: com.mysql.cj.jdbc.Driver
 
 pms:
   preview: false
@@ -24,4 +25,4 @@ mybatis-plus:
     log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl #开启sql日志
 
 filestorage:
-  path:
+  path: /data/data01/museum_huyaobang_data/filestorage

+ 3 - 3
src/main/resources/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8080
+  port: 8180
   tomcat:
     max-http-form-post-size: -1
 spring:
@@ -26,7 +26,7 @@ spring:
 sa-token:
   token-name: Authorization
   token-prefix: Bearer
-  jwt-secret-key: 'd0!doc15415B0*4G0`'
+  jwt-secret-key: xxx
 knife4j:
   enable: true
 
@@ -40,7 +40,7 @@ mybatis-plus:
       logic-delete-value: 0 # 逻辑已删除值。可选,默认值为 0
       logic-not-delete-value: 1 # 逻辑未删除值。可选,默认值为 1
 log:
-  path: /home/backend/kanzhan
+  path: /data/data01/museum_huyaobang_data/server
 
 # 不配默认为false
 tlog: