Browse Source

修改后台代码

master
wtp 2 years ago
parent
commit
49ef4f9c43
  1. BIN
      .vs/znyc.dispatching.api/v17/.wsuo
  2. 4
      src/Znyc.Dispatching.Application/Order/Services/OrderService.cs
  3. 5
      src/Znyc.Dispatching.Application/Znyc.Dispatching.Application.xml
  4. 2
      src/Znyc.Dispatching.Core/coreconfig.Development.json
  5. 4
      src/Znyc.Dispatching.EntityFramework.Core/dbsettings.Development.json
  6. 2
      src/Znyc.Dispatching.MongoDb.Repository/mongodbsettings.Development.json
  7. 40
      src/Znyc.Dispatching.Web.Entry/appsettings.Development.json

BIN
.vs/znyc.dispatching.api/v17/.wsuo

Binary file not shown.

4
src/Znyc.Dispatching.Application/Order/Services/OrderService.cs

@ -815,7 +815,7 @@ namespace Znyc.Dispatching.Application
var wxAdminUser = _wxUserRelationRepository.Where(x => x.UserId == adminUserId).FirstOrDefault(); var wxAdminUser = _wxUserRelationRepository.Where(x => x.UserId == adminUserId).FirstOrDefault();
if (wxAdminUser.IsNotNull() && wxAdminUser.WxOfficialOpenId.IsNotNull()) if (wxAdminUser.IsNotNull() && wxAdminUser.WxOfficialOpenId.IsNotNull())
{ {
var data = new WeixinTemplate_AssignOrder("已接单提醒", order.ProjectName, "出车任务", orderContent, order.ArriveDate.ToString("yyyy -MM-dd HH:mm:ss"), $"[{order.VehicleCode}]号车,{orderVehicleDriverName}已接单,{orderVehicleCrewsName}已阅读"); var data = new WeixinTemplate_AssignOrder("已接单提醒", order.ProjectName, "已接单", orderContent, order.ArriveDate.ToString("yyyy -MM-dd HH:mm:ss"), $"[{order.VehicleCode}]号车,{orderVehicleDriverName}已接单,{orderVehicleCrewsName}已阅读");
TemplateModel_MiniProgram miniProgram = new TemplateModel_MiniProgram(); TemplateModel_MiniProgram miniProgram = new TemplateModel_MiniProgram();
miniProgram.appid = _weixinSettingOptions.WxOpenAppId; miniProgram.appid = _weixinSettingOptions.WxOpenAppId;
miniProgram.pagepath = $"pages/taskInfo/taskInfo?id={order.Id}&isDriver=false&type=2"; miniProgram.pagepath = $"pages/taskInfo/taskInfo?id={order.Id}&isDriver=false&type=2";
@ -845,7 +845,7 @@ namespace Znyc.Dispatching.Application
var wxAdminUser = _wxUserRelationRepository.Where(x => x.UserId == adminUserId).FirstOrDefault(); var wxAdminUser = _wxUserRelationRepository.Where(x => x.UserId == adminUserId).FirstOrDefault();
if (wxAdminUser.IsNotNull() && wxAdminUser.WxOfficialOpenId.IsNotNull()) if (wxAdminUser.IsNotNull() && wxAdminUser.WxOfficialOpenId.IsNotNull())
{ {
var data = new WeixinTemplate_AssignOrder("已接单提醒", order.ProjectName, "出车任务", orderContent, order.ArriveDate.ToString("yyyy -MM-dd HH:mm:ss"), $"{message}变更通知,[{order.VehicleCode}]车,{orderVehicleDriverName},{orderVehicleCrewsName}已收到已查看"); var data = new WeixinTemplate_AssignOrder("已接单提醒", order.ProjectName, "已接单", orderContent, order.ArriveDate.ToString("yyyy -MM-dd HH:mm:ss"), $"{message}变更通知,[{order.VehicleCode}]车,{orderVehicleDriverName},{orderVehicleCrewsName}已收到已查看");
TemplateModel_MiniProgram miniProgram = new TemplateModel_MiniProgram(); TemplateModel_MiniProgram miniProgram = new TemplateModel_MiniProgram();
miniProgram.appid = _weixinSettingOptions.WxOpenAppId; miniProgram.appid = _weixinSettingOptions.WxOpenAppId;
miniProgram.pagepath = $"pages/taskInfo/taskInfo?id={order.Id}&isDriver=false&type=2"; miniProgram.pagepath = $"pages/taskInfo/taskInfo?id={order.Id}&isDriver=false&type=2";

5
src/Znyc.Dispatching.Application/Znyc.Dispatching.Application.xml

@ -4048,6 +4048,11 @@
车辆编号 车辆编号
</summary> </summary>
</member> </member>
<member name="P:Znyc.Dispatching.Application.MapMonitorDataOutput.Latitude">
<summary>
维度
</summary>
</member>
<member name="P:Znyc.Dispatching.Application.MapMonitorDataOutput.Longitude"> <member name="P:Znyc.Dispatching.Application.MapMonitorDataOutput.Longitude">
<summary> <summary>
精度 精度

2
src/Znyc.Dispatching.Core/coreconfig.Development.json

@ -13,7 +13,7 @@
}, },
"Cache": { "Cache": {
// //
"RedisConnectionString": "42.194.147.251:6379,password=vtgA9HXFQQYA9g8Z,defaultDatabase=6" "RedisConnectionString": "81.71.148.57:46379,password=dfeFEgeGH/,defaultDatabase=6"
//"RedisConnectionString": "127.0.0.1:6379" //"RedisConnectionString": "127.0.0.1:6379"
}, },
"SnowId": { "SnowId": {

4
src/Znyc.Dispatching.EntityFramework.Core/dbsettings.Development.json

@ -1,7 +1,7 @@
{ {
"ConnectionStrings": { "ConnectionStrings": {
// //ԻãDZҪڱؽп
"DefaultConnection": "Server=42.194.147.251;Port=43306;Database=znyc_dispatching;Uid=guest;Pwd=4Y2e2WtekfDYWfT8;Charset=utf8mb4;AllowLoadLocalInfile=true" "DefaultConnection": "Server=81.71.148.57;Port=43306;Database=znyc_dispatching;Uid=znyc;Pwd=bIQISVSO;Charset=utf8mb4;AllowLoadLocalInfile=true"
//"DefaultConnection": "Server=127.0.0.1;Port=3306;Database=znyc_dispatching;Uid=root;Pwd=123456;Charset=utf8mb4" //"DefaultConnection": "Server=127.0.0.1;Port=3306;Database=znyc_dispatching;Uid=root;Pwd=123456;Charset=utf8mb4"
} }
} }

2
src/Znyc.Dispatching.MongoDb.Repository/mongodbsettings.Development.json

@ -1,6 +1,6 @@
{ {
"MongoDbConnectionStrings": { "MongoDbConnectionStrings": {
"DefaultConnection": "mongodb://42.194.147.251:27018", "DefaultConnection": "mongodb://81.71.148.57:27017",
//"DefaultConnection": "mongodb://127.0.0.1:27017", //"DefaultConnection": "mongodb://127.0.0.1:27017",
"Database": "ZNYCGPS" "Database": "ZNYCGPS"
} }

40
src/Znyc.Dispatching.Web.Entry/appsettings.Development.json

@ -1,41 +1,41 @@
{ {
"AllowedHosts": "*", "AllowedHosts": "*",
"Upload": { "Upload": {
// //ͷ
"avatar": { "avatar": {
// D:/upload/admin/avatar //ϴ· D:/upload/admin/avatar
"uploadPath": "../upload/avatar", "uploadPath": "../upload/avatar",
// //·
"requestPath": "/upload/avatar", "requestPath": "/upload/avatar",
// //ȡ·
"readPath": "https://znyc-images-1304677865.cos.ap-guangzhou.myqcloud.com/", "readPath": "https://znyc-images-1304677865.cos.ap-guangzhou.myqcloud.com/",
// yyyy/MM/dd //·ڸʽ yyyy/MM/dd
"dateTimeFormat": "", "dateTimeFormat": "",
//{} //{û}
"format": "", "format": "",
// 1M = 1 * 1024 * 1024 //ͼƬС 1M = 1 * 1024 * 1024
"maxSize": 1048576, "maxSize": 1048576,
//-1 //ϴ-1
"limit": 1, "limit": 1,
// //ͼƬʽ
"contentType": [ "image/jpg", "image/png", "image/jpeg", "image/gif" ] "contentType": [ "image/jpg", "image/png", "image/jpeg", "image/gif" ]
}, },
// //ĵͼƬ
"document": { "document": {
// D:/upload/admin/document //ϴ· D:/upload/admin/document
"uploadPath": "../upload/document", "uploadPath": "../upload/document",
// //·
"requestPath": "/images", "requestPath": "/images",
// yyyy/MM/dd //·ڸʽ yyyy/MM/dd
"dateTimeFormat": "", "dateTimeFormat": "",
//{} //{ĵ}
"format": "", "format": "",
// 1M = 1 * 1024 * 1024 //ͼƬС 1M = 1 * 1024 * 1024
"maxSize": 1048576, "maxSize": 1048576,
//-1 //ϴ-1
"limit": -1, "limit": -1,
// //ͼƬʽ
"contentType": [ "image/jpg", "image/png", "image/jpeg", "image/gif" ] "contentType": [ "image/jpg", "image/png", "image/jpeg", "image/gif" ]
}, },
@ -53,9 +53,9 @@
"durationSeconds": 1800, "durationSeconds": 1800,
"allowActions": [ "allowActions": [
"name/cos:PutObject", "name/cos:PutObject",
// // ϴСϴ
"name/cos:PostObject", "name/cos:PostObject",
// // Ƭϴ
"name/cos:InitiateMultipartUpload", "name/cos:InitiateMultipartUpload",
"name/cos:ListMultipartUploads", "name/cos:ListMultipartUploads",
"name/cos:ListParts", "name/cos:ListParts",
@ -84,6 +84,6 @@
}, },
"SnowId": { "SnowId": {
"WorkerId": "1" // 0~63,1 "WorkerId": "1" // ȡֵΧ0~63,Ĭ1
} }
} }
Loading…
Cancel
Save