From 1aa53fde5eb18a39c53daf910d69cb857913b08d Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 06 七月 2022 15:23:02 +0800
Subject: [PATCH] 提交

---
 zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Index.cshtml                  |   33 ++++++++
 zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs |  120 +++++++++++++++++++++++++++++-
 zhengcaioa/zhengcaioa/appsettings.Development.json                        |    2 
 zhengcaioa/Crawler/sichuan/OldSichuanoperation.cs                         |   12 ++
 zhengcaioa/zhengcaioa/Controllers/LiaotianController.cs                   |   14 +-
 zhengcaioa/Crawler/Program.cs                                             |    6 +
 zhengcaioa/Crawler/sichuan/sichuanoperation.cs                            |   53 +++++++------
 7 files changed, 202 insertions(+), 38 deletions(-)

diff --git a/zhengcaioa/Crawler/Program.cs b/zhengcaioa/Crawler/Program.cs
index 98b3c75..e71f603 100644
--- a/zhengcaioa/Crawler/Program.cs
+++ b/zhengcaioa/Crawler/Program.cs
@@ -5,6 +5,7 @@
 using OpenQA.Selenium;
 using OpenQA.Selenium.Chrome;
 using System;
+using System.Net;
 using System.Net.Http;
 using System.Threading;
 using zhengcaioa.Models;
@@ -13,6 +14,7 @@
 {
     class Program
     {
+      
         public static string connection = @"server=.;database=WebCrawler;uid=sa;pwd=123456;";
         //public static string connection = @"server=172.26.97.147;database=WebCrawler;uid=sa;pwd=Za20222812;";
         static void Main(string[] args)
@@ -144,12 +146,13 @@
         {
             while (true)
             {
+                ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
                 var dbContextOptionBuilder = new DbContextOptionsBuilder<WebCrawlerContext>();
                 var cccontext = new WebCrawlerContext(dbContextOptionBuilder.UseSqlServer(connection).Options);
                 //鑾峰彇鍥涘窛鐨勬斂閲囨暟鎹�
                 sichuanoperation.operations(cccontext);
                 //Console.WriteLine("杩欎釜鏆傚仠");
-                Thread.CurrentThread.Join(1000*60*60*2);//闃绘璁惧畾鏃堕棿
+                Thread.CurrentThread.Join(1000 * 60 * 60 * 2);//闃绘璁惧畾鏃堕棿
             }
         }
 
@@ -157,6 +160,7 @@
         {
             while (true)
             {
+                ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
                 var dbContextOptionBuilder = new DbContextOptionsBuilder<WebCrawlerContext>();
                 var cccontext = new WebCrawlerContext(dbContextOptionBuilder.UseSqlServer(connection).Options);
                 //鑾峰彇鍥涘窛鐨勬斂閲囨暟鎹�
diff --git a/zhengcaioa/Crawler/sichuan/OldSichuanoperation.cs b/zhengcaioa/Crawler/sichuan/OldSichuanoperation.cs
index e6abaa5..92ae231 100644
--- a/zhengcaioa/Crawler/sichuan/OldSichuanoperation.cs
+++ b/zhengcaioa/Crawler/sichuan/OldSichuanoperation.cs
@@ -14884,11 +14884,13 @@
         //鎰忓悜鍏憡
         public static void yixianggonggao(WebCrawlerContext _ccontext,string sichuanpageurll, string City, string CityName, string regionCode, string regionName,string startTime,int page)
         {
+           
             sichuanpageurll = sichuanpageurll.Replace("startTime=", "startTime="+ startTime);
             var parser = new HtmlParser();
             while (true)
             {
-              string  sichuanpageurl2 = sichuanpageurll.Replace("curPage=1", "curPage=" + page);
+                logg.WriteLog(page.ToString());
+                string  sichuanpageurl2 = sichuanpageurll.Replace("curPage=1", "curPage=" + page);
                 using (HttpClient client = new HttpClient())
                 {
                     //List<sichuanjieshoudtl> data = new List<sichuanjieshoudtl>();
@@ -15041,10 +15043,12 @@
         //閲囪喘鍏憡
         public static void caigougonggao(WebCrawlerContext _ccontext, string sichuanpageurll, string City, string CityName, string regionCode, string regionName, string startTime, int page, string cgfs, string cgfsName)
         {
+           
             sichuanpageurll = sichuanpageurll.Replace("startTime=", "startTime=" + startTime);
             var parser = new HtmlParser();
             while (true)
             {
+                logg.WriteLog(page.ToString());
                 string sichuanpageurl2 = sichuanpageurll.Replace("curPage=1", "curPage=" + page);
                 using (HttpClient client = new HttpClient())
                 {
@@ -15274,10 +15278,12 @@
         //涓爣鍏憡
         public static void zhongbiaogonggao(WebCrawlerContext _ccontext, string sichuanpageurll, string City, string CityName, string regionCode, string regionName, string startTime, int page)
         {
+          
             sichuanpageurll = sichuanpageurll.Replace("startTime=", "startTime=" + startTime);
             var parser = new HtmlParser();
             while (true)
             {
+                logg.WriteLog(page.ToString());
                 string sichuanpageurl2 = sichuanpageurll.Replace("curPage=1", "curPage=" + page);
                 using (HttpClient client = new HttpClient())
                 {
@@ -15507,10 +15513,12 @@
         //鏇存鍏憡
         public static void gengzhenggonggao(WebCrawlerContext _ccontext, string sichuanpageurll, string City, string CityName, string regionCode, string regionName, string startTime, int page)
         {
+           
             sichuanpageurll = sichuanpageurll.Replace("startTime=", "startTime=" + startTime);
             var parser = new HtmlParser();
             while (true)
             {
+                logg.WriteLog(page.ToString());
                 string sichuanpageurl2 = sichuanpageurll.Replace("curPage=1", "curPage=" + page);
                 using (HttpClient client = new HttpClient())
                 {
@@ -15740,10 +15748,12 @@
         //搴熸爣鍏憡
         public static void feibiaogonggao(WebCrawlerContext _ccontext, string sichuanpageurll, string City, string CityName, string regionCode, string regionName, string startTime, int page)
         {
+          
             sichuanpageurll = sichuanpageurll.Replace("startTime=", "startTime=" + startTime);
             var parser = new HtmlParser();
             while (true)
             {
+                logg.WriteLog(page.ToString());
                 string sichuanpageurl2 = sichuanpageurll.Replace("curPage=1", "curPage=" + page);
                 using (HttpClient client = new HttpClient())
                 {
diff --git a/zhengcaioa/Crawler/sichuan/sichuanoperation.cs b/zhengcaioa/Crawler/sichuan/sichuanoperation.cs
index 8026fde..7fa8cbe 100644
--- a/zhengcaioa/Crawler/sichuan/sichuanoperation.cs
+++ b/zhengcaioa/Crawler/sichuan/sichuanoperation.cs
@@ -46,6 +46,7 @@
                 logg.WriteLog("鍥涘窛鐪侀噰璐叕鍛� 寮�濮嬭幏鍙�");
                 while (true)
                 {
+                    logg.WriteLog(currPage.ToString());
                     string address = "https://zfcg.scsczt.cn/freecms/rest/v1/notice/selectInfoMoreChannel.do?&siteId=94c965cc-c55d-4f92-8469-d5875c68bd04&channel=c5bff13f-21ca-4dac-b158-cb40accd3035&currPage=" + currPage + "&pageSize=" + pageSize + "&noticeType=00101&regionCode=&purchaseManner=&title=&openTenderCode=&purchaser=&agency=&purchaseNature=&operationStartTime=" + operationStartTime + "&operationEndTime=&selectTimeName=noticeTime&cityOrArea=";
                     using (HttpClient client = new HttpClient())
                     {
@@ -325,6 +326,7 @@
                 logg.WriteLog("鍥涘窛鐪佷腑鏍囧叕鍛� 寮�濮嬭幏鍙�");
                 while (true)
                 {
+                    logg.WriteLog(currPage.ToString());
                     string address = "https://zfcg.scsczt.cn/freecms/rest/v1/notice/selectInfoMoreChannel.do?&siteId=94c965cc-c55d-4f92-8469-d5875c68bd04&channel=c5bff13f-21ca-4dac-b158-cb40accd3035&currPage=" + currPage + "&pageSize=" + pageSize + "&noticeType=00102&regionCode=&purchaseManner=&title=&openTenderCode=&purchaser=&agency=&purchaseNature=&operationStartTime=" + operationStartTime + "&operationEndTime=&selectTimeName=noticeTime&cityOrArea=";
                     using (HttpClient client = new HttpClient())
                     {
@@ -476,27 +478,27 @@
                                             cgfsName = "鍏紑鎷涙爣";
                                             break;
                                         case "2":
-                                            zhengfuProject.Cgfs = "1";
+                                            zhengfuProject.Cgfs = "2";
                                             cgfsName = "閭�璇锋嫑鏍�";
                                             break;
                                         case "3":
-                                            zhengfuProject.Cgfs = "1";
+                                            zhengfuProject.Cgfs = "5";
                                             cgfsName = "绔炰簤鎬ц皥鍒�";
                                             break;
                                         case "4":
-                                            zhengfuProject.Cgfs = "1";
+                                            zhengfuProject.Cgfs = "4";
                                             cgfsName = "璇环";
                                             break;
                                         case "5":
-                                            zhengfuProject.Cgfs = "1";
+                                            zhengfuProject.Cgfs = "7";
                                             cgfsName = "鍗曚竴鏉ユ簮";
                                             break;
                                         case "6":
-                                            zhengfuProject.Cgfs = "1";
+                                            zhengfuProject.Cgfs = "3";
                                             cgfsName = "绔炰簤鎬х鍟�";
                                             break;
                                         case "9":
-                                            zhengfuProject.Cgfs = "1";
+                                            zhengfuProject.Cgfs = "10";
                                             cgfsName = "鍏朵粬";
                                             break;
                                     }
@@ -604,6 +606,7 @@
                 logg.WriteLog("鍥涘窛鐪佹洿姝e叕鍛� 寮�濮嬭幏鍙�");
                 while (true)
                 {
+                    logg.WriteLog(currPage.ToString());
                     string address = "https://zfcg.scsczt.cn/freecms/rest/v1/notice/selectInfoMoreChannel.do?&siteId=94c965cc-c55d-4f92-8469-d5875c68bd04&channel=c5bff13f-21ca-4dac-b158-cb40accd3035&currPage=" + currPage + "&pageSize=" + pageSize + "&noticeType=00103&regionCode=&purchaseManner=&title=&openTenderCode=&purchaser=&agency=&purchaseNature=&operationStartTime=" + operationStartTime + "&operationEndTime=&selectTimeName=noticeTime&cityOrArea=";
                     using (HttpClient client = new HttpClient())
                     {
@@ -755,27 +758,27 @@
                                             cgfsName = "鍏紑鎷涙爣";
                                             break;
                                         case "2":
-                                            zhengfuProject.Cgfs = "1";
+                                            zhengfuProject.Cgfs = "2";
                                             cgfsName = "閭�璇锋嫑鏍�";
                                             break;
                                         case "3":
-                                            zhengfuProject.Cgfs = "1";
+                                            zhengfuProject.Cgfs = "5";
                                             cgfsName = "绔炰簤鎬ц皥鍒�";
                                             break;
                                         case "4":
-                                            zhengfuProject.Cgfs = "1";
+                                            zhengfuProject.Cgfs = "4";
                                             cgfsName = "璇环";
                                             break;
                                         case "5":
-                                            zhengfuProject.Cgfs = "1";
+                                            zhengfuProject.Cgfs = "7";
                                             cgfsName = "鍗曚竴鏉ユ簮";
                                             break;
                                         case "6":
-                                            zhengfuProject.Cgfs = "1";
+                                            zhengfuProject.Cgfs = "3";
                                             cgfsName = "绔炰簤鎬х鍟�";
                                             break;
                                         case "9":
-                                            zhengfuProject.Cgfs = "1";
+                                            zhengfuProject.Cgfs = "10";
                                             cgfsName = "鍏朵粬";
                                             break;
                                     }
@@ -884,6 +887,7 @@
                 logg.WriteLog("鍥涘窛鐪佸簾鏍囧叕鍛� 寮�濮嬭幏鍙�");
                 while (true)
                 {
+                    logg.WriteLog(currPage.ToString());
                     string address = "https://zfcg.scsczt.cn/freecms/rest/v1/notice/selectInfoMoreChannel.do?&siteId=94c965cc-c55d-4f92-8469-d5875c68bd04&channel=c5bff13f-21ca-4dac-b158-cb40accd3035&currPage=" + currPage + "&pageSize=" + pageSize + "&noticeType=001004,001006&regionCode=&purchaseManner=&title=&openTenderCode=&purchaser=&agency=&purchaseNature=&operationStartTime=" + operationStartTime + "&operationEndTime=&selectTimeName=noticeTime&cityOrArea=";
                     using (HttpClient client = new HttpClient())
                     {
@@ -1035,27 +1039,27 @@
                                             cgfsName = "鍏紑鎷涙爣";
                                             break;
                                         case "2":
-                                            zhengfuProject.Cgfs = "1";
+                                            zhengfuProject.Cgfs = "2";
                                             cgfsName = "閭�璇锋嫑鏍�";
                                             break;
                                         case "3":
-                                            zhengfuProject.Cgfs = "1";
+                                            zhengfuProject.Cgfs = "5";
                                             cgfsName = "绔炰簤鎬ц皥鍒�";
                                             break;
                                         case "4":
-                                            zhengfuProject.Cgfs = "1";
+                                            zhengfuProject.Cgfs = "4";
                                             cgfsName = "璇环";
                                             break;
                                         case "5":
-                                            zhengfuProject.Cgfs = "1";
+                                            zhengfuProject.Cgfs = "7";
                                             cgfsName = "鍗曚竴鏉ユ簮";
                                             break;
                                         case "6":
-                                            zhengfuProject.Cgfs = "1";
+                                            zhengfuProject.Cgfs = "3";
                                             cgfsName = "绔炰簤鎬х鍟�";
                                             break;
                                         case "9":
-                                            zhengfuProject.Cgfs = "1";
+                                            zhengfuProject.Cgfs = "10";
                                             cgfsName = "鍏朵粬";
                                             break;
                                     }
@@ -1163,6 +1167,7 @@
                 logg.WriteLog("鍥涘窛鐪佹剰鍚戝叕寮� 寮�濮嬭幏鍙�");
                 while (true)
                 {
+                    logg.WriteLog(currPage.ToString());
                     string address = "https://zfcg.scsczt.cn/freecms/rest/v1/notice/selectInfoMoreChannel.do?&siteId=94c965cc-c55d-4f92-8469-d5875c68bd04&channel=c5bff13f-21ca-4dac-b158-cb40accd3035&currPage="+ currPage + "&pageSize="+ pageSize + "&noticeType=59&regionCode=&purchaseManner=&title=&openTenderCode=&purchaser=&agency=&purchaseNature=&operationStartTime="+ operationStartTime + "&operationEndTime=&selectTimeName=noticeTime&cityOrArea=";
                     using (HttpClient client = new HttpClient())
                     {
@@ -1314,27 +1319,27 @@
                                             cgfsName = "鍏紑鎷涙爣";
                                             break;
                                         case "2":
-                                            zhengfuProject.Cgfs = "1";
+                                            zhengfuProject.Cgfs = "2";
                                             cgfsName = "閭�璇锋嫑鏍�";
                                             break;
                                         case "3":
-                                            zhengfuProject.Cgfs = "1";
+                                            zhengfuProject.Cgfs = "5";
                                             cgfsName = "绔炰簤鎬ц皥鍒�";
                                             break;
                                         case "4":
-                                            zhengfuProject.Cgfs = "1";
+                                            zhengfuProject.Cgfs = "4";
                                             cgfsName = "璇环";
                                             break;
                                         case "5":
-                                            zhengfuProject.Cgfs = "1";
+                                            zhengfuProject.Cgfs = "7";
                                             cgfsName = "鍗曚竴鏉ユ簮";
                                             break;
                                         case "6":
-                                            zhengfuProject.Cgfs = "1";
+                                            zhengfuProject.Cgfs = "3";
                                             cgfsName = "绔炰簤鎬х鍟�";
                                             break;
                                         case "9":
-                                            zhengfuProject.Cgfs = "1";
+                                            zhengfuProject.Cgfs = "10";
                                             cgfsName = "鍏朵粬";
                                             break;
                                     }
diff --git a/zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs b/zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs
index cf5f8ef..69ca945 100644
--- a/zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs
@@ -82,6 +82,15 @@
             actionlist.Add(actionEntity2);
 
 
+            ActionEntity actionEntity3 = new ActionEntity();
+            actionEntity3.OpenType = 0;
+            actionEntity3.ActionUrl = "";
+            actionEntity3.ActionFun = "Zhuanyi";
+            actionEntity3.PageIco = "fa fa-plus";
+            actionEntity3.ActionName = "鏁版嵁杞Щ";
+            actionlist.Add(actionEntity3);
+
+
             ViewData["ActionInfo"] = actionlist;
 
 
@@ -316,7 +325,7 @@
             {
 
                 string api_domain = _configuration.GetSection("Elasticsearchurl").Value;
-                string url = $"{api_domain}/liaotian/person/" + data.Id;
+                string url = $"{api_domain}/liaotian/_doc/" + data.Id;
                 //string requestJson = "{\"id\": \"" + Id + "\",\"question\": \"" + data.Question + "\",\"anwser\": \"" + data.Anwser + "\"}";
                 try
                 {
@@ -417,7 +426,7 @@
             resultEntity = _expertTestTopicService.shenpi(data);
 
             string api_domain = _configuration.GetSection("Elasticsearchurl").Value;
-            string url = $"{api_domain}/liaotian/person/" + data.Id;
+            string url = $"{api_domain}/liaotian/_doc/" + data.Id;
             LiaotianElasticsearchDTO liaotianElasticsearchDTO = new LiaotianElasticsearchDTO();
             liaotianElasticsearchDTO.id = data.Id;
             liaotianElasticsearchDTO.question = data.Topic;
@@ -533,7 +542,7 @@
               data = _expertTestTopicService.Get(data.Id);
             var datadtls = _expertTestTopicService.GetListanwser(data.Id);
             string api_domain = _configuration.GetSection("Elasticsearchurl").Value;
-            string url = $"{api_domain}/liaotian/person/" + data.Id;
+            string url = $"{api_domain}/liaotian/_doc/" + data.Id;
             LiaotianElasticsearchDTO liaotianElasticsearchDTO = new LiaotianElasticsearchDTO();
             liaotianElasticsearchDTO.id = data.Id;
             liaotianElasticsearchDTO.question = data.Topic;
@@ -616,7 +625,7 @@
             ResultEntity resultEntity = _expertTestTopicService.ModifyStatus(Id, curentuser.Id);
 
             string api_domain = _configuration.GetSection("Elasticsearchurl").Value;
-            string url = $"{api_domain}/liaotian/person/" + Id;
+            string url = $"{api_domain}/liaotian/_doc/" + Id;
             //string requestJson = "{\"id\": \"" + Id + "\",\"question\": \"" + data.Question + "\",\"anwser\": \"" + data.Anwser + "\"}";
             try
             {
@@ -1093,5 +1102,108 @@
             return View();
 
         }
+
+
+
+        /// <summary>
+        /// 杞Щ鏁版嵁
+        /// </summary>
+        /// <param name="data">宀椾綅瀹炰綋绫诲璞�</param>
+        /// <returns></returns>
+
+        [CheckLogin]
+        public async Task<string> ZhuanyiAsync()
+        {
+            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+            ViewData["curentuser"] = curentuser;
+            ResultEntity resultEntity = new ResultEntity();
+            resultEntity.Result = false;
+
+            var expertTestTopicDTOs = _expertTestTopicService.GetList().Where(x => x.ShenpiStatus == "A").ToList();
+
+
+            try
+            {
+                foreach (var data in expertTestTopicDTOs)
+                {
+
+
+                    string api_domain = _configuration.GetSection("Elasticsearchurl").Value;
+                    string url = $"{api_domain}/liaotian/_doc/" + data.Id;
+
+                    var datadtls = _expertTestTopicService.GetListanwser(data.Id);
+                    LiaotianElasticsearchDTO liaotianElasticsearchDTO = new LiaotianElasticsearchDTO();
+                    liaotianElasticsearchDTO.id = data.Id;
+                    liaotianElasticsearchDTO.question = data.Topic;
+                    liaotianElasticsearchDTO.anwser = data.Topic + "  </br> ";
+                    foreach (var datadtl in datadtls)
+                    {
+                        if (datadtl.Shifouzhengqu == "A")
+                        {
+                            liaotianElasticsearchDTO.anwser += "<font color=\"#FF0000\">" + datadtl.Anwserno + " " + datadtl.Anwser + "</font>   </br>";
+                        }
+                        else
+                        {
+                            liaotianElasticsearchDTO.anwser += datadtl.Anwserno + " " + datadtl.Anwser + "  </br> ";
+                        }
+
+                    }
+
+
+
+                    string requestJson = JsonConvert.SerializeObject(liaotianElasticsearchDTO);
+
+
+
+
+
+                
+                    string result = string.Empty;
+                    Uri postUrl = new Uri(url);
+
+                    using (HttpContent httpContent = new StringContent(requestJson))
+                    {
+                        httpContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
+
+                        var httpClient = _clientFactory.CreateClient();
+                        httpClient.Timeout = new TimeSpan(0, 0, 60);
+                        var Result = await httpClient.PutAsync(postUrl, httpContent);
+                        result = Result.Content.ReadAsStringAsync().Result;
+
+
+
+                    }
+
+                    Newtonsoft.Json.Linq.JObject jobject = (Newtonsoft.Json.Linq.JObject)JsonConvert.DeserializeObject(result);
+
+                    if (jobject["error"] == null && jobject["_shards"]["successful"].ToString() == "1")
+                    {
+                        resultEntity.Result = true;
+                    }
+                    else
+                    {
+                        resultEntity.Result = false;
+                        return JsonConvert.SerializeObject(resultEntity);
+                    }
+                }
+
+
+
+            }
+            catch (Exception e)
+            {
+                resultEntity.Result = false;
+                throw e;
+
+
+            }
+
+
+
+
+
+            return JsonConvert.SerializeObject(resultEntity);
+        }
+
     }
 }
diff --git a/zhengcaioa/zhengcaioa/Controllers/LiaotianController.cs b/zhengcaioa/zhengcaioa/Controllers/LiaotianController.cs
index c467b76..7b1b755 100644
--- a/zhengcaioa/zhengcaioa/Controllers/LiaotianController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/LiaotianController.cs
@@ -54,7 +54,7 @@
             List<LiaotianElasticsearchDTO> liaotianElasticsearchDTOs = new List<LiaotianElasticsearchDTO>();
 
             string api_domain = _configuration.GetSection("Elasticsearchurl").Value;
-            string url = $"{api_domain}/liaotian/person/_search";
+            string url = $"{api_domain}/liaotian/_doc/_search";
 
             string question = info;
 
@@ -180,7 +180,7 @@
                 foreach (var liaotianDTO in liaotianDTOs)
                 {
                     string api_domain = _configuration.GetSection("Elasticsearchurl").Value;
-                    string url = $"{api_domain}/liaotian/person/" + liaotianDTO.Id;
+                    string url = $"{api_domain}/liaotian/_doc/" + liaotianDTO.Id;
 
                     LiaotianElasticsearchDTO liaotianElasticsearchDTO = new LiaotianElasticsearchDTO();
                     liaotianElasticsearchDTO.id = liaotianDTO.Id;
@@ -348,7 +348,7 @@
             {
 
                 string api_domain = _configuration.GetSection("Elasticsearchurl").Value;
-                string url = $"{api_domain}/liaotian/person/" + data.Id;
+                string url = $"{api_domain}/liaotian/_doc/" + data.Id;
                 //string requestJson = "{\"id\": \"" + Id + "\",\"question\": \"" + data.Question + "\",\"anwser\": \"" + data.Anwser + "\"}";
                 try
                 {
@@ -391,7 +391,7 @@
 
 
             //string api_domain = _configuration.GetSection("Elasticsearchurl").Value;
-            //string url = $"{api_domain}/liaotian/person/"+ data.Id;
+            //string url = $"{api_domain}/liaotian/_doc/"+ data.Id;
             //LiaotianElasticsearchDTO liaotianElasticsearchDTO = new LiaotianElasticsearchDTO();
             //liaotianElasticsearchDTO.id = data.Id;
             //liaotianElasticsearchDTO.question = data.Question;
@@ -523,7 +523,7 @@
             
 
             string api_domain = _configuration.GetSection("Elasticsearchurl").Value;
-            string url = $"{api_domain}/liaotian/person/" + data.Id;
+            string url = $"{api_domain}/liaotian/_doc/" + data.Id;
             LiaotianElasticsearchDTO liaotianElasticsearchDTO = new LiaotianElasticsearchDTO();
             liaotianElasticsearchDTO.id = data.Id;
             liaotianElasticsearchDTO.question = data.Question;
@@ -603,7 +603,7 @@
             resultEntity =  _liaotianService.saveLiaotian(data);
 
             string api_domain = _configuration.GetSection("Elasticsearchurl").Value;
-            string url = $"{api_domain}/liaotian/person/" + data.Id;
+            string url = $"{api_domain}/liaotian/_doc/" + data.Id;
             LiaotianElasticsearchDTO liaotianElasticsearchDTO = new LiaotianElasticsearchDTO();
             liaotianElasticsearchDTO.id = data.Id;
             liaotianElasticsearchDTO.question = data.Question;
@@ -675,7 +675,7 @@
             ResultEntity resultEntity = _liaotianService.ModifyStatus(Id, curentuser.Id);
 
             string api_domain = _configuration.GetSection("Elasticsearchurl").Value;
-            string url = $"{api_domain}/liaotian/person/" + Id;
+            string url = $"{api_domain}/liaotian/_doc/" + Id;
             //string requestJson = "{\"id\": \"" + Id + "\",\"question\": \"" + data.Question + "\",\"anwser\": \"" + data.Anwser + "\"}";
             try
             {
diff --git a/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Index.cshtml b/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Index.cshtml
index 5dffcc0..7148016 100644
--- a/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Index.cshtml
@@ -128,6 +128,39 @@
 
         });
 
+
+        var _pageZhuanyi = function () {
+            $.ajax({
+                type: "GET",
+                url: "/ExpertTestTopic/Zhuanyi",
+                dataType: "json",
+                global: false,
+                data: '',
+                success: function (data) {
+
+
+                    if (data.Result) {
+                        //  parent._afterSave(true);
+                        parent.layer.msg('杞Щ鎴愬姛', { icon: 6 });
+
+                    }
+                    else {
+
+                        parent.layer.msg('杞Щ澶辫触', { icon: 5 });
+                    }
+
+                },
+                error: function () {
+                    if ($.isNumber(imgLoad)) {
+                        layer.close(imgLoad);
+                    }
+
+
+                    parent.layer.msg('杞Щ澶辫触', { icon: 5 });
+                }
+            });
+        }
+
         var _afterSave = function (result) {
             if (result) {
                 toastr.success("淇濆瓨鎴愬姛");
diff --git a/zhengcaioa/zhengcaioa/appsettings.Development.json b/zhengcaioa/zhengcaioa/appsettings.Development.json
index 7d40940..a7b5fe7 100644
--- a/zhengcaioa/zhengcaioa/appsettings.Development.json
+++ b/zhengcaioa/zhengcaioa/appsettings.Development.json
@@ -12,7 +12,7 @@
     }
   },
   "AllowedHosts": "*",
-  "Elasticsearchurl": "http://localhost:9200",
+  "Elasticsearchurl": "http://192.168.0.116:9200",
   "SecurityKey": "superSecretKey@345",
   "Shuchengurl": "http://192.168.0.191:8085",
   "GetShopUsers": "/actionapi/Shop/GetShopUsers",

--
Gitblit v1.9.1