up

plugins/mysql-ya/class/mysqlDb.py

@@ -30,7 +30,7 @@ class mysqlDb:
         '''连接MYSQL数据库'''
         try:
             import mw
-            socket = '/www/server/mysql/mysql.sock'
+            socket = '/www/server/mysql-ya/mysql.sock'
             try:
                 import MySQLdb
             except Exception as ex:

plugins/mysql-ya/conf/my8.0.cnf

@@ -6,6 +6,7 @@ socket		= {$SERVER_APP_PATH}/mysql.sock
 default-character-set = UTF8MB4
 
 [mysqld]
+default_authentication_plugin=mysql_native_password
 pid-file = {$SERVER_APP_PATH}/data/mysql.pid
 user = mysql
 port		= 3386

route/static/app/public.js

@@ -794,10 +794,7 @@ function jump() {
 function installTips() {
 	$(".fangshi label").mouseover(function() {
 		var a = $(this).attr("data-title");
-		layer.tips(a, this, {
-			tips: [1, "#787878"],
-			time: 0
-		})
+		layer.tips(a, this, {tips: [1, "#787878"],time: 0});
 	}).mouseout(function() {
 		$(".layui-layer-tips").remove()
 	})

route/static/app/soft.js

@@ -176,18 +176,30 @@ function installPreInspection(name, ver, callback){
     
 }
 
+function runInstall(data){
+    var loadT = layer.msg('正在添加到安装器...', { icon: 16, time: 0, shade: [0.3, '#000'] });
+    $.post("/plugins/install", data, function(rdata) {
+        layer.closeAll();
+        layer.msg(rdata.msg, { icon: rdata.status ? 1 : 2 });
+        getSList();
+    },'json');
+
+    installTips();
+    fly("bi-btn");
+}
+
 function addVersion(name, ver, type, obj, title, install_pre_inspection) {
     var option = '';
     var titlename = name;
     if (ver.indexOf('|') >= 0){
         var veropt = ver.split("|");
-        var SelectVersion = '';
+        var selectVersion = '';
         for (var i = 0; i < veropt.length; i++) {
-            SelectVersion += '<option>' + name + ' ' + veropt[i] + '</option>';
+            selectVersion += '<option>' + name + ' ' + veropt[i] + '</option>';
         }
-        option = "<select id='SelectVersion' class='bt-input-text' style='margin-left:30px'>" + SelectVersion + "</select>";
+        option = "<select id='selectVersion' class='bt-input-text' style='margin-left:30px'>" + selectVersion + "</select>";
     } else {
-        option = '<span id="SelectVersion">' + name + ' ' + ver + '</span>';
+        option = '<span id="selectVersion">' + name + ' ' + ver + '</span>';
     }
 
     layer.open({
@@ -196,56 +208,38 @@ function addVersion(name, ver, type, obj, title, install_pre_inspection) {
         area: '350px',
         closeBtn: 2,
         shadeClose: true,
-        content: "<div class='bt-form pd20 pb70 c6'>\
+        btn: ['提交','关闭'],
+        content: "<div class='bt-form pd20 c6'>\
 			<div class='version line'>安装版本：" + option + "</div>\
-	    	<div class='bt-form-submit-btn'>\
-				<button type='button' class='btn btn-danger btn-sm btn-title' onclick='layer.closeAll()'>关闭</button>\
-		        <button type='button' id='bi-btn' class='btn btn-success btn-sm btn-title bi-btn'>提交</button>\
-	        </div>\
-	    </div>"
-    });
-
-    $('.fangshi input').click(function() {
-        $(this).attr('checked', 'checked').parent().siblings().find("input").removeAttr('checked');
-    });
-    $("#bi-btn").click(function() {
+	    </div>",
+        success:function(){
+            $('.fangshi input').click(function() {
+                $(this).attr('checked', 'checked').parent().siblings().find("input").removeAttr('checked');
+            });
+        },
+        yes:function(){
+            var info = $("#selectVersion").val().toLowerCase();
+            if (info == ''){
+                info = $("#selectVersion").text().toLowerCase();
+            }
+            var name = info.split(" ")[0];
+            var version = info.split(" ")[1];
+            var type = $('.fangshi input').prop("checked") ? '1' : '0';
+            var data = "name=" + name + "&version=" + version + "&type=" + type;
+            // console.log(data);
+            if (install_pre_inspection){
+                //安装检查
+                installPreInspection(name, version, function(){
+                    runInstall(data);
+                });      
+                return;
+            }
+            runInstall(data);
 
-        var info = $("#SelectVersion").val().toLowerCase();
-        if (info == ''){
-            info = $("#SelectVersion").text().toLowerCase();
-        }
-        var name = info.split(" ")[0];
-        var version = info.split(" ")[1];
-        var type = $('.fangshi input').prop("checked") ? '1' : '0';
-        var data = "name=" + name + "&version=" + version + "&type=" + type;
-
-        if (install_pre_inspection){
-            //安装检查
-            installPreInspection(name,version, function(){
-                var loadT = layer.msg('正在添加到安装器...', { icon: 16, time: 0, shade: [0.3, '#000'] });
-                $.post("/plugins/install", data, function(rdata) {
-                    layer.closeAll();
-                    layer.msg(rdata.msg, { icon: rdata.status ? 1 : 2 });
-                    getSList();
-                },'json');
-
-                installTips();
-                fly("bi-btn");
-            });            
-            return;
+            // installTips();
+            // fly("bi-btn");
         }
-
-        var loadT = layer.msg('正在添加到安装器...', { icon: 16, time: 0, shade: [0.3, '#000'] });
-        $.post("/plugins/install", data, function(rdata) {
-            layer.closeAll();
-            layer.msg(rdata.msg, { icon: rdata.status ? 1 : 2 });
-            getSList();
-        },'json');
-
-        installTips();
-        fly("bi-btn");
     });
-    
 }
 
 //卸载软件

scripts/install/centos.sh

@@ -8,6 +8,7 @@ if [ ! -f /usr/bin/applydeltarpm ];then
 	yum -y install deltarpm
 fi
 
+VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
 
 setenforce 0
 sed -i 's#SELINUX=enforcing#SELINUX=disabled#g' /etc/selinux/config
@@ -20,6 +21,8 @@ yum install -y vixie-cron
 yum install -y curl-devel libmcrypt libmcrypt-devel
 yum install -y mysql-devel
 
+
+
 #https need
 if [ ! -d /root/.acme.sh ];then	
 	curl https://get.acme.sh | sh
@@ -80,6 +83,9 @@ if [ "$?" != "0" ];then
 	dnf upgrade -y libmodulemd
 fi
 
+
+
+
 yum install -y libzstd-devel
 yum install -y libevent libevent-devel libjpeg* libpng* gd* libxslt* unzip
 yum install -y python-imaging libicu-devel zip bzip2-devel gcc libxml2 libxml2-devel  pcre pcre-devel