From 455c7c1dfc1d7f9ccf9f5a1b8febac519aa19f37 Mon Sep 17 00:00:00 2001
From: gongfuxiang <2499232802@qq.com>
Date: Tue, 16 Jul 2019 00:09:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=92=E4=BB=B6=E7=AE=A1=E7=90=86=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Pluginsadmin.php | 14 ++++------
 .../view/default/pluginsadmin/first_step.html |  2 +-
 .../view/default/pluginsadmin/index.html      |  4 +--
 .../view/default/pluginsadmin/save_info.html  |  4 +--
 application/service/PluginsAdminService.php   | 28 +++++--------------
 5 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/application/admin/controller/Pluginsadmin.php b/application/admin/controller/Pluginsadmin.php
index 8d481691e..8aad37789 100755
--- a/application/admin/controller/Pluginsadmin.php
+++ b/application/admin/controller/Pluginsadmin.php
@@ -92,14 +92,12 @@ class Pluginsadmin extends Common
         if(!empty($params['id']))
         {
             // 获取数据
-            $data_params = array(
-                'm'         => 0,
-                'n'         => 1,
-                'where'     => ['id' => intval($params['id'])],
-            );
-            $ret = PluginsAdminService::PluginsList($data_params);
-            $data = $ret['data'][0];
-            $params['plugins'] = $ret['data'][0]['plugins'];
+            $ret = PluginsAdminService::PluginsList();
+            if(isset($ret['data'][$params['id']]))
+            {
+                $data = $ret['data'][$params['id']];
+                $params['plugins'] = $params['id'];
+            }
         }
         $this->assign('data', $data);
 
diff --git a/application/admin/view/default/pluginsadmin/first_step.html b/application/admin/view/default/pluginsadmin/first_step.html
index b7d6f0f36..900f01802 100755
--- a/application/admin/view/default/pluginsadmin/first_step.html
+++ b/application/admin/view/default/pluginsadmin/first_step.html
@@ -13,7 +13,7 @@
                         应用编辑
                     {{/if}}
                 </span>
-                <a href="{{:MyUrl('admin/pluginsadmin/index', $params)}}" class="fr fs-14 m-t-5 am-icon-mail-reply"> 返回</a>
+                <a href="{{:MyUrl('admin/pluginsadmin/index')}}" class="fr fs-14 m-t-5 am-icon-mail-reply"> 返回</a>
             </legend>
 
             <div class="am-form-group">
diff --git a/application/admin/view/default/pluginsadmin/index.html b/application/admin/view/default/pluginsadmin/index.html
index c9edeea6e..c73caa579 100755
--- a/application/admin/view/default/pluginsadmin/index.html
+++ b/application/admin/view/default/pluginsadmin/index.html
@@ -30,8 +30,8 @@
                             <div class="am-gallery-desc">{{$v.desc}}</div>
                             <div class="operation">
                                 {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
-                                    <a href="{{:MyUrl('admin/pluginsadmin/saveinfo', array('id'=>$v['id']))}}" class="am-btn am-btn-default am-btn-xs am-radius am-icon-edit" title="编辑"></a>
-                                    <a href="{{:MyUrl('admin/pluginsadmin/download', array('id'=>$v['id']))}}" class="am-btn am-btn-default am-btn-xs am-radius am-icon-download" title="打包"></a>
+                                    <a href="{{:MyUrl('admin/pluginsadmin/saveinfo', array('id'=>$v['plugins']))}}" class="am-btn am-btn-default am-btn-xs am-radius am-icon-edit" title="编辑"></a>
+                                    <a href="{{:MyUrl('admin/pluginsadmin/download', array('id'=>$v['plugins']))}}" class="am-btn am-btn-default am-btn-xs am-radius am-icon-download" title="打包"></a>
                                 {{/if}}
 
                                 {{if isset($v['is_install']) and $v['is_install'] eq 1}}
diff --git a/application/admin/view/default/pluginsadmin/save_info.html b/application/admin/view/default/pluginsadmin/save_info.html
index cf5cc3e95..dc584e1ef 100755
--- a/application/admin/view/default/pluginsadmin/save_info.html
+++ b/application/admin/view/default/pluginsadmin/save_info.html
@@ -4,7 +4,7 @@
 <div class="content-right">
     <div class="content">
         <!-- form start -->
-        <form class="am-form form-validation view-save" action="{{:MyUrl('admin/pluginsadmin/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/pluginsadmin/index', $params)}}" enctype="multipart/form-data">
+        <form class="am-form form-validation view-save" action="{{:MyUrl('admin/pluginsadmin/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/pluginsadmin/index')}}" enctype="multipart/form-data">
             <legend>
                 <span class="fs-16">
                     {{if empty($data['id'])}}
@@ -13,7 +13,7 @@
                         应用编辑
                     {{/if}}
                 </span>
-                <a href="{{:MyUrl('admin/pluginsadmin/index', $params)}}" class="fr fs-14 m-t-5 am-icon-mail-reply"> 返回</a>
+                <a href="{{:MyUrl('admin/pluginsadmin/index')}}" class="fr fs-14 m-t-5 am-icon-mail-reply"> 返回</a>
             </legend>
 
             <div class="am-form-group">
diff --git a/application/service/PluginsAdminService.php b/application/service/PluginsAdminService.php
index f5ea006dd..711e4089d 100755
--- a/application/service/PluginsAdminService.php
+++ b/application/service/PluginsAdminService.php
@@ -56,8 +56,8 @@ class PluginsAdminService
 
                             // 数据组装
                             $base = $config['base'];
-                            $data[] = [
-                                'id'            => date('YmdHis').GetNumberCode(8),
+                            $data[$config['base']['plugins']] = [
+                                'id'            => empty($db_config['id']) ? date('YmdHis').GetNumberCode(8) : $db_config['id'],
                                 'plugins'       => isset($base['plugins']) ? $base['plugins'] : '',
                                 'is_enable'     => isset($db_config['is_enable']) ? $db_config['is_enable'] : 0,
                                 'is_install'    => empty($db_config) ? 0 : 1,
@@ -144,7 +144,7 @@ class PluginsAdminService
         Db::startTrans();
 
         // 开始卸载
-        if(db('Plugins')->where(['plugins'=>$params['id']])->delete())
+        if(DB::name('Plugins')->where(['plugins'=>$params['id']])->delete())
         {
             // 钩子部署
             $ret = self::PluginsHookDeployment();
@@ -154,11 +154,13 @@ class PluginsAdminService
                 Db::commit();
                 return DataReturn('卸载成功');
             }
+        } else {
+            $ret = DataReturn('卸载失败', -100);
         }
 
         // 事务回退
         Db::rollback();
-        return DataReturn('卸载失败', -100);
+        return $ret;
     }
 
     /**
@@ -502,17 +504,6 @@ class PluginsAdminService
             return $ret;
         }
 
-        // 应用是否已存在数据库
-        $plugins_id = Db::name('Plugins')->where(['plugins'=>$plugins])->value('id');
-        if(empty($plugins_id))
-        {
-            $plugins_id = Db::name('Plugins')->insertGetId(['plugins'=>$plugins, 'is_enable'=>0, 'add_time'=>time()]);
-            if(empty($plugins_id))
-            {
-                return DataReturn('应用添加失败', -100);
-            }
-        }
-
         // 应用目录不存在则创建
         $app_dir = APP_PATH.'plugins'.DS.$plugins;
         if(\base\FileUtil::CreateDir($app_dir) !== true)
@@ -1129,12 +1120,7 @@ php;
         }
         
         // 获取应用标记
-        $where = ['id'=>intval($params['id'])];
-        $plugins = Db::name('Plugins')->where($where)->value('plugins');
-        if(empty($plugins))
-        {
-           return DataReturn('应用不存在', -10); 
-        }
+        $plugins = $params['id'];
 
         // 目录不存在则创建
         $new_dir = ROOT.'runtime'.DS.'data'.DS.'plugins_package'.DS.$plugins;