Merge branch 'master' of http://47.92.245.94:8000/r/JSU_Pissa_MVC

wx

2023-01-06 474c4fe70ec870c1b49dc92f03e37fc1d57a2a16

Merge branch 'master' of http://47.92.245.94:8000/r/JSU_Pissa_MVC

 GasolineBlend.BLL/TryApplyBLL.cs

@@ -25,5 +25,10 @@
        {
            return _acc.UpdateTryApply(tryApply);
        }

        public bool DelTryApply(int id)
        {
            return _acc.DelTryApply(id);
        }
    }
}

 GasolineBlend.DAL/TryApplyDAL.cs

@@ -24,7 +24,7 @@
            using (IDbConnection connection = new MySqlConnection(connectionString))
            {
                var sql =
                    $"insert into try_apply (name,email,mobile,wechat,company,position,createtime) Values(@name,@email,@mobile,@wechat,@company,@position,@createtime);select @@IDENTITY;";
                    $"insert into try_apply (name,email,mobile,wechat,company,position,createtime,status) Values(@name,@email,@mobile,@wechat,@company,@position,@createtime,@status);select @@IDENTITY;";
                return connection.ExecuteScalar<int>(sql, tryApply) > 0;
            }
        }
@@ -38,6 +38,18 @@
                paras.Add("status", tryApply.status);
                paras.Add("id", tryApply.id);
                return connection.Execute(sql, paras) > 0;
                
            }
        }

        public bool DelTryApply(int id)
        {
            using (IDbConnection connection = new MySqlConnection(connectionString))
            {
                var sql = $"delete from try_apply  where id=@id";
                DynamicParameters paras = new DynamicParameters();
                paras.Add("id", id);
                return connection.Execute(sql, paras) > 0;
            }
        }
    }

 GasolineBlend/Controllers/PatentSearchController.cs

@@ -129,6 +129,19 @@
                PatentSearchAll patentSearchAll = new PatentSearchAll();
                patentSearchAll.content=content.Replace("，",",").Replace("；", ";");
                patentSearchAll.keywordField = keywordField;
                char[] delimiters = new[] { ',', ';', '|' };
                var splittedArray = patentSearchAll.content.Split(delimiters, StringSplitOptions.RemoveEmptyEntries);
                if (keywordField == "assigneeHarmonizedNameArray" && splittedArray != null &&
                    splittedArray.Length > 2000)
                {
                    return Error("获取失败！批量搜索专利数量超过2000！");
                }

                if (keywordField != "assigneeHarmonizedNameArray" && splittedArray != null && splittedArray.Length > 5000)
                {
                    return Error("获取失败！批量搜索专利数量超过5000！");
                }

                patentSearchAll.sortFields = sortFields;
                patentSearchAll.pageNo = pageNo;
                patentSearchAll.pageSize = pageSize;

 GasolineBlend/Controllers/SysController.cs

@@ -37,7 +37,7 @@
        public ActionResult GetCountryMain()
        {
            List<string> listNameCH = new List<string>();
            string[] strNameCh = {"中国", "美国", "日本", "韩国", "德国","法国","意大利", "瑞典", "芬兰", "挪威", "英国", "瑞士", "俄罗斯", "印度", "巴西" };
            string[] strNameCh = {"中国", "美国", "欧盟", "日本", "韩国", "德国","法国","芬兰","意大利", "瑞典",  "挪威", "英国", "瑞士", "印度", "巴西" };
            listNameCH = strNameCh.ToList();
            var res = _countryService.GetListAsync(a=>listNameCH.Contains(a.NameCh), a => a.Sort, OrderByType.Asc, false).Result;
            return SuccessNoShow(data: res);

 GasolineBlend/Controllers/TryApplyController.cs

@@ -46,7 +46,7 @@
                tryApply.createtime = DateTime.Now;
                tryApply.status = "已提交";
                var list = _acc.AddTryApply(tryApply);
                return SuccessNoShow(data: list);
                return Success(message: "您的申请已提交，请耐心等待审核", data: list);
            }
            catch (Exception e)
            {
@@ -74,5 +74,22 @@
                return Error();
            }
        }

        [HttpPost]
        public ActionResult DelTryApply(int id)
        {
            try
            {

                var list = _acc.DelTryApply(id);
                return Success(data: list);
            }
            catch (Exception e)
            {
                LogHelper.Write(Level.Error, "删除申请列表  DelTryApply", e,
                    OperatorProvider.Instance.Current.LoginName); //
                return Error();
            }
        }
    }
}

 GasolineBlend/Pages/index.html

@@ -1 +1 @@
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/Pages/favicon.ico"><title>探数狗 | 您身边的全球专利服务专家</title><script defer="defer" type="module" src="/Pages/js/chunk-vendors.49dc088a.js"></script><script defer="defer" type="module" src="/Pages/js/app.990f461b.js"></script><link href="/Pages/css/app.ab2f4c9a.css" rel="stylesheet"><script defer="defer" src="/Pages/js/chunk-vendors-legacy.f1bf8091.js" nomodule></script><script defer="defer" src="/Pages/js/app-legacy.860cfcee.js" nomodule></script></head><body><noscript><strong>We're sorry but dianzhi doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/Pages/favicon.ico"><title>探数狗 | 您身边的全球专利服务专家</title><script defer="defer" type="module" src="/Pages/js/chunk-vendors.49dc088a.js"></script><script defer="defer" type="module" src="/Pages/js/app.c2cf6abc.js"></script><link href="/Pages/css/app.ab2783ce.css" rel="stylesheet"><script defer="defer" src="/Pages/js/chunk-vendors-legacy.f1bf8091.js" nomodule></script><script defer="defer" src="/Pages/js/app-legacy.78202766.js" nomodule></script></head><body><noscript><strong>We're sorry but dianzhi doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>

 GasolineBlend/Web.config

@@ -6,7 +6,7 @@
<configuration>
  <connectionStrings>
    <!--<add name="connStrYQSH" connectionString="Data Source=101.133.134.71,1433;Initial Catalog=YQShanghai;User ID=sa;Password=win2020!" providerName="System.Data.SqlClient" />-->
    <add name="connStrMySQL" connectionString="Server=39.99.202.28;Port=13306;Database=jeecg-boot;Uid=root;Pwd=win2020!;" />
    <add name="connStrMySQL" connectionString="Server=39.99.202.28;Port=13306;Database=jeecg-boot;Uid=root;Pwd=win2020!;Charset=utf8" />
    <add name="connStrYQSH" connectionString="Server=39.103.220.129;Port=3306;Database=epidemic;Uid=root;Pwd=win2020;" />
  </connectionStrings>
  <appSettings>