Merge branch 'master' of github.com:star7th/showdoc

star7th · May 13, 2023 · d549e54 · d549e54
2 parents 7c1a543 + e65e4bf
commit d549e54
Show file tree

Hide file tree

Showing 16 changed files with 115 additions and 12 deletions.
diff --git a/.github/workflows/docker-arm.yml b/.github/workflows/docker-arm.yml
@@ -0,0 +1,31 @@
+name: ci
+
+on:
+  push:
+    branches:
+      - "master"
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          push: true
+          tags: star7th/showdoc:arm-latest
+          file: DockerfileARM # 使用仓库下的DockerfileARM文件进行构建
+          platforms: |
+            linux/arm/v5
+            linux/arm/v7
+            linux/arm64
diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
@@ -0,0 +1,26 @@
+name: Build and push Docker image
+on:
+  release:
+    types: [published]
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          push: true
+          tags: star7th/showdoc:${{ github.event.release.tag_name }}
diff --git a/DockerfileARM b/DockerfileARM
@@ -0,0 +1,13 @@
+FROM  arm64v8/wordpress:php7.4
+
+COPY ./ /var/www/html/
+RUN mkdir -p /showdoc_data/html
+RUN cp -R /var/www/html/ /showdoc_data/
+RUN rm -rf /usr/src/wordpress
+COPY ./ /usr/src/wordpress
+RUN echo "<?php echo file_get_contents('index.html'); ?>" > /var/www/html/web/index.php
+RUN chmod -R 777  /var/www/html/
+
+# 写环境变量
+ENV SHOWDOC_DOCKER_VERSION 2.4
+ENV SHOWDOC_DOCKER_ARM 1
diff --git a/composer.json b/composer.json
@@ -8,7 +8,7 @@
         "Api"
     ],
     "homepage": "https://github.com/star7th/showdoc",
-    "version": "v3.1.0",
+    "version": "v3.1.1",
     "license": "Apache-2.0",
     "authors": [
         {

diff --git a/server/Application/Api/Controller/AdminSettingController.class.php b/server/Application/Api/Controller/AdminSettingController.class.php
@@ -22,13 +22,15 @@ public function saveConfig()
         $beian = I("beian");
         $site_url = I("site_url");
         $open_api_key = I("open_api_key");
+        $open_api_host = I("open_api_host");
         D("Options")->set("history_version_count", $history_version_count);
         D("Options")->set("register_open", $register_open);
         D("Options")->set("home_page", $home_page);
         D("Options")->set("home_item", $home_item);
         D("Options")->set("beian", $beian);
         D("Options")->set("site_url", $site_url);
         D("Options")->set("open_api_key", $open_api_key);
+        D("Options")->set("open_api_host", $open_api_host);
         D("Options")->set("show_watermark", $show_watermark);
 
         if ($oss_open) {
@@ -55,6 +57,7 @@ public function loadConfig()
         $beian = D("Options")->get("beian");
         $site_url = D("Options")->get("site_url");
         $open_api_key = D("Options")->get("open_api_key");
+        $open_api_host = D("Options")->get("open_api_host");
         $oss_setting = json_decode($oss_setting, 1);
 
         //如果强等于false，那就是尚未有数据。关闭注册应该是有数据且数据为字符串0
@@ -72,6 +75,7 @@ public function loadConfig()
                 "site_url" => $site_url,
                 "oss_setting" => $oss_setting,
                 "open_api_key" => $open_api_key,
+                "open_api_host" => $open_api_host,
             );
             $this->sendResult($array);
         }

diff --git a/server/Application/Api/Controller/AiController.class.php b/server/Application/Api/Controller/AiController.class.php
@@ -44,9 +44,20 @@ public function send($content)
                 ),
             ),
         ));
-        $api_base_url = env('API_BASE_URL', 'https://api.openai.com');
+        $open_api_host = D("Options")->get("open_api_host");
+        if (!$open_api_host) {
+            $open_api_host = 'https://api.openai.com';
+        }
+        if (!strstr($open_api_host, 'http')) {
+            $open_api_host = 'https://' . $open_api_host;
+        }
+        if (substr($open_api_host, -1) === '/') { // 如果字符串以 / 符号结尾:
+            $open_api_host = substr($open_api_host, 0, -1); // 将字符串的最后一个字符剪切掉
+
+        }
         $curl = curl_init();  //初始化
-        curl_setopt($curl, CURLOPT_URL, $api_base_url . '/v1/chat/completions');  //设置url
+        curl_setopt($curl, CURLOPT_ENCODING, '');
+        curl_setopt($curl, CURLOPT_URL, $open_api_host . '/v1/chat/completions');  //设置url
         curl_setopt($curl, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);  //设置http验证方法
         curl_setopt($curl, CURLOPT_TIMEOUT, 120);
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);  //设置curl_exec获取的信息的返回方式

diff --git a/web/index.html b/web/index.html
@@ -9,4 +9,4 @@
           '../server/index.php?s=',
         // "lang" :'en'
         lang: 'zh-cn'
-      }</script><link href=./static/css/app.ebeffe2948eb6b4f85c67f44a1860bf3.css rel=stylesheet></head><body class=grey-bg><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.339f5a1f86786a88b9d4.js></script><script type=text/javascript src=./static/js/app.0cf128d74464e1dccf3a.js></script></body></html>
+      }</script><link href=./static/css/app.cf5cf8d7db49bba7dd9f2a5241bd431c.css rel=stylesheet></head><body class=grey-bg><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.339f5a1f86786a88b9d4.js></script><script type=text/javascript src=./static/js/app.7d4ce78ff195400edcb7.js></script></body></html>
diff --git a/.../app.ebeffe2948eb6b4f85c67f44a1860bf3.css → .../app.cf5cf8d7db49bba7dd9f2a5241bd431c.css b/.../app.ebeffe2948eb6b4f85c67f44a1860bf3.css → .../app.cf5cf8d7db49bba7dd9f2a5241bd431c.css
diff --git a/web/static/js/app.0cf128d74464e1dccf3a.js b/web/static/js/app.0cf128d74464e1dccf3a.js
diff --git a/web/static/js/app.7d4ce78ff195400edcb7.js b/web/static/js/app.7d4ce78ff195400edcb7.js
diff --git a/web_src/src/components/admin/setting/Index.vue b/web_src/src/components/admin/setting/Index.vue
@@ -97,6 +97,20 @@
           ></i>
         </el-tooltip>
       </el-form-item>
+      <el-form-item v-show="$lang == 'zh-cn'" label="AI助手代理HOST">
+        <el-input
+          v-model="form.open_api_host"
+          class="form-el"
+          placeholder="可选"
+        ></el-input>
+
+        <el-tooltip effect="dark" content="点击查看填写说明" placement="top">
+          <i
+            class="el-icon-question cursor-pointer "
+            @click="toOutLink('https://github.com/star7th/showdoc/issues/1904')"
+          ></i>
+        </el-tooltip>
+      </el-form-item>
       <el-form-item :label="$t('oss_open')">
         <el-switch v-model="form.oss_open"></el-switch>
       </el-form-item>
@@ -225,7 +239,8 @@ export default {
         beian: '',
         show_watermark: false,
         site_url: '',
-        open_api_key: ''
+        open_api_key: '',
+        open_api_host: ''
       },
       itemList: []
     }
@@ -272,6 +287,9 @@ export default {
         this.form.open_api_key = data.data.open_api_key
           ? data.data.open_api_key
           : ''
+        this.form.open_api_host = data.data.open_api_host
+          ? data.data.open_api_host
+          : ''
       })
     },
     getItemList() {

diff --git a/web_src/src/components/item/home/ItemList.vue b/web_src/src/components/item/home/ItemList.vue
@@ -232,7 +232,7 @@ import Recycle from '@/components/item/setting/Recycle'
 import Archive from '@/components/item/setting/Archive'
 import Attorn from '@/components/item/setting/Attorn'
 import Delete from '@/components/item/setting/Delete'
-import Share from '@/components/item/home/share'
+import Share from '@/components/item/home/Share'
 export default {
   name: 'ItemList',
   components: {

diff --git a/web_src/src/components/item/show/show_single_page_item/HeaderRight.vue b/web_src/src/components/item/show/show_single_page_item/HeaderRight.vue
@@ -184,7 +184,7 @@ import Archive from '@/components/item/setting/Archive'
 import Attorn from '@/components/item/setting/Attorn'
 import Delete from '@/components/item/setting/Delete'
 import ItemUpdate from '@/components/item/add/Basic'
-import Share from '@/components/item/home/share'
+import Share from '@/components/item/home/Share'
 import PageEdit from '@/components/page/edit/Index'
 export default {
   components: {

diff --git a/web_src/src/components/item/show/show_table_item/HeaderRight.vue b/web_src/src/components/item/show/show_table_item/HeaderRight.vue
@@ -209,7 +209,7 @@ import Archive from '@/components/item/setting/Archive'
 import Attorn from '@/components/item/setting/Attorn'
 import Delete from '@/components/item/setting/Delete'
 import ItemUpdate from '@/components/item/add/Basic'
-import Share from '@/components/item/home/share'
+import Share from '@/components/item/home/Share'
 export default {
   components: {
     Member,

diff --git a/web_src/src/main.js b/web_src/src/main.js
@@ -20,7 +20,7 @@ import 'babel-polyfill'
 import VueClipboard from 'vue-clipboard2'
 import store from './store/'
 import '../src/assets/tailwind.css' // 引入tailwind
-import SDialog from '@/components/common/SDialog'
+import SDialog from '@/components/common/Sdialog'
 
 Vue.use(util)
 Vue.config.productionTip = false

diff --git a/web_src/src/router/index.js b/web_src/src/router/index.js
@@ -2,7 +2,7 @@ import Vue from 'vue'
 import Router from 'vue-router'
 import Index from '@/components/Index'
 import UserLogin from '@/components/user/Login'
-import UserSetting from '@/components/user/setting/index'
+import UserSetting from '@/components/user/setting/Index'
 import UserRegister from '@/components/user/Register'
 import loginByUserToken from '@/components/user/loginByUserToken'
 import ItemIndex from '@/components/item/home/Index'