feature(1.2.8): 使用 embed 打包静态资源

- go version 升级为 1.16 - 使用 embed 特性，将静态资源打包进二进制文件 - 优化代码
lyf571321556 · Nov 20, 2021 · 8ed27cd · 8ed27cd
1 parent 9aa0067
commit 8ed27cd
Show file tree

Hide file tree

Showing 244 changed files with 2,287 additions and 3,188 deletions.
diff --git a/README.md b/README.md
@@ -13,8 +13,7 @@
 1. 支持 [Swagger](https://github.com/swaggo/gin-swagger) 接口文档生成 
 1. 支持 [GraphQL](https://github.com/99designs/gqlgen) 查询语言 
 1. 支持 trace 项目内部链路追踪 
-1. 支持 [pprof](https://github.com/gin-contrib/pprof) 性能剖析 
-1. 支持 [jwt](https://github.com/dgrijalva/jwt-go) 接口鉴权 
+1. 支持 [pprof](https://github.com/gin-contrib/pprof) 性能剖析
 1. 支持 errno 统一定义错误码 
 1. 支持 [zap](https://go.uber.org/zap) 日志收集 
 1. 支持 [viper](https://github.com/spf13/viper) 配置文件解析
@@ -34,7 +33,9 @@
 
 ## 其他
 
-查看 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) 。
+查看 Jaeger 链路追踪 Demo 代码，请查看 [v1.0 版](https://github.com/xinliangnote/go-gin-api/releases/tag/v1.0) ，链接地址：http://127.0.0.1:9999/jaeger_test
+
+调用的其他服务端 Demo 代码为 [https://github.com/xinliangnote/go-jaeger-demo](https://github.com/xinliangnote/go-jaeger-demo)
 
 ## 联系作者
 

diff --git a/assets/assets.go b/assets/assets.go
@@ -0,0 +1,11 @@
+package assets
+
+import "embed"
+
+var (
+	//go:embed bootstrap
+	Bootstrap embed.FS
+
+	//go:embed templates
+	Templates embed.FS
+)
diff --git a/assets/bootstrap/js/bootstrap-notify/notify.js b/assets/bootstrap/js/bootstrap-notify/notify.js
@@ -1,4 +1,4 @@
-document.write('<script type="text/javascript" src="../../bootstrap/js/bootstrap-notify/bootstrap-notify.min.js"></script>');
+document.write('<script type="text/javascript" src="/assets/bootstrap/js/bootstrap-notify/bootstrap-notify.min.js"></script>');
 
 function SuccessNotify(content) {
     $.notify({

diff --git a/assets/bootstrap/js/httpclient/httpclient.js b/assets/bootstrap/js/httpclient/httpclient.js
@@ -1,8 +1,8 @@
-document.write('<script type="text/javascript" src="../../bootstrap/js/authorization/ksort.js"></script>');
-document.write('<script type="text/javascript" src="../../bootstrap/js/authorization/crypto-js.min.js"></script>');
-document.write('<script type="text/javascript" src="../../bootstrap/js/authorization/hmac-sha256.js"></script>');
-document.write('<script type="text/javascript" src="../../bootstrap/js/authorization/enc-base64.min.js"></script>');
-document.write('<script type="text/javascript" src="../../bootstrap/js/jquery.cookie.min.js"></script>');
+document.write('<script type="text/javascript" src="/assets/bootstrap/js/authorization/ksort.js"></script>');
+document.write('<script type="text/javascript" src="/assets/bootstrap/js/authorization/crypto-js.min.js"></script>');
+document.write('<script type="text/javascript" src="/assets/bootstrap/js/authorization/hmac-sha256.js"></script>');
+document.write('<script type="text/javascript" src="/assets/bootstrap/js/authorization/enc-base64.min.js"></script>');
+document.write('<script type="text/javascript" src="/assets/bootstrap/js/jquery.cookie.min.js"></script>');
 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>');
 
 function GenerateAuthorization(path, method, params) {

diff --git a/assets/templates/admin/admin_add.html b/assets/templates/admin/admin_add.html
@@ -3,11 +3,11 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"/>
-    <link href="../../bootstrap/js/jquery-confirm/jquery-confirm.min.css" rel="stylesheet">
-    <link href="../../bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="../../bootstrap/js/bootstrap-multitabs/multitabs.min.css" rel="stylesheet" type="text/css">
-    <link href="../../bootstrap/css/materialdesignicons.min.css" rel="stylesheet">
-    <link href="../../bootstrap/css/style.min.css" rel="stylesheet">
+    <link href="/assets/bootstrap/js/jquery-confirm/jquery-confirm.min.css" rel="stylesheet">
+    <link href="/assets/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+    <link href="/assets/bootstrap/js/bootstrap-multitabs/multitabs.min.css" rel="stylesheet" type="text/css">
+    <link href="/assets/bootstrap/css/materialdesignicons.min.css" rel="stylesheet">
+    <link href="/assets/bootstrap/css/style.min.css" rel="stylesheet">
 </head>
 
 <body>
@@ -51,13 +51,13 @@
         </div>
     </div>
 </div>
-<script type="text/javascript" src="../../bootstrap/js/jquery.min.js"></script>
-<script type="text/javascript" src="../../bootstrap/js/bootstrap.min.js"></script>
-<script type="text/javascript" src="../../bootstrap/js/bootstrap-maxlength/bootstrap-maxlength.min.js"></script>
-<script type="text/javascript" src="../../bootstrap/js/jquery-confirm/jquery-confirm.min.js"></script>
-<script type="text/javascript" src="../../bootstrap/js/bootstrap-multitabs/multitabs.min.js"></script>
-<script type="text/javascript" src="../../bootstrap/js/httpclient/httpclient.js"></script>
-<script type="text/javascript" src="../../bootstrap/js/authorization/md5.min.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/jquery.min.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/bootstrap.min.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/bootstrap-maxlength/bootstrap-maxlength.min.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/jquery-confirm/jquery-confirm.min.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/bootstrap-multitabs/multitabs.min.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/httpclient/httpclient.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/authorization/md5.min.js"></script>
 <script type="text/javascript">
     $(document).ready(function () {
 

diff --git a/assets/templates/admin/admin_list.html b/assets/templates/admin/admin_list.html
@@ -3,10 +3,10 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"/>
-    <link href="../../bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="../../bootstrap/css/materialdesignicons.min.css" rel="stylesheet">
-    <link href="../../bootstrap/js/jquery-confirm/jquery-confirm.min.css" rel="stylesheet">
-    <link href="../../bootstrap/css/style.min.css" rel="stylesheet">
+    <link href="/assets/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+    <link href="/assets/bootstrap/css/materialdesignicons.min.css" rel="stylesheet">
+    <link href="/assets/bootstrap/js/jquery-confirm/jquery-confirm.min.css" rel="stylesheet">
+    <link href="/assets/bootstrap/css/style.min.css" rel="stylesheet">
 </head>
 
 <body>
@@ -53,11 +53,11 @@
 
     </div>
 </div>
-<script type="text/javascript" src="../../bootstrap/js/jquery.min.js"></script>
-<script type="text/javascript" src="../../bootstrap/js/bootstrap.min.js"></script>
-<script type="text/javascript" src="../../bootstrap/js/jquery-confirm/jquery-confirm.min.js"></script>
-<script type="text/javascript" src="../../bootstrap/js/httpclient/httpclient.js"></script>
-<script type="text/javascript" src="../../bootstrap/js/jquery.pagination.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/jquery.min.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/bootstrap.min.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/jquery-confirm/jquery-confirm.min.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/httpclient/httpclient.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/jquery.pagination.js"></script>
 <script type="text/javascript">
     $(document).ready(function () {
         // 加载列表页数据

diff --git a/assets/templates/admin/admin_login.html b/assets/templates/admin/admin_login.html
@@ -5,14 +5,14 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=0, minimal-ui">
     <title>登录页面</title>
-    <link rel="shortcut icon" type="image/x-icon" href="bootstrap/favicon.ico">
+    <link rel="shortcut icon" type="image/x-icon" href="/assets/bootstrap/favicon.ico">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-touch-fullscreen" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="default">
-    <link rel="stylesheet" type="text/css" href="../../bootstrap/js/jquery-confirm/jquery-confirm.min.css">
-    <link rel="stylesheet" type="text/css" href="../../bootstrap/css/materialdesignicons.min.css">
-    <link rel="stylesheet" type="text/css" href="../../bootstrap/css/bootstrap.min.css">
-    <link rel="stylesheet" type="text/css" href="../../bootstrap/css/style.min.css">
+    <link rel="stylesheet" type="text/css" href="/assets/bootstrap/js/jquery-confirm/jquery-confirm.min.css">
+    <link rel="stylesheet" type="text/css" href="/assets/bootstrap/css/materialdesignicons.min.css">
+    <link rel="stylesheet" type="text/css" href="/assets/bootstrap/css/bootstrap.min.css">
+    <link rel="stylesheet" type="text/css" href="/assets/bootstrap/css/style.min.css">
 
     <style>
         .login-form .has-feedback {
@@ -47,7 +47,7 @@
 <body class="center-vh">
 <div class="card card-shadowed p-5 w-420 mb-0 mr-2 ml-2">
     <div class="text-center mb-3">
-        <img src="../../bootstrap/images/logo-sidebar.png">
+        <img src="/assets/bootstrap/images/logo-sidebar.png">
     </div>
     <form class="login-form">
         <div class="form-group has-feedback">
@@ -71,10 +71,10 @@
     </form>
 </div>
 
-<script type="text/javascript" src="../../bootstrap/js/jquery.min.js"></script>
-<script type="text/javascript" src="../../bootstrap/js/httpclient/httpclient.js"></script>
-<script type="text/javascript" src="../../bootstrap/js/authorization/md5.min.js"></script>
-<script type="text/javascript" src="../../bootstrap/js/jquery-confirm/jquery-confirm.min.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/jquery.min.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/httpclient/httpclient.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/authorization/md5.min.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/jquery-confirm/jquery-confirm.min.js"></script>
 <script type="text/javascript">
     $(document).ready(function () {
 

diff --git a/assets/templates/admin/admin_menu.html b/assets/templates/admin/admin_menu.html
@@ -3,11 +3,11 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"/>
-    <link href="../../bootstrap/js/jquery-confirm/jquery-confirm.min.css" rel="stylesheet">
-    <link href="../../bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="../../bootstrap/js/bootstrap-multitabs/multitabs.min.css" rel="stylesheet" type="text/css">
-    <link href="../../bootstrap/css/materialdesignicons.min.css" rel="stylesheet">
-    <link href="../../bootstrap/css/style.min.css" rel="stylesheet">
+    <link href="/assets/bootstrap/js/jquery-confirm/jquery-confirm.min.css" rel="stylesheet">
+    <link href="/assets/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+    <link href="/assets/bootstrap/js/bootstrap-multitabs/multitabs.min.css" rel="stylesheet" type="text/css">
+    <link href="/assets/bootstrap/css/materialdesignicons.min.css" rel="stylesheet">
+    <link href="/assets/bootstrap/css/style.min.css" rel="stylesheet">
 </head>
 
 <body>
@@ -53,12 +53,12 @@
         </div>
     </div>
 </div>
-<script type="text/javascript" src="../../bootstrap/js/jquery.min.js"></script>
-<script type="text/javascript" src="../../bootstrap/js/bootstrap.min.js"></script>
-<script type="text/javascript" src="../../bootstrap/js/bootstrap-maxlength/bootstrap-maxlength.min.js"></script>
-<script type="text/javascript" src="../../bootstrap/js/jquery-confirm/jquery-confirm.min.js"></script>
-<script type="text/javascript" src="../../bootstrap/js/bootstrap-multitabs/multitabs.min.js"></script>
-<script type="text/javascript" src="../../bootstrap/js/httpclient/httpclient.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/jquery.min.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/bootstrap.min.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/bootstrap-maxlength/bootstrap-maxlength.min.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/jquery-confirm/jquery-confirm.min.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/bootstrap-multitabs/multitabs.min.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/httpclient/httpclient.js"></script>
 <script type="text/javascript">
     $(document).ready(function () {
         const hash_id = {{ .HashID }}

diff --git a/assets/templates/admin/admin_modifyinfo.html → ...ts/templates/admin/admin_modify_info.html b/assets/templates/admin/admin_modifyinfo.html → ...ts/templates/admin/admin_modify_info.html
@@ -3,11 +3,11 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"/>
-    <link href="../../bootstrap/js/jquery-confirm/jquery-confirm.min.css" rel="stylesheet">
-    <link href="../../bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="../../bootstrap/js/bootstrap-multitabs/multitabs.min.css" rel="stylesheet" type="text/css">
-    <link href="../../bootstrap/css/materialdesignicons.min.css" rel="stylesheet">
-    <link href="../../bootstrap/css/style.min.css" rel="stylesheet">
+    <link href="/assets/bootstrap/js/jquery-confirm/jquery-confirm.min.css" rel="stylesheet">
+    <link href="/assets/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+    <link href="/assets/bootstrap/js/bootstrap-multitabs/multitabs.min.css" rel="stylesheet" type="text/css">
+    <link href="/assets/bootstrap/css/materialdesignicons.min.css" rel="stylesheet">
+    <link href="/assets/bootstrap/css/style.min.css" rel="stylesheet">
 </head>
 
 <body>
@@ -44,12 +44,12 @@
         </div>
     </div>
 </div>
-<script type="text/javascript" src="../../bootstrap/js/jquery.min.js"></script>
-<script type="text/javascript" src="../../bootstrap/js/bootstrap.min.js"></script>
-<script type="text/javascript" src="../../bootstrap/js/bootstrap-maxlength/bootstrap-maxlength.min.js"></script>
-<script type="text/javascript" src="../../bootstrap/js/jquery-confirm/jquery-confirm.min.js"></script>
-<script type="text/javascript" src="../../bootstrap/js/bootstrap-multitabs/multitabs.min.js"></script>
-<script type="text/javascript" src="../../bootstrap/js/httpclient/httpclient.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/jquery.min.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/bootstrap.min.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/bootstrap-maxlength/bootstrap-maxlength.min.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/jquery-confirm/jquery-confirm.min.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/bootstrap-multitabs/multitabs.min.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/httpclient/httpclient.js"></script>
 <script type="text/javascript">
     $(document).ready(function () {
 

diff --git a/...templates/admin/admin_modifypassword.html → ...emplates/admin/admin_modify_password.html b/...templates/admin/admin_modifypassword.html → ...emplates/admin/admin_modify_password.html
@@ -3,11 +3,11 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"/>
-    <link href="../../bootstrap/js/jquery-confirm/jquery-confirm.min.css" rel="stylesheet">
-    <link href="../../bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="../../bootstrap/js/bootstrap-multitabs/multitabs.min.css" rel="stylesheet" type="text/css">
-    <link href="../../bootstrap/css/materialdesignicons.min.css" rel="stylesheet">
-    <link href="../../bootstrap/css/style.min.css" rel="stylesheet">
+    <link href="/assets/bootstrap/js/jquery-confirm/jquery-confirm.min.css" rel="stylesheet">
+    <link href="/assets/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+    <link href="/assets/bootstrap/js/bootstrap-multitabs/multitabs.min.css" rel="stylesheet" type="text/css">
+    <link href="/assets/bootstrap/css/materialdesignicons.min.css" rel="stylesheet">
+    <link href="/assets/bootstrap/css/style.min.css" rel="stylesheet">
 </head>
 
 <body>
@@ -46,13 +46,13 @@
         </div>
     </div>
 </div>
-<script type="text/javascript" src="../../bootstrap/js/jquery.min.js"></script>
-<script type="text/javascript" src="../../bootstrap/js/bootstrap.min.js"></script>
-<script type="text/javascript" src="../../bootstrap/js/bootstrap-maxlength/bootstrap-maxlength.min.js"></script>
-<script type="text/javascript" src="../../bootstrap/js/jquery-confirm/jquery-confirm.min.js"></script>
-<script type="text/javascript" src="../../bootstrap/js/bootstrap-multitabs/multitabs.min.js"></script>
-<script type="text/javascript" src="../../bootstrap/js/httpclient/httpclient.js"></script>
-<script type="text/javascript" src="../../bootstrap/js/authorization/md5.min.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/jquery.min.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/bootstrap.min.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/bootstrap-maxlength/bootstrap-maxlength.min.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/jquery-confirm/jquery-confirm.min.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/bootstrap-multitabs/multitabs.min.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/httpclient/httpclient.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/authorization/md5.min.js"></script>
 <script type="text/javascript">
     $(document).ready(function () {
 

diff --git a/assets/templates/authorized/authorized_add.html b/assets/templates/authorized/authorized_add.html
@@ -3,11 +3,11 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"/>
-    <link href="../../bootstrap/js/jquery-confirm/jquery-confirm.min.css" rel="stylesheet">
-    <link href="../../bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="../../bootstrap/js/bootstrap-multitabs/multitabs.min.css" rel="stylesheet" type="text/css">
-    <link href="../../bootstrap/css/materialdesignicons.min.css" rel="stylesheet">
-    <link href="../../bootstrap/css/style.min.css" rel="stylesheet">
+    <link href="/assets/bootstrap/js/jquery-confirm/jquery-confirm.min.css" rel="stylesheet">
+    <link href="/assets/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+    <link href="/assets/bootstrap/js/bootstrap-multitabs/multitabs.min.css" rel="stylesheet" type="text/css">
+    <link href="/assets/bootstrap/css/materialdesignicons.min.css" rel="stylesheet">
+    <link href="/assets/bootstrap/css/style.min.css" rel="stylesheet">
 </head>
 
 <body>
@@ -46,12 +46,12 @@
         </div>
     </div>
 </div>
-<script type="text/javascript" src="../../bootstrap/js/jquery.min.js"></script>
-<script type="text/javascript" src="../../bootstrap/js/bootstrap.min.js"></script>
-<script type="text/javascript" src="../../bootstrap/js/bootstrap-maxlength/bootstrap-maxlength.min.js"></script>
-<script type="text/javascript" src="../../bootstrap/js/jquery-confirm/jquery-confirm.min.js"></script>
-<script type="text/javascript" src="../../bootstrap/js/bootstrap-multitabs/multitabs.min.js"></script>
-<script type="text/javascript" src="../../bootstrap/js/httpclient/httpclient.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/jquery.min.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/bootstrap.min.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/bootstrap-maxlength/bootstrap-maxlength.min.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/jquery-confirm/jquery-confirm.min.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/bootstrap-multitabs/multitabs.min.js"></script>
+<script type="text/javascript" src="/assets/bootstrap/js/httpclient/httpclient.js"></script>
 <script type="text/javascript">
     $(document).ready(function () {