From 4ab746036a63d9631b5a8572c0c857a2ae711d53 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 18 Mar 2022 16:21:30 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0url=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/IcNeighborHoodController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java index 663e48ba6f..1eb5088cbc 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java @@ -188,7 +188,7 @@ public class IcNeighborHoodController { //url组成:数字社区地址?小区id&用户id //String url = "https://demo.tduckapp.com/s/7314b64b3a26455ab793fb8c640856b6?id="+id; String url = EnvEnum.getCurrentEnv().getUrl().replace("api/",StrConstant.EPMETY_STR) - .concat("epmet-oper-gov/#/") + .concat("epmet-oper-gov/#/caiji/") .concat(id) .concat(StrConstant.AND_MARK).concat("userId=").concat(tokenDto.getUserId()); BufferedImage image = BarcodeUtils.drawQRImage(neighborhoodName, url); From 518c7bbd38d1d572b31d0edfd86277d4f9c80dab Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 18 Mar 2022 16:45:08 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0url=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/controller/AgencyController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java index 0328b455ef..80006c5353 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java @@ -416,8 +416,9 @@ public class AgencyController { //url组成:数字社区地址?小区id&用户id //String url = "https://demo.tduckapp.com/s/7314b64b3a26455ab793fb8c640856b6?id="+id; String url = EnvEnum.getCurrentEnv().getUrl().replace("api/", StrConstant.EPMETY_STR) - .concat("epmet-oper-gov/#/") + .concat("epmet-oper-gov/#/caiji/") .concat(id).concat(StrConstant.QUESTION_MARK_TRANSFER) + .concat("name=").concat(name).concat(StrConstant.AND_MARK) .concat("type=").concat(type).concat(StrConstant.AND_MARK) .concat("userId=").concat(tokenDto.getUserId()) .concat(StrConstant.AND_MARK).concat(String.valueOf(LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli())); From c390a88a346e89531ce935db35b3bd42f0bcd353 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 18 Mar 2022 16:59:15 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/controller/AgencyController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java index 80006c5353..6588637233 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java @@ -406,7 +406,7 @@ public class AgencyController { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"组织信息不存在"); } name = customerAgencyDTO.getOrganizationName(); - }else if (type.equals(OrgInfoConstant.COMMUNITY)){ + }else if (type.equals(OrgInfoConstant.NEIGHBOR_HOOD)){ IcNeighborHoodDTO icNeighborHoodDTO = neighborHoodService.get(id); if (icNeighborHoodDTO == null){ throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"小区信息不存在"); @@ -417,7 +417,7 @@ public class AgencyController { //String url = "https://demo.tduckapp.com/s/7314b64b3a26455ab793fb8c640856b6?id="+id; String url = EnvEnum.getCurrentEnv().getUrl().replace("api/", StrConstant.EPMETY_STR) .concat("epmet-oper-gov/#/caiji/") - .concat(id).concat(StrConstant.QUESTION_MARK_TRANSFER) + .concat(id).concat("?") .concat("name=").concat(name).concat(StrConstant.AND_MARK) .concat("type=").concat(type).concat(StrConstant.AND_MARK) .concat("userId=").concat(tokenDto.getUserId()) From 930ed68e29b5bbb49506c3fa239df7255c8e36b8 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 18 Mar 2022 18:03:14 +0800 Subject: [PATCH 4/5] =?UTF-8?q?gbk=E6=94=B9utf8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/commons/tools/utils/BarcodeUtils.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/BarcodeUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/BarcodeUtils.java index 555643e9e1..dfdae4a097 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/BarcodeUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/BarcodeUtils.java @@ -106,7 +106,7 @@ public class BarcodeUtils { g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON); g.setBackground(Color.white); // 获取文字数量 按照字节展示 - int size = pressText.getBytes("GBK").length; + int size = pressText.getBytes("UTF-8").length; // 获取一行最多能容纳多少文字 按照文字字节展示 int maxSize = (WIDTH / FONTSIZE - 2) * 2; if (size > maxSize) { @@ -121,7 +121,7 @@ public class BarcodeUtils { g.drawString(pressText, (WIDTH - (FONTSIZE * v)) / 2, startY); } } else { - g.drawString(pressText, (WIDTH - ((pressText.getBytes("GBK").length) / 2) * FONTSIZE) / 2, startY); + g.drawString(pressText, (WIDTH - ((pressText.getBytes("UTF-8").length) / 2) * FONTSIZE) / 2, startY); } g.dispose(); @@ -153,7 +153,7 @@ public class BarcodeUtils { private static String outStringByByte(String str, int len) throws IOException { - byte[] btf = str.getBytes("gbk"); + byte[] btf = str.getBytes("UTF-8"); int count = 0; for (int j = len - 1; j >= 0; j--) { @@ -165,9 +165,9 @@ public class BarcodeUtils { } if (count % 2 == 0) { - return new String(btf, 0, len, "gbk"); + return new String(btf, 0, len, "UTF-8"); } else { - return new String(btf, 0, len - 1, "gbk"); + return new String(btf, 0, len - 1, "UTF-8"); } } From 2d5c3ba625332a480610480d5cadcef02636dabf Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 18 Mar 2022 18:21:47 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/commons/tools/utils/BarcodeUtils.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/BarcodeUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/BarcodeUtils.java index dfdae4a097..1751ef4bc7 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/BarcodeUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/BarcodeUtils.java @@ -102,11 +102,11 @@ public class BarcodeUtils { Graphics2D g = outImage.createGraphics(); g.drawImage(image, 0, 0, imageW, imageH, null); g.setColor(QRCOLOR); - g.setFont(new Font("微软雅黑", Font.BOLD, FONTSIZE)); +// g.setFont(new Font("微软雅黑", Font.BOLD, FONTSIZE)); g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON); g.setBackground(Color.white); // 获取文字数量 按照字节展示 - int size = pressText.getBytes("UTF-8").length; + int size = pressText.getBytes("GBK").length; // 获取一行最多能容纳多少文字 按照文字字节展示 int maxSize = (WIDTH / FONTSIZE - 2) * 2; if (size > maxSize) { @@ -121,7 +121,7 @@ public class BarcodeUtils { g.drawString(pressText, (WIDTH - (FONTSIZE * v)) / 2, startY); } } else { - g.drawString(pressText, (WIDTH - ((pressText.getBytes("UTF-8").length) / 2) * FONTSIZE) / 2, startY); + g.drawString(pressText, (WIDTH - ((pressText.getBytes("GBK").length) / 2) * FONTSIZE) / 2, startY); } g.dispose(); @@ -153,7 +153,7 @@ public class BarcodeUtils { private static String outStringByByte(String str, int len) throws IOException { - byte[] btf = str.getBytes("UTF-8"); + byte[] btf = str.getBytes("GBK"); int count = 0; for (int j = len - 1; j >= 0; j--) { @@ -165,9 +165,9 @@ public class BarcodeUtils { } if (count % 2 == 0) { - return new String(btf, 0, len, "UTF-8"); + return new String(btf, 0, len, "GBK"); } else { - return new String(btf, 0, len - 1, "UTF-8"); + return new String(btf, 0, len - 1, "GBK"); } }