2020-07-10 解决public冲突。

This commit is contained in:
midoks
2020-07-10 15:57:25 +08:00
parent 89e3940771
commit 6c65e45d00
47 changed files with 2324 additions and 2318 deletions
+18 -18
View File
@@ -13,7 +13,7 @@ import re
import hashlib
from random import Random
import public
import mw
import db
from flask import redirect
@@ -41,7 +41,7 @@ def checkClose():
def initDB():
try:
sql = db.Sql().dbfile('default')
csql = public.readFile('data/sql/default.sql')
csql = mw.readFile('data/sql/default.sql')
csql_list = csql.split(';')
for index in range(len(csql_list)):
sql.execute(csql_list[index], ())
@@ -51,33 +51,33 @@ def initDB():
def initInitD():
script = public.getRunDir() + '/scripts/init.d/mw.tpl'
script_bin = public.getRunDir() + '/scripts/init.d/mw'
script = mw.getRunDir() + '/scripts/init.d/mw.tpl'
script_bin = mw.getRunDir() + '/scripts/init.d/mw'
# if os.path.exists(script_bin):
# return
content = public.readFile(script)
content = content.replace("{$SERVER_PATH}", public.getRunDir())
content = mw.readFile(script)
content = content.replace("{$SERVER_PATH}", mw.getRunDir())
public.writeFile(script_bin, content)
public.execShell('chmod +x ' + script_bin)
mw.writeFile(script_bin, content)
mw.execShell('chmod +x ' + script_bin)
if not public.isAppleSystem():
if not mw.isAppleSystem():
initd_bin = '/etc/init.d/mw'
if not os.path.exists(initd_bin):
import shutil
shutil.copyfile(script_bin, initd_bin)
public.execShell('chmod +x ' + initd_bin)
#加入自启动
public.execShell('chkconfig --add mw')
mw.execShell('chmod +x ' + initd_bin)
# 加入自启动
mw.execShell('chkconfig --add mw')
def initUserInfo():
data = public.M('users').where('id=?', (1,)).getField('password')
data = mw.M('users').where('id=?', (1,)).getField('password')
if data == '21232f297a57a5a743894a0e4a801fc3':
pwd = public.getRandomString(8).lower()
file_pw = public.getRunDir() + '/data/default.pl'
public.writeFile(file_pw, pwd)
public.M('users').where('id=?', (1,)).setField(
'password', public.md5(pwd))
pwd = mw.getRandomString(8).lower()
file_pw = mw.getRunDir() + '/data/default.pl'
mw.writeFile(file_pw, pwd)
mw.M('users').where('id=?', (1,)).setField(
'password', mw.md5(pwd))