From 10293badd6ff26a137728adec9a88a568bbef41c Mon Sep 17 00:00:00 2001 From: Mzaxd Date: Fri, 28 Apr 2023 15:59:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?ci:=20=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.properties | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index bec4938..aa2e423 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -63,8 +63,8 @@ swaggerLevel=0 # \u672C\u5730\u5B58\u50A8\u6587\u4EF6\u7684\u78C1\u76D8\u5730\u5740 #uploadFile=D:\\work\\idea\\changan\\ -uploadFile=D:\\uploadfile\\tmp\\ -#uploadFile=/data/DeploymentPackage/report_library/uploadfile/ +#uploadFile=D:\\uploadfile\\tmp\\ +uploadFile=/data/DeploymentPackage/report_library/uploadfile/ # \u672C\u5730\u6587\u4EF6\u8BBF\u95EE\u7684url\u5730\u5740 picPath=/api/home/pic/ @@ -87,7 +87,8 @@ MAIL_POP_PORT=110 #MAIL_USERNAME=64459@Any3.com #MAIL_PASSWORD=65316975Xiaoq -IPANDPORT=http://localhost:7061/ +# \u4FEE\u6539\u6210\u540E\u7AEF\u670D\u52A1\u5668\u5730\u5740 +IPANDPORT=http://localhost:7060/ #redis #Redis\u670D\u52A1\u5668\u5730\u5740 @@ -110,7 +111,7 @@ spring.redis.jedis.pool.max-wait=2000ms spring.redis.database=2 # \u4E0A\u4F20\u65B9\u5F0F\uFF1A\u963F\u91CC\u4E91\uFF1Aalioss \u534E\u4E3A\u4E91\uFF1Ahwobs \u672C\u5730\uFF1Alocal -uploadType: local +uploadType: hwobs # \u672C\u5730\u6587\u4EF6\u5B58\u50A8\u5730\u5740 localFilePath=D:\\uploadfile\\ From dc226542d157d2813a59251e0736226e1c78700a Mon Sep 17 00:00:00 2001 From: Mzaxd Date: Fri, 28 Apr 2023 16:00:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E6=A0=87=E7=AD=BE=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mybatis/mapper/mysql/ReportManageMapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml index 1244a3d..00a9f5f 100644 --- a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml +++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml @@ -83,6 +83,7 @@ pa.power FROM TT_REPORT_MANAGE eo + INNER JOIN ts_report_label AS trl ON eo.id = trl.report_id LEFT JOIN tr_report_user ru ON eo.id = ru.reportId LEFT JOIN power_apply pa ON pa.report_id = eo.id WHERE