From 1c8688432a9a5c603e211467da1271fa0ce86e05 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Tue, 11 Apr 2023 11:04:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9env?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/adminapi/controller/v1/setting/SystemMenus.php | 2 +-
 crmeb/public/install/.env                                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crmeb/app/adminapi/controller/v1/setting/SystemMenus.php b/crmeb/app/adminapi/controller/v1/setting/SystemMenus.php
index 693b146f2..d8b64f814 100644
--- a/crmeb/app/adminapi/controller/v1/setting/SystemMenus.php
+++ b/crmeb/app/adminapi/controller/v1/setting/SystemMenus.php
@@ -255,7 +255,7 @@ class SystemMenus extends AuthController
     public function ruleList()
     {
         //获取所有的路由
-        $ruleList = app()->make(SystemRouteServices::class)->selectList(['app_name' => 'adminapi'], 'name,path,method,type');
+        $ruleList = app()->make(SystemRouteServices::class)->selectList(['app_name' => 'adminapi'], 'name,path,method,type,id');
         $menuApiList = $this->services->getColumn(['auth_type' => 2, 'is_del' => 0], "concat(`api_url`,'_',lower(`methods`)) as rule");
         if ($menuApiList) $menuApiList = array_column($menuApiList, 'rule');
         $list = [];
diff --git a/crmeb/public/install/.env b/crmeb/public/install/.env
index 71c73fb47..bfac354fe 100755
--- a/crmeb/public/install/.env
+++ b/crmeb/public/install/.env
@@ -1 +1 @@
-APP_DEBUG = true

[APP]
DEFAULT_TIMEZONE = Asia/Shanghai

[DATABASE]
TYPE = mysql
HOSTNAME = #DB_HOST#
HOSTPORT = #DB_PORT#
USERNAME = #DB_USER#
PASSWORD = '#DB_PWD#'
DATABASE = #DB_NAME#
PREFIX = #DB_PREFIX#
CHARSET = utf8mb4
DEBUG = true

[LANG]
default_lang = zh-cn

[CACHE]
DRIVER = #CACHE_TYPE#
CACHE_PREFIX = #CACHE_PREFIX#
CACHE_TAG_PREFIX = #CACHE_TAG_PREFIX#

[REDIS]
REDIS_HOSTNAME = #RB_HOST#
PORT = #RB_PORT#
REDIS_PASSWORD = '#RB_PWD#'
SELECT = #RB_SELECT#

[QUEUE]
QUEUE_NAME = #QUEUE_NAME#
\ No newline at end of file
+APP_DEBUG = true

[APP]
DEFAULT_TIMEZONE = Asia/Shanghai

[DATABASE]
TYPE = mysql
HOSTNAME = #DB_HOST#
HOSTPORT = #DB_PORT#
USERNAME = #DB_USER#
PASSWORD = #DB_PWD#
DATABASE = #DB_NAME#
PREFIX = #DB_PREFIX#
CHARSET = utf8mb4
DEBUG = true

[LANG]
default_lang = zh-cn

[CACHE]
DRIVER = #CACHE_TYPE#
CACHE_PREFIX = #CACHE_PREFIX#
CACHE_TAG_PREFIX = #CACHE_TAG_PREFIX#

[REDIS]
REDIS_HOSTNAME = #RB_HOST#
PORT = #RB_PORT#
REDIS_PASSWORD = '#RB_PWD#'
SELECT = #RB_SELECT#

[QUEUE]
QUEUE_NAME = #QUEUE_NAME#
\ No newline at end of file

From eb2bbfe0b47a58ee06fa8955126128d32637b2fc Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Tue, 11 Apr 2023 11:11:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/admin/src/setting.js  | 2 +-
 template/uni-app/config/app.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/template/admin/src/setting.js b/template/admin/src/setting.js
index 9af4364ea..84a509ef8 100644
--- a/template/admin/src/setting.js
+++ b/template/admin/src/setting.js
@@ -1,5 +1,5 @@
 // 请求接口地址 如果没有配置自动获取当前网址路径
-const VUE_APP_API_URL = 'http://open.net/adminapi' || process.env.VUE_APP_API_URL || `${location.origin}/adminapi`;
+const VUE_APP_API_URL = process.env.VUE_APP_API_URL || `${location.origin}/adminapi`;
 
 const Setting = {
   // 路由前缀
diff --git a/template/uni-app/config/app.js b/template/uni-app/config/app.js
index 6c3a4c7bd..b808ce61f 100644
--- a/template/uni-app/config/app.js
+++ b/template/uni-app/config/app.js
@@ -8,7 +8,7 @@ module.exports = {
 	// H5配置
 	// #ifdef H5
 	//H5接口是浏览器地址，非单独部署不用修改
-	HTTP_REQUEST_URL: window.location.protocol + "//" + window.location.host,
+	HTTP_REQUEST_URL: `https://v5.wuht.net`||window.location.protocol + "//" + window.location.host,
 	// #endif 
 
 	// 以下配置在不做二开的前提下,不需要做任何的修改