Merge branch 'master' of github.com:liuhuapiaoyuan/chatgpt-mirror-server

.devcontainer/daemon.json

@@ -1,4 +1,4 @@
 {
-    "registry-mirrors": [
-        ]
+  "registry-mirrors": [],
+  "dns": ["114.114.114.114", "8.8.8.8"]
 }

.devcontainer/devcontainer.json

@@ -10,22 +10,27 @@
       "source": "dind-var-lib-docker-${devcontainerId}",
       "target": "/var/lib/docker",
       "type": "volume"
+    },
+    {
+      "source": "node_modules_volume",
+      "target": "/latestworkspaces/chatgpt-mirror-server/frontend/node_modules",
+      "type": "volume"
     }
   ],
   "customizations": {
     "vscode": {
       "extensions": [
         "ms-ceintl.vscode-language-pack-zh-hans",
-        "GitHub.vscode-pull-request-github",
-        "github.copilot",
         "esbenp.prettier-vscode",
         "vue.volar",
-        "cweijan.vscode-database-client2"
+        "sourcegraph.cody-ai"
       ]
     }
   },
   "containerEnv": {
-    "TZ": "Asia/Shanghai"
+    "TZ": "Asia/Shanghai",
+    "HTTP_PROXY":"",
+    "HTTPS_PROXY":""
   },
   "postCreateCommand": "make init",
   "remoteUser": "root"

.github/workflows/docker_build.yml

@@ -0,0 +1,41 @@
+name: 自动构建发布
+
+on:
+  workflow_dispatch: 
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    env:
+      REMOTE_CONTAINERS: "true"
+    steps:
+    - name: 代码拉取
+      uses: actions/checkout@v2
+
+    - name: 初始化环境
+      run: |
+        chmod +x ./.devcontainer/scripts/init.sh
+        ./.devcontainer/scripts/init.sh
+
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1
+
+    - name: 登录到docker
+      uses: docker/login-action@v1
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+    - name: Release
+      run: |
+        chmod +x ./release.sh
+        ./release.sh      
+
+    - name: Cache node modules
+      uses: actions/cache@v2
+      with:
+        path: frontend/node_modules
+        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+        restore-keys: |
+          ${{ runner.os }}-node-

.github/workflows/release-please.yml

@@ -0,0 +1,24 @@
+on:
+  push:
+    branches:
+      - master
+
+permissions:
+  contents: write
+  pull-requests: write
+
+name: 自动版本日志
+
+jobs:
+  release-please:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: google-github-actions/release-please-action@v4
+        with:
+          # this assumes that you have created a personal access token
+          # (PAT) and configured it as a GitHub action secret named
+          # `MY_RELEASE_PLEASE_TOKEN` (this secret name is not important).
+          token: ${{ secrets.GITHUB_TOKEN }}
+          # this is a built-in strategy in release-please, see "Action Inputs"
+          # for more options
+          release-type: simple

.vscode/settings.json

@@ -0,0 +1,2 @@
+{
+}

CHANGELOG.md

@@ -0,0 +1,47 @@
+# Changelog
+
+## [1.1.0](https://github.com/liuhuapiaoyuan/chatgpt-mirror-server/compare/v1.0.0...v1.1.0) (2024-01-06)
+
+
+### Features
+
+* 由于独立计费，所以增加gpt4-mobile ([6b70eb4](https://github.com/liuhuapiaoyuan/chatgpt-mirror-server/commit/6b70eb4cf4b0b1a99d4e0bd1b938641af8613ba3))
+
+
+### Bug Fixes
+
+* 修复Prompt的错误，同时汉化 ([7b63e30](https://github.com/liuhuapiaoyuan/chatgpt-mirror-server/commit/7b63e30ffd3d4ab9b100011f68dee56979287b02))
+* 修复自动登录的问题 ([2fa28f7](https://github.com/liuhuapiaoyuan/chatgpt-mirror-server/commit/2fa28f70a6de71a953e74db0d817801d128183cb))
+* 修补部分接口未对接造成的异常 ([48a289d](https://github.com/liuhuapiaoyuan/chatgpt-mirror-server/commit/48a289d2a8a84fc71141027e9e57ad31df0f8e19))
+* 删除无用的next ([42f6f65](https://github.com/liuhuapiaoyuan/chatgpt-mirror-server/commit/42f6f6579b1ccd67ed13c323198b3592fde31b30))
+* 增加授权码，增加开发使用的网关 ([d397396](https://github.com/liuhuapiaoyuan/chatgpt-mirror-server/commit/d3973966d90338d8979e6e8cd28d3ad2ff1951ca))
+* 引入账号关联会话机制，切换账号等于切换聊天记录 ([62002b3](https://github.com/liuhuapiaoyuan/chatgpt-mirror-server/commit/62002b3f4a6bc4896f51debd31fa0ba97278b86d))
+* 测试prompt ([b9ab10a](https://github.com/liuhuapiaoyuan/chatgpt-mirror-server/commit/b9ab10a46d9d2495b2e6d308b9e191e911439f77))
+* 调整会话ID的唯一 ([7d14825](https://github.com/liuhuapiaoyuan/chatgpt-mirror-server/commit/7d148252c41dc278203d2b3e7f2a30a55e6281e2))
+* 调整部分细节代码 ([7ab3246](https://github.com/liuhuapiaoyuan/chatgpt-mirror-server/commit/7ab32464b760f3793b83df5076f11e25122a0d27))
+* 还原配置 ([0583439](https://github.com/liuhuapiaoyuan/chatgpt-mirror-server/commit/0583439665dae4f5447dd6db6af6e8df3aae6bd4))
+
+## 1.0.0 (2023-12-05)
+
+
+### Features
+
+* openai账号增加手工刷新，自动shuaxin ([b7d155d](https://github.com/liuhuapiaoyuan/chatgpt-mirror-server/commit/b7d155d4744f571bfa4b7ede511ff3d1a4eda1b2))
+* 后台增加会话隔离，账号密码登录 ([b7d155d](https://github.com/liuhuapiaoyuan/chatgpt-mirror-server/commit/b7d155d4744f571bfa4b7ede511ff3d1a4eda1b2))
+* 增加github-action/release ([d958a85](https://github.com/liuhuapiaoyuan/chatgpt-mirror-server/commit/d958a85e878c179001345f38fb8d9fdf962e221a))
+* 增加share能力 ([9303c26](https://github.com/liuhuapiaoyuan/chatgpt-mirror-server/commit/9303c26e8916faea58f2695c01e6c667a5c770d7))
+* 增加支持品牌化 ([b29fe27](https://github.com/liuhuapiaoyuan/chatgpt-mirror-server/commit/b29fe2765fc36f08345bf0f708cbdc4d8b9ef6f8))
+* 增加文件服务的代理 ([f6c4929](https://github.com/liuhuapiaoyuan/chatgpt-mirror-server/commit/f6c4929d0169a1d9a51b1ce0f02f150ade06c6ef))
+* 完善登录逻辑，sessionkey刷新机制 ([5366720](https://github.com/liuhuapiaoyuan/chatgpt-mirror-server/commit/5366720a6f2ba7aad32cb16cefd728be5347d017))
+* 完善聊天隔离 ([b9c6097](https://github.com/liuhuapiaoyuan/chatgpt-mirror-server/commit/b9c609729c5e5f3ee912e09543f6a3861492d529))
+* 支持不同用户分别配置隔离 ([eab169d](https://github.com/liuhuapiaoyuan/chatgpt-mirror-server/commit/eab169d5ca72b5eecf002562e5afbaa4dd639e82))
+
+
+### Bug Fixes
+
+* 修复STATIC_CDN_URL变量 ([46e6efa](https://github.com/liuhuapiaoyuan/chatgpt-mirror-server/commit/46e6efa31dcd634275a833e6011836539be0fa57))
+* 修复删除会话错误 ([a7cb72b](https://github.com/liuhuapiaoyuan/chatgpt-mirror-server/commit/a7cb72b6fe27d0c389ab335f5d04cc0e4c67b1b7))
+* 增加静态资源的CDN加速，更改ArkoseUrl ([31a7537](https://github.com/liuhuapiaoyuan/chatgpt-mirror-server/commit/31a75376ed05d22456078f4b1a99e10e1a514454))
+* 支持同步删除会话 ([d343f5a](https://github.com/liuhuapiaoyuan/chatgpt-mirror-server/commit/d343f5a1caaacfd508ea45b1098afd8c98eeadfe))
+* 改成GITHUB_TOKEN ([7873f84](https://github.com/liuhuapiaoyuan/chatgpt-mirror-server/commit/7873f84d7d3d227e6b61ebeef7b54394a655678e))
+* 更新arkoseurl 缓存记录 ([fde264b](https://github.com/liuhuapiaoyuan/chatgpt-mirror-server/commit/fde264b0d12d14fe9831a9725c9d7c1624d43973))

README.MD

@@ -16,6 +16,8 @@
 -  分配账号:增加账号密码
 -  分配账号: 改为绑定openai账号（通过sessionId进行绑定）
 -  允许登录的时候使用分配账号(注意不是openai账号)密码登录
+-  [x] 增加会话隔离模式 isIsolate
 
 ### TODO 
--  [ ] 增加会话隔离模式 isIsolate
+- [] 增加GPTS的隔离
+- [] 增加聊天对话过滤规则，每个账号可以配置一个过滤策略，过滤策略采用可视化编排，选择

api/api.go

@@ -24,12 +24,14 @@ func init() {
 	// s.SetServerRoot("./resource/public/" + config.BuildDate)
 	group := s.Group("/")
 	group.GET("/", Index)
-	group.GET("/c/:ChatId", C)
+	group.GET("/c/:convId", C)
 	group.GET("/g/:gizmoId", G)
 	group.GET("/gpts/discovery", Discovery)
 	group.GET("/gpts/editor", Editor)
 	group.GET("/gpts/editor/:slug", Slug)
 	group.GET("/g/:gizmoId/c/:convId", GC)
+	group.GET("/gpts/mine", Mine)
+	group.GET("/gpts", Gpts)
 
 	group.GET("/login", Login)
 	group.GET("/share/:shareId", Share)