url缩减

.gitignore

@@ -328,5 +328,5 @@ FakesAssemblies/
 _Pvt_Extensions
 **/node_modules/*
 **/bower_components/*
-**/dist/web12345/*
-**/dist/multimedia/*
+**/web12345/*
+**/m/*

Winsoft.GOV.XF.WebApi.WXCore/Controllers/BundleController.cs

@@ -232,6 +232,19 @@ namespace Winsoft.GOV.XF.WebApi.WXCore.Controllers
             return BadRequest("无权限发布");
         }
 
+        [HttpGet("generate/{id}")]
+        [Produces(typeof(string))]
+        public async Task<IActionResult> GenerateSampleShareURL(string id)
+        {
+            Bundle b = await _bundlesService.Get(id);
+            if (b == null)
+                return BadRequest("非法请求");
+            string multimediaURL = _bundlesService.GenerateSampleShareURL(b, HttpContext.Request.Cookies["BaseUrl"]);
+            if (!String.IsNullOrEmpty(multimediaURL))
+                return Ok(multimediaURL);
+            return BadRequest("无权限发布");
+        }
+
         [HttpGet("getShareInfo/{id}/{ciphertext}")]
         public async Task<IActionResult> GetShareInfo(string id, string ciphertext)
         {
@@ -250,6 +263,15 @@ namespace Winsoft.GOV.XF.WebApi.WXCore.Controllers
             return Ok(b);
         }
 
+        [HttpGet("getShareInfo/{id}")]
+        public async Task<IActionResult> GetShareInfoByBundleId(string id)
+        {
+            Bundle b = await _bundlesService.GetDetail(id);
+            if (b == null)
+                return BadRequest("非法请求");
+            return Ok(b);
+        }
+
         // POST api/values
         [HttpPost]
         [Produces(typeof(string))]

Winsoft.GOV.XF.WebApi.WXCore/Controllers/HomeController.cs

@@ -34,7 +34,7 @@ namespace Winsoft.GOV.XF.WebApi.WXCore.Controllers
             if (u != null)
                 HttpContext.Response.Cookies.Append("User", JsonConvert.SerializeObject(u));
             HttpContext.Response.Cookies.Append("BaseUrl", HttpContext.Request.GetAbsoluteUri());
-            return Redirect(HttpContext.Request.GetAbsoluteUri()+ "dist/web12345/index.html");
+            return Redirect(HttpContext.Request.GetAbsoluteUri()+ "web12345/index.html");
         }
 
 

Winsoft.GOV.XF.WebApi.WXCore/Services/BundlesService.cs

@@ -37,13 +37,6 @@ namespace Winsoft.GOV.XF.WebApi.WXCore.Services
             return null;
         }
 
-        public string GetURL(Bundle b, string absoluteUri)
-        {
-            //_httpContext.Request.GetAbsoluteUri()
-            string s = absoluteUri + "/dist/web12345-pageView/index.html#!/pageView?bid={0}&m={1}";
-            s = String.Format(s, b.Id.ToString(), b.Id.ToString().AESEncrypt(b.Key));
-            return s;
-        }
 
         public async Task<Bundle> GetDetail(string id)
         {
@@ -100,7 +93,21 @@ namespace Winsoft.GOV.XF.WebApi.WXCore.Services
                 Expire = -1,
                 BundleId = b.Id
             };
-            string multimediaURL = string.Format("{0}dist/multimedia/index.html?bundleId={1}&ciphertext={2}",
+            //http://ef7eb3cc.ngrok.io/dist/multimedia/index.html?
+            string multimediaURL = string.Format("{0}m/index.html?bundleId={1}&ciphertext={2}",
+                absoluteUri, b.Id, JsonConvert.SerializeObject(a).AESEncrypt(b.Key));
+            return multimediaURL;
+        }
+
+        public string GenerateSampleBaseURL(Bundle b, string absoluteUri)
+        {
+            BundleAccessToken a = new BundleAccessToken()
+            {
+                Expire = -1,
+                BundleId = b.Id
+            };
+            //http://ef7eb3cc.ngrok.io/dist/multimedia/index.html?
+            string multimediaURL = string.Format("{0}m/index.html?id={1}",
                 absoluteUri, b.Id, JsonConvert.SerializeObject(a).AESEncrypt(b.Key));
             return multimediaURL;
         }
@@ -110,11 +117,24 @@ namespace Winsoft.GOV.XF.WebApi.WXCore.Services
             if (a.Expire != -1)
             {
                 a.Expire = DateTime.Now.AddDays(1).ToTimeStamp();
-                string multimediaURL = string.Format("{0}dist/multimedia/index.html?bundleId={1}&data={2}",
+                string multimediaURL = string.Format("{0}m/index.html?id={1}&ciphertext={2}",
                     absoluteUri, b.Id, JsonConvert.SerializeObject(a).AESEncrypt(b.Key));
                 return multimediaURL;
             }
             return String.Empty;
         }
+
+        public string GenerateSampleShareURL(Bundle b, string absoluteUri)
+        {
+            BundleAccessToken a = new BundleAccessToken()
+            {
+                BundleId = b.Id,
+                Expire = DateTime.Now.AddDays(1).ToTimeStamp()
+            };
+
+            string multimediaURL = string.Format("{0}m/index.html?id={1}&ciphertext={2}",
+                absoluteUri, b.Id, JsonConvert.SerializeObject(a).AESEncrypt(b.Key));
+            return multimediaURL;
+        }
     }
 }

Winsoft.GOV.XF.WebApi.WXCore/Services/XFApiService.cs

@@ -36,7 +36,8 @@ namespace Winsoft.GOV.XF.WebApi.WXCore.Services
         {
             string d = b.Describe;
             if (b.Assets.Count() > 0)
-                d += "（此信件内容含有其他多媒体信息，详细请复制网址到浏览器打开：" + _bundlesService.GenerateBaseURL(b, absoluteUri) + "）";
+                //d += "（此信件内容含有其他多媒体信息，详细请复制网址到浏览器打开：" + _bundlesService.GenerateBaseURL(b, absoluteUri) + "）";
+                d += "\r\n【扩展信息链接：" + _bundlesService.GenerateSampleBaseURL(b, absoluteUri) + "】";
             string s = "advice={0};type={1};name={2};phone={3};is_public={4};content={5};title={6};county_id={7};unit_id={8};sswz=8;ly=2; user_id={9}";
             s = String.Format(s, b.Advice, b.Type.ToString(), b.Name, b.Mobile, b.IsPublic.ToString(), d, b.Title, b.County_id, b.Unit_id, b.OpenID);
             XFApiResult rObj = await HttpPostAsync<XFApiResult>(_config["XFApi"] + "/letter/submitLetter;", s, onFails);

Winsoft.GOV.XF.WebApi.WXCore/wwwroot/dist/multimedia/index.html

@@ -1,29 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <title>12345政务服务</title>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,user-scalable=no">
-    <!-- 新 Bootstrap 核心 CSS 文件 -->
-    <link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.min.css">
-    <link rel="stylesheet" href="../bower_components/animate.css/animate.min.css">
-    <link rel="stylesheet" href="app-64840856fb.css">
-
-    <!-- jQuery文件。务必在bootstrap.min.js 之前引入 -->
-    <script src="http://webapi.amap.com/maps?v=1.3&key=d7455920303550a45cb4e1a27bdbfc86"></script>
-    <script src="../bower_components/lodash/dist/lodash.js"></script>
-    <script src="../bower_components/jquery/dist/jquery.min.js"></script>
-    <script src="../bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
-    <script src="../bower_components/angular/angular.js"></script>
-    <script src="../bower_components/angular-ui-router/release/angular-ui-router.min.js"></script>
-    <script src="../bower_components/angular-animate/angular-animate.min.js"></script>
-
-    <script src="app-3ce44b167d.js"></script>
-</head>
-
-<body ng-app="app">
-    <ui-view></ui-view>
-</body>
-
-</html>