From 153717f3d4350facd069f75ffa89a688068ea25a Mon Sep 17 00:00:00 2001
From: "huojin\\hj" <982011>
Date: Wed, 11 Jun 2025 14:15:29 +0800
Subject: [PATCH] =?UTF-8?q?#=20=E5=A2=9E=E5=8A=A0Springboot=20Actuator?=
 =?UTF-8?q?=E6=8E=88=E6=9D=83=E3=80=81=E5=8D=87=E7=BA=A7=E7=A7=AF=E6=9C=A8?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A82.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nc_wms_java/pom.xml                           |  2 +-
 .../src/main/resources/dev/sa-base.yaml       | 17 ++++++-
 .../src/main/resources/prod/sa-base.yaml      | 17 ++++++-
 nc_wms_java/solution.xml                      | 46 -------------------
 4 files changed, 33 insertions(+), 49 deletions(-)
 delete mode 100644 nc_wms_java/solution.xml

diff --git a/nc_wms_java/pom.xml b/nc_wms_java/pom.xml
index c1aee27..ad65b40 100644
--- a/nc_wms_java/pom.xml
+++ b/nc_wms_java/pom.xml
@@ -59,7 +59,7 @@
         <freemarker.version>2.3.33</freemarker.version>
         <jsoup.version>1.18.1</jsoup.version>
         <tika.version>3.1.0</tika.version>
-        <jimureport-spring.version>1.9.4</jimureport-spring.version>
+        <jimureport-spring.version>2.0.0</jimureport-spring.version>
         <jimubi-spring.version>1.9.5</jimubi-spring.version>
     </properties>
 
diff --git a/nc_wms_java/sa-base/src/main/resources/dev/sa-base.yaml b/nc_wms_java/sa-base/src/main/resources/dev/sa-base.yaml
index a63922e..d53f2e9 100644
--- a/nc_wms_java/sa-base/src/main/resources/dev/sa-base.yaml
+++ b/nc_wms_java/sa-base/src/main/resources/dev/sa-base.yaml
@@ -169,4 +169,19 @@ smart:
     # 数据库配置检测-开关 默认开启 可选（作用是固定间隔读取数据库配置更新任务，关闭后只能重启服务或通过接口修改定时任务，建议开启）
     db-refresh-enabled: true
     # 数据库配置检测-执行间隔 默认120秒 可选
-    db-refresh-interval: 60
\ No newline at end of file
+    db-refresh-interval: 60
+
+# Springboot Actuator授权
+management:
+  endpoints:
+    web:
+      exposure:
+        include: "health"  # 只暴露健康检查端点
+  endpoint:
+    health:
+      show-details: never
+    shutdown:
+      enabled: false  # 显式关闭危险端点
+  server:
+    port: 8002
+    address: 127.0.0.1
\ No newline at end of file
diff --git a/nc_wms_java/sa-base/src/main/resources/prod/sa-base.yaml b/nc_wms_java/sa-base/src/main/resources/prod/sa-base.yaml
index ca6742a..69b095b 100644
--- a/nc_wms_java/sa-base/src/main/resources/prod/sa-base.yaml
+++ b/nc_wms_java/sa-base/src/main/resources/prod/sa-base.yaml
@@ -171,4 +171,19 @@ smart:
     # 数据库配置检测-开关 默认开启 可选（作用是固定间隔读取数据库配置更新任务，关闭后只能重启服务或通过接口修改定时任务，建议开启）
     db-refresh-enabled: true
     # 数据库配置检测-执行间隔 默认120秒 可选
-    db-refresh-interval: 60
\ No newline at end of file
+    db-refresh-interval: 60
+
+# Springboot Actuator授权
+management:
+  endpoints:
+    web:
+      exposure:
+        include: "health"  # 只暴露健康检查端点
+  endpoint:
+    health:
+      show-details: never
+    shutdown:
+      enabled: false  # 显式关闭危险端点
+  server:
+    port: 8002
+    address: 127.0.0.1
\ No newline at end of file
diff --git a/nc_wms_java/solution.xml b/nc_wms_java/solution.xml
deleted file mode 100644
index 52c78cb..0000000
--- a/nc_wms_java/solution.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="example.dao.OrdersDao">
-
-    <!-- 查询结果列 -->
-    <sql id="base_columns">
-        orders.id,
-        orders.order_number,
-        orders.status,
-        orders.create_time,
-        orders.updateInfo.operatorName,
-        orders.updateInfo.operateTime
-        <!-- 其他列... -->
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="queryPage" resultType="example.domain.vo.OrderVO">
-        SELECT
-        <include refid="base_columns"/>
-        FROM orders
-        <where>
-            <!-- 其他查询条件... -->
-            
-            <!-- 用户过滤条件：如果是admin则不过滤，否则只显示当前操作员的数据 -->
-            AND (orders.updateInfo.operatorName=#{SESSION_USERS} or orders.updateInfo.operatorName='admin')
-        </where>
-        ORDER BY orders.create_time DESC
-    </select>
-
-    <!-- 另一种实现方式，使用动态SQL更灵活控制 -->
-    <select id="queryPageAlt" resultType="example.domain.vo.OrderVO">
-        SELECT
-        <include refid="base_columns"/>
-        FROM orders
-        <where>
-            <!-- 其他查询条件... -->
-            
-            <!-- 当前操作员为admin时不添加过滤条件，否则只显示当前操作员的数据 -->
-            <if test="SESSION_USERS != 'admin'">
-                AND orders.updateInfo.operatorName=#{SESSION_USERS}
-            </if>
-        </where>
-        ORDER BY orders.create_time DESC
-    </select>
-
-</mapper> 
\ No newline at end of file