瀏覽代碼

website 不带域名

dsx 2 年之前
父節點
當前提交
d05467e819

+ 6 - 2
src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -91,6 +91,9 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
     @Value("#{'${build.scene.post.not-delete-nas-nums:}'.split(',')}")
     private List<String> notDeleteNasNumList;
 
+    @Value("${main.url}")
+    private String mainUrl;
+
     @Autowired
     private RabbitMqProducer mqProducer;
 
@@ -648,8 +651,9 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
         if(!ObjectUtils.isEmpty(localLogoPath)){
             qrConfig.setImg(localLogoPath);
         }
-        QrCodeUtil.generate(scenePlusExt.getWebSite(), qrConfig, FileUtil.file(outPathZh));
-        QrCodeUtil.generate(scenePlusExt.getWebSite() + "&lang=en", qrConfig, FileUtil.file(outPathEn));
+        String webSize = mainUrl + scenePlusExt.getWebSite();
+        QrCodeUtil.generate(webSize, qrConfig, FileUtil.file(outPathZh));
+        QrCodeUtil.generate(webSize + "&lang=en", qrConfig, FileUtil.file(outPathEn));
         //上传二维码
         fYunFileService.uploadFile(outPathZh, String.format(UploadFilePath.DOWNLOADS_QRCODE, num) + num + ".png");
         fYunFileService.uploadFile(outPathEn, String.format(UploadFilePath.DOWNLOADS_QRCODE, num) + num + "_en.png");

+ 1 - 1
src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -389,7 +389,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             firmwareVersion.put("version", jsonObject.getString("version"));
         }
 
-        String sceneUrl = mainUrl + "/" + sceneProNewUrl;
+        String sceneUrl = "/" + sceneProNewUrl;
 
         //重算的场景,先移除该场景对应的容量
         if (rebuild == 1) {