设备码生成

src/main/java/org/springblade/modules/api/controller/ApiFacilityController.java

@@ -151,7 +151,7 @@ public class ApiFacilityController extends BaseController {
             });
 
             pages.getRecords().forEach(facilityVO -> {
-                facilityVO.setQrCode(domainUrl + "?merchantCode=" + facilityVO.getId());
+                facilityVO.setQrCode(domainUrl + "?qrcode=" + facilityVO.getId());
             });
         }
 
@@ -223,7 +223,7 @@ public class ApiFacilityController extends BaseController {
         QrConfig qrConfig = new QrConfig();
         qrConfig.setWidth(600);
         qrConfig.setHeight(600);
-        QrCodeUtil.generate(domainUrl + "?merchantCode=" + id,qrConfig, "jpg", osOut);
+        QrCodeUtil.generate(domainUrl + "?qrcode=" + id,qrConfig, "jpg", osOut);
         osOut.close();
     }
 

src/main/java/org/springblade/modules/business/controller/FacilityController.java

@@ -86,7 +86,7 @@ public class FacilityController extends BladeController {
         IPage<FacilityVO> facilityVOIPage = FacilityWrapper.build().pageVO(pages);
         if (CollectionUtil.isNotEmpty(facilityVOIPage.getRecords())){
             facilityVOIPage.getRecords().forEach(facilityVO -> {
-                facilityVO.setQrCode(domainUrl + "?merchantCode=" + facilityVO.getId());
+                facilityVO.setQrCode(domainUrl + "?qrcode=" + facilityVO.getId());
             });
 		}
 		return R.data(facilityVOIPage);
@@ -175,7 +175,7 @@ public class FacilityController extends BladeController {
         QrConfig qrConfig = new QrConfig();
         qrConfig.setWidth(600);
         qrConfig.setHeight(600);
-        QrCodeUtil.generate(domainUrl + "?merchantCode=" + id,qrConfig, "jpg", osOut);
+        QrCodeUtil.generate(domainUrl + "?qrcode=" + id,qrConfig, "jpg", osOut);
 		osOut.close();
 	}
 

src/main/resources/application-prod.yml

@@ -174,4 +174,4 @@ captcha:
   length: 5
 
 qrCode:
-  domainUrl: "https://sellwine.gzzzyd.com"
+  domainUrl: "https://sellwine.csshsh.com"