Merge remote-tracking branch 'origin/2.0' into 2.0

puzhibing

2024-06-14 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/QRCodeUtils.java

@@ -263,10 +263,10 @@
        return QRCodeUtils.decode(new File(path));
    }

    public static void main(String[] args) throws Exception {
        String text = "http://www.baidu.com";  //这里设置自定义网站url
        String logoPath = "C:\\Users\\admin\\Desktop\\test\\test.jpg";
        String destPath = "C:\\Users\\admin\\Desktop\\test\\";
        logger.debug(QRCodeUtils.encode(text, "test", logoPath, destPath, true));
    }
//    public static void main(String[] args) throws Exception {
//        String text = "http://www.baidu.com";  //这里设置自定义网站url
//        String logoPath = "C:\\Users\\admin\\Desktop\\test\\test.jpg";
//        String destPath = "C:\\Users\\admin\\Desktop\\test\\";
//        logger.debug(QRCodeUtils.encode(text, "test", logoPath, destPath, true));
//    }
}