Pre Merge pull request !405 from 柳翼/master

bin/clean.bat

@@ -1,6 +1,6 @@
 @echo off
 echo.
-echo [信息] 清理工程target生成路径。
+echo [信息] 清理工程target生成路径。
 echo.
 
 %~d0

docker/copy.ps1

@@ -0,0 +1,45 @@
+#!/usr/bin/env pwsh
+
+<#
+.SYNOPSIS
+复制项目的文件到对应docker路径，便于一键生成镜像。
+#>
+
+# 复制SQL文件
+Write-Host "begin copy sql"
+Copy-Item -Path "../sql/ry_20250425.sql" -Destination "./mysql/db" -Force
+Copy-Item -Path "../sql/ry_config_20250224.sql" -Destination "./mysql/db" -Force
+
+# 复制HTML文件
+Write-Host "begin copy html"
+if (Test-Path "../ruoyi-ui/dist") {
+    Remove-Item -Path "./nginx/html/dist" -Recurse -Force -ErrorAction SilentlyContinue
+    New-Item -ItemType Directory -Path "./nginx/html/dist" -Force | Out-Null
+    Copy-Item -Path "../ruoyi-ui/dist/*" -Destination "./nginx/html/dist" -Recurse -Force
+} else {
+    Write-Host "Warning: ../ruoyi-ui/dist directory not found"
+}
+
+# 复制JAR文件
+Write-Host "begin copy ruoyi-gateway"
+Copy-Item -Path "../ruoyi-gateway/target/ruoyi-gateway.jar" -Destination "./ruoyi/gateway/jar" -Force
+
+Write-Host "begin copy ruoyi-auth"
+Copy-Item -Path "../ruoyi-auth/target/ruoyi-auth.jar" -Destination "./ruoyi/auth/jar" -Force
+
+Write-Host "begin copy ruoyi-visual"
+Copy-Item -Path "../ruoyi-visual/ruoyi-monitor/target/ruoyi-visual-monitor.jar" -Destination "./ruoyi/visual/monitor/jar" -Force
+
+Write-Host "begin copy ruoyi-modules-system"
+Copy-Item -Path "../ruoyi-modules/ruoyi-system/target/ruoyi-modules-system.jar" -Destination "./ruoyi/modules/system/jar" -Force
+
+Write-Host "begin copy ruoyi-modules-file"
+Copy-Item -Path "../ruoyi-modules/ruoyi-file/target/ruoyi-modules-file.jar" -Destination "./ruoyi/modules/file/jar" -Force
+
+Write-Host "begin copy ruoyi-modules-job"
+Copy-Item -Path "../ruoyi-modules/ruoyi-job/target/ruoyi-modules-job.jar" -Destination "./ruoyi/modules/job/jar" -Force
+
+Write-Host "begin copy ruoyi-modules-gen"
+Copy-Item -Path "../ruoyi-modules/ruoyi-gen/target/ruoyi-modules-gen.jar" -Destination "./ruoyi/modules/gen/jar" -Force
+
+Write-Host "copy completed"

docker/docker-compose.yml

@@ -2,7 +2,6 @@ version : '3.8'
 services:
   ruoyi-nacos:
     container_name: ruoyi-nacos
-    image: nacos/nacos-server
     build:
       context: ./nacos
     environment:
@@ -18,7 +17,6 @@ services:
       - ruoyi-mysql
   ruoyi-mysql:
     container_name: ruoyi-mysql
-    image: mysql:5.7
     build:
       context: ./mysql
     ports:
@@ -40,7 +38,6 @@ services:
       MYSQL_ROOT_PASSWORD: password
   ruoyi-redis:
     container_name: ruoyi-redis
-    image: redis
     build:
       context: ./redis
     ports:

docker/mysql/Dockerfile

@@ -1,7 +1,7 @@
-# 基础镜像
+# 基础镜像
-FROM mysql:5.7
+FROM mysql:5.7
-# author
+# author
-MAINTAINER ruoyi
+MAINTAINER ruoyi
-
+
-# 执行sql脚本
+# 执行sql脚本
-ADD ./db/*.sql /docker-entrypoint-initdb.d/
+ADD ./db/*.sql /docker-entrypoint-initdb.d/

docker/mysql/db/readme.txt

@@ -1 +1 @@
-存放sql目录下的所有脚本，用于docker自动执行。
+存放sql目录下的所有脚本，用于docker自动执行。

docker/nginx/html/dist/readme.txt

@@ -1 +0,0 @@
-存放前端ruoyi-ui构建好的静态文件，用于nginx请求访问。

docker/ruoyi/auth/jar/readme.txt

@@ -1 +1 @@
-存放认证中心打包好的jar文件，用于docker启动应用。
+存放认证中心打包好的jar文件，用于docker启动应用。

docker/ruoyi/gateway/jar/readme.txt

@@ -1 +1 @@
-存放网关模块打包好的jar文件，用于docker启动应用。
+存放网关模块打包好的jar文件，用于docker启动应用。

docker/ruoyi/visual/monitor/jar/readme.txt

@@ -1 +1 @@
-存放监控中心打包好的jar文件，用于docker启动应用。
+存放监控中心打包好的jar文件，用于docker启动应用。

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java

@@ -73,6 +73,8 @@ public class ExcelUtil<T>
 {
     private static final Logger log = LoggerFactory.getLogger(ExcelUtil.class);
 
+    public static final String SEPARATOR = ",";
+
     public static final String FORMULA_REGEX_STR = "=|-|\\+|@";
 
     public static final String[] FORMULA_STR = { "=", "-", "+", "@" };
@@ -157,11 +159,6 @@ public class ExcelUtil<T>
      */
     private Map<Integer, Double> statistics = new HashMap<Integer, Double>();
 
-    /**
-     * 数字格式
-     */
-    private static final DecimalFormat DOUBLE_FORMAT = new DecimalFormat("######0.00");
-
     /**
      * 实体对象
      */
@@ -724,6 +721,7 @@ public class ExcelUtil<T>
         style = wb.createCellStyle();
         style.setAlignment(HorizontalAlignment.CENTER);
         style.setVerticalAlignment(VerticalAlignment.CENTER);
+        style.setDataFormat(dataFormat.getFormat("######0.00"));
         Font totalFont = wb.createFont();
         totalFont.setFontName("Arial");
         totalFont.setFontHeightInPoints((short) 10);
@@ -1130,7 +1128,7 @@ public class ExcelUtil<T>
     public static String convertByExp(String propertyValue, String converterExp, String separator)
     {
         StringBuilder propertyString = new StringBuilder();
-        String[] convertSource = converterExp.split(",");
+        String[] convertSource = converterExp.split(SEPARATOR);
         for (String item : convertSource)
         {
             String[] itemArray = item.split("=");
@@ -1167,7 +1165,7 @@ public class ExcelUtil<T>
     public static String reverseByExp(String propertyValue, String converterExp, String separator)
     {
         StringBuilder propertyString = new StringBuilder();
-        String[] convertSource = converterExp.split(",");
+        String[] convertSource = converterExp.split(SEPARATOR);
         for (String item : convertSource)
         {
             String[] itemArray = item.split("=");
@@ -1255,7 +1253,7 @@ public class ExcelUtil<T>
             {
                 cell = row.createCell(key);
                 cell.setCellStyle(styles.get("total"));
-                cell.setCellValue(DOUBLE_FORMAT.format(statistics.get(key)));
+                cell.setCellValue(statistics.get(key));
             }
             statistics.clear();
         }