From 43987d31cdf56e5c2de1626ec490607679297b53 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 19 四月 2023 14:18:14 +0800
Subject: [PATCH] 提交
---
zhengcaioa/DTO/ProjectfasongxiaoxiDTO.cs | 1
zhengcaioa/zhengcaioa/appsettings.Development.json | 7
zhengcaioa/zhengcaioa/Startup.cs | 4
zhengcaioa/Model/imdbtest/IMdbtestContext.cs | 103 +++++++++++++++++
zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs | 205 ++++++++++++++++++++++++++++++++-
zhengcaioa/Model/imdbtest/ImUserInfo.cs | 24 ++++
zhengcaioa/zhengcaioa/appsettings.json | 3
7 files changed, 333 insertions(+), 14 deletions(-)
diff --git a/zhengcaioa/DTO/ProjectfasongxiaoxiDTO.cs b/zhengcaioa/DTO/ProjectfasongxiaoxiDTO.cs
index 143f27d..9649f37 100644
--- a/zhengcaioa/DTO/ProjectfasongxiaoxiDTO.cs
+++ b/zhengcaioa/DTO/ProjectfasongxiaoxiDTO.cs
@@ -20,5 +20,6 @@
public string KhId { get; set; }
public string HuiyuanId { get; set; }
public string Projectname { get; set; }
+ public string HuiyuanName { get; set; }
}
}
diff --git a/zhengcaioa/Model/imdbtest/IMdbtestContext.cs b/zhengcaioa/Model/imdbtest/IMdbtestContext.cs
new file mode 100644
index 0000000..b418d67
--- /dev/null
+++ b/zhengcaioa/Model/imdbtest/IMdbtestContext.cs
@@ -0,0 +1,103 @@
+锘縰sing System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#nullable disable
+
+namespace zhengcaioa.Models
+{
+ public partial class IMdbtestContext : DbContext
+ {
+ public IMdbtestContext()
+ {
+ }
+
+ public IMdbtestContext(DbContextOptions<IMdbtestContext> options)
+ : base(options)
+ {
+ }
+
+ public virtual DbSet<ImUserInfo> ImUserInfos { get; set; }
+
+ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+ {
+ if (!optionsBuilder.IsConfigured)
+ {
+#warning To protect potentially sensitive information in your connection string, you should move it out of source code. You can avoid scaffolding the connection string by using the Name= syntax to read it from configuration - see https://go.microsoft.com/fwlink/?linkid=2131148. For more guidance on storing connection strings, see http://go.microsoft.com/fwlink/?LinkId=723263.
+ optionsBuilder.UseSqlServer("Data Source=.;Initial Catalog=IMdbtest;User ID=sa;Password=123456");
+ }
+ }
+
+ protected override void OnModelCreating(ModelBuilder modelBuilder)
+ {
+ modelBuilder.HasAnnotation("Relational:Collation", "Chinese_PRC_CI_AS");
+
+ modelBuilder.Entity<ImUserInfo>(entity =>
+ {
+ entity.ToTable("ImUserInfo");
+
+ entity.HasComment("Im鐢ㄦ埛鐩稿叧");
+
+ entity.Property(e => e.Id)
+ .HasMaxLength(200)
+ .IsUnicode(false)
+ .HasColumnName("ID")
+ .HasComment("澶栭儴绯荤粺鍏宠仈ID锛岃窡澶栭儴鍏宠仈ID涓�鑷�");
+
+ entity.Property(e => e.CreatBy)
+ .HasMaxLength(200)
+ .IsUnicode(false)
+ .HasComment("鍒涘缓浜�");
+
+ entity.Property(e => e.CreatTime)
+ .HasColumnType("datetime")
+ .HasComment("鍒涘缓鏃堕棿");
+
+ entity.Property(e => e.Gender).HasComment("0涓虹敺 ,1 涓哄コ");
+
+ entity.Property(e => e.HeadPictureId)
+ .HasColumnName("HeadPictureID")
+ .HasComment("澶村儚闄勪欢");
+
+ entity.Property(e => e.IsEn).HasComment("浣胯兘锛堟槸鍚︽湁鏁堬級");
+
+ entity.Property(e => e.Isdelete)
+ .HasColumnName("isdelete")
+ .HasComment("鍒犻櫎鏍囧織");
+
+ entity.Property(e => e.NickName)
+ .HasMaxLength(200)
+ .IsUnicode(false)
+ .HasComment("鏄电О");
+
+ entity.Property(e => e.Other)
+ .HasMaxLength(30)
+ .IsUnicode(false)
+ .HasComment("鍏朵粬");
+
+ entity.Property(e => e.Sign)
+ .HasMaxLength(60)
+ .IsUnicode(false)
+ .HasColumnName("sign")
+ .HasComment("绛惧悕,闀垮害涓嶈秴杩�60");
+
+ entity.Property(e => e.Sort)
+ .HasColumnName("sort")
+ .HasComment("鎺掑簭");
+
+ entity.Property(e => e.UpdataBy)
+ .HasMaxLength(200)
+ .IsUnicode(false)
+ .HasComment("淇敼浜�");
+
+ entity.Property(e => e.UpdataTime)
+ .HasColumnType("datetime")
+ .HasComment("淇敼鏃堕棿");
+ });
+
+ OnModelCreatingPartial(modelBuilder);
+ }
+
+ partial void OnModelCreatingPartial(ModelBuilder modelBuilder);
+ }
+}
diff --git a/zhengcaioa/Model/imdbtest/ImUserInfo.cs b/zhengcaioa/Model/imdbtest/ImUserInfo.cs
new file mode 100644
index 0000000..1646cb7
--- /dev/null
+++ b/zhengcaioa/Model/imdbtest/ImUserInfo.cs
@@ -0,0 +1,24 @@
+锘縰sing System;
+using System.Collections.Generic;
+
+#nullable disable
+
+namespace zhengcaioa.Models
+{
+ public partial class ImUserInfo
+ {
+ public string Id { get; set; }
+ public long? HeadPictureId { get; set; }
+ public string NickName { get; set; }
+ public string Sign { get; set; }
+ public string Other { get; set; }
+ public int? Gender { get; set; }
+ public string CreatBy { get; set; }
+ public DateTime? CreatTime { get; set; }
+ public string UpdataBy { get; set; }
+ public DateTime? UpdataTime { get; set; }
+ public bool Isdelete { get; set; }
+ public int? Sort { get; set; }
+ public bool IsEn { get; set; }
+ }
+}
diff --git a/zhengcaioa/zhengcaioa/Startup.cs b/zhengcaioa/zhengcaioa/Startup.cs
index a8daa76..3b03fca 100644
--- a/zhengcaioa/zhengcaioa/Startup.cs
+++ b/zhengcaioa/zhengcaioa/Startup.cs
@@ -82,6 +82,10 @@
services.AddDbContext<WebCrawlerContext>(options =>
options.UseSqlServer(connectionString3));
+ var connectionString4 = Configuration.GetConnectionString("IMdbtestConnection");
+ services.AddDbContext<IMdbtestContext>(options =>
+ options.UseSqlServer(connectionString4));
+
services.AddControllersWithViews();
services.AddScoped(typeof(ISimService), typeof(SimService));
diff --git a/zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs b/zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs
index e97f527..9989543 100644
--- a/zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs
+++ b/zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs
@@ -35,6 +35,7 @@
private readonly zhengcaioaContext _context;
private readonly IMapper _mapper;
private readonly zcUserInfoN_dbContext _zcUserInfoN_DbContext;
+ private readonly IMdbtestContext _iMdbtestContext;
public TimerGetShopUsersService(ILogger<TimerGetShopUsersService> logger, IServiceScopeFactory factory)
{
_logger = logger;
@@ -46,6 +47,7 @@
_context = factory.CreateScope().ServiceProvider.GetRequiredService<zhengcaioaContext>();
_mapper = factory.CreateScope().ServiceProvider.GetRequiredService<IMapper>();
_zcUserInfoN_DbContext = factory.CreateScope().ServiceProvider.GetRequiredService<zcUserInfoN_dbContext>();
+ _iMdbtestContext = factory.CreateScope().ServiceProvider.GetRequiredService<IMdbtestContext>();
}
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
@@ -150,6 +152,9 @@
//浼氬憳琛�
var frameworkUsers = _zcUserInfoN_DbContext.FrameworkUsers.Where(x => x.IsValid == true).ToList();
+
+ //鏄电О鏍�
+ var imUserInfos = _iMdbtestContext.ImUserInfos.ToList();
//StringBuilder number = new StringBuilder(); ;
//if (result != null && result.Count > 0)
@@ -565,6 +570,24 @@
projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId;
projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower();
projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname;
+ string name = "";
+ var imUserInfo = imUserInfos.Where(x => x.Id == projectfasongxiaoxiDTO.HuiyuanId).FirstOrDefault();
+ if (imUserInfo != null)
+ {
+ name = imUserInfo.NickName;
+ }
+ else
+ {
+ if (frameworkUser.Name.StartsWith("1") && frameworkUser.Name.Length == 11)
+ {
+ name = frameworkUser.Name.Substring(0, 3) + "****" + frameworkUser.Name.Substring(7, 4);
+ }
+ else
+ {
+ name = frameworkUser.Name;
+ }
+ }
+ projectfasongxiaoxiDTO.HuiyuanName = name;
projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO);
}
}
@@ -614,6 +637,24 @@
projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId;
projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower();
projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname;
+ string name = "";
+ var imUserInfo = imUserInfos.Where(x => x.Id == projectfasongxiaoxiDTO.HuiyuanId).FirstOrDefault();
+ if (imUserInfo != null)
+ {
+ name = imUserInfo.NickName;
+ }
+ else
+ {
+ if (frameworkUser.Name.StartsWith("1") && frameworkUser.Name.Length == 11)
+ {
+ name = frameworkUser.Name.Substring(0, 3) + "****" + frameworkUser.Name.Substring(7, 4);
+ }
+ else
+ {
+ name = frameworkUser.Name;
+ }
+ }
+ projectfasongxiaoxiDTO.HuiyuanName = name;
projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO);
}
}
@@ -767,7 +808,7 @@
+ "\"appkey\": \"" + appkey + "\","
+ "\"senderId\": \"" + ywjl.UserSn + "\","
+ "\"senderData\": { \"avatar\": \"\",\"name\": \""+ ywjl.UserName + "\"},"
- + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"\"}},"
+ + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \""+ projectfasongxiaoxisywjl[i].HuiyuanName+ "\"}},"
+ "\"type\": \"text\","
+ "\"payload\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔★紝鐢�3浣嶉��浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ユ爣涔︼紝鏉滅粷搴熸爣 銆佸府鍔╂偍寰楀埌鍏ㄩ儴缁煎悎璇勫寰楀垎锛岀粡鏀块噰鍜ㄨ鍏徃妫�鏌ヨ繃鐨勬爣涔︼紝涓嶅彲鑳借搴熸爣锛岃鎯呰鍜ㄨ锛�" + ywjl.Phone + " \","
+ "\"notification\": { \"title\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔� \",\"body\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔� \","
@@ -885,7 +926,7 @@
+ "\"appkey\": \"" + appkey + "\","
+ "\"senderId\": \"kehujingli\","
+ "\"senderData\": { \"avatar\": \"\",\"name\": \"瀹㈡埛缁忕悊\"},"
- + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"\"}},"
+ + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"" + projectfasongxiaoxisywjl[i].HuiyuanName + "\"}},"
+ "\"type\": \"text\","
+ "\"payload\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔★紝鐢�3浣嶉��浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ユ爣涔︼紝鏉滅粷搴熸爣 銆佸府鍔╂偍寰楀埌鍏ㄩ儴缁煎悎璇勫寰楀垎锛岀粡鏀块噰鍜ㄨ鍏徃妫�鏌ヨ繃鐨勬爣涔︼紝涓嶅彲鑳借搴熸爣锛岃鎯呰鍜ㄨ锛�400-028-8080 \","
+ "\"notification\": { \"title\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔� \",\"body\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔� \","
@@ -1292,6 +1333,24 @@
projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId;
projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower();
projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname;
+ string name = "";
+ var imUserInfo = imUserInfos.Where(x => x.Id == projectfasongxiaoxiDTO.HuiyuanId).FirstOrDefault();
+ if (imUserInfo != null)
+ {
+ name = imUserInfo.NickName;
+ }
+ else
+ {
+ if (frameworkUser.Name.StartsWith("1") && frameworkUser.Name.Length == 11)
+ {
+ name = frameworkUser.Name.Substring(0, 3) + "****" + frameworkUser.Name.Substring(7, 4);
+ }
+ else
+ {
+ name = frameworkUser.Name;
+ }
+ }
+ projectfasongxiaoxiDTO.HuiyuanName = name;
projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO);
}
}
@@ -1341,6 +1400,24 @@
projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId;
projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower();
projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname;
+ string name = "";
+ var imUserInfo = imUserInfos.Where(x => x.Id == projectfasongxiaoxiDTO.HuiyuanId).FirstOrDefault();
+ if (imUserInfo != null)
+ {
+ name = imUserInfo.NickName;
+ }
+ else
+ {
+ if (frameworkUser.Name.StartsWith("1") && frameworkUser.Name.Length == 11)
+ {
+ name = frameworkUser.Name.Substring(0, 3) + "****" + frameworkUser.Name.Substring(7, 4);
+ }
+ else
+ {
+ name = frameworkUser.Name;
+ }
+ }
+ projectfasongxiaoxiDTO.HuiyuanName = name;
projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO);
}
}
@@ -1493,7 +1570,7 @@
+ "\"appkey\": \"" + appkey + "\","
+ "\"senderId\": \"" + ywjl.UserSn + "\","
+ "\"senderData\": { \"avatar\": \"\",\"name\": \"" + ywjl.UserName + "\"},"
- + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"\"}},"
+ + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"" + projectfasongxiaoxisywjl[i].HuiyuanName + "\"}},"
+ "\"type\": \"text\","
+ "\"payload\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵ｅ垎鐞嗙敱锛屽鏋滄偍鍦ㄥ弬鍔犫��" + projectfasongxiaoxisywjl[i].Projectname + "鈥濇姇鏍囧墠鎵炬斂閲囧挩璇㈡鏌ユ爣涔︼紝鑷冲皯鎻愬崌璇勫寰楀垎5-8鍒嗭紝涔熻涓爣鐨勫氨鏄吹鍏徃銆備簡瑙ｈ鎯呰鍜ㄨ锛�" + ywjl.Phone + " \","
+ "\"notification\": { \"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�� \",\"body\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�� \","
@@ -1575,7 +1652,7 @@
+ "\"appkey\": \"" + appkey + "\","
+ "\"senderId\": \"kehujingli\","
+ "\"senderData\": { \"avatar\": \"\",\"name\": \"瀹㈡埛缁忕悊\"},"
- + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"\"}},"
+ + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"" + projectfasongxiaoxisywjl[i].HuiyuanName + "\"}},"
+ "\"type\": \"text\","
+ "\"payload\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵ｅ垎鐞嗙敱锛屽鏋滄偍鍦ㄥ弬鍔犫��" + projectfasongxiaoxisywjl[i].Projectname + "鈥濇姇鏍囧墠鎵炬斂閲囧挩璇㈡鏌ユ爣涔︼紝鑷冲皯鎻愬崌璇勫寰楀垎5-8鍒嗭紝涔熻涓爣鐨勫氨鏄吹鍏徃銆備簡瑙ｈ鎯呰鍜ㄨ锛�400-028-8080 \","
+ "\"notification\": { \"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�� \",\"body\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�� \","
@@ -1895,6 +1972,24 @@
projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId;
projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower();
projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname;
+ string name = "";
+ var imUserInfo = imUserInfos.Where(x => x.Id == projectfasongxiaoxiDTO.HuiyuanId).FirstOrDefault();
+ if (imUserInfo != null)
+ {
+ name = imUserInfo.NickName;
+ }
+ else
+ {
+ if (frameworkUser.Name.StartsWith("1") && frameworkUser.Name.Length == 11)
+ {
+ name = frameworkUser.Name.Substring(0, 3) + "****" + frameworkUser.Name.Substring(7, 4);
+ }
+ else
+ {
+ name = frameworkUser.Name;
+ }
+ }
+ projectfasongxiaoxiDTO.HuiyuanName = name;
projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO);
}
}
@@ -1944,6 +2039,24 @@
projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId;
projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower();
projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname;
+ string name = "";
+ var imUserInfo = imUserInfos.Where(x => x.Id == projectfasongxiaoxiDTO.HuiyuanId).FirstOrDefault();
+ if (imUserInfo != null)
+ {
+ name = imUserInfo.NickName;
+ }
+ else
+ {
+ if (frameworkUser.Name.StartsWith("1") && frameworkUser.Name.Length == 11)
+ {
+ name = frameworkUser.Name.Substring(0, 3) + "****" + frameworkUser.Name.Substring(7, 4);
+ }
+ else
+ {
+ name = frameworkUser.Name;
+ }
+ }
+ projectfasongxiaoxiDTO.HuiyuanName = name;
projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO);
}
}
@@ -2097,7 +2210,7 @@
+ "\"appkey\": \"" + appkey + "\","
+ "\"senderId\": \"" + ywjl.UserSn + "\","
+ "\"senderData\": { \"avatar\": \"\",\"name\": \"" + ywjl.UserName + "\"},"
- + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"\"}},"
+ + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"" + projectfasongxiaoxisywjl[i].HuiyuanName + "\"}},"
+ "\"type\": \"text\","
+ "\"payload\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵ｅ垎鐞嗙敱锛岃嚦灏戝姪鎮ㄦ彁鍗囩患鍚堣瘎瀹″緱鍒�5-10鍒嗐�備簡瑙ｈ鎯呰鍜ㄨ锛�" + ywjl.Phone + " \","
+ "\"notification\": { \"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�� \",\"body\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�� \","
@@ -2217,7 +2330,7 @@
+ "\"appkey\": \"" + appkey + "\","
+ "\"senderId\": \"kehujingli\","
+ "\"senderData\": { \"avatar\": \"\",\"name\": \"瀹㈡埛缁忕悊\"},"
- + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"\"}},"
+ + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"" + projectfasongxiaoxisywjl[i].HuiyuanName + "\"}},"
+ "\"type\": \"text\","
+ "\"payload\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵ｅ垎鐞嗙敱锛岃嚦灏戝姪鎮ㄦ彁鍗囩患鍚堣瘎瀹″緱鍒�5-10鍒嗐�備簡瑙ｈ鎯呰鍜ㄨ锛�400-028-8080 \","
+ "\"notification\": { \"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�� \",\"body\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�� \","
@@ -2565,6 +2678,24 @@
projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId;
projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower();
projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname;
+ string name = "";
+ var imUserInfo = imUserInfos.Where(x => x.Id == projectfasongxiaoxiDTO.HuiyuanId).FirstOrDefault();
+ if (imUserInfo != null)
+ {
+ name = imUserInfo.NickName;
+ }
+ else
+ {
+ if (frameworkUser.Name.StartsWith("1") && frameworkUser.Name.Length == 11)
+ {
+ name = frameworkUser.Name.Substring(0, 3) + "****" + frameworkUser.Name.Substring(7, 4);
+ }
+ else
+ {
+ name = frameworkUser.Name;
+ }
+ }
+ projectfasongxiaoxiDTO.HuiyuanName = name;
projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO);
}
}
@@ -2614,6 +2745,24 @@
projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId;
projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower();
projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname;
+ string name = "";
+ var imUserInfo = imUserInfos.Where(x => x.Id == projectfasongxiaoxiDTO.HuiyuanId).FirstOrDefault();
+ if (imUserInfo != null)
+ {
+ name = imUserInfo.NickName;
+ }
+ else
+ {
+ if (frameworkUser.Name.StartsWith("1") && frameworkUser.Name.Length == 11)
+ {
+ name = frameworkUser.Name.Substring(0, 3) + "****" + frameworkUser.Name.Substring(7, 4);
+ }
+ else
+ {
+ name = frameworkUser.Name;
+ }
+ }
+ projectfasongxiaoxiDTO.HuiyuanName = name;
projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO);
}
}
@@ -2767,7 +2916,7 @@
+ "\"appkey\": \"" + appkey + "\","
+ "\"senderId\": \"" + ywjl.UserSn + "\","
+ "\"senderData\": { \"avatar\": \"\",\"name\": \"" + ywjl.UserName + "\"},"
- + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"\"}},"
+ + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"" + projectfasongxiaoxisywjl[i].HuiyuanName + "\"}},"
+ "\"type\": \"text\","
+ "\"payload\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╂偍寰楅綈鍏ㄩ儴瀹㈣鍒嗗拰涓昏鍒嗭紝浠庢涓嶅啀涓烘爣涔﹀埗浣滄搷蹇冦�備簡瑙ｈ鎯呰鍜ㄨ锛�" + ywjl.Phone + " \","
+ "\"notification\": { \"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵� \",\"body\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵� \","
@@ -2887,7 +3036,7 @@
+ "\"appkey\": \"" + appkey + "\","
+ "\"senderId\": \"kehujingli\","
+ "\"senderData\": { \"avatar\": \"\",\"name\": \"瀹㈡埛缁忕悊\"},"
- + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"\"}},"
+ + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"" + projectfasongxiaoxisywjl[i].HuiyuanName + "\"}},"
+ "\"type\": \"text\","
+ "\"payload\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╂偍寰楅綈鍏ㄩ儴瀹㈣鍒嗗拰涓昏鍒嗭紝浠庢涓嶅啀涓烘爣涔﹀埗浣滄搷蹇冦�備簡瑙ｈ鎯呰鍜ㄨ锛�400-028-8080 \","
+ "\"notification\": { \"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�漒",\"body\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�漒","
@@ -3608,6 +3757,24 @@
projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId;
projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower();
projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname;
+ string name = "";
+ var imUserInfo = imUserInfos.Where(x => x.Id == projectfasongxiaoxiDTO.HuiyuanId).FirstOrDefault();
+ if (imUserInfo != null)
+ {
+ name = imUserInfo.NickName;
+ }
+ else
+ {
+ if (frameworkUser.Name.StartsWith("1") && frameworkUser.Name.Length == 11)
+ {
+ name = frameworkUser.Name.Substring(0, 3) + "****" + frameworkUser.Name.Substring(7, 4);
+ }
+ else
+ {
+ name = frameworkUser.Name;
+ }
+ }
+ projectfasongxiaoxiDTO.HuiyuanName = name;
projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO);
}
}
@@ -3657,6 +3824,24 @@
projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId;
projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower();
projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname;
+ string name = "";
+ var imUserInfo = imUserInfos.Where(x => x.Id == projectfasongxiaoxiDTO.HuiyuanId).FirstOrDefault();
+ if (imUserInfo != null)
+ {
+ name = imUserInfo.NickName;
+ }
+ else
+ {
+ if (frameworkUser.Name.StartsWith("1") && frameworkUser.Name.Length == 11)
+ {
+ name = frameworkUser.Name.Substring(0, 3) + "****" + frameworkUser.Name.Substring(7, 4);
+ }
+ else
+ {
+ name = frameworkUser.Name;
+ }
+ }
+ projectfasongxiaoxiDTO.HuiyuanName = name;
projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO);
}
}
@@ -3805,7 +3990,7 @@
+ "\"appkey\": \"" + appkey + "\","
+ "\"senderId\": \"" + ywjl.UserSn + "\","
+ "\"senderData\": { \"avatar\": \"\",\"name\": \"" + ywjl.UserName + "\"},"
- + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"\"}},"
+ + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"" + projectfasongxiaoxisywjl[i].HuiyuanName + "\"}},"
+ "\"type\": \"text\","
+ "\"payload\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠ｆ嫙璐ㄧ枒鍑姐�佹姇璇変功锛岃祫娣辨斂搴滈噰璐硶寰嬩笓瀹躲��3000澶氫欢璐ㄧ枒鎶曡瘔鎴愬姛妗堜緥锛屾壘鏀块噰鍜ㄨ锛岃姳閽辨洿灏戙�佽儨绠楁洿楂橈紝鎺ュ彈鎺ㄩ闄╀唬鐞嗭紝璐ㄧ枒鎶曡瘔鎴愬姛鍐嶆敹璐广�備簡瑙ｈ鎯呰鍜ㄨ锛�" + ywjl.Phone + " \","
+ "\"notification\": { \"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠ｆ嫙璐ㄧ枒鍑姐�佹姇璇変功 \",\"body\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠ｆ嫙璐ㄧ枒鍑姐�佹姇璇変功 \","
@@ -3926,7 +4111,7 @@
+ "\"appkey\": \"" + appkey + "\","
+ "\"senderId\": \"kehujingli\","
+ "\"senderData\": { \"avatar\": \"\",\"name\": \"瀹㈡埛缁忕悊\"},"
- + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"\"}},"
+ + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"" + projectfasongxiaoxisywjl[i].HuiyuanName + "\"}},"
+ "\"type\": \"text\","
+ "\"payload\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠ｆ嫙璐ㄧ枒鍑姐�佹姇璇変功锛岃祫娣辨斂搴滈噰璐硶寰嬩笓瀹躲��3000澶氫欢璐ㄧ枒鎶曡瘔鎴愬姛妗堜緥锛屾壘鏀块噰鍜ㄨ锛岃姳閽辨洿灏戙�佽儨绠楁洿楂橈紝鎺ュ彈鎺ㄩ闄╀唬鐞嗭紝璐ㄧ枒鎶曡瘔鎴愬姛鍐嶆敹璐广�備簡瑙ｈ鎯呰鍜ㄨ锛�400-028-8080 \","
+ "\"notification\": { \"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠ｆ嫙璐ㄧ枒鍑姐�佹姇璇変功 \",\"body\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠ｆ嫙璐ㄧ枒鍑姐�佹姇璇変功 \","
diff --git a/zhengcaioa/zhengcaioa/appsettings.Development.json b/zhengcaioa/zhengcaioa/appsettings.Development.json
index 5d8d368..ea087af 100644
--- a/zhengcaioa/zhengcaioa/appsettings.Development.json
+++ b/zhengcaioa/zhengcaioa/appsettings.Development.json
@@ -1,9 +1,10 @@
{
"ConnectionStrings": {
- "DefaultConnection": "server=localhost;database=zhengcaioa;uid=sa;pwd=123456;",
+ "DefaultConnection": "server=localhost;database=zhengcaioa44;uid=sa;pwd=123456;",
"zcwebConnection": "server=localhost;database=zcweb;uid=sa;pwd=123456;",
"zcUserInfoNConnection": "server=localhost;database=zcUserInfoN_db;uid=sa;pwd=123456;",
- "WebCrawlerConnection": "server=localhost;database=WebCrawler;uid=sa;pwd=123456;"
+ "WebCrawlerConnection": "server=localhost;database=WebCrawler;uid=sa;pwd=123456;",
+ "IMdbtestConnection": "server=localhost;database=IMdbtest;uid=sa;pwd=123456;"
},
"Logging": {
"LogLevel": {
@@ -15,7 +16,7 @@
"AllowedHosts": "*",
"Elasticsearchurl": "http://192.168.0.15:9200",
"SecurityKey": "superSecretKey@345",
- "Shuchengurl": "http://192.168.0.7:8085",
+ "Shuchengurl": "http://192.168.0.21:8085",
"GetShopUsers": "/actionapi/Shop/GetShopUsers",
"huiyuanurl": "http://192.168.0.113:8087",
"GetDateFirstOrderUser": "/api/ZCBackgRound/GetDateFirstOrderUser",
diff --git a/zhengcaioa/zhengcaioa/appsettings.json b/zhengcaioa/zhengcaioa/appsettings.json
index d3e1c60..744879f 100644
--- a/zhengcaioa/zhengcaioa/appsettings.json
+++ b/zhengcaioa/zhengcaioa/appsettings.json
@@ -3,7 +3,8 @@
"DefaultConnection": "server=172.26.97.184;database=zhengcaioa;uid=sa;pwd=Za20222812;",
"zcwebConnection": "server=172.26.97.184;database=zcweb;uid=sa;pwd=Za20222812;",
"zcUserInfoNConnection": "server=172.26.97.184;database=zcUserInfoN_db;uid=sa;pwd=Za20222812;",
- "WebCrawlerConnection": "server=172.26.97.184;database=WebCrawler;uid=sa;pwd=Za20222812;"
+ "WebCrawlerConnection": "server=172.26.97.184;database=WebCrawler;uid=sa;pwd=Za20222812;",
+ "IMdbtestConnection": "server=172.26.97.184;database=IMdbtest;uid=sa;pwd=Za20222812;"
},
"Logging": {
"LogLevel": {
--
Gitblit v1.9.1