Merge remote-tracking branch 'origin/master' into feature/payment-apply-bfi-sync

# Conflicts:
#	blade-common/src/main/java/org/springblade/common/config/BladeCommonConfiguration.java
#	blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java
#	blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java
#	blade-service/blade-system/src/main/java/org/springblade/system/feign/SysClient.java
#	blade-service/blade-transport/pom.xml
#	blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/CustomerArchiveMapper.xml
#	blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java
#	blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/PaymentApplicationWrapper.java
#	blade-service/blade-transport/src/main/resources/application-dev.yml
#	blade-third-party-api/pom.xml
#	doc/nacos/blade-dev.yaml
#	doc/nacos/blade-prod.yaml
#	doc/nacos/third-party-api.yaml
#	pom.xml

doc/nacos/blade-dev.yaml

@@ -32,16 +32,16 @@ spring:
 blade:
   #分布式锁配置
   lock:
-    # blade.lock.enabled=true 才会装配 RedisLockClient；收票全票池同步等定时任务依赖它做 single-flight
-    enabled: true
+    enabled: false
     address: redis://127.0.0.1:6379
   #多团队协作服务配置
   loadbalancer:
     #开启配置
     enabled: true
-    #负载均衡优先调用的ip段
+    #负载均衡优先调用的ip段（含本机局域网段，避免只剩 169.254.* 时误路由）
     prior-ip-pattern:
-      - 192.168.0.*
+      - 192.168.*.*
+      - 172.16.*.*
       - 127.0.0.1
   #通用开发生产环境数据库地址(特殊情况可在对应的子工程里配置覆盖)
   datasource:
@@ -88,7 +88,17 @@ thirdParty:
     baseUrl: http://127.0.0.1:8080
   oa:
     # OA开放接口地址
-    baseUrl: http://127.0.0.1:8080
+    baseUrl: http://172.16.204.83:38000
+    queryCompanyPageUrl: /gwzh/OA/OA_GET_COMPANY_LIST
+    queryDepartmentPageUrl: /gwzh/OA/OA_GET_DEPARTMENT_LIST
+    queryPersonPageUrl: /gwzh/OA/OA_GET_USER_LIST
+    authorization: ${OA_AUTHORIZATION:${IAM_SSO_AUTHORIZATION:Z3d6aF90bXMtOVJJU0RVN1U6YW0yYkcwWnBJZ0RQZmtrSjNaZkZjUDBSaGFuSEtxQng=}}
+  lbs:
+    # LBS 网关地址（车辆实时定位）
+    baseUrl: http://172.16.204.83:38000
+    locateUrl: /gwzh/LBS/LBS_LOCATE
+    trackUrl: /gwzh/LBS/LBS_TRACK
+    authorization: ${LBS_AUTHORIZATION:${OA_AUTHORIZATION:${IAM_SSO_AUTHORIZATION:Z3d6aF90bXMtOVJJU0RVN1U6YW0yYkcwWnBJZ0RQZmtrSjNaZkZjUDBSaGFuSEtxQng=}}}
   track:
     # 轨迹开放接口地址
     baseUrl: http://127.0.0.1:8080
@@ -110,6 +120,7 @@ thirdParty:
     processExecuteUrl: ${MK_PROCESS_EXECUTE_URL:/openapi/sys-lbpm/sysLbpmProcess/openSupport/execute}
     processDeleteUrl: ${MK_PROCESS_DELETE_URL:/openapi/sys-lbpm/sysLbpmProcess/openSupport/delete}
     getCurrentNodesUrl: ${MK_CURRENT_NODES_URL:/openapi/sys-lbpm/sysLbpmProcess/openSupport/getCurNodesInfo}
+    getProcessInfoUrl: ${MK_PROCESS_INFO_URL:/openapi/sys-lbpm/sysLbpmProcess/openSupport/getProcessInfo}
     getNodeHandlersUrl: ${MK_NODE_HANDLERS_URL:/openapi/sys-lbpm/sysLbpmProcess/openSupport/getNodeHandlerInfos}
     getManualNodeUrl: ${MK_MANUAL_NODE_URL:/openapi/sys-lbpm/sysLbpmTemplate/openSupport/getManualNode}
     pushOrgDeptUrl: ${MK_PUSH_ORG_DEPT_URL:/openapi/sys-org/v2/push/orgDept}
@@ -122,6 +133,11 @@ thirdParty:
     downloadFileUrl: ${MK_DOWNLOAD_FILE_URL:/openapi/sys-attach/fileStream/download}
     queryApprovalListUrl: ${MK_QUERY_APPROVAL_LIST_URL:/openapi/lbpm-approval/lbpmApproval/portal/list}
     queryProcessListUrl: ${MK_QUERY_PROCESS_LIST_URL:/openapi/sys-lbpm/sysLbpmProcess/openSupport/list}
+  wechat:
+    mini:
+      # 微信小程序（手机号一键登录 / openid）
+      appId: ${WECHAT_MINI_APP_ID:}
+      appSecret: ${WECHAT_MINI_APP_SECRET:}
   bfi:
     # 业财融合（BFI）应用及接口配置，敏感值通过环境变量注入
     baseUrl: ${BFI_BASE_URL:http://172.16.203.134:8000/gwzh/BFI}
@@ -161,15 +177,6 @@ baidu:
     token-refresh-advance: 1m
 
 
-#MinIO文件存储配置
-file:
-  storage:
-    minio:
-      endpoint: http://8.148.239.157:9000
-      access-key-id: transport
-      access-key-secret: transport
-      bucket-name: transport
-
 powerjob:
   worker:
     enabled: false

doc/nacos/blade-prod.yaml

@@ -38,10 +38,10 @@ blade:
     ##开启前必须先补 password(与 spring.data.redis 一致)，否则 Redisson 无密码连接会被拒绝，
     ##影响的是全部依赖该模板的服务；收票全票池等同步定时任务依赖它做多副本 single-flight
     enabled: false
-    #password:
     ##将docker脚本部署的redis服务映射为宿主机ip
     ##生产环境推荐使用阿里云高可用redis服务并设置密码
     address: redis://172.16.203.228:6379
+    password: ${spring.data.redis.password:}
   #通用开发生产环境数据库地址(特殊情况可在对应的子工程里配置覆盖)
   datasource:
     prod:
@@ -61,7 +61,17 @@ thirdParty:
     baseUrl: http://127.0.0.1:8080
   oa:
     # OA开放接口地址
-    baseUrl: http://127.0.0.1:8080
+    baseUrl: http://172.16.204.83:38000
+    queryCompanyPageUrl: /gwzh/OA/OA_GET_COMPANY_LIST
+    queryDepartmentPageUrl: /gwzh/OA/OA_GET_DEPARTMENT_LIST
+    queryPersonPageUrl: /gwzh/OA/OA_GET_USER_LIST
+    authorization: ${OA_AUTHORIZATION:${IAM_SSO_AUTHORIZATION:Z3d6aF90bXMtOVJJU0RVN1U6YW0yYkcwWnBJZ0RQZmtrSjNaZkZjUDBSaGFuSEtxQng=}}
+  lbs:
+    # LBS 网关地址（车辆实时定位）
+    baseUrl: http://172.16.204.83:38000
+    locateUrl: /gwzh/LBS/LBS_LOCATE
+    trackUrl: /gwzh/LBS/LBS_TRACK
+    authorization: ${LBS_AUTHORIZATION:${OA_AUTHORIZATION:${IAM_SSO_AUTHORIZATION:Z3d6aF90bXMtOVJJU0RVN1U6YW0yYkcwWnBJZ0RQZmtrSjNaZkZjUDBSaGFuSEtxQng=}}}
   track:
     # 轨迹开放接口地址
     baseUrl: http://127.0.0.1:8080
@@ -95,6 +105,10 @@ thirdParty:
     downloadFileUrl: ${MK_DOWNLOAD_FILE_URL:/openapi/sys-attach/fileStream/download}
     queryApprovalListUrl: ${MK_QUERY_APPROVAL_LIST_URL:/openapi/lbpm-approval/lbpmApproval/portal/list}
     queryProcessListUrl: ${MK_QUERY_PROCESS_LIST_URL:/openapi/sys-lbpm/sysLbpmProcess/openSupport/list}
+  wechat:
+    mini:
+      appId: ${WECHAT_MINI_APP_ID:}
+      appSecret: ${WECHAT_MINI_APP_SECRET:}
   bfi:
     # 业财融合（BFI）应用及接口配置，敏感值通过环境变量注入
     baseUrl: ${BFI_BASE_URL:http://172.16.203.134:8000/gwzh/BFI}
@@ -136,3 +150,12 @@ baidu:
 powerjob:
   worker:
     server-address: 172.16.203.228:7700
+
+# IAM账号与组织同步配置
+iam:
+  sync:
+    account-list-url: http://172.16.204.83:38000/gwzh/IAM/IAM_IDM_ACCOUNT_LIST
+    org-list-url: http://172.16.204.83:38000/gwzh/IAM/IAM_IDM_ORG_LIST
+    authorization: ${IAM_SSO_AUTHORIZATION:Z3d6aF90bXMtOVJJU0RVN1U6YW0yYkcwWnBJZ0RQZmtrSjNaZkZjUDBSaGFuSEtxQng=}
+    profile-authorization: ${IAM_SSO_PROFILE_AUTHORIZATION:YjNlZmU0ODEwMzJiNGJhZTpkYzQ5NDY1NmQ4MzE0NThjODI5MzlmNzA2ZjliNDY3MQ==}
+    page-size: 50

doc/nacos/blade.yaml

@@ -22,6 +22,8 @@ spring:
       discovery:
         # 禁用云命名空间解析,防止和云平台环境变量冲突
         isUseCloudNamespaceParsing: false
+        # 本机多网卡开发时建议固定 127.0.0.1，可用环境变量 NACOS_DISCOVERY_IP 覆盖
+        ip: ${NACOS_DISCOVERY_IP:}
       config:
         # 禁用云命名空间解析,防止和云平台环境变量冲突
         isUseCloudNamespaceParsing: false
@@ -197,6 +199,9 @@ blade:
         - /wechat/**
       #开启错误日志入库
       error-log: true
+    #增删改操作日志自动入库（blade_log_api）
+    operation:
+      enabled: true
   #xss配置
   xss:
     enabled: true
@@ -213,6 +218,19 @@ blade:
     #接口放行
     skip-url:
       - /test/**
+      # 退出登录：允许无令牌/令牌失效时也能调用（服务端对无用户直接返回成功）
+      - /oauth/logout/**
+      - /blade-auth/oauth/logout/**
+      - /blade-transport/customer-archive/public/**
+      - /customer-archive/public/**
+      - /blade-transport/mk-process/public/**
+      - /mk-process/public/**
+      - /blade-openapi/openApi/mk/process/commonCallback
+      - /openApi/mk/process/commonCallback
+      - /feign/client/businessProcess/getCurrentNodes
+      - /feign/client/businessProcess/getProcessInfo
+      - /feign/client/customerArchive/syncProcessNode
+      - /feign/client/mkProcess/**
     #授权认证配置
     auth:
       - method: ALL

doc/nacos/routes/blade-gateway-dev.json

@@ -27,6 +27,28 @@
     "filters": [],
     "uri": "lb://blade-transport"
   },
+  {
+    "id": "blade-user-alias-route",
+    "order": 0,
+    "predicates": [
+      {
+        "name": "Path",
+        "args": {
+          "pattern": "/blade-user/**"
+        }
+      }
+    ],
+    "filters": [
+      {
+        "name": "RewritePath",
+        "args": {
+          "regexp": "/blade-user/(?<segment>.*)",
+          "replacement": "/user/$\\{segment}"
+        }
+      }
+    ],
+    "uri": "lb://blade-system"
+  },
   {
     "id": "example-route",
     "order": 0,

doc/nacos/third-party-api.yaml

@@ -10,13 +10,28 @@ thirdParty:
     baseUrl: ${WPS_BASE_URL:http://127.0.0.1:8080}
   oa:
     # OA开放接口地址
-    baseUrl: ${OA_BASE_URL:http://127.0.0.1:8080}
+    baseUrl: ${OA_BASE_URL:http://172.16.204.83:38000}
+    queryCompanyPageUrl: ${OA_QUERY_COMPANY_PAGE_URL:/gwzh/OA/OA_GET_COMPANY_LIST}
+    queryDepartmentPageUrl: ${OA_QUERY_DEPARTMENT_PAGE_URL:/gwzh/OA/OA_GET_DEPARTMENT_LIST}
+    queryPersonPageUrl: ${OA_QUERY_PERSON_PAGE_URL:/gwzh/OA/OA_GET_USER_LIST}
+    authorization: ${OA_AUTHORIZATION:${IAM_SSO_AUTHORIZATION:}}
+  lbs:
+    # LBS 网关地址（车辆实时定位）
+    baseUrl: ${LBS_BASE_URL:${OA_BASE_URL:http://172.16.204.83:38000}}
+    locateUrl: ${LBS_LOCATE_URL:/gwzh/LBS/LBS_LOCATE}
+    trackUrl: ${LBS_TRACK_URL:/gwzh/LBS/LBS_TRACK}
+    authorization: ${LBS_AUTHORIZATION:${OA_AUTHORIZATION:${IAM_SSO_AUTHORIZATION:}}}
   track:
     # 轨迹开放接口地址
     baseUrl: ${TRACK_BASE_URL:http://127.0.0.1:8080}
   mk:
     # MK开放接口地址
     baseUrl: ${MK_BASE_URL:http://127.0.0.1:8080}
+  wechat:
+    mini:
+      # 微信小程序 AppId / AppSecret（Nacos 配置，勿提交真实 secret）
+      appId: ${WECHAT_MINI_APP_ID:}
+      appSecret: ${WECHAT_MINI_APP_SECRET:}
   bfi:
     # 业财融合（BFI）开放接口地址
     baseUrl: ${BFI_BASE_URL:http://172.16.203.134:8000/gwzh/BFI}

doc/sql/bladex/bladex.mysql.all.create.sql

@@ -308,12 +308,15 @@ CREATE TABLE `blade_dept`  (
   `mnemonic_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '助记码',
   `carrier_customer_id` bigint NULL DEFAULT NULL COMMENT '承运商客商档案主键',
   `is_platform_company` tinyint NOT NULL DEFAULT 0 COMMENT '是否平台公司：0否，1是',
+  `oa_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'OA主键',
+  `oa_sup_sub_com_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'OA上级主键',
   `sort` int NULL DEFAULT NULL COMMENT '排序',
   `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
   `status` int NULL DEFAULT 1 COMMENT '状态',
   `is_deleted` int NULL DEFAULT 0 COMMENT '是否已删除',
   PRIMARY KEY (`id`) USING BTREE,
-  UNIQUE KEY `uk_blade_dept_dept_code` (`dept_code`)
+  UNIQUE KEY `uk_blade_dept_dept_code` (`dept_code`),
+  INDEX `idx_blade_dept_oa_id` (`oa_id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '机构表';
 
 -- ----------------------------
@@ -1757,6 +1760,7 @@ INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `s
 DROP TABLE IF EXISTS `blade_measurement_unit`;
 CREATE TABLE `blade_measurement_unit`  (
   `id` bigint NOT NULL COMMENT '主键',
+  `unit_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '计量单位编码',
   `unit_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '计量单位',
   `dimension` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '计量维度',
   `remark` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
@@ -1768,6 +1772,7 @@ CREATE TABLE `blade_measurement_unit`  (
   `status` int NULL DEFAULT 1 COMMENT '状态',
   `is_deleted` int NULL DEFAULT 0 COMMENT '是否已删除',
   PRIMARY KEY (`id`) USING BTREE,
+  UNIQUE INDEX `uk_measurement_unit_code`(`unit_code`) USING BTREE,
   UNIQUE INDEX `uk_measurement_unit_name`(`unit_name`) USING BTREE,
   INDEX `idx_measurement_unit_dimension`(`dimension`) USING BTREE,
   INDEX `idx_measurement_unit_status`(`status`) USING BTREE

doc/sql/transport/blade_customer_archive.sql

@@ -8,6 +8,7 @@ CREATE TABLE `blade_customer_archive` (
   `customer_code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客商编号',
   `short_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客商简称',
   `full_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客商全称',
+  `customer_kind` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'external' COMMENT '客商类型：external外部客商，internal内部组织',
   `customer_nature` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客商性质',
   `guangxi_top100` tinyint NULL DEFAULT NULL COMMENT '是否广西百强：0否，1是',
   `unified_credit_code` varchar(18) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '统一社会信用代码',
@@ -93,6 +94,7 @@ CREATE TABLE `blade_customer_receipt_account` (
   `account_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收款方名称',
   `account_holder_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '开户人姓名',
   `bank_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '开户行名称',
+  `cnaps_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联行号',
   `bank_account` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '银行账号',
   `registered_phone` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '注册电话',
   `registered_address` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '注册地址',

doc/sql/transport/blade_customer_archive_customer_kind_20260923.sql

@@ -0,0 +1,19 @@
+-- 客商档案：新增「客商类型」字段（external外部客商，internal内部组织）
+-- 历史数据默认外部客商；重复执行不会报重复列错误。
+
+SET @customer_archive_schema = DATABASE();
+
+SET @customer_archive_sql = (
+  SELECT IF(
+    COUNT(*) = 0,
+    'ALTER TABLE `blade_customer_archive` ADD COLUMN `customer_kind` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT ''external'' COMMENT ''客商类型：external外部客商，internal内部组织'' AFTER `full_name`',
+    'SELECT 1'
+  )
+  FROM information_schema.columns
+  WHERE table_schema = @customer_archive_schema
+    AND table_name = 'blade_customer_archive'
+    AND column_name = 'customer_kind'
+);
+PREPARE customer_archive_stmt FROM @customer_archive_sql;
+EXECUTE customer_archive_stmt;
+DEALLOCATE PREPARE customer_archive_stmt;

doc/sql/transport/blade_customer_receipt_account_cnaps_code_20260922.sql

@@ -0,0 +1,4 @@
+-- 客商收款信息：新增联行号
+
+ALTER TABLE `blade_customer_receipt_account`
+  ADD COLUMN `cnaps_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联行号' AFTER `bank_name`;

doc/sql/transport/blade_dept_oa_id_20260921.sql

@@ -0,0 +1,6 @@
+-- 机构表：记录 OA 主键与上级 OA 主键，仅用于同步后重建组织层级，不用于前端展示
+
+ALTER TABLE `blade_dept`
+  ADD COLUMN `oa_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'OA主键' AFTER `is_platform_company`,
+  ADD COLUMN `oa_sup_sub_com_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'OA上级主键' AFTER `oa_id`,
+  ADD INDEX `idx_blade_dept_oa_id` (`oa_id`);

doc/sql/transport/blade_measurement_unit.sql

@@ -4,6 +4,7 @@
 DROP TABLE IF EXISTS `blade_measurement_unit`;
 CREATE TABLE `blade_measurement_unit` (
   `id` bigint NOT NULL COMMENT '主键',
+  `unit_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '计量单位编码',
   `unit_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '计量单位',
   `dimension` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '计量维度',
   `remark` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
@@ -15,6 +16,7 @@ CREATE TABLE `blade_measurement_unit` (
   `status` int NULL DEFAULT 1 COMMENT '状态',
   `is_deleted` int NULL DEFAULT 0 COMMENT '是否已删除',
   PRIMARY KEY (`id`) USING BTREE,
+  UNIQUE INDEX `uk_measurement_unit_code`(`unit_code`) USING BTREE,
   UNIQUE INDEX `uk_measurement_unit_name`(`unit_name`) USING BTREE,
   INDEX `idx_measurement_unit_dimension`(`dimension`) USING BTREE,
   INDEX `idx_measurement_unit_status`(`status`) USING BTREE

doc/sql/transport/blade_measurement_unit_code_20260919.sql

@@ -0,0 +1,11 @@
+-- 计量单位新增计量单位编码
+ALTER TABLE `blade_measurement_unit`
+  ADD COLUMN `unit_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '计量单位编码' AFTER `id`;
+
+UPDATE `blade_measurement_unit`
+SET `unit_code` = CONCAT('MU', `id`)
+WHERE `unit_code` IS NULL OR `unit_code` = '';
+
+ALTER TABLE `blade_measurement_unit`
+  MODIFY COLUMN `unit_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '计量单位编码',
+  ADD UNIQUE INDEX `uk_measurement_unit_code`(`unit_code`) USING BTREE;

doc/sql/transport/blade_transport_vehicle.sql

@@ -57,7 +57,7 @@ CREATE TABLE `blade_transport_vehicle` (
   KEY `idx_transport_vehicle_road_end` (`road_transport_cert_end_date`) USING BTREE,
   KEY `idx_transport_vehicle_annual_end` (`annual_review_end_date`) USING BTREE,
   KEY `idx_transport_vehicle_status` (`status`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='车辆管理';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='车辆管理';
 
 -- ----------------------------
 -- Records of blade_menu for transport capacity vehicle

doc/sql/transport/blade_transport_vehicle_collation_20260923.sql

@@ -0,0 +1,4 @@
+-- 对齐车辆表字符串列排序规则，避免与 utf8mb4_general_ci 表 JOIN 报 Illegal mix of collations
+-- 背景：blade_transport_vehicle 建表未显式指定 COLLATE，MySQL 8 默认 utf8mb4_0900_ai_ci
+ALTER TABLE `blade_transport_vehicle`
+  CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;

doc/sql/update/add-mp-auth-permission.sql

@@ -0,0 +1,21 @@
+-- 小程序调度端入口权限码 mp_auth
+-- user-info 的 permission 来自按钮叶子 code；需把本菜单授权给调度/管理员角色
+-- 执行后：后台「角色管理 → 权限配置」勾选「小程序调度端」，或按需 INSERT blade_role_menu
+
+-- 父级菜单（小程序）
+INSERT IGNORE INTO `blade_menu`
+(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`)
+VALUES
+(2091800000000000001, 0, 'miniprogram', '小程序', 'menu', '/miniprogram', 'iconfont iconicon_work', 98, 1, 0, 1, '', '小程序相关权限', 0);
+
+-- 按钮权限：mp_auth（叶子节点，会被 permissionCodes 收集）
+INSERT IGNORE INTO `blade_menu`
+(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`)
+VALUES
+(2091800000000000002, 2091800000000000001, 'mp_auth', '小程序调度端', 'mp_auth', '', '', 1, 2, 0, 1, NULL, '登录后进入调度端首页', 0);
+
+-- 示例：给管理员角色（role_id 按环境实际调整，默认管理员 1123598816738675201）
+-- INSERT IGNORE INTO `blade_role_menu` (`id`, `menu_id`, `role_id`)
+-- VALUES
+-- (2091800000000000101, 2091800000000000001, 1123598816738675201),
+-- (2091800000000000102, 2091800000000000002, 1123598816738675201);

doc/sql/update/add-wechat-applet-grant-type.sql

@@ -0,0 +1,8 @@
+-- 为小程序客户端授权类型补充微信小程序登录（wechat_applet）
+-- 执行后建议清客户端缓存 / 重启 blade-auth
+
+UPDATE blade_client
+SET authorized_grant_types = CONCAT(authorized_grant_types, ',wechat_applet')
+WHERE client_id IN ('saber3', 'saber', 'sword', 'rider')
+  AND FIND_IN_SET('wechat_applet', REPLACE(authorized_grant_types, ' ', '')) = 0
+  AND is_deleted = 0;