From 73325df48d9c1a585776867fc7d60527b81b22b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Jun 2022 03:37:17 +0000 Subject: [PATCH 01/15] Bump fastjson from 1.2.79 to 1.2.83 Bumps [fastjson](https://github.com/alibaba/fastjson) from 1.2.79 to 1.2.83. - [Release notes](https://github.com/alibaba/fastjson/releases) - [Commits](https://github.com/alibaba/fastjson/compare/1.2.79...1.2.83) --- updated-dependencies: - dependency-name: com.alibaba:fastjson dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 pom.xml diff --git a/pom.xml b/pom.xml old mode 100755 new mode 100644 index 836cdffd44..b84d82afb2 --- a/pom.xml +++ b/pom.xml @@ -100,7 +100,7 @@ com.alibaba fastjson - 1.2.79 + 1.2.83 org.mybatis.spring.boot From c8b13e819d1a1bc25080631726c883643cb7c7b4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jun 2022 23:53:35 +0000 Subject: [PATCH 02/15] Bump mysql-connector-java from 8.0.16 to 8.0.28 Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.16 to 8.0.28. - [Release notes](https://github.com/mysql/mysql-connector-j/releases) - [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES) - [Commits](https://github.com/mysql/mysql-connector-j/compare/8.0.16...8.0.28) --- updated-dependencies: - dependency-name: mysql:mysql-connector-java dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 pom.xml diff --git a/pom.xml b/pom.xml old mode 100755 new mode 100644 index 836cdffd44..5e33379d13 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ 6.0.37 1.1.10 1.3.1 - 8.0.16 + 8.0.28 2.2 3.2.1 1.3.3 From 7606a173d0462fdedc6a12ff9d95cccd6fb30af5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Jun 2022 17:39:47 +0000 Subject: [PATCH 03/15] Bump poi from 3.17 to 4.1.1 Bumps poi from 3.17 to 4.1.1. --- updated-dependencies: - dependency-name: org.apache.poi:poi dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 pom.xml diff --git a/pom.xml b/pom.xml old mode 100755 new mode 100644 index 836cdffd44..e53fc6c9a7 --- a/pom.xml +++ b/pom.xml @@ -456,7 +456,7 @@ org.apache.poi poi - 3.17 + 4.1.1 From 4330d1b9a2b88fbc27de5a966ec3e65ebb83d526 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Jul 2022 20:02:04 +0000 Subject: [PATCH 04/15] Bump jsch from 0.1.49 to 0.1.54 Bumps jsch from 0.1.49 to 0.1.54. --- updated-dependencies: - dependency-name: com.jcraft:jsch dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 pom.xml diff --git a/pom.xml b/pom.xml old mode 100755 new mode 100644 index 836cdffd44..ac8ba42700 --- a/pom.xml +++ b/pom.xml @@ -240,7 +240,7 @@ com.jcraft jsch - 0.1.49 + 0.1.54 From f8ce1c5f2eaa7aff07d74f0be1ef59ba0c2058b4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Sep 2022 23:52:37 +0000 Subject: [PATCH 05/15] Bump jsoup from 1.14.2 to 1.15.3 Bumps [jsoup](https://github.com/jhy/jsoup) from 1.14.2 to 1.15.3. - [Release notes](https://github.com/jhy/jsoup/releases) - [Changelog](https://github.com/jhy/jsoup/blob/master/CHANGES) - [Commits](https://github.com/jhy/jsoup/compare/jsoup-1.14.2...jsoup-1.15.3) --- updated-dependencies: - dependency-name: org.jsoup:jsoup dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 638309353e..b80e24f4de 100644 --- a/pom.xml +++ b/pom.xml @@ -437,7 +437,7 @@ org.jsoup jsoup - 1.14.2 + 1.15.3 From a1f8cfc2d58f23bcf40d51596bcc6698edfffa8f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Dec 2022 23:59:07 +0000 Subject: [PATCH 06/15] Bump commons-net from 3.3 to 3.9.0 Bumps commons-net from 3.3 to 3.9.0. --- updated-dependencies: - dependency-name: commons-net:commons-net dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b80e24f4de..55c7343a3a 100644 --- a/pom.xml +++ b/pom.xml @@ -333,7 +333,7 @@ commons-net commons-net - 3.3 + 3.9.0 From f5e0c02d97fae7b7ec30684701d953641b3e6741 Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Fri, 6 Jan 2023 04:27:21 +0000 Subject: [PATCH 07/15] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B4=B9=E7=94=A8?= =?UTF-8?q?=E6=B1=87=E6=80=BBbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: java110 <928255095@qq.com> --- .../cmd/reportFeeMonthStatistics/QueryReportFeeSummaryCmd.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeSummaryCmd.java b/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeSummaryCmd.java index 40a60f01a2..a72130c32a 100644 --- a/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeSummaryCmd.java +++ b/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeSummaryCmd.java @@ -103,6 +103,8 @@ public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJso ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reportFeeMonthStatisticsDto.getRow()), count, reportFeeMonthStatisticsDtos); ResponseEntity responseEntity = new ResponseEntity(resultVo.toString(), HttpStatus.OK); + context.setResponseEntity(responseEntity); + } private List dealConfigReportFeeMonthStatisticsList(List reportFeeMonthStatisticsList, String flag) { From d20264d78733e2cac27be437db6f335dc9a01336 Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Fri, 6 Jan 2023 06:17:04 +0000 Subject: [PATCH 08/15] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BE=A49=20=20?= =?UTF-8?q?=E6=97=A0=E5=B3=B0=20=E5=8F=8D=E9=A6=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: java110 <928255095@qq.com> --- .../core/smo/impl/SaveTransactionLogSMOImpl.java | 13 ++++++++++++- .../mapper/fee/FeeDetailServiceDaoImplMapper.xml | 4 ++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/java110-core/src/main/java/com/java110/core/smo/impl/SaveTransactionLogSMOImpl.java b/java110-core/src/main/java/com/java110/core/smo/impl/SaveTransactionLogSMOImpl.java index 2b552aa94b..db6ff8e425 100755 --- a/java110-core/src/main/java/com/java110/core/smo/impl/SaveTransactionLogSMOImpl.java +++ b/java110-core/src/main/java/com/java110/core/smo/impl/SaveTransactionLogSMOImpl.java @@ -1,6 +1,7 @@ package com.java110.core.smo.impl; import com.alibaba.fastjson.JSONObject; +import com.java110.core.context.Environment; import com.java110.core.context.IPageData; import com.java110.core.context.PageData; import com.java110.core.factory.CallApiServiceFactory; @@ -9,6 +10,7 @@ import com.java110.dto.assetImportLog.AssetImportLogDto; import com.java110.intf.common.ITransactionLogInnerServiceSMO; import com.java110.po.transactionLog.TransactionLogPo; +import com.java110.utils.factory.ApplicationContextFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpMethod; import org.springframework.scheduling.annotation.Async; @@ -32,6 +34,9 @@ public class SaveTransactionLogSMOImpl implements ISaveTransactionLogSMO { @Autowired(required = false) private RestTemplate restTemplate; + @Autowired(required = false) + private RestTemplate outRestTemplate; + @Override @Async public void saveLog(TransactionLogPo transactionLogPo) { @@ -41,11 +46,17 @@ public void saveLog(TransactionLogPo transactionLogPo) { @Override @Async public void saveAssetImportLog(AssetImportLogDto assetImportLogDto) { + String apiUrl = "http://api-service/api/assetImportLog/saveAssetImportLog"; + RestTemplate tmpRestTemplate = restTemplate; + if (Environment.isStartBootWay()) { + apiUrl = "http://127.0.0.1:8008/api/assetImportLog/saveAssetImportLog"; + tmpRestTemplate = outRestTemplate; + } IPageData newPd = PageData.newInstance().builder("-1", "批量日志", "", "", "", "", apiUrl, "", AppDto.WEB_APP_ID); - CallApiServiceFactory.callCenterService(restTemplate, newPd, JSONObject.toJSONString(assetImportLogDto), apiUrl, HttpMethod.POST); + CallApiServiceFactory.callCenterService(tmpRestTemplate, newPd, JSONObject.toJSONString(assetImportLogDto), apiUrl, HttpMethod.POST); } } diff --git a/java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml index 6b6b93c446..f12c43427e 100755 --- a/java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml +++ b/java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml @@ -307,12 +307,12 @@ insert into pay_fee_detail( - prime_rate,detail_id,receivable_amount,cycles,remark,status_cd,received_amount,community_id,b_id,fee_id,state,start_time,end_time,payable_amount + prime_rate,detail_id,receivable_amount,cycles,remark,received_amount,community_id,fee_id,state,start_time,end_time,payable_amount ,create_time ) - values(#{primeRate},#{detailId},#{receivableAmount},#{cycles},#{remark},'0',#{receivedAmount},#{communityId},'-1',#{feeId},#{state}, + values(#{primeRate},#{detailId},#{receivableAmount},#{cycles},#{remark},#{receivedAmount},#{communityId},#{feeId},#{state}, #{startTime},#{endTime},#{payableAmount} ,#{createTime} From 99e359dee66c692586f1592737f902baf24b4974 Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Fri, 6 Jan 2023 11:04:59 +0000 Subject: [PATCH 09/15] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=80=80=E8=B4=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: java110 <928255095@qq.com> --- .../main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml index f12c43427e..45c339004c 100755 --- a/java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml +++ b/java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml @@ -121,7 +121,7 @@ t.state,d.name stateName,t.start_time,t.end_time,t.start_time startTime,t.end_time endTime,pfa.`value` importFeeName,pfc.fee_name feeName,t.payable_amount,t.payable_amount payableAmount, mw.cur_degrees curDegrees,mw.pre_degrees preDegrees, mw.pre_reading_time preReadingTime,mw.cur_reading_time - curReadingTime + curReadingTime,t.pay_order_id payOrderId from pay_fee_detail t left join pay_fee_attrs pfa on t.fee_id = pfa.fee_id and pfa.spec_cd = '390002' left join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0' From 6f42f51c2b038a7b8349fd0537e35d294c9959e2 Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Sun, 8 Jan 2023 08:12:55 +0000 Subject: [PATCH 10/15] =?UTF-8?q?=E4=BC=98=E5=8C=96springboot=20=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: java110 <928255095@qq.com> --- springboot/src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/springboot/src/main/resources/application.yml b/springboot/src/main/resources/application.yml index bfa50977b3..caf4dfcd64 100644 --- a/springboot/src/main/resources/application.yml +++ b/springboot/src/main/resources/application.yml @@ -1,3 +1,3 @@ spring: profiles: - active: debug \ No newline at end of file + active: dev \ No newline at end of file From 6d62d5b92abbb234a2bdd4bfe2dacd950d65da6b Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Mon, 9 Jan 2023 08:46:01 +0000 Subject: [PATCH 11/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=89=E8=A3=85?= =?UTF-8?q?=E6=95=99=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: java110 <928255095@qq.com> --- docs/installHcDev.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/installHcDev.md b/docs/installHcDev.md index 97ba37e4ea..a5df9a0f55 100644 --- a/docs/installHcDev.md +++ b/docs/installHcDev.md @@ -1,7 +1,7 @@ ## HC小区管理系统安装教程（开发环境） 1、下载代码
-git clone https://github.com/java110/MicroCommunity.git
+git clone https://gitee.com/wuxw7/MicroCommunity.git
执行 mvn clean package 和 mvn clean install

2、添加hosts
127.0.0.1 dev.db.java110.com
@@ -82,7 +82,7 @@ dataSource.yml 中修改password密码
6、启动模块service-开头服务下的*ServiceApplicationStart.java文件中的main方法
注意启动是没有顺序的，但是我们优先推荐您启动service-eureka
7、下载前段代码
-git clone https://github.com/java110/MicroCommunityWeb.git
+git clone https://gitee.com/java110/MicroCommunityWeb.git
8、修改app.js 中的地址
```shell script app.use('/callComponent', proxy('http://192.168.100.108:8008', opts)); From 2896a4372aec487c839ed3ec40097b4aec3227c1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Jan 2023 09:46:05 +0000 Subject: [PATCH 12/15] Bump junit from 4.11 to 4.13.1 in /java110-doc Bumps [junit](https://github.com/junit-team/junit4) from 4.11 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.11.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.11...r4.13.1) --- updated-dependencies: - dependency-name: junit:junit dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- java110-doc/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java110-doc/pom.xml b/java110-doc/pom.xml index 6d2cc179e2..eaf5b4b733 100644 --- a/java110-doc/pom.xml +++ b/java110-doc/pom.xml @@ -25,7 +25,7 @@ junit junit - 4.11 + 4.13.1 test From 310788b1d7495bde7318e7c00c7ee583042d0402 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Jan 2023 09:46:05 +0000 Subject: [PATCH 13/15] Bump junit from 4.11 to 4.13.1 in /springboot Bumps [junit](https://github.com/junit-team/junit4) from 4.11 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.11.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.11...r4.13.1) --- updated-dependencies: - dependency-name: junit:junit dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- springboot/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/springboot/pom.xml b/springboot/pom.xml index f6b9cc5a4f..d3fc209a0d 100644 --- a/springboot/pom.xml +++ b/springboot/pom.xml @@ -31,7 +31,7 @@ junit junit - 4.11 + 4.13.1 test From 5c0be3cd927460bf697040347da9fb77ca063202 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Jan 2023 09:46:11 +0000 Subject: [PATCH 14/15] Bump junit from 4.11 to 4.13.1 in /java110-boot Bumps [junit](https://github.com/junit-team/junit4) from 4.11 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.11.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.11...r4.13.1) --- updated-dependencies: - dependency-name: junit:junit dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- java110-boot/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java110-boot/pom.xml b/java110-boot/pom.xml index e6e63cbab5..d806f888a8 100644 --- a/java110-boot/pom.xml +++ b/java110-boot/pom.xml @@ -25,7 +25,7 @@ junit junit - 4.11 + 4.13.1 test From 7fbe79f3d9b410c5c6991a0d05694391fb725f90 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Feb 2023 07:05:25 +0000 Subject: [PATCH 15/15] Bump commons-fileupload from 1.3.3 to 1.5 Bumps commons-fileupload from 1.3.3 to 1.5. --- updated-dependencies: - dependency-name: commons-fileupload:commons-fileupload dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ab86b04427..ca18749101 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 8.0.28 2.2 3.2.1 - 1.3.3 + 1.5 1.6 1.1.1 2.5