1

Property.Modele.FixedAssets/PropertyModule.cs

@@ -648,6 +648,26 @@ namespace Property.Module.FixedAssets
                 demodel.Images = JsonConvert.SerializeObject(imgList);
 
                 var dmodel = property_InfoRepository.GetEntity(demodel.Id);
+                if (string.IsNullOrEmpty(dmodel.QRCode)) {
+                    #region 生成二维码
+                    string QRPath = DateTime.Now.Ticks.ToString() + ".png";
+                    string basepath = AppContext.BaseDirectory;
+                    string path_server = basepath + "\\upfile\\code\\" + QRPath;
+                    string ImageAddress = "/upfile/code/" + QRPath;
+                    string logoPath = basepath + "\\ExportFile\\Branch\\Logo.png";
+                    try
+                    {
+                        QRCodeHelper.Create_CodeImages("PropertyCheck|Id=" + demodel.Id, 3, logoPath, path_server, System.Drawing.Imaging.ImageFormat.Png);
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.Write(ex, "QRCodeHelper.Create_CodeImages");
+                        ImageAddress = "";
+                    }
+                    #endregion
+                    dmodel.QRCode = ImageAddress;
+                }
+
                 dmodel.BrandName = demodel.BrandName;
                 dmodel.BuyDate = demodel.BuyDate;
                 dmodel.BuyType = demodel.BuyType;
@@ -723,7 +743,7 @@ namespace Property.Module.FixedAssets
                     string logoPath = basepath + "\\ExportFile\\Branch\\Logo.png";
                     try
                     {
-                        QRCodeHelper.Create_CodeImages("vt:193213/3213/4123?Id=" + PropertyId, 3, logoPath, path_server, System.Drawing.Imaging.ImageFormat.Png);
+                        QRCodeHelper.Create_CodeImages("PropertyCheck|Id=" + PropertyId, 3, logoPath, path_server, System.Drawing.Imaging.ImageFormat.Png);
                     }
                     catch (Exception ex)
                     {

Property.WebApi/Controllers/Login/LoginController.cs

@@ -57,6 +57,9 @@ namespace Property.WebApi.Controllers.Login
             {
                 Domain = Domain.Replace("zc", "");//资产管理专用
             }
+            if (Domain.Contains("test")) {
+                Domain = Domain.Replace("test", "");//资产管理测试专用
+            }
             var gmodel = loginModule.GetGroupByDomain(new RB_Group_Extend { Domain = Domain }).FirstOrDefault();
             if (gmodel == null)
             {

Property.WebApi/Startup.cs

@@ -49,7 +49,7 @@ namespace Property.WebApi
                 options.JsonSerializerOptions.PropertyNamingPolicy = null;
             });
 
-            services.AddCors(options => options.AddPolicy("AllowCors", policy => policy.AllowAnyHeader().AllowAnyMethod().AllowCredentials().WithOrigins(new[] { "http://www.test.com:8080", "http://www.test.com:8081", "http://www.test.com:8082", "http://zcyx.oytour.com", "http://yx.oytour.com" })));
+            services.AddCors(options => options.AddPolicy("AllowCors", policy => policy.AllowAnyHeader().AllowAnyMethod().AllowCredentials().WithOrigins(new[] { "http://www.test.com:8080", "http://www.test.com:8081", "http://www.test.com:8082", "http://testzcyx.oytour.com:8080", "http://testzcyx.oytour.com:8081", "http://zcyx.oytour.com", "http://yx.oytour.com" })));
             //services.AddCors(options =>
             //{
             //    options.AddPolicy("AllowCors",