diff --git a/cutejava-front/src/views/home.vue b/cutejava-front/src/views/home.vue
index 4fa22f5f..d4ed4fa6 100644
--- a/cutejava-front/src/views/home.vue
+++ b/cutejava-front/src/views/home.vue
@@ -3,6 +3,10 @@
+
+ 系统API文档:{{ swaggerApi }}
+
+
@@ -36,6 +40,7 @@ import LineChart from './dashboard/LineChart'
import RadarChart from '@/components/Echarts/RadarChart'
import PieChart from '@/components/Echarts/PieChart'
import BarChart from '@/components/Echarts/BarChart'
+import store from '@/store'
const lineChartData = {
newVisitis: {
@@ -68,6 +73,7 @@ export default {
},
data() {
return {
+ swaggerApi: store.getters.swaggerApi,
lineChartData: lineChartData.newVisitis
}
},
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/server/core/KitFileLocalUploadHelper.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/server/core/KitFileLocalUploadHelper.java
index bee9707c..0fdf1754 100644
--- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/server/core/KitFileLocalUploadHelper.java
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/server/core/KitFileLocalUploadHelper.java
@@ -13,10 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package cn.odboy.framework.server.core;
+import cn.hutool.core.util.StrUtil;
import cn.odboy.constant.SystemConst;
+import cn.odboy.util.KitSystemUtil;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
@@ -32,17 +33,25 @@ public class KitFileLocalUploadHelper {
*/
private static final int AVATAR_MAX_SIZE = 5;
private static final String PATH_WINDOWS = "C:\\${appName}\\file\\";
- private static final String PATH_MAC = "/Users/odboy/${appName}/file/";
+ private static final String PATH_MAC = "/Users${username}/${appName}/file/";
private static final String PATH_LINUX = "/home/${appName}/file/";
- @Value("${spring.application.name}")
- private String appName;
+ @Value("${spring.application.name}") private String appName;
public String getPath() {
String os = System.getProperty("os.name");
- if (os.toLowerCase().startsWith(SystemConst.WIN)) {
+ if (os == null) {
+ // 默认使用 Linux 路径作为兜底方案
+ return PATH_LINUX.replace("${appName}", appName);
+ }
+ String lowerOs = os.toLowerCase();
+ if (lowerOs.startsWith(SystemConst.WIN)) {
return PATH_WINDOWS.replace("${appName}", appName);
- } else if (os.toLowerCase().startsWith(SystemConst.MAC)) {
- return PATH_MAC.replace("${appName}", appName);
+ } else if (lowerOs.startsWith(SystemConst.MAC)) {
+ String currentUserName = KitSystemUtil.getCurrentUserName();
+ if (StrUtil.isBlank(currentUserName)) {
+ return PATH_MAC.replace("${appName}", appName).replace("${username}", "");
+ }
+ return PATH_MAC.replace("${appName}", appName).replace("${username}", currentUserName);
}
return PATH_LINUX.replace("${appName}", appName);
}
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitSystemUtil.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitSystemUtil.java
index 8bf56b2d..29b4905f 100644
--- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitSystemUtil.java
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitSystemUtil.java
@@ -32,4 +32,11 @@ public class KitSystemUtil {
CentralProcessor processor = systemInfo.getHardware().getProcessor();
return processor.getPhysicalProcessorCount();
}
+
+ /**
+ * 获取当前系统的用户名
+ */
+ public static String getCurrentUserName() {
+ return System.getProperty("user.name");
+ }
}
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/core/KitFileLocalUploadHelper.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/core/KitFileLocalUploadHelper.java
index 7e54b1df..0fdf1754 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/core/KitFileLocalUploadHelper.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/core/KitFileLocalUploadHelper.java
@@ -15,7 +15,9 @@
*/
package cn.odboy.framework.server.core;
+import cn.hutool.core.util.StrUtil;
import cn.odboy.constant.SystemConst;
+import cn.odboy.util.KitSystemUtil;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
@@ -31,16 +33,25 @@ public class KitFileLocalUploadHelper {
*/
private static final int AVATAR_MAX_SIZE = 5;
private static final String PATH_WINDOWS = "C:\\${appName}\\file\\";
- private static final String PATH_MAC = "/Users/odboy/${appName}/file/";
+ private static final String PATH_MAC = "/Users${username}/${appName}/file/";
private static final String PATH_LINUX = "/home/${appName}/file/";
@Value("${spring.application.name}") private String appName;
public String getPath() {
String os = System.getProperty("os.name");
- if (os.toLowerCase().startsWith(SystemConst.WIN)) {
+ if (os == null) {
+ // 默认使用 Linux 路径作为兜底方案
+ return PATH_LINUX.replace("${appName}", appName);
+ }
+ String lowerOs = os.toLowerCase();
+ if (lowerOs.startsWith(SystemConst.WIN)) {
return PATH_WINDOWS.replace("${appName}", appName);
- } else if (os.toLowerCase().startsWith(SystemConst.MAC)) {
- return PATH_MAC.replace("${appName}", appName);
+ } else if (lowerOs.startsWith(SystemConst.MAC)) {
+ String currentUserName = KitSystemUtil.getCurrentUserName();
+ if (StrUtil.isBlank(currentUserName)) {
+ return PATH_MAC.replace("${appName}", appName).replace("${username}", "");
+ }
+ return PATH_MAC.replace("${appName}", appName).replace("${username}", currentUserName);
}
return PATH_LINUX.replace("${appName}", appName);
}
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitSystemUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitSystemUtil.java
index a237de44..3e955496 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitSystemUtil.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitSystemUtil.java
@@ -30,4 +30,11 @@ public class KitSystemUtil {
CentralProcessor processor = systemInfo.getHardware().getProcessor();
return processor.getPhysicalProcessorCount();
}
+
+ /**
+ * 获取当前系统的用户名
+ */
+ public static String getCurrentUserName() {
+ return System.getProperty("user.name");
+ }
}