diff --git a/.gitignore b/.gitignore index eb59fff..0a5d442 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,17 @@ tests/**/obj/ # === 前端部署到CncWebApi/admin === src/CncWebApi/admin/ + +# === 后端发布输出 === +publish/ + +# === 工具项目 === +tools/ + +# === IIS部署DLL（src/CncWebApi根目录下的dll/pdb/xml） === +src/CncWebApi/*.dll +src/CncWebApi/*.pdb +src/CncWebApi/*.xml + +# === 测试报告 === +docs/test-reports/ diff --git a/docs/test-reports/20260429044113-联调测试总报告.html b/docs/test-reports/20260429044113-联调测试总报告.html deleted file mode 100644 index af7919a..0000000 --- a/docs/test-reports/20260429044113-联调测试总报告.html +++ /dev/null @@ -1,120 +0,0 @@ - - - - -CNC数据采集系统 - 全模块联调测试总报告 - - - - -

🏭 CNC机床数据采集系统
全模块联调测试总报告

- -
-

📊 测试环境：http://192.168.1.202/

-

🕐 测试时间：2026-04-29 04:41:13

-

📌 Git Commit：6522b2a

-

🖥️ 部署方式：IIS 站点（后端Web API + 前端Vue3静态文件）

-

💾 数据库：MariaDB 11.8.6（cnc_business + cnc_log 双库）

-

📋 测试范围：10个功能模块，共 30 个API端点联调验证

-
- -
-
30/30 ✅
-
全部通过 — 10个模块 30项测试 全部 code=0
-
- -

📋 模块测试结果总览

- - - - - - - - - - - - - - - - - -
序号模块名称测试项数通过跳过失败详细报告
1🔐 登录模块2200查看
2📊 仪表盘4440查看
3🏷️ 品牌模板4450查看
4🔗 采集地址5530查看
5👷 员工管理6640查看
6📈 产量报表2230查看
7🔔 告警中心2220查看
8⚙️ 系统设置2250查看
9📋 操作日志2210查看
10🖥️ 大屏看板3320查看
合计3030290-
- -

⚠️ 跳过项汇总（29项）

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
模块跳过项原因
📊 仪表盘采集服务启动/停止/刷新B类端点，采集服务未实现
工人产量排行图表需页面级图表渲染验证
车间平均单机产量需页面级图表渲染验证
机床状态分布需页面级图表渲染验证
🏷️ 品牌模板新增品牌需页面级交互测试
编辑品牌（逐字段验证）需页面级交互测试
删除品牌需页面级交互测试
复制品牌需页面级交互测试
导入导出用户要求排除
🔗 采集地址新增/编辑地址（逐字段验证）需页面级交互测试
删除地址需页面级交互测试
导入导出用户要求排除
👷 员工管理新增/编辑员工（逐字段验证）需页面级交互测试
删除员工需页面级交互测试
启停切换需页面级交互测试
导入导出用户要求排除
📈 产量报表修正产量需页面级交互测试
修正历史查询需页面级交互触发
导出报表用户要求排除
🔔 告警中心处理单条告警需页面级交互测试
批量处理告警需页面级交互测试
⚙️ 系统设置编辑配置项需页面级交互测试
重置Token需页面级交互测试
新增/编辑/删除车间需页面级交互测试
启停车间需页面级交互测试
修改密码需页面级交互测试
📋 操作日志导出修正日志用户要求排除
🖥️ 大屏看板各图表详细渲染验证需页面级可视化验证
自动刷新机制需长时间观察验证
- -

📝 测试说明

-
-

测试方法：对每个API端点发送HTTP请求，验证返回JSON中code=0及数据结构正确性。

-

测试数据：已向10张业务/日志表插入测试数据（机床24台、工人6名、日产量20条、告警5条、修正记录3条、系统日志30条、采集原始JSON 6条、心跳3条）。

-

排除项：大屏配置界面不测试、所有导入导出功能不测试（用户明确要求）。

-

跳过原因分类：

- -
- -
-

CNC机床数据采集系统 — 联调测试报告 | 生成时间：2026-04-29 04:41:13

-

测试报告不纳入Git版本管理，Git Commit Hash: 6522b2a

-
- - - diff --git a/docs/test-reports/产量报表/20260429044113/测试报告-产量报表.html b/docs/test-reports/产量报表/20260429044113/测试报告-产量报表.html deleted file mode 100644 index ca8b5cc..0000000 --- a/docs/test-reports/产量报表/20260429044113/测试报告-产量报表.html +++ /dev/null @@ -1,44 +0,0 @@ - - - - -测试报告 - 产量报表模块 - - - -

📈 测试报告 - 产量报表模块

-
-

测试时间：2026-04-29 04:41:13

-

Git Commit：126cecf（补齐adjustment-history端点）

-

测试环境：http://192.168.1.202/admin/production

-

测试结果：✅ 全部通过（2/2）

-
- -

测试项明细

- - - - -
#测试项API调用预期结果实际结果状态
1日汇总统计GET /api/admin/production/daily-summarycode=0, 返回今日汇总code=0, totalQuantity=635✅ 通过
2日产量列表（分页）GET /api/admin/production/dailycode=0, 返回分页列表code=0, total=20条✅ 通过
- -

跳过项

- - - - - -
跳过项原因备注
修正产量需页面级交互测试API端点已实现，待后续手动验证
修正历史查询（新增端点）需页面级交互触发API端点GET /api/admin/production/{recordId}/adjustment-history已实现
导出报表用户要求排除-
- - diff --git a/docs/test-reports/仪表盘/20260429044113/测试报告-仪表盘.html b/docs/test-reports/仪表盘/20260429044113/测试报告-仪表盘.html deleted file mode 100644 index 975484c..0000000 --- a/docs/test-reports/仪表盘/20260429044113/测试报告-仪表盘.html +++ /dev/null @@ -1,47 +0,0 @@ - - - - -测试报告 - 仪表盘模块 - - - -

📊 测试报告 - 仪表盘模块

-
-

测试时间：2026-04-29 04:41:13

-

Git Commit：6522b2a

-

测试环境：http://192.168.1.202/admin/dashboard

-

测试结果：✅ 全部通过（4/4）

-
- -

测试项明细

- - - - - - -
#测试项API调用预期结果实际结果状态
1汇总统计（8个卡片）GET /api/admin/dashboard/summarycode=0, 返回统计数据code=0, 返回统计对象✅ 通过
2机床产量排行TOP10GET /api/admin/dashboard/machine-rankcode=0, 返回排行列表code=0, items=10条✅ 通过
37天产量趋势GET /api/admin/dashboard/trendcode=0, 返回7天数据code=0, items=7条✅ 通过
4最新5条告警GET /api/admin/dashboard/recent-alertscode=0, 返回告警列表code=0, items=5条✅ 通过
- -

跳过项

- - - - - - -
跳过项原因备注
采集服务启动/停止/刷新B类端点，采集服务未实现3个端点（collector/start/stop/refresh）暂不补齐，前端有try-catch容错
工人产量排行需页面级图表渲染验证API端点已实现，返回数据正确
车间平均单机产量需页面级图表渲染验证API端点已实现
机床状态分布需页面级图表渲染验证API端点已实现
- - diff --git a/docs/test-reports/告警中心/20260429044113/测试报告-告警中心.html b/docs/test-reports/告警中心/20260429044113/测试报告-告警中心.html deleted file mode 100644 index 62c0107..0000000 --- a/docs/test-reports/告警中心/20260429044113/测试报告-告警中心.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - -测试报告 - 告警中心模块 - - - -

🔔 测试报告 - 告警中心模块

-
-

测试时间：2026-04-29 04:41:13

-

Git Commit：6522b2a

-

测试环境：http://192.168.1.202/admin/alert

-

测试结果：✅ 全部通过（2/2）

-
- -

测试项明细

- - - - -
#测试项API调用预期结果实际结果状态
1告警统计GET /api/admin/alert/statisticscode=0, 返回统计数据code=0, 返回统计对象✅ 通过
2告警列表（分页）GET /api/admin/alertcode=0, 返回告警分页列表code=0, total=5条✅ 通过
- -

跳过项

- - - - -
跳过项原因备注
处理单条告警需页面级交互测试API端点PUT /api/admin/alert/{id}/resolve已实现
批量处理告警需页面级交互测试API端点POST /api/admin/alert/batch-resolve已实现
- - diff --git a/docs/test-reports/员工管理/20260429044113/测试报告-员工管理.html b/docs/test-reports/员工管理/20260429044113/测试报告-员工管理.html deleted file mode 100644 index cd46d72..0000000 --- a/docs/test-reports/员工管理/20260429044113/测试报告-员工管理.html +++ /dev/null @@ -1,49 +0,0 @@ - - - - -测试报告 - 员工管理模块 - - - -

👷 测试报告 - 员工管理模块

-
-

测试时间：2026-04-29 04:41:13

-

Git Commit：1168b3c（补齐4个端点）

-

测试环境：http://192.168.1.202/admin/worker

-

测试结果：✅ 全部通过（6/6）

-
- -

测试项明细

- - - - - - - - -
#测试项API调用预期结果实际结果状态
1员工列表（分页）GET /api/admin/workercode=0, 返回员工分页列表code=0, total=6✅ 通过
2员工详情GET /api/admin/worker/1code=0, 含name/code/machineCountcode=0, name=张三, machineCount=2✅ 通过
3绑定机床列表（新增端点）GET /api/admin/worker/1/machinescode=0, 返回机床列表code=0, items=2条✅ 通过
4今日产量（新增端点）GET /api/admin/worker/1/production/todaycode=0, 返回产量列表code=0, items=0（采集服务未运行，预期空）✅ 通过
57天产量趋势（新增端点）GET /api/admin/worker/1/production/trendcode=0, 返回7天趋势code=0, items=7条，quantity均为0（采集服务未运行）✅ 通过
6可绑定机床（新增端点）GET /api/admin/worker/available-machinescode=0, 返回未绑定的机床code=0, items=0（所有机床已绑定或离线）✅ 通过
- -

跳过项

- - - - - - -
跳过项原因备注
新增/编辑员工（逐字段验证）需页面级交互测试API端点已实现，待后续手动验证
删除员工需页面级交互测试API端点已实现，待后续手动验证
启停切换需页面级交互测试API端点已实现，待后续手动验证
导入导出用户要求排除-
- - diff --git a/docs/test-reports/品牌模板/20260429044113/测试报告-品牌模板.html b/docs/test-reports/品牌模板/20260429044113/测试报告-品牌模板.html deleted file mode 100644 index ca11637..0000000 --- a/docs/test-reports/品牌模板/20260429044113/测试报告-品牌模板.html +++ /dev/null @@ -1,49 +0,0 @@ - - - - -测试报告 - 品牌模板模块 - - - -

🏷️ 测试报告 - 品牌模板模块

-
-

测试时间：2026-04-29 04:41:13

-

Git Commit：6522b2a

-

测试环境：http://192.168.1.202/admin/brand

-

测试结果：✅ 全部通过（4/4）

-
- -

测试项明细

- - - - - - -
#测试项API调用预期结果实际结果状态
1品牌列表加载GET /api/admin/brandcode=0, 返回品牌列表code=0, items=1条（FANUC）✅ 通过
2品牌详情（含字段映射）GET /api/admin/brand/1code=0, 包含brandName和mappingscode=0, brandName=FANUC, 含字段映射✅ 通过
3标准字段列表GET /api/admin/brand/standard-fieldscode=0, 返回标准字段列表code=0, count=16个标准字段✅ 通过
4启停切换PUT /api/admin/brand/{id}/togglecode=0code=0（已在设备管理联调中验证）✅ 通过
- -

跳过项

- - - - - - - -
跳过项原因备注
新增品牌需页面级交互测试API端点已实现，待后续手动验证
编辑品牌（逐字段验证）需页面级交互测试API端点已实现，待后续手动验证
删除品牌需页面级交互测试API端点已实现，待后续手动验证
复制品牌需页面级交互测试API端点已实现，待后续手动验证
导入导出用户要求排除-
- - diff --git a/docs/test-reports/大屏看板/20260429044113/测试报告-大屏看板.html b/docs/test-reports/大屏看板/20260429044113/测试报告-大屏看板.html deleted file mode 100644 index 934111c..0000000 --- a/docs/test-reports/大屏看板/20260429044113/测试报告-大屏看板.html +++ /dev/null @@ -1,44 +0,0 @@ - - - - -测试报告 - 大屏看板模块 - - - -

🖥️ 测试报告 - 大屏看板模块

-
-

测试时间：2026-04-29 04:41:13

-

Git Commit：6522b2a

-

测试环境：http://192.168.1.202/screen（免认证）

-

测试结果：✅ 全部通过（3/3）

-
- -

测试项明细

- - - - - -
#测试项API调用预期结果实际结果状态
1大屏汇总统计（免Token）GET /api/screen/summary（无Auth header）code=0, 返回统计数据code=0, 返回统计对象✅ 通过
2大屏筛选条件GET /api/screen/filterscode=0, 返回筛选配置code=0, 返回筛选数据✅ 通过
3刷新间隔配置GET /api/screen/refresh-intervalcode=0, 返回刷新间隔code=0, 返回间隔配置✅ 通过
- -

跳过项

- - - - -
跳过项原因备注
各图表详细渲染验证需页面级可视化验证API端点均已实现，数据返回正确
自动刷新机制需长时间观察验证定时器逻辑在前端实现
- - diff --git a/docs/test-reports/操作日志/20260429044113/测试报告-操作日志.html b/docs/test-reports/操作日志/20260429044113/测试报告-操作日志.html deleted file mode 100644 index 5974379..0000000 --- a/docs/test-reports/操作日志/20260429044113/测试报告-操作日志.html +++ /dev/null @@ -1,42 +0,0 @@ - - - - -测试报告 - 操作日志模块 - - - -

📋 测试报告 - 操作日志模块

-
-

测试时间：2026-04-29 04:41:13

-

Git Commit：6522b2a（补齐export端点占位）

-

测试环境：http://192.168.1.202/admin/log

-

测试结果：✅ 全部通过（2/2）

-
- -

测试项明细

- - - - -
#测试项API调用预期结果实际结果状态
1产量修正日志（分页）GET /api/admin/log/adjustmentcode=0, 返回修正日志分页列表code=0, total=3条✅ 通过
2系统运行日志（分页）GET /api/admin/log/systemcode=0, 返回系统日志分页列表code=0, total=30条✅ 通过
- -

跳过项

- - - -
跳过项原因备注
导出修正日志用户要求排除-
- - diff --git a/docs/test-reports/登录/20260429044113/测试报告-登录.html b/docs/test-reports/登录/20260429044113/测试报告-登录.html deleted file mode 100644 index d557830..0000000 --- a/docs/test-reports/登录/20260429044113/测试报告-登录.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - -测试报告 - 登录模块 - - - -

🔐 测试报告 - 登录模块

-
-

测试时间：2026-04-29 04:41:13

-

Git Commit：6522b2a

-

测试环境：http://192.168.1.202/admin/

-

测试结果：✅ 全部通过（2/2）

-
- -

测试项明细

- - - - -
#测试项测试方法预期结果实际结果状态
1正确密码登录POST /api/admin/login {username:admin, password:admin123}code=0, 返回tokencode=0, token=eyJhbG...，长度>100字符✅ 通过
2错误密码登录POST /api/admin/login {username:admin, password:wrong}code≠0, 返回错误信息code=40000, message="用户名或密码错误"✅ 通过
- -

跳过项

- - - -
跳过项原因备注
无--
- - diff --git a/docs/test-reports/系统设置/20260429044113/测试报告-系统设置.html b/docs/test-reports/系统设置/20260429044113/测试报告-系统设置.html deleted file mode 100644 index 97f3de5..0000000 --- a/docs/test-reports/系统设置/20260429044113/测试报告-系统设置.html +++ /dev/null @@ -1,46 +0,0 @@ - - - - -测试报告 - 系统设置模块 - - - -

⚙️ 测试报告 - 系统设置模块

-
-

测试时间：2026-04-29 04:41:13

-

Git Commit：6522b2a

-

测试环境：http://192.168.1.202/admin/settings

-

测试结果：✅ 全部通过（2/2）

-
- -

测试项明细

- - - - -
#测试项API调用预期结果实际结果状态
1配置项列表GET /api/admin/sys-configcode=0, 返回配置列表code=0, items=18条✅ 通过
2车间列表GET /api/admin/workshopcode=0, 返回车间列表code=0, items=3条（A栋/B栋/C栋）✅ 通过
- -

跳过项

- - - - - - - -
跳过项原因备注
编辑配置项需页面级交互测试API端点PUT /api/admin/sys-config/{id}已实现
重置Token需页面级交互测试API端点POST /api/admin/sys-config/reset-token已实现
新增/编辑/删除车间需页面级交互测试API端点已实现，待后续手动验证
启停车间需页面级交互测试API端点PUT /api/admin/workshop/{id}/toggle已实现
修改密码需页面级交互测试API端点POST /api/admin/change-password已实现
- - diff --git a/docs/test-reports/采集地址/20260429044113/测试报告-采集地址.html b/docs/test-reports/采集地址/20260429044113/测试报告-采集地址.html deleted file mode 100644 index 650de21..0000000 --- a/docs/test-reports/采集地址/20260429044113/测试报告-采集地址.html +++ /dev/null @@ -1,47 +0,0 @@ - - - - -测试报告 - 采集地址模块 - - - -

🔗 测试报告 - 采集地址模块

-
-

测试时间：2026-04-29 04:41:13

-

Git Commit：6fb571f（补齐3个详情子端点）

-

测试环境：http://192.168.1.202/admin/collect-address

-

测试结果：✅ 全部通过（5/5）

-
- -

测试项明细

- - - - - - - -
#测试项API调用预期结果实际结果状态
1地址列表加载GET /api/admin/collect-addresscode=0, 返回地址列表code=0, items=2条✅ 通过
2地址详情GET /api/admin/collect-address/1code=0, 含name/url/brandNamecode=0, name=FANUC-1号✅ 通过
3地址下关联机床（新增端点）GET /api/admin/collect-address/1/machinescode=0, 返回机床列表code=0, items=14条✅ 通过
4近期采集记录（新增端点）GET /api/admin/collect-address/1/collect-recordscode=0, 返回采集记录code=0, items=4条✅ 通过
5最新原始JSON（新增端点）GET /api/admin/collect-address/1/raw-jsoncode=0, 返回rawJson字符串code=0, rawJson长度>0✅ 通过
- -

跳过项

- - - - - -
跳过项原因备注
新增/编辑地址（逐字段验证）需页面级交互测试API端点已实现，待后续手动验证
删除地址需页面级交互测试API端点已实现，待后续手动验证
导入导出用户要求排除-
- - diff --git a/publish/BCrypt.Net-Next.dll b/publish/BCrypt.Net-Next.dll deleted file mode 100644 index 101a48e..0000000 Binary files a/publish/BCrypt.Net-Next.dll and /dev/null differ diff --git a/publish/CncModels.dll b/publish/CncModels.dll deleted file mode 100644 index 1bf7b98..0000000 Binary files a/publish/CncModels.dll and /dev/null differ diff --git a/publish/CncModels.pdb b/publish/CncModels.pdb deleted file mode 100644 index f006f00..0000000 Binary files a/publish/CncModels.pdb and /dev/null differ diff --git a/publish/CncModels.xml b/publish/CncModels.xml deleted file mode 100644 index e8e40ca..0000000 --- a/publish/CncModels.xml +++ /dev/null @@ -1,1596 +0,0 @@ - - - - CncModels - - - - - 全局错误码 - 编号规则：5位数字，前2位为模块，后3位为具体错误 - - - - 请求参数错误 - - - 未认证（Token缺失或无效） - - - 资源不存在 - - - 数据冲突（唯一性校验失败） - - - 数据已被引用，不允许操作 - - - 服务器内部错误 - - - - 敏感配置键（用于系统配置表中的敏感字段脱敏处理） - - - - API Token - - - 采集器 API Key - - - 管理员密码哈希 - - - - 数据库表名常量 - - - - 车间表 cnc_workshop - - - 品牌表 cnc_brand - - - 品牌字段映射表 cnc_brand_field_mapping - - - 采集地址表 cnc_collect_address - - - 机床表 cnc_machine - - - 工人表 cnc_worker - - - 工人-机床绑定表 cnc_worker_machine - - - 采集结构化记录表 cnc_collect_record - - - 产量分段表 cnc_production_segment - - - 机床日状态 cnc_machine_daily_status - - - 日产量 cnc_daily_production - - - 工人日汇总 cnc_worker_daily_summary - - - 产量调整 cnc_production_adjustment - - - 告警 cnc_alert - - - 系统配置 cnc_sys_config - - - 大屏配置 cnc_screen_config - - - 大屏筛选配置 cnc_screen_filter - - - 日志原始采集表 log_collect_raw - - - 日志系统表 log_system - - - 日志心跳表 log_collector_heartbeat - - - - 告警列表项 - - - - - 告警查询（分页） - - - - - 告警统计结果（未处理告警分类型统计） - - - - 未处理告警总数 - - - 按告警类型统计的未处理数量 - - - - 批量告警处理请求 - - - - - 统一API响应包装类 - 前端约定：code=0 表示成功，非0表示失败 - - 业务数据类型 - - - 错误码，0=成功 - - - 提示信息 - - - 业务数据 - - - - 构建成功响应 - - 业务数据 - 提示信息，默认 "success" - 成功响应 - - - - 构建失败响应 - - 错误码（非0） - 错误信息 - 失败响应 - - - - 品牌详情（含字段映射） - - - - - 品牌字段映射 - - - - - 品牌模板列表项 - - - - - 新增品牌模板请求 - - - - - 标准字段列表 - - - - - 更新品牌模板请求 - - - - - 采集地址详情（扩展字段留待未来扩展） - - - - - 采集地址列表项 - - - - - 采集地址下关联机床项 - - - - 机床名称 - - - 设备编码 - - - 车间名称 - - - 是否在线 - - - 当前NC程序名 - - - - 采集地址查询（分页） - - - - - 采集地址原始JSON响应 - - - - 原始JSON字符串 - - - - 采集地址采集记录项 - - - - 请求时间 - - - 耗时（毫秒） - - - 是否成功 - - - 采集到的机床数 - - - 机床名称（用于原始JSON弹窗标题） - - - - 新增采集地址请求 - - - - - 编辑采集地址请求 - - - - - 通用下拉项 - - - - - 最新告警条目 - - - - - 仪表盘查询参数（日期筛选，不带分页） - - - - 起始日期 - - - 结束日期 - - - - 仪表盘总览数据 - - - - 在线机床数量 - - - 总机床数量 - - - 今日产量（件） - - - 活跃告警数量 - - - 采集成功率（百分比，小数不放大） - - - 今日总工作时长/产线运行时间，单位分钟 - - - 正在运行的机床数量 - - - 数据缺失机床数量 - - - - 机床产量排行项 - - - - - 工人产量排行项 - - - - - 车间生产量统计 - - - - - 登录请求 - - - - 用户名 - - - 密码 - - - 是否记住密码/保持登录 - - - - 登录响应 - - - - JWT Token - - - Token 过期时间（秒） - - - - 调整日志列表项 - - - - - 调整日志查询（分页） - - - - - 系统日志列表项 - - - - - 系统日志查询（分页） - - - - - 新增机床请求 - - - - - 机床采集记录项 - - - - 采集时间 - - - NC程序名 - - - 零件计数 - - - 运行状态 - - - - 机床详情 - - - - - 机床列表项 - - - - - 今日产量与趋势（简化模型） - - - - 今日产量 - - - 趋势数据（JSON 字符串） - - - - 机床查询（分页） - - - - 搜索关键字（名称/编码） - - - 车间ID - - - 是否在线（1在线 0离线） - - - 品牌ID - - - - 实时采集状态 - - - - NC程序名 - - - 零件计数 - - - 运行状态 - - - 操作模式 - - - 主轴设定转速 - - - 进给设定速度 - - - 主轴实际转速 - - - 主轴负载（%） - - - - 机床今日产量明细项 - - - - NC程序名 - - - 产量 - - - 运行时间（分钟） - - - 切削时间（分钟） - - - - 机床产量趋势数据项 - - - - 日期（yyyy-MM-dd） - - - 当日产量 - - - - 编辑机床请求 - - - - - 分页查询参数基类 - 默认值：page=1, pageSize=20 - 约束：pageSize最大100，page最小1 - - - - 页码（从1开始），小于1自动修正为1 - - - 每页条数，范围1-100，超出自动修正 - - - - 计算SQL偏移量（OFFSET） - - - - - 分页结果 - - 数据项类型 - - - 数据列表 - - - 总记录数 - - - 当前页码（从1开始） - - - 每页条数 - - - 总页数 - - - - 产量修正历史记录项 - - - - 修正记录ID - - - 修正前值 - - - 修正后值 - - - 修正原因 - - - 操作人IP - - - 修正时间 - - - - cnc_daily_production 日汇总表列表项 - - - - - 日汇总统计 - - - - - 产量调整历史 - - - - - 调整产量请求 - - - - - 产量查询（分页） - - - - - 新增屏幕配置请求 - - - - - 新增屏幕筛选项请求 - - - - - 卡片配置列表项 - - - - - 筛选项列表项 - - - - - 更新屏幕配置请求 - - - - - 更新屏幕筛选项请求 - - - - - 筛选条件集合（大屏用） - - - - - 机床状态总览 - - - - - 大屏汇总数据（简化模型） - - - - - 修改密码请求 - - - - - 新增车间请求 - - - - - 系统配置项 - - - - - 更新系统配置请求 - - - - - 编辑车间请求 - - - - - 车间列表项 - - - - - 新增工人请求 - - - - - 更新工人请求 - - - - - 可绑定机床项（未绑定其他工人的机床） - - - - 机床ID - - - 机床名称 - - - 设备编码 - - - - 工人详情 - - - - - 工人列表项 - - - - - 工人绑定机床项 - - - - 机床ID - - - 机床名称 - - - 设备编码 - - - 车间名称 - - - 品牌名称 - - - 是否在线 - - - 当前NC程序名 - - - - 工人查询（分页） - - - - - 工人今日产量明细项 - - - - 机床名称 - - - NC程序名 - - - 产量 - - - 运行时间（分钟） - - - 切削时间（分钟） - - - - 工人产量趋势数据项 - - - - 日期（yyyy-MM-dd） - - - 当日产量 - - - - cnc_alert 告警表 - - - - 主键ID - - - 告警类型 - - - 机床ID - - - 采集地址ID - - - 标题 - - - 详情 - - - 是否已解决 - - - 解决时间 - - - 创建时间 - - - - cnc_brand CNC品牌模板表 - - - - 主键ID - - - 品牌名称 - - - 设备字段名 - - - 标签路径 - - - 是否启用 - - - 创建时间 - - - 修改时间 - - - - cnc_brand_field_mapping 品牌字段映射表 - - - - 主键ID - - - 品牌ID - - - 标准字段 - - - 字段名 - - - 匹配规则 - - - 数据类型 - - - 是否必填 - - - 创建时间 - - - - cnc_collect_address 采集地址表 - - - - 主键ID - - - 名称 - - - 地址URL - - - 品牌ID - - - 采集间隔（秒/单位未约定以整型表示） - - - 是否启用 - - - 最近采集时间 - - - 最近采集状态 - - - 失败次数 - - - 创建时间 - - - 修改时间 - - - - log_collector_heartbeat 采集服务心跳表 - - - - 主键ID - - - 服务ID - - - 状态 - - - 采集地址ID - - - 最近采集时间 - - - 成功次数 - - - 失败次数 - - - 运行时长（秒） - - - 详情（JSON 字符串） - - - 创建时间 - - - - log_collect_raw 原始采集JSON表 - - - - 主键ID - - - 采集地址ID - - - 请求时间 - - - 响应时间 - - - 响应时长 - - - 是否成功 - - - 状态码 - - - 原始JSON - - - 错误信息 - - - 创建时间 - - - - cnc_collect_record 采集结构化记录表 - - - - 主键ID - - - 机床ID - - - 采集时间 - - - 设备时间 - - - NC程序名 - - - 零件计数 - - - 设备状态 - - - 运行状态 - - - 操作模式 - - - 主轴设定速度 - - - 进给设定速度 - - - 主轴实际速度 - - - 进给实际速度 - - - 主轴负载 - - - 主轴倍率 - - - 开机时间 - - - 运行时间 - - - 切削时间 - - - 循环时间 - - - 加工状态 - - - 扩展数据（JSON 字符串） - - - 创建时间 - - - - cnc_daily_production 日汇总表 - - - - 主键ID - - - 机床ID - - - 生产日期 - - - 程序名 - - - 总产量 - - - 工人ID（用于产量按工人汇总的场景） - - - 段数 - - - 总运行时间 - - - 总切削时间 - - - 总循环时间 - - - 是否已调整 - - - 调整后的数量 - - - 创建时间 - - - 修改时间 - - - - cnc_machine 机床表 - - - - 主键ID - - - 设备编码 - - - 名称 - - - 车间ID - - - 采集地址ID - - - IP地址 - - - 品牌ID - - - 是否启用 - - - 是否在线 - - - 最近Ping时间 - - - 最近采集时间 - - - 最近设备状态 - - - 最近运行状态 - - - 最近程序名 - - - 最近零件数 - - - 最近操作模式 - - - 最近加工状态 - - - 创建时间 - - - 修改时间 - - - - cnc_machine_daily_status 机床日状态表 - - - - 主键ID - - - 机床ID - - - 生产日期 - - - 数据状态 - - - 创建时间 - - - 修改时间 - - - - cnc_production_adjustment 产量修正审计表 - - - - 主键ID - - - 目标表 - - - 目标ID - - - 字段名 - - - 旧值 - - - 新值 - - - 原因 - - - 操作IP - - - 创建时间 - - - - cnc_production_segment 产量分段记录表 - - - - 主键ID - - - 机床ID - - - 程序名 - - - 生产日期 - - - 开始时间 - - - 结束时间 - - - 起始零件数 - - - 结束零件数 - - - 产量 - - - 是否已结算 - - - 结束原因 - - - 创建时间 - - - 修改时间 - - - - cnc_screen_config 大屏卡片配置表 - - - - 主键ID - - - 卡片键 - - - 卡片类型 - - - 标题 - - - 指标 - - - 维度 - - - 排序 - - - 是否启用 - - - 图表配置（JSON 字符串） - - - 创建时间 - - - 修改时间 - - - - cnc_screen_filter 大屏筛选配置表 - - - - 主键ID - - - 屏幕Key - - - 筛选类型 - - - 筛选值 - - - 是否为默认 - - - 排序 - - - - cnc_sys_config 系统配置表 - - - - 主键ID - - - 配置键 - - - 配置值 - - - 值类型 - - - 描述 - - - 最后修改时间 - - - - log_system 系统日志表 - - - - 主键ID - - - 日志等级 - - - 来源 - - - 消息 - - - 堆栈信息 - - - 扩展数据（JSON 字符串） - - - 创建时间 - - - - cnc_worker 工人表 - - - - 主键ID - - - 姓名 - - - 工号 - - - 是否启用 - - - 创建时间 - - - 修改时间 - - - - cnc_worker_daily_summary 工人日汇总表 - - - - 主键ID - - - 工人ID - - - 生产日期 - - - 总产量 - - - 机床数量 - - - 程序数量 - - - 是否已调整 - - - 调整后的数量 - - - 创建时间 - - - 修改时间 - - - - cnc_worker_machine 工人-机床绑定表 - - - - 主键ID - - - 工人ID - - - 机床ID - - - 创建时间 - - - - cnc_workshop 车间表 - - - - 主键ID - - - 车间名称 - - - 排序序号 - - - 是否启用 - - - 创建时间 - - - 修改时间 - - - - 告警类型常量集合（数据库以字符串存储） - - - - 采集失败 - - - 设备离线 - - - 产量异常 - - - 未知设备 - - - 服务错误 - - - - 大屏卡片类型常量（存储为字符串） - - - - 统计数字 - - - 柱状图 - - - 折线图 - - - 饼图 - - - 状态网格 - - - 排名列表 - - - - 采集服务状态（字符串存储） - - - - 运行中 - - - 已停止 - - - 错误 - - - - 采集结果状态常量 - - - - 成功 - - - 失败 - - - 超时 - - - - 数据状态枚举（字符串存储版本） - - - - 正常 - - - 离线 - - - 数据缺失 - - - - 数据类型枚举（字符串存储版本） - - - - 字符串 - - - 数字 - - - - 日志等级常量（字符串表示） - - - - 调试 - - - 信息 - - - 警告 - - - 错误 - - - - 字段匹配方式（字符串存储） - - - - 按ID匹配 - - - 按名称匹配 - - - - 产量段关闭原因（字符串存储） - - - - 程序切换 - - - 手动复位 - - - 日终结束 - - - 服务停止 - - - - 值类型枚举（字符串存储） - - - - 字符串 - - - 数字 - - - diff --git a/publish/CncRepository.dll b/publish/CncRepository.dll deleted file mode 100644 index c0cf4e3..0000000 Binary files a/publish/CncRepository.dll and /dev/null differ diff --git a/publish/CncRepository.pdb b/publish/CncRepository.pdb deleted file mode 100644 index e12906f..0000000 Binary files a/publish/CncRepository.pdb and /dev/null differ diff --git a/publish/CncRepository.xml b/publish/CncRepository.xml deleted file mode 100644 index ff27a97..0000000 --- a/publish/CncRepository.xml +++ /dev/null @@ -1,301 +0,0 @@ - - - - CncRepository - - - - - 仓储基类，提供数据库连接管理 - 每个仓储方法应 using(CreateConnection()) 自动释放连接 - - - - - 初始化仓储基类 - - 数据库连接字符串 - - - - 创建新的数据库连接 - 调用方需使用 using 语句确保连接释放 - - - using (var conn = CreateConnection()) - { - return conn.QueryFirstOrDefault<Machine>("SELECT * FROM cnc_machine WHERE id = @Id", new { Id = id }); - } - - - - - 业务库仓储基类（cnc_business） - 所有操作业务库的仓储继承此类 - - - - - 初始化业务库仓储 - - cnc_business 数据库连接字符串 - - - - 日志库仓储基类（cnc_log） - 所有操作日志库的仓储继承此类 - - - - - 初始化日志库仓储 - - cnc_log 数据库连接字符串 - - - Alert SELECT列映射模板（snake_case列名 → PascalCase属性名） - - - - 告警类型计数内部类，用于Dapper映射 - - - - - 品牌字段映射实现 - - - - - 品牌实现 - - - - - 采集地址实现 - - - - 采集地址SELECT列映射模板 - - - - cnc_daily_production 产量仓储实现（业务库） - - - - - 仪表盘跨表统计查询实现 - - - - 汇总卡片数据 - - - 按车间时间区间统计生产量（平均单机产量） - - - 机床排行 - - - 工人排行 - - - 产量趋势（最近 days 天） - - - 机床状态分布（示意性实现，需要根据实际状态表结构调整） - - - 最近告警 - - - - 日志库：log_collector_heartbeat 心跳仓储实现 - - - - 写入心跳 - - - 获取最新心跳 - - - 清理过去的心跳记录（按日期） - - - - 日志库：log_collect_raw 原始采集记录仓储实现 - - - - 通过 Id 获取原始记录 - - - 按地址分页获取原始记录 - - - 获取某地址最新的一条原始采集记录 - - - 写入原始采集记录 - - - 清理过期数据（按日期） - - - - 机床实现 - - - - 机床SELECT列映射模板（snake_case列名 → PascalCase属性名） - - - - - - - 系统配置实现 - - - - - - - - - - - - - - 工人-机床绑定实现 - - - - - 工人实现 - - - - 工人SELECT列映射模板 - - - - 车间仓储实现 - - - - - cnc_alert 告警表 仓储接口 - - - - - 品牌字段映射仓储接口 - - - - - 品牌仓储接口 - - - - - 采集地址仓储接口 - - - - - 日志库：心跳仓储接口 - - - - - 日志库：原始采集记录仓储接口 - - - - - cnc_daily_production 产量仓储接口（业务库） - - - - - 仪表盘统计查询仓储接口（跨表聚合） - - - - - cnc_machine_daily_status 机床日状态表 仓储接口 - - - - - 机床仓储接口 - - - - - cnc_production_adjustment 产量修正审计表 仓储接口 - - - - - cnc_production_segment 产量分段记录表 仓储接口 - - - - - cnc_screen_config 大屏卡片配置表 仓储接口 - - - - - cnc_screen_filter 大屏筛选配置表 仓储接口 - - - - - 系统配置仓储接口 - - - - 按配置Key获取配置 - - - 获取全部配置 - - - 更新配置值 - 配置项ID - 新值 - - - - log_system 系统日志 仓储接口 - - - - - cnc_worker_daily_summary 工人日汇总表 仓储接口 - - - - - 工人-机床绑定仓储接口 - - - - - 工人仓储接口 - - - - - 车间仓储接口 - - - - diff --git a/publish/CncService.dll b/publish/CncService.dll deleted file mode 100644 index 7d6b9ea..0000000 Binary files a/publish/CncService.dll and /dev/null differ diff --git a/publish/CncService.pdb b/publish/CncService.pdb deleted file mode 100644 index f7660b2..0000000 Binary files a/publish/CncService.pdb and /dev/null differ diff --git a/publish/CncService.xml b/publish/CncService.xml deleted file mode 100644 index 7beaa98..0000000 --- a/publish/CncService.xml +++ /dev/null @@ -1,487 +0,0 @@ - - - - CncService - - - - - 业务异常 - Service层抛出此异常，由全局异常过滤器统一捕获并转换为ApiResponse - - - - 业务错误码（非0） - - - - 创建业务异常 - - 错误码，参见 CncModels.Constants.ErrorCode - 错误信息，会返回给前端展示 - - - - 告警管理实现 - - - - - - - - - - - - - - - - - 登录认证实现 - - - - - - - - 品牌模板实现 - - - - - 采集地址实现 - - - - - - - - - - - - - - 采集数据查询实现 - - - - - - - - - - - 仪表盘实现 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 机床管理实现 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 产量管理实现 - - - - - - - - - - - - - - - - - - - - 大屏配置实现 - - - - - - - - - - - - - - - - - - - - - - - - - - 系统日志实现 - - - - - - - - 员工管理实现 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 车间管理实现 - - - - - - - - - - - - - - - - - - - - - - - - - - 登录认证服务接口 - - - - - 管理员登录 - - 登录请求参数 - 登录响应（包含 JWT Token 及有效期） - - - - 品牌模板服务接口 - - - - - 采集地址服务接口 - - - - - 获取采集地址下关联机床列表 - - - - - 获取采集地址近期采集记录 - - - - - 获取最新原始采集JSON - - - - - 采集数据查询服务接口 - - - - 按地址ID分页查询原始采集记录 - - - 获取最新采集记录 - - - - 仪表盘服务接口 - - - - - 机床管理服务接口 - - - - - 分页查询机床列表 - - 查询条件 - 分页结果 - - - - 根据ID获取机床详情 - - 机床ID - 机床详情 - - - - 新增机床 - - 创建参数 - 新建机床的ID - - - - 编辑机床信息 - - 机床ID - 修改参数 - 是否更新成功 - - - - 删除机床并解绑相关工人 - - 机床ID - 是否删除成功 - - - - 启用或禁用机床 - - 机床ID - 是否切换成功 - - - - 获取机床实时采集状态 - - 机床ID - 实时状态信息 - - - - 获取机床今日产量明细 - - 机床ID - 今日产量列表 - - - - 获取机床7天产量趋势 - - 机床ID - 趋势数据列表 - - - - 获取机床近期采集记录 - - 机床ID - 采集记录列表 - - - - 产量管理服务接口 - - - - 分页查询产量记录 - - - 获取日汇总统计 - - - 获取日期范围总产量 - - - 产量修正 - - - - 获取某条产量记录的修正历史 - - - - - 大屏配置服务接口 - - - - 获取大屏汇总数据 - - - 获取所有卡片配置 - - - 更新卡片配置 - - - 获取筛选项列表 - - - 创建筛选项 - - - 更新筛选项 - - - 删除筛选项 - - - - 获取工人绑定机床列表 - - - - - 获取工人今日产量明细 - - - - - 获取工人7天产量趋势 - - - - - 获取可绑定机床列表（未绑定其他工人的） - - - - - 车间管理服务接口 - - - - 获取车间列表 - - - 按ID获取车间 - - - 新增车间 - - - 编辑车间 - - - 删除车间 - - - 启停车间 - - - 获取车间下机床数量 - - - diff --git a/publish/CncWebApi.dll b/publish/CncWebApi.dll deleted file mode 100644 index 04fa0d4..0000000 Binary files a/publish/CncWebApi.dll and /dev/null differ diff --git a/publish/CncWebApi.pdb b/publish/CncWebApi.pdb deleted file mode 100644 index 74e08ed..0000000 Binary files a/publish/CncWebApi.pdb and /dev/null differ diff --git a/publish/CncWebApi.xml b/publish/CncWebApi.xml deleted file mode 100644 index b9ac075..0000000 --- a/publish/CncWebApi.xml +++ /dev/null @@ -1,768 +0,0 @@ - - - - CncWebApi - - - - - Web API 路由和过滤器配置 - 在 Global.asax Application_Start 中调用 - - - - - 注册Web API配置 - - HTTP配置对象 - - - - 告警中心控制器 - - - - - 构造函数 - - - - - 告警列表（分页） - GET /api/admin/alert - - - - - 告警统计 - GET /api/admin/alert/statistics - - - - - 处理单条告警 - PUT /api/admin/alert/{id}/resolve - - - - - 批量处理告警 - POST /api/admin/alert/batch-resolve - - - - - 登录认证控制器 - - - - - 构造函数 - - - - - 管理员登录 - POST /api/admin/login - - - - - 品牌模板控制器 - - - - - 构造函数 - - - - - 品牌列表 - GET /api/admin/brand - - - - - 品牌详情（含字段映射） - GET /api/admin/brand/{id} - - - - - 新增品牌 - POST /api/admin/brand - - - - - 编辑品牌 - PUT /api/admin/brand/{id} - - - - - 删除品牌 - DELETE /api/admin/brand/{id} - - - - - 复制品牌 - POST /api/admin/brand/{id}/copy - - - - - 启停品牌 - PUT /api/admin/brand/{id}/toggle - - - - - 标准字段列表 - GET /api/admin/brand/standard-fields - - - - - 采集地址控制器 - - - - - 构造函数 - - - - - 地址列表（分页） - GET /api/admin/collect-address - - - - - 地址详情 - GET /api/admin/collect-address/{id} - - - - - 新增地址 - POST /api/admin/collect-address - - - - - 编辑地址 - PUT /api/admin/collect-address/{id} - - - - - 删除地址 - DELETE /api/admin/collect-address/{id} - - - - - 启停地址 - PUT /api/admin/collect-address/{id}/toggle - - - - - 地址下关联机床列表 - GET /api/admin/collect-address/{id}/machines - - - - - 地址近期采集记录 - GET /api/admin/collect-address/{id}/collect-records - - - - - 地址最新原始JSON - GET /api/admin/collect-address/{id}/raw-json - - - - - 仪表盘控制器 - - - - - 构造函数 - - - - - 8个统计卡片数据 - GET /api/admin/dashboard/summary - - - - - 车间平均单机产量 - GET /api/admin/dashboard/workshop-production - - - - - 机床产量排行TOP10 - GET /api/admin/dashboard/machine-rank - - - - - 工人产量排行TOP10 - GET /api/admin/dashboard/worker-rank - - - - - 产量趋势（近7天） - GET /api/admin/dashboard/trend - - - - - 机床状态分布 - GET /api/admin/dashboard/machine-status-distribution - - - - - 最新5条告警 - GET /api/admin/dashboard/recent-alerts - - - - - 采集服务状态 - GET /api/admin/collector/status - - - - - 健康检查控制器 - 用于验证API服务是否正常运行 - - - - - 健康检查端点 - GET /api/health - - - - - 操作日志控制器 - - - - - 构造函数 - - - - - 系统运行日志（分页） - GET /api/admin/log/system - - - - - 产量修正日志（分页） - GET /api/admin/log/adjustment - - - - - 导出修正日志（占位，暂返回提示） - GET /api/admin/log/adjustment/export - - - - - 设备管理控制器 - - - - - 构造函数 - - - - - 机床列表（分页） - GET /api/admin/machine - - - - - 机床详情 - GET /api/admin/machine/{id} - - - - - 新增机床 - POST /api/admin/machine - - - - - 编辑机床 - PUT /api/admin/machine/{id} - - - - - 删除机床 - DELETE /api/admin/machine/{id} - - - - - 启停机床 - PUT /api/admin/machine/{id}/toggle - - - - - 机床实时采集状态 - GET /api/admin/machine/{id}/status - - - - - 机床今日产量明细 - GET /api/admin/machine/{id}/production/today - - - - - 机床7天产量趋势 - GET /api/admin/machine/{id}/production/trend - - - - - 机床近期采集记录 - GET /api/admin/machine/{id}/collect-records - - - - - 公共下拉选项控制器 - - - - - 构造函数 - - - - - 车间下拉 - GET /api/admin/workshop/list - - - - - 品牌下拉 - GET /api/admin/brand/list - - - - - 机床下拉 - GET /api/admin/machine/list - - - - - 工人下拉 - GET /api/admin/worker/list - - - - - 采集地址下拉 - GET /api/admin/collect-address/list - - - - - 产量报表控制器 - - - - - 构造函数 - - - - - 日产量列表（分页） - GET /api/admin/production/daily - - - - - 日汇总统计 - GET /api/admin/production/daily-summary - - - - - 修正产量 - POST /api/admin/production/adjust - - - - - 修正历史 - GET /api/admin/production/{recordId}/adjustment-history - - - - - 导出报表（占位，暂返回空结果） - GET /api/admin/production/export - - - - - 大屏配置控制器 - - - - - 构造函数 - - - - - 卡片配置列表 - GET /api/admin/screen-config - - - - - 编辑卡片 - PUT /api/admin/screen-config/{id} - - - - - 删除卡片 - DELETE /api/admin/screen-config/{id} - - - - - 启停卡片 - PUT /api/admin/screen-config/{id}/toggle - - - - - 筛选配置列表 - GET /api/admin/screen-filter - - - - - 新增筛选项 - POST /api/admin/screen-filter - - - - - 编辑筛选项 - PUT /api/admin/screen-filter/{id} - - - - - 删除筛选项 - DELETE /api/admin/screen-filter/{id} - - - - - 大屏看板控制器（无需认证） - - - - - 构造函数 - - - - - 大屏汇总统计 - GET /api/screen/summary - - - - - 采集服务状态 - GET /api/screen/collector-status - - - - - 各车间产量 - GET /api/screen/workshop-production - - - - - 7天产量趋势 - GET /api/screen/production-trend - - - - - 机床产量排行 - GET /api/screen/machine-rank - - - - - 工人产量排行 - GET /api/screen/worker-rank - - - - - 机床状态总览 - GET /api/screen/machine-status - - - - - 大屏筛选条件 - GET /api/screen/filters - - - - - 刷新间隔配置 - GET /api/screen/refresh-interval - - - - - 系统设置控制器 - - - - - 构造函数 - - - - - 配置项列表 - GET /api/admin/sys-config - - - - - 编辑配置项 - PUT /api/admin/sys-config/{id} - - - - - 修改密码 - POST /api/admin/change-password - - - - - 车间列表 - GET /api/admin/workshop - - - - - 新增车间 - POST /api/admin/workshop - - - - - 编辑车间 - PUT /api/admin/workshop/{id} - - - - - 删除车间 - DELETE /api/admin/workshop/{id} - - - - - 启停车间 - PUT /api/admin/workshop/{id}/toggle - - - - - 员工管理控制器 - - - - - 构造函数 - - - - - 工人列表（分页） - GET /api/admin/worker - - - - - 工人详情 - GET /api/admin/worker/{id} - - - - - 新增工人 - POST /api/admin/worker - - - - - 编辑工人 - PUT /api/admin/worker/{id} - - - - - 删除工人 - DELETE /api/admin/worker/{id} - - - - - 启停工人 - PUT /api/admin/worker/{id}/toggle - - - - - 绑定机床 - POST /api/admin/worker/{id}/bind - - - - - 解绑机床 - POST /api/admin/worker/{id}/unbind - - - - - 绑定机床列表 - GET /api/admin/worker/{id}/machines - - - - - 工人今日产量明细 - GET /api/admin/worker/{id}/production/today - - - - - 工人7天产量趋势 - GET /api/admin/worker/{id}/production/trend - - - - - 可绑定机床列表（未绑定其他工人的） - GET /api/admin/worker/available-machines - - - - - 绑定/解绑机床请求 - - - - 机床ID - - - - 全局异常过滤器 - 统一捕获所有未处理异常，转换为标准ApiResponse格式 - Controller层不需要 try-catch，异常会自动被此过滤器捕获 - - - - - 异常发生时自动调用 - - 异常上下文 - - - - Web API 应用程序入口 - IIS 启动时自动调用 Application_Start - - - - - 应用启动时执行，注册路由和全局配置 - - - - - SPA 路由回退：/admin/ 下的非文件请求重写到 index.html - 用于支持前端 Vue Router 的 HTML5 History 模式 - - - - - JWT 认证过滤器 - 验证请求 Header 中的 Bearer Token - 管理 /api/admin/** 接口需要认证，大屏 /api/screen/** 不需要 - - - - - - - - 简单的依赖注入解析器 - 手动注册 Repository 和 Service 的映射关系 - - - - - - - - - - - - - - - - diff --git a/publish/Dapper.dll b/publish/Dapper.dll deleted file mode 100644 index a4d613a..0000000 Binary files a/publish/Dapper.dll and /dev/null differ diff --git a/publish/Global.asax b/publish/Global.asax deleted file mode 100644 index a1a7732..0000000 --- a/publish/Global.asax +++ /dev/null @@ -1 +0,0 @@ -<%@ Application Codebehind="Global.asax.cs" Inherits="CncWebApi.WebApiApplication" Language="C#" %> diff --git a/publish/Microsoft.Bcl.AsyncInterfaces.dll b/publish/Microsoft.Bcl.AsyncInterfaces.dll deleted file mode 100644 index 0c99b0b..0000000 Binary files a/publish/Microsoft.Bcl.AsyncInterfaces.dll and /dev/null differ diff --git a/publish/Microsoft.Extensions.Logging.Abstractions.dll b/publish/Microsoft.Extensions.Logging.Abstractions.dll deleted file mode 100644 index 1b1f204..0000000 Binary files a/publish/Microsoft.Extensions.Logging.Abstractions.dll and /dev/null differ diff --git a/publish/Microsoft.IdentityModel.Abstractions.dll b/publish/Microsoft.IdentityModel.Abstractions.dll deleted file mode 100644 index 4e6451b..0000000 Binary files a/publish/Microsoft.IdentityModel.Abstractions.dll and /dev/null differ diff --git a/publish/Microsoft.IdentityModel.JsonWebTokens.dll b/publish/Microsoft.IdentityModel.JsonWebTokens.dll deleted file mode 100644 index 61d7cd4..0000000 Binary files a/publish/Microsoft.IdentityModel.JsonWebTokens.dll and /dev/null differ diff --git a/publish/Microsoft.IdentityModel.Logging.dll b/publish/Microsoft.IdentityModel.Logging.dll deleted file mode 100644 index dbb70ec..0000000 Binary files a/publish/Microsoft.IdentityModel.Logging.dll and /dev/null differ diff --git a/publish/Microsoft.IdentityModel.Tokens.dll b/publish/Microsoft.IdentityModel.Tokens.dll deleted file mode 100644 index 0619a4a..0000000 Binary files a/publish/Microsoft.IdentityModel.Tokens.dll and /dev/null differ diff --git a/publish/Microsoft.Owin.Host.SystemWeb.dll b/publish/Microsoft.Owin.Host.SystemWeb.dll deleted file mode 100644 index d324867..0000000 Binary files a/publish/Microsoft.Owin.Host.SystemWeb.dll and /dev/null differ diff --git a/publish/Microsoft.Owin.dll b/publish/Microsoft.Owin.dll deleted file mode 100644 index 2d87006..0000000 Binary files a/publish/Microsoft.Owin.dll and /dev/null differ diff --git a/publish/MySqlConnector.dll b/publish/MySqlConnector.dll deleted file mode 100644 index c1ba4e5..0000000 Binary files a/publish/MySqlConnector.dll and /dev/null differ diff --git a/publish/Newtonsoft.Json.Bson.dll b/publish/Newtonsoft.Json.Bson.dll deleted file mode 100644 index 9e3cd73..0000000 Binary files a/publish/Newtonsoft.Json.Bson.dll and /dev/null differ diff --git a/publish/Newtonsoft.Json.dll b/publish/Newtonsoft.Json.dll deleted file mode 100644 index 341d08f..0000000 Binary files a/publish/Newtonsoft.Json.dll and /dev/null differ diff --git a/publish/Owin.dll b/publish/Owin.dll deleted file mode 100644 index ba6e21e..0000000 Binary files a/publish/Owin.dll and /dev/null differ diff --git a/publish/System.Buffers.dll b/publish/System.Buffers.dll deleted file mode 100644 index f2d83c5..0000000 Binary files a/publish/System.Buffers.dll and /dev/null differ diff --git a/publish/System.Diagnostics.DiagnosticSource.dll b/publish/System.Diagnostics.DiagnosticSource.dll deleted file mode 100644 index 1786b54..0000000 Binary files a/publish/System.Diagnostics.DiagnosticSource.dll and /dev/null differ diff --git a/publish/System.IdentityModel.Tokens.Jwt.dll b/publish/System.IdentityModel.Tokens.Jwt.dll deleted file mode 100644 index c997fdb..0000000 Binary files a/publish/System.IdentityModel.Tokens.Jwt.dll and /dev/null differ diff --git a/publish/System.Memory.dll b/publish/System.Memory.dll deleted file mode 100644 index 4617199..0000000 Binary files a/publish/System.Memory.dll and /dev/null differ diff --git a/publish/System.Net.Http.Formatting.dll b/publish/System.Net.Http.Formatting.dll deleted file mode 100644 index f469ce3..0000000 Binary files a/publish/System.Net.Http.Formatting.dll and /dev/null differ diff --git a/publish/System.Numerics.Vectors.dll b/publish/System.Numerics.Vectors.dll deleted file mode 100644 index 0865972..0000000 Binary files a/publish/System.Numerics.Vectors.dll and /dev/null differ diff --git a/publish/System.Runtime.CompilerServices.Unsafe.dll b/publish/System.Runtime.CompilerServices.Unsafe.dll deleted file mode 100644 index c5ba4e4..0000000 Binary files a/publish/System.Runtime.CompilerServices.Unsafe.dll and /dev/null differ diff --git a/publish/System.Text.Encodings.Web.dll b/publish/System.Text.Encodings.Web.dll deleted file mode 100644 index 6d2b207..0000000 Binary files a/publish/System.Text.Encodings.Web.dll and /dev/null differ diff --git a/publish/System.Text.Json.dll b/publish/System.Text.Json.dll deleted file mode 100644 index a3a85c2..0000000 Binary files a/publish/System.Text.Json.dll and /dev/null differ diff --git a/publish/System.Threading.Tasks.Extensions.dll b/publish/System.Threading.Tasks.Extensions.dll deleted file mode 100644 index eeec928..0000000 Binary files a/publish/System.Threading.Tasks.Extensions.dll and /dev/null differ diff --git a/publish/System.ValueTuple.dll b/publish/System.ValueTuple.dll deleted file mode 100644 index 4ce28fd..0000000 Binary files a/publish/System.ValueTuple.dll and /dev/null differ diff --git a/publish/System.Web.Cors.dll b/publish/System.Web.Cors.dll deleted file mode 100644 index 0c91ac6..0000000 Binary files a/publish/System.Web.Cors.dll and /dev/null differ diff --git a/publish/System.Web.Http.Cors.dll b/publish/System.Web.Http.Cors.dll deleted file mode 100644 index c7672bc..0000000 Binary files a/publish/System.Web.Http.Cors.dll and /dev/null differ diff --git a/publish/System.Web.Http.Owin.dll b/publish/System.Web.Http.Owin.dll deleted file mode 100644 index 2a41a60..0000000 Binary files a/publish/System.Web.Http.Owin.dll and /dev/null differ diff --git a/publish/System.Web.Http.WebHost.dll b/publish/System.Web.Http.WebHost.dll deleted file mode 100644 index 7c7f5c1..0000000 Binary files a/publish/System.Web.Http.WebHost.dll and /dev/null differ diff --git a/publish/System.Web.Http.dll b/publish/System.Web.Http.dll deleted file mode 100644 index d04c17b..0000000 Binary files a/publish/System.Web.Http.dll and /dev/null differ diff --git a/publish/Web.config b/publish/Web.config deleted file mode 100644 index 9cebd44..0000000 --- a/publish/Web.config +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/publish/log4net.dll b/publish/log4net.dll deleted file mode 100644 index 8646b6f..0000000 Binary files a/publish/log4net.dll and /dev/null differ diff --git a/src/CncModels/Dto/Dashboard/MachineRankResponse.cs b/src/CncModels/Dto/Dashboard/MachineRankResponse.cs index a979d7a..0e3fda9 100644 --- a/src/CncModels/Dto/Dashboard/MachineRankResponse.cs +++ b/src/CncModels/Dto/Dashboard/MachineRankResponse.cs @@ -7,6 +7,7 @@ namespace CncModels.Dto.Dashboard /// public class MachineRankResponse { + public int MachineId { get; set; } public string MachineName { get; set; } public int Quantity { get; set; } } diff --git a/src/CncRepository/Impl/Dashboard/DashboardRepository.cs b/src/CncRepository/Impl/Dashboard/DashboardRepository.cs index 06e3fa5..9e5da0a 100644 --- a/src/CncRepository/Impl/Dashboard/DashboardRepository.cs +++ b/src/CncRepository/Impl/Dashboard/DashboardRepository.cs @@ -78,7 +78,8 @@ namespace CncRepository.Impl.Dashboard using (var conn = CreateConnection()) { var sql = @" - SELECT m.name AS MachineName, + SELECT m.id AS MachineId, + m.name AS MachineName, COALESCE(SUM(dp.total_quantity),0) AS Quantity FROM cnc_machine m LEFT JOIN cnc_daily_production dp ON dp.machine_id = m.id diff --git a/src/CncWebApi/BCrypt.Net-Next.dll b/src/CncWebApi/BCrypt.Net-Next.dll deleted file mode 100644 index 101a48e..0000000 Binary files a/src/CncWebApi/BCrypt.Net-Next.dll and /dev/null differ diff --git a/src/CncWebApi/CncModels.dll b/src/CncWebApi/CncModels.dll deleted file mode 100644 index 1bf7b98..0000000 Binary files a/src/CncWebApi/CncModels.dll and /dev/null differ diff --git a/src/CncWebApi/CncModels.pdb b/src/CncWebApi/CncModels.pdb deleted file mode 100644 index f006f00..0000000 Binary files a/src/CncWebApi/CncModels.pdb and /dev/null differ diff --git a/src/CncWebApi/CncModels.xml b/src/CncWebApi/CncModels.xml deleted file mode 100644 index e8e40ca..0000000 --- a/src/CncWebApi/CncModels.xml +++ /dev/null @@ -1,1596 +0,0 @@ - - - - CncModels - - - - - 全局错误码 - 编号规则：5位数字，前2位为模块，后3位为具体错误 - - - - 请求参数错误 - - - 未认证（Token缺失或无效） - - - 资源不存在 - - - 数据冲突（唯一性校验失败） - - - 数据已被引用，不允许操作 - - - 服务器内部错误 - - - - 敏感配置键（用于系统配置表中的敏感字段脱敏处理） - - - - API Token - - - 采集器 API Key - - - 管理员密码哈希 - - - - 数据库表名常量 - - - - 车间表 cnc_workshop - - - 品牌表 cnc_brand - - - 品牌字段映射表 cnc_brand_field_mapping - - - 采集地址表 cnc_collect_address - - - 机床表 cnc_machine - - - 工人表 cnc_worker - - - 工人-机床绑定表 cnc_worker_machine - - - 采集结构化记录表 cnc_collect_record - - - 产量分段表 cnc_production_segment - - - 机床日状态 cnc_machine_daily_status - - - 日产量 cnc_daily_production - - - 工人日汇总 cnc_worker_daily_summary - - - 产量调整 cnc_production_adjustment - - - 告警 cnc_alert - - - 系统配置 cnc_sys_config - - - 大屏配置 cnc_screen_config - - - 大屏筛选配置 cnc_screen_filter - - - 日志原始采集表 log_collect_raw - - - 日志系统表 log_system - - - 日志心跳表 log_collector_heartbeat - - - - 告警列表项 - - - - - 告警查询（分页） - - - - - 告警统计结果（未处理告警分类型统计） - - - - 未处理告警总数 - - - 按告警类型统计的未处理数量 - - - - 批量告警处理请求 - - - - - 统一API响应包装类 - 前端约定：code=0 表示成功，非0表示失败 - - 业务数据类型 - - - 错误码，0=成功 - - - 提示信息 - - - 业务数据 - - - - 构建成功响应 - - 业务数据 - 提示信息，默认 "success" - 成功响应 - - - - 构建失败响应 - - 错误码（非0） - 错误信息 - 失败响应 - - - - 品牌详情（含字段映射） - - - - - 品牌字段映射 - - - - - 品牌模板列表项 - - - - - 新增品牌模板请求 - - - - - 标准字段列表 - - - - - 更新品牌模板请求 - - - - - 采集地址详情（扩展字段留待未来扩展） - - - - - 采集地址列表项 - - - - - 采集地址下关联机床项 - - - - 机床名称 - - - 设备编码 - - - 车间名称 - - - 是否在线 - - - 当前NC程序名 - - - - 采集地址查询（分页） - - - - - 采集地址原始JSON响应 - - - - 原始JSON字符串 - - - - 采集地址采集记录项 - - - - 请求时间 - - - 耗时（毫秒） - - - 是否成功 - - - 采集到的机床数 - - - 机床名称（用于原始JSON弹窗标题） - - - - 新增采集地址请求 - - - - - 编辑采集地址请求 - - - - - 通用下拉项 - - - - - 最新告警条目 - - - - - 仪表盘查询参数（日期筛选，不带分页） - - - - 起始日期 - - - 结束日期 - - - - 仪表盘总览数据 - - - - 在线机床数量 - - - 总机床数量 - - - 今日产量（件） - - - 活跃告警数量 - - - 采集成功率（百分比，小数不放大） - - - 今日总工作时长/产线运行时间，单位分钟 - - - 正在运行的机床数量 - - - 数据缺失机床数量 - - - - 机床产量排行项 - - - - - 工人产量排行项 - - - - - 车间生产量统计 - - - - - 登录请求 - - - - 用户名 - - - 密码 - - - 是否记住密码/保持登录 - - - - 登录响应 - - - - JWT Token - - - Token 过期时间（秒） - - - - 调整日志列表项 - - - - - 调整日志查询（分页） - - - - - 系统日志列表项 - - - - - 系统日志查询（分页） - - - - - 新增机床请求 - - - - - 机床采集记录项 - - - - 采集时间 - - - NC程序名 - - - 零件计数 - - - 运行状态 - - - - 机床详情 - - - - - 机床列表项 - - - - - 今日产量与趋势（简化模型） - - - - 今日产量 - - - 趋势数据（JSON 字符串） - - - - 机床查询（分页） - - - - 搜索关键字（名称/编码） - - - 车间ID - - - 是否在线（1在线 0离线） - - - 品牌ID - - - - 实时采集状态 - - - - NC程序名 - - - 零件计数 - - - 运行状态 - - - 操作模式 - - - 主轴设定转速 - - - 进给设定速度 - - - 主轴实际转速 - - - 主轴负载（%） - - - - 机床今日产量明细项 - - - - NC程序名 - - - 产量 - - - 运行时间（分钟） - - - 切削时间（分钟） - - - - 机床产量趋势数据项 - - - - 日期（yyyy-MM-dd） - - - 当日产量 - - - - 编辑机床请求 - - - - - 分页查询参数基类 - 默认值：page=1, pageSize=20 - 约束：pageSize最大100，page最小1 - - - - 页码（从1开始），小于1自动修正为1 - - - 每页条数，范围1-100，超出自动修正 - - - - 计算SQL偏移量（OFFSET） - - - - - 分页结果 - - 数据项类型 - - - 数据列表 - - - 总记录数 - - - 当前页码（从1开始） - - - 每页条数 - - - 总页数 - - - - 产量修正历史记录项 - - - - 修正记录ID - - - 修正前值 - - - 修正后值 - - - 修正原因 - - - 操作人IP - - - 修正时间 - - - - cnc_daily_production 日汇总表列表项 - - - - - 日汇总统计 - - - - - 产量调整历史 - - - - - 调整产量请求 - - - - - 产量查询（分页） - - - - - 新增屏幕配置请求 - - - - - 新增屏幕筛选项请求 - - - - - 卡片配置列表项 - - - - - 筛选项列表项 - - - - - 更新屏幕配置请求 - - - - - 更新屏幕筛选项请求 - - - - - 筛选条件集合（大屏用） - - - - - 机床状态总览 - - - - - 大屏汇总数据（简化模型） - - - - - 修改密码请求 - - - - - 新增车间请求 - - - - - 系统配置项 - - - - - 更新系统配置请求 - - - - - 编辑车间请求 - - - - - 车间列表项 - - - - - 新增工人请求 - - - - - 更新工人请求 - - - - - 可绑定机床项（未绑定其他工人的机床） - - - - 机床ID - - - 机床名称 - - - 设备编码 - - - - 工人详情 - - - - - 工人列表项 - - - - - 工人绑定机床项 - - - - 机床ID - - - 机床名称 - - - 设备编码 - - - 车间名称 - - - 品牌名称 - - - 是否在线 - - - 当前NC程序名 - - - - 工人查询（分页） - - - - - 工人今日产量明细项 - - - - 机床名称 - - - NC程序名 - - - 产量 - - - 运行时间（分钟） - - - 切削时间（分钟） - - - - 工人产量趋势数据项 - - - - 日期（yyyy-MM-dd） - - - 当日产量 - - - - cnc_alert 告警表 - - - - 主键ID - - - 告警类型 - - - 机床ID - - - 采集地址ID - - - 标题 - - - 详情 - - - 是否已解决 - - - 解决时间 - - - 创建时间 - - - - cnc_brand CNC品牌模板表 - - - - 主键ID - - - 品牌名称 - - - 设备字段名 - - - 标签路径 - - - 是否启用 - - - 创建时间 - - - 修改时间 - - - - cnc_brand_field_mapping 品牌字段映射表 - - - - 主键ID - - - 品牌ID - - - 标准字段 - - - 字段名 - - - 匹配规则 - - - 数据类型 - - - 是否必填 - - - 创建时间 - - - - cnc_collect_address 采集地址表 - - - - 主键ID - - - 名称 - - - 地址URL - - - 品牌ID - - - 采集间隔（秒/单位未约定以整型表示） - - - 是否启用 - - - 最近采集时间 - - - 最近采集状态 - - - 失败次数 - - - 创建时间 - - - 修改时间 - - - - log_collector_heartbeat 采集服务心跳表 - - - - 主键ID - - - 服务ID - - - 状态 - - - 采集地址ID - - - 最近采集时间 - - - 成功次数 - - - 失败次数 - - - 运行时长（秒） - - - 详情（JSON 字符串） - - - 创建时间 - - - - log_collect_raw 原始采集JSON表 - - - - 主键ID - - - 采集地址ID - - - 请求时间 - - - 响应时间 - - - 响应时长 - - - 是否成功 - - - 状态码 - - - 原始JSON - - - 错误信息 - - - 创建时间 - - - - cnc_collect_record 采集结构化记录表 - - - - 主键ID - - - 机床ID - - - 采集时间 - - - 设备时间 - - - NC程序名 - - - 零件计数 - - - 设备状态 - - - 运行状态 - - - 操作模式 - - - 主轴设定速度 - - - 进给设定速度 - - - 主轴实际速度 - - - 进给实际速度 - - - 主轴负载 - - - 主轴倍率 - - - 开机时间 - - - 运行时间 - - - 切削时间 - - - 循环时间 - - - 加工状态 - - - 扩展数据（JSON 字符串） - - - 创建时间 - - - - cnc_daily_production 日汇总表 - - - - 主键ID - - - 机床ID - - - 生产日期 - - - 程序名 - - - 总产量 - - - 工人ID（用于产量按工人汇总的场景） - - - 段数 - - - 总运行时间 - - - 总切削时间 - - - 总循环时间 - - - 是否已调整 - - - 调整后的数量 - - - 创建时间 - - - 修改时间 - - - - cnc_machine 机床表 - - - - 主键ID - - - 设备编码 - - - 名称 - - - 车间ID - - - 采集地址ID - - - IP地址 - - - 品牌ID - - - 是否启用 - - - 是否在线 - - - 最近Ping时间 - - - 最近采集时间 - - - 最近设备状态 - - - 最近运行状态 - - - 最近程序名 - - - 最近零件数 - - - 最近操作模式 - - - 最近加工状态 - - - 创建时间 - - - 修改时间 - - - - cnc_machine_daily_status 机床日状态表 - - - - 主键ID - - - 机床ID - - - 生产日期 - - - 数据状态 - - - 创建时间 - - - 修改时间 - - - - cnc_production_adjustment 产量修正审计表 - - - - 主键ID - - - 目标表 - - - 目标ID - - - 字段名 - - - 旧值 - - - 新值 - - - 原因 - - - 操作IP - - - 创建时间 - - - - cnc_production_segment 产量分段记录表 - - - - 主键ID - - - 机床ID - - - 程序名 - - - 生产日期 - - - 开始时间 - - - 结束时间 - - - 起始零件数 - - - 结束零件数 - - - 产量 - - - 是否已结算 - - - 结束原因 - - - 创建时间 - - - 修改时间 - - - - cnc_screen_config 大屏卡片配置表 - - - - 主键ID - - - 卡片键 - - - 卡片类型 - - - 标题 - - - 指标 - - - 维度 - - - 排序 - - - 是否启用 - - - 图表配置（JSON 字符串） - - - 创建时间 - - - 修改时间 - - - - cnc_screen_filter 大屏筛选配置表 - - - - 主键ID - - - 屏幕Key - - - 筛选类型 - - - 筛选值 - - - 是否为默认 - - - 排序 - - - - cnc_sys_config 系统配置表 - - - - 主键ID - - - 配置键 - - - 配置值 - - - 值类型 - - - 描述 - - - 最后修改时间 - - - - log_system 系统日志表 - - - - 主键ID - - - 日志等级 - - - 来源 - - - 消息 - - - 堆栈信息 - - - 扩展数据（JSON 字符串） - - - 创建时间 - - - - cnc_worker 工人表 - - - - 主键ID - - - 姓名 - - - 工号 - - - 是否启用 - - - 创建时间 - - - 修改时间 - - - - cnc_worker_daily_summary 工人日汇总表 - - - - 主键ID - - - 工人ID - - - 生产日期 - - - 总产量 - - - 机床数量 - - - 程序数量 - - - 是否已调整 - - - 调整后的数量 - - - 创建时间 - - - 修改时间 - - - - cnc_worker_machine 工人-机床绑定表 - - - - 主键ID - - - 工人ID - - - 机床ID - - - 创建时间 - - - - cnc_workshop 车间表 - - - - 主键ID - - - 车间名称 - - - 排序序号 - - - 是否启用 - - - 创建时间 - - - 修改时间 - - - - 告警类型常量集合（数据库以字符串存储） - - - - 采集失败 - - - 设备离线 - - - 产量异常 - - - 未知设备 - - - 服务错误 - - - - 大屏卡片类型常量（存储为字符串） - - - - 统计数字 - - - 柱状图 - - - 折线图 - - - 饼图 - - - 状态网格 - - - 排名列表 - - - - 采集服务状态（字符串存储） - - - - 运行中 - - - 已停止 - - - 错误 - - - - 采集结果状态常量 - - - - 成功 - - - 失败 - - - 超时 - - - - 数据状态枚举（字符串存储版本） - - - - 正常 - - - 离线 - - - 数据缺失 - - - - 数据类型枚举（字符串存储版本） - - - - 字符串 - - - 数字 - - - - 日志等级常量（字符串表示） - - - - 调试 - - - 信息 - - - 警告 - - - 错误 - - - - 字段匹配方式（字符串存储） - - - - 按ID匹配 - - - 按名称匹配 - - - - 产量段关闭原因（字符串存储） - - - - 程序切换 - - - 手动复位 - - - 日终结束 - - - 服务停止 - - - - 值类型枚举（字符串存储） - - - - 字符串 - - - 数字 - - - diff --git a/src/CncWebApi/CncRepository.dll b/src/CncWebApi/CncRepository.dll deleted file mode 100644 index c0cf4e3..0000000 Binary files a/src/CncWebApi/CncRepository.dll and /dev/null differ diff --git a/src/CncWebApi/CncRepository.pdb b/src/CncWebApi/CncRepository.pdb deleted file mode 100644 index e12906f..0000000 Binary files a/src/CncWebApi/CncRepository.pdb and /dev/null differ diff --git a/src/CncWebApi/CncRepository.xml b/src/CncWebApi/CncRepository.xml deleted file mode 100644 index ff27a97..0000000 --- a/src/CncWebApi/CncRepository.xml +++ /dev/null @@ -1,301 +0,0 @@ - - - - CncRepository - - - - - 仓储基类，提供数据库连接管理 - 每个仓储方法应 using(CreateConnection()) 自动释放连接 - - - - - 初始化仓储基类 - - 数据库连接字符串 - - - - 创建新的数据库连接 - 调用方需使用 using 语句确保连接释放 - - - using (var conn = CreateConnection()) - { - return conn.QueryFirstOrDefault<Machine>("SELECT * FROM cnc_machine WHERE id = @Id", new { Id = id }); - } - - - - - 业务库仓储基类（cnc_business） - 所有操作业务库的仓储继承此类 - - - - - 初始化业务库仓储 - - cnc_business 数据库连接字符串 - - - - 日志库仓储基类（cnc_log） - 所有操作日志库的仓储继承此类 - - - - - 初始化日志库仓储 - - cnc_log 数据库连接字符串 - - - Alert SELECT列映射模板（snake_case列名 → PascalCase属性名） - - - - 告警类型计数内部类，用于Dapper映射 - - - - - 品牌字段映射实现 - - - - - 品牌实现 - - - - - 采集地址实现 - - - - 采集地址SELECT列映射模板 - - - - cnc_daily_production 产量仓储实现（业务库） - - - - - 仪表盘跨表统计查询实现 - - - - 汇总卡片数据 - - - 按车间时间区间统计生产量（平均单机产量） - - - 机床排行 - - - 工人排行 - - - 产量趋势（最近 days 天） - - - 机床状态分布（示意性实现，需要根据实际状态表结构调整） - - - 最近告警 - - - - 日志库：log_collector_heartbeat 心跳仓储实现 - - - - 写入心跳 - - - 获取最新心跳 - - - 清理过去的心跳记录（按日期） - - - - 日志库：log_collect_raw 原始采集记录仓储实现 - - - - 通过 Id 获取原始记录 - - - 按地址分页获取原始记录 - - - 获取某地址最新的一条原始采集记录 - - - 写入原始采集记录 - - - 清理过期数据（按日期） - - - - 机床实现 - - - - 机床SELECT列映射模板（snake_case列名 → PascalCase属性名） - - - - - - - 系统配置实现 - - - - - - - - - - - - - - 工人-机床绑定实现 - - - - - 工人实现 - - - - 工人SELECT列映射模板 - - - - 车间仓储实现 - - - - - cnc_alert 告警表 仓储接口 - - - - - 品牌字段映射仓储接口 - - - - - 品牌仓储接口 - - - - - 采集地址仓储接口 - - - - - 日志库：心跳仓储接口 - - - - - 日志库：原始采集记录仓储接口 - - - - - cnc_daily_production 产量仓储接口（业务库） - - - - - 仪表盘统计查询仓储接口（跨表聚合） - - - - - cnc_machine_daily_status 机床日状态表 仓储接口 - - - - - 机床仓储接口 - - - - - cnc_production_adjustment 产量修正审计表 仓储接口 - - - - - cnc_production_segment 产量分段记录表 仓储接口 - - - - - cnc_screen_config 大屏卡片配置表 仓储接口 - - - - - cnc_screen_filter 大屏筛选配置表 仓储接口 - - - - - 系统配置仓储接口 - - - - 按配置Key获取配置 - - - 获取全部配置 - - - 更新配置值 - 配置项ID - 新值 - - - - log_system 系统日志 仓储接口 - - - - - cnc_worker_daily_summary 工人日汇总表 仓储接口 - - - - - 工人-机床绑定仓储接口 - - - - - 工人仓储接口 - - - - - 车间仓储接口 - - - - diff --git a/src/CncWebApi/CncService.dll b/src/CncWebApi/CncService.dll deleted file mode 100644 index 7d6b9ea..0000000 Binary files a/src/CncWebApi/CncService.dll and /dev/null differ diff --git a/src/CncWebApi/CncService.pdb b/src/CncWebApi/CncService.pdb deleted file mode 100644 index f7660b2..0000000 Binary files a/src/CncWebApi/CncService.pdb and /dev/null differ diff --git a/src/CncWebApi/CncService.xml b/src/CncWebApi/CncService.xml deleted file mode 100644 index 7beaa98..0000000 --- a/src/CncWebApi/CncService.xml +++ /dev/null @@ -1,487 +0,0 @@ - - - - CncService - - - - - 业务异常 - Service层抛出此异常，由全局异常过滤器统一捕获并转换为ApiResponse - - - - 业务错误码（非0） - - - - 创建业务异常 - - 错误码，参见 CncModels.Constants.ErrorCode - 错误信息，会返回给前端展示 - - - - 告警管理实现 - - - - - - - - - - - - - - - - - 登录认证实现 - - - - - - - - 品牌模板实现 - - - - - 采集地址实现 - - - - - - - - - - - - - - 采集数据查询实现 - - - - - - - - - - - 仪表盘实现 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 机床管理实现 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 产量管理实现 - - - - - - - - - - - - - - - - - - - - 大屏配置实现 - - - - - - - - - - - - - - - - - - - - - - - - - - 系统日志实现 - - - - - - - - 员工管理实现 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 车间管理实现 - - - - - - - - - - - - - - - - - - - - - - - - - - 登录认证服务接口 - - - - - 管理员登录 - - 登录请求参数 - 登录响应（包含 JWT Token 及有效期） - - - - 品牌模板服务接口 - - - - - 采集地址服务接口 - - - - - 获取采集地址下关联机床列表 - - - - - 获取采集地址近期采集记录 - - - - - 获取最新原始采集JSON - - - - - 采集数据查询服务接口 - - - - 按地址ID分页查询原始采集记录 - - - 获取最新采集记录 - - - - 仪表盘服务接口 - - - - - 机床管理服务接口 - - - - - 分页查询机床列表 - - 查询条件 - 分页结果 - - - - 根据ID获取机床详情 - - 机床ID - 机床详情 - - - - 新增机床 - - 创建参数 - 新建机床的ID - - - - 编辑机床信息 - - 机床ID - 修改参数 - 是否更新成功 - - - - 删除机床并解绑相关工人 - - 机床ID - 是否删除成功 - - - - 启用或禁用机床 - - 机床ID - 是否切换成功 - - - - 获取机床实时采集状态 - - 机床ID - 实时状态信息 - - - - 获取机床今日产量明细 - - 机床ID - 今日产量列表 - - - - 获取机床7天产量趋势 - - 机床ID - 趋势数据列表 - - - - 获取机床近期采集记录 - - 机床ID - 采集记录列表 - - - - 产量管理服务接口 - - - - 分页查询产量记录 - - - 获取日汇总统计 - - - 获取日期范围总产量 - - - 产量修正 - - - - 获取某条产量记录的修正历史 - - - - - 大屏配置服务接口 - - - - 获取大屏汇总数据 - - - 获取所有卡片配置 - - - 更新卡片配置 - - - 获取筛选项列表 - - - 创建筛选项 - - - 更新筛选项 - - - 删除筛选项 - - - - 获取工人绑定机床列表 - - - - - 获取工人今日产量明细 - - - - - 获取工人7天产量趋势 - - - - - 获取可绑定机床列表（未绑定其他工人的） - - - - - 车间管理服务接口 - - - - 获取车间列表 - - - 按ID获取车间 - - - 新增车间 - - - 编辑车间 - - - 删除车间 - - - 启停车间 - - - 获取车间下机床数量 - - - diff --git a/src/CncWebApi/CncWebApi.dll b/src/CncWebApi/CncWebApi.dll deleted file mode 100644 index 04fa0d4..0000000 Binary files a/src/CncWebApi/CncWebApi.dll and /dev/null differ diff --git a/src/CncWebApi/CncWebApi.pdb b/src/CncWebApi/CncWebApi.pdb deleted file mode 100644 index 74e08ed..0000000 Binary files a/src/CncWebApi/CncWebApi.pdb and /dev/null differ diff --git a/src/CncWebApi/CncWebApi.xml b/src/CncWebApi/CncWebApi.xml deleted file mode 100644 index b9ac075..0000000 --- a/src/CncWebApi/CncWebApi.xml +++ /dev/null @@ -1,768 +0,0 @@ - - - - CncWebApi - - - - - Web API 路由和过滤器配置 - 在 Global.asax Application_Start 中调用 - - - - - 注册Web API配置 - - HTTP配置对象 - - - - 告警中心控制器 - - - - - 构造函数 - - - - - 告警列表（分页） - GET /api/admin/alert - - - - - 告警统计 - GET /api/admin/alert/statistics - - - - - 处理单条告警 - PUT /api/admin/alert/{id}/resolve - - - - - 批量处理告警 - POST /api/admin/alert/batch-resolve - - - - - 登录认证控制器 - - - - - 构造函数 - - - - - 管理员登录 - POST /api/admin/login - - - - - 品牌模板控制器 - - - - - 构造函数 - - - - - 品牌列表 - GET /api/admin/brand - - - - - 品牌详情（含字段映射） - GET /api/admin/brand/{id} - - - - - 新增品牌 - POST /api/admin/brand - - - - - 编辑品牌 - PUT /api/admin/brand/{id} - - - - - 删除品牌 - DELETE /api/admin/brand/{id} - - - - - 复制品牌 - POST /api/admin/brand/{id}/copy - - - - - 启停品牌 - PUT /api/admin/brand/{id}/toggle - - - - - 标准字段列表 - GET /api/admin/brand/standard-fields - - - - - 采集地址控制器 - - - - - 构造函数 - - - - - 地址列表（分页） - GET /api/admin/collect-address - - - - - 地址详情 - GET /api/admin/collect-address/{id} - - - - - 新增地址 - POST /api/admin/collect-address - - - - - 编辑地址 - PUT /api/admin/collect-address/{id} - - - - - 删除地址 - DELETE /api/admin/collect-address/{id} - - - - - 启停地址 - PUT /api/admin/collect-address/{id}/toggle - - - - - 地址下关联机床列表 - GET /api/admin/collect-address/{id}/machines - - - - - 地址近期采集记录 - GET /api/admin/collect-address/{id}/collect-records - - - - - 地址最新原始JSON - GET /api/admin/collect-address/{id}/raw-json - - - - - 仪表盘控制器 - - - - - 构造函数 - - - - - 8个统计卡片数据 - GET /api/admin/dashboard/summary - - - - - 车间平均单机产量 - GET /api/admin/dashboard/workshop-production - - - - - 机床产量排行TOP10 - GET /api/admin/dashboard/machine-rank - - - - - 工人产量排行TOP10 - GET /api/admin/dashboard/worker-rank - - - - - 产量趋势（近7天） - GET /api/admin/dashboard/trend - - - - - 机床状态分布 - GET /api/admin/dashboard/machine-status-distribution - - - - - 最新5条告警 - GET /api/admin/dashboard/recent-alerts - - - - - 采集服务状态 - GET /api/admin/collector/status - - - - - 健康检查控制器 - 用于验证API服务是否正常运行 - - - - - 健康检查端点 - GET /api/health - - - - - 操作日志控制器 - - - - - 构造函数 - - - - - 系统运行日志（分页） - GET /api/admin/log/system - - - - - 产量修正日志（分页） - GET /api/admin/log/adjustment - - - - - 导出修正日志（占位，暂返回提示） - GET /api/admin/log/adjustment/export - - - - - 设备管理控制器 - - - - - 构造函数 - - - - - 机床列表（分页） - GET /api/admin/machine - - - - - 机床详情 - GET /api/admin/machine/{id} - - - - - 新增机床 - POST /api/admin/machine - - - - - 编辑机床 - PUT /api/admin/machine/{id} - - - - - 删除机床 - DELETE /api/admin/machine/{id} - - - - - 启停机床 - PUT /api/admin/machine/{id}/toggle - - - - - 机床实时采集状态 - GET /api/admin/machine/{id}/status - - - - - 机床今日产量明细 - GET /api/admin/machine/{id}/production/today - - - - - 机床7天产量趋势 - GET /api/admin/machine/{id}/production/trend - - - - - 机床近期采集记录 - GET /api/admin/machine/{id}/collect-records - - - - - 公共下拉选项控制器 - - - - - 构造函数 - - - - - 车间下拉 - GET /api/admin/workshop/list - - - - - 品牌下拉 - GET /api/admin/brand/list - - - - - 机床下拉 - GET /api/admin/machine/list - - - - - 工人下拉 - GET /api/admin/worker/list - - - - - 采集地址下拉 - GET /api/admin/collect-address/list - - - - - 产量报表控制器 - - - - - 构造函数 - - - - - 日产量列表（分页） - GET /api/admin/production/daily - - - - - 日汇总统计 - GET /api/admin/production/daily-summary - - - - - 修正产量 - POST /api/admin/production/adjust - - - - - 修正历史 - GET /api/admin/production/{recordId}/adjustment-history - - - - - 导出报表（占位，暂返回空结果） - GET /api/admin/production/export - - - - - 大屏配置控制器 - - - - - 构造函数 - - - - - 卡片配置列表 - GET /api/admin/screen-config - - - - - 编辑卡片 - PUT /api/admin/screen-config/{id} - - - - - 删除卡片 - DELETE /api/admin/screen-config/{id} - - - - - 启停卡片 - PUT /api/admin/screen-config/{id}/toggle - - - - - 筛选配置列表 - GET /api/admin/screen-filter - - - - - 新增筛选项 - POST /api/admin/screen-filter - - - - - 编辑筛选项 - PUT /api/admin/screen-filter/{id} - - - - - 删除筛选项 - DELETE /api/admin/screen-filter/{id} - - - - - 大屏看板控制器（无需认证） - - - - - 构造函数 - - - - - 大屏汇总统计 - GET /api/screen/summary - - - - - 采集服务状态 - GET /api/screen/collector-status - - - - - 各车间产量 - GET /api/screen/workshop-production - - - - - 7天产量趋势 - GET /api/screen/production-trend - - - - - 机床产量排行 - GET /api/screen/machine-rank - - - - - 工人产量排行 - GET /api/screen/worker-rank - - - - - 机床状态总览 - GET /api/screen/machine-status - - - - - 大屏筛选条件 - GET /api/screen/filters - - - - - 刷新间隔配置 - GET /api/screen/refresh-interval - - - - - 系统设置控制器 - - - - - 构造函数 - - - - - 配置项列表 - GET /api/admin/sys-config - - - - - 编辑配置项 - PUT /api/admin/sys-config/{id} - - - - - 修改密码 - POST /api/admin/change-password - - - - - 车间列表 - GET /api/admin/workshop - - - - - 新增车间 - POST /api/admin/workshop - - - - - 编辑车间 - PUT /api/admin/workshop/{id} - - - - - 删除车间 - DELETE /api/admin/workshop/{id} - - - - - 启停车间 - PUT /api/admin/workshop/{id}/toggle - - - - - 员工管理控制器 - - - - - 构造函数 - - - - - 工人列表（分页） - GET /api/admin/worker - - - - - 工人详情 - GET /api/admin/worker/{id} - - - - - 新增工人 - POST /api/admin/worker - - - - - 编辑工人 - PUT /api/admin/worker/{id} - - - - - 删除工人 - DELETE /api/admin/worker/{id} - - - - - 启停工人 - PUT /api/admin/worker/{id}/toggle - - - - - 绑定机床 - POST /api/admin/worker/{id}/bind - - - - - 解绑机床 - POST /api/admin/worker/{id}/unbind - - - - - 绑定机床列表 - GET /api/admin/worker/{id}/machines - - - - - 工人今日产量明细 - GET /api/admin/worker/{id}/production/today - - - - - 工人7天产量趋势 - GET /api/admin/worker/{id}/production/trend - - - - - 可绑定机床列表（未绑定其他工人的） - GET /api/admin/worker/available-machines - - - - - 绑定/解绑机床请求 - - - - 机床ID - - - - 全局异常过滤器 - 统一捕获所有未处理异常，转换为标准ApiResponse格式 - Controller层不需要 try-catch，异常会自动被此过滤器捕获 - - - - - 异常发生时自动调用 - - 异常上下文 - - - - Web API 应用程序入口 - IIS 启动时自动调用 Application_Start - - - - - 应用启动时执行，注册路由和全局配置 - - - - - SPA 路由回退：/admin/ 下的非文件请求重写到 index.html - 用于支持前端 Vue Router 的 HTML5 History 模式 - - - - - JWT 认证过滤器 - 验证请求 Header 中的 Bearer Token - 管理 /api/admin/** 接口需要认证，大屏 /api/screen/** 不需要 - - - - - - - - 简单的依赖注入解析器 - 手动注册 Repository 和 Service 的映射关系 - - - - - - - - - - - - - - - - diff --git a/src/CncWebApi/Dapper.dll b/src/CncWebApi/Dapper.dll deleted file mode 100644 index a4d613a..0000000 Binary files a/src/CncWebApi/Dapper.dll and /dev/null differ diff --git a/src/CncWebApi/Microsoft.Bcl.AsyncInterfaces.dll b/src/CncWebApi/Microsoft.Bcl.AsyncInterfaces.dll deleted file mode 100644 index 0c99b0b..0000000 Binary files a/src/CncWebApi/Microsoft.Bcl.AsyncInterfaces.dll and /dev/null differ diff --git a/src/CncWebApi/Microsoft.Extensions.Logging.Abstractions.dll b/src/CncWebApi/Microsoft.Extensions.Logging.Abstractions.dll deleted file mode 100644 index 1b1f204..0000000 Binary files a/src/CncWebApi/Microsoft.Extensions.Logging.Abstractions.dll and /dev/null differ diff --git a/src/CncWebApi/Microsoft.IdentityModel.Abstractions.dll b/src/CncWebApi/Microsoft.IdentityModel.Abstractions.dll deleted file mode 100644 index 4e6451b..0000000 Binary files a/src/CncWebApi/Microsoft.IdentityModel.Abstractions.dll and /dev/null differ diff --git a/src/CncWebApi/Microsoft.IdentityModel.JsonWebTokens.dll b/src/CncWebApi/Microsoft.IdentityModel.JsonWebTokens.dll deleted file mode 100644 index 61d7cd4..0000000 Binary files a/src/CncWebApi/Microsoft.IdentityModel.JsonWebTokens.dll and /dev/null differ diff --git a/src/CncWebApi/Microsoft.IdentityModel.Logging.dll b/src/CncWebApi/Microsoft.IdentityModel.Logging.dll deleted file mode 100644 index dbb70ec..0000000 Binary files a/src/CncWebApi/Microsoft.IdentityModel.Logging.dll and /dev/null differ diff --git a/src/CncWebApi/Microsoft.IdentityModel.Tokens.dll b/src/CncWebApi/Microsoft.IdentityModel.Tokens.dll deleted file mode 100644 index 0619a4a..0000000 Binary files a/src/CncWebApi/Microsoft.IdentityModel.Tokens.dll and /dev/null differ diff --git a/src/CncWebApi/Microsoft.Owin.Host.SystemWeb.dll b/src/CncWebApi/Microsoft.Owin.Host.SystemWeb.dll deleted file mode 100644 index d324867..0000000 Binary files a/src/CncWebApi/Microsoft.Owin.Host.SystemWeb.dll and /dev/null differ diff --git a/src/CncWebApi/Microsoft.Owin.dll b/src/CncWebApi/Microsoft.Owin.dll deleted file mode 100644 index 2d87006..0000000 Binary files a/src/CncWebApi/Microsoft.Owin.dll and /dev/null differ diff --git a/src/CncWebApi/MySqlConnector.dll b/src/CncWebApi/MySqlConnector.dll deleted file mode 100644 index c1ba4e5..0000000 Binary files a/src/CncWebApi/MySqlConnector.dll and /dev/null differ diff --git a/src/CncWebApi/Newtonsoft.Json.Bson.dll b/src/CncWebApi/Newtonsoft.Json.Bson.dll deleted file mode 100644 index 9e3cd73..0000000 Binary files a/src/CncWebApi/Newtonsoft.Json.Bson.dll and /dev/null differ diff --git a/src/CncWebApi/Newtonsoft.Json.dll b/src/CncWebApi/Newtonsoft.Json.dll deleted file mode 100644 index 341d08f..0000000 Binary files a/src/CncWebApi/Newtonsoft.Json.dll and /dev/null differ diff --git a/src/CncWebApi/Owin.dll b/src/CncWebApi/Owin.dll deleted file mode 100644 index ba6e21e..0000000 Binary files a/src/CncWebApi/Owin.dll and /dev/null differ diff --git a/src/CncWebApi/System.Buffers.dll b/src/CncWebApi/System.Buffers.dll deleted file mode 100644 index f2d83c5..0000000 Binary files a/src/CncWebApi/System.Buffers.dll and /dev/null differ diff --git a/src/CncWebApi/System.Diagnostics.DiagnosticSource.dll b/src/CncWebApi/System.Diagnostics.DiagnosticSource.dll deleted file mode 100644 index 1786b54..0000000 Binary files a/src/CncWebApi/System.Diagnostics.DiagnosticSource.dll and /dev/null differ diff --git a/src/CncWebApi/System.IdentityModel.Tokens.Jwt.dll b/src/CncWebApi/System.IdentityModel.Tokens.Jwt.dll deleted file mode 100644 index c997fdb..0000000 Binary files a/src/CncWebApi/System.IdentityModel.Tokens.Jwt.dll and /dev/null differ diff --git a/src/CncWebApi/System.Memory.dll b/src/CncWebApi/System.Memory.dll deleted file mode 100644 index 4617199..0000000 Binary files a/src/CncWebApi/System.Memory.dll and /dev/null differ diff --git a/src/CncWebApi/System.Net.Http.Formatting.dll b/src/CncWebApi/System.Net.Http.Formatting.dll deleted file mode 100644 index f469ce3..0000000 Binary files a/src/CncWebApi/System.Net.Http.Formatting.dll and /dev/null differ diff --git a/src/CncWebApi/System.Numerics.Vectors.dll b/src/CncWebApi/System.Numerics.Vectors.dll deleted file mode 100644 index 0865972..0000000 Binary files a/src/CncWebApi/System.Numerics.Vectors.dll and /dev/null differ diff --git a/src/CncWebApi/System.Runtime.CompilerServices.Unsafe.dll b/src/CncWebApi/System.Runtime.CompilerServices.Unsafe.dll deleted file mode 100644 index c5ba4e4..0000000 Binary files a/src/CncWebApi/System.Runtime.CompilerServices.Unsafe.dll and /dev/null differ diff --git a/src/CncWebApi/System.Text.Encodings.Web.dll b/src/CncWebApi/System.Text.Encodings.Web.dll deleted file mode 100644 index 6d2b207..0000000 Binary files a/src/CncWebApi/System.Text.Encodings.Web.dll and /dev/null differ diff --git a/src/CncWebApi/System.Text.Json.dll b/src/CncWebApi/System.Text.Json.dll deleted file mode 100644 index a3a85c2..0000000 Binary files a/src/CncWebApi/System.Text.Json.dll and /dev/null differ diff --git a/src/CncWebApi/System.Threading.Tasks.Extensions.dll b/src/CncWebApi/System.Threading.Tasks.Extensions.dll deleted file mode 100644 index eeec928..0000000 Binary files a/src/CncWebApi/System.Threading.Tasks.Extensions.dll and /dev/null differ diff --git a/src/CncWebApi/System.ValueTuple.dll b/src/CncWebApi/System.ValueTuple.dll deleted file mode 100644 index 4ce28fd..0000000 Binary files a/src/CncWebApi/System.ValueTuple.dll and /dev/null differ diff --git a/src/CncWebApi/System.Web.Cors.dll b/src/CncWebApi/System.Web.Cors.dll deleted file mode 100644 index 0c91ac6..0000000 Binary files a/src/CncWebApi/System.Web.Cors.dll and /dev/null differ diff --git a/src/CncWebApi/System.Web.Http.Cors.dll b/src/CncWebApi/System.Web.Http.Cors.dll deleted file mode 100644 index c7672bc..0000000 Binary files a/src/CncWebApi/System.Web.Http.Cors.dll and /dev/null differ diff --git a/src/CncWebApi/System.Web.Http.Owin.dll b/src/CncWebApi/System.Web.Http.Owin.dll deleted file mode 100644 index 2a41a60..0000000 Binary files a/src/CncWebApi/System.Web.Http.Owin.dll and /dev/null differ diff --git a/src/CncWebApi/System.Web.Http.WebHost.dll b/src/CncWebApi/System.Web.Http.WebHost.dll deleted file mode 100644 index 7c7f5c1..0000000 Binary files a/src/CncWebApi/System.Web.Http.WebHost.dll and /dev/null differ diff --git a/src/CncWebApi/System.Web.Http.dll b/src/CncWebApi/System.Web.Http.dll deleted file mode 100644 index d04c17b..0000000 Binary files a/src/CncWebApi/System.Web.Http.dll and /dev/null differ diff --git a/src/CncWebApi/log4net.dll b/src/CncWebApi/log4net.dll deleted file mode 100644 index 8646b6f..0000000 Binary files a/src/CncWebApi/log4net.dll and /dev/null differ diff --git a/tools/GenHash/GenHash.csproj b/tools/GenHash/GenHash.csproj deleted file mode 100644 index 2d3aff0..0000000 --- a/tools/GenHash/GenHash.csproj +++ /dev/null @@ -1,10 +0,0 @@ - - - Exe - net472 - - - - - - diff --git a/tools/GenHash/Program.cs b/tools/GenHash/Program.cs deleted file mode 100644 index e453d35..0000000 --- a/tools/GenHash/Program.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using BCrypt.Net; - -/// -/// 临时工具：验证并生成 BCrypt 密码哈希 -/// -class Program -{ - static void Main() - { - var password = "admin123"; - var existingHash = "$2a$10$N9qo8uLOickgx2ZMRZoMyeIjZAgcfl7p92ldGxad68LJZdL17lhWy"; - - Console.WriteLine("=== BCrypt 验证测试 ==="); - Console.WriteLine($"密码: {password}"); - Console.WriteLine($"现有Hash: {existingHash}"); - Console.WriteLine($"Hash长度: {existingHash.Length}"); - - try - { - var result = BCrypt.Net.BCrypt.Verify(password, existingHash); - Console.WriteLine($"验证结果: {result}"); - } - catch (Exception ex) - { - Console.WriteLine($"验证异常: {ex.GetType().Name} - {ex.Message}"); - } - - // 生成新 hash - var newHash = BCrypt.Net.BCrypt.HashPassword(password, 10); - Console.WriteLine($"\n新生成的Hash: {newHash}"); - Console.WriteLine($"新Hash长度: {newHash.Length}"); - - // 验证新 hash - var verifyNew = BCrypt.Net.BCrypt.Verify(password, newHash); - Console.WriteLine($"新Hash验证: {verifyNew}"); - } -} diff --git a/tools/GenHash/bin/Debug/net472/BCrypt.Net-Next.dll b/tools/GenHash/bin/Debug/net472/BCrypt.Net-Next.dll deleted file mode 100644 index 101a48e..0000000 Binary files a/tools/GenHash/bin/Debug/net472/BCrypt.Net-Next.dll and /dev/null differ diff --git a/tools/GenHash/bin/Debug/net472/GenHash.exe b/tools/GenHash/bin/Debug/net472/GenHash.exe deleted file mode 100644 index d9ca337..0000000 Binary files a/tools/GenHash/bin/Debug/net472/GenHash.exe and /dev/null differ diff --git a/tools/GenHash/bin/Debug/net472/GenHash.exe.config b/tools/GenHash/bin/Debug/net472/GenHash.exe.config deleted file mode 100644 index 8f60dcb..0000000 --- a/tools/GenHash/bin/Debug/net472/GenHash.exe.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/tools/GenHash/bin/Debug/net472/GenHash.pdb b/tools/GenHash/bin/Debug/net472/GenHash.pdb deleted file mode 100644 index fd04587..0000000 Binary files a/tools/GenHash/bin/Debug/net472/GenHash.pdb and /dev/null differ diff --git a/tools/GenHash/bin/Debug/net472/System.Buffers.dll b/tools/GenHash/bin/Debug/net472/System.Buffers.dll deleted file mode 100644 index f2d83c5..0000000 Binary files a/tools/GenHash/bin/Debug/net472/System.Buffers.dll and /dev/null differ diff --git a/tools/GenHash/bin/Debug/net472/System.Memory.dll b/tools/GenHash/bin/Debug/net472/System.Memory.dll deleted file mode 100644 index 5d19470..0000000 Binary files a/tools/GenHash/bin/Debug/net472/System.Memory.dll and /dev/null differ diff --git a/tools/GenHash/bin/Debug/net472/System.Numerics.Vectors.dll b/tools/GenHash/bin/Debug/net472/System.Numerics.Vectors.dll deleted file mode 100644 index 0865972..0000000 Binary files a/tools/GenHash/bin/Debug/net472/System.Numerics.Vectors.dll and /dev/null differ diff --git a/tools/GenHash/bin/Debug/net472/System.Runtime.CompilerServices.Unsafe.dll b/tools/GenHash/bin/Debug/net472/System.Runtime.CompilerServices.Unsafe.dll deleted file mode 100644 index de9e124..0000000 Binary files a/tools/GenHash/bin/Debug/net472/System.Runtime.CompilerServices.Unsafe.dll and /dev/null differ diff --git a/tools/GenHash/obj/Debug/net472/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs b/tools/GenHash/obj/Debug/net472/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs deleted file mode 100644 index 3871b18..0000000 --- a/tools/GenHash/obj/Debug/net472/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs +++ /dev/null @@ -1,4 +0,0 @@ -// -using System; -using System.Reflection; -[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.7.2", FrameworkDisplayName = ".NET Framework 4.7.2")] diff --git a/tools/GenHash/obj/Debug/net472/GenHash.AssemblyInfo.cs b/tools/GenHash/obj/Debug/net472/GenHash.AssemblyInfo.cs deleted file mode 100644 index e23b6db..0000000 --- a/tools/GenHash/obj/Debug/net472/GenHash.AssemblyInfo.cs +++ /dev/null @@ -1,22 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -using System; -using System.Reflection; - -[assembly: System.Reflection.AssemblyCompanyAttribute("GenHash")] -[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] -[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+126154fc7b204a9d7e479fd6838032e6586218cb")] -[assembly: System.Reflection.AssemblyProductAttribute("GenHash")] -[assembly: System.Reflection.AssemblyTitleAttribute("GenHash")] -[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] - -// 由 MSBuild WriteCodeFragment 类生成。 - diff --git a/tools/GenHash/obj/Debug/net472/GenHash.AssemblyInfoInputs.cache b/tools/GenHash/obj/Debug/net472/GenHash.AssemblyInfoInputs.cache deleted file mode 100644 index 2f51fb6..0000000 --- a/tools/GenHash/obj/Debug/net472/GenHash.AssemblyInfoInputs.cache +++ /dev/null @@ -1 +0,0 @@ -22f577992b89c047865f8b0d1537059d5535ea9f3c4de2459a9851257537d551 diff --git a/tools/GenHash/obj/Debug/net472/GenHash.GeneratedMSBuildEditorConfig.editorconfig b/tools/GenHash/obj/Debug/net472/GenHash.GeneratedMSBuildEditorConfig.editorconfig deleted file mode 100644 index 442df8c..0000000 --- a/tools/GenHash/obj/Debug/net472/GenHash.GeneratedMSBuildEditorConfig.editorconfig +++ /dev/null @@ -1,5 +0,0 @@ -is_global = true -build_property.RootNamespace = GenHash -build_property.ProjectDir = E:\opencode\haoliang\tools\GenHash\ -build_property.EnableComHosting = -build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/tools/GenHash/obj/Debug/net472/GenHash.assets.cache b/tools/GenHash/obj/Debug/net472/GenHash.assets.cache deleted file mode 100644 index 5233cf0..0000000 Binary files a/tools/GenHash/obj/Debug/net472/GenHash.assets.cache and /dev/null differ diff --git a/tools/GenHash/obj/Debug/net472/GenHash.csproj.AssemblyReference.cache b/tools/GenHash/obj/Debug/net472/GenHash.csproj.AssemblyReference.cache deleted file mode 100644 index d0bedff..0000000 Binary files a/tools/GenHash/obj/Debug/net472/GenHash.csproj.AssemblyReference.cache and /dev/null differ diff --git a/tools/GenHash/obj/Debug/net472/GenHash.csproj.CoreCompileInputs.cache b/tools/GenHash/obj/Debug/net472/GenHash.csproj.CoreCompileInputs.cache deleted file mode 100644 index cdba8ef..0000000 --- a/tools/GenHash/obj/Debug/net472/GenHash.csproj.CoreCompileInputs.cache +++ /dev/null @@ -1 +0,0 @@ -746fca54574b2e8c52ec70b90a8ed1a2e4981e9054539b3531f555fbb2776184 diff --git a/tools/GenHash/obj/Debug/net472/GenHash.csproj.FileListAbsolute.txt b/tools/GenHash/obj/Debug/net472/GenHash.csproj.FileListAbsolute.txt deleted file mode 100644 index 15d660b..0000000 --- a/tools/GenHash/obj/Debug/net472/GenHash.csproj.FileListAbsolute.txt +++ /dev/null @@ -1,16 +0,0 @@ -E:\opencode\haoliang\tools\GenHash\bin\Debug\net472\GenHash.exe.config -E:\opencode\haoliang\tools\GenHash\bin\Debug\net472\GenHash.exe -E:\opencode\haoliang\tools\GenHash\bin\Debug\net472\GenHash.pdb -E:\opencode\haoliang\tools\GenHash\bin\Debug\net472\BCrypt.Net-Next.dll -E:\opencode\haoliang\tools\GenHash\bin\Debug\net472\System.Buffers.dll -E:\opencode\haoliang\tools\GenHash\bin\Debug\net472\System.Memory.dll -E:\opencode\haoliang\tools\GenHash\bin\Debug\net472\System.Numerics.Vectors.dll -E:\opencode\haoliang\tools\GenHash\bin\Debug\net472\System.Runtime.CompilerServices.Unsafe.dll -E:\opencode\haoliang\tools\GenHash\obj\Debug\net472\GenHash.csproj.AssemblyReference.cache -E:\opencode\haoliang\tools\GenHash\obj\Debug\net472\GenHash.GeneratedMSBuildEditorConfig.editorconfig -E:\opencode\haoliang\tools\GenHash\obj\Debug\net472\GenHash.AssemblyInfoInputs.cache -E:\opencode\haoliang\tools\GenHash\obj\Debug\net472\GenHash.AssemblyInfo.cs -E:\opencode\haoliang\tools\GenHash\obj\Debug\net472\GenHash.csproj.CoreCompileInputs.cache -E:\opencode\haoliang\tools\GenHash\obj\Debug\net472\GenHash.csproj.Up2Date -E:\opencode\haoliang\tools\GenHash\obj\Debug\net472\GenHash.exe -E:\opencode\haoliang\tools\GenHash\obj\Debug\net472\GenHash.pdb diff --git a/tools/GenHash/obj/Debug/net472/GenHash.csproj.Up2Date b/tools/GenHash/obj/Debug/net472/GenHash.csproj.Up2Date deleted file mode 100644 index e69de29..0000000 diff --git a/tools/GenHash/obj/Debug/net472/GenHash.exe b/tools/GenHash/obj/Debug/net472/GenHash.exe deleted file mode 100644 index d9ca337..0000000 Binary files a/tools/GenHash/obj/Debug/net472/GenHash.exe and /dev/null differ diff --git a/tools/GenHash/obj/Debug/net472/GenHash.exe.withSupportedRuntime.config b/tools/GenHash/obj/Debug/net472/GenHash.exe.withSupportedRuntime.config deleted file mode 100644 index 8f60dcb..0000000 --- a/tools/GenHash/obj/Debug/net472/GenHash.exe.withSupportedRuntime.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/tools/GenHash/obj/Debug/net472/GenHash.pdb b/tools/GenHash/obj/Debug/net472/GenHash.pdb deleted file mode 100644 index fd04587..0000000 Binary files a/tools/GenHash/obj/Debug/net472/GenHash.pdb and /dev/null differ diff --git a/tools/GenHash/obj/GenHash.csproj.nuget.dgspec.json b/tools/GenHash/obj/GenHash.csproj.nuget.dgspec.json deleted file mode 100644 index eecd693..0000000 --- a/tools/GenHash/obj/GenHash.csproj.nuget.dgspec.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - "format": 1, - "restore": { - "E:\\opencode\\haoliang\\tools\\GenHash\\GenHash.csproj": {} - }, - "projects": { - "E:\\opencode\\haoliang\\tools\\GenHash\\GenHash.csproj": { - "version": "1.0.0", - "restore": { - "projectUniqueName": "E:\\opencode\\haoliang\\tools\\GenHash\\GenHash.csproj", - "projectName": "GenHash", - "projectPath": "E:\\opencode\\haoliang\\tools\\GenHash\\GenHash.csproj", - "packagesPath": "C:\\Users\\jiang\\.nuget\\packages\\", - "outputPath": "E:\\opencode\\haoliang\\tools\\GenHash\\obj\\", - "projectStyle": "PackageReference", - "configFilePaths": [ - "C:\\Users\\jiang\\AppData\\Roaming\\NuGet\\NuGet.Config" - ], - "originalTargetFrameworks": [ - "net472" - ], - "sources": { - "https://api.nuget.org/v3/index.json": {} - }, - "frameworks": { - "net472": { - "targetAlias": "net472", - "projectReferences": {} - } - }, - "warningProperties": { - "warnAsError": [ - "NU1605" - ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" - } - }, - "frameworks": { - "net472": { - "targetAlias": "net472", - "dependencies": { - "BCrypt.Net-Next": { - "target": "Package", - "version": "[4.0.3, )" - }, - "Microsoft.NETFramework.ReferenceAssemblies": { - "suppressParent": "All", - "target": "Package", - "version": "[1.0.3, )", - "autoReferenced": true - }, - "Microsoft.NETFramework.ReferenceAssemblies.net472": { - "suppressParent": "All", - "target": "Package", - "version": "[1.0.3, )" - } - }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.420\\RuntimeIdentifierGraph.json" - } - }, - "runtimes": { - "win7-x86": { - "#import": [] - } - } - } - } -} \ No newline at end of file diff --git a/tools/GenHash/obj/GenHash.csproj.nuget.g.props b/tools/GenHash/obj/GenHash.csproj.nuget.g.props deleted file mode 100644 index 2ca1412..0000000 --- a/tools/GenHash/obj/GenHash.csproj.nuget.g.props +++ /dev/null @@ -1,15 +0,0 @@ - - - - True - NuGet - $(MSBuildThisFileDirectory)project.assets.json - $(UserProfile)\.nuget\packages\ - C:\Users\jiang\.nuget\packages\ - PackageReference - 6.11.2 - - - - - \ No newline at end of file diff --git a/tools/GenHash/obj/GenHash.csproj.nuget.g.targets b/tools/GenHash/obj/GenHash.csproj.nuget.g.targets deleted file mode 100644 index c7f69cc..0000000 --- a/tools/GenHash/obj/GenHash.csproj.nuget.g.targets +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/tools/GenHash/obj/project.assets.json b/tools/GenHash/obj/project.assets.json deleted file mode 100644 index de92db8..0000000 --- a/tools/GenHash/obj/project.assets.json +++ /dev/null @@ -1,841 +0,0 @@ -{ - "version": 3, - "targets": { - ".NETFramework,Version=v4.7.2": { - "BCrypt.Net-Next/4.0.3": { - "type": "package", - "dependencies": { - "System.Memory": "4.5.4" - }, - "frameworkAssemblies": [ - "System" - ], - "compile": { - "lib/net472/BCrypt.Net-Next.dll": { - "related": ".xml" - } - }, - "runtime": { - "lib/net472/BCrypt.Net-Next.dll": { - "related": ".xml" - } - } - }, - "Microsoft.NETFramework.ReferenceAssemblies/1.0.3": { - "type": "package", - "dependencies": { - "Microsoft.NETFramework.ReferenceAssemblies.net472": "1.0.3" - } - }, - "Microsoft.NETFramework.ReferenceAssemblies.net472/1.0.3": { - "type": "package", - "build": { - "build/Microsoft.NETFramework.ReferenceAssemblies.net472.targets": {} - } - }, - "System.Buffers/4.5.1": { - "type": "package", - "frameworkAssemblies": [ - "mscorlib" - ], - "compile": { - "ref/net45/System.Buffers.dll": { - "related": ".xml" - } - }, - "runtime": { - "lib/net461/System.Buffers.dll": { - "related": ".xml" - } - } - }, - "System.Memory/4.5.4": { - "type": "package", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.5.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" - }, - "frameworkAssemblies": [ - "System", - "mscorlib" - ], - "compile": { - "lib/net461/System.Memory.dll": { - "related": ".xml" - } - }, - "runtime": { - "lib/net461/System.Memory.dll": { - "related": ".xml" - } - } - }, - "System.Numerics.Vectors/4.5.0": { - "type": "package", - "frameworkAssemblies": [ - "System.Numerics", - "mscorlib" - ], - "compile": { - "ref/net46/System.Numerics.Vectors.dll": { - "related": ".xml" - } - }, - "runtime": { - "lib/net46/System.Numerics.Vectors.dll": { - "related": ".xml" - } - } - }, - "System.Runtime.CompilerServices.Unsafe/4.5.3": { - "type": "package", - "frameworkAssemblies": [ - "mscorlib" - ], - "compile": { - "ref/net461/System.Runtime.CompilerServices.Unsafe.dll": { - "related": ".xml" - } - }, - "runtime": { - "lib/net461/System.Runtime.CompilerServices.Unsafe.dll": { - "related": ".xml" - } - } - } - }, - ".NETFramework,Version=v4.7.2/win7-x86": { - "BCrypt.Net-Next/4.0.3": { - "type": "package", - "dependencies": { - "System.Memory": "4.5.4" - }, - "frameworkAssemblies": [ - "System" - ], - "compile": { - "lib/net472/BCrypt.Net-Next.dll": { - "related": ".xml" - } - }, - "runtime": { - "lib/net472/BCrypt.Net-Next.dll": { - "related": ".xml" - } - } - }, - "Microsoft.NETFramework.ReferenceAssemblies/1.0.3": { - "type": "package", - "dependencies": { - "Microsoft.NETFramework.ReferenceAssemblies.net472": "1.0.3" - } - }, - "Microsoft.NETFramework.ReferenceAssemblies.net472/1.0.3": { - "type": "package", - "build": { - "build/Microsoft.NETFramework.ReferenceAssemblies.net472.targets": {} - } - }, - "System.Buffers/4.5.1": { - "type": "package", - "frameworkAssemblies": [ - "mscorlib" - ], - "compile": { - "ref/net45/System.Buffers.dll": { - "related": ".xml" - } - }, - "runtime": { - "lib/net461/System.Buffers.dll": { - "related": ".xml" - } - } - }, - "System.Memory/4.5.4": { - "type": "package", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.5.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" - }, - "frameworkAssemblies": [ - "System", - "mscorlib" - ], - "compile": { - "lib/net461/System.Memory.dll": { - "related": ".xml" - } - }, - "runtime": { - "lib/net461/System.Memory.dll": { - "related": ".xml" - } - } - }, - "System.Numerics.Vectors/4.5.0": { - "type": "package", - "frameworkAssemblies": [ - "System.Numerics", - "mscorlib" - ], - "compile": { - "ref/net46/System.Numerics.Vectors.dll": { - "related": ".xml" - } - }, - "runtime": { - "lib/net46/System.Numerics.Vectors.dll": { - "related": ".xml" - } - } - }, - "System.Runtime.CompilerServices.Unsafe/4.5.3": { - "type": "package", - "frameworkAssemblies": [ - "mscorlib" - ], - "compile": { - "ref/net461/System.Runtime.CompilerServices.Unsafe.dll": { - "related": ".xml" - } - }, - "runtime": { - "lib/net461/System.Runtime.CompilerServices.Unsafe.dll": { - "related": ".xml" - } - } - } - } - }, - "libraries": { - "BCrypt.Net-Next/4.0.3": { - "sha512": "W+U9WvmZQgi5cX6FS5GDtDoPzUCV4LkBLkywq/kRZhuDwcbavOzcDAr3LXJFqHUi952Yj3LEYoWW0jbEUQChsA==", - "type": "package", - "path": "bcrypt.net-next/4.0.3", - "files": [ - ".nupkg.metadata", - ".signature.p7s", - "bcrypt.net-next.4.0.3.nupkg.sha512", - "bcrypt.net-next.nuspec", - "ico.png", - "lib/net20/BCrypt.Net-Next.dll", - "lib/net20/BCrypt.Net-Next.xml", - "lib/net35/BCrypt.Net-Next.dll", - "lib/net35/BCrypt.Net-Next.xml", - "lib/net462/BCrypt.Net-Next.dll", - "lib/net462/BCrypt.Net-Next.xml", - "lib/net472/BCrypt.Net-Next.dll", - "lib/net472/BCrypt.Net-Next.xml", - "lib/net48/BCrypt.Net-Next.dll", - "lib/net48/BCrypt.Net-Next.xml", - "lib/net5.0/BCrypt.Net-Next.dll", - "lib/net5.0/BCrypt.Net-Next.xml", - "lib/net6.0/BCrypt.Net-Next.dll", - "lib/net6.0/BCrypt.Net-Next.xml", - "lib/netstandard2.0/BCrypt.Net-Next.dll", - "lib/netstandard2.0/BCrypt.Net-Next.xml", - "lib/netstandard2.1/BCrypt.Net-Next.dll", - "lib/netstandard2.1/BCrypt.Net-Next.xml", - "readme.md" - ] - }, - "Microsoft.NETFramework.ReferenceAssemblies/1.0.3": { - "sha512": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", - "type": "package", - "path": "microsoft.netframework.referenceassemblies/1.0.3", - "files": [ - ".nupkg.metadata", - ".signature.p7s", - "microsoft.netframework.referenceassemblies.1.0.3.nupkg.sha512", - "microsoft.netframework.referenceassemblies.nuspec" - ] - }, - "Microsoft.NETFramework.ReferenceAssemblies.net472/1.0.3": { - "sha512": "0E7evZXHXaDYYiLRfpyXvCh+yzM2rNTyuZDI+ZO7UUqSc6GfjePiXTdqJGtgIKUwdI81tzQKmaWprnUiPj9hAw==", - "type": "package", - "path": "microsoft.netframework.referenceassemblies.net472/1.0.3", - "files": [ - ".nupkg.metadata", - ".signature.p7s", - "build/.NETFramework/v4.7.2/Accessibility.dll", - "build/.NETFramework/v4.7.2/Accessibility.xml", - "build/.NETFramework/v4.7.2/CustomMarshalers.dll", - "build/.NETFramework/v4.7.2/CustomMarshalers.xml", - "build/.NETFramework/v4.7.2/Facades/Microsoft.Win32.Primitives.dll", - "build/.NETFramework/v4.7.2/Facades/System.AppContext.dll", - "build/.NETFramework/v4.7.2/Facades/System.Collections.Concurrent.dll", - "build/.NETFramework/v4.7.2/Facades/System.Collections.NonGeneric.dll", - "build/.NETFramework/v4.7.2/Facades/System.Collections.Specialized.dll", - "build/.NETFramework/v4.7.2/Facades/System.Collections.dll", - "build/.NETFramework/v4.7.2/Facades/System.ComponentModel.Annotations.dll", - "build/.NETFramework/v4.7.2/Facades/System.ComponentModel.EventBasedAsync.dll", - "build/.NETFramework/v4.7.2/Facades/System.ComponentModel.Primitives.dll", - "build/.NETFramework/v4.7.2/Facades/System.ComponentModel.TypeConverter.dll", - "build/.NETFramework/v4.7.2/Facades/System.ComponentModel.dll", - "build/.NETFramework/v4.7.2/Facades/System.Console.dll", - "build/.NETFramework/v4.7.2/Facades/System.Data.Common.dll", - "build/.NETFramework/v4.7.2/Facades/System.Diagnostics.Contracts.dll", - "build/.NETFramework/v4.7.2/Facades/System.Diagnostics.Debug.dll", - "build/.NETFramework/v4.7.2/Facades/System.Diagnostics.FileVersionInfo.dll", - "build/.NETFramework/v4.7.2/Facades/System.Diagnostics.Process.dll", - "build/.NETFramework/v4.7.2/Facades/System.Diagnostics.StackTrace.dll", - "build/.NETFramework/v4.7.2/Facades/System.Diagnostics.TextWriterTraceListener.dll", - "build/.NETFramework/v4.7.2/Facades/System.Diagnostics.Tools.dll", - "build/.NETFramework/v4.7.2/Facades/System.Diagnostics.TraceSource.dll", - "build/.NETFramework/v4.7.2/Facades/System.Drawing.Primitives.dll", - "build/.NETFramework/v4.7.2/Facades/System.Dynamic.Runtime.dll", - "build/.NETFramework/v4.7.2/Facades/System.Globalization.Calendars.dll", - "build/.NETFramework/v4.7.2/Facades/System.Globalization.Extensions.dll", - "build/.NETFramework/v4.7.2/Facades/System.Globalization.dll", - "build/.NETFramework/v4.7.2/Facades/System.IO.Compression.ZipFile.dll", - "build/.NETFramework/v4.7.2/Facades/System.IO.FileSystem.DriveInfo.dll", - "build/.NETFramework/v4.7.2/Facades/System.IO.FileSystem.Primitives.dll", - "build/.NETFramework/v4.7.2/Facades/System.IO.FileSystem.Watcher.dll", - "build/.NETFramework/v4.7.2/Facades/System.IO.FileSystem.dll", - "build/.NETFramework/v4.7.2/Facades/System.IO.IsolatedStorage.dll", - "build/.NETFramework/v4.7.2/Facades/System.IO.MemoryMappedFiles.dll", - "build/.NETFramework/v4.7.2/Facades/System.IO.Pipes.dll", - "build/.NETFramework/v4.7.2/Facades/System.IO.UnmanagedMemoryStream.dll", - "build/.NETFramework/v4.7.2/Facades/System.IO.dll", - "build/.NETFramework/v4.7.2/Facades/System.Linq.Expressions.dll", - "build/.NETFramework/v4.7.2/Facades/System.Linq.Parallel.dll", - "build/.NETFramework/v4.7.2/Facades/System.Linq.Queryable.dll", - "build/.NETFramework/v4.7.2/Facades/System.Linq.dll", - "build/.NETFramework/v4.7.2/Facades/System.Net.Http.Rtc.dll", - "build/.NETFramework/v4.7.2/Facades/System.Net.NameResolution.dll", - "build/.NETFramework/v4.7.2/Facades/System.Net.NetworkInformation.dll", - "build/.NETFramework/v4.7.2/Facades/System.Net.Ping.dll", - "build/.NETFramework/v4.7.2/Facades/System.Net.Primitives.dll", - "build/.NETFramework/v4.7.2/Facades/System.Net.Requests.dll", - "build/.NETFramework/v4.7.2/Facades/System.Net.Security.dll", - "build/.NETFramework/v4.7.2/Facades/System.Net.Sockets.dll", - "build/.NETFramework/v4.7.2/Facades/System.Net.WebHeaderCollection.dll", - "build/.NETFramework/v4.7.2/Facades/System.Net.WebSockets.Client.dll", - "build/.NETFramework/v4.7.2/Facades/System.Net.WebSockets.dll", - "build/.NETFramework/v4.7.2/Facades/System.ObjectModel.dll", - "build/.NETFramework/v4.7.2/Facades/System.Reflection.Emit.ILGeneration.dll", - "build/.NETFramework/v4.7.2/Facades/System.Reflection.Emit.Lightweight.dll", - "build/.NETFramework/v4.7.2/Facades/System.Reflection.Emit.dll", - "build/.NETFramework/v4.7.2/Facades/System.Reflection.Extensions.dll", - "build/.NETFramework/v4.7.2/Facades/System.Reflection.Primitives.dll", - "build/.NETFramework/v4.7.2/Facades/System.Reflection.dll", - "build/.NETFramework/v4.7.2/Facades/System.Resources.Reader.dll", - "build/.NETFramework/v4.7.2/Facades/System.Resources.ResourceManager.dll", - "build/.NETFramework/v4.7.2/Facades/System.Resources.Writer.dll", - "build/.NETFramework/v4.7.2/Facades/System.Runtime.CompilerServices.VisualC.dll", - "build/.NETFramework/v4.7.2/Facades/System.Runtime.Extensions.dll", - "build/.NETFramework/v4.7.2/Facades/System.Runtime.Handles.dll", - "build/.NETFramework/v4.7.2/Facades/System.Runtime.InteropServices.RuntimeInformation.dll", - "build/.NETFramework/v4.7.2/Facades/System.Runtime.InteropServices.WindowsRuntime.dll", - "build/.NETFramework/v4.7.2/Facades/System.Runtime.InteropServices.dll", - "build/.NETFramework/v4.7.2/Facades/System.Runtime.Numerics.dll", - "build/.NETFramework/v4.7.2/Facades/System.Runtime.Serialization.Formatters.dll", - "build/.NETFramework/v4.7.2/Facades/System.Runtime.Serialization.Json.dll", - "build/.NETFramework/v4.7.2/Facades/System.Runtime.Serialization.Primitives.dll", - "build/.NETFramework/v4.7.2/Facades/System.Runtime.Serialization.Xml.dll", - "build/.NETFramework/v4.7.2/Facades/System.Runtime.dll", - "build/.NETFramework/v4.7.2/Facades/System.Security.Claims.dll", - "build/.NETFramework/v4.7.2/Facades/System.Security.Cryptography.Algorithms.dll", - "build/.NETFramework/v4.7.2/Facades/System.Security.Cryptography.Csp.dll", - "build/.NETFramework/v4.7.2/Facades/System.Security.Cryptography.Encoding.dll", - "build/.NETFramework/v4.7.2/Facades/System.Security.Cryptography.Primitives.dll", - "build/.NETFramework/v4.7.2/Facades/System.Security.Cryptography.X509Certificates.dll", - "build/.NETFramework/v4.7.2/Facades/System.Security.Principal.dll", - "build/.NETFramework/v4.7.2/Facades/System.Security.SecureString.dll", - "build/.NETFramework/v4.7.2/Facades/System.ServiceModel.Duplex.dll", - "build/.NETFramework/v4.7.2/Facades/System.ServiceModel.Http.dll", - "build/.NETFramework/v4.7.2/Facades/System.ServiceModel.NetTcp.dll", - "build/.NETFramework/v4.7.2/Facades/System.ServiceModel.Primitives.dll", - "build/.NETFramework/v4.7.2/Facades/System.ServiceModel.Security.dll", - "build/.NETFramework/v4.7.2/Facades/System.Text.Encoding.Extensions.dll", - "build/.NETFramework/v4.7.2/Facades/System.Text.Encoding.dll", - "build/.NETFramework/v4.7.2/Facades/System.Text.RegularExpressions.dll", - "build/.NETFramework/v4.7.2/Facades/System.Threading.Overlapped.dll", - "build/.NETFramework/v4.7.2/Facades/System.Threading.Tasks.Parallel.dll", - "build/.NETFramework/v4.7.2/Facades/System.Threading.Tasks.dll", - "build/.NETFramework/v4.7.2/Facades/System.Threading.Thread.dll", - "build/.NETFramework/v4.7.2/Facades/System.Threading.ThreadPool.dll", - "build/.NETFramework/v4.7.2/Facades/System.Threading.Timer.dll", - "build/.NETFramework/v4.7.2/Facades/System.Threading.dll", - "build/.NETFramework/v4.7.2/Facades/System.ValueTuple.dll", - "build/.NETFramework/v4.7.2/Facades/System.Xml.ReaderWriter.dll", - "build/.NETFramework/v4.7.2/Facades/System.Xml.XDocument.dll", - "build/.NETFramework/v4.7.2/Facades/System.Xml.XPath.XDocument.dll", - "build/.NETFramework/v4.7.2/Facades/System.Xml.XPath.dll", - "build/.NETFramework/v4.7.2/Facades/System.Xml.XmlDocument.dll", - "build/.NETFramework/v4.7.2/Facades/System.Xml.XmlSerializer.dll", - "build/.NETFramework/v4.7.2/Facades/netstandard.dll", - "build/.NETFramework/v4.7.2/ISymWrapper.dll", - "build/.NETFramework/v4.7.2/ISymWrapper.xml", - "build/.NETFramework/v4.7.2/Microsoft.Activities.Build.dll", - "build/.NETFramework/v4.7.2/Microsoft.Activities.Build.xml", - "build/.NETFramework/v4.7.2/Microsoft.Build.Conversion.v4.0.dll", - "build/.NETFramework/v4.7.2/Microsoft.Build.Conversion.v4.0.xml", - "build/.NETFramework/v4.7.2/Microsoft.Build.Engine.dll", - "build/.NETFramework/v4.7.2/Microsoft.Build.Engine.xml", - "build/.NETFramework/v4.7.2/Microsoft.Build.Framework.dll", - "build/.NETFramework/v4.7.2/Microsoft.Build.Framework.xml", - "build/.NETFramework/v4.7.2/Microsoft.Build.Tasks.v4.0.dll", - "build/.NETFramework/v4.7.2/Microsoft.Build.Tasks.v4.0.xml", - "build/.NETFramework/v4.7.2/Microsoft.Build.Utilities.v4.0.dll", - "build/.NETFramework/v4.7.2/Microsoft.Build.Utilities.v4.0.xml", - "build/.NETFramework/v4.7.2/Microsoft.Build.dll", - "build/.NETFramework/v4.7.2/Microsoft.Build.xml", - "build/.NETFramework/v4.7.2/Microsoft.CSharp.dll", - "build/.NETFramework/v4.7.2/Microsoft.CSharp.xml", - "build/.NETFramework/v4.7.2/Microsoft.JScript.dll", - "build/.NETFramework/v4.7.2/Microsoft.JScript.xml", - "build/.NETFramework/v4.7.2/Microsoft.VisualBasic.Compatibility.Data.dll", - "build/.NETFramework/v4.7.2/Microsoft.VisualBasic.Compatibility.Data.xml", - "build/.NETFramework/v4.7.2/Microsoft.VisualBasic.Compatibility.dll", - "build/.NETFramework/v4.7.2/Microsoft.VisualBasic.Compatibility.xml", - "build/.NETFramework/v4.7.2/Microsoft.VisualBasic.dll", - "build/.NETFramework/v4.7.2/Microsoft.VisualBasic.xml", - "build/.NETFramework/v4.7.2/Microsoft.VisualC.STLCLR.dll", - "build/.NETFramework/v4.7.2/Microsoft.VisualC.STLCLR.xml", - "build/.NETFramework/v4.7.2/Microsoft.VisualC.dll", - "build/.NETFramework/v4.7.2/Microsoft.VisualC.xml", - "build/.NETFramework/v4.7.2/PermissionSets/FullTrust.xml", - "build/.NETFramework/v4.7.2/PermissionSets/Internet.xml", - "build/.NETFramework/v4.7.2/PermissionSets/LocalIntranet.xml", - "build/.NETFramework/v4.7.2/PresentationBuildTasks.dll", - "build/.NETFramework/v4.7.2/PresentationBuildTasks.xml", - "build/.NETFramework/v4.7.2/PresentationCore.dll", - "build/.NETFramework/v4.7.2/PresentationCore.xml", - "build/.NETFramework/v4.7.2/PresentationFramework.Aero.dll", - "build/.NETFramework/v4.7.2/PresentationFramework.Aero.xml", - "build/.NETFramework/v4.7.2/PresentationFramework.Aero2.dll", - "build/.NETFramework/v4.7.2/PresentationFramework.Aero2.xml", - "build/.NETFramework/v4.7.2/PresentationFramework.AeroLite.dll", - "build/.NETFramework/v4.7.2/PresentationFramework.AeroLite.xml", - "build/.NETFramework/v4.7.2/PresentationFramework.Classic.dll", - "build/.NETFramework/v4.7.2/PresentationFramework.Classic.xml", - "build/.NETFramework/v4.7.2/PresentationFramework.Luna.dll", - "build/.NETFramework/v4.7.2/PresentationFramework.Luna.xml", - "build/.NETFramework/v4.7.2/PresentationFramework.Royale.dll", - "build/.NETFramework/v4.7.2/PresentationFramework.Royale.xml", - "build/.NETFramework/v4.7.2/PresentationFramework.dll", - "build/.NETFramework/v4.7.2/PresentationFramework.xml", - "build/.NETFramework/v4.7.2/ReachFramework.dll", - "build/.NETFramework/v4.7.2/ReachFramework.xml", - "build/.NETFramework/v4.7.2/RedistList/FrameworkList.xml", - "build/.NETFramework/v4.7.2/System.Activities.Core.Presentation.dll", - "build/.NETFramework/v4.7.2/System.Activities.Core.Presentation.xml", - "build/.NETFramework/v4.7.2/System.Activities.DurableInstancing.dll", - "build/.NETFramework/v4.7.2/System.Activities.DurableInstancing.xml", - "build/.NETFramework/v4.7.2/System.Activities.Presentation.dll", - "build/.NETFramework/v4.7.2/System.Activities.Presentation.xml", - "build/.NETFramework/v4.7.2/System.Activities.dll", - "build/.NETFramework/v4.7.2/System.Activities.xml", - "build/.NETFramework/v4.7.2/System.AddIn.Contract.dll", - "build/.NETFramework/v4.7.2/System.AddIn.Contract.xml", - "build/.NETFramework/v4.7.2/System.AddIn.dll", - "build/.NETFramework/v4.7.2/System.AddIn.xml", - "build/.NETFramework/v4.7.2/System.ComponentModel.Composition.Registration.dll", - "build/.NETFramework/v4.7.2/System.ComponentModel.Composition.Registration.xml", - "build/.NETFramework/v4.7.2/System.ComponentModel.Composition.dll", - "build/.NETFramework/v4.7.2/System.ComponentModel.Composition.xml", - "build/.NETFramework/v4.7.2/System.ComponentModel.DataAnnotations.dll", - "build/.NETFramework/v4.7.2/System.ComponentModel.DataAnnotations.xml", - "build/.NETFramework/v4.7.2/System.Configuration.Install.dll", - "build/.NETFramework/v4.7.2/System.Configuration.Install.xml", - "build/.NETFramework/v4.7.2/System.Configuration.dll", - "build/.NETFramework/v4.7.2/System.Configuration.xml", - "build/.NETFramework/v4.7.2/System.Core.dll", - "build/.NETFramework/v4.7.2/System.Core.xml", - "build/.NETFramework/v4.7.2/System.Data.DataSetExtensions.dll", - "build/.NETFramework/v4.7.2/System.Data.DataSetExtensions.xml", - "build/.NETFramework/v4.7.2/System.Data.Entity.Design.dll", - "build/.NETFramework/v4.7.2/System.Data.Entity.Design.xml", - "build/.NETFramework/v4.7.2/System.Data.Entity.dll", - "build/.NETFramework/v4.7.2/System.Data.Entity.xml", - "build/.NETFramework/v4.7.2/System.Data.Linq.dll", - "build/.NETFramework/v4.7.2/System.Data.Linq.xml", - "build/.NETFramework/v4.7.2/System.Data.OracleClient.dll", - "build/.NETFramework/v4.7.2/System.Data.OracleClient.xml", - "build/.NETFramework/v4.7.2/System.Data.Services.Client.dll", - "build/.NETFramework/v4.7.2/System.Data.Services.Client.xml", - "build/.NETFramework/v4.7.2/System.Data.Services.Design.dll", - "build/.NETFramework/v4.7.2/System.Data.Services.Design.xml", - "build/.NETFramework/v4.7.2/System.Data.Services.dll", - "build/.NETFramework/v4.7.2/System.Data.Services.xml", - "build/.NETFramework/v4.7.2/System.Data.SqlXml.dll", - "build/.NETFramework/v4.7.2/System.Data.SqlXml.xml", - "build/.NETFramework/v4.7.2/System.Data.dll", - "build/.NETFramework/v4.7.2/System.Data.xml", - "build/.NETFramework/v4.7.2/System.Deployment.dll", - "build/.NETFramework/v4.7.2/System.Deployment.xml", - "build/.NETFramework/v4.7.2/System.Design.dll", - "build/.NETFramework/v4.7.2/System.Design.xml", - "build/.NETFramework/v4.7.2/System.Device.dll", - "build/.NETFramework/v4.7.2/System.Device.xml", - "build/.NETFramework/v4.7.2/System.Diagnostics.Tracing.dll", - "build/.NETFramework/v4.7.2/System.Diagnostics.Tracing.xml", - "build/.NETFramework/v4.7.2/System.DirectoryServices.AccountManagement.dll", - "build/.NETFramework/v4.7.2/System.DirectoryServices.AccountManagement.xml", - "build/.NETFramework/v4.7.2/System.DirectoryServices.Protocols.dll", - "build/.NETFramework/v4.7.2/System.DirectoryServices.Protocols.xml", - "build/.NETFramework/v4.7.2/System.DirectoryServices.dll", - "build/.NETFramework/v4.7.2/System.DirectoryServices.xml", - "build/.NETFramework/v4.7.2/System.Drawing.Design.dll", - "build/.NETFramework/v4.7.2/System.Drawing.Design.xml", - "build/.NETFramework/v4.7.2/System.Drawing.dll", - "build/.NETFramework/v4.7.2/System.Drawing.xml", - "build/.NETFramework/v4.7.2/System.Dynamic.dll", - "build/.NETFramework/v4.7.2/System.EnterpriseServices.Thunk.dll", - "build/.NETFramework/v4.7.2/System.EnterpriseServices.Wrapper.dll", - "build/.NETFramework/v4.7.2/System.EnterpriseServices.dll", - "build/.NETFramework/v4.7.2/System.EnterpriseServices.xml", - "build/.NETFramework/v4.7.2/System.IO.Compression.FileSystem.dll", - "build/.NETFramework/v4.7.2/System.IO.Compression.FileSystem.xml", - "build/.NETFramework/v4.7.2/System.IO.Compression.dll", - "build/.NETFramework/v4.7.2/System.IO.Compression.xml", - "build/.NETFramework/v4.7.2/System.IO.Log.dll", - "build/.NETFramework/v4.7.2/System.IO.Log.xml", - "build/.NETFramework/v4.7.2/System.IdentityModel.Selectors.dll", - "build/.NETFramework/v4.7.2/System.IdentityModel.Selectors.xml", - "build/.NETFramework/v4.7.2/System.IdentityModel.Services.dll", - "build/.NETFramework/v4.7.2/System.IdentityModel.Services.xml", - "build/.NETFramework/v4.7.2/System.IdentityModel.dll", - "build/.NETFramework/v4.7.2/System.IdentityModel.xml", - "build/.NETFramework/v4.7.2/System.Linq.xml", - "build/.NETFramework/v4.7.2/System.Management.Instrumentation.dll", - "build/.NETFramework/v4.7.2/System.Management.Instrumentation.xml", - "build/.NETFramework/v4.7.2/System.Management.dll", - "build/.NETFramework/v4.7.2/System.Management.xml", - "build/.NETFramework/v4.7.2/System.Messaging.dll", - "build/.NETFramework/v4.7.2/System.Messaging.xml", - "build/.NETFramework/v4.7.2/System.Net.Http.WebRequest.dll", - "build/.NETFramework/v4.7.2/System.Net.Http.WebRequest.xml", - "build/.NETFramework/v4.7.2/System.Net.Http.dll", - "build/.NETFramework/v4.7.2/System.Net.Http.xml", - "build/.NETFramework/v4.7.2/System.Net.dll", - "build/.NETFramework/v4.7.2/System.Net.xml", - "build/.NETFramework/v4.7.2/System.Numerics.dll", - "build/.NETFramework/v4.7.2/System.Numerics.xml", - "build/.NETFramework/v4.7.2/System.Printing.dll", - "build/.NETFramework/v4.7.2/System.Printing.xml", - "build/.NETFramework/v4.7.2/System.Reflection.Context.dll", - "build/.NETFramework/v4.7.2/System.Reflection.Context.xml", - "build/.NETFramework/v4.7.2/System.Runtime.Caching.dll", - "build/.NETFramework/v4.7.2/System.Runtime.Caching.xml", - "build/.NETFramework/v4.7.2/System.Runtime.DurableInstancing.dll", - "build/.NETFramework/v4.7.2/System.Runtime.DurableInstancing.xml", - "build/.NETFramework/v4.7.2/System.Runtime.Remoting.dll", - "build/.NETFramework/v4.7.2/System.Runtime.Remoting.xml", - "build/.NETFramework/v4.7.2/System.Runtime.Serialization.Formatters.Soap.dll", - "build/.NETFramework/v4.7.2/System.Runtime.Serialization.Formatters.Soap.xml", - "build/.NETFramework/v4.7.2/System.Runtime.Serialization.dll", - "build/.NETFramework/v4.7.2/System.Runtime.Serialization.xml", - "build/.NETFramework/v4.7.2/System.Security.dll", - "build/.NETFramework/v4.7.2/System.Security.xml", - "build/.NETFramework/v4.7.2/System.ServiceModel.Activation.dll", - "build/.NETFramework/v4.7.2/System.ServiceModel.Activation.xml", - "build/.NETFramework/v4.7.2/System.ServiceModel.Activities.dll", - "build/.NETFramework/v4.7.2/System.ServiceModel.Activities.xml", - "build/.NETFramework/v4.7.2/System.ServiceModel.Channels.dll", - "build/.NETFramework/v4.7.2/System.ServiceModel.Channels.xml", - "build/.NETFramework/v4.7.2/System.ServiceModel.Discovery.dll", - "build/.NETFramework/v4.7.2/System.ServiceModel.Discovery.xml", - "build/.NETFramework/v4.7.2/System.ServiceModel.Routing.dll", - "build/.NETFramework/v4.7.2/System.ServiceModel.Routing.xml", - "build/.NETFramework/v4.7.2/System.ServiceModel.Web.dll", - "build/.NETFramework/v4.7.2/System.ServiceModel.Web.xml", - "build/.NETFramework/v4.7.2/System.ServiceModel.dll", - "build/.NETFramework/v4.7.2/System.ServiceModel.xml", - "build/.NETFramework/v4.7.2/System.ServiceProcess.dll", - "build/.NETFramework/v4.7.2/System.ServiceProcess.xml", - "build/.NETFramework/v4.7.2/System.Speech.dll", - "build/.NETFramework/v4.7.2/System.Speech.xml", - "build/.NETFramework/v4.7.2/System.Threading.Tasks.Dataflow.xml", - "build/.NETFramework/v4.7.2/System.Transactions.dll", - "build/.NETFramework/v4.7.2/System.Transactions.xml", - "build/.NETFramework/v4.7.2/System.Web.Abstractions.dll", - "build/.NETFramework/v4.7.2/System.Web.ApplicationServices.dll", - "build/.NETFramework/v4.7.2/System.Web.ApplicationServices.xml", - "build/.NETFramework/v4.7.2/System.Web.DataVisualization.Design.dll", - "build/.NETFramework/v4.7.2/System.Web.DataVisualization.dll", - "build/.NETFramework/v4.7.2/System.Web.DataVisualization.xml", - "build/.NETFramework/v4.7.2/System.Web.DynamicData.Design.dll", - "build/.NETFramework/v4.7.2/System.Web.DynamicData.Design.xml", - "build/.NETFramework/v4.7.2/System.Web.DynamicData.dll", - "build/.NETFramework/v4.7.2/System.Web.DynamicData.xml", - "build/.NETFramework/v4.7.2/System.Web.Entity.Design.dll", - "build/.NETFramework/v4.7.2/System.Web.Entity.Design.xml", - "build/.NETFramework/v4.7.2/System.Web.Entity.dll", - "build/.NETFramework/v4.7.2/System.Web.Entity.xml", - "build/.NETFramework/v4.7.2/System.Web.Extensions.Design.dll", - "build/.NETFramework/v4.7.2/System.Web.Extensions.Design.xml", - "build/.NETFramework/v4.7.2/System.Web.Extensions.dll", - "build/.NETFramework/v4.7.2/System.Web.Extensions.xml", - "build/.NETFramework/v4.7.2/System.Web.Mobile.dll", - "build/.NETFramework/v4.7.2/System.Web.Mobile.xml", - "build/.NETFramework/v4.7.2/System.Web.RegularExpressions.dll", - "build/.NETFramework/v4.7.2/System.Web.RegularExpressions.xml", - "build/.NETFramework/v4.7.2/System.Web.Routing.dll", - "build/.NETFramework/v4.7.2/System.Web.Services.dll", - "build/.NETFramework/v4.7.2/System.Web.Services.xml", - "build/.NETFramework/v4.7.2/System.Web.dll", - "build/.NETFramework/v4.7.2/System.Web.xml", - "build/.NETFramework/v4.7.2/System.Windows.Controls.Ribbon.dll", - "build/.NETFramework/v4.7.2/System.Windows.Controls.Ribbon.xml", - "build/.NETFramework/v4.7.2/System.Windows.Forms.DataVisualization.Design.dll", - "build/.NETFramework/v4.7.2/System.Windows.Forms.DataVisualization.dll", - "build/.NETFramework/v4.7.2/System.Windows.Forms.DataVisualization.xml", - "build/.NETFramework/v4.7.2/System.Windows.Forms.dll", - "build/.NETFramework/v4.7.2/System.Windows.Forms.xml", - "build/.NETFramework/v4.7.2/System.Windows.Input.Manipulations.dll", - "build/.NETFramework/v4.7.2/System.Windows.Input.Manipulations.xml", - "build/.NETFramework/v4.7.2/System.Windows.Presentation.dll", - "build/.NETFramework/v4.7.2/System.Windows.Presentation.xml", - "build/.NETFramework/v4.7.2/System.Windows.dll", - "build/.NETFramework/v4.7.2/System.Workflow.Activities.dll", - "build/.NETFramework/v4.7.2/System.Workflow.Activities.xml", - "build/.NETFramework/v4.7.2/System.Workflow.ComponentModel.dll", - "build/.NETFramework/v4.7.2/System.Workflow.ComponentModel.xml", - "build/.NETFramework/v4.7.2/System.Workflow.Runtime.dll", - "build/.NETFramework/v4.7.2/System.Workflow.Runtime.xml", - "build/.NETFramework/v4.7.2/System.WorkflowServices.dll", - "build/.NETFramework/v4.7.2/System.WorkflowServices.xml", - "build/.NETFramework/v4.7.2/System.Xaml.dll", - "build/.NETFramework/v4.7.2/System.Xaml.xml", - "build/.NETFramework/v4.7.2/System.Xml.Linq.dll", - "build/.NETFramework/v4.7.2/System.Xml.Linq.xml", - "build/.NETFramework/v4.7.2/System.Xml.Serialization.dll", - "build/.NETFramework/v4.7.2/System.Xml.dll", - "build/.NETFramework/v4.7.2/System.Xml.xml", - "build/.NETFramework/v4.7.2/System.dll", - "build/.NETFramework/v4.7.2/System.xml", - "build/.NETFramework/v4.7.2/UIAutomationClient.dll", - "build/.NETFramework/v4.7.2/UIAutomationClient.xml", - "build/.NETFramework/v4.7.2/UIAutomationClientsideProviders.dll", - "build/.NETFramework/v4.7.2/UIAutomationClientsideProviders.xml", - "build/.NETFramework/v4.7.2/UIAutomationProvider.dll", - "build/.NETFramework/v4.7.2/UIAutomationProvider.xml", - "build/.NETFramework/v4.7.2/UIAutomationTypes.dll", - "build/.NETFramework/v4.7.2/UIAutomationTypes.xml", - "build/.NETFramework/v4.7.2/WindowsBase.dll", - "build/.NETFramework/v4.7.2/WindowsBase.xml", - "build/.NETFramework/v4.7.2/WindowsFormsIntegration.dll", - "build/.NETFramework/v4.7.2/WindowsFormsIntegration.xml", - "build/.NETFramework/v4.7.2/XamlBuildTask.dll", - "build/.NETFramework/v4.7.2/XamlBuildTask.xml", - "build/.NETFramework/v4.7.2/mscorlib.dll", - "build/.NETFramework/v4.7.2/mscorlib.xml", - "build/.NETFramework/v4.7.2/namespaces.xml", - "build/.NETFramework/v4.7.2/sysglobl.dll", - "build/.NETFramework/v4.7.2/sysglobl.xml", - "build/Microsoft.NETFramework.ReferenceAssemblies.net472.targets", - "microsoft.netframework.referenceassemblies.net472.1.0.3.nupkg.sha512", - "microsoft.netframework.referenceassemblies.net472.nuspec" - ] - }, - "System.Buffers/4.5.1": { - "sha512": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==", - "type": "package", - "path": "system.buffers/4.5.1", - "files": [ - ".nupkg.metadata", - ".signature.p7s", - "LICENSE.TXT", - "THIRD-PARTY-NOTICES.TXT", - "lib/net461/System.Buffers.dll", - "lib/net461/System.Buffers.xml", - "lib/netcoreapp2.0/_._", - "lib/netstandard1.1/System.Buffers.dll", - "lib/netstandard1.1/System.Buffers.xml", - "lib/netstandard2.0/System.Buffers.dll", - "lib/netstandard2.0/System.Buffers.xml", - "lib/uap10.0.16299/_._", - "ref/net45/System.Buffers.dll", - "ref/net45/System.Buffers.xml", - "ref/netcoreapp2.0/_._", - "ref/netstandard1.1/System.Buffers.dll", - "ref/netstandard1.1/System.Buffers.xml", - "ref/netstandard2.0/System.Buffers.dll", - "ref/netstandard2.0/System.Buffers.xml", - "ref/uap10.0.16299/_._", - "system.buffers.4.5.1.nupkg.sha512", - "system.buffers.nuspec", - "useSharedDesignerContext.txt", - "version.txt" - ] - }, - "System.Memory/4.5.4": { - "sha512": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", - "type": "package", - "path": "system.memory/4.5.4", - "files": [ - ".nupkg.metadata", - ".signature.p7s", - "LICENSE.TXT", - "THIRD-PARTY-NOTICES.TXT", - "lib/net461/System.Memory.dll", - "lib/net461/System.Memory.xml", - "lib/netcoreapp2.1/_._", - "lib/netstandard1.1/System.Memory.dll", - "lib/netstandard1.1/System.Memory.xml", - "lib/netstandard2.0/System.Memory.dll", - "lib/netstandard2.0/System.Memory.xml", - "ref/netcoreapp2.1/_._", - "system.memory.4.5.4.nupkg.sha512", - "system.memory.nuspec", - "useSharedDesignerContext.txt", - "version.txt" - ] - }, - "System.Numerics.Vectors/4.5.0": { - "sha512": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==", - "type": "package", - "path": "system.numerics.vectors/4.5.0", - "files": [ - ".nupkg.metadata", - ".signature.p7s", - "LICENSE.TXT", - "THIRD-PARTY-NOTICES.TXT", - "lib/MonoAndroid10/_._", - "lib/MonoTouch10/_._", - "lib/net46/System.Numerics.Vectors.dll", - "lib/net46/System.Numerics.Vectors.xml", - "lib/netcoreapp2.0/_._", - "lib/netstandard1.0/System.Numerics.Vectors.dll", - "lib/netstandard1.0/System.Numerics.Vectors.xml", - "lib/netstandard2.0/System.Numerics.Vectors.dll", - "lib/netstandard2.0/System.Numerics.Vectors.xml", - "lib/portable-net45+win8+wp8+wpa81/System.Numerics.Vectors.dll", - "lib/portable-net45+win8+wp8+wpa81/System.Numerics.Vectors.xml", - "lib/uap10.0.16299/_._", - "lib/xamarinios10/_._", - "lib/xamarinmac20/_._", - "lib/xamarintvos10/_._", - "lib/xamarinwatchos10/_._", - "ref/MonoAndroid10/_._", - "ref/MonoTouch10/_._", - "ref/net45/System.Numerics.Vectors.dll", - "ref/net45/System.Numerics.Vectors.xml", - "ref/net46/System.Numerics.Vectors.dll", - "ref/net46/System.Numerics.Vectors.xml", - "ref/netcoreapp2.0/_._", - "ref/netstandard1.0/System.Numerics.Vectors.dll", - "ref/netstandard1.0/System.Numerics.Vectors.xml", - "ref/netstandard2.0/System.Numerics.Vectors.dll", - "ref/netstandard2.0/System.Numerics.Vectors.xml", - "ref/uap10.0.16299/_._", - "ref/xamarinios10/_._", - "ref/xamarinmac20/_._", - "ref/xamarintvos10/_._", - "ref/xamarinwatchos10/_._", - "system.numerics.vectors.4.5.0.nupkg.sha512", - "system.numerics.vectors.nuspec", - "useSharedDesignerContext.txt", - "version.txt" - ] - }, - "System.Runtime.CompilerServices.Unsafe/4.5.3": { - "sha512": "3TIsJhD1EiiT0w2CcDMN/iSSwnNnsrnbzeVHSKkaEgV85txMprmuO+Yq2AdSbeVGcg28pdNDTPK87tJhX7VFHw==", - "type": "package", - "path": "system.runtime.compilerservices.unsafe/4.5.3", - "files": [ - ".nupkg.metadata", - ".signature.p7s", - "LICENSE.TXT", - "THIRD-PARTY-NOTICES.TXT", - "lib/net461/System.Runtime.CompilerServices.Unsafe.dll", - "lib/net461/System.Runtime.CompilerServices.Unsafe.xml", - "lib/netcoreapp2.0/System.Runtime.CompilerServices.Unsafe.dll", - "lib/netcoreapp2.0/System.Runtime.CompilerServices.Unsafe.xml", - "lib/netstandard1.0/System.Runtime.CompilerServices.Unsafe.dll", - "lib/netstandard1.0/System.Runtime.CompilerServices.Unsafe.xml", - "lib/netstandard2.0/System.Runtime.CompilerServices.Unsafe.dll", - "lib/netstandard2.0/System.Runtime.CompilerServices.Unsafe.xml", - "ref/net461/System.Runtime.CompilerServices.Unsafe.dll", - "ref/net461/System.Runtime.CompilerServices.Unsafe.xml", - "ref/netstandard1.0/System.Runtime.CompilerServices.Unsafe.dll", - "ref/netstandard1.0/System.Runtime.CompilerServices.Unsafe.xml", - "ref/netstandard2.0/System.Runtime.CompilerServices.Unsafe.dll", - "ref/netstandard2.0/System.Runtime.CompilerServices.Unsafe.xml", - "system.runtime.compilerservices.unsafe.4.5.3.nupkg.sha512", - "system.runtime.compilerservices.unsafe.nuspec", - "useSharedDesignerContext.txt", - "version.txt" - ] - } - }, - "projectFileDependencyGroups": { - ".NETFramework,Version=v4.7.2": [ - "BCrypt.Net-Next >= 4.0.3", - "Microsoft.NETFramework.ReferenceAssemblies >= 1.0.3", - "Microsoft.NETFramework.ReferenceAssemblies.net472 >= 1.0.3" - ] - }, - "packageFolders": { - "C:\\Users\\jiang\\.nuget\\packages\\": {} - }, - "project": { - "version": "1.0.0", - "restore": { - "projectUniqueName": "E:\\opencode\\haoliang\\tools\\GenHash\\GenHash.csproj", - "projectName": "GenHash", - "projectPath": "E:\\opencode\\haoliang\\tools\\GenHash\\GenHash.csproj", - "packagesPath": "C:\\Users\\jiang\\.nuget\\packages\\", - "outputPath": "E:\\opencode\\haoliang\\tools\\GenHash\\obj\\", - "projectStyle": "PackageReference", - "configFilePaths": [ - "C:\\Users\\jiang\\AppData\\Roaming\\NuGet\\NuGet.Config" - ], - "originalTargetFrameworks": [ - "net472" - ], - "sources": { - "https://api.nuget.org/v3/index.json": {} - }, - "frameworks": { - "net472": { - "targetAlias": "net472", - "projectReferences": {} - } - }, - "warningProperties": { - "warnAsError": [ - "NU1605" - ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" - } - }, - "frameworks": { - "net472": { - "targetAlias": "net472", - "dependencies": { - "BCrypt.Net-Next": { - "target": "Package", - "version": "[4.0.3, )" - }, - "Microsoft.NETFramework.ReferenceAssemblies": { - "suppressParent": "All", - "target": "Package", - "version": "[1.0.3, )", - "autoReferenced": true - }, - "Microsoft.NETFramework.ReferenceAssemblies.net472": { - "suppressParent": "All", - "target": "Package", - "version": "[1.0.3, )" - } - }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.420\\RuntimeIdentifierGraph.json" - } - }, - "runtimes": { - "win7-x86": { - "#import": [] - } - } - } -} \ No newline at end of file diff --git a/tools/GenHash/obj/project.nuget.cache b/tools/GenHash/obj/project.nuget.cache deleted file mode 100644 index b91baa4..0000000 --- a/tools/GenHash/obj/project.nuget.cache +++ /dev/null @@ -1,16 +0,0 @@ -{ - "version": 2, - "dgSpecHash": "oBkre/ibNH0=", - "success": true, - "projectFilePath": "E:\\opencode\\haoliang\\tools\\GenHash\\GenHash.csproj", - "expectedPackageFiles": [ - "C:\\Users\\jiang\\.nuget\\packages\\bcrypt.net-next\\4.0.3\\bcrypt.net-next.4.0.3.nupkg.sha512", - "C:\\Users\\jiang\\.nuget\\packages\\microsoft.netframework.referenceassemblies\\1.0.3\\microsoft.netframework.referenceassemblies.1.0.3.nupkg.sha512", - "C:\\Users\\jiang\\.nuget\\packages\\microsoft.netframework.referenceassemblies.net472\\1.0.3\\microsoft.netframework.referenceassemblies.net472.1.0.3.nupkg.sha512", - "C:\\Users\\jiang\\.nuget\\packages\\system.buffers\\4.5.1\\system.buffers.4.5.1.nupkg.sha512", - "C:\\Users\\jiang\\.nuget\\packages\\system.memory\\4.5.4\\system.memory.4.5.4.nupkg.sha512", - "C:\\Users\\jiang\\.nuget\\packages\\system.numerics.vectors\\4.5.0\\system.numerics.vectors.4.5.0.nupkg.sha512", - "C:\\Users\\jiang\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\4.5.3\\system.runtime.compilerservices.unsafe.4.5.3.nupkg.sha512" - ], - "logs": [] -} \ No newline at end of file diff --git a/tools/update_hash.sql b/tools/update_hash.sql deleted file mode 100644 index 1173a7d..0000000 --- a/tools/update_hash.sql +++ /dev/null @@ -1,2 +0,0 @@ -UPDATE cnc_business.cnc_sys_config SET config_value = '$2a$10$U3N87MUjanIcRsgbsQBo9eevVolvb9f2iKdqEcA.mXAb.NUT.tEQW' WHERE config_key = 'admin_password_hash'; -SELECT config_key, config_value FROM cnc_business.cnc_sys_config WHERE config_key = 'admin_password_hash';