Skip to content

Commit 8ed27cd

Browse files
xinliangnotexinliangnote
committed
feature(1.2.8): 使用 embed 打包静态资源
- go version 升级为 1.16 - 使用 embed 特性，将静态资源打包进二进制文件 - 优化代码
1 parent 9aa0067 commit 8ed27cd

File tree

244 files changed

+2287
-3188
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

244 files changed

+2287
-3188
lines changed

‎README.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
1. 支持 [Swagger](https://github.com/swaggo/gin-swagger) 接口文档生成
1414
1. 支持 [GraphQL](https://github.com/99designs/gqlgen) 查询语言
1515
1. 支持 trace 项目内部链路追踪
16-
1. 支持 [pprof](https://github.com/gin-contrib/pprof) 性能剖析
17-
1. 支持 [jwt](https://github.com/dgrijalva/jwt-go) 接口鉴权
16+
1. 支持 [pprof](https://github.com/gin-contrib/pprof) 性能剖析
1817
1. 支持 errno 统一定义错误码
1918
1. 支持 [zap](https://go.uber.org/zap) 日志收集
2019
1. 支持 [viper](https://github.com/spf13/viper) 配置文件解析
@@ -34,7 +33,9 @@
3433

3534
## 其他
3635

37-
查看 Jaeger 链路追踪代码，请查看 [v1.0版](https://github.com/xinliangnote/go-gin-api/releases/tag/v1.0)，文档点这里 [jaeger.md](https://github.com/xinliangnote/go-gin-api/blob/master/docs/jaeger.md) 。
36+
查看 Jaeger 链路追踪 Demo 代码，请查看 [v1.0 版](https://github.com/xinliangnote/go-gin-api/releases/tag/v1.0) ，链接地址：http://127.0.0.1:9999/jaeger_test
37+
38+
调用的其他服务端 Demo 代码为 [https://github.com/xinliangnote/go-jaeger-demo](https://github.com/xinliangnote/go-jaeger-demo)
3839

3940
## 联系作者
4041

‎assets/assets.go‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package assets
2+
3+
import "embed"
4+
5+
var (
6+
//go:embed bootstrap
7+
Bootstrap embed.FS
8+
9+
//go:embed templates
10+
Templates embed.FS
11+
)

‎assets/bootstrap/js/bootstrap-notify/notify.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
document.write('<script type="text/javascript" src="../../bootstrap/js/bootstrap-notify/bootstrap-notify.min.js"></script>');
1+
document.write('<script type="text/javascript" src="/assets/bootstrap/js/bootstrap-notify/bootstrap-notify.min.js"></script>');
22

33
function SuccessNotify(content) {
44
$.notify({

‎assets/bootstrap/js/httpclient/httpclient.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
document.write('<script type="text/javascript" src="../../bootstrap/js/authorization/ksort.js"></script>');
2-
document.write('<script type="text/javascript" src="../../bootstrap/js/authorization/crypto-js.min.js"></script>');
3-
document.write('<script type="text/javascript" src="../../bootstrap/js/authorization/hmac-sha256.js"></script>');
4-
document.write('<script type="text/javascript" src="../../bootstrap/js/authorization/enc-base64.min.js"></script>');
5-
document.write('<script type="text/javascript" src="../../bootstrap/js/jquery.cookie.min.js"></script>');
1+
document.write('<script type="text/javascript" src="/assets/bootstrap/js/authorization/ksort.js"></script>');
2+
document.write('<script type="text/javascript" src="/assets/bootstrap/js/authorization/crypto-js.min.js"></script>');
3+
document.write('<script type="text/javascript" src="/assets/bootstrap/js/authorization/hmac-sha256.js"></script>');
4+
document.write('<script type="text/javascript" src="/assets/bootstrap/js/authorization/enc-base64.min.js"></script>');
5+
document.write('<script type="text/javascript" src="/assets/bootstrap/js/jquery.cookie.min.js"></script>');
66
document.write('<div style="display:none"><script type="text/javascript">document.write(unescape("%3Cspan id=\'cnzz_stat_icon_1279911342\'%3E%3C/span%3E%3Cscript src=\'https://v1.cnzz.com/z_stat.php%3Fid%3D1279911342%26\' type=\'text/javascript\'%3E%3C/script%3E"));</script></div>');
77

88
function GenerateAuthorization(path, method, params) {

‎assets/templates/admin/admin_add.html‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<head>
44
<meta charset="utf-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"/>
6-
<link href="../../bootstrap/js/jquery-confirm/jquery-confirm.min.css" rel="stylesheet">
7-
<link href="../../bootstrap/css/bootstrap.min.css" rel="stylesheet">
8-
<link href="../../bootstrap/js/bootstrap-multitabs/multitabs.min.css" rel="stylesheet" type="text/css">
9-
<link href="../../bootstrap/css/materialdesignicons.min.css" rel="stylesheet">
10-
<link href="../../bootstrap/css/style.min.css" rel="stylesheet">
6+
<link href="/assets/bootstrap/js/jquery-confirm/jquery-confirm.min.css" rel="stylesheet">
7+
<link href="/assets/bootstrap/css/bootstrap.min.css" rel="stylesheet">
8+
<link href="/assets/bootstrap/js/bootstrap-multitabs/multitabs.min.css" rel="stylesheet" type="text/css">
9+
<link href="/assets/bootstrap/css/materialdesignicons.min.css" rel="stylesheet">
10+
<link href="/assets/bootstrap/css/style.min.css" rel="stylesheet">
1111
</head>
1212

1313
<body>
@@ -51,13 +51,13 @@
5151
</div>
5252
</div>
5353
</div>
54-
<script type="text/javascript" src="../../bootstrap/js/jquery.min.js"></script>
55-
<script type="text/javascript" src="../../bootstrap/js/bootstrap.min.js"></script>
56-
<script type="text/javascript" src="../../bootstrap/js/bootstrap-maxlength/bootstrap-maxlength.min.js"></script>
57-
<script type="text/javascript" src="../../bootstrap/js/jquery-confirm/jquery-confirm.min.js"></script>
58-
<script type="text/javascript" src="../../bootstrap/js/bootstrap-multitabs/multitabs.min.js"></script>
59-
<script type="text/javascript" src="../../bootstrap/js/httpclient/httpclient.js"></script>
60-
<script type="text/javascript" src="../../bootstrap/js/authorization/md5.min.js"></script>
54+
<script type="text/javascript" src="/assets/bootstrap/js/jquery.min.js"></script>
55+
<script type="text/javascript" src="/assets/bootstrap/js/bootstrap.min.js"></script>
56+
<script type="text/javascript" src="/assets/bootstrap/js/bootstrap-maxlength/bootstrap-maxlength.min.js"></script>
57+
<script type="text/javascript" src="/assets/bootstrap/js/jquery-confirm/jquery-confirm.min.js"></script>
58+
<script type="text/javascript" src="/assets/bootstrap/js/bootstrap-multitabs/multitabs.min.js"></script>
59+
<script type="text/javascript" src="/assets/bootstrap/js/httpclient/httpclient.js"></script>
60+
<script type="text/javascript" src="/assets/bootstrap/js/authorization/md5.min.js"></script>
6161
<script type="text/javascript">
6262
$(document).ready(function () {
6363

‎assets/templates/admin/admin_list.html‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
<head>
44
<meta charset="utf-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"/>
6-
<link href="../../bootstrap/css/bootstrap.min.css" rel="stylesheet">
7-
<link href="../../bootstrap/css/materialdesignicons.min.css" rel="stylesheet">
8-
<link href="../../bootstrap/js/jquery-confirm/jquery-confirm.min.css" rel="stylesheet">
9-
<link href="../../bootstrap/css/style.min.css" rel="stylesheet">
6+
<link href="/assets/bootstrap/css/bootstrap.min.css" rel="stylesheet">
7+
<link href="/assets/bootstrap/css/materialdesignicons.min.css" rel="stylesheet">
8+
<link href="/assets/bootstrap/js/jquery-confirm/jquery-confirm.min.css" rel="stylesheet">
9+
<link href="/assets/bootstrap/css/style.min.css" rel="stylesheet">
1010
</head>
1111

1212
<body>
@@ -53,11 +53,11 @@
5353

5454
</div>
5555
</div>
56-
<script type="text/javascript" src="../../bootstrap/js/jquery.min.js"></script>
57-
<script type="text/javascript" src="../../bootstrap/js/bootstrap.min.js"></script>
58-
<script type="text/javascript" src="../../bootstrap/js/jquery-confirm/jquery-confirm.min.js"></script>
59-
<script type="text/javascript" src="../../bootstrap/js/httpclient/httpclient.js"></script>
60-
<script type="text/javascript" src="../../bootstrap/js/jquery.pagination.js"></script>
56+
<script type="text/javascript" src="/assets/bootstrap/js/jquery.min.js"></script>
57+
<script type="text/javascript" src="/assets/bootstrap/js/bootstrap.min.js"></script>
58+
<script type="text/javascript" src="/assets/bootstrap/js/jquery-confirm/jquery-confirm.min.js"></script>
59+
<script type="text/javascript" src="/assets/bootstrap/js/httpclient/httpclient.js"></script>
60+
<script type="text/javascript" src="/assets/bootstrap/js/jquery.pagination.js"></script>
6161
<script type="text/javascript">
6262
$(document).ready(function () {
6363
// 加载列表页数据

‎assets/templates/admin/admin_login.html‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
<meta http-equiv="X-UA-Compatible" content="IE=edge">
66
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=0, minimal-ui">
77
<title>登录页面</title>
8-
<link rel="shortcut icon" type="image/x-icon" href="bootstrap/favicon.ico">
8+
<link rel="shortcut icon" type="image/x-icon" href="/assets/bootstrap/favicon.ico">
99
<meta name="apple-mobile-web-app-capable" content="yes">
1010
<meta name="apple-touch-fullscreen" content="yes">
1111
<meta name="apple-mobile-web-app-status-bar-style" content="default">
12-
<link rel="stylesheet" type="text/css" href="../../bootstrap/js/jquery-confirm/jquery-confirm.min.css">
13-
<link rel="stylesheet" type="text/css" href="../../bootstrap/css/materialdesignicons.min.css">
14-
<link rel="stylesheet" type="text/css" href="../../bootstrap/css/bootstrap.min.css">
15-
<link rel="stylesheet" type="text/css" href="../../bootstrap/css/style.min.css">
12+
<link rel="stylesheet" type="text/css" href="/assets/bootstrap/js/jquery-confirm/jquery-confirm.min.css">
13+
<link rel="stylesheet" type="text/css" href="/assets/bootstrap/css/materialdesignicons.min.css">
14+
<link rel="stylesheet" type="text/css" href="/assets/bootstrap/css/bootstrap.min.css">
15+
<link rel="stylesheet" type="text/css" href="/assets/bootstrap/css/style.min.css">
1616

1717
<style>
1818
.login-form .has-feedback {
@@ -47,7 +47,7 @@
4747
<body class="center-vh">
4848
<div class="card card-shadowed p-5 w-420 mb-0 mr-2 ml-2">
4949
<div class="text-center mb-3">
50-
<img src="../../bootstrap/images/logo-sidebar.png">
50+
<img src="/assets/bootstrap/images/logo-sidebar.png">
5151
</div>
5252
<form class="login-form">
5353
<div class="form-group has-feedback">
@@ -71,10 +71,10 @@
7171
</form>
7272
</div>
7373

74-
<script type="text/javascript" src="../../bootstrap/js/jquery.min.js"></script>
75-
<script type="text/javascript" src="../../bootstrap/js/httpclient/httpclient.js"></script>
76-
<script type="text/javascript" src="../../bootstrap/js/authorization/md5.min.js"></script>
77-
<script type="text/javascript" src="../../bootstrap/js/jquery-confirm/jquery-confirm.min.js"></script>
74+
<script type="text/javascript" src="/assets/bootstrap/js/jquery.min.js"></script>
75+
<script type="text/javascript" src="/assets/bootstrap/js/httpclient/httpclient.js"></script>
76+
<script type="text/javascript" src="/assets/bootstrap/js/authorization/md5.min.js"></script>
77+
<script type="text/javascript" src="/assets/bootstrap/js/jquery-confirm/jquery-confirm.min.js"></script>
7878
<script type="text/javascript">
7979
$(document).ready(function () {
8080

‎assets/templates/admin/admin_menu.html‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<head>
44
<meta charset="utf-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"/>
6-
<link href="../../bootstrap/js/jquery-confirm/jquery-confirm.min.css" rel="stylesheet">
7-
<link href="../../bootstrap/css/bootstrap.min.css" rel="stylesheet">
8-
<link href="../../bootstrap/js/bootstrap-multitabs/multitabs.min.css" rel="stylesheet" type="text/css">
9-
<link href="../../bootstrap/css/materialdesignicons.min.css" rel="stylesheet">
10-
<link href="../../bootstrap/css/style.min.css" rel="stylesheet">
6+
<link href="/assets/bootstrap/js/jquery-confirm/jquery-confirm.min.css" rel="stylesheet">
7+
<link href="/assets/bootstrap/css/bootstrap.min.css" rel="stylesheet">
8+
<link href="/assets/bootstrap/js/bootstrap-multitabs/multitabs.min.css" rel="stylesheet" type="text/css">
9+
<link href="/assets/bootstrap/css/materialdesignicons.min.css" rel="stylesheet">
10+
<link href="/assets/bootstrap/css/style.min.css" rel="stylesheet">
1111
</head>
1212

1313
<body>
@@ -53,12 +53,12 @@
5353
</div>
5454
</div>
5555
</div>
56-
<script type="text/javascript" src="../../bootstrap/js/jquery.min.js"></script>
57-
<script type="text/javascript" src="../../bootstrap/js/bootstrap.min.js"></script>
58-
<script type="text/javascript" src="../../bootstrap/js/bootstrap-maxlength/bootstrap-maxlength.min.js"></script>
59-
<script type="text/javascript" src="../../bootstrap/js/jquery-confirm/jquery-confirm.min.js"></script>
60-
<script type="text/javascript" src="../../bootstrap/js/bootstrap-multitabs/multitabs.min.js"></script>
61-
<script type="text/javascript" src="../../bootstrap/js/httpclient/httpclient.js"></script>
56+
<script type="text/javascript" src="/assets/bootstrap/js/jquery.min.js"></script>
57+
<script type="text/javascript" src="/assets/bootstrap/js/bootstrap.min.js"></script>
58+
<script type="text/javascript" src="/assets/bootstrap/js/bootstrap-maxlength/bootstrap-maxlength.min.js"></script>
59+
<script type="text/javascript" src="/assets/bootstrap/js/jquery-confirm/jquery-confirm.min.js"></script>
60+
<script type="text/javascript" src="/assets/bootstrap/js/bootstrap-multitabs/multitabs.min.js"></script>
61+
<script type="text/javascript" src="/assets/bootstrap/js/httpclient/httpclient.js"></script>
6262
<script type="text/javascript">
6363
$(document).ready(function () {
6464
const hash_id = {{ .HashID }}

‎assets/templates/admin/admin_modifyinfo.html‎ renamed to ‎assets/templates/admin/admin_modify_info.html‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<head>
44
<meta charset="utf-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"/>
6-
<link href="../../bootstrap/js/jquery-confirm/jquery-confirm.min.css" rel="stylesheet">
7-
<link href="../../bootstrap/css/bootstrap.min.css" rel="stylesheet">
8-
<link href="../../bootstrap/js/bootstrap-multitabs/multitabs.min.css" rel="stylesheet" type="text/css">
9-
<link href="../../bootstrap/css/materialdesignicons.min.css" rel="stylesheet">
10-
<link href="../../bootstrap/css/style.min.css" rel="stylesheet">
6+
<link href="/assets/bootstrap/js/jquery-confirm/jquery-confirm.min.css" rel="stylesheet">
7+
<link href="/assets/bootstrap/css/bootstrap.min.css" rel="stylesheet">
8+
<link href="/assets/bootstrap/js/bootstrap-multitabs/multitabs.min.css" rel="stylesheet" type="text/css">
9+
<link href="/assets/bootstrap/css/materialdesignicons.min.css" rel="stylesheet">
10+
<link href="/assets/bootstrap/css/style.min.css" rel="stylesheet">
1111
</head>
1212

1313
<body>
@@ -44,12 +44,12 @@
4444
</div>
4545
</div>
4646
</div>
47-
<script type="text/javascript" src="../../bootstrap/js/jquery.min.js"></script>
48-
<script type="text/javascript" src="../../bootstrap/js/bootstrap.min.js"></script>
49-
<script type="text/javascript" src="../../bootstrap/js/bootstrap-maxlength/bootstrap-maxlength.min.js"></script>
50-
<script type="text/javascript" src="../../bootstrap/js/jquery-confirm/jquery-confirm.min.js"></script>
51-
<script type="text/javascript" src="../../bootstrap/js/bootstrap-multitabs/multitabs.min.js"></script>
52-
<script type="text/javascript" src="../../bootstrap/js/httpclient/httpclient.js"></script>
47+
<script type="text/javascript" src="/assets/bootstrap/js/jquery.min.js"></script>
48+
<script type="text/javascript" src="/assets/bootstrap/js/bootstrap.min.js"></script>
49+
<script type="text/javascript" src="/assets/bootstrap/js/bootstrap-maxlength/bootstrap-maxlength.min.js"></script>
50+
<script type="text/javascript" src="/assets/bootstrap/js/jquery-confirm/jquery-confirm.min.js"></script>
51+
<script type="text/javascript" src="/assets/bootstrap/js/bootstrap-multitabs/multitabs.min.js"></script>
52+
<script type="text/javascript" src="/assets/bootstrap/js/httpclient/httpclient.js"></script>
5353
<script type="text/javascript">
5454
$(document).ready(function () {
5555

‎assets/templates/admin/admin_modifypassword.html‎ renamed to ‎assets/templates/admin/admin_modify_password.html‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<head>
44
<meta charset="utf-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"/>
6-
<link href="../../bootstrap/js/jquery-confirm/jquery-confirm.min.css" rel="stylesheet">
7-
<link href="../../bootstrap/css/bootstrap.min.css" rel="stylesheet">
8-
<link href="../../bootstrap/js/bootstrap-multitabs/multitabs.min.css" rel="stylesheet" type="text/css">
9-
<link href="../../bootstrap/css/materialdesignicons.min.css" rel="stylesheet">
10-
<link href="../../bootstrap/css/style.min.css" rel="stylesheet">
6+
<link href="/assets/bootstrap/js/jquery-confirm/jquery-confirm.min.css" rel="stylesheet">
7+
<link href="/assets/bootstrap/css/bootstrap.min.css" rel="stylesheet">
8+
<link href="/assets/bootstrap/js/bootstrap-multitabs/multitabs.min.css" rel="stylesheet" type="text/css">
9+
<link href="/assets/bootstrap/css/materialdesignicons.min.css" rel="stylesheet">
10+
<link href="/assets/bootstrap/css/style.min.css" rel="stylesheet">
1111
</head>
1212

1313
<body>
@@ -46,13 +46,13 @@
4646
</div>
4747
</div>
4848
</div>
49-
<script type="text/javascript" src="../../bootstrap/js/jquery.min.js"></script>
50-
<script type="text/javascript" src="../../bootstrap/js/bootstrap.min.js"></script>
51-
<script type="text/javascript" src="../../bootstrap/js/bootstrap-maxlength/bootstrap-maxlength.min.js"></script>
52-
<script type="text/javascript" src="../../bootstrap/js/jquery-confirm/jquery-confirm.min.js"></script>
53-
<script type="text/javascript" src="../../bootstrap/js/bootstrap-multitabs/multitabs.min.js"></script>
54-
<script type="text/javascript" src="../../bootstrap/js/httpclient/httpclient.js"></script>
55-
<script type="text/javascript" src="../../bootstrap/js/authorization/md5.min.js"></script>
49+
<script type="text/javascript" src="/assets/bootstrap/js/jquery.min.js"></script>
50+
<script type="text/javascript" src="/assets/bootstrap/js/bootstrap.min.js"></script>
51+
<script type="text/javascript" src="/assets/bootstrap/js/bootstrap-maxlength/bootstrap-maxlength.min.js"></script>
52+
<script type="text/javascript" src="/assets/bootstrap/js/jquery-confirm/jquery-confirm.min.js"></script>
53+
<script type="text/javascript" src="/assets/bootstrap/js/bootstrap-multitabs/multitabs.min.js"></script>
54+
<script type="text/javascript" src="/assets/bootstrap/js/httpclient/httpclient.js"></script>
55+
<script type="text/javascript" src="/assets/bootstrap/js/authorization/md5.min.js"></script>
5656
<script type="text/javascript">
5757
$(document).ready(function () {
5858

0 commit comments

Comments
 (0)