更新前端

args/flag.go

@@ -20,7 +20,6 @@ var (
 	Version   string
 	GitHash   string
 	BuildTime string
-	GoVersion string
 )
 
 func init() {
@@ -47,7 +46,6 @@ func Parse() {
 		fmt.Printf("Version: %s \n", Version)
 		fmt.Printf("Git Hash: %s \n", GitHash)
 		fmt.Printf("Build Time: %s \n", BuildTime)
-		fmt.Printf("GoLang Version: %s \n", GoVersion)
 		os.Exit(0)
 	}
 }

build.sh

@@ -14,12 +14,10 @@ if [ -n "${ver}" ];then
 fi
 
 
-goVersion=$(go version | awk '{print $3}')
 gitHash=$(git show -s --format=%H)
 buildTime=$(date -d today +"%Y-%m-%d %H:%M:%S")
 
 ldflags="-X 'github.com/zgwit/iot-master/args.Version=$version' \
--X 'github.com/zgwit/iot-master/args.goVersion=$goVersion' \
 -X 'github.com/zgwit/iot-master/args.gitHash=$gitHash' \
 -X 'github.com/zgwit/iot-master/args.buildTime=$buildTime'"
 

config/database.go

@@ -9,6 +9,6 @@ type Database struct {
 
 var DatabaseDefault = Database{
 	Type:  "sqlite3",
-	URL:   "data/sqlite3.db",
+	URL:   "sqlite3.db",
 	Debug: false,
 }

portal/src/app/admin/admin.component.html

@@ -67,8 +67,8 @@
       <router-outlet></router-outlet>
     </nz-content>
     <nz-footer class="app-footer">
-
-      <a href="https://iot-master.com" target="_blank">物联大师 开源版</a> v1.0.0
+      物联大师 {{version.version}}
+      {{version.runtime}} {{version.build}} {{version.git}} gin@{{version.gin}}
       &copy; 2016~2022 <a href="https://zgwit.com" target="_blank">真格智能实验室</a>
 
     </nz-footer>

portal/src/app/admin/admin.component.ts

@@ -18,12 +18,18 @@ export class AdminComponent implements OnInit {
 
   tabs: Array<any> = [{url: 'welcome'}]
 
+  version: any = {
+    version: "1.0.0"
+  }
+
   constructor(private rs: RequestService, public us: UserService, private route: Router) {
     this.initMenu();
   }
 
   ngOnInit(): void {
-
+    this.rs.get("system/version").subscribe(res=>{
+      this.version = res.data
+    })
   }
 
   noop(): void {

web/api/api.go

@@ -175,7 +175,7 @@ func RegisterRoutes(app *gin.RouterGroup) {
 	app.GET("/pipe/:id/stop", parseParamId, pipeStop)
 
 	//系统接口
-	app.GET("/system/version")
+	app.GET("/system/version", version)
 	app.GET("/system/cpu-info", cpuInfo)
 	app.GET("/system/cpu", cpuStats)
 	app.GET("/system/memory", memStats)

web/api/system.go

@@ -5,17 +5,20 @@ import (
 	"github.com/shirou/gopsutil/cpu"
 	"github.com/shirou/gopsutil/disk"
 	"github.com/shirou/gopsutil/mem"
+	"github.com/zgwit/iot-master/args"
 	"github.com/zgwit/iot-master/protocols"
+	"runtime"
 )
 
-func systemRoutes(app *gin.RouterGroup) {
-	app.GET("version")
-	app.GET("cpu-info", cpuInfo)
-	app.GET("cpu", cpuStats)
-	app.GET("memory", memStats)
-	app.GET("disk", diskStats)
-	app.GET("cron")
-	app.GET("protocols", protocolList)
+
+func version(ctx *gin.Context)  {
+	replyOk(ctx, gin.H{
+		"build": args.BuildTime,
+		"gin": gin.Version,
+		"git": args.GitHash,
+		"runtime": runtime.Version(),
+		"version": args.Version,
+	})
 
 }
 
@@ -77,4 +80,4 @@ func diskStats(ctx *gin.Context)  {
 func protocolList(ctx *gin.Context) {
 	ps := protocols.Protocols()
 	replyOk(ctx, ps)
-}
\ No newline at end of file
+}

web/www/index.html

@@ -4,9 +4,9 @@
   <base href="/">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="favicon.ico">
-<style>html,body{width:100%;height:100%}*,*:before,*:after{box-sizing:border-box}html{font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-ms-overflow-style:scrollbar;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{margin:0;color:#ffffffd9;font-size:14px;font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,"Apple Color Emoji","Segoe UI Emoji",Segoe UI Symbol,"Noto Color Emoji";font-variant:tabular-nums;line-height:1.5715;background-color:#000;font-feature-settings:"tnum","tnum"}html{--antd-wave-shadow-color:#8bbb11;--scroll-bar:0}</style><link rel="stylesheet" href="styles.f2f443a14f57e770.css" media="print" onload="this.media='all'"><noscript><link rel="stylesheet" href="styles.f2f443a14f57e770.css"></noscript></head>
+<style>html,body{width:100%;height:100%}*,*:before,*:after{box-sizing:border-box}html{font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-ms-overflow-style:scrollbar;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{margin:0;color:#ffffffd9;font-size:14px;font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,"Apple Color Emoji","Segoe UI Emoji",Segoe UI Symbol,"Noto Color Emoji";font-variant:tabular-nums;line-height:1.5715;background-color:#000;font-feature-settings:"tnum","tnum"}html{--antd-wave-shadow-color:#8bbb11;--scroll-bar:0}</style><link rel="stylesheet" href="styles.21e5f0b7193777dc.css" media="print" onload="this.media='all'"><noscript><link rel="stylesheet" href="styles.21e5f0b7193777dc.css"></noscript></head>
 <body>
   <app-root></app-root>
-<script src="runtime.02df557f82ee98a9.js" type="module"></script><script src="polyfills.2166f38f5c78e617.js" type="module"></script><script src="main.6245d4a83c01473c.js" type="module"></script>
+<script src="runtime.16bf59671e677e05.js" type="module"></script><script src="polyfills.2166f38f5c78e617.js" type="module"></script><script src="main.d33a4a1cfcd11fa8.js" type="module"></script>
 
 </body></html>
\ No newline at end of file

web/www/runtime.02df557f82ee98a9.js → web/www/runtime.16bf59671e677e05.js

-(()=>{"use strict";var e,v={},_={};function r(e){var n=_[e];if(void 0!==n)return n.exports;var t=_[e]={exports:{}};return v[e].call(t.exports,t,t.exports,r),t.exports}r.m=v,e=[],r.O=(n,t,o,f)=>{if(!t){var a=1/0;for(i=0;i<e.length;i++){for(var[t,o,f]=e[i],l=!0,u=0;u<t.length;u++)(!1&f||a>=f)&&Object.keys(r.O).every(b=>r.O[b](t[u]))?t.splice(u--,1):(l=!1,f<a&&(a=f));if(l){e.splice(i--,1);var s=o();void 0!==s&&(n=s)}}return n}f=f||0;for(var i=e.length;i>0&&e[i-1][2]>f;i--)e[i]=e[i-1];e[i]=[t,o,f]},r.n=e=>{var n=e&&e.__esModule?()=>e.default:()=>e;return r.d(n,{a:n}),n},(()=>{var n,e=Object.getPrototypeOf?t=>Object.getPrototypeOf(t):t=>t.__proto__;r.t=function(t,o){if(1&o&&(t=this(t)),8&o||"object"==typeof t&&t&&(4&o&&t.__esModule||16&o&&"function"==typeof t.then))return t;var f=Object.create(null);r.r(f);var i={};n=n||[null,e({}),e([]),e(e)];for(var a=2&o&&t;"object"==typeof a&&!~n.indexOf(a);a=e(a))Object.getOwnPropertyNames(a).forEach(l=>i[l]=()=>t[l]);return i.default=()=>t,r.d(f,i),f}})(),r.d=(e,n)=>{for(var t in n)r.o(n,t)&&!r.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:n[t]})},r.f={},r.e=e=>Promise.all(Object.keys(r.f).reduce((n,t)=>(r.f[t](e,n),n),[])),r.u=e=>e+".4231c6e8f46f26e3.js",r.miniCssF=e=>{},r.o=(e,n)=>Object.prototype.hasOwnProperty.call(e,n),(()=>{var e={},n="iot-master:";r.l=(t,o,f,i)=>{if(e[t])e[t].push(o);else{var a,l;if(void 0!==f)for(var u=document.getElementsByTagName("script"),s=0;s<u.length;s++){var d=u[s];if(d.getAttribute("src")==t||d.getAttribute("data-webpack")==n+f){a=d;break}}a||(l=!0,(a=document.createElement("script")).type="module",a.charset="utf-8",a.timeout=120,r.nc&&a.setAttribute("nonce",r.nc),a.setAttribute("data-webpack",n+f),a.src=r.tu(t)),e[t]=[o];var c=(g,b)=>{a.onerror=a.onload=null,clearTimeout(p);var m=e[t];if(delete e[t],a.parentNode&&a.parentNode.removeChild(a),m&&m.forEach(y=>y(b)),g)return g(b)},p=setTimeout(c.bind(null,void 0,{type:"timeout",target:a}),12e4);a.onerror=c.bind(null,a.onerror),a.onload=c.bind(null,a.onload),l&&document.head.appendChild(a)}}})(),r.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},(()=>{var e;r.tt=()=>(void 0===e&&(e={createScriptURL:n=>n},"undefined"!=typeof trustedTypes&&trustedTypes.createPolicy&&(e=trustedTypes.createPolicy("angular#bundler",e))),e)})(),r.tu=e=>r.tt().createScriptURL(e),r.p="",(()=>{var e={666:0};r.f.j=(o,f)=>{var i=r.o(e,o)?e[o]:void 0;if(0!==i)if(i)f.push(i[2]);else if(666!=o){var a=new Promise((d,c)=>i=e[o]=[d,c]);f.push(i[2]=a);var l=r.p+r.u(o),u=new Error;r.l(l,d=>{if(r.o(e,o)&&(0!==(i=e[o])&&(e[o]=void 0),i)){var c=d&&("load"===d.type?"missing":d.type),p=d&&d.target&&d.target.src;u.message="Loading chunk "+o+" failed.\n("+c+": "+p+")",u.name="ChunkLoadError",u.type=c,u.request=p,i[1](u)}},"chunk-"+o,o)}else e[o]=0},r.O.j=o=>0===e[o];var n=(o,f)=>{var u,s,[i,a,l]=f,d=0;if(i.some(p=>0!==e[p])){for(u in a)r.o(a,u)&&(r.m[u]=a[u]);if(l)var c=l(r)}for(o&&o(f);d<i.length;d++)r.o(e,s=i[d])&&e[s]&&e[s][0](),e[s]=0;return r.O(c)},t=self.webpackChunkiot_master=self.webpackChunkiot_master||[];t.forEach(n.bind(null,0)),t.push=n.bind(null,t.push.bind(t))})()})();
\ No newline at end of file
+(()=>{"use strict";var e,v={},_={};function r(e){var n=_[e];if(void 0!==n)return n.exports;var t=_[e]={exports:{}};return v[e].call(t.exports,t,t.exports,r),t.exports}r.m=v,e=[],r.O=(n,t,o,i)=>{if(!t){var a=1/0;for(f=0;f<e.length;f++){for(var[t,o,i]=e[f],l=!0,u=0;u<t.length;u++)(!1&i||a>=i)&&Object.keys(r.O).every(b=>r.O[b](t[u]))?t.splice(u--,1):(l=!1,i<a&&(a=i));if(l){e.splice(f--,1);var d=o();void 0!==d&&(n=d)}}return n}i=i||0;for(var f=e.length;f>0&&e[f-1][2]>i;f--)e[f]=e[f-1];e[f]=[t,o,i]},r.n=e=>{var n=e&&e.__esModule?()=>e.default:()=>e;return r.d(n,{a:n}),n},(()=>{var n,e=Object.getPrototypeOf?t=>Object.getPrototypeOf(t):t=>t.__proto__;r.t=function(t,o){if(1&o&&(t=this(t)),8&o||"object"==typeof t&&t&&(4&o&&t.__esModule||16&o&&"function"==typeof t.then))return t;var i=Object.create(null);r.r(i);var f={};n=n||[null,e({}),e([]),e(e)];for(var a=2&o&&t;"object"==typeof a&&!~n.indexOf(a);a=e(a))Object.getOwnPropertyNames(a).forEach(l=>f[l]=()=>t[l]);return f.default=()=>t,r.d(i,f),i}})(),r.d=(e,n)=>{for(var t in n)r.o(n,t)&&!r.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:n[t]})},r.f={},r.e=e=>Promise.all(Object.keys(r.f).reduce((n,t)=>(r.f[t](e,n),n),[])),r.u=e=>e+".ed60305cd7f7ad3d.js",r.miniCssF=e=>{},r.o=(e,n)=>Object.prototype.hasOwnProperty.call(e,n),(()=>{var e={},n="iot-master:";r.l=(t,o,i,f)=>{if(e[t])e[t].push(o);else{var a,l;if(void 0!==i)for(var u=document.getElementsByTagName("script"),d=0;d<u.length;d++){var s=u[d];if(s.getAttribute("src")==t||s.getAttribute("data-webpack")==n+i){a=s;break}}a||(l=!0,(a=document.createElement("script")).type="module",a.charset="utf-8",a.timeout=120,r.nc&&a.setAttribute("nonce",r.nc),a.setAttribute("data-webpack",n+i),a.src=r.tu(t)),e[t]=[o];var c=(g,b)=>{a.onerror=a.onload=null,clearTimeout(p);var m=e[t];if(delete e[t],a.parentNode&&a.parentNode.removeChild(a),m&&m.forEach(y=>y(b)),g)return g(b)},p=setTimeout(c.bind(null,void 0,{type:"timeout",target:a}),12e4);a.onerror=c.bind(null,a.onerror),a.onload=c.bind(null,a.onload),l&&document.head.appendChild(a)}}})(),r.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},(()=>{var e;r.tt=()=>(void 0===e&&(e={createScriptURL:n=>n},"undefined"!=typeof trustedTypes&&trustedTypes.createPolicy&&(e=trustedTypes.createPolicy("angular#bundler",e))),e)})(),r.tu=e=>r.tt().createScriptURL(e),r.p="",(()=>{var e={666:0};r.f.j=(o,i)=>{var f=r.o(e,o)?e[o]:void 0;if(0!==f)if(f)i.push(f[2]);else if(666!=o){var a=new Promise((s,c)=>f=e[o]=[s,c]);i.push(f[2]=a);var l=r.p+r.u(o),u=new Error;r.l(l,s=>{if(r.o(e,o)&&(0!==(f=e[o])&&(e[o]=void 0),f)){var c=s&&("load"===s.type?"missing":s.type),p=s&&s.target&&s.target.src;u.message="Loading chunk "+o+" failed.\n("+c+": "+p+")",u.name="ChunkLoadError",u.type=c,u.request=p,f[1](u)}},"chunk-"+o,o)}else e[o]=0},r.O.j=o=>0===e[o];var n=(o,i)=>{var u,d,[f,a,l]=i,s=0;if(f.some(p=>0!==e[p])){for(u in a)r.o(a,u)&&(r.m[u]=a[u]);if(l)var c=l(r)}for(o&&o(i);s<f.length;s++)r.o(e,d=f[s])&&e[d]&&e[d][0](),e[d]=0;return r.O(c)},t=self.webpackChunkiot_master=self.webpackChunkiot_master||[];t.forEach(n.bind(null,0)),t.push=n.bind(null,t.push.bind(t))})()})();
\ No newline at end of file