修改后台代码

2 years ago · 49ef4f9c43
7 changed files with 31 additions and 26 deletions
--- a/.vs/znyc.dispatching.api/v17/.wsuo
+++ b/.vs/znyc.dispatching.api/v17/.wsuo
--- a/src/Znyc.Dispatching.Application/Order/Services/OrderService.cs
+++ b/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();
                            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";
--- a/src/Znyc.Dispatching.Application/Znyc.Dispatching.Application.xml
+++ b/src/Znyc.Dispatching.Application/Znyc.Dispatching.Application.xml
@ -4048,6 +4048,11 @@
                车辆编号
            </summary>
        </member>
+        <member name="P:Znyc.Dispatching.Application.MapMonitorDataOutput.Latitude">
+            <summary>
+                维度
+            </summary>
+        </member>
        <member name="P:Znyc.Dispatching.Application.MapMonitorDataOutput.Longitude">
            <summary>
                精度
--- 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": {
--- a/src/Znyc.Dispatching.EntityFramework.Core/dbsettings.Development.json
+++ b/src/Znyc.Dispatching.EntityFramework.Core/dbsettings.Development.json
@ -1,7 +1,7 @@
 {
  "ConnectionStrings": {
-    //测试环境调试配置，非必要请在本地进行开发调试
-    "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"
  }
 }
--- 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"
  }
--- 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
  }
 }