From 74ee4ce1bb27fecd177f3a9d500186771d79e78d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Mon, 6 Mar 2023 10:51:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=BF=9D=E5=AD=98=E6=8A=A5=E9=94=99=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/services/message/SystemNotificationServices.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crmeb/app/services/message/SystemNotificationServices.php b/crmeb/app/services/message/SystemNotificationServices.php
index 69d42a5a3..a73417383 100644
--- a/crmeb/app/services/message/SystemNotificationServices.php
+++ b/crmeb/app/services/message/SystemNotificationServices.php
@@ -113,7 +113,7 @@ class SystemNotificationServices extends BaseServices
     {
         $type = $data['type'];
         $id = $data['id'];
-        $info = $this->dao->get($id, 'id');
+        $info = $this->dao->get($id);
         if (!$info) {
             throw new AdminException(100026);
         }

From c9454d344a0f8260ce1976736107dfc733cc0faa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Mon, 6 Mar 2023 14:05:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=9A=E8=AF=AD?=
 =?UTF-8?q?=E8=A8=80=E6=95=B0=E6=8D=AE=E7=89=88=E6=9C=AC=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/api/controller/v1/PublicController.php  | 12 ++++++++++++
 crmeb/app/api/route/v1.php                      |  2 ++
 .../services/system/lang/LangCodeServices.php   | 17 +++++++++++++++++
 .../services/system/lang/LangTypeServices.php   |  3 ++-
 4 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/crmeb/app/api/controller/v1/PublicController.php b/crmeb/app/api/controller/v1/PublicController.php
index edbca5418..cd5c8689a 100644
--- a/crmeb/app/api/controller/v1/PublicController.php
+++ b/crmeb/app/api/controller/v1/PublicController.php
@@ -645,4 +645,16 @@ class PublicController
     {
         return app('json')->success(['version' => get_crmeb_version()]);
     }
+
+    /**
+     * 获取多语言缓存
+     * @return \think\Response
+     * @author 吴汐
+     * @email 442384644@qq.com
+     * @date 2023/03/06
+     */
+    public function getLangVersion()
+    {
+        return app('json')->success(app()->make(LangCodeServices::class)->getLangVersion());
+    }
 }
diff --git a/crmeb/app/api/route/v1.php b/crmeb/app/api/route/v1.php
index 01f9fc22c..a8d2c1b73 100644
--- a/crmeb/app/api/route/v1.php
+++ b/crmeb/app/api/route/v1.php
@@ -388,6 +388,8 @@ Route::group(function () {
     Route::get('get_lang_json', 'v1.PublicController/getLangJson')->name('getLangJson');
     //获取当前后台设置的默认语言类型
     Route::get('get_default_lang_type', 'v1.PublicController/getDefaultLangType')->name('getLangJson');
+    //获取当前后台设置的默认语言类型
+    Route::get('lang_version', 'v1.PublicController/getLangVersion')->name('getLangVersion');
 
     /** 定时任务接口 */
     //定时任务调用接口
diff --git a/crmeb/app/services/system/lang/LangCodeServices.php b/crmeb/app/services/system/lang/LangCodeServices.php
index 60bea4419..5753b902c 100644
--- a/crmeb/app/services/system/lang/LangCodeServices.php
+++ b/crmeb/app/services/system/lang/LangCodeServices.php
@@ -138,6 +138,7 @@ class LangCodeServices extends BaseServices
             $langStr = 'api_lang_' . str_replace('-', '_', $value);
             CacheService::delete($langStr);
         }
+        $this->cacheDriver()->clear();
         return true;
     }
 
@@ -169,4 +170,20 @@ class LangCodeServices extends BaseServices
         }
         return $data;
     }
+
+    /**
+     * 获取多语言缓存
+     * @return mixed
+     * @author 吴汐
+     * @email 442384644@qq.com
+     * @date 2023/03/06
+     */
+    public function getLangVersion()
+    {
+        return $this->cacheDriver()->remember('lang_version', function () {
+            return [
+                'version' => uniqid()
+            ];
+        });
+    }
 }
\ No newline at end of file
diff --git a/crmeb/app/services/system/lang/LangTypeServices.php b/crmeb/app/services/system/lang/LangTypeServices.php
index ae8d10fa2..79089332e 100644
--- a/crmeb/app/services/system/lang/LangTypeServices.php
+++ b/crmeb/app/services/system/lang/LangTypeServices.php
@@ -49,7 +49,7 @@ class LangTypeServices extends BaseServices
         $langCountryList = app()->make(LangCountryServices::class)->selectList([])->toArray();
         $options = [];
         foreach ($langCountryList as $item) {
-            $options[] = ['value' => $item['code'], 'label' => $item['name'].' [ '.$item['code'].' ]'];
+            $options[] = ['value' => $item['code'], 'label' => $item['name'] . ' [ ' . $item['code'] . ' ]'];
         }
         $field[] = Form::select('file_name', '语言标识', $info['file_name'] ?? '')->setOptions(Form::setOptions($options))->filterable(1);
         $field[] = Form::radio('is_default', '是否默认', $info['is_default'] ?? 0)->options([['label' => '开启', 'value' => 1], ['label' => '关闭', 'value' => 0]]);
@@ -100,6 +100,7 @@ class LangTypeServices extends BaseServices
     {
         $fileName = $this->dao->value(['is_default' => 1], 'file_name');
         $this->cacheDriver()->set('range_name', $fileName);
+        app()->make(LangCodeServices::class)->cacheDriver()->clear();
     }
 
     /**