Skip to content

Commit

Permalink
fix: create user
Browse files Browse the repository at this point in the history
  • Loading branch information
@labulakalia
labulakalia committed Jul 31, 2020
1 parent 9cb383e commit a86faca
Show file tree
Hide file tree
Showing 10 changed files with 142 additions and 129 deletions.
15 changes: 8 additions & 7 deletions core/model/install.go
View file
Expand Up @@ -33,31 +33,32 @@ func QueryIsInstall(ctx context.Context) (bool, error) {
var querytable string
needtables := []interface{}{}

for _, tbname := range crcocodileTables {
needtables = append(needtables, tbname)
}
var queryname string
params := []string{}
drivename := config.CoreConf.Server.DB.Drivename
if drivename == "sqlite3" {
querytable = `SELECT count(*) FROM sqlite_master WHERE type="table" AND (`
queryname = "name"
} else if drivename == "mysql" {
dbname := strings.Split(strings.Split(config.CoreConf.Server.DB.Dsn,"?")[0],"/")[1]
params = append(params, dbname)
querytable = `SELECT count(*) FROM information_schema.TABLES WHERE TABLE_SCHEMA = ? (`
dbname := strings.Split(strings.Split(config.CoreConf.Server.DB.Dsn, "?")[0], "/")[1]
needtables = append(needtables, dbname)
querytable = `SELECT count(*) FROM information_schema.TABLES WHERE TABLE_SCHEMA=? AND (`
queryname = "table_name"
} else {
return false, fmt.Errorf("unsupport drive type %s, only support sqlite3 or mysql", drivename)
}

for _, tbname := range crcocodileTables {
needtables = append(needtables, tbname)
}

for i := 0; i < len(crcocodileTables); i++ {
params = append(params, queryname+"=?")
}
querytable += strings.Join(params, " OR ")
querytable += ")"
var count int
fmt.Println(querytable, params)
conn, err := db.GetConn(ctx)
if err != nil {
return false, fmt.Errorf("db.GetConn failed: %w", err)
Expand Down Expand Up @@ -127,7 +128,7 @@ func StartInstall(ctx context.Context, username, password string) error {
}
_, err = conn.ExecContext(context.Background(), sql)
if err != nil {
log.Error("conn.ExecContext failed", zap.Error(err),zap.String("sql",sql))
log.Error("conn.ExecContext failed", zap.Error(err), zap.String("sql", sql))
return fmt.Errorf("conn.ExecContext failed: %w", err)
}
}
Expand Down
190 changes: 95 additions & 95 deletions core/utils/asset/asset.go
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion web/crocodile/index.html
View file
@@ -1 +1 @@
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=/favicon.ico><title>Crocodile Schedule</title><link href=/static/css/chunk-elementUI.ded27da0.css rel=stylesheet><link href=/static/css/chunk-libs.3dfb7769.css rel=stylesheet><link href=/static/css/app.e61e1ac6.css rel=stylesheet></head><body><noscript><strong>We're sorry but Crocodile Schedule doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-elementUI.4de05055.js></script><script src=/static/js/chunk-libs.22042878.js></script><script>(function(e){function n(n){for(var r,c,o=n[0],i=n[1],f=n[2],d=0,h=[];d<o.length;d++)c=o[d],a[c]&&h.push(a[c][0]),a[c]=0;for(r in i)Object.prototype.hasOwnProperty.call(i,r)&&(e[r]=i[r]);l&&l(n);while(h.length)h.shift()();return u.push.apply(u,f||[]),t()}function t(){for(var e,n=0;n<u.length;n++){for(var t=u[n],r=!0,c=1;c<t.length;c++){var o=t[c];0!==a[o]&&(r=!1)}r&&(u.splice(n--,1),e=i(i.s=t[0]))}return e}var r={},c={runtime:0},a={runtime:0},u=[];function o(e){return i.p+"static/js/"+({}[e]||e)+"."+{"chunk-090a4c30":"ec6d19cf","chunk-1d4f7197":"6db0697b","chunk-29e09dc4":"9389ae27","chunk-2d230a36":"19ca57bd","chunk-38aaca24":"0c1829c5","chunk-4671ff38":"84ab35f3","chunk-95556898":"6d904ccb","chunk-21ce0abe":"955cab21","chunk-81349c72":"6a064337","chunk-2ae561e3":"66f41031","chunk-9a0d9ce0":"5b22a6d6","chunk-ad78273e":"75415542","chunk-c9c77a48":"7e3b5398"}[e]+".js"}function i(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,i),t.l=!0,t.exports}i.e=function(e){var n=[],t={"chunk-090a4c30":1,"chunk-1d4f7197":1,"chunk-29e09dc4":1,"chunk-38aaca24":1,"chunk-4671ff38":1,"chunk-21ce0abe":1,"chunk-2ae561e3":1,"chunk-9a0d9ce0":1,"chunk-ad78273e":1,"chunk-c9c77a48":1};c[e]?n.push(c[e]):0!==c[e]&&t[e]&&n.push(c[e]=new Promise((function(n,t){for(var r="static/css/"+({}[e]||e)+"."+{"chunk-090a4c30":"9337881c","chunk-1d4f7197":"31c20e2b","chunk-29e09dc4":"066ec77b","chunk-2d230a36":"31d6cfe0","chunk-38aaca24":"68f5a9fe","chunk-4671ff38":"27ba2cd7","chunk-95556898":"31d6cfe0","chunk-21ce0abe":"ebf9cad3","chunk-81349c72":"31d6cfe0","chunk-2ae561e3":"3ae9cf43","chunk-9a0d9ce0":"542e45d8","chunk-ad78273e":"6298f940","chunk-c9c77a48":"a37cd815"}[e]+".css",a=i.p+r,u=document.getElementsByTagName("link"),o=0;o<u.length;o++){var f=u[o],d=f.getAttribute("data-href")||f.getAttribute("href");if("stylesheet"===f.rel&&(d===r||d===a))return n()}var h=document.getElementsByTagName("style");for(o=0;o<h.length;o++){f=h[o],d=f.getAttribute("data-href");if(d===r||d===a)return n()}var l=document.createElement("link");l.rel="stylesheet",l.type="text/css",l.onload=n,l.onerror=function(n){var r=n&&n.target&&n.target.src||a,u=new Error("Loading CSS chunk "+e+" failed.\n("+r+")");u.code="CSS_CHUNK_LOAD_FAILED",u.request=r,delete c[e],l.parentNode.removeChild(l),t(u)},l.href=a;var s=document.getElementsByTagName("head")[0];s.appendChild(l)})).then((function(){c[e]=0})));var r=a[e];if(0!==r)if(r)n.push(r[2]);else{var u=new Promise((function(n,t){r=a[e]=[n,t]}));n.push(r[2]=u);var f,d=document.createElement("script");d.charset="utf-8",d.timeout=120,i.nc&&d.setAttribute("nonce",i.nc),d.src=o(e),f=function(n){d.onerror=d.onload=null,clearTimeout(h);var t=a[e];if(0!==t){if(t){var r=n&&("load"===n.type?"missing":n.type),c=n&&n.target&&n.target.src,u=new Error("Loading chunk "+e+" failed.\n("+r+": "+c+")");u.type=r,u.request=c,t[1](u)}a[e]=void 0}};var h=setTimeout((function(){f({type:"timeout",target:d})}),12e4);d.onerror=d.onload=f,document.head.appendChild(d)}return Promise.all(n)},i.m=e,i.c=r,i.d=function(e,n,t){i.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:t})},i.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(e,n){if(1&n&&(e=i(e)),8&n)return e;if(4&n&&"object"===typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(i.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var r in e)i.d(t,r,function(n){return e[n]}.bind(null,r));return t},i.n=function(e){var n=e&&e.__esModule?function(){return e["default"]}:function(){return e};return i.d(n,"a",n),n},i.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},i.p="/",i.oe=function(e){throw console.error(e),e};var f=window["webpackJsonp"]=window["webpackJsonp"]||[],d=f.push.bind(f);f.push=n,f=f.slice();for(var h=0;h<f.length;h++)n(f[h]);var l=d;t()})([]);</script><script src=/static/js/app.858cb0bb.js></script></body></html>
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=/favicon.ico><title>Crocodile Schedule</title><link href=/static/css/chunk-elementUI.ded27da0.css rel=stylesheet><link href=/static/css/chunk-libs.3dfb7769.css rel=stylesheet><link href=/static/css/app.e61e1ac6.css rel=stylesheet></head><body><noscript><strong>We're sorry but Crocodile Schedule doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-elementUI.4de05055.js></script><script src=/static/js/chunk-libs.22042878.js></script><script>(function(e){function n(n){for(var r,c,o=n[0],i=n[1],f=n[2],d=0,h=[];d<o.length;d++)c=o[d],u[c]&&h.push(u[c][0]),u[c]=0;for(r in i)Object.prototype.hasOwnProperty.call(i,r)&&(e[r]=i[r]);l&&l(n);while(h.length)h.shift()();return a.push.apply(a,f||[]),t()}function t(){for(var e,n=0;n<a.length;n++){for(var t=a[n],r=!0,c=1;c<t.length;c++){var o=t[c];0!==u[o]&&(r=!1)}r&&(a.splice(n--,1),e=i(i.s=t[0]))}return e}var r={},c={runtime:0},u={runtime:0},a=[];function o(e){return i.p+"static/js/"+({}[e]||e)+"."+{"chunk-090a4c30":"ec6d19cf","chunk-1d4f7197":"6db0697b","chunk-29e09dc4":"9389ae27","chunk-2d230a36":"c75f36b7","chunk-38aaca24":"0c1829c5","chunk-4671ff38":"84ab35f3","chunk-7b51d856":"e1534342","chunk-95556898":"6d904ccb","chunk-21ce0abe":"955cab21","chunk-81349c72":"6a064337","chunk-2ae561e3":"66f41031","chunk-9a0d9ce0":"5b22a6d6","chunk-c9c77a48":"7e3b5398"}[e]+".js"}function i(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,i),t.l=!0,t.exports}i.e=function(e){var n=[],t={"chunk-090a4c30":1,"chunk-1d4f7197":1,"chunk-29e09dc4":1,"chunk-38aaca24":1,"chunk-4671ff38":1,"chunk-7b51d856":1,"chunk-21ce0abe":1,"chunk-2ae561e3":1,"chunk-9a0d9ce0":1,"chunk-c9c77a48":1};c[e]?n.push(c[e]):0!==c[e]&&t[e]&&n.push(c[e]=new Promise((function(n,t){for(var r="static/css/"+({}[e]||e)+"."+{"chunk-090a4c30":"9337881c","chunk-1d4f7197":"31c20e2b","chunk-29e09dc4":"066ec77b","chunk-2d230a36":"31d6cfe0","chunk-38aaca24":"68f5a9fe","chunk-4671ff38":"27ba2cd7","chunk-7b51d856":"ec20b65a","chunk-95556898":"31d6cfe0","chunk-21ce0abe":"ebf9cad3","chunk-81349c72":"31d6cfe0","chunk-2ae561e3":"3ae9cf43","chunk-9a0d9ce0":"542e45d8","chunk-c9c77a48":"a37cd815"}[e]+".css",u=i.p+r,a=document.getElementsByTagName("link"),o=0;o<a.length;o++){var f=a[o],d=f.getAttribute("data-href")||f.getAttribute("href");if("stylesheet"===f.rel&&(d===r||d===u))return n()}var h=document.getElementsByTagName("style");for(o=0;o<h.length;o++){f=h[o],d=f.getAttribute("data-href");if(d===r||d===u)return n()}var l=document.createElement("link");l.rel="stylesheet",l.type="text/css",l.onload=n,l.onerror=function(n){var r=n&&n.target&&n.target.src||u,a=new Error("Loading CSS chunk "+e+" failed.\n("+r+")");a.code="CSS_CHUNK_LOAD_FAILED",a.request=r,delete c[e],l.parentNode.removeChild(l),t(a)},l.href=u;var s=document.getElementsByTagName("head")[0];s.appendChild(l)})).then((function(){c[e]=0})));var r=u[e];if(0!==r)if(r)n.push(r[2]);else{var a=new Promise((function(n,t){r=u[e]=[n,t]}));n.push(r[2]=a);var f,d=document.createElement("script");d.charset="utf-8",d.timeout=120,i.nc&&d.setAttribute("nonce",i.nc),d.src=o(e),f=function(n){d.onerror=d.onload=null,clearTimeout(h);var t=u[e];if(0!==t){if(t){var r=n&&("load"===n.type?"missing":n.type),c=n&&n.target&&n.target.src,a=new Error("Loading chunk "+e+" failed.\n("+r+": "+c+")");a.type=r,a.request=c,t[1](a)}u[e]=void 0}};var h=setTimeout((function(){f({type:"timeout",target:d})}),12e4);d.onerror=d.onload=f,document.head.appendChild(d)}return Promise.all(n)},i.m=e,i.c=r,i.d=function(e,n,t){i.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:t})},i.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(e,n){if(1&n&&(e=i(e)),8&n)return e;if(4&n&&"object"===typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(i.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var r in e)i.d(t,r,function(n){return e[n]}.bind(null,r));return t},i.n=function(e){var n=e&&e.__esModule?function(){return e["default"]}:function(){return e};return i.d(n,"a",n),n},i.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},i.p="/",i.oe=function(e){throw console.error(e),e};var f=window["webpackJsonp"]=window["webpackJsonp"]||[],d=f.push.bind(f);f.push=n,f=f.slice();for(var h=0;h<f.length;h++)n(f[h]);var l=d;t()})([]);</script><script src=/static/js/app.e18665d4.js></script></body></html>
1 change: 1 addition & 0 deletions web/crocodile/static/css/chunk-7b51d856.ec20b65a.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion web/crocodile/static/css/chunk-ad78273e.6298f940.css
View file

This file was deleted.

2 changes: 1 addition & 1 deletion web/crocodile/static/js/app.858cb0bb.js → web/crocodile/static/js/app.e18665d4.js
View file

Large diffs are not rendered by default.

0 comments on commit a86faca

Please sign in to comment.