Merge pull request #670 from visuddhinanda/laravel

增加 BASE_DIR 设置

.env.example

@@ -1,3 +1,7 @@
+BASE_DIR="/workspace/.env.global"
+CACHE_DIR="${BASE_DIR}/cache"
+TMP_DIR="${BASE_DIR}/tmp"
+
 APP_NAME=Laravel
 APP_ENV=local
 APP_KEY=
@@ -50,3 +54,4 @@ PUSHER_APP_CLUSTER=mt1
 
 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+

README.md

@@ -170,13 +170,13 @@ php artisan migrate
 
 **Liunx**
 ```dash
-cd public/deploy
+cd ./v1/scripts
 sh ./install.sh
 ```
 
 **Window**
 ```dash
-cd public/deploy
+cd ./v1/scripts
 ./install.bat
 ```
 运行时间较长。本地开发环境大约4小时。
@@ -187,13 +187,13 @@ cd public/deploy
 
 **Liunx**
 ```dash
-cd public/deploy
+cd ./v1/scripts
 sh ./redis_upgrade.sh
 ```
 
 **Window**
 ```dash
-cd public/deploy
+cd ./v1/scripts
 ./redis_upgrade.bat
 ```
 运行时间较长。本地开发环境大约4小时。

public/app/config.sample.php

@@ -1,6 +1,6 @@
 <?php 
 #目录设置，不能更改
-require_once __DIR__."/dir.php";
+require_once __DIR__."/config.dir.php";
 
 #域名设置
 define("WWW_DOMAIN_PROTOCOL","https");
@@ -53,7 +53,7 @@ define("SnowFlake",[
 数据表
 */
 #表设置，此行不能更改
-require_once __DIR__."/table.php";
+require_once __DIR__."/config.table.php";
 
 #表名设置，此行不能更改
 require_once __DIR__."/config.migrate.php";

v1/scripts/upgrade_redis.sh

@@ -1,24 +1,16 @@
 #!/bin/sh
 
 date
-php ../app/dict/redis_import_dict.php ../../dicttext/system/system.json
-date
-php ../app/dict/redis_import_dict.php ../../dicttext/rich/rich.json
-date
-php ../app/dict/redis_import_dict.php ../../tmp/dict_text/comp.json
-date
-php ../app/dict/redis_import_term.php
-date
-php ../app/dict/redis_import_user.php
-date
-php ../app/dict/redis_ref_with_mean.php
-date
-php ../app/dict/redis_refresh_first_mean.php
-date
-php ../app/dict/redis_sys_rgl_part.php
-date
-php ../app/dict/redis_pm_part.php
-date
-php ../app/pali_sent/redis_upgrade_pali_sent.php
+
+php ../../public/app/dict/redis_import_dict.php ../../dicttext/system/system.json
+php ../../public/app/dict/redis_import_dict.php ../../dicttext/rich/rich.json
+php ../../public/app/dict/redis_import_dict.php ../../tmp/dict_text/comp.json
+php ../../public/app/dict/redis_import_term.php
+php ../../public/app/dict/redis_import_user.php
+php ../../public/app/dict/redis_ref_with_mean.php
+php ../../public/app/dict/redis_refresh_first_mean.php
+php ../../public/app/dict/redis_sys_rgl_part.php
+php ../../public/app/dict/redis_pm_part.php
+php ../../public/app/pali_sent/redis_upgrade_pali_sent.php
 
 date