From ebd2750533ba5240f5873818d24f7aee041ab038 Mon Sep 17 00:00:00 2001
From: Mzaxd <caihaohan0712@foxmail.com>
Date: Wed, 26 Apr 2023 10:40:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B7=AF=E5=BE=84=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/application-dev.properties | 48 +++++++++----------
 .../controller/ReportManageConroller.java     | 12 +++++
 2 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties
index 4231dbe..858d3b9 100644
--- a/adc-da-main/src/main/resources/application-dev.properties
+++ b/adc-da-main/src/main/resources/application-dev.properties
@@ -18,7 +18,7 @@
 #spring.datasource.password = adc_forecast
 
 
-#kylin数据库 ds1
+#kylin\u6570\u636E\u5E93 ds1
 #spring.datasource.kylin.name=PROJECT_MI
 #spring.datasource.kylin.driverClassName=org.apache.kylin.jdbc.Driver
 #spring.datasource.kylin.url=jdbc:kylin://10.64.23.8:7070/PROJECT_MI
@@ -28,32 +28,32 @@
 #spring.datasource.kylin.maxWaitTime=10000
 #spring.datasource.kylin.poolSize=10
 #
-##mysql数据库 ds2
+##mysql\u6570\u636E\u5E93 ds2
 #spring.datasource.mysql.driverClassName = com.mysql.jdbc.Driver
 #spring.datasource.mysql.url = jdbc:mysql://192.168.144.80:3306/cadata?characterEncoding=utf-8&&zeroDateTimeBehavior=convertToNull
 #spring.datasource.mysql.username = root
 #spring.datasource.mysql.password = root
 
 spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
-spring.datasource.url = jdbc:mysql://121.36.69.172:3307/report-library?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+spring.datasource.url = jdbc:mysql://121.36.69.172:3307/report-library?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
 spring.datasource.username = root
 spring.datasource.password = hzwlsoft.com
 
-#后端端口
+#\u540E\u7AEF\u7AEF\u53E3
 server.port=7060
 
-#验证码后台模式，默认为1：1为不开启，2为开启，3为输错 用户名或密码 ${maxLoginErrorCount} 次 才开启
+#\u9A8C\u8BC1\u7801\u540E\u53F0\u6A21\u5F0F\uFF0C\u9ED8\u8BA4\u4E3A1\uFF1A1\u4E3A\u4E0D\u5F00\u542F\uFF0C2\u4E3A\u5F00\u542F\uFF0C3\u4E3A\u8F93\u9519 \u7528\u6237\u540D\u6216\u5BC6\u7801 ${maxLoginErrorCount} \u6B21 \u624D\u5F00\u542F
 verifyCodeMode=3
-#仅当验证码模式 ${verifyCodeMode} 为 3时生效，设置错误登录出现验证码的阈值，默认为3
+#\u4EC5\u5F53\u9A8C\u8BC1\u7801\u6A21\u5F0F ${verifyCodeMode} \u4E3A 3\u65F6\u751F\u6548\uFF0C\u8BBE\u7F6E\u9519\u8BEF\u767B\u5F55\u51FA\u73B0\u9A8C\u8BC1\u7801\u7684\u9608\u503C\uFF0C\u9ED8\u8BA4\u4E3A3
 maxLoginErrorCount=3
 
-#密码Base64加密开关,true为开启,false为关闭
+#\u5BC6\u7801Base64\u52A0\u5BC6\u5F00\u5173,true\u4E3A\u5F00\u542F,false\u4E3A\u5173\u95ED
 isPassEncrypted=true
 #{
 #"password": "YWJjMTIz",
 #"username": "YWRtaW4x"
 #}
-#swagger 显示api，1为只显示${restPath:/api}前缀的api,0为显示所有api，其他为不显示api
+#swagger \u663E\u793Aapi\uFF0C1\u4E3A\u53EA\u663E\u793A${restPath:/api}\u524D\u7F00\u7684api,0\u4E3A\u663E\u793A\u6240\u6709api\uFF0C\u5176\u4ED6\u4E3A\u4E0D\u663E\u793Aapi
 swaggerLevel=0
 
 
@@ -61,9 +61,9 @@ swaggerLevel=0
 #
 #picPath=/EPR/file/home/pic/
 
-# 本地存储文件的磁盘地址
+# \u672C\u5730\u5B58\u50A8\u6587\u4EF6\u7684\u78C1\u76D8\u5730\u5740
 uploadFile=D:\\work\\idea\\changan\\
-# 本地文件访问的url地址
+# \u672C\u5730\u6587\u4EF6\u8BBF\u95EE\u7684url\u5730\u5740
 picPath=/api/home/pic/
 
 
@@ -89,42 +89,42 @@ MAIL_POP_PORT=110
 IPANDPORT=http://localhost:7061/
 
 #redis
-#Redis服务器地址
+#Redis\u670D\u52A1\u5668\u5730\u5740
 spring.redis.host=192.168.144.29
 #spring.redis.host=localhost
-## Redis服务器连接端口
+## Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
 spring.redis.port=6379
-## Redis服务器连接密码（默认为空）
+## Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
 spring.redis.password=123321
-## 连接超时时间（毫秒）
+## \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09
 spring.redis.timeout=200000ms
-## 连接池中的最大空闲连接，默认值是8。
+## \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u9ED8\u8BA4\u503C\u662F8\u3002
 spring.redis.jedis.pool.max-idle=50
-##连接池中的最小空闲连接，默认值是0。
+##\u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u9ED8\u8BA4\u503C\u662F0\u3002
 spring.redis.jedis.pool.min-idle=10
-## 如果赋值为-1，则表示不限制；如果pool已经分配了maxActive个jedis实例，则此时pool的状态为exhausted(耗尽)。
+## \u5982\u679C\u8D4B\u503C\u4E3A-1\uFF0C\u5219\u8868\u793A\u4E0D\u9650\u5236\uFF1B\u5982\u679Cpool\u5DF2\u7ECF\u5206\u914D\u4E86maxActive\u4E2Ajedis\u5B9E\u4F8B\uFF0C\u5219\u6B64\u65F6pool\u7684\u72B6\u6001\u4E3Aexhausted(\u8017\u5C3D)\u3002
 spring.redis.jedis.pool.max-active=2000
-## 等待可用连接的最大时间，单位毫秒，默认值为-1，表示永不超时。如果超过等待时间，则直接抛出JedisConnectionException
+## \u7B49\u5F85\u53EF\u7528\u8FDE\u63A5\u7684\u6700\u5927\u65F6\u95F4\uFF0C\u5355\u4F4D\u6BEB\u79D2\uFF0C\u9ED8\u8BA4\u503C\u4E3A-1\uFF0C\u8868\u793A\u6C38\u4E0D\u8D85\u65F6\u3002\u5982\u679C\u8D85\u8FC7\u7B49\u5F85\u65F6\u95F4\uFF0C\u5219\u76F4\u63A5\u629B\u51FAJedisConnectionException
 spring.redis.jedis.pool.max-wait=2000ms
 
 spring.redis.database=6
 
-# 上传方式：阿里云：alioss 华为云：hwobs
-uploadType: hwobs
+# \u4E0A\u4F20\u65B9\u5F0F\uFF1A\u963F\u91CC\u4E91\uFF1Aalioss \u534E\u4E3A\u4E91\uFF1Ahwobs \u672C\u5730\uFF1Alocal
+uploadType: local
 
-# ======= 阿里OSS配置 =========
+# ======= \u963F\u91CCOSS\u914D\u7F6E =========
 aliyun.OSS.endpoint=https://oss-cn-hangzhou.aliyuncs.com
 aliyun.OSS.accessKeyId= LTAI5tBmUfVF6Z8R6sHTdTG7
 aliyun.OSS.accessKeySecret= mY6UvWv20Tg2R46ORe6uV5gL6TQloC
 aliyun.OSS.bucketName=qqxexamplebucket
-aliyun.OSS.fileMaxSize=10 #文件上传最大M数
+aliyun.OSS.fileMaxSize=10 #\u6587\u4EF6\u4E0A\u4F20\u6700\u5927M\u6570
 
-# ======= 华为OBS配置 =========
+# ======= \u534E\u4E3AOBS\u914D\u7F6E =========
 huawei.OBS.endPoint=https://obs.cn-north-4.myhuaweicloud.com
 huawei.OBS.accessKey=EEMAGYTHP9KKPF18TZCL
 huawei.OBS.secretKey=3NmFNf1uX3EV1LbCEzgw6gDv0tZ6WAVwG37BGq1p
 huawei.OBS.bucketName=gcpa
-huawei.OBS.fileMaxSize=10 #文件上传最大M数
+huawei.OBS.fileMaxSize=10 #\u6587\u4EF6\u4E0A\u4F20\u6700\u5927M\u6570
 
 logging.level.com.adc: debug
 
diff --git a/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java b/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java
index 407bb60..44eeec0 100644
--- a/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java
+++ b/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java
@@ -26,6 +26,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
+import java.net.URISyntaxException;
 import java.net.URLEncoder;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -189,6 +190,17 @@ public class ReportManageConroller {
         stringRedisTemplate.boundValueOps("1121212").set("1212");
 
     }
+    @ApiOperation("testPath")
+    @GetMapping("/testPath")
+    public ResponseMessage testPath() throws URISyntaxException {
+        HashMap<String, String> pathMap = new HashMap<>();
+        String jarPath = new File(getClass().getProtectionDomain().getCodeSource().getLocation().toURI().getPath()).getParentFile().getPath();
+        String property = System.getProperty("user.dir");
+        pathMap.put("jarpath", jarPath);
+        pathMap.put("propertyPath", property);
+        return Result.success(pathMap);
+    }
+
 
 
     /**