pgxx7

plugins/postgresql/class/pg.py

@@ -9,7 +9,7 @@ import psycopg2
 
 class ORM:
     __DB_PASS = None
-    __DB_USER = 'root'
+    __DB_USER = 'postgres'
     __DB_PORT = 5432
     __DB_HOST = 'localhost'
     __DB_CONN = None
@@ -117,7 +117,8 @@ class ORM:
 
     def select(self):
         # 查询数据集
-        self.__Conn()
+        if not self.__Conn():
+            return self.__DB_ERR
         try:
             sql = "SELECT " + self.__OPT_FIELD + " FROM " + self.__DB_TABLE + \
                 self.__OPT_WHERE + self.__OPT_GROUP + self.__OPT_ORDER + self.__OPT_LIMIT

plugins/postgresql/index.html

@@ -11,7 +11,6 @@
 			<p onclick="pgPerfOpt();">性能优化</p>
 			<p onclick="pluginLogs('postgresql',$('.plugin_version').attr('version'),'run_log');">日志</p>
 			<p onclick="pluginLogs('postgresql',$('.plugin_version').attr('version'),'slow_log');">慢日志</p> 
-			<!--<p onclick="pluginLogs('postgresql',$('.plugin_version').attr('version'),'show_log');">慢日志</p>-->
 			<p onclick="dbList()">管理列表</p>
 			<!--<p onclick="masterOrSlaveConf($('.plugin_version').attr('version'))">主从配置</p> -->
 		</div>

plugins/postgresql/index.py

@@ -64,6 +64,15 @@ def getArgs():
     return tmp
 
 
+def getBackupDir():
+    bk_path = mw.getBackupDir() + "/pg"
+    if not os.path.isdir(bk_path):
+        mw.execShell("mkdir -p {}/upload".format(bk_path))
+
+    bk_path_upload = bk_path + "/upload"
+    return bk_path_upload
+
+
 def checkArgs(data, ck=[]):
     for i in range(len(ck)):
         if not ck[i] in data:
@@ -251,7 +260,7 @@ def initPgPwd():
     serverdir = getServerDir()
     pwd = mw.getRandomString(16)
 
-    cmd_pass = "echo \"create user root with superuser password '" + pwd + "'\" | "
+    cmd_pass = "echo \"create user postgres with superuser password '" + pwd + "'\" | "
     cmd_pass = cmd_pass + serverdir + '/bin/psql -d postgres'
     data = mw.execShell(cmd_pass)
     # print(cmd_pass)
@@ -812,10 +821,9 @@ def syncGetDatabases():
     psdb = pSqliteDb('databases')
     data = pdb.table('pg_database').field(
         'datname').where("datistemplate=false").select()
-    nameArr = ['postgres', ]
+    nameArr = ['postgres']
     n = 0
 
-    # print(users)
     for value in data:
         vdb_name = value["datname"]
         b = False
@@ -827,13 +835,8 @@ def syncGetDatabases():
             continue
         if psdb.where("name=?", (vdb_name,)).count() > 0:
             continue
-        host = '127.0.0.1'
-        # for user in users:
-        #     if vdb_name == user["User"]:
-        #         host = user["Host"]
-        #         break
-
-        ps = mw.getMsg('INPUT_PS')
+        host = '127.0.0.1/32'
+        ps = vdb_name
         addTime = time.strftime('%Y-%m-%d %X', time.localtime())
         if psdb.add('name,username,password,accept,ps,addtime', (vdb_name, vdb_name, '', host, ps, addTime)):
             n += 1
@@ -883,11 +886,16 @@ def addDb():
 
     pdb = pgDb()
     psdb = pSqliteDb('databases')
+
     if psdb.where("name=? or username=?", (dbname, dbuser)).count():
         return mw.returnJson(False, '数据库或用户已存在!')
 
+    sql = "select pg_terminate_backend(pid) from pg_stat_activity where DATNAME = 'template1';"
+    pdb.execute(sql)
     r = pdb.execute("create database " + dbname)
+    # print(r)
     r = pdb.execute("create user " + dbuser)
+    # print(r)
     pdb.execute("alter user {} with password '{}'".format(dbuser, password,))
     pdb.execute(
         "GRANT ALL PRIVILEGES ON DATABASE {} TO {}".format(dbname, dbuser,))
@@ -918,10 +926,20 @@ def delDb():
 
     pdb = pgDb()
     psdb = pSqliteDb('databases')
-    pdb.execute("drop database " + name)
 
     username = psdb.where('id=?', (did,)).getField('username')
-    pdb.execute("drop user " + username)
+    # print(username, len(username))
+    if len(username) > 0:
+        r = pdb.execute("drop user " + str(username))
+        # print(r)
+
+    sql = "SELECT pg_terminate_backend(pg_stat_activity.pid) FROM pg_stat_activity WHERE datname='" + \
+        name + "' AND pid<>pg_backend_pid();"
+
+    r = pdb.execute(sql)
+    # print(r)
+    r = pdb.execute("drop database " + name)
+    # print(r)
 
     pg_hba = getServerDir() + "/data/pg_hba.conf"
     old_config = mw.readFile(pg_hba)
@@ -932,6 +950,37 @@ def delDb():
     return mw.returnJson(True, '删除成功!')
 
 
+def setDbRw(version=''):
+    args = getArgs()
+    data = checkArgs(args, ['username', 'id', 'rw'])
+    if not data[0]:
+        return data[1]
+
+    username = args['username']
+    uid = args['id']
+    rw = args['rw']
+
+    pdb = pgDb()
+    psdb = pSqliteDb('databases')
+    dbname = psdb.where("id=?", (uid,)).getField('name')
+
+    # sql = "REVOKE ALL ON database " + dbname + " FROM " + username
+    # r = pdb.query(sql)
+    # print(sql)
+    # print("uu:" + str(r))
+
+    if rw == 'rw':
+        sql = "GRANT SELECT, INSERT, UPDATE, DELETE ON database " + dbname + " TO " + username
+    elif rw == 'r':
+        sql = "GRANT SELECT ON database " + dbname + " TO " + username
+    else:
+        sql = "GRANT all ON database " + dbname + " TO " + username
+
+    r = pdb.execute(sql)
+    psdb.where("id=?", (uid,)).setField('rw', rw)
+    return mw.returnJson(True, '切换成功!')
+
+
 def getDbAccess():
     args = getArgs()
     data = checkArgs(args, ['name'])
@@ -962,11 +1011,7 @@ def pgBack():
     if not data[0]:
         return data[1]
 
-    bk_path = mw.getBackupDir() + "/pg"
-    if not os.path.isdir(bk_path):
-        mw.execShell("mkdir -p {}/upload".format(bk_path))
-
-    bk_path_upload = bk_path + "/upload"
+    bk_path_upload = getBackupDir()
     database = args['name']
     port = getPgPort()
 
@@ -990,11 +1035,7 @@ def pgBackList():
 
     database = args['name']
 
-    bk_path = mw.getBackupDir() + "/pg"
-    if not os.path.isdir(bk_path):
-        mw.execShell("mkdir -p {}/upload".format(bk_path))
-
-    bk_path_upload = bk_path + "/upload"
+    bk_path_upload = getBackupDir()
     file_list = os.listdir(bk_path_upload)
     data = []
     for i in file_list:
@@ -1021,11 +1062,7 @@ def importDbBackup():
     file = args['file']
     name = args['name']
 
-    bk_path = mw.getBackupDir() + "/pg"
-    if not os.path.isdir(bk_path):
-        mw.execShell("mkdir -p {}/upload".format(bk_path))
-
-    bk_path_upload = bk_path + "/upload"
+    bk_path_upload = getBackupDir()
 
     file_path = os.path.join(bk_path_upload, name)
     if not os.path.exists(file_path):
@@ -1051,12 +1088,7 @@ def deleteDbBackup():
     if not data[0]:
         return data[1]
 
-    bk_path = mw.getBackupDir() + "/pg"
-    if not os.path.isdir(bk_path):
-        mw.execShell("mkdir -p {}/upload".format(bk_path))
-
-    bk_path_upload = bk_path + "/upload"
-
+    bk_path_upload = getBackupDir()
     os.remove(bk_path_upload + '/' + args['filename'])
     return mw.returnJson(True, 'ok')
 
@@ -1126,6 +1158,8 @@ if __name__ == "__main__":
         print(addDb())
     elif func == 'del_db':
         print(delDb())
+    elif func == 'set_db_rw':
+        print(setDbRw(version))
     elif func == 'get_db_access':
         print(getDbAccess())
     elif func == 'set_db_access':

plugins/postgresql/js/postgresql.js

@@ -279,13 +279,11 @@ function checkSelect(){
 }
 
 function setDbRw(id,username,val){
-    myPost('get_db_rw',{id:id,username:username,rw:val}, function(data){
+    myPost('set_db_rw',{id:id,username:username,rw:val}, function(data){
         var rdata = $.parseJSON(data.data);
-        // layer.msg(rdata.msg,{icon:rdata.status ? 1 : 5,shade: [0.3, '#000']});
         showMsg(rdata.msg, function(){
             dbList();
         },{icon:rdata.status ? 1 : 5,shade: [0.3, '#000']}, 2000);
-
     });
 }
 
@@ -686,8 +684,8 @@ function dbList(page, search){
         //<button onclick="" id="dataRecycle" title="删除选中项" class="btn btn-default btn-sm" style="margin-left: 5px;"><span class="glyphicon glyphicon-trash" style="margin-right: 5px;"></span>回收站</button>
         var con = '<div class="safe bgw">\
             <button onclick="addDatabase()" title="添加数据库" class="btn btn-success btn-sm" type="button" style="margin-right: 5px;">添加数据库</button>\
-            <button onclick="setRootPwd(0,\''+rdata.info['root_pwd']+'\')" title="设置MySQL管理员密码" class="btn btn-default btn-sm" type="button" style="margin-right: 5px;">root密码</button>\
-            <button onclick="setDbAccess(\'root\')" title="ROOT权限" class="btn btn-default btn-sm" type="button" style="margin-right: 5px;">ROOT权限</button>\
+            <button onclick="setRootPwd(0,\''+rdata.info['root_pwd']+'\')" title="管理员密码" class="btn btn-default btn-sm" type="button" style="margin-right: 5px;">PG密码</button>\
+            <button onclick="setDbAccess(\'postgres\')" title="ROOT权限" class="btn btn-default btn-sm" type="button" style="margin-right: 5px;">ROOT权限</button>\
             <span style="float:right">              \
                 <button batch="true" style="float: right;display: none;margin-left:10px;" onclick="delDbBatch();" title="删除选中项" class="btn btn-default btn-sm">删除选中</button>\
             </span>\
@@ -698,9 +696,7 @@ function dbList(page, search){
                     <th>数据库名</th>\
                     <th>用户名</th>\
                     <th>密码</th>\
-                    '+
-                    // '<th>备份</th>'+
-                    '<th>备注</th>\
+                    <th>备注</th>\
                     <th style="text-align:right;">操作</th></tr></thead>\
                     <tbody>\
                     '+ list +'\
@@ -708,8 +704,6 @@ function dbList(page, search){
                 </div>\
                 <div id="databasePage" class="dataTables_paginate paging_bootstrap page"></div>\
                 <div class="table_toolbar" style="left:0px;">\
-                    <span class="sync btn btn-default btn-sm" style="margin-right:5px" onclick="syncToDatabase(1)" title="将选中数据库信息同步到服务器">同步选中</span>\
-                    <span class="sync btn btn-default btn-sm" style="margin-right:5px" onclick="syncToDatabase(0)" title="将所有数据库信息同步到服务器">同步所有</span>\
                     <span class="sync btn btn-default btn-sm" onclick="syncGetDatabase()" title="从服务器获取数据库列表">从服务器获取</span>\
                 </div>\
             </div>\