From 014582fad9bcac0e40c93d36676a5aff71332b8d Mon Sep 17 00:00:00 2001 From: jack ning Date: Wed, 11 Sep 2024 19:24:23 +0800 Subject: [PATCH] update --- deploy/server/config/application.properties | 46 +++++++++++++++------ deploy/server/readme.md | 6 +-- deploy/server/readme.zh.md | 6 +-- deploy/server/start.sh | 14 ------- deploy/server/stop.sh | 2 +- 5 files changed, 41 insertions(+), 33 deletions(-) diff --git a/deploy/server/config/application.properties b/deploy/server/config/application.properties index f85c8dbf..e7d7388a 100644 --- a/deploy/server/config/application.properties +++ b/deploy/server/config/application.properties @@ -5,7 +5,7 @@ # =============================== spring.application.name=bytedesk application.title=https://www.weiyuai.cn -application.version=0.3.5 +application.version=0.4.1 # server.host=127.0.0.1 server.port=9003 @@ -20,8 +20,9 @@ spring.freemarker.charset=UTF-8 spring.freemarker.content-type=text/html spring.freemarker.expose-request-attributes=true spring.freemarker.expose-session-attributes=true + # =============================== -#=bytedesk config using mysql/redis、upload to aliyun oss +#=bytedesk # =============================== bytedesk.debug=true # default admin username/password/email/mobile info @@ -44,6 +45,8 @@ bytedesk.mobile-code=123456 bytedesk.organization-name=MyCompany bytedesk.organization-code=bytedesk # bytedesk.timezone=GMT+8 +bytedesk.javaai=false +bytedesk.pythonai=true # =============================== #=bytedesk cors config @@ -185,6 +188,7 @@ tencent.secretkey= # =============================== logging.level.web=DEBUG logging.level.org.springframework.security.web.FilterChainProxy=DEBUG +# logging.level.org.springframework.messaging=WARN # logging.level.org.springframework.web=INFO # logging.level.org.springframework.security=INFO #trace=true @@ -230,6 +234,7 @@ spring.datasource.password=r8FqfdbWUaN3 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.jpa.database=mysql spring.jpa.database-platform=org.hibernate.dialect.MySQLDialect +spring.quartz.properties.org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.StdJDBCDelegate # =============================== #= postgre @@ -241,6 +246,7 @@ spring.jpa.database-platform=org.hibernate.dialect.MySQLDialect # spring.datasource.password=C8aJEVCCvSA1VFi8 # spring.datasource.driver-class-name=org.postgresql.Driver # spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect +# spring.quartz.properties.org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.PostgreSQLDelegate # =============================== #=spring-boot-starter-data-jpa @@ -280,6 +286,8 @@ spring.data.redis.database=0 spring.data.redis.host=127.0.0.1 spring.data.redis.port=6379 spring.data.redis.password=C8aJEVCCvSA1VFi8 +# disable redis repository +spring.data.redis.repositories.enabled=false # redis pool config common.redis.pool-config.maxIdle=64 common.redis.pool-config.maxTotal=64 @@ -395,7 +403,6 @@ spring.quartz.properties.org.quartz.jobStore.isClustered=true spring.quartz.properties.org.quartz.jobStore.tablePrefix=QRTZ_ # spring.quartz.properties.org.quartz.jobStore.class=org.quartz.impl.jdbcjobstore.JobStoreTX spring.quartz.properties.org.quartz.jobStore.class=org.springframework.scheduling.quartz.LocalDataSourceJobStore -spring.quartz.properties.org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.StdJDBCDelegate spring.quartz.properties.org.quartz.jobStore.clusterCheckinInterval=10000 spring.quartz.properties.org.quartz.jobStore.useProperties=false # @@ -447,9 +454,10 @@ logging.level.org.springframework.ai.chat.client.advisor=DEBUG # moonshot # https://docs.spring.io/spring-ai/reference/api/chat/moonshot-chat.html -spring.ai.moonshot.chat.enabled=false +spring.ai.moonshot.chat.enabled=true # spring.ai.moonshot.base-url=api.moonshot.cn -spring.ai.moonshot.api-key=123 +spring.ai.moonshot.api-key=sk-placeholder +# spring.ai.moonshot.api-key=sk-placeholder # 或 export SPRING_AI_MOONSHOT_API_KEY= # spring.ai.moonshot.chat.base-url= # spring.ai.moonshot.chat.api-key= @@ -459,19 +467,20 @@ spring.ai.moonshot.chat.options.temperature=0.7 # minimax # https://platform.minimaxi.com/user-center/basic-information/interface-key -spring.ai.minimax.chat.enabled=false -spring.ai.minimax.api-key=123 +spring.ai.minimax.chat.enabled=true +spring.ai.minimax.api-key=placeholder +# spring.ai.minimax.api-key=placeholder # spring.ai.minimax.chat.options.model=minimax-v1 - # zhipuai # https://open.bigmodel.cn/overview # https://docs.spring.io/spring-ai/reference/api/embeddings/zhipuai-embeddings.html # https://docs.spring.io/spring-ai/reference/api/chat/zhipuai-chat.html -spring.ai.zhipuai.chat.enabled=false +spring.ai.zhipuai.chat.enabled=true # spring.ai.zhipuai.chat.base-url=URL_ADDRESS -spring.ai.zhipuai.api-key=123 -spring.ai.zhipuai.chat.options.model=glm-3-turbo +spring.ai.zhipuai.api-key=f03410085cb038ec41098ae7ca6ef047.TrJMIwAULDG12345 +# 免费模型：https://open.bigmodel.cn/dev/api#glm-4 +spring.ai.zhipuai.chat.options.model=glm-4-flash spring.ai.zhipuai.chat.options.temperature=0.7 # # ollama list: @@ -497,7 +506,7 @@ spring.ai.ollama.embedding.options.model=mistral # spring.ai.vectorstore.pgvector.dimensions=1536 # # https://docs.spring.io/spring-ai/reference/api/vectordbs/redis.html -spring.ai.vectorstore.redis.initialize-schema=true +spring.ai.vectorstore.redis.initialize-schema=false spring.ai.vectorstore.redis.uri=redis://127.0.0.1:6379 spring.ai.vectorstore.redis.index=bytedesk_vs_index spring.ai.vectorstore.redis.prefix=bytedesk_vs_prefix: @@ -523,8 +532,21 @@ bytedesk.oauth.github.clientsecret=clientid bytedesk.liangshibao.host=http://127.0.0.1:9003 bytedesk.liangshibao.path=/Users/ningjinpeng/Desktop/git/private/liangshibao/web/ +# =============================== +# = 百度翻译 +# https://fanyi-api.baidu.com/doc/21 +# =============================== +translate.baidu.appid=placeholder +translate.baidu.key=placeholder + +# 抖音开放平台 +# https://developer.open-douyin.com/webapp/aw74cmav4symty7z/setting/app-info +douyin.client.key=aw74cmav4symty7z +douyin.client.secret=e758131d44eacb5bf2b7fc3d9edfe544 + # =============================== # = docker compose # =============================== spring.docker.compose.enabled=false spring.docker.compose.file=docker-compose.yaml + diff --git a/deploy/server/readme.md b/deploy/server/readme.md index 960a9171..62ffe0eb 100644 --- a/deploy/server/readme.md +++ b/deploy/server/readme.md @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-08-09 10:08:02 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2024-08-28 09:26:22 + * @LastEditTime: 2024-08-10 05:45:29 * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk * Please be aware of the BSL license restrictions before installing Bytedesk IM – * selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. @@ -14,10 +14,10 @@ --> # bytedesk jar deploy -## download [server](https://www.weiyuai.cn/download/server.zip) +## download [server](https://cdn.weiyuai.cn/server.zip) ```bash -# if jar not found, download from: https://www.weiyuai.cn/download/server.zip +# if jar not found, download from: https://cdn.weiyuai.cn/server.zip # edit config/application.properties # change mysql credentials spring.datasource.url=jdbc:mysql://127.0.0.1:3306/bytedesk_im diff --git a/deploy/server/readme.zh.md b/deploy/server/readme.zh.md index a3d308b0..eeccf236 100644 --- a/deploy/server/readme.zh.md +++ b/deploy/server/readme.zh.md @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-08-09 10:08:02 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2024-08-28 09:26:03 + * @LastEditTime: 2024-08-10 05:46:29 * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk * Please be aware of the BSL license restrictions before installing Bytedesk IM – * selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. @@ -16,10 +16,10 @@ [微语](https://www.weiyuai.cn)是开源免费的企业协作系统，支持企业IM、在线客服、AI助手、知识库、帮助中心、工单系统等。 -## 下载 [server](https://www.weiyuai.cn/download/server.zip) +## 下载 [server](https://cdn.weiyuai.cn/server.zip) ```bash -# 因jar包太大, 从这里下载: https://www.weiyuai.cn/download/server.zip +# 因jar包太大, 从这里下载: https://cdn.weiyuai.cn/server.zip # 编辑配置文件：config/application.properties # 修改数据库连接信息 spring.datasource.url=jdbc:mysql://127.0.0.1:3306/bytedesk_im diff --git a/deploy/server/start.sh b/deploy/server/start.sh index 7a9d0c68..8876a2b1 100755 --- a/deploy/server/start.sh +++ b/deploy/server/start.sh @@ -1,18 +1,4 @@ #!/bin/sh -### - # @Author: jackning 270580156@qq.com - # @Date: 2024-08-09 10:35:30 - # @LastEditors: jackning 270580156@qq.com - # @LastEditTime: 2024-08-28 09:24:27 - # @Description: bytedesk.com https://github.com/Bytedesk/bytedesk - # Please be aware of the BSL license restrictions before installing Bytedesk IM – - # selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. - # 仅支持企业内部员工自用，严禁私自用于销售、二次销售或者部署SaaS方式销售 - # Business Source License 1.1: https://github.com/Bytedesk/bytedesk/blob/main/LICENSE - # contact: 270580156@qq.com - # 联系：270580156@qq.com - # Copyright (c) 2024 by bytedesk.com, All Rights Reserved. -### RUN_NAME="bytedesk-starter-0.4.1.jar" export LANG="en_US.UTF-8" PRG=$0 diff --git a/deploy/server/stop.sh b/deploy/server/stop.sh index 90e47a39..6287cdbc 100755 --- a/deploy/server/stop.sh +++ b/deploy/server/stop.sh @@ -3,7 +3,7 @@ # @Author: jackning 270580156@qq.com # @Date: 2024-08-09 10:35:30 # @LastEditors: jackning 270580156@qq.com - # @LastEditTime: 2024-08-28 09:24:56 + # @LastEditTime: 2024-08-09 10:51:39 # @Description: bytedesk.com https://github.com/Bytedesk/bytedesk # Please be aware of the BSL license restrictions before installing Bytedesk IM – # selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license.