Merge remote-tracking branch 'origin/feature-2022.07.29' into feature-2022.07.29

eladmin-system/src/main/java/me/zhengjie/application/bank/service/impl/BorrowerServiceImpl.java

@@ -143,7 +143,12 @@ public class BorrowerServiceImpl extends AbstractServiceImpl<BorrowerMapper, Bor
             notaryOrder.eq("status", 4);
             orderEntity = orderService.getOne(notaryOrder);
         }
-
+        //查询主订单状态
+        QueryWrapper<NotaryOrderEntity> statusOrder = new QueryWrapper<>();
+        statusOrder.eq("business_no", businessNo);
+       
+        NotaryOrderEntity orderStatus = orderService.getOne(statusOrder);
+        
         List<OrderDto> list = new ArrayList<OrderDto>();
         for (BorrowerEntity b : borrowers) {
             OrderDto dto = new OrderDto();
@@ -161,7 +166,7 @@ public class BorrowerServiceImpl extends AbstractServiceImpl<BorrowerMapper, Bor
             dto.setResidence(b.getResidence());
             dto.setRate(b.getRate());
             dto.setType("1");
-            dto.setStatus(orderEntity.getStatus());
+            dto.setStatus(orderStatus.getStatus());
             //子订单
             dto.setSubStatus(b.getStatus());
             if (orderEntity != null) {
@@ -192,7 +197,7 @@ public class BorrowerServiceImpl extends AbstractServiceImpl<BorrowerMapper, Bor
             dto.setHouseLocation(b.getHouseLocation());
             dto.setHousePropertyNo(b.getHousePropertyNo());
             dto.setType("2");
-            dto.setStatus(orderEntity.getStatus());
+            dto.setStatus(orderStatus.getStatus());
             dto.setSubStatus(b.getStatus());
             if (orderEntity != null) {
                 dto.setReturnReason(orderEntity.getReturnReason());
@@ -219,7 +224,7 @@ public class BorrowerServiceImpl extends AbstractServiceImpl<BorrowerMapper, Bor
             dto.setBusinessNo(businessNo);
             dto.setResidence(b.getResidence());
             dto.setType("3");
-            dto.setStatus(orderEntity.getStatus());
+            dto.setStatus(orderStatus.getStatus());
             //子订单状态
             dto.setSubStatus(b.getStatus());
             if (orderEntity != null) {

eladmin-system/src/main/java/me/zhengjie/base/file/MinioFileHandle.java

@@ -48,6 +48,7 @@ public class MinioFileHandle extends AbstractFileHandle {
 				minioClient = new MinioClient(appMinioUrl, appMinioAccesskey, appMinioSecretkey);
 				log.info("minioClient create end");
 				// 判断桶是否已经存在
+				log.info("开始创建minio的：");
 				createBucket();
 			}
 		} catch (Exception e) {

eladmin-system/src/main/resources/config/application-nt.yml

@@ -1,6 +1,6 @@
 #配置数据源
 server:
-  port: 8000
+  port: 8009
 spring:
   mvc:
     static-path-pattern: /image/**
@@ -156,19 +156,19 @@ app:
   background:
     picture: https://flowbb.show.xjrkj.com/image/logo/83d9449f4e02459da1661bafdf08b86a_8.png
   image:
-    url: https://flowbb.show.xjrkj.com/image/
+    url: https://fqgz.banknotary.cn:8000/image/
   upload:
     path: /image/
   host:
-    domain: https://flowbb.show.xjrkj.com/
+    domain: https://fqgz.banknotary.cn:8000/
   push:
     port: 8089
   minio:
-    accesskey: minioadmin
-    secretkey: minioadmin
-    url: http://124.222.192.60:9000
-    bucketName: mytest    
-    preview: https://flowbb.show.xjrkj.com
+    accesskey: admin
+    secretkey: nt123!jf
+    url: http://127.0.0.1:9000
+    bucketName: fqgz    
+    preview: https://fqgz.banknotary.cn:8000
 tencent:
   client:
     webankAppId: TIDAdW8e
@@ -189,5 +189,5 @@ xxl:
       address:
       ip:
       port: 9999
-      logpath: /Users/sakuya/applogs/xxl-job/jobhandler
+      logpath: ./xxl-job/
       logretentiondays: 30

ubuntu.txt

@@ -150,6 +150,7 @@
 	  sudo make 
 	 将文件安装到指定目录
 	  sudo make install 
+文件服务器：