Skip to content

Commit 9d72187

Browse files
fancyecommercefancyecommerce
committed
fecmall界面安装的问题处理
1 parent 2e6542a commit 9d72187

File tree

5 files changed

+46
-33
lines changed

5 files changed

+46
-33
lines changed

‎app/appinstall/modules/Database/controllers/ConfigController.php

+13-4
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function actionIndex()
2828
$editForm = Yii::$app->request->post('editForm');
2929
if ($editForm && $this->checkDatabaseData($editForm)
3030
&& $this->updateDatabaseConfig($editForm)) {
31-
Yii::$app->session->setFlash('database-success', 'mysql config set success, mysql config file path: @common/config/main-local.php');
31+
Yii::$app->session->setFlash('database-success', 'Mysql配置成功，写入的配置文件路径为: @common/config/main-local.php');
3232
// 进行跳转
3333
$homeUrl = Yii::$app->homeUrl;
3434
return $this->redirect($homeUrl.'/database/config/migrate');
@@ -245,7 +245,8 @@ public function getErrorHtml($errorInfo){
245245
public function runMigrate()
246246
{
247247
$bashPath = dirname(Yii::getAlias('@appfront'));
248-
$oldApp = \Yii::$app;
248+
$oldApp = Yii::$app;
249+
$aliases = Yii::$aliases;
249250
Yii::$app = new \yii\console\Application([
250251
'id' => 'install-console',
251252
'basePath' => $bashPath,
@@ -255,10 +256,18 @@ public function runMigrate()
255256
]);
256257
ob_start();
257258
ob_implicit_flush(false);
258-
$runResult = \Yii::$app->runAction('migrate/up', ['migrationPath' => '@fecshop/migrations/mysqldb', 'interactive' => false]);
259+
$runResult = Yii::$app->runAction('migrate/up', ['migrationPath' => '@fecshop/migrations/mysqldb', 'interactive' => false]);
259260
$post_log = ob_get_clean();
260261
Yii::info($post_log, 'fecshop_debug');
261-
\Yii::$app = $oldApp;
262+
Yii::$app = $oldApp;
263+
/**
264+
* aliases 需要重新设置，否则，将会导致配置文件中的 aliases 无法获取，譬如main.php中的
265+
* 'aliases' => [
266+
* '@bower' => '@vendor/bower-asset',
267+
* '@npm' => '@vendor/npm-asset',
268+
* ],
269+
*/
270+
Yii::$aliases = $aliases;
262271
// $runResult 返回值，0代表执行完成，1代表执行出错。
263272
return $runResult === 0 ? true : false ;
264273
}

‎app/appinstall/modules/Database/views/config/addtestdata.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@
1717

1818
<p>2.产品的图片复制</p>
1919

20-
<p>3.<b>请勿重复执行该步骤</b>，操作成功后，请勿刷新页面，因为插入的测试数据多次插入将会报错，
21-
如果您已经执行了插入的sql，点击跳过进入下一步即可。</p>
20+
<p>3.<b>请勿重复执行该步骤</b>，操作成功后，请勿刷新页面，点击<span style="#cc0000">下一步</span>即可。</p>
21+
2222

23-
<p>4.如果您进行了重复操作，请清空数据库的表，从头开始安装</p>
2423

2524
<br/>
2625
<br/>

‎app/appinstall/modules/Database/views/config/migrate.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
use fec\helpers\CRequest;
33
?>
4-
<h1>Mysql数据库表初始化</h1>
4+
<h1>Mysql数据库表初始化Migrate</h1>
55
<br/>
66

77
<?= $errorInfo ?>
@@ -24,7 +24,7 @@
2424
<?php echo CRequest::getCsrfInputHtml(); ?>
2525
<input type="hidden" value="1" name="isPost" />
2626
<button type="submit" class="btn btn-default dbInit">进行数据表初始化</button>
27-
<span class="d_info" style="margin-left:20px;display:none; color: #cc0000">数据库migrate初始化中...</span>
27+
<span class="d_info" style="margin-left:20px;display:none; color: #cc0000">数据库migrate初始化中，请耐心等待，在该过程中请勿刷新页面...</span>
2828
</form>
2929

3030
<script>

‎app/appinstall/modules/Database/views/config/migratesuccess.php

+5
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,16 @@
2222
<br/>
2323
<button type="button" class="btn btn-default dbNext">安装产品测试数据</button>
2424
<button type="button" class="btn btn-default dbSkip">跳过</button>
25+
26+
<div class="loadingInfo" style="display:none;">
27+
产品测试数据安装中，请耐心等待，在该过程中请勿刷新页面...
28+
</div>
2529
<script>
2630
// add to cart js
2731
<?php $this->beginBlock('dbNext') ?>
2832
$(document).ready(function(){
2933
$(".dbNext").click(function(){
34+
$(".loadingInfo").show();
3035
window.location.href="<?= $nextUrl ?>";
3136
});
3237

‎migrations/mysqldb/m190906_121308_fecshop_tables.php

+24-24
Original file line numberDiff line numberDiff line change
@@ -18,35 +18,35 @@ public function safeUp()
1818
';
1919
$this->execute($sql);
2020
// 1
21-
$sql = "
22-
UPDATE `store_domain` SET `lang` = 'en-US' WHERE `lang` = 'en_US';
23-
";
24-
$this->execute($sql);
21+
//$sql = "
22+
// UPDATE `store_domain` SET `lang` = 'en-US' WHERE `lang` = 'en_US';
23+
//";
24+
//$this->execute($sql);
2525
// 2
26-
$sql = "
27-
UPDATE `store_domain` SET `lang` = 'fr-FR' WHERE `lang` = 'fr_FR';
28-
";
29-
$this->execute($sql);
26+
//$sql = "
27+
// UPDATE `store_domain` SET `lang` = 'fr-FR' WHERE `lang` = 'fr_FR';
28+
//";
29+
//$this->execute($sql);
3030
// 3
31-
$sql = "
32-
UPDATE `store_domain` SET `lang` = 'es-ES' WHERE `lang` = 'es_ES';
33-
";
34-
$this->execute($sql);
31+
//$sql = "
32+
// UPDATE `store_domain` SET `lang` = 'es-ES' WHERE `lang` = 'es_ES';
33+
//";
34+
//$this->execute($sql);
3535
// 4
36-
$sql = "
37-
UPDATE `store_domain` SET `lang` = 'zh-CN' WHERE `lang` = 'zh_CN';
38-
";
39-
$this->execute($sql);
36+
//$sql = "
37+
// UPDATE `store_domain` SET `lang` = 'zh-CN' WHERE `lang` = 'zh_CN';
38+
// ";
39+
//$this->execute($sql);
4040
// 5
41-
$sql = "
42-
UPDATE `store_domain` SET `lang` = 'it-IT' WHERE `lang` = 'it_IT';
43-
";
44-
$this->execute($sql);
41+
//$sql = "
42+
// UPDATE `store_domain` SET `lang` = 'it-IT' WHERE `lang` = 'it_IT';
43+
//";
44+
//$this->execute($sql);
4545
// 6
46-
$sql = "
47-
UPDATE `store_domain` SET `lang` = 'de-DE' WHERE `lang` = 'de_DE';
48-
";
49-
$this->execute($sql);
46+
//$sql = "
47+
// UPDATE `store_domain` SET `lang` = 'de-DE' WHERE `lang` = 'de_DE';
48+
//";
49+
//$this->execute($sql);
5050
// appserver_store
5151
$sql = '
5252
UPDATE `store_base_config` SET `value` = \'a:9:{s:3:"key";s:36:"fecshop.appserver.fancyecommerce.com";s:4:"lang";s:5:"en-US";s:9:"lang_name";s:7:"English";s:8:"currency";s:3:"USD";s:12:"https_enable";s:1:"1";s:21:"facebook_login_app_id";s:16:"1108618299786621";s:25:"facebook_login_app_secret";s:32:"420b56da4f4664a4d1065a1d31e5ec73";s:22:"google_login_client_id";s:72:"380372364773-qdj1seag9bh2n0pgrhcv2r5uoc58ltp3.apps.googleusercontent.com";s:26:"google_login_client_secret";s:24:"ei8RaoCDoAlIeh1nHYm0rrwO";}\' WHERE `key` ="appserver_store";

0 commit comments

Comments
 (0)