From 49ef4f9c43abeb712864be52c2d0aab5c3c699e3 Mon Sep 17 00:00:00 2001 From: wtp <1813748440@qq.com> Date: Tue, 18 Jul 2023 11:29:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E5=8F=B0=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/znyc.dispatching.api/v17/.wsuo | Bin 0 -> 14336 bytes .../Order/Services/OrderService.cs | 4 +- .../Znyc.Dispatching.Application.xml | 5 +++ .../coreconfig.Development.json | 2 +- .../dbsettings.Development.json | 4 +- .../mongodbsettings.Development.json | 2 +- .../appsettings.Development.json | 40 +++++++++--------- 7 files changed, 31 insertions(+), 26 deletions(-) create mode 100644 .vs/znyc.dispatching.api/v17/.wsuo diff --git a/.vs/znyc.dispatching.api/v17/.wsuo b/.vs/znyc.dispatching.api/v17/.wsuo new file mode 100644 index 0000000000000000000000000000000000000000..35672eb1db32acb0918e487df3f44c425ecf8e4f GIT binary patch literal 14336 zcmeI2OK?+F7{^bFsDLjXf*@kWf+)14p)Cak%A=)d!z(~tbkjCzDQ%ielJaoH-fdJBB)(zC(|K8l>HpxwI60BV4m-%wfIrrT2o$qzd zcOG|cul()v>l=PIC9vNtG52SenI~Q4Ay?YGV9XlwD!V^BJF8bplU#%VN#L|e@ynTJ z(`%-AX3Q0-(l@L%OA9(*I?q>k?q>hm^4+hY71X=B+OB*OiYar!9E188sa|t=o>u0* zUTc~P^d8JDgXLvpf zJ_kMzN`@=JRiMQ~d=gkl|G)W7(f@n?NB2bo=^XZ2Q{B) z&d?m9@n5#2dEsSnBlrrq349f7244d=gRg@v;1+Nz_y)KQd=q>N+z##lTfsJPCm06X z!3eku>;OB#E^s&44ekN=f^Hu7yYdG~9|8}%%G`A;r59XD{~^H`5zmwrgG`W`Mh^NP zBk~xhG-Jg;_8SCL0d^37C!fCb3{Sstul==rx+xSQdHRqV*V@D+bS*QOhdllY!#jCA8zrF;=7V{2k@J#x{ZCepy@wn;XU! z`sl}$C3|OOkf0|yPpjBlhy3U2KV@;6gr=;15c<<5jtnlDll*7N=RkR7C0T^wU*od$ z>DT`HsH<^OP-=hTU-VFYLf^q^&m}E7WvSgu=$la6thxtbb@^`P7=Dw|*Q>^9KUnzZ?l03m)i5{dMX~swC zUzVU!H*`T?de^+`SO1Fbv}P2zIg7%#yucob+OYW<%O_K47RkRY*D_Dc6kE+7m_>`WB8>nx(@vq-ZzS;iMxxm9fz|F5k~2} z*v1Hzg7dgF63if{oSHH4U$gza%Xg0cYoV`sD#wVeS$UdXpQoLkI_SU0caoVPW?6g2 zYE4!q3a2R>1;yhjbS{Z#Zp;=&Y5QCKcSB$M0gCnf%HKWyRnz}Ts7~`sAoV_r>!RI> zwgCIDS^lzpNB`C6pR+j6S##7#fp>ioM>6LvD@6Vw#kS&Ipgzq9ny;Msw;KIHD+-t< zMoQBYTMngdN9y2TdqvLrx1}rs$eLzip)kL8{6PQJK)(DSpl|S>=Wgs>f2!8DlEc|t zBJ=g1^?rZtz#kv({I>q@YwhpDR$qS5hz=Y5UUt|Befg2TFSe2HA?q6&?Z0nA9uhE}Nk{qKE^TK=ppBgY`@fyN zfL;8C_*S#0R=t|-hv@b90qyxHF-y+k;8s96NTPS?A`@smWU)orUT}Os9w^Jn@*EA6 z>`QxonHaDm&>U#zC24W+V?eyPR0pGszZz3*n=3(pe(1)YiXzxo?5^5o7}(FLauts{f*MKLd>+RxOZ^-M?dsmzx(Cw)n5#9u_|xu?COH5}<4Y3=9?ceU>63@2J6@kk`Tdv~NOo}e2DS#mDI`?r@DGj*gYoo_p3 z+M`xl6c*3_=iZaBHhUj|zs2+4$NT&@%4yG8qdm8|_dwixcGZTJdd`0bXi)pE4+`9F z_@LUXrJW$tFFk**eE#h%jcuHN=`OJ53dzB{X7SBFlKuH?DSh3?(AlHbuHLsEifv(k zHQ&Ehyr%vND$%!ZAZc$nZru;5)*qd}ucDpRpkMwK1$faf-oMakyY}W1)bBY6ib<-bVZ_x%q`{u^o2FMap x.UserId == adminUserId).FirstOrDefault(); 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(); miniProgram.appid = _weixinSettingOptions.WxOpenAppId; 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(); 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(); miniProgram.appid = _weixinSettingOptions.WxOpenAppId; miniProgram.pagepath = $"pages/taskInfo/taskInfo?id={order.Id}&isDriver=false&type=2"; diff --git a/src/Znyc.Dispatching.Application/Znyc.Dispatching.Application.xml b/src/Znyc.Dispatching.Application/Znyc.Dispatching.Application.xml index c51ed68..f3ecbf3 100644 --- a/src/Znyc.Dispatching.Application/Znyc.Dispatching.Application.xml +++ b/src/Znyc.Dispatching.Application/Znyc.Dispatching.Application.xml @@ -4048,6 +4048,11 @@ 车辆编号 + + + 维度 + + 精度 diff --git a/src/Znyc.Dispatching.Core/coreconfig.Development.json b/src/Znyc.Dispatching.Core/coreconfig.Development.json index a3676b5..0bd5a9f 100644 --- a/src/Znyc.Dispatching.Core/coreconfig.Development.json +++ b/src/Znyc.Dispatching.Core/coreconfig.Development.json @@ -13,7 +13,7 @@ }, "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" }, "SnowId": { diff --git a/src/Znyc.Dispatching.EntityFramework.Core/dbsettings.Development.json b/src/Znyc.Dispatching.EntityFramework.Core/dbsettings.Development.json index 1707909..2e4f91b 100644 --- a/src/Znyc.Dispatching.EntityFramework.Core/dbsettings.Development.json +++ b/src/Znyc.Dispatching.EntityFramework.Core/dbsettings.Development.json @@ -1,7 +1,7 @@ { "ConnectionStrings": { - //ԻãDZҪڱؽп - "DefaultConnection": "Server=42.194.147.251;Port=43306;Database=znyc_dispatching;Uid=guest;Pwd=4Y2e2WtekfDYWfT8;Charset=utf8mb4;AllowLoadLocalInfile=true" + //���Ի����������ã��DZ�Ҫ���ڱ��ؽ��п������� + "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" } } diff --git a/src/Znyc.Dispatching.MongoDb.Repository/mongodbsettings.Development.json b/src/Znyc.Dispatching.MongoDb.Repository/mongodbsettings.Development.json index ed7ea68..3e16f0e 100644 --- a/src/Znyc.Dispatching.MongoDb.Repository/mongodbsettings.Development.json +++ b/src/Znyc.Dispatching.MongoDb.Repository/mongodbsettings.Development.json @@ -1,6 +1,6 @@ { "MongoDbConnectionStrings": { - "DefaultConnection": "mongodb://42.194.147.251:27018", + "DefaultConnection": "mongodb://81.71.148.57:27017", //"DefaultConnection": "mongodb://127.0.0.1:27017", "Database": "ZNYCGPS" } diff --git a/src/Znyc.Dispatching.Web.Entry/appsettings.Development.json b/src/Znyc.Dispatching.Web.Entry/appsettings.Development.json index 18be695..c8827d1 100644 --- a/src/Znyc.Dispatching.Web.Entry/appsettings.Development.json +++ b/src/Znyc.Dispatching.Web.Entry/appsettings.Development.json @@ -1,41 +1,41 @@ { "AllowedHosts": "*", "Upload": { - //ͷ + //ͷ�� "avatar": { - //ϴ· D:/upload/admin/avatar + //�ϴ�·�� D:/upload/admin/avatar "uploadPath": "../upload/avatar", - //· + //����·�� "requestPath": "/upload/avatar", - //ȡ· + //��ȡ·�� "readPath": "https://znyc-images-1304677865.cos.ap-guangzhou.myqcloud.com/", - //·ڸʽ yyyy/MM/dd + //·�����ڸ�ʽ yyyy/MM/dd "dateTimeFormat": "", - //{û} + //{�û����} "format": "", - //ͼƬС 1M = 1 * 1024 * 1024 + //ͼƬ��С������ 1M = 1 * 1024 * 1024 "maxSize": 1048576, - //ϴ-1 + //��������ϴ�������-1������ "limit": 1, - //ͼƬʽ + //ͼƬ��ʽ "contentType": [ "image/jpg", "image/png", "image/jpeg", "image/gif" ] }, - //ĵͼƬ + //�ĵ�ͼƬ "document": { - //ϴ· D:/upload/admin/document + //�ϴ�·�� D:/upload/admin/document "uploadPath": "../upload/document", - //· + //����·�� "requestPath": "/images", - //·ڸʽ yyyy/MM/dd + //·�����ڸ�ʽ yyyy/MM/dd "dateTimeFormat": "", - //{ĵ} + //{�ĵ����} "format": "", - //ͼƬС 1M = 1 * 1024 * 1024 + //ͼƬ��С������ 1M = 1 * 1024 * 1024 "maxSize": 1048576, - //ϴ-1 + //��������ϴ�������-1������ "limit": -1, - //ͼƬʽ + //ͼƬ��ʽ "contentType": [ "image/jpg", "image/png", "image/jpeg", "image/gif" ] }, @@ -53,9 +53,9 @@ "durationSeconds": 1800, "allowActions": [ "name/cos:PutObject", - // ϴСϴ + // ����ϴ���С�����ϴ� "name/cos:PostObject", - // Ƭϴ + // ��Ƭ�ϴ� "name/cos:InitiateMultipartUpload", "name/cos:ListMultipartUploads", "name/cos:ListParts", @@ -84,6 +84,6 @@ }, "SnowId": { - "WorkerId": "1" // ȡֵΧ0~63,Ĭ1 + "WorkerId": "1" // ȡֵ��Χ0~63,Ĭ��1 } } \ No newline at end of file