-
Notifications
You must be signed in to change notification settings - Fork 921
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
修复服务端首次运行，未及时更新服务路由造成令牌验证失败的问题和修复基于zookeeper订阅者注册失败的问题，以及新增身份验证界面 #4
- Loading branch information
1 parent
52954c3
commit 6e458db
Showing
23 changed files
with
182 additions
and
63 deletions.
There are no files selected for viewing
16 changes: 16 additions & 0 deletions
16
Surging.ApiGateway/Controllers/AuthenticationManageController.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| using Microsoft.AspNetCore.Mvc; | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Threading.Tasks; | ||
|
|
||
| namespace Surging.ApiGateway.Controllers | ||
| { | ||
| public class AuthenticationManageController : Controller | ||
| { | ||
| public IActionResult Index() | ||
| { | ||
| return View(); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 68 additions & 0 deletions
68
Surging.ApiGateway/Views/AuthenticationManage/Index.cshtml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
|
|
||
| @{ | ||
| ViewBag.Title = "认证管理"; | ||
| var isPjax = (!string.IsNullOrEmpty(Context.Request.Query["XPJAX"]) && bool.Parse(Context.Request.Query["XPJAX"])) | ||
| && (!string.IsNullOrEmpty(Context.Request.Headers["X-PJAX"]) && bool.Parse(Context.Request.Headers["X-PJAX"])); | ||
| Layout = isPjax ? null : "_AuthenticationManage.cshtml"; | ||
| } | ||
| <div class="page-header"> | ||
| <h1> | ||
| 认证管理 | ||
| <small> | ||
| <i class="icon-double-angle-right"></i> | ||
| 服务令牌 | ||
| </small> | ||
| </h1> | ||
| <div class="ace-settings-container"> | ||
| <a href="@Context.Request.Headers["Referer"]" class="btn btn-app btn-xs btn-warning ace-settings-btn" data-pjax=".page-content"> | ||
| <i class="icon-back bigger-150"></i> | ||
| </a> | ||
| </div> | ||
| </div> | ||
| <div class="row"> | ||
| <div class="col-xs-12"> | ||
| <div id="sample-table-2_wrapper" class="dataTables_wrapper" role="grid"> | ||
| <div class="row"> | ||
| <div class="col-sm-6"> | ||
| 关键字：<input type="text" name="queryParam" id="queryParam" placeholder="机器名\服务Id"> | ||
| <button id="btnSearch" class="btn btn-primary">搜　索</button> | ||
| </div> | ||
| </div> | ||
| <div> | ||
| <table id="dataService" class="table table-striped table-bordered table-hover dataTable"> | ||
| <thead> | ||
| <tr role="row"> | ||
| <th style="width: 6%"></th> | ||
| <th class="center" width="12%">机器名</th> | ||
| <th class="center" width="12%">状态</th> | ||
| <th class="center" width="12%">检查</th> | ||
| <th class="center">操作</th> | ||
| </tr> | ||
| </thead> | ||
| <tbody id=""></tbody> | ||
| </table> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| @*@if (!isPjax) | ||
| { | ||
| @section SubFootJS | ||
| { | ||
| <script type="text/javascript"> | ||
| seajs.use("apps_authmanage/view/address.guide.js", function(a) { | ||
| a.init({ | ||
| }); | ||
| }); | ||
| </script> | ||
| } | ||
| } | ||
| else | ||
| { | ||
| <script type="text/javascript"> | ||
| seajs.use("apps_authmanage/view/address.guide.js", function (a) { | ||
| a.init({ | ||
| }); | ||
| }); | ||
| </script> | ||
| }*@ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
Surging.ApiGateway/Views/ServiceManage/ServiceSubscriber.cshtml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
Surging.ApiGateway/wwwroot/apps/authmanage/assets/js/modules/authenticationmanage.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,17 @@ | ||
| define(function (require, exports, module) { | ||
| var $ = jQuery = require('jquery'); | ||
| var init = function () { | ||
| $(".app-board").on("click", "#leftSide-toggle", function () { | ||
| var $this = $(this); | ||
| if ($this.is(".icon-double-angle-right")) { | ||
| $this.attr("class", "icon icon-double-angle-left"); | ||
| $(".app-left-side").removeClass("menu-min"); | ||
| } else { | ||
| $this.attr("class", "icon icon-double-angle-right"); | ||
| $(".app-left-side").addClass("menu-min"); | ||
| } | ||
|
|
||
| }); | ||
| } | ||
| exports.init = init; | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file modified
BIN
+2.44 KB
(130%)
Surging.ApiGateway/wwwroot/assets/css/fonts/surgingfonticon.eot
Binary file not shown.
Oops, something went wrong.