Bump commons-fileupload from 1.3.3 to 1.5

docs/installHcDev.md

@@ -1,7 +1,7 @@
 ## HC小区管理系统安装教程（开发环境）
 
 1、下载代码 <br/>
-git clone https://github.com/java110/MicroCommunity.git <br/>
+git clone https://gitee.com/wuxw7/MicroCommunity.git <br/>
 执行 mvn clean package  和 mvn clean install<br/><br/>
 2、添加hosts<br/>
 127.0.0.1 dev.db.java110.com <br/>
@@ -82,7 +82,7 @@ dataSource.yml 中修改password密码<br/>
 6、启动模块service-开头服务下的*ServiceApplicationStart.java文件中的main方法<br/>
 注意启动是没有顺序的，但是我们优先推荐您启动service-eureka<br/>
 7、下载前段代码 <br/>
-git clone https://github.com/java110/MicroCommunityWeb.git <br/>
+git clone https://gitee.com/java110/MicroCommunityWeb.git <br/>
 8、修改app.js 中的地址<br/>
 ```shell script
 app.use('/callComponent', proxy('http://192.168.100.108:8008', opts));

java110-boot/pom.xml

@@ -25,7 +25,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.11</version>
+            <version>4.13.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

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);
     }
 }

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'
@@ -307,12 +307,12 @@
     <insert id="saveFeeDetail" parameterType="Map">
         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
         <if test="createTime != null and createTime != ''">
             ,create_time
         </if>
         )
-        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}
         <if test="createTime != null and createTime != ''">
             ,#{createTime}

java110-doc/pom.xml

@@ -25,7 +25,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.11</version>
+            <version>4.13.1</version>
             <scope>test</scope>
         </dependency>
 

pom.xml

@@ -58,10 +58,10 @@
         <tomcat.servlet.version>6.0.37</tomcat.servlet.version>
         <druid.version>1.1.10</druid.version>
         <mybatis-spring.version>1.3.1</mybatis-spring.version>
-        <mysql.version>8.0.16</mysql.version>
+        <mysql.version>8.0.28</mysql.version>
         <commons-pool2.version>2.2</commons-pool2.version>
         <commons-collections.version>3.2.1</commons-collections.version>
-        <commons-fileupload.version>1.3.3</commons-fileupload.version>
+        <commons-fileupload.version>1.5</commons-fileupload.version>
         <commons-codec.version>1.6</commons-codec.version>
         <commons-logging.version>1.1.1</commons-logging.version>
         <commons-lang.version>2.5</commons-lang.version>
@@ -250,7 +250,7 @@
             <dependency>
                 <groupId>com.jcraft</groupId>
                 <artifactId>jsch</artifactId>
-                <version>0.1.49</version>
+                <version>0.1.54</version>
             </dependency>
 
             <dependency>
@@ -343,7 +343,7 @@
             <dependency>
                 <groupId>commons-net</groupId>
                 <artifactId>commons-net</artifactId>
-                <version>3.3</version>
+                <version>3.9.0</version>
             </dependency>
 
             <dependency>
@@ -466,7 +466,7 @@
             <dependency>
                 <groupId>org.apache.poi</groupId>
                 <artifactId>poi</artifactId>
-                <version>3.17</version>
+                <version>4.1.1</version>
             </dependency>
 
             <dependency>

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<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+        context.setResponseEntity(responseEntity);
+
     }
 
     private List<ReportFeeMonthStatisticsDto> dealConfigReportFeeMonthStatisticsList(List<ReportFeeMonthStatisticsDto> reportFeeMonthStatisticsList, String flag) {

springboot/pom.xml

@@ -31,7 +31,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.11</version>
+            <version>4.13.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>

springboot/src/main/resources/application.yml

@@ -1,3 +1,3 @@
 spring:
   profiles:
-    active: debug
+    active: dev