Compare commits
86 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0f76b61152 | |||
| 6cfff15c62 | |||
| 6d3887ec06 | |||
| 5af0b07775 | |||
| 8ae10dd2c3 | |||
| 17c1ce2cc6 | |||
| a209dc8080 | |||
| 1d4fff13a1 | |||
| a811e36635 | |||
| d8a0dd5d31 | |||
| 0ff979917c | |||
| fc5615a9c7 | |||
| cdcd9eeffa | |||
| c0da89735c | |||
| fc34d83692 | |||
| 8ceb252d79 | |||
| 8da4563435 | |||
| 045e6ab3df | |||
| 5591e17446 | |||
| 8f783fd765 | |||
| 6b41e46f30 | |||
| ff89fdf5e9 | |||
| 402c425575 | |||
| ee2785f972 | |||
| bbb0271a5e | |||
| 75ff4bb0a4 | |||
| 776f0ed029 | |||
| eef56291eb | |||
| 8e159edf1d | |||
| 1793e4b2aa | |||
| a793ed541b | |||
| 09ed1bd427 | |||
| ff666975da | |||
| b4403cedd9 | |||
| 98d2eb8a2a | |||
| ae5f56c16f | |||
| d374034694 | |||
| b0f399c814 | |||
| 8489ef35cb | |||
| 7d8c2d4e37 | |||
| ec60eee8fe | |||
| dac15250a2 | |||
| fec0198537 | |||
| f5ac4d10c0 | |||
| ca07a6cea5 | |||
| b5d89aef72 | |||
| d151d45e99 | |||
| 3525af81bf | |||
| 01c86ce0a3 | |||
| e5e619a241 | |||
| d9b10c1621 | |||
| c6e72e5b79 | |||
| 980effc420 | |||
| e4040a27e7 | |||
| 23170dcc3f | |||
| 64c92857a6 | |||
| 4346bfebb7 | |||
| c24271c075 | |||
| 526982c431 | |||
| c161bc55e5 | |||
| eb79ad260c | |||
| ce8e59902c | |||
| b8ed400d12 | |||
| 5f48980d31 | |||
| b81e7b8b1b | |||
| a468c0919d | |||
| 1ae5b46523 | |||
| ecac45a74a | |||
| 51c4cb7767 | |||
| ae7cfebb44 | |||
| e4ccbbcbd1 | |||
| bdfcd1cedb | |||
| 6a7b465944 | |||
| 41ac96630c | |||
| 3a8fbc3e1b | |||
| e3e57ee154 | |||
| 0883c1318b | |||
| fe79d04343 | |||
| 2857283558 | |||
| 981779126c | |||
| 39ce5882cb | |||
| e51f6c6544 | |||
| 3a7f510e19 | |||
| 1c9e72e28d | |||
| 9d79b2585e | |||
| 1fc9a39ffe |
27
.env.development
Normal file
27
.env.development
Normal file
@@ -0,0 +1,27 @@
|
||||
# 项目配置, 请根据实际情况修改
|
||||
PROJECT_NAME=newshop
|
||||
|
||||
# ThinkPHP 6.x 配置, 请根据实际情况修改
|
||||
APP_ENV=development
|
||||
|
||||
# PHP/PHP-FPM 配置
|
||||
PHP_VERSION=7.4
|
||||
PHP_FPM_VERSION=7.4-fpm
|
||||
PHP_FPM_PORT=9105
|
||||
XDEBUG_POST=9108
|
||||
|
||||
# 数据库配置
|
||||
MYSQL_ROOT_HOST=%
|
||||
MYSQL_DATABASE=shop_mallnew
|
||||
MYSQL_USER=shop_mallnew
|
||||
MYSQL_PASSWORD=shop_mallnew
|
||||
MYSQL_PORT=3326
|
||||
|
||||
# Redis 绑定端口及密码
|
||||
REDIS_PASSWORD=luckyshop123!@#
|
||||
REDIS_PORT=6499
|
||||
|
||||
# Nginx 暴漏端口
|
||||
NGINX_PORT=8050
|
||||
NGINX_SSL_PORT=8052
|
||||
|
||||
16
.env.example
16
.env.example
@@ -1,24 +1,26 @@
|
||||
# 项目配置, 请根据实际情况修改
|
||||
PROJECT_NAME=newshop
|
||||
|
||||
# ThinkPHP 6.x 配置, 请根据实际情况修改
|
||||
APP_ENV=development
|
||||
|
||||
# PHP/PHP-FPM 配置
|
||||
PHP_VERSION=7.4
|
||||
PHP_FPM_VERSION=7.4-fpm
|
||||
PHP_FPM_PORT=9000
|
||||
XDEBUG_POST=9003
|
||||
PHP_FPM_PORT=9100
|
||||
XDEBUG_POST=9103
|
||||
|
||||
# 数据库配置
|
||||
MYSQL_ROOT_HOST=%
|
||||
MYSQL_DATABASE=shop_mallnew
|
||||
MYSQL_USER=shop_mallnew
|
||||
MYSQL_PASSWORD=shop_mallnew
|
||||
MYSQL_PORT=3306
|
||||
MYSQL_PORT=3316
|
||||
|
||||
# Redis 配置
|
||||
REDIS_PASSWORD=luckyshop123!@#
|
||||
REDIS_PORT=6379
|
||||
REDIS_PORT=6399
|
||||
|
||||
# Nginx 配置
|
||||
NGINX_PORT=80
|
||||
NGINX_SSL_PORT=443
|
||||
|
||||
NGINX_PORT=8010
|
||||
NGINX_SSL_PORT=8012
|
||||
|
||||
27
.env.local
Normal file
27
.env.local
Normal file
@@ -0,0 +1,27 @@
|
||||
# 项目配置, 请根据实际情况修改
|
||||
PROJECT_NAME=newshop
|
||||
|
||||
# ThinkPHP 6.x 配置, 请根据实际情况修改
|
||||
APP_ENV=local
|
||||
|
||||
# PHP/PHP-FPM 配置
|
||||
PHP_VERSION=7.4
|
||||
PHP_FPM_VERSION=7.4-fpm
|
||||
PHP_FPM_PORT=9100
|
||||
XDEBUG_POST=9103
|
||||
|
||||
# 数据库配置
|
||||
MYSQL_ROOT_HOST=%
|
||||
MYSQL_DATABASE=shop_dev
|
||||
MYSQL_USER=shop_mallnew
|
||||
MYSQL_PASSWORD=shop_mallnew
|
||||
MYSQL_PORT=3316
|
||||
|
||||
# Redis 配置
|
||||
REDIS_PASSWORD=luckyshop123!@#
|
||||
REDIS_PORT=6399
|
||||
|
||||
# Nginx 配置
|
||||
NGINX_PORT=8010
|
||||
NGINX_SSL_PORT=8012
|
||||
|
||||
3
.gitignore
vendored
3
.gitignore
vendored
@@ -18,6 +18,9 @@ __pycache__
|
||||
.idea
|
||||
.vscode
|
||||
|
||||
# 环境变量
|
||||
.env
|
||||
|
||||
# 源码结构
|
||||
debug.txt
|
||||
.travis.yml
|
||||
|
||||
43
README.md
Normal file
43
README.md
Normal file
@@ -0,0 +1,43 @@
|
||||
# 在线商城PHP项目
|
||||
|
||||
|
||||
## Docker 部署
|
||||
|
||||
```bash
|
||||
cp .env.example .env.development
|
||||
```
|
||||
|
||||
**注意**
|
||||
|
||||
- 在同一目录下面,执行 `docker-compose` 命令时,需要指定项目名称。用来区分不同的环境。如 `shop_local`、`shop_dev` 等。
|
||||
- 本地部署时,需要将 `APP_ENV` 设置为 `local`。
|
||||
- 开发环境部署时,需要将 `APP_ENV` 设置为 `development`。
|
||||
|
||||
|
||||
|
||||
## 环境变量
|
||||
|
||||
- `APP_ENV`: 应用环境,默认值为 `development`。
|
||||
|
||||
## 开发环境-local 部署
|
||||
|
||||
```bash
|
||||
# 本地部署时,需要将 APP_ENV 设置为 local, 并指定 docker-compose.local.yml 文件
|
||||
docker-compose --env-file .env.local -f docker-compose.local.yml up -d
|
||||
# docker-compose --project-name shop_local --env-file .env.local -f docker-compose.local.yml up -d
|
||||
|
||||
# docker-compose down 命令,用来停止并删除容器
|
||||
docker-compose -f docker-compose.local.yml down -v
|
||||
# docker-compose --project-name shop_local down -v
|
||||
```
|
||||
|
||||
|
||||
## 开发环境-development 部署
|
||||
|
||||
```bash
|
||||
# 默认使用 docker-compose.yml 文件
|
||||
docker-compose --project-name shop_development --env-file .env.development up -d
|
||||
|
||||
# docker-compose down 命令,用来停止并删除容器
|
||||
docker-compose --project-name shop_development down -v
|
||||
```
|
||||
126
docker-compose.local.yml
Normal file
126
docker-compose.local.yml
Normal file
@@ -0,0 +1,126 @@
|
||||
# 特别说明,本地local环境,方便操作,所以未使用的统一的docker-compose.yml文件,只保留了local环境的配置
|
||||
|
||||
x-shared-env: &shared-api-env
|
||||
MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD:-rootpassword}
|
||||
MYSQL_ROOT_HOST: ${MYSQL_ROOT_HOST:-'%'} # 允许root从任何主机连接
|
||||
MYSQL_DATABASE: ${MYSQL_DATABASE:-shop_mallnew}
|
||||
MYSQL_USER: ${MYSQL_USER:-shop_mallnew}
|
||||
MYSQL_PASSWORD: ${MYSQL_PASSWORD:-shop_mallnew}
|
||||
|
||||
REDIS_PASSWORD: ${REDIS_PASSWORD:-luckyshop123!@#}
|
||||
REDIS_PORT: ${REDIS_PORT:-6379}
|
||||
|
||||
# 将服务归类到目录 A 中
|
||||
services:
|
||||
php-fpm:
|
||||
build:
|
||||
context: ./docker/php
|
||||
dockerfile: Dockerfile
|
||||
container_name: ${PROJECT_NAME}_php
|
||||
restart: always
|
||||
extra_hosts:
|
||||
- "host.docker.internal:host-gateway" # 支持主机名解析
|
||||
environment:
|
||||
PHP_ENV: ${PHP_ENV:-development}
|
||||
# 环境变量, APP_ENV 应用于 ThinkPHP 6.x 框架, .env.local 要想启用,需要在项目根目录下创建 .env.local 文件,并将 APP_ENV 设置为 local
|
||||
# 同理,如果要启用开发环境,则将 APP_ENV 设置为 development,如果要启用生产环境,则将 APP_ENV 设置为 production
|
||||
# 不然,ThinkPHP 6.x 系列,会只加载 .env 文件,而不会加载 .env.local 文件,导致 .env.local 文件中的配置不会生效
|
||||
APP_ENV: ${APP_ENV:-local}
|
||||
APP_DEBUG: ${APP_DEBUG:-true}
|
||||
XDEBUG_CONFIG: ${XDEBUG_CONFIG:-client_host=host.docker.internal client_port=9003}
|
||||
PHP_IDE_CONFIG: serverName=docker-php
|
||||
ports:
|
||||
- "${PHP_FPM_PORT:-9000}:9000" # PHP-FPM
|
||||
- "${XDEBUG_POST:-9003}:9003" # Xdebug
|
||||
volumes:
|
||||
- ./:/var/www/all_source
|
||||
- ./src:/var/www/html
|
||||
# 更新下载源列表以加速apt-get
|
||||
- ./docker/debian/sources.list:/etc/apt/sources.list:ro
|
||||
- ./docker/php/php.ini:/usr/local/etc/php/php.ini:ro
|
||||
- ./docker/php/xdebug.ini:/usr/local/etc/php/conf.d/xdebug.ini
|
||||
- xdebug_logs:/tmp # Xdebug 日志目录
|
||||
depends_on:
|
||||
- db
|
||||
healthcheck:
|
||||
test: ["CMD", "bash", "-c", "curl -f http://localhost:9000/status && ps aux | grep '[p]hp think cron:schedule'"]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
start_period: 60s
|
||||
networks:
|
||||
- sass-platform-net
|
||||
labels:
|
||||
- "com.docker.compose.project.working_dir=${PROJECT_NAME}"
|
||||
|
||||
nginx:
|
||||
build:
|
||||
context: ./docker/nginx
|
||||
dockerfile: Dockerfile
|
||||
container_name: ${PROJECT_NAME}_nginx
|
||||
restart: always
|
||||
ports:
|
||||
- "${NGINX_PORT:-80}:80"
|
||||
- "${NGINX_SSL_PORT:-443}:443"
|
||||
volumes:
|
||||
# 挂载项目代码到 Nginx 容器中
|
||||
- ./src:/var/www/html:rw
|
||||
# 更新下载源列表以加速apt-get
|
||||
- ./docker/debian/sources.list:/etc/apt/sources.list:ro
|
||||
# 创建临时目录
|
||||
- /var/www/server/nginx/proxy_temp_dir
|
||||
- /var/www/server/nginx/proxy_cache_dir
|
||||
depends_on:
|
||||
- php-fpm
|
||||
networks:
|
||||
- sass-platform-net
|
||||
labels:
|
||||
- "com.docker.compose.project.working_dir=${PROJECT_NAME}"
|
||||
|
||||
db:
|
||||
image: mysql:5.7.44
|
||||
container_name: ${PROJECT_NAME}_mysql
|
||||
environment:
|
||||
<<: *shared-api-env
|
||||
volumes:
|
||||
- mysql_db_data:/var/lib/mysql
|
||||
- ./docker/mysql/init:/docker-entrypoint-initdb.d
|
||||
- ./docker/mysql/my.cnf:/etc/mysql/conf.d/custom.cnf
|
||||
ports:
|
||||
- ${MYSQL_PORT:-3306}:3306
|
||||
networks:
|
||||
- sass-platform-net
|
||||
restart: unless-stopped
|
||||
command:
|
||||
- --character-set-server=utf8mb4
|
||||
- --collation-server=utf8mb4_unicode_ci
|
||||
- --innodb_buffer_pool_size=256M
|
||||
labels:
|
||||
- "com.docker.compose.project.working_dir=${PROJECT_NAME}"
|
||||
|
||||
# Redis 服务(可选)
|
||||
redis:
|
||||
image: redis:8.2
|
||||
container_name: ${PROJECT_NAME}_redis
|
||||
environment:
|
||||
REDIS_PASSWORD: ${REDIS_PASSWORD:-luckyshop123!@#}
|
||||
REDISCLI_AUTH: ${REDIS_PASSWORD:-luckyshop123!@#}
|
||||
ports:
|
||||
- "${REDIS_PORT:-6379}:6379"
|
||||
volumes:
|
||||
- redis_data:/data
|
||||
- ./docker/redis/redis.conf:/etc/redis/redis.conf
|
||||
networks:
|
||||
- sass-platform-net
|
||||
restart: unless-stopped
|
||||
labels:
|
||||
- "com.docker.compose.project.working_dir=${PROJECT_NAME}"
|
||||
|
||||
volumes:
|
||||
mysql_db_data:
|
||||
redis_data:
|
||||
xdebug_logs:
|
||||
|
||||
networks:
|
||||
sass-platform-net:
|
||||
driver: bridge
|
||||
@@ -14,7 +14,7 @@ services:
|
||||
build:
|
||||
context: ./docker/php
|
||||
dockerfile: Dockerfile
|
||||
container_name: ${PROJECT_NAME}_php
|
||||
container_name: ${PROJECT_NAME}_${APP_ENV}_php
|
||||
restart: always
|
||||
extra_hosts:
|
||||
- "host.docker.internal:host-gateway" # 支持主机名解析
|
||||
@@ -49,18 +49,19 @@ services:
|
||||
networks:
|
||||
- sass-platform-net
|
||||
labels:
|
||||
- "com.docker.compose.project.working_dir=${PROJECT_NAME}"
|
||||
- "com.docker.compose.project.working_dir=${PROJECT_NAME}_${APP_ENV}"
|
||||
|
||||
nginx:
|
||||
build:
|
||||
context: ./docker/nginx
|
||||
dockerfile: Dockerfile
|
||||
container_name: ${PROJECT_NAME}_nginx
|
||||
container_name: ${PROJECT_NAME}_${APP_ENV}_nginx
|
||||
restart: always
|
||||
ports:
|
||||
- "${NGINX_PORT:-80}:80"
|
||||
- "${NGINX_SSL_PORT:-443}:443"
|
||||
volumes:
|
||||
# 挂载项目代码到 Nginx 容器中
|
||||
- ./src:/var/www/html:rw
|
||||
# 更新下载源列表以加速apt-get
|
||||
- ./docker/debian/sources.list:/etc/apt/sources.list:ro
|
||||
@@ -72,11 +73,11 @@ services:
|
||||
networks:
|
||||
- sass-platform-net
|
||||
labels:
|
||||
- "com.docker.compose.project.working_dir=${PROJECT_NAME}"
|
||||
- "com.docker.compose.project.working_dir=${PROJECT_NAME}_${APP_ENV}"
|
||||
|
||||
db:
|
||||
image: mysql:5.7.44
|
||||
container_name: ${PROJECT_NAME}_mysql
|
||||
container_name: ${PROJECT_NAME}_${APP_ENV}_mysql
|
||||
environment:
|
||||
<<: *shared-api-env
|
||||
volumes:
|
||||
@@ -93,12 +94,12 @@ services:
|
||||
- --collation-server=utf8mb4_unicode_ci
|
||||
- --innodb_buffer_pool_size=256M
|
||||
labels:
|
||||
- "com.docker.compose.project.working_dir=${PROJECT_NAME}"
|
||||
- "com.docker.compose.project.working_dir=${PROJECT_NAME}_${APP_ENV}"
|
||||
|
||||
# Redis 服务(可选)
|
||||
redis:
|
||||
image: redis:8.2
|
||||
container_name: ${PROJECT_NAME}_redis
|
||||
container_name: ${PROJECT_NAME}_${APP_ENV}_redis
|
||||
environment:
|
||||
REDIS_PASSWORD: ${REDIS_PASSWORD:-luckyshop123!@#}
|
||||
REDISCLI_AUTH: ${REDIS_PASSWORD:-luckyshop123!@#}
|
||||
@@ -111,13 +112,32 @@ services:
|
||||
- sass-platform-net
|
||||
restart: unless-stopped
|
||||
labels:
|
||||
- "com.docker.compose.project.working_dir=${PROJECT_NAME}"
|
||||
- "com.docker.compose.project.working_dir=${PROJECT_NAME}_${APP_ENV}"
|
||||
|
||||
volumes:
|
||||
mysql_db_data:
|
||||
name: ${PROJECT_NAME}_${APP_ENV}_mysql_db_data
|
||||
driver: local
|
||||
driver_opts:
|
||||
type: none
|
||||
o: bind
|
||||
device: ./docker/mysql_db_data/${APP_ENV}
|
||||
redis_data:
|
||||
name: ${PROJECT_NAME}_${APP_ENV}_redis_data
|
||||
driver: local
|
||||
driver_opts:
|
||||
type: none
|
||||
o: bind
|
||||
device: ./docker/redis_data/${APP_ENV}
|
||||
xdebug_logs:
|
||||
name: ${PROJECT_NAME}_${APP_ENV}_xdebug_logs
|
||||
driver: local
|
||||
driver_opts:
|
||||
type: none
|
||||
o: bind
|
||||
device: ./docker/xdebug_logs/${APP_ENV}
|
||||
|
||||
networks:
|
||||
sass-platform-net:
|
||||
name: ${PROJECT_NAME}_${APP_ENV}_net
|
||||
driver: bridge
|
||||
File diff suppressed because one or more lines are too long
10
docker/mysql_db_data/.gitignore
vendored
Normal file
10
docker/mysql_db_data/.gitignore
vendored
Normal file
@@ -0,0 +1,10 @@
|
||||
# 忽略目录下所有文件和子目录
|
||||
*
|
||||
# 忽略所有子目录
|
||||
*/
|
||||
# 但不忽略 .gitkeep 文件
|
||||
!.gitkeep
|
||||
# 不忽略 .gitignore 文件自身
|
||||
!.gitignore
|
||||
# 不忽略 development/.gitkeep 文件
|
||||
!development/.gitkeep
|
||||
0
docker/mysql_db_data/.gitkeep
Normal file
0
docker/mysql_db_data/.gitkeep
Normal file
@@ -27,6 +27,7 @@ RUN apt-get update && apt-get install -y \
|
||||
libfreetype6-dev \
|
||||
libjpeg62-turbo-dev \
|
||||
libpng-dev \
|
||||
iputils-ping \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# 安装 PHP 扩展
|
||||
@@ -66,21 +67,9 @@ RUN echo "zend_extension=xdebug.so" > /usr/local/etc/php/conf.d/xdebug.ini
|
||||
# RUN composer config -g repo.packagist composer https://mirrors.aliyun.com/composer/
|
||||
# RUN composer install --no-dev --optimize-autoloader --working-dir=/var/www/html
|
||||
|
||||
# # 创建非 root 用户
|
||||
# RUN useradd -m -u 1000 phpuser && chown -R phpuser:phpuser /var/www/html
|
||||
|
||||
# 设置权限, 防止以下目录无法写入的问题
|
||||
RUN chmod -R a+rw /var/www/html/runtime
|
||||
RUN chmod -R a+rw /var/www/html/uploads
|
||||
RUN chmod -R a+rw /var/www/html/tmp
|
||||
RUN chmod -R a+rw /var/www/html/temp
|
||||
|
||||
# USER phpuser
|
||||
|
||||
# 暴露端口
|
||||
EXPOSE 9000 9003
|
||||
|
||||
|
||||
############ 查看 cron 进程
|
||||
## 查看 cron 进程
|
||||
# ps aux | grep "think cron:schedule"
|
||||
@@ -95,4 +84,10 @@ EXPOSE 9000 9003
|
||||
#######################################
|
||||
|
||||
# 启动Supervisor
|
||||
# 添加在Dockerfile末尾,CMD命令之前
|
||||
COPY ./entrypoint.sh /usr/local/bin/
|
||||
RUN chmod +x /usr/local/bin/entrypoint.sh
|
||||
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
|
||||
|
||||
# 修改CMD命令
|
||||
CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]
|
||||
59
docker/php/entrypoint.sh
Normal file
59
docker/php/entrypoint.sh
Normal file
@@ -0,0 +1,59 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
# 设置全局umask
|
||||
umask 0002
|
||||
|
||||
echo "=== ThinkPHP Docker权限初始化 ==="
|
||||
|
||||
# 修复目录所有权和权限
|
||||
fix_directory_permissions() {
|
||||
local dir=$1
|
||||
echo "修复目录权限: $dir"
|
||||
|
||||
# 确保目录存在
|
||||
mkdir -p "$dir"
|
||||
|
||||
# 设置所有权
|
||||
chown -R www-data:www-data "$dir"
|
||||
|
||||
# 设置权限
|
||||
chmod -R 775 "$dir"
|
||||
|
||||
# 设置setgid权限
|
||||
chmod g+s "$dir"
|
||||
|
||||
# 尝试设置ACL(如果支持)
|
||||
if command -v setfacl >/dev/null 2>&1; then
|
||||
setfacl -d -m u:www-data:rwx -m u:root:rwx "$dir" 2>/dev/null || true
|
||||
setfacl -Rm u:www-data:rwx "$dir" 2>/dev/null || true
|
||||
fi
|
||||
|
||||
echo "✅ $dir 权限设置完成"
|
||||
}
|
||||
|
||||
# 处理所有需要权限的目录
|
||||
directories=("runtime" "upload")
|
||||
for dir in "${directories[@]}"; do
|
||||
fix_directory_permissions "/var/www/html/$dir"
|
||||
done
|
||||
|
||||
# 验证权限
|
||||
echo "=== 权限验证 ==="
|
||||
echo "当前用户: $(whoami)"
|
||||
echo "当前UID: $(id -u), GID: $(id -g)"
|
||||
echo "当前umask: $(umask)"
|
||||
|
||||
# 测试写入权限
|
||||
sudo -u www-data mkdir -p /var/www/html/runtime/test_dir 2>/dev/null && \
|
||||
echo "✅ runtime目录新建子目录测试通过" || \
|
||||
echo "❌ runtime目录新建子目录失败"
|
||||
|
||||
sudo -u www-data mkdir -p /var/www/html/upload/test_dir 2>/dev/null && \
|
||||
echo "✅ upload目录新建子目录测试通过" || \
|
||||
echo "❌ upload目录新建子目录失败"
|
||||
|
||||
echo "=== 启动应用 ==="
|
||||
|
||||
# 执行原有的启动命令
|
||||
exec "$@"
|
||||
@@ -6,25 +6,40 @@ logfile_backups=10
|
||||
loglevel=info
|
||||
pidfile=/var/run/supervisord.pid
|
||||
|
||||
[program:chmod]
|
||||
command=/bin/bash -c "while true; do chmod -R 775 /var/www/html/runtime/ /var/www/html/upload/ 2>/dev/null || true; sleep 30; done"
|
||||
autostart=true
|
||||
autorestart=true
|
||||
stopasgroup=true
|
||||
killasgroup=true
|
||||
|
||||
[program:php-fpm]
|
||||
command=php-fpm
|
||||
autostart=true
|
||||
autorestart=true
|
||||
startretries=3
|
||||
startsecs=1
|
||||
stdout_logfile=/dev/stdout
|
||||
stdout_logfile_maxbytes=0
|
||||
stderr_logfile=/dev/stderr
|
||||
stderr_logfile_maxbytes=0
|
||||
stopasgroup=true
|
||||
killasgroup=true
|
||||
stdout_logfile=/var/log/supervisor/php-fpm.log
|
||||
stdout_logfile_maxbytes=10MB
|
||||
stdout_logfile_backups=10
|
||||
stderr_logfile=/var/log/supervisor/php-fpm-error.log
|
||||
stderr_logfile_maxbytes=10MB
|
||||
stderr_logfile_backups=10
|
||||
|
||||
[program:think-cron]
|
||||
command=php /var/www/html/think cron:schedule
|
||||
environment=APP_ENV=local
|
||||
process_name=%(program_name)s_%(process_num)02d
|
||||
numprocs=1
|
||||
autostart=true
|
||||
autorestart=true
|
||||
startretries=5
|
||||
startsecs=2
|
||||
stdout_logfile=/dev/stdout
|
||||
stdout_logfile_maxbytes=0
|
||||
stderr_logfile=/dev/stderr
|
||||
stderr_logfile_maxbytes=0
|
||||
startretries=3
|
||||
stdout_logfile=/var/log/supervisor/think-cron.log
|
||||
stdout_logfile_maxbytes=10MB
|
||||
stdout_logfile_backups=10
|
||||
stderr_logfile=/var/log/supervisor/think-cron-error.log
|
||||
stderr_logfile_maxbytes=10MB
|
||||
stderr_logfile_backups=10
|
||||
startsecs=3
|
||||
stopwaitsecs=10
|
||||
10
docker/redis_data/.gitignore
vendored
Normal file
10
docker/redis_data/.gitignore
vendored
Normal file
@@ -0,0 +1,10 @@
|
||||
# 忽略目录下所有文件和子目录
|
||||
*
|
||||
# 忽略所有子目录
|
||||
*/
|
||||
# 但不忽略 .gitkeep 文件
|
||||
!.gitkeep
|
||||
# 不忽略 .gitignore 文件自身
|
||||
!.gitignore
|
||||
# 不忽略 development/.gitkeep 文件
|
||||
!development/.gitkeep
|
||||
0
docker/redis_data/.gitkeep
Normal file
0
docker/redis_data/.gitkeep
Normal file
10
docker/xdebug_logs/.gitignore
vendored
Normal file
10
docker/xdebug_logs/.gitignore
vendored
Normal file
@@ -0,0 +1,10 @@
|
||||
# 忽略目录下所有文件和子目录
|
||||
*
|
||||
# 忽略所有子目录
|
||||
*/
|
||||
# 但不忽略 .gitkeep 文件
|
||||
!.gitkeep
|
||||
# 不忽略 .gitignore 文件自身
|
||||
!.gitignore
|
||||
# 不忽略 development/.gitkeep 文件
|
||||
!development/.gitkeep
|
||||
0
docker/xdebug_logs/.gitkeep
Normal file
0
docker/xdebug_logs/.gitkeep
Normal file
128
docs/GIT_REALEASE.md
Normal file
128
docs/GIT_REALEASE.md
Normal file
@@ -0,0 +1,128 @@
|
||||
适用于中大型团队的方案主要有两种:
|
||||
|
||||
---
|
||||
|
||||
## ✅ 推荐方案一:**GitFlow(适合版本发布节奏明确的项目)**
|
||||
|
||||
### 📌 核心分支说明
|
||||
|
||||
| 分支 | 作用 | 生命周期 | 是否长期存在 |
|
||||
|------|------|--------|------------|
|
||||
| `main`(或 `master`) | **生产环境代码**,每个 commit 对应一个可发布版本 | 永久 | ✅ |
|
||||
| `develop` | **集成开发分支**,最新开发成果,用于测试环境部署 | 永久 | ✅ |
|
||||
| `feature/*` | 功能开发分支(如 `feature/user-auth`) | 临时 | ❌ |
|
||||
| `release/*` | 发布准备分支(如 `release/v1.2.0`) | 临时 | ❌ |
|
||||
| `hotfix/*` | 紧急线上修复分支(如 `hotfix/login-bug`) | 临时 | ❌ |
|
||||
|
||||
### 🔁 典型流程
|
||||
|
||||
1. **日常开发**
|
||||
- 从 `develop` 拉出 `feature/xxx`
|
||||
- 开发完成后,**PR/MR 合并回 `develop`**
|
||||
|
||||
2. **准备发布**
|
||||
- 从 `develop` 拉出 `release/vX.Y.Z`
|
||||
- 在此分支修复 bug、更新版本号、生成 changelog
|
||||
- 测试通过后:
|
||||
- 合并到 `main`(打 tag,如 `v1.2.0`)
|
||||
- 合并回 `develop`(同步修复)
|
||||
|
||||
3. **紧急修复**
|
||||
- 从 `main`(或对应 tag)拉出 `hotfix/xxx`
|
||||
- 修复后:
|
||||
- 合并到 `main`(打新 patch tag,如 `v1.2.1`)
|
||||
- 合并到 `develop`
|
||||
|
||||
### ✅ 优点
|
||||
- 版本清晰,适合有明确发布周期的系统(如每月发版)
|
||||
- 支持并行开发与紧急修复
|
||||
- `main` 始终代表线上状态
|
||||
|
||||
### ⚠️ 缺点
|
||||
- 分支较多,对小型团队略显复杂
|
||||
- 不适合持续部署(CI/CD 频繁上线)场景
|
||||
|
||||
---
|
||||
|
||||
## ✅ 推荐方案二:**Trunk-Based Development + Release Branches(适合 DevOps / 持续交付)**
|
||||
|
||||
> 越来越多互联网公司(如 Google、Facebook、Netflix)采用此模式,尤其适合**高频发布、自动化 CI/CD** 的后台服务。
|
||||
|
||||
### 📌 核心分支说明
|
||||
|
||||
| 分支 | 作用 |
|
||||
|------|------|
|
||||
| `main`(或 `trunk`) | **唯一主干分支**,所有开发直接或间接流向这里,保持可随时发布状态 |
|
||||
| `release/*`(可选) | 仅在需要维护多个线上版本时使用(如 `release/v1.3`) |
|
||||
| `feature/*`(短生命周期) | 功能分支,**必须短(<1天~2天)**,通过 PR 快速合并到 `main` |
|
||||
|
||||
> 💡 实践中常配合 **Feature Toggle(功能开关)**,即使未完成的功能也可合入 `main`,但默认关闭。
|
||||
|
||||
### 🔁 典型流程
|
||||
|
||||
1. 开发者从 `main` 拉出短命 `feature/xxx`
|
||||
2. 提交 PR → 自动化测试(单元、集成、安全扫描)→ Code Review
|
||||
3. 合并到 `main`
|
||||
4. **CI/CD 自动部署到测试/预发环境**
|
||||
5. 人工验证后,**一键发布到生产**(或自动金丝雀发布)
|
||||
6. 若需回滚,直接回退 `main` 的 commit 或触发回滚流程
|
||||
|
||||
### ✅ 优点
|
||||
- 极简分支模型,减少合并冲突
|
||||
- 支持每天多次发布
|
||||
- 与现代 CI/CD 工具链(Jenkins, GitLab CI, ArgoCD 等)天然契合
|
||||
|
||||
### ⚠️ 要求
|
||||
- 强大的自动化测试覆盖(>80%)
|
||||
- 快速 Code Review 文化
|
||||
- 监控与快速回滚能力
|
||||
|
||||
---
|
||||
|
||||
## 🏆 企业后台服务推荐选择
|
||||
|
||||
| 场景 | 推荐策略 |
|
||||
|------|--------|
|
||||
| **传统企业、月度/季度发版、强合规要求** | ✅ **GitFlow** |
|
||||
| **互联网公司、SaaS 服务、每日/每小时发布** | ✅ **Trunk-Based + Short-lived Feature Branches** |
|
||||
| **混合模式(主干开发 + 定期大版本)** | 主干开发为主,大版本前切 `release` 分支 |
|
||||
|
||||
> 🔔 **当前趋势**:越来越多企业后台服务(尤其是微服务架构)倾向于 **Trunk-Based**,因为:
|
||||
> - 后台服务通常无“客户端版本”约束
|
||||
> - 可独立部署、灰度发布
|
||||
> - 自动化程度高
|
||||
|
||||
---
|
||||
|
||||
## 🔐 补充建议(无论哪种策略)
|
||||
|
||||
1. **保护关键分支**
|
||||
- 在 GitHub/GitLab 中设置:
|
||||
- `main` / `develop` 为 **protected branch**
|
||||
- 要求 **PR/MR + 至少1人审批 + CI 通过**
|
||||
- (可选)要求 **GPG 签名提交**
|
||||
|
||||
2. **标准化 Commit & PR 模板**
|
||||
- 使用 Conventional Commits(如 `feat:`, `fix:`, `chore:`)
|
||||
- 自动生成 changelog 和版本号(配合 semantic-release)
|
||||
|
||||
3. **Tag 语义化版本**
|
||||
- 所有生产发布必须打 tag:`v1.2.3`
|
||||
- 格式遵循 [SemVer](https://semver.org/)
|
||||
|
||||
4. **禁止直接 push 到主干**
|
||||
- 所有代码必须通过 PR/MR 合并
|
||||
|
||||
---
|
||||
|
||||
## 📌 总结:最优实践(推荐)
|
||||
|
||||
> **对于大多数现代企业后台服务,采用:**
|
||||
> **✅ Trunk-Based Development(主干开发) + 短生命周期 feature 分支 + 自动化 CI/CD**
|
||||
> 是最高效、可扩展、符合 DevOps 理念的方式。
|
||||
|
||||
只有在**强版本管控、多客户定制、无法频繁上线**等特殊场景下,才考虑 GitFlow。
|
||||
|
||||
---
|
||||
|
||||
如果你能提供更多信息(如团队规模、发布频率、是否微服务、CI/CD 成熟度),我可以给出更定制化的建议!
|
||||
26
docs/addon/huaweipay/README.md
Normal file
26
docs/addon/huaweipay/README.md
Normal file
@@ -0,0 +1,26 @@
|
||||
# 华为支付插件
|
||||
|
||||
|
||||
## Demo
|
||||
|
||||
```
|
||||
安卓快应用ID:115644647
|
||||
安卓快应用包名:com.jieganfsj.fivegshop
|
||||
安卓快应用名称:秸秆粉碎机
|
||||
|
||||
|
||||
商户名称:徐州明文机械有限公司
|
||||
商户号:102751500028
|
||||
|
||||
开发者ID:10086000901972225
|
||||
支付ID:10086000901972225
|
||||
公钥:
|
||||
MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA9g1+QcqvC4f1pUiwJ1um1iBUlNn6hRDJrNdv5zB77l5DNo6S6hE4w7VyhkMnkIk89i8kTej1m1ByjRpo7B5OPqafNqI9JBQyQ26A1Zp71zSfe/UicAFiMtF4lWNnAHBYH06sUTvybwYllDVybpi6lL2i8VAGIN8YgoK36lPaYsxWZ911lPCegy7B3kDj1xhBe41cNHgu8wYmjqLU7njleY5Pseherx+Kb58aQvB5xQr8w7KgAyMrsfRH30Btpg/ZWRn8qOXd/DW6eEla3djah4ug8jKdi0qUkA24FLDdOZST4vb5qhgQDVXpqJhYmBIU14YOHsCX9Olu6b7DDjQo/dvOaY3vzWROfV+sV60fUVIps8Vy1EpS/UXeHUxg6r37U8WAxUbSV8d6e4VylLuiIgbX5JpSC1s7jq/cwUwXfSJmKzaCj+C+LJ958IM17FYxIz5xWJtZEzWsPAH7WVCP3b1m4MHU/UwGuMu/Gfdzusnr+Qtan6Wqn9AqUyJP/JfrAgMBAAE=
|
||||
|
||||
支付私钥:
|
||||
MIIG/QIBADANBgkqhkiG9w0BAQEFAASCBucwggbjAgEAAoIBgQD2DX5Byq8Lh/WlSLAnW6bWIFSU2fqFEMms12/nMHvuXkM2jpLqETjDtXKGQyeQiTz2LyRN6PWbUHKNGmjsHk4+pp82oj0kFDJDboDVmnvXNJ979SJwAWIy0XiVY2cAcFgfTqxRO/JvBiWUNXJumLqUvaLxUAYg3xiCgrfqU9pizFZn3XWU8J6DLsHeQOPXGEF7jVw0eC7zBiaOotTueOV5jk+x6F6vH4pvnxpC8HnFCvzDsqADIyux9EffQG2mD9lZGfyo5d38Nbp4SVrd2NqHi6DyMp2LSpSQDbgUsN05lJPi9vmqGBANVemomFiYEhTXhg4ewJf06W7pvsMONCj9285pje/NZE59X6xXrR9RUimzxXLUSlL9Rd4dTGDqvftTxYDFRtJXx3p7hXKUu6IiBtfkmlILWzuOr9zBTBd9ImYrNoKP4L4sn3nwgzXsVjEjPnFYm1kTNaw8AftZUI/dvWbgwdT9TAa4y78Z93O6yev5C1qfpaqf0CpTIk/8l+sCAwEAAQKCAYAVlJFiS9iWdlJBMOLiUNONLEC+3W9vhE1r72lNKZ91BKd4fYC9Ls1/vMZSqEksEB1cqj3Q54HDIYcqgQp6yx2puQt1yzz5kRvndiWulmIOOftS7+kZUcW/F0gwMguyqifQdyH97fgRbMSW/ykOMi8LJKbJ627eKzMHH1fqIXih+bIKYg4SBhihANTYHXDeSK5Vm8xefbwAbKWtFPMAB3J4+tZakDrduTJ3H8k53cWQVqpcr6oBHHCUpww2tHvpeLI3a/FXyHYBqrx8ErnXCjkVBHBtwQf+43H+buyDjrYUwJUi3RSJgeefcyyJoO0I9GwGb6nY8kK5kZ0aeIIkfiVOexMYS9w11FVl96LjC7HjJQrNY4jOLI/X76xyEwBFy9LNogRTafjZVZmVRj/9Kembx6+/eDxvyEv5FnelsHqfFbv1KPkR6e7FvwpDbYgJBpfKTE6SICqo52bHxewpSL7KHRlTpp0IfMM/IOOs8CCwI37ixKQun6W4en457j/tP4ECgcEA+0pa3omCKJfiVR4PpyXY+t9FEqdcZkdYEDtCSX9vqu6yE4sdt7rNnZ6cIiD6ViC2xvQ5VLry1y57JvP57svt5OJYhmILuj3jJ7pdcfKRAVaV4W7C8vGMit6ssckEOnOSj/bvEazfHorjXKU9cn9uCymczRQC9azaRkN+1LLk2mBbczghxd7rSJyXtbt9NVNUi9Gr11AzJsrWN/Bqqna5BizBLIaGYthJ/04LYTl1AjWPEJXjXI72/WvMdQ/w6itxAoHBAPqqAi5mbvjRDitmLQchc/R3Yl329OaB3GSz3YtFqfk9lLJIyl91+MzxBg1ChHnRFC8MB1s1Z05ZkFmcy8AVqvJ6MSZhUCLNjq8HyVgp24CqQTr8ciomF03ncXnKKSsH7tidInkQ8R3e7qRRGQMnDvV+Hs3FjlOk8vJyZCcGkUCVA0kkwkk/95qIfrZsthtewAxJR/rY63FnG+MUayEBB1lwyJZ7xDi/GyX6SAnPBl6bLRA1BdBeTV8K0MEwwIqzGwKBwBqo+9UKT7XQz2FqbAy2tjt/fouJGAN95DjsoI69p3JCGsB6DPAWMIRddIEmcIi8tceL151GrEbqFoS+c7DDD/0timjPdCEROc1YN1vEeV/j+MjPAH3X5KpDD51ZD0rIQi9l6l08svtBjvegTFGedWVXx9v2GI5KBWpY9NbKF/+XI3yo4uRkTyAIBQxx1MnYimq/FvUj/BlMgceziQ2GxQCDtQbtSsqn2cntVMW+28wdNI106YdDX67pRerRgyTE8QKBwHAwLxG9XuWWC5V5AaYzXsaHuEr+ANY6QP4BUqLG5zBaU3cIBSt8jYKMTX0ZzFkJLtNvussjt7zlcSnqd3bdO8mSzvSykT9CaR4FiiQfd9K6YL+ZxS8AJWYEtFEiHhLYVho1Gfy9jG0mHgEFGwDCNnvBmt/WD8F4DhRdBl5BHjmdd/8AqMRIEPXlKXFUbp0JZ0MYeVLYS2hSEbUsqlX3M+bgB6bydfw/7FKvFhbtxZgKM70RPizoSBDFsnEE9OgfCQKBwQD4M4f2f678YScvrwQnV2J8SSnJhQbZqht1Rlb34zU0JIcfpwOKpoNvRyZz1BxvzPSm5S3TLDytK16uvAsMFCHVByyCajPozlWnLzeEqvE4DZXZcWeY+/+MZ4nsajLTTeJWos6UrazZcd8/2c301x4OUKfgZWW1tS65MA48X0+Y4uPyOuH365wQ0obBfg4aB85sZl71v7Rveq+COHBstp/BdDVAsdufWCr7Nkbeu/3qh886ZumpYe+89So1oDIuoys=
|
||||
|
||||
|
||||
```
|
||||
|
||||
支付密钥用于交易过程中的签名认证,请妥善保管,谨防泄露,签名认证规范参考开发指南服务端开发。
|
||||
266
docs/api_kefu.md
Normal file
266
docs/api_kefu.md
Normal file
@@ -0,0 +1,266 @@
|
||||
# 智能客服API接口文档
|
||||
|
||||
## 一、接口说明
|
||||
|
||||
本接口用于连接微信小程序与Dify聊天机器人,实现智能客服功能。
|
||||
|
||||
## 二、配置说明
|
||||
|
||||
### 1. 安装插件
|
||||
|
||||
在ThinkPHP后台的插件管理页面中,找到智能客服插件(aikefu)并点击安装按钮。
|
||||
|
||||
### 2. 配置插件
|
||||
|
||||
1. 进入智能客服配置页面
|
||||
2. 输入从Dify平台获取的API密钥
|
||||
3. 配置API基础地址(默认:https://api.dify.ai/v1)
|
||||
4. 配置聊天接口端点(默认:/chat-messages)
|
||||
5. 启用智能客服功能
|
||||
|
||||
### 3. 获取Dify API密钥
|
||||
|
||||
1. 登录Dify平台
|
||||
2. 进入工作台
|
||||
3. 选择您的聊天机器人项目
|
||||
4. 点击"发布"按钮
|
||||
5. 在API访问页面获取API密钥
|
||||
|
||||
## 三、接口列表
|
||||
|
||||
### 1. 智能客服聊天接口
|
||||
|
||||
**接口地址**:`/api/kefu/chat`
|
||||
|
||||
**请求方式**:POST
|
||||
|
||||
**请求参数**:
|
||||
|
||||
| 参数名 | 类型 | 必填 | 说明 |
|
||||
| --- | --- | --- | --- |
|
||||
| message | string | 是 | 用户输入的消息内容 |
|
||||
| user_id | string | 否 | 用户ID,默认使用当前登录会员ID |
|
||||
| conversation_id | string | 否 | 会话ID,第一次聊天可不传,系统会自动创建 |
|
||||
| stream | bool | 否 | 是否使用流式响应,默认false |
|
||||
|
||||
**响应示例**:
|
||||
|
||||
```json
|
||||
{
|
||||
"code": 0,
|
||||
"message": "success",
|
||||
"data": {
|
||||
"conversation_id": "conv_123456789",
|
||||
"reply": "您好,我是智能客服,有什么可以帮助您的?",
|
||||
"message_id": "msg_123456789",
|
||||
"finish_reason": "stop",
|
||||
"usage": {
|
||||
"prompt_tokens": 10,
|
||||
"completion_tokens": 20,
|
||||
"total_tokens": 30
|
||||
}
|
||||
},
|
||||
"timestamp": 1640995200
|
||||
}
|
||||
```
|
||||
|
||||
### 2. 获取会话历史
|
||||
|
||||
**接口地址**:`/api/kefu/getHistory`
|
||||
|
||||
**请求方式**:POST
|
||||
|
||||
**请求参数**:
|
||||
|
||||
| 参数名 | 类型 | 必填 | 说明 |
|
||||
| --- | --- | --- | --- |
|
||||
| conversation_id | string | 是 | 会话ID |
|
||||
| user_id | string | 否 | 用户ID,默认使用当前登录会员ID |
|
||||
| limit | int | 否 | 每页条数,默认20 |
|
||||
| offset | int | 否 | 偏移量,默认0 |
|
||||
|
||||
**响应示例**:
|
||||
|
||||
```json
|
||||
{
|
||||
"code": 0,
|
||||
"message": "success",
|
||||
"data": {
|
||||
"messages": [
|
||||
{
|
||||
"id": "msg_123456789",
|
||||
"role": "user",
|
||||
"content": "你好",
|
||||
"created_at": "2023-01-01T00:00:00Z"
|
||||
},
|
||||
{
|
||||
"id": "msg_987654321",
|
||||
"role": "assistant",
|
||||
"content": "您好,我是智能客服,有什么可以帮助您的?",
|
||||
"created_at": "2023-01-01T00:00:01Z"
|
||||
}
|
||||
],
|
||||
"total": 2,
|
||||
"limit": 20,
|
||||
"offset": 0
|
||||
},
|
||||
"timestamp": 1640995200
|
||||
}
|
||||
```
|
||||
|
||||
### 3. 创建新会话
|
||||
|
||||
**接口地址**:`/api/kefu/createConversation`
|
||||
|
||||
**请求方式**:POST
|
||||
|
||||
**请求参数**:
|
||||
|
||||
| 参数名 | 类型 | 必填 | 说明 |
|
||||
| --- | --- | --- | --- |
|
||||
| user_id | string | 否 | 用户ID,默认使用当前登录会员ID |
|
||||
|
||||
**响应示例**:
|
||||
|
||||
```json
|
||||
{
|
||||
"code": 0,
|
||||
"message": "success",
|
||||
"data": {
|
||||
"conversation_id": "conv_123456789",
|
||||
"name": "智能客服会话",
|
||||
"created_at": "2023-01-01T00:00:00Z"
|
||||
},
|
||||
"timestamp": 1640995200
|
||||
}
|
||||
```
|
||||
|
||||
## 四、前端调用示例
|
||||
|
||||
### Uniapp调用示例
|
||||
|
||||
```javascript
|
||||
// 引入请求封装(根据项目实际情况调整)
|
||||
import { request } from '@/utils/request';
|
||||
|
||||
// 智能客服聊天
|
||||
async function chatWithAI(message, conversationId = '') {
|
||||
try {
|
||||
const res = await request({
|
||||
url: '/api/kefu/chat',
|
||||
method: 'POST',
|
||||
data: {
|
||||
message: message,
|
||||
conversation_id: conversationId,
|
||||
// user_id: 'your-user-id', // 可选
|
||||
// stream: false // 可选
|
||||
}
|
||||
});
|
||||
|
||||
if (res.code === 0) {
|
||||
return res.data;
|
||||
} else {
|
||||
console.error('聊天失败:', res.message);
|
||||
return null;
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('聊天请求失败:', error);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
// 获取会话历史
|
||||
async function getChatHistory(conversationId, limit = 20, offset = 0) {
|
||||
try {
|
||||
const res = await request({
|
||||
url: '/api/kefu/getHistory',
|
||||
method: 'POST',
|
||||
data: {
|
||||
conversation_id: conversationId,
|
||||
limit: limit,
|
||||
offset: offset
|
||||
// user_id: 'your-user-id', // 可选
|
||||
}
|
||||
});
|
||||
|
||||
if (res.code === 0) {
|
||||
return res.data;
|
||||
} else {
|
||||
console.error('获取历史记录失败:', res.message);
|
||||
return null;
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('获取历史记录请求失败:', error);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
// 创建新会话
|
||||
async function createNewConversation() {
|
||||
try {
|
||||
const res = await request({
|
||||
url: '/api/kefu/createConversation',
|
||||
method: 'POST',
|
||||
data: {
|
||||
// user_id: 'your-user-id', // 可选
|
||||
}
|
||||
});
|
||||
|
||||
if (res.code === 0) {
|
||||
return res.data.conversation_id;
|
||||
} else {
|
||||
console.error('创建会话失败:', res.message);
|
||||
return null;
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('创建会话请求失败:', error);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
## 五、使用流程
|
||||
|
||||
1. **初始化会话**:小程序端进入客服页面时,调用`createConversation`接口创建新会话,或使用本地存储的会话ID
|
||||
2. **发送消息**:用户输入消息后,调用`chat`接口发送消息,获取机器人回复
|
||||
3. **显示消息**:将用户消息和机器人回复显示在聊天界面
|
||||
4. **加载历史记录**:需要时调用`getHistory`接口加载历史消息
|
||||
5. **维护会话**:保持会话ID,用于后续消息交流
|
||||
|
||||
## 六、注意事项
|
||||
|
||||
1. 请确保Dify API密钥的安全性,不要泄露给前端
|
||||
2. 建议对用户ID进行加密处理,避免直接使用敏感信息
|
||||
3. 对于大量用户的场景,建议实现会话管理机制,定期清理过期会话
|
||||
4. 建议添加请求频率限制,防止恶意请求
|
||||
5. 在生产环境中,建议关闭DEBUG模式
|
||||
|
||||
## 七、测试建议
|
||||
|
||||
1. 首先在Dify平台测试聊天机器人功能是否正常
|
||||
2. 在后端配置正确的API密钥
|
||||
3. 使用Postman或类似工具测试后端API接口
|
||||
4. 在小程序端集成并测试完整流程
|
||||
5. 模拟不同场景下的用户输入,测试机器人回复效果
|
||||
|
||||
## 八、常见问题
|
||||
|
||||
### 1. 接口返回401错误
|
||||
|
||||
**原因**:Dify API密钥无效或过期
|
||||
**解决方法**:重新获取有效的API密钥并更新插件配置
|
||||
|
||||
### 2. 接口返回500错误
|
||||
|
||||
**原因**:后端服务器错误或Dify API服务异常
|
||||
**解决方法**:查看服务器日志,检查Dify API服务状态
|
||||
|
||||
### 3. 机器人回复为空
|
||||
|
||||
**原因**:Dify聊天机器人配置问题或请求参数错误
|
||||
**解决方法**:检查Dify机器人配置,验证请求参数是否正确
|
||||
|
||||
### 4. 会话ID无效
|
||||
|
||||
**原因**:会话已过期或不存在
|
||||
**解决方法**:创建新会话,获取新的会话ID
|
||||
375
docs/db/compare_sql_tables.py
Normal file
375
docs/db/compare_sql_tables.py
Normal file
@@ -0,0 +1,375 @@
|
||||
import re
|
||||
import os
|
||||
|
||||
# 解析SQL文件,提取表结构
|
||||
def parse_sql_file(file_path, ignore_prefix=None):
|
||||
tables = {}
|
||||
|
||||
# 读取文件内容
|
||||
with open(file_path, 'r', encoding='utf-8') as f:
|
||||
content = f.read()
|
||||
|
||||
# 匹配CREATE TABLE语句
|
||||
table_pattern = re.compile(r'CREATE TABLE\s+`?([^`\s]+)`?\s*\(([^;]+)\)\s*(?:[^;]+);', re.DOTALL | re.IGNORECASE)
|
||||
|
||||
matches = table_pattern.findall(content)
|
||||
|
||||
for full_table_name, table_def in matches:
|
||||
# 处理表名,忽略前缀
|
||||
table_name = full_table_name
|
||||
if ignore_prefix and table_name.startswith(ignore_prefix):
|
||||
table_name = table_name[len(ignore_prefix):]
|
||||
|
||||
# 提取列定义
|
||||
columns = []
|
||||
# 匹配列定义,包括列名、类型、约束等
|
||||
column_pattern = re.compile(r'\s*`?([^`\s,]+)`?\s+([^\s,]+)\s*([^,]+)(?:,|$)', re.DOTALL)
|
||||
column_matches = column_pattern.findall(table_def)
|
||||
|
||||
for col_name, col_type, col_constraints in column_matches:
|
||||
# 清理约束中的换行符和多余空格
|
||||
col_constraints = re.sub(r'\s+', ' ', col_constraints.strip())
|
||||
columns.append((col_name, col_type, col_constraints))
|
||||
|
||||
# 提取主键
|
||||
primary_key = None
|
||||
pk_pattern = re.compile(r'PRIMARY\s+KEY\s*\(`?([^`\s,]+)`?\)', re.IGNORECASE)
|
||||
pk_match = pk_pattern.search(table_def)
|
||||
if pk_match:
|
||||
primary_key = pk_match.group(1)
|
||||
|
||||
# 提取索引
|
||||
indexes = []
|
||||
index_pattern = re.compile(r'INDEX\s+`?([^`\s]+)`?\s*\(([^)]+)\)', re.IGNORECASE)
|
||||
index_matches = index_pattern.findall(table_def)
|
||||
for index_name, index_cols in index_matches:
|
||||
indexes.append((index_name, index_cols.strip()))
|
||||
|
||||
# 提取唯一约束
|
||||
unique_constraints = []
|
||||
unique_pattern = re.compile(r'UNIQUE\s+KEY\s*`?([^`\s]+)`?\s*\(([^)]+)\)', re.IGNORECASE)
|
||||
unique_matches = unique_pattern.findall(table_def)
|
||||
for unique_name, unique_cols in unique_matches:
|
||||
unique_constraints.append((unique_name, unique_cols.strip()))
|
||||
|
||||
tables[table_name] = {
|
||||
'full_name': full_table_name,
|
||||
'columns': columns,
|
||||
'primary_key': primary_key,
|
||||
'indexes': indexes,
|
||||
'unique_constraints': unique_constraints
|
||||
}
|
||||
|
||||
return tables
|
||||
|
||||
# 比较两个数据库表结构
|
||||
def compare_databases(db1, db2, db1_name, db2_name):
|
||||
diffs = {
|
||||
'only_in_db1': [],
|
||||
'only_in_db2': [],
|
||||
'column_diffs': {},
|
||||
'primary_key_diffs': {},
|
||||
'index_diffs': {},
|
||||
'unique_constraint_diffs': {}
|
||||
}
|
||||
|
||||
# 找出只在db1中存在的表
|
||||
for table_name in db1:
|
||||
if table_name not in db2:
|
||||
diffs['only_in_db1'].append(table_name)
|
||||
|
||||
# 找出只在db2中存在的表
|
||||
for table_name in db2:
|
||||
if table_name not in db1:
|
||||
diffs['only_in_db2'].append(table_name)
|
||||
|
||||
# 比较共同存在的表
|
||||
common_tables = set(db1.keys()) & set(db2.keys())
|
||||
for table_name in common_tables:
|
||||
table1 = db1[table_name]
|
||||
table2 = db2[table_name]
|
||||
|
||||
# 比较列
|
||||
col_diffs = {
|
||||
'only_in_db1': [],
|
||||
'only_in_db2': [],
|
||||
'type_diffs': [],
|
||||
'constraint_diffs': []
|
||||
}
|
||||
|
||||
# 列名集合
|
||||
cols1 = {col[0]: col for col in table1['columns']}
|
||||
cols2 = {col[0]: col for col in table2['columns']}
|
||||
|
||||
# 只在db1中的列
|
||||
for col_name in cols1:
|
||||
if col_name not in cols2:
|
||||
col_diffs['only_in_db1'].append(col_name)
|
||||
|
||||
# 只在db2中的列
|
||||
for col_name in cols2:
|
||||
if col_name not in cols1:
|
||||
col_diffs['only_in_db2'].append(col_name)
|
||||
|
||||
# 比较列类型和约束
|
||||
common_cols = set(cols1.keys()) & set(cols2.keys())
|
||||
for col_name in common_cols:
|
||||
col1 = cols1[col_name]
|
||||
col2 = cols2[col_name]
|
||||
|
||||
# 类型差异
|
||||
if col1[1] != col2[1]:
|
||||
col_diffs['type_diffs'].append((col_name, col1[1], col2[1]))
|
||||
|
||||
# 约束差异
|
||||
if col1[2] != col2[2]:
|
||||
col_diffs['constraint_diffs'].append((col_name, col1[2], col2[2]))
|
||||
|
||||
if any(col_diffs.values()):
|
||||
diffs['column_diffs'][table_name] = col_diffs
|
||||
|
||||
# 比较主键
|
||||
if table1['primary_key'] != table2['primary_key']:
|
||||
diffs['primary_key_diffs'][table_name] = (table1['primary_key'], table2['primary_key'])
|
||||
|
||||
# 比较索引
|
||||
index_diffs = {
|
||||
'only_in_db1': [],
|
||||
'only_in_db2': [],
|
||||
'definition_diffs': []
|
||||
}
|
||||
|
||||
indexes1 = {idx[0]: idx[1] for idx in table1['indexes']}
|
||||
indexes2 = {idx[0]: idx[1] for idx in table2['indexes']}
|
||||
|
||||
# 只在db1中的索引
|
||||
for idx_name in indexes1:
|
||||
if idx_name not in indexes2:
|
||||
index_diffs['only_in_db1'].append((idx_name, indexes1[idx_name]))
|
||||
|
||||
# 只在db2中的索引
|
||||
for idx_name in indexes2:
|
||||
if idx_name not in indexes1:
|
||||
index_diffs['only_in_db2'].append((idx_name, indexes2[idx_name]))
|
||||
|
||||
# 比较索引定义
|
||||
common_indexes = set(indexes1.keys()) & set(indexes2.keys())
|
||||
for idx_name in common_indexes:
|
||||
if indexes1[idx_name] != indexes2[idx_name]:
|
||||
index_diffs['definition_diffs'].append((idx_name, indexes1[idx_name], indexes2[idx_name]))
|
||||
|
||||
if any(index_diffs.values()):
|
||||
diffs['index_diffs'][table_name] = index_diffs
|
||||
|
||||
# 比较唯一约束
|
||||
unique_diffs = {
|
||||
'only_in_db1': [],
|
||||
'only_in_db2': [],
|
||||
'definition_diffs': []
|
||||
}
|
||||
|
||||
unique1 = {uc[0]: uc[1] for uc in table1['unique_constraints']}
|
||||
unique2 = {uc[0]: uc[1] for uc in table2['unique_constraints']}
|
||||
|
||||
# 只在db1中的唯一约束
|
||||
for uc_name in unique1:
|
||||
if uc_name not in unique2:
|
||||
unique_diffs['only_in_db1'].append((uc_name, unique1[uc_name]))
|
||||
|
||||
# 只在db2中的唯一约束
|
||||
for uc_name in unique2:
|
||||
if uc_name not in unique1:
|
||||
unique_diffs['only_in_db2'].append((uc_name, unique2[uc_name]))
|
||||
|
||||
# 比较唯一约束定义
|
||||
common_unique = set(unique1.keys()) & set(unique2.keys())
|
||||
for uc_name in common_unique:
|
||||
if unique1[uc_name] != unique2[uc_name]:
|
||||
unique_diffs['definition_diffs'].append((uc_name, unique1[uc_name], unique2[uc_name]))
|
||||
|
||||
if any(unique_diffs.values()):
|
||||
diffs['unique_constraint_diffs'][table_name] = unique_diffs
|
||||
|
||||
return diffs
|
||||
|
||||
# 打印差异报告
|
||||
# 生成Markdown格式的差异报告
|
||||
def generate_markdown_report(diffs, db1_name, db2_name, db1_table_count, db2_table_count):
|
||||
report = []
|
||||
|
||||
# 报告标题
|
||||
report.append(f"# 数据库差异报告: {db1_name} vs {db2_name}")
|
||||
report.append("\n## 1. 表数量统计")
|
||||
report.append("| 数据库文件 | 表数量 |")
|
||||
report.append("|------------|--------|")
|
||||
report.append(f"| {db1_name} | {db1_table_count} |")
|
||||
report.append(f"| {db2_name} | {db2_table_count} |")
|
||||
|
||||
# 表存在性差异
|
||||
report.append("\n## 2. 表存在性差异")
|
||||
|
||||
# 仅在db1中的表
|
||||
if diffs['only_in_db1']:
|
||||
report.append(f"\n### 2.1 仅在 {db1_name} 中存在的表 ({len(diffs['only_in_db1'])} 个)")
|
||||
report.append("| 表名 |")
|
||||
report.append("|------|")
|
||||
for table in sorted(diffs['only_in_db1']):
|
||||
report.append(f"| {table} |")
|
||||
|
||||
# 仅在db2中的表
|
||||
if diffs['only_in_db2']:
|
||||
report.append(f"\n### 2.2 仅在 {db2_name} 中存在的表 ({len(diffs['only_in_db2'])} 个)")
|
||||
report.append("| 表名 |")
|
||||
report.append("|------|")
|
||||
for table in sorted(diffs['only_in_db2']):
|
||||
report.append(f"| {table} |")
|
||||
|
||||
# 列结构差异
|
||||
if diffs['column_diffs']:
|
||||
report.append(f"\n## 3. 列结构差异的表 ({len(diffs['column_diffs'])} 个)")
|
||||
|
||||
for table, col_diffs in diffs['column_diffs'].items():
|
||||
report.append(f"\n### 3.1 表: {table}")
|
||||
|
||||
# 仅在db1中的列
|
||||
if col_diffs['only_in_db1']:
|
||||
report.append(f"\n#### 3.1.1 仅在 {db1_name} 中存在的列")
|
||||
report.append("| 列名 |")
|
||||
report.append("|------|")
|
||||
for col in col_diffs['only_in_db1']:
|
||||
report.append(f"| {col} |")
|
||||
|
||||
# 仅在db2中的列
|
||||
if col_diffs['only_in_db2']:
|
||||
report.append(f"\n#### 3.1.2 仅在 {db2_name} 中存在的列")
|
||||
report.append("| 列名 |")
|
||||
report.append("|------|")
|
||||
for col in col_diffs['only_in_db2']:
|
||||
report.append(f"| {col} |")
|
||||
|
||||
# 列类型差异
|
||||
if col_diffs['type_diffs']:
|
||||
report.append(f"\n#### 3.1.3 列类型差异")
|
||||
report.append(f"| 列名 | {db1_name} | {db2_name} |")
|
||||
report.append("|------|------------|------------|")
|
||||
for col_name, type1, type2 in col_diffs['type_diffs']:
|
||||
report.append(f"| {col_name} | {type1} | {type2} |")
|
||||
|
||||
# 列约束差异
|
||||
if col_diffs['constraint_diffs']:
|
||||
report.append(f"\n#### 3.1.4 列约束差异")
|
||||
report.append(f"| 列名 | {db1_name} | {db2_name} |")
|
||||
report.append("|------|------------|------------|")
|
||||
for col_name, constraint1, constraint2 in col_diffs['constraint_diffs']:
|
||||
report.append(f"| {col_name} | {constraint1} | {constraint2} |")
|
||||
|
||||
# 主键差异
|
||||
if diffs['primary_key_diffs']:
|
||||
report.append(f"\n## 4. 主键差异的表 ({len(diffs['primary_key_diffs'])} 个)")
|
||||
report.append(f"| 表名 | {db1_name} | {db2_name} |")
|
||||
report.append("|------|------------|------------|")
|
||||
for table, (pk1, pk2) in diffs['primary_key_diffs'].items():
|
||||
report.append(f"| {table} | {pk1} | {pk2} |")
|
||||
|
||||
# 索引差异
|
||||
if diffs['index_diffs']:
|
||||
report.append(f"\n## 5. 索引差异的表 ({len(diffs['index_diffs'])} 个)")
|
||||
|
||||
for table, idx_diffs in diffs['index_diffs'].items():
|
||||
report.append(f"\n### 5.1 表: {table}")
|
||||
|
||||
# 仅在db1中的索引
|
||||
if idx_diffs['only_in_db1']:
|
||||
report.append(f"\n#### 5.1.1 仅在 {db1_name} 中存在的索引")
|
||||
report.append("| 索引名 | 索引列 |")
|
||||
report.append("|--------|--------|")
|
||||
for idx_name, idx_cols in idx_diffs['only_in_db1']:
|
||||
report.append(f"| {idx_name} | {idx_cols} |")
|
||||
|
||||
# 仅在db2中的索引
|
||||
if idx_diffs['only_in_db2']:
|
||||
report.append(f"\n#### 5.1.2 仅在 {db2_name} 中存在的索引")
|
||||
report.append("| 索引名 | 索引列 |")
|
||||
report.append("|--------|--------|")
|
||||
for idx_name, idx_cols in idx_diffs['only_in_db2']:
|
||||
report.append(f"| {idx_name} | {idx_cols} |")
|
||||
|
||||
# 索引定义差异
|
||||
if idx_diffs['definition_diffs']:
|
||||
report.append(f"\n#### 5.1.3 索引定义差异")
|
||||
report.append(f"| 索引名 | {db1_name} | {db2_name} |")
|
||||
report.append("|--------|------------|------------|")
|
||||
for idx_name, idx1, idx2 in idx_diffs['definition_diffs']:
|
||||
report.append(f"| {idx_name} | {idx1} | {idx2} |")
|
||||
|
||||
# 唯一约束差异
|
||||
if diffs['unique_constraint_diffs']:
|
||||
report.append(f"\n## 6. 唯一约束差异的表 ({len(diffs['unique_constraint_diffs'])} 个)")
|
||||
|
||||
for table, uc_diffs in diffs['unique_constraint_diffs'].items():
|
||||
report.append(f"\n### 6.1 表: {table}")
|
||||
|
||||
# 仅在db1中的唯一约束
|
||||
if uc_diffs['only_in_db1']:
|
||||
report.append(f"\n#### 6.1.1 仅在 {db1_name} 中存在的唯一约束")
|
||||
report.append("| 约束名 | 约束列 |")
|
||||
report.append("|--------|--------|")
|
||||
for uc_name, uc_cols in uc_diffs['only_in_db1']:
|
||||
report.append(f"| {uc_name} | {uc_cols} |")
|
||||
|
||||
# 仅在db2中的唯一约束
|
||||
if uc_diffs['only_in_db2']:
|
||||
report.append(f"\n#### 6.1.2 仅在 {db2_name} 中存在的唯一约束")
|
||||
report.append("| 约束名 | 约束列 |")
|
||||
report.append("|--------|--------|")
|
||||
for uc_name, uc_cols in uc_diffs['only_in_db2']:
|
||||
report.append(f"| {uc_name} | {uc_cols} |")
|
||||
|
||||
# 唯一约束定义差异
|
||||
if uc_diffs['definition_diffs']:
|
||||
report.append(f"\n#### 6.1.3 唯一约束定义差异")
|
||||
report.append(f"| 约束名 | {db1_name} | {db2_name} |")
|
||||
report.append("|--------|------------|------------|")
|
||||
for uc_name, uc1, uc2 in uc_diffs['definition_diffs']:
|
||||
report.append(f"| {uc_name} | {uc1} | {uc2} |")
|
||||
|
||||
report.append("\n## 7. 总结")
|
||||
report.append("差异比较完成!")
|
||||
|
||||
return '\n'.join(report)
|
||||
|
||||
# 主函数
|
||||
def main():
|
||||
# 文件路径
|
||||
db1_path = r'D:\projects\shop-projects\backend\docs\db\niushop_database.sql'
|
||||
db2_path = r'D:\projects\shop-projects\backend\docs\db\init_v2.0_with_data.sql'
|
||||
report_path = r'D:\projects\shop-projects\backend\docs\db\database_diff_report.md'
|
||||
|
||||
# 解析数据库结构
|
||||
print(f"正在解析 {db1_path}...")
|
||||
db1 = parse_sql_file(db1_path)
|
||||
db1_table_count = len(db1)
|
||||
print(f"解析完成,共 {db1_table_count} 个表")
|
||||
|
||||
print(f"\n正在解析 {db2_path}...")
|
||||
db2 = parse_sql_file(db2_path, ignore_prefix='lucky_')
|
||||
db2_table_count = len(db2)
|
||||
print(f"解析完成,共 {db2_table_count} 个表")
|
||||
|
||||
# 比较差异
|
||||
print("\n正在比较数据库差异...")
|
||||
diffs = compare_databases(db1, db2, 'niushop_database.sql', 'init_v2.0_with_data.sql')
|
||||
|
||||
# 生成Markdown差异报告
|
||||
print("\n正在生成Markdown差异报告...")
|
||||
report = generate_markdown_report(diffs, 'niushop_database.sql', 'init_v2.0_with_data.sql', db1_table_count, db2_table_count)
|
||||
|
||||
# 保存报告到文件
|
||||
with open(report_path, 'w', encoding='utf-8') as f:
|
||||
f.write(report)
|
||||
|
||||
print(f"\n差异报告已生成: {report_path}")
|
||||
print("差异比较完成!")
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
5278
docs/db/database_diff_report.md
Normal file
5278
docs/db/database_diff_report.md
Normal file
File diff suppressed because it is too large
Load Diff
11578
docs/db/niushop_database.sql
Normal file
11578
docs/db/niushop_database.sql
Normal file
File diff suppressed because it is too large
Load Diff
117
docs/db/update_sql_comments.py
Normal file
117
docs/db/update_sql_comments.py
Normal file
@@ -0,0 +1,117 @@
|
||||
import re
|
||||
import os
|
||||
|
||||
# 读取 SQL 文件内容
|
||||
def read_sql_file(file_path):
|
||||
with open(file_path, 'r', encoding='utf-8') as f:
|
||||
return f.read()
|
||||
|
||||
# 解析 database.sql,提取表结构和注释
|
||||
def parse_database_sql(sql_content):
|
||||
tables = {}
|
||||
|
||||
# 匹配 CREATE TABLE 语句,更灵活的格式
|
||||
# 匹配所有 CREATE TABLE 语句,不依赖于 ENGINE、CHARACTER SET 等子句的顺序
|
||||
table_pattern = re.compile(r"CREATE TABLE\s+`?([^`\s]+)`?\s*\(([^;]+)\)\s*(?:[^;]+COMMENT\s*=\s*'([^']+)'[^;]*)?\s*;", re.DOTALL | re.IGNORECASE)
|
||||
|
||||
matches = table_pattern.findall(sql_content)
|
||||
|
||||
for table_name, table_def, table_comment in matches:
|
||||
if not table_comment:
|
||||
# 如果没有匹配到表注释,尝试从其他位置获取
|
||||
comment_match = re.search(r"COMMENT\s*=\s*'([^']+)'", table_def, re.IGNORECASE)
|
||||
if comment_match:
|
||||
table_comment = comment_match.group(1)
|
||||
else:
|
||||
table_comment = ''
|
||||
|
||||
# 解析列定义和注释
|
||||
columns = {}
|
||||
# 匹配列定义,包括 COMMENT
|
||||
column_lines = table_def.split('\n')
|
||||
for line in column_lines:
|
||||
# 匹配列名、类型和注释
|
||||
column_match = re.search(r"\s*([^\s,]+)\s+([^\s,]+)\s*(?:[^,]+COMMENT\s*=\s*'([^']+)'[^,]*|[^,]*)", line)
|
||||
if column_match:
|
||||
column_name = column_match.group(1)
|
||||
column_comment = column_match.group(3) or ''
|
||||
if column_comment:
|
||||
columns[column_name] = column_comment
|
||||
|
||||
tables[table_name] = {
|
||||
'comment': table_comment,
|
||||
'columns': columns
|
||||
}
|
||||
|
||||
return tables
|
||||
|
||||
# 更新 init_v2.0.sql 文件中的注释
|
||||
def update_init_sql(init_sql_path, database_tables):
|
||||
# 读取 init_v2.0.sql 内容
|
||||
init_content = read_sql_file(init_sql_path)
|
||||
|
||||
# 匹配 CREATE TABLE 语句,适应 init_v2.0.sql 的格式
|
||||
table_pattern = re.compile(r"(create table if not exists lucky_([^\s]+)\s*\(([^;]+)\)\s*comment\s*=\s*'[^']*'\s*(.*?);)", re.DOTALL | re.IGNORECASE)
|
||||
|
||||
def replace_table(match):
|
||||
full_match = match.group(0)
|
||||
table_name = match.group(2)
|
||||
table_def = match.group(3)
|
||||
table_suffix = match.group(4)
|
||||
|
||||
if table_name in database_tables:
|
||||
# 获取数据库表的注释和列注释
|
||||
db_table = database_tables[table_name]
|
||||
table_comment = db_table['comment']
|
||||
columns = db_table['columns']
|
||||
|
||||
# 更新列注释
|
||||
new_table_def = table_def
|
||||
for column_name, column_comment in columns.items():
|
||||
# 匹配列定义,替换注释
|
||||
# 格式:列名 类型 default 默认值 not null comment '注释'
|
||||
column_pattern = re.compile(r"(\s*" + column_name + r"\s+[^\s,]+\s*(?:default\s+[^\s,]+\s*)?(?:not null\s*)?comment\s*=\s*')([^']*)'([^,]*)", re.IGNORECASE)
|
||||
new_table_def = column_pattern.sub(r"\1" + column_comment + r"'\3", new_table_def)
|
||||
|
||||
# 重新构建 CREATE TABLE 语句
|
||||
new_full_match = f"create table if not exists lucky_{table_name} ({new_table_def}) comment = '{table_comment}' {table_suffix};"
|
||||
return new_full_match
|
||||
|
||||
return full_match
|
||||
|
||||
# 替换所有表
|
||||
updated_content = table_pattern.sub(replace_table, init_content)
|
||||
|
||||
# 写回文件
|
||||
with open(init_sql_path, 'w', encoding='utf-8') as f:
|
||||
f.write(updated_content)
|
||||
|
||||
print(f"Updated {init_sql_path}")
|
||||
|
||||
# 主函数
|
||||
def main():
|
||||
# 文件路径
|
||||
database_sql_path = r'./niushop_database.sql'
|
||||
init_v20_sql_path = r'./init_v2.0.sql'
|
||||
init_v20_with_data_sql_path = r'./init_v2.0_with_data.sql'
|
||||
|
||||
# 解析 database.sql
|
||||
print("Parsing database.sql...")
|
||||
database_content = read_sql_file(database_sql_path)
|
||||
database_tables = parse_database_sql(database_content)
|
||||
print(f"Found {len(database_tables)} tables in database.sql")
|
||||
|
||||
# 更新 init_v2.0.sql
|
||||
if os.path.exists(init_v20_sql_path):
|
||||
print("Updating init_v2.0.sql...")
|
||||
update_init_sql(init_v20_sql_path, database_tables)
|
||||
|
||||
# 更新 init_v2.0_with_data.sql
|
||||
if os.path.exists(init_v20_with_data_sql_path):
|
||||
print("Updating init_v2.0_with_data.sql...")
|
||||
update_init_sql(init_v20_with_data_sql_path, database_tables)
|
||||
|
||||
print("All files updated successfully!")
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
170
replace_comments.py
Normal file
170
replace_comments.py
Normal file
@@ -0,0 +1,170 @@
|
||||
#!/usr/bin/env python3
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
import os
|
||||
import argparse
|
||||
|
||||
# 定义要查找和替换的注释内容
|
||||
# 使用原始字符串数组,支持多个旧内容,避免Unicode转义问题
|
||||
OLD_COMMENTS = [
|
||||
r"""
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
""".strip(),
|
||||
r"""
|
||||
<?php
|
||||
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
""".strip(),
|
||||
# 格式1:标准注释格式
|
||||
r"""
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
""".strip(),
|
||||
r"""
|
||||
<?php
|
||||
|
||||
/**
|
||||
* Niushop商城系统 - 团队十年电商经验汇集巨献!
|
||||
* =========================================================
|
||||
* Copy right 2019-2029 杭州牛之云科技有限公司, 保留所有权利。
|
||||
* ----------------------------------------------
|
||||
* 官方网址: https://www.niushop.com
|
||||
* =========================================================
|
||||
*/
|
||||
""".strip(),
|
||||
# 格式1:标准注释格式
|
||||
r"""
|
||||
<?php
|
||||
/**
|
||||
* Niushop商城系统 - 团队十年电商经验汇集巨献!
|
||||
* =========================================================
|
||||
* Copy right 2019-2029 杭州牛之云科技有限公司, 保留所有权利。
|
||||
* ----------------------------------------------
|
||||
* 官方网址: https://www.niushop.com
|
||||
* =========================================================
|
||||
*/""".strip(),
|
||||
# 格式2:带有额外空行的注释格式
|
||||
r"""
|
||||
<?php
|
||||
/**
|
||||
* Niushop商城系统 - 团队十年电商经验汇集巨献!
|
||||
* =========================================================
|
||||
* Copy right 2019-2029 杭州牛之云科技有限公司, 保留所有权利。
|
||||
* ----------------------------------------------
|
||||
* 官方网址: https://www.niushop.com
|
||||
|
||||
* =========================================================
|
||||
*/""".strip(),
|
||||
]
|
||||
|
||||
NEW_COMMENT = r"""
|
||||
<?php
|
||||
""".strip()
|
||||
|
||||
# 定义要处理的文件类型
|
||||
FILE_TYPES = [".php", ".js", ".css", ".html", ".vue", ".ts", ".tsx", ".jsx", ".scss", ".less"]
|
||||
|
||||
def replace_comments(file_path):
|
||||
"""
|
||||
替换文件中的注释
|
||||
"""
|
||||
try:
|
||||
# 读取文件内容
|
||||
with open(file_path, 'r', encoding='utf-8') as f:
|
||||
content = f.read()
|
||||
|
||||
# 检查文件是否包含任何旧注释
|
||||
has_old_comment = False
|
||||
for old_comment in OLD_COMMENTS:
|
||||
if old_comment in content:
|
||||
has_old_comment = True
|
||||
break
|
||||
|
||||
if has_old_comment:
|
||||
# 替换所有旧注释
|
||||
new_content = content
|
||||
for old_comment in OLD_COMMENTS:
|
||||
if old_comment in new_content:
|
||||
new_content = new_content.replace(old_comment, NEW_COMMENT)
|
||||
|
||||
# 写回文件
|
||||
with open(file_path, 'w', encoding='utf-8') as f:
|
||||
f.write(new_content)
|
||||
|
||||
print(f"✓ 已处理: {file_path}")
|
||||
return True
|
||||
return False
|
||||
|
||||
except UnicodeDecodeError:
|
||||
# 跳过二进制文件
|
||||
print(f"✗ 跳过二进制文件: {file_path}")
|
||||
return False
|
||||
except PermissionError:
|
||||
# 跳过没有权限的文件
|
||||
print(f"✗ 权限不足: {file_path}")
|
||||
return False
|
||||
except Exception as e:
|
||||
# 处理其他异常
|
||||
print(f"✗ 处理失败 {file_path}: {str(e)}")
|
||||
return False
|
||||
|
||||
def main():
|
||||
"""
|
||||
主函数
|
||||
"""
|
||||
parser = argparse.ArgumentParser(description="替换Niushop商城系统的注释")
|
||||
parser.add_argument("--path", type=str, default=".", help="要遍历的目录路径")
|
||||
args = parser.parse_args()
|
||||
|
||||
root_path = args.path
|
||||
total_files = 0
|
||||
processed_files = 0
|
||||
|
||||
print(f"开始遍历目录: {root_path}")
|
||||
print(f"将处理的文件类型: {', '.join(FILE_TYPES)}")
|
||||
print("=" * 60)
|
||||
|
||||
# 遍历所有文件
|
||||
for root, dirs, files in os.walk(root_path):
|
||||
# 跳过某些目录(如.git、vendor、node_modules等)
|
||||
dirs[:] = [d for d in dirs if d not in ['.git', 'vendor', 'node_modules', 'runtime', 'upload', 'public', 'static']]
|
||||
|
||||
for file in files:
|
||||
# 检查文件类型
|
||||
if any(file.endswith(ext) for ext in FILE_TYPES):
|
||||
total_files += 1
|
||||
file_path = os.path.join(root, file)
|
||||
if replace_comments(file_path):
|
||||
processed_files += 1
|
||||
|
||||
print("=" * 60)
|
||||
print(f"处理完成!")
|
||||
print(f"总文件数: {total_files}")
|
||||
print(f"已处理文件数: {processed_files}")
|
||||
print(f"替换率: {processed_files / total_files * 100:.2f}%" if total_files > 0 else "未找到匹配的文件")
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
22
scripts/generate_key_pair/main.js
Normal file
22
scripts/generate_key_pair/main.js
Normal file
@@ -0,0 +1,22 @@
|
||||
const crypto = require('crypto');
|
||||
// 生成密钥对
|
||||
const { publicKey, privateKey } = crypto.generateKeyPairSync('rsa', {
|
||||
modulusLength: 3072, // 密钥长度,不少于3072
|
||||
publicKeyEncoding: {
|
||||
type: 'spki', // 公钥编码格式
|
||||
format: 'pem' // 公钥输出格式
|
||||
},
|
||||
privateKeyEncoding: {
|
||||
type: 'pkcs8', // 私钥编码格式
|
||||
format: 'pem' // 私钥输出格式
|
||||
}
|
||||
});
|
||||
console.info('生成的公钥:');
|
||||
console.info(publicKey);
|
||||
console.info('生成的私钥:');
|
||||
console.info(privateKey);
|
||||
|
||||
// 保存密钥对到文件
|
||||
const fs = require('fs');
|
||||
fs.writeFileSync('merchant_public_key.pem', publicKey);
|
||||
fs.writeFileSync('merchant_private_key.pem', privateKey);
|
||||
@@ -1,25 +1,22 @@
|
||||
APP_DEBUG = true
|
||||
APP_TRACE = true
|
||||
|
||||
[APP]
|
||||
DEFAULT_TIMEZONE = Asia/Shanghai
|
||||
ENV_MODE = development
|
||||
|
||||
[LANG]
|
||||
default_lang = zh-cn
|
||||
|
||||
[DATABASE]
|
||||
TYPE = mysql
|
||||
HOSTNAME = 127.0.0.1
|
||||
DATABASE = shop_mallnew_dev
|
||||
USERNAME = root
|
||||
PASSWORD = root
|
||||
HOSTNAME = db
|
||||
DATABASE = shop_mallnew
|
||||
USERNAME = shop_mallnew
|
||||
PASSWORD = shop_mallnew
|
||||
HOSTPORT = 3306
|
||||
CHARSET = utf8
|
||||
DEBUG = true
|
||||
|
||||
[RRDATABASE]
|
||||
HOSTNAME = host.docker.internal
|
||||
[redis]
|
||||
HOST = 127.0.0.1
|
||||
HOST = redis
|
||||
PORT = 6379
|
||||
PASSWORD = ''
|
||||
PASSWORD = 'luckyshop123!@#'
|
||||
EXPIRY = 604800
|
||||
@@ -6,7 +6,7 @@ DEFAULT_TIMEZONE = Asia/Shanghai
|
||||
default_lang = zh-cn
|
||||
[DATABASE]
|
||||
TYPE = mysql
|
||||
HOSTNAME = newshop_mysql
|
||||
HOSTNAME = db
|
||||
DATABASE = shop_dev
|
||||
USERNAME = shop_mallnew
|
||||
PASSWORD = shop_mallnew
|
||||
@@ -14,9 +14,9 @@ HOSTPORT = 3306
|
||||
CHARSET = utf8
|
||||
DEBUG = true
|
||||
[RRDATABASE]
|
||||
HOSTNAME = 192.168.2.64
|
||||
HOSTNAME = redis
|
||||
[redis]
|
||||
HOST = newshop_redis
|
||||
HOST = redis
|
||||
PORT = 6379
|
||||
PASSWORD = 'luckyshop123!@#'
|
||||
EXPIRY = 604800
|
||||
313
src/addon/aikefu/api/controller/Kefu.php
Normal file
313
src/addon/aikefu/api/controller/Kefu.php
Normal file
@@ -0,0 +1,313 @@
|
||||
<?php
|
||||
|
||||
namespace addon\aikefu\api\controller;
|
||||
|
||||
use addon\aikefu\model\Config as KefuConfigModel;
|
||||
use addon\aikefu\model\Conversation as KefuConversationModel;
|
||||
use addon\aikefu\model\Message as KefuMessageModel;
|
||||
use app\api\controller\BaseApi;
|
||||
|
||||
|
||||
class Kefu extends BaseApi
|
||||
{
|
||||
/**
|
||||
* 封装curl请求方法
|
||||
* @param string $url 请求URL
|
||||
* @param string $method 请求方法
|
||||
* @param array $data 请求数据
|
||||
* @param array $headers 请求头
|
||||
* @return string 响应内容
|
||||
*/
|
||||
private function curlRequest($url, $method = 'GET', $data = [], $headers = [])
|
||||
{
|
||||
$ch = curl_init();
|
||||
|
||||
// 设置URL
|
||||
curl_setopt($ch, CURLOPT_URL, $url);
|
||||
|
||||
// 设置请求方法
|
||||
curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $method);
|
||||
|
||||
// 设置POST数据
|
||||
if ($method === 'POST' && !empty($data)) {
|
||||
curl_setopt($ch, CURLOPT_POSTFIELDS, is_array($data) ? json_encode($data) : $data);
|
||||
}
|
||||
|
||||
// 设置请求头
|
||||
if (!empty($headers)) {
|
||||
curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
|
||||
}
|
||||
|
||||
// 设置返回值
|
||||
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
|
||||
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
|
||||
curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
|
||||
curl_setopt($ch, CURLOPT_TIMEOUT, 30);
|
||||
|
||||
// 执行请求
|
||||
$response = curl_exec($ch);
|
||||
$httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
|
||||
|
||||
// 关闭连接
|
||||
curl_close($ch);
|
||||
|
||||
if ($response === false) {
|
||||
throw new \Exception('Curl请求失败');
|
||||
}
|
||||
|
||||
if ($httpCode >= 400) {
|
||||
throw new \Exception('HTTP请求失败,状态码:' . $httpCode);
|
||||
}
|
||||
|
||||
return $response;
|
||||
}
|
||||
/**
|
||||
* 为事件调用初始化属性
|
||||
* @param array $data 事件数据
|
||||
*/
|
||||
public function initializeForEvent($data)
|
||||
{
|
||||
if (!empty($data['site_id'])) {
|
||||
$this->site_id = $data['site_id'] ?? 0;
|
||||
}
|
||||
|
||||
if (!empty($data['member_id'])) {
|
||||
$this->member_id = $data['member_id'] ?? 0;
|
||||
}
|
||||
|
||||
if (!empty($data['token'])) {
|
||||
$this->token = $data['token'] ?? '';
|
||||
}
|
||||
|
||||
$this->params = [
|
||||
'message' => $data['message'] ?? '',
|
||||
'user_id' => $data['user_id'] ?? '',
|
||||
'conversation_id' => $data['conversation_id'] ?? '',
|
||||
'stream' => $data['stream'] ?? false,
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* 智能客服聊天接口
|
||||
* @return \think\response\Json
|
||||
*/
|
||||
public function chat()
|
||||
{
|
||||
// 获取请求参数
|
||||
$message = $this->params['message'] ?? '';
|
||||
$user_id = $this->params['user_id'] ?? $this->member_id;
|
||||
$conversation_id = $this->params['conversation_id'] ?? '';
|
||||
$stream = $this->params['stream'] ?? false;
|
||||
|
||||
// 验证参数
|
||||
if (empty($message)) {
|
||||
return $this->response($this->error('请输入消息内容'));
|
||||
}
|
||||
|
||||
try {
|
||||
// 获取智能客服配置
|
||||
$kefu_config_model = new KefuConfigModel();
|
||||
$config_info = $kefu_config_model->getConfig($this->site_id)['data']['value'] ?? [];
|
||||
|
||||
if (empty($config_info) || $config_info['status'] != 1) {
|
||||
return $this->response($this->error('智能客服暂未启用'));
|
||||
}
|
||||
|
||||
$config = $config_info;
|
||||
$apiKey = $config['api_key'];
|
||||
$baseUrl = $config['base_url'];
|
||||
$chatEndpoint = $config['chat_endpoint'];
|
||||
|
||||
// 构建请求数据
|
||||
$requestData = [
|
||||
'inputs' => [],
|
||||
'query' => $message,
|
||||
'response_mode' => $stream ? 'streaming' : 'blocking',
|
||||
'user' => $user_id,
|
||||
];
|
||||
|
||||
// 如果有会话ID,添加到请求中
|
||||
if (!empty($conversation_id)) {
|
||||
$requestData['conversation_id'] = $conversation_id;
|
||||
}
|
||||
|
||||
// 构建请求头
|
||||
$headers = [
|
||||
'Authorization: Bearer ' . $apiKey,
|
||||
'Content-Type: application/json',
|
||||
];
|
||||
|
||||
// 发送请求到Dify API
|
||||
$url = $baseUrl . $chatEndpoint;
|
||||
$response = $this->curlRequest($url, 'POST', $requestData, $headers);
|
||||
|
||||
// 解析响应
|
||||
$result = json_decode($response, true);
|
||||
|
||||
if (json_last_error() !== JSON_ERROR_NONE) {
|
||||
return $this->response($this->error('解析响应失败'));
|
||||
}
|
||||
|
||||
// 保存消息记录
|
||||
$kefu_message_model = new KefuMessageModel();
|
||||
$kefu_conversation_model = new KefuConversationModel();
|
||||
|
||||
// 保存用户消息
|
||||
$kefu_message_model->addMessage([
|
||||
'site_id' => $this->site_id,
|
||||
'user_id' => $user_id,
|
||||
'conversation_id' => $result['conversation_id'] ?? $conversation_id,
|
||||
'message_id' => $result['message_id'] ?? '',
|
||||
'role' => 'user',
|
||||
'content' => $message,
|
||||
]);
|
||||
|
||||
// 保存机器人回复
|
||||
$kefu_message_model->addMessage([
|
||||
'site_id' => $this->site_id,
|
||||
'user_id' => $user_id,
|
||||
'conversation_id' => $result['conversation_id'] ?? $conversation_id,
|
||||
'message_id' => $result['id'] ?? '',
|
||||
'role' => 'assistant',
|
||||
'content' => $result['answer'] ?? '',
|
||||
]);
|
||||
|
||||
// 更新会话状态或创建新会话
|
||||
$conversation_info = $kefu_conversation_model->getConversationInfo([
|
||||
['site_id', '=', $this->site_id],
|
||||
['conversation_id', '=', $result['conversation_id'] ?? $conversation_id],
|
||||
]);
|
||||
|
||||
if (empty($conversation_info['data'])) {
|
||||
// 创建新会话
|
||||
$kefu_conversation_model->addConversation([
|
||||
'site_id' => $this->site_id,
|
||||
'user_id' => $user_id,
|
||||
'conversation_id' => $result['conversation_id'] ?? '',
|
||||
'name' => '智能客服会话',
|
||||
]);
|
||||
} else {
|
||||
// 更新会话状态
|
||||
$kefu_conversation_model->updateConversation([
|
||||
'status' => 1,
|
||||
], [
|
||||
['id', '=', $conversation_info['data']['id']],
|
||||
]);
|
||||
}
|
||||
|
||||
// 返回成功响应
|
||||
return $this->response($this->success([
|
||||
'conversation_id' => $result['conversation_id'] ?? '',
|
||||
'reply' => $result['answer'] ?? '',
|
||||
'message_id' => $result['message_id'] ?? '',
|
||||
'finish_reason' => $result['finish_reason'] ?? '',
|
||||
'usage' => $result['usage'] ?? [],
|
||||
]));
|
||||
} catch (\Exception $e) {
|
||||
return $this->response($this->error('请求失败:' . $e->getMessage()));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取会话历史
|
||||
* @return \think\response\Json
|
||||
*/
|
||||
public function getHistory()
|
||||
{
|
||||
// 获取请求参数
|
||||
$conversation_id = $this->params['conversation_id'] ?? '';
|
||||
$user_id = $this->params['user_id'] ?? $this->member_id;
|
||||
$limit = $this->params['limit'] ?? 20;
|
||||
$offset = $this->params['offset'] ?? 0;
|
||||
|
||||
// 验证参数
|
||||
if (empty($conversation_id)) {
|
||||
return $this->response($this->error('会话ID不能为空'));
|
||||
}
|
||||
|
||||
try {
|
||||
// 获取会话历史记录
|
||||
$kefu_message_model = new KefuMessageModel();
|
||||
$message_list = $kefu_message_model->getMessageList([
|
||||
['site_id', '=', $this->site_id],
|
||||
['user_id', '=', $user_id],
|
||||
['conversation_id', '=', $conversation_id],
|
||||
], 'id, role, content, create_time', 'create_time asc', $limit, $offset);
|
||||
|
||||
// 返回成功响应
|
||||
return $this->response($this->success([
|
||||
'messages' => $message_list['data'] ?? [],
|
||||
'total' => $message_list['total'] ?? 0,
|
||||
'limit' => $limit,
|
||||
'offset' => $offset,
|
||||
]));
|
||||
} catch (\Exception $e) {
|
||||
return $this->response($this->error('请求失败:' . $e->getMessage()));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建新会话
|
||||
* @return \think\response\Json
|
||||
*/
|
||||
public function createConversation()
|
||||
{
|
||||
// 获取请求参数
|
||||
$user_id = $this->params['user_id'] ?? $this->member_id;
|
||||
|
||||
try {
|
||||
// 获取智能客服配置
|
||||
$kefu_config_model = new KefuConfigModel();
|
||||
$config_info = $kefu_config_model->getConfig($this->site_id)['data']['value'] ?? [];
|
||||
|
||||
if (empty($config_info) || $config_info['status'] != 1) {
|
||||
return $this->response($this->error('智能客服暂未启用'));
|
||||
}
|
||||
|
||||
$config = $config_info;
|
||||
$apiKey = $config['api_key'];
|
||||
$baseUrl = $config['base_url'];
|
||||
|
||||
// 构建请求数据
|
||||
$requestData = [
|
||||
'name' => '智能客服会话',
|
||||
'user' => $user_id,
|
||||
];
|
||||
|
||||
// 构建请求头
|
||||
$headers = [
|
||||
'Authorization: Bearer ' . $apiKey,
|
||||
'Content-Type: application/json',
|
||||
];
|
||||
|
||||
// 发送请求到Dify API
|
||||
$url = $baseUrl . '/conversations';
|
||||
$response = $this->curlRequest($url, 'POST', $requestData, $headers);
|
||||
|
||||
// 解析响应
|
||||
$result = json_decode($response, true);
|
||||
|
||||
if (json_last_error() !== JSON_ERROR_NONE) {
|
||||
return $this->response($this->error('解析响应失败'));
|
||||
}
|
||||
|
||||
// 保存会话记录
|
||||
$kefu_conversation_model = new KefuConversationModel();
|
||||
$kefu_conversation_model->addConversation([
|
||||
'site_id' => $this->site_id,
|
||||
'user_id' => $user_id,
|
||||
'conversation_id' => $result['id'] ?? '',
|
||||
'name' => $result['name'] ?? '智能客服会话',
|
||||
]);
|
||||
|
||||
// 返回成功响应
|
||||
return $this->response($this->success([
|
||||
'conversation_id' => $result['id'] ?? '',
|
||||
'name' => $result['name'] ?? '',
|
||||
'created_at' => $result['created_at'] ?? '',
|
||||
]));
|
||||
} catch (\Exception $e) {
|
||||
return $this->response($this->error('请求失败:' . $e->getMessage()));
|
||||
}
|
||||
}
|
||||
}
|
||||
24
src/addon/aikefu/config/event.php
Normal file
24
src/addon/aikefu/config/event.php
Normal file
@@ -0,0 +1,24 @@
|
||||
<?php
|
||||
/**
|
||||
* 智能客服扩展事件配置
|
||||
*/
|
||||
return [
|
||||
'bind' => [
|
||||
|
||||
],
|
||||
|
||||
'listen' => [
|
||||
'KefuChat' => [
|
||||
'addon\aikefu\event\KefuChat'
|
||||
],
|
||||
'KefuCreateConversation' => [
|
||||
'addon\aikefu\event\KefuCreateConversation'
|
||||
],
|
||||
'KefuGetHistory' => [
|
||||
'addon\aikefu\event\KefuGetHistory'
|
||||
],
|
||||
],
|
||||
|
||||
'subscribe' => [
|
||||
],
|
||||
];
|
||||
13
src/addon/aikefu/config/info.php
Normal file
13
src/addon/aikefu/config/info.php
Normal file
@@ -0,0 +1,13 @@
|
||||
<?php
|
||||
|
||||
return [
|
||||
'name' => 'aikefu',
|
||||
'title' => '智能客服',
|
||||
'description' => '基于Dify的智能客服系统',
|
||||
'type' => 'system', //插件类型 system :系统插件(自动安装), business:业务插件 promotion:扩展营销插件 tool:工具插件
|
||||
'status' => 1,
|
||||
'author' => '',
|
||||
'version' => '1.0.0',
|
||||
'version_no' => '525231212001',
|
||||
'content' => '',
|
||||
];
|
||||
36
src/addon/aikefu/data/install.sql
Normal file
36
src/addon/aikefu/data/install.sql
Normal file
@@ -0,0 +1,36 @@
|
||||
-- 智能客服插件安装脚本
|
||||
-- 1. 智能客服插件使用系统配置表存储配置信息,无需创建独立数据表
|
||||
-- 2. 会话和消息数据存储在独立数据表中
|
||||
|
||||
-- 创建智能客服会话表
|
||||
CREATE TABLE IF NOT EXISTS `lucky_aikefu_conversation` (
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`site_id` int(11) NOT NULL COMMENT '站点ID',
|
||||
`user_id` varchar(50) NOT NULL COMMENT '用户ID',
|
||||
`conversation_id` varchar(100) NOT NULL COMMENT 'Dify会话ID',
|
||||
`name` varchar(255) NOT NULL COMMENT '会话名称',
|
||||
`status` tinyint(1) NOT NULL DEFAULT 1 COMMENT '状态:1活跃,0结束',
|
||||
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `site_id` (`site_id`),
|
||||
KEY `user_id` (`user_id`),
|
||||
KEY `conversation_id` (`conversation_id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='智能客服会话表';
|
||||
|
||||
-- 创建智能客服消息表
|
||||
CREATE TABLE IF NOT EXISTS `lucky_aikefu_message` (
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`site_id` int(11) NOT NULL COMMENT '站点ID',
|
||||
`user_id` varchar(50) NOT NULL COMMENT '用户ID',
|
||||
`conversation_id` varchar(100) NOT NULL COMMENT '会话ID',
|
||||
`message_id` varchar(100) NOT NULL COMMENT '消息ID',
|
||||
`role` varchar(20) NOT NULL COMMENT '角色:user用户,assistant助手',
|
||||
`content` text NOT NULL COMMENT '消息内容',
|
||||
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `site_id` (`site_id`),
|
||||
KEY `user_id` (`user_id`),
|
||||
KEY `conversation_id` (`conversation_id`),
|
||||
KEY `message_id` (`message_id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='智能客服消息表';
|
||||
4
src/addon/aikefu/data/uninstall.sql
Normal file
4
src/addon/aikefu/data/uninstall.sql
Normal file
@@ -0,0 +1,4 @@
|
||||
-- 智能客服插件卸载脚本
|
||||
-- 删除智能客服相关表(配置信息存储在系统配置表中,无需单独删除)
|
||||
DROP TABLE IF EXISTS `lucky_aikefu_message`;
|
||||
DROP TABLE IF EXISTS `lucky_aikefu_conversation`;
|
||||
50
src/addon/aikefu/event/Install.php
Normal file
50
src/addon/aikefu/event/Install.php
Normal file
@@ -0,0 +1,50 @@
|
||||
<?php
|
||||
|
||||
namespace addon\aikefu\event;
|
||||
|
||||
use app\model\system\Addon as AddonModel;
|
||||
|
||||
/**
|
||||
* 智能客服插件安装
|
||||
*/
|
||||
class Install
|
||||
{
|
||||
public function handle()
|
||||
{
|
||||
$addon_model = new AddonModel();
|
||||
$info = $addon_model->getAddonInfo(['name' => 'aikefu']);
|
||||
|
||||
if (empty($info['data'])) {
|
||||
// 插件未安装,执行安装逻辑
|
||||
$addon_model->addAddon([
|
||||
'name' => 'aikefu',
|
||||
'title' => '智能客服',
|
||||
'description' => '基于Dify的智能客服系统',
|
||||
'author' => 'admin',
|
||||
'version' => '1.0.0',
|
||||
'scene' => 'web',
|
||||
'state' => 0,
|
||||
'category' => 'business',
|
||||
'need_install' => 1,
|
||||
'need_cache' => 1,
|
||||
'create_time' => time(),
|
||||
'update_time' => time()
|
||||
]);
|
||||
} else {
|
||||
// 插件已存在,更新插件信息
|
||||
$addon_model->updateAddon([
|
||||
'title' => '智能客服',
|
||||
'description' => '基于Dify的智能客服系统',
|
||||
'author' => 'admin',
|
||||
'version' => '1.0.0',
|
||||
'scene' => 'web',
|
||||
'category' => 'business',
|
||||
'need_install' => 1,
|
||||
'need_cache' => 1,
|
||||
'update_time' => time()
|
||||
], ['name' => 'aikefu']);
|
||||
}
|
||||
|
||||
return success(1);
|
||||
}
|
||||
}
|
||||
39
src/addon/aikefu/event/KefuChat.php
Normal file
39
src/addon/aikefu/event/KefuChat.php
Normal file
@@ -0,0 +1,39 @@
|
||||
<?php
|
||||
|
||||
namespace addon\aikefu\event;
|
||||
|
||||
use addon\aikefu\api\controller\Kefu as KefuApi;
|
||||
|
||||
/**
|
||||
* 客服聊天
|
||||
*/
|
||||
class KefuChat
|
||||
{
|
||||
/**
|
||||
* 处理智能客服聊天事件
|
||||
* @param array $data 事件数据
|
||||
* @return array
|
||||
*/
|
||||
public function handle($data)
|
||||
{
|
||||
try {
|
||||
// 创建addon的KefuApi实例
|
||||
$kefu_api = new KefuApi();
|
||||
|
||||
// 调用初始化方法设置属性
|
||||
$kefu_api->initializeForEvent($data);
|
||||
|
||||
// 调用addon的chat方法
|
||||
$response = $kefu_api->chat();
|
||||
|
||||
// 返回响应数据
|
||||
return json_decode($response->getContent(), true);
|
||||
} catch (\Exception $e) {
|
||||
return [
|
||||
'code' => -1,
|
||||
'message' => '聊天失败:' . $e->getMessage(),
|
||||
'data' => []
|
||||
];
|
||||
}
|
||||
}
|
||||
}
|
||||
81
src/addon/aikefu/event/KefuCreateConversation.php
Normal file
81
src/addon/aikefu/event/KefuCreateConversation.php
Normal file
@@ -0,0 +1,81 @@
|
||||
<?php
|
||||
|
||||
namespace addon\aikefu\event;
|
||||
|
||||
use addon\aikefu\api\controller\Kefu as KefuApi;
|
||||
|
||||
/**
|
||||
* 处理智能客服创建会话事件
|
||||
*/
|
||||
class KefuCreateConversation
|
||||
{
|
||||
|
||||
/**
|
||||
* 处理智能客服创建会话事件
|
||||
* @param array $data 事件数据
|
||||
* @return array
|
||||
*/
|
||||
public function handle($data)
|
||||
{
|
||||
try {
|
||||
// 创建addon的KefuApi实例
|
||||
$kefu_api = new KefuApi();
|
||||
|
||||
// 调用初始化方法设置属性
|
||||
$kefu_api->initializeForEvent($data);
|
||||
|
||||
// 调用addon的createConversation方法
|
||||
$response = $kefu_api->createConversation();
|
||||
|
||||
// 返回响应数据
|
||||
return json_decode($response->getContent(), true);
|
||||
} catch (\Exception $e) {
|
||||
return [
|
||||
'code' => -1,
|
||||
'message' => '创建会话失败:' . $e->getMessage(),
|
||||
'data' => []
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 处理智能客服获取历史消息事件
|
||||
* @param array $data 事件数据
|
||||
* @return array
|
||||
*/
|
||||
public function handleKefuGetHistory($data)
|
||||
{
|
||||
try {
|
||||
// 创建addon的KefuApi实例
|
||||
$kefu_api = new KefuApi();
|
||||
|
||||
// 调用初始化方法设置属性
|
||||
$kefu_api->initializeForEvent($data);
|
||||
|
||||
// 调用addon的getHistory方法
|
||||
$response = $kefu_api->getHistory();
|
||||
|
||||
// 返回响应数据
|
||||
return json_decode($response->getContent(), true);
|
||||
} catch (\Exception $e) {
|
||||
return [
|
||||
'code' => -1,
|
||||
'message' => '获取历史消息失败:' . $e->getMessage(),
|
||||
'data' => []
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 事件监听映射
|
||||
* @return array
|
||||
*/
|
||||
public function subscribe()
|
||||
{
|
||||
return [
|
||||
'KefuChat' => 'handleKefuChat',
|
||||
'KefuCreateConversation' => 'handleKefuCreateConversation',
|
||||
'KefuGetHistory' => 'handleKefuGetHistory',
|
||||
];
|
||||
}
|
||||
}
|
||||
39
src/addon/aikefu/event/KefuGetHistory.php
Normal file
39
src/addon/aikefu/event/KefuGetHistory.php
Normal file
@@ -0,0 +1,39 @@
|
||||
<?php
|
||||
|
||||
namespace addon\aikefu\event;
|
||||
|
||||
use addon\aikefu\api\controller\Kefu as KefuApi;
|
||||
|
||||
/**
|
||||
* 处理智能客服获取历史消息事件
|
||||
*/
|
||||
class KefuGetHistory
|
||||
{
|
||||
/**
|
||||
* 处理智能客服获取历史消息事件
|
||||
* @param array $data 事件数据
|
||||
* @return array
|
||||
*/
|
||||
public function handle($data)
|
||||
{
|
||||
try {
|
||||
// 创建addon的KefuApi实例
|
||||
$kefu_api = new KefuApi();
|
||||
|
||||
// 调用初始化方法设置属性
|
||||
$kefu_api->initializeForEvent($data);
|
||||
|
||||
// 调用addon的getHistory方法
|
||||
$response = $kefu_api->getHistory();
|
||||
|
||||
// 返回响应数据
|
||||
return json_decode($response->getContent(), true);
|
||||
} catch (\Exception $e) {
|
||||
return [
|
||||
'code' => -1,
|
||||
'message' => '获取历史消息失败:' . $e->getMessage(),
|
||||
'data' => []
|
||||
];
|
||||
}
|
||||
}
|
||||
}
|
||||
20
src/addon/aikefu/event/UnInstall.php
Normal file
20
src/addon/aikefu/event/UnInstall.php
Normal file
@@ -0,0 +1,20 @@
|
||||
<?php
|
||||
|
||||
namespace addon\aikefu\event;
|
||||
|
||||
use app\model\system\Addon as AddonModel;
|
||||
|
||||
/**
|
||||
* 智能客服插件卸载
|
||||
*/
|
||||
class UnInstall
|
||||
{
|
||||
public function handle()
|
||||
{
|
||||
$addon_model = new AddonModel();
|
||||
// 删除插件信息
|
||||
$addon_model->deleteAddon(['name' => 'aikefu']);
|
||||
|
||||
return success(1);
|
||||
}
|
||||
}
|
||||
1
src/addon/aikefu/icon.png
Normal file
1
src/addon/aikefu/icon.png
Normal file
File diff suppressed because one or more lines are too long
67
src/addon/aikefu/model/Config.php
Normal file
67
src/addon/aikefu/model/Config.php
Normal file
@@ -0,0 +1,67 @@
|
||||
<?php
|
||||
/**
|
||||
* 智能客服配置模型
|
||||
* 用于存储和管理智能客服的配置信息
|
||||
* 版本:1.0.0
|
||||
*/
|
||||
|
||||
namespace addon\aikefu\model;
|
||||
|
||||
use app\model\system\Config as ConfigModel;
|
||||
use app\model\BaseModel;
|
||||
|
||||
/**
|
||||
* 智能客服配置
|
||||
*/
|
||||
class Config extends BaseModel
|
||||
{
|
||||
/**
|
||||
* 设置智能客服配置
|
||||
* @param array $data
|
||||
* @param int $site_id
|
||||
* @param string $app_module
|
||||
* @return array
|
||||
*/
|
||||
public function setConfig($data, $site_id = 0, $app_module = 'shop')
|
||||
{
|
||||
$config = new ConfigModel();
|
||||
|
||||
// 获取原始配置
|
||||
$original_config = $this->getConfig($site_id, $app_module)['data']['value'] ?? [];
|
||||
|
||||
// 如果 API Key 为空或保持不变,则使用原始值
|
||||
if (isset($data['api_key']) && empty($data['api_key'])) {
|
||||
$data['api_key'] = $original_config['api_key'] ?? '';
|
||||
}
|
||||
|
||||
$res = $config->setConfig($data, '智能客服配置', 1, [['site_id', '=', $site_id], ['app_module', '=', $app_module], ['config_key', '=', 'AIKEFU_CONFIG']]);
|
||||
return $res;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取智能客服配置
|
||||
* @param int $site_id
|
||||
* @param string $app_module
|
||||
* @return array
|
||||
*/
|
||||
public function getConfig($site_id = 0, $app_module = 'shop')
|
||||
{
|
||||
$config = new ConfigModel();
|
||||
$res = $config->getConfig([['site_id', '=', $site_id], ['app_module', '=', $app_module], ['config_key', '=', 'AIKEFU_CONFIG']]);
|
||||
return $res;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取智能客服配置信息
|
||||
* @param array $condition
|
||||
* @param string $field
|
||||
* @return array
|
||||
*/
|
||||
public function getConfigInfo($condition = [], $field = '*')
|
||||
{
|
||||
// 兼容旧的调用方式
|
||||
$site_id = $condition[0][1] ?? 0;
|
||||
$res = $this->getConfig($site_id);
|
||||
return $res;
|
||||
}
|
||||
}
|
||||
192
src/addon/aikefu/model/Conversation.php
Normal file
192
src/addon/aikefu/model/Conversation.php
Normal file
@@ -0,0 +1,192 @@
|
||||
<?php
|
||||
|
||||
namespace addon\aikefu\model;
|
||||
|
||||
use think\Model;
|
||||
|
||||
class Conversation extends Model
|
||||
{
|
||||
/**
|
||||
* 操作成功返回值函数
|
||||
* @param string $data
|
||||
* @param string $code_var
|
||||
* @return array
|
||||
*/
|
||||
public function success($data = '', $code_var = 'SUCCESS')
|
||||
{
|
||||
$lang_array = $this->getLang();
|
||||
$lang_var = $lang_array[$code_var] ?? $code_var;
|
||||
|
||||
if ($code_var == 'SUCCESS') {
|
||||
$code_var = 0;
|
||||
} else {
|
||||
$code_array = array_keys($lang_array);
|
||||
$code_index = array_search($code_var, $code_array);
|
||||
if ($code_index != false) {
|
||||
$code_var = 10000 + $code_index;
|
||||
}
|
||||
}
|
||||
|
||||
return success($code_var, $lang_var, $data);
|
||||
}
|
||||
|
||||
/**
|
||||
* 操作失败返回值函数
|
||||
* @param string $data
|
||||
* @param string $code_var
|
||||
* @return array
|
||||
*/
|
||||
public function error($data = '', $code_var = 'FAIL')
|
||||
{
|
||||
$lang_array = $this->getLang();
|
||||
|
||||
if (isset($lang_array[$code_var])) {
|
||||
$lang_var = $lang_array[$code_var];
|
||||
} else {
|
||||
$lang_var = $code_var;
|
||||
$code_var = 'FAIL';
|
||||
}
|
||||
$code_array = array_keys($lang_array);
|
||||
$code_index = array_search($code_var, $code_array);
|
||||
if ($code_index != false) {
|
||||
$code_var = -10000 - $code_index;
|
||||
}
|
||||
return error($code_var, $lang_var, $data);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取语言包数组
|
||||
* @return Ambigous <multitype:, unknown>
|
||||
*/
|
||||
public function getLang()
|
||||
{
|
||||
$default_lang = config("lang.default_lang");
|
||||
$cache_common = \think\facade\Cache::get("lang_app/lang/" . $default_lang . '/model.php');
|
||||
if (empty($cache_common)) {
|
||||
$cache_common = include 'app/lang/' . $default_lang . '/model.php';
|
||||
\think\facade\Cache::tag("lang")->set("lang_app/lang/" . $default_lang, $cache_common);
|
||||
}
|
||||
$lang_path = $this->lang ?? '';
|
||||
if (!empty($lang_path)) {
|
||||
$cache_path = \think\facade\Cache::get("lang_" . $lang_path . "/" . $default_lang . '/model.php');
|
||||
if (empty($cache_path)) {
|
||||
$cache_path = include $lang_path . "/" . $default_lang . '/model.php';
|
||||
\think\facade\Cache::tag("lang")->set("lang_" . $lang_path . "/" . $default_lang, $cache_path);
|
||||
}
|
||||
$lang = array_merge($cache_common, $cache_path);
|
||||
} else {
|
||||
$lang = $cache_common;
|
||||
}
|
||||
return $lang;
|
||||
}
|
||||
|
||||
/**
|
||||
* 表名
|
||||
* @var string
|
||||
*/
|
||||
protected $name = 'aikefu_conversation';
|
||||
|
||||
/**
|
||||
* 主键
|
||||
* @var string
|
||||
*/
|
||||
protected $pk = 'id';
|
||||
|
||||
/**
|
||||
* 获取会话信息
|
||||
* @param array $condition
|
||||
* @param string $field
|
||||
* @return array
|
||||
*/
|
||||
public function getConversationInfo($condition = [], $field = '*')
|
||||
{
|
||||
$info = $this->where($condition)->field($field)->find();
|
||||
return empty($info) ? [] : $info->toArray();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取会话列表
|
||||
* @param array $condition
|
||||
* @param string $field
|
||||
* @param string $order
|
||||
* @param int $page
|
||||
* @param int $limit
|
||||
* @return array
|
||||
*/
|
||||
public function getConversationList($condition = [], $field = '*', $order = 'id desc', $page = 1, $limit = 10)
|
||||
{
|
||||
$list = $this->where($condition)->field($field)->order($order)->paginate([
|
||||
'page' => $page,
|
||||
'list_rows' => $limit
|
||||
]);
|
||||
return $this->pageFormat($list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页数据格式化
|
||||
* @param \think\Paginator $paginator
|
||||
* @return array
|
||||
*/
|
||||
protected function pageFormat($paginator)
|
||||
{
|
||||
return [
|
||||
'data' => $paginator->items(),
|
||||
'total' => $paginator->total(),
|
||||
'per_page' => $paginator->listRows(),
|
||||
'current_page' => $paginator->currentPage(),
|
||||
'last_page' => $paginator->lastPage()
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加会话
|
||||
* @param array $data
|
||||
* @return array
|
||||
*/
|
||||
public function addConversation($data)
|
||||
{
|
||||
$result = $this->insert($data);
|
||||
return $this->success(['result' => $result]);
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新会话
|
||||
* @param array $data
|
||||
* @param array $condition
|
||||
* @return array
|
||||
*/
|
||||
public function updateConversation($data, $condition)
|
||||
{
|
||||
$result = $this->where($condition)->update($data);
|
||||
return $this->success(['result' => $result]);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除会话
|
||||
* @param array $condition
|
||||
* @return array
|
||||
*/
|
||||
public function deleteConversation($condition)
|
||||
{
|
||||
$result = $this->where($condition)->delete();
|
||||
return $this->success(['result' => $result]);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取用户会话列表
|
||||
* @param int $site_id
|
||||
* @param string $user_id
|
||||
* @param int $page
|
||||
* @param int $limit
|
||||
* @return array
|
||||
*/
|
||||
public function getUserConversationList($site_id, $user_id, $page = 1, $limit = 10)
|
||||
{
|
||||
$condition = [
|
||||
['site_id', '=', $site_id],
|
||||
['user_id', '=', $user_id]
|
||||
];
|
||||
|
||||
return $this->getConversationList($condition, '*', 'update_time desc', $page, $limit);
|
||||
}
|
||||
}
|
||||
208
src/addon/aikefu/model/Message.php
Normal file
208
src/addon/aikefu/model/Message.php
Normal file
@@ -0,0 +1,208 @@
|
||||
<?php
|
||||
|
||||
namespace addon\aikefu\model;
|
||||
|
||||
use think\Model;
|
||||
|
||||
class Message extends Model
|
||||
{
|
||||
/**
|
||||
* 操作成功返回值函数
|
||||
* @param string $data
|
||||
* @param string $code_var
|
||||
* @return array
|
||||
*/
|
||||
public function success($data = '', $code_var = 'SUCCESS')
|
||||
{
|
||||
$lang_array = $this->getLang();
|
||||
$lang_var = $lang_array[$code_var] ?? $code_var;
|
||||
|
||||
if ($code_var == 'SUCCESS') {
|
||||
$code_var = 0;
|
||||
} else {
|
||||
$code_array = array_keys($lang_array);
|
||||
$code_index = array_search($code_var, $code_array);
|
||||
if ($code_index != false) {
|
||||
$code_var = 10000 + $code_index;
|
||||
}
|
||||
}
|
||||
|
||||
return success($code_var, $lang_var, $data);
|
||||
}
|
||||
|
||||
/**
|
||||
* 操作失败返回值函数
|
||||
* @param string $data
|
||||
* @param string $code_var
|
||||
* @return array
|
||||
*/
|
||||
public function error($data = '', $code_var = 'FAIL')
|
||||
{
|
||||
$lang_array = $this->getLang();
|
||||
|
||||
if (isset($lang_array[$code_var])) {
|
||||
$lang_var = $lang_array[$code_var];
|
||||
} else {
|
||||
$lang_var = $code_var;
|
||||
$code_var = 'FAIL';
|
||||
}
|
||||
$code_array = array_keys($lang_array);
|
||||
$code_index = array_search($code_var, $code_array);
|
||||
if ($code_index != false) {
|
||||
$code_var = -10000 - $code_index;
|
||||
}
|
||||
return error($code_var, $lang_var, $data);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取语言包数组
|
||||
* @return Ambigous <multitype:, unknown>
|
||||
*/
|
||||
public function getLang()
|
||||
{
|
||||
$default_lang = config("lang.default_lang");
|
||||
$cache_common = \think\facade\Cache::get("lang_app/lang/" . $default_lang . '/model.php');
|
||||
if (empty($cache_common)) {
|
||||
$cache_common = include 'app/lang/' . $default_lang . '/model.php';
|
||||
\think\facade\Cache::tag("lang")->set("lang_app/lang/" . $default_lang, $cache_common);
|
||||
}
|
||||
$lang_path = $this->lang ?? '';
|
||||
if (!empty($lang_path)) {
|
||||
$cache_path = \think\facade\Cache::get("lang_" . $lang_path . "/" . $default_lang . '/model.php');
|
||||
if (empty($cache_path)) {
|
||||
$cache_path = include $lang_path . "/" . $default_lang . '/model.php';
|
||||
\think\facade\Cache::tag("lang")->set("lang_" . $lang_path . "/" . $default_lang, $cache_path);
|
||||
}
|
||||
$lang = array_merge($cache_common, $cache_path);
|
||||
} else {
|
||||
$lang = $cache_common;
|
||||
}
|
||||
return $lang;
|
||||
}
|
||||
|
||||
/**
|
||||
* 表名
|
||||
* @var string
|
||||
*/
|
||||
protected $name = 'aikefu_message';
|
||||
|
||||
/**
|
||||
* 主键
|
||||
* @var string
|
||||
*/
|
||||
protected $pk = 'id';
|
||||
|
||||
/**
|
||||
* 获取消息信息
|
||||
* @param array $condition
|
||||
* @param string $field
|
||||
* @return array
|
||||
*/
|
||||
public function getMessageInfo($condition = [], $field = '*')
|
||||
{
|
||||
$info = $this->where($condition)->field($field)->find();
|
||||
return empty($info) ? [] : $info->toArray();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取消息列表
|
||||
* @param array $condition
|
||||
* @param string $field
|
||||
* @param string $order
|
||||
* @param int $page
|
||||
* @param int $limit
|
||||
* @return array
|
||||
*/
|
||||
public function getMessageList($condition = [], $field = '*', $order = 'id asc', $page = 1, $limit = 20)
|
||||
{
|
||||
$list = $this->where($condition)->field($field)->order($order)->paginate([
|
||||
'page' => $page,
|
||||
'list_rows' => $limit
|
||||
]);
|
||||
return $this->pageFormat($list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页数据格式化
|
||||
* @param \think\Paginator $paginator
|
||||
* @return array
|
||||
*/
|
||||
protected function pageFormat($paginator)
|
||||
{
|
||||
return [
|
||||
'data' => $paginator->items(),
|
||||
'total' => $paginator->total(),
|
||||
'per_page' => $paginator->listRows(),
|
||||
'current_page' => $paginator->currentPage(),
|
||||
'last_page' => $paginator->lastPage()
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加消息
|
||||
* @param array $data
|
||||
* @return array
|
||||
*/
|
||||
public function addMessage($data)
|
||||
{
|
||||
$result = $this->insert($data);
|
||||
return $this->success(['result' => $result]);
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新消息
|
||||
* @param array $data
|
||||
* @param array $condition
|
||||
* @return array
|
||||
*/
|
||||
public function updateMessage($data, $condition)
|
||||
{
|
||||
$result = $this->where($condition)->update($data);
|
||||
return $this->success(['result' => $result]);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除消息
|
||||
* @param array $condition
|
||||
* @return array
|
||||
*/
|
||||
public function deleteMessage($condition)
|
||||
{
|
||||
$result = $this->where($condition)->delete();
|
||||
return $this->success(['result' => $result]);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取会话消息记录
|
||||
* @param int $site_id
|
||||
* @param string $conversation_id
|
||||
* @param int $limit
|
||||
* @param int $offset
|
||||
* @return array
|
||||
*/
|
||||
public function getConversationMessages($site_id, $conversation_id, $limit = 20, $offset = 0)
|
||||
{
|
||||
$condition = [
|
||||
['site_id', '=', $site_id],
|
||||
['conversation_id', '=', $conversation_id]
|
||||
];
|
||||
|
||||
return $this->getMessageList($condition, '*', 'create_time asc', ($offset / $limit) + 1, $limit);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取用户消息总数
|
||||
* @param int $site_id
|
||||
* @param string $user_id
|
||||
* @return array
|
||||
*/
|
||||
public function getUserMessageCount($site_id, $user_id)
|
||||
{
|
||||
$count = $this->where([
|
||||
['site_id', '=', $site_id],
|
||||
['user_id', '=', $user_id]
|
||||
])->count();
|
||||
|
||||
return $this->success(['count' => $count]);
|
||||
}
|
||||
}
|
||||
217
src/addon/aikefu/shop/controller/Kefu.php
Normal file
217
src/addon/aikefu/shop/controller/Kefu.php
Normal file
@@ -0,0 +1,217 @@
|
||||
<?php
|
||||
/**
|
||||
* 智能客服控制器
|
||||
*/
|
||||
|
||||
namespace addon\aikefu\shop\controller;
|
||||
|
||||
use addon\aikefu\model\Config as KefuConfigModel;
|
||||
use addon\aikefu\model\Conversation as KefuConversationModel;
|
||||
use addon\aikefu\model\Message as KefuMessageModel;
|
||||
use app\shop\controller\BaseShop;
|
||||
use think\facade\View;
|
||||
|
||||
/**
|
||||
* 智能客服 控制器
|
||||
*/
|
||||
class Kefu extends BaseShop
|
||||
{
|
||||
/**
|
||||
* 智能客服配置页
|
||||
* @return \think\response\View|\think\response\Json
|
||||
*/
|
||||
public function config()
|
||||
{
|
||||
$kefu_config_model = new KefuConfigModel();
|
||||
|
||||
if (request()->isJson()) {
|
||||
$api_key = input("api_key", "");//Dify API密钥
|
||||
$base_url = input("base_url", "https://api.dify.ai/v1");//API基础地址
|
||||
$chat_endpoint = input("chat_endpoint", "/chat-messages");//聊天接口端点
|
||||
$status = input("status", 0);//状态
|
||||
|
||||
$data = array(
|
||||
"api_key" => $api_key,
|
||||
"base_url" => $base_url,
|
||||
"chat_endpoint" => $chat_endpoint,
|
||||
"status" => $status
|
||||
);
|
||||
$result = $kefu_config_model->setConfig($data, $this->site_id, $this->app_module);
|
||||
return $result;
|
||||
} else {
|
||||
$config_info = $kefu_config_model->getConfig($this->site_id, $this->app_module)['data']['value'] ?? [];
|
||||
$this->assign("config_info", $config_info);
|
||||
return $this->fetch("kefu/config");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 会话管理列表
|
||||
* @return \think\response\View
|
||||
*/
|
||||
public function conversation()
|
||||
{
|
||||
return View::fetch("kefu/conversation");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取会话列表
|
||||
* @return \think\response\Json
|
||||
*/
|
||||
public function getConversationList()
|
||||
{
|
||||
$page = input("page", 1);
|
||||
$limit = input("limit", 10);
|
||||
$user_id = input("user_id", "");
|
||||
$status = input("status", "");
|
||||
|
||||
$kefu_conversation_model = new KefuConversationModel();
|
||||
$condition = [['site_id', '=', $this->site_id]];
|
||||
|
||||
if (!empty($user_id)) {
|
||||
$condition[] = ['user_id', '=', $user_id];
|
||||
}
|
||||
|
||||
if ($status !== '') {
|
||||
$condition[] = ['status', '=', $status];
|
||||
}
|
||||
|
||||
$conversation_list = $kefu_conversation_model->getConversationList($condition, '*', 'update_time desc', $page, $limit);
|
||||
|
||||
return $this->success($conversation_list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取会话信息
|
||||
* @return \think\response\Json
|
||||
*/
|
||||
public function getConversationInfo()
|
||||
{
|
||||
$conversation_id = input("conversation_id", "");
|
||||
|
||||
if (empty($conversation_id)) {
|
||||
return $this->error('会话ID不能为空');
|
||||
}
|
||||
|
||||
$kefu_conversation_model = new KefuConversationModel();
|
||||
$conversation_info = $kefu_conversation_model->getConversationInfo([
|
||||
['site_id', '=', $this->site_id],
|
||||
['conversation_id', '=', $conversation_id]
|
||||
]);
|
||||
|
||||
if (empty($conversation_info)) {
|
||||
return $this->error('会话不存在');
|
||||
}
|
||||
|
||||
return $this->success($conversation_info);
|
||||
}
|
||||
|
||||
/**
|
||||
* 结束会话
|
||||
* @return \think\response\Json
|
||||
*/
|
||||
public function endConversation()
|
||||
{
|
||||
$id = input("id", "");
|
||||
|
||||
if (empty($id)) {
|
||||
return $this->error('会话ID不能为空');
|
||||
}
|
||||
|
||||
$kefu_conversation_model = new KefuConversationModel();
|
||||
$result = $kefu_conversation_model->updateConversation(
|
||||
['status' => 0],
|
||||
[
|
||||
['id', '=', $id],
|
||||
['site_id', '=', $this->site_id]
|
||||
]
|
||||
);
|
||||
|
||||
return $this->success($result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除会话
|
||||
* @return \think\response\Json
|
||||
*/
|
||||
public function deleteConversation()
|
||||
{
|
||||
$id = input("id", "");
|
||||
|
||||
if (empty($id)) {
|
||||
return $this->error('会话ID不能为空');
|
||||
}
|
||||
|
||||
$kefu_conversation_model = new KefuConversationModel();
|
||||
$kefu_message_model = new KefuMessageModel();
|
||||
|
||||
// 开启事务
|
||||
\think\facade\Db::startTrans();
|
||||
|
||||
try {
|
||||
// 删除会话关联的消息
|
||||
$conversation_info = $kefu_conversation_model->getConversationInfo([
|
||||
['id', '=', $id],
|
||||
['site_id', '=', $this->site_id]
|
||||
]);
|
||||
|
||||
if (!empty($conversation_info)) {
|
||||
$kefu_message_model->deleteMessage([
|
||||
['site_id', '=', $this->site_id],
|
||||
['conversation_id', '=', $conversation_info['conversation_id']]
|
||||
]);
|
||||
}
|
||||
|
||||
// 删除会话
|
||||
$result = $kefu_conversation_model->deleteConversation([
|
||||
['id', '=', $id],
|
||||
['site_id', '=', $this->site_id]
|
||||
]);
|
||||
|
||||
// 提交事务
|
||||
\think\facade\Db::commit();
|
||||
|
||||
return $this->success($result);
|
||||
} catch (\Exception $e) {
|
||||
// 回滚事务
|
||||
\think\facade\Db::rollback();
|
||||
return $this->error($e->getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 消息管理列表
|
||||
* @return \think\response\View
|
||||
*/
|
||||
public function message()
|
||||
{
|
||||
$conversation_id = input("conversation_id", "");
|
||||
View::assign("conversation_id", $conversation_id);
|
||||
return View::fetch("kefu/message");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取消息列表
|
||||
* @return \think\response\Json
|
||||
*/
|
||||
public function getMessageList()
|
||||
{
|
||||
$page = input("page", 1);
|
||||
$limit = input("limit", 50);
|
||||
$conversation_id = input("conversation_id", "");
|
||||
|
||||
if (empty($conversation_id)) {
|
||||
return $this->error('会话ID不能为空');
|
||||
}
|
||||
|
||||
$kefu_message_model = new KefuMessageModel();
|
||||
$condition = [
|
||||
['site_id', '=', $this->site_id],
|
||||
['conversation_id', '=', $conversation_id]
|
||||
];
|
||||
|
||||
$message_list = $kefu_message_model->getMessageList($condition, '*', 'create_time asc', $page, $limit);
|
||||
|
||||
return $this->success($message_list);
|
||||
}
|
||||
}
|
||||
104
src/addon/aikefu/shop/view/kefu/config.html
Normal file
104
src/addon/aikefu/shop/view/kefu/config.html
Normal file
@@ -0,0 +1,104 @@
|
||||
<style>
|
||||
.word-aux {
|
||||
margin-left: 110px;
|
||||
color: #999;
|
||||
font-size: 12px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
.required {
|
||||
color: red;
|
||||
}
|
||||
</style>
|
||||
|
||||
<div class="layui-form form-wrap">
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label"><span class="required">*</span>Dify API密钥:</label>
|
||||
<div class="layui-input-block">
|
||||
<input type="text" name="api_key" placeholder="请输入Dify API密钥" value="{$config_info.api_key ?? ''}" class="layui-input">
|
||||
</div>
|
||||
<div class="word-aux">
|
||||
从Dify平台获取的API密钥,用于调用Dify聊天机器人API。
|
||||
<a href="https://dify.ai/" target="_blank">前往Dify平台</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">API基础地址:</label>
|
||||
<div class="layui-input-block">
|
||||
<input type="text" name="base_url" placeholder="请输入Dify API基础地址" value="{$config_info.base_url ?? 'https://api.dify.ai/v1'}" class="layui-input">
|
||||
</div>
|
||||
<div class="word-aux">Dify API的基础地址,默认为https://api.dify.ai/v1</div>
|
||||
</div>
|
||||
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">聊天接口端点:</label>
|
||||
<div class="layui-input-block">
|
||||
<input type="text" name="chat_endpoint" placeholder="请输入聊天接口端点" value="{$config_info.chat_endpoint ?? '/chat-messages'}" class="layui-input">
|
||||
</div>
|
||||
<div class="word-aux">聊天接口的端点,默认为/chat-messages</div>
|
||||
</div>
|
||||
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label"><span class="required">*</span>状态:</label>
|
||||
<div class="layui-input-block">
|
||||
<input type="checkbox" name="status" value="1" lay-skin="switch" {if condition="isset($config_info.status) && $config_info.status == 1"} checked {/if}>
|
||||
</div>
|
||||
<div class="word-aux">启用或禁用智能客服功能</div>
|
||||
</div>
|
||||
|
||||
<div class="form-row">
|
||||
<button class="layui-btn" lay-submit lay-filter="save">保存</button>
|
||||
<button class="layui-btn layui-btn-primary" onclick="back()">返回</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
layui.use('form', function() {
|
||||
var form = layui.form;
|
||||
var repeat_flag = false; //防重复标识
|
||||
form.render();
|
||||
|
||||
/**
|
||||
* 监听提交
|
||||
*/
|
||||
form.on('submit(save)', function(data) {
|
||||
if (repeat_flag) return false;
|
||||
repeat_flag = true;
|
||||
|
||||
$.ajax({
|
||||
url: ns.url("aikefu://shop/kefu/config"),
|
||||
type: 'POST',
|
||||
data: data.field,
|
||||
dataType: 'json',
|
||||
success: function(res) {
|
||||
repeat_flag = false;
|
||||
if (res.code === 0) {
|
||||
layer.confirm('保存成功', {
|
||||
title: '操作提示',
|
||||
btn: ['返回列表', '继续编辑'],
|
||||
yes: function(index, layero) {
|
||||
location.reload();
|
||||
layer.close(index);
|
||||
},
|
||||
btn2: function(index, layero) {
|
||||
layer.close(index);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
layer.msg(res.message, {icon: 2});
|
||||
}
|
||||
},
|
||||
error: function() {
|
||||
repeat_flag = false;
|
||||
layer.msg('请求失败,请稍后重试', {icon: 2});
|
||||
}
|
||||
});
|
||||
|
||||
return false;
|
||||
});
|
||||
});
|
||||
|
||||
function back() {
|
||||
window.history.back();
|
||||
}
|
||||
</script>
|
||||
214
src/addon/aikefu/shop/view/kefu/conversation.html
Normal file
214
src/addon/aikefu/shop/view/kefu/conversation.html
Normal file
@@ -0,0 +1,214 @@
|
||||
<style>
|
||||
.search-box {
|
||||
padding: 10px 0;
|
||||
border-bottom: 1px solid #eee;
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
.search-item {
|
||||
display: inline-block;
|
||||
margin-right: 15px;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.search-item label {
|
||||
display: inline-block;
|
||||
width: 80px;
|
||||
text-align: right;
|
||||
margin-right: 10px;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.search-item input,
|
||||
.search-item select {
|
||||
width: 150px;
|
||||
display: inline-block;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.layui-btn-container {
|
||||
margin-bottom: 15px;
|
||||
text-align: right;
|
||||
}
|
||||
.layui-btn-sm {
|
||||
margin-left: 5px;
|
||||
}
|
||||
.status-active {
|
||||
color: #52c41a;
|
||||
}
|
||||
.status-inactive {
|
||||
color: #faad14;
|
||||
}
|
||||
</style>
|
||||
|
||||
<div class="layui-card-body">
|
||||
<!-- 搜索区域 -->
|
||||
<div class="search-box">
|
||||
<form class="layui-form" id="searchForm">
|
||||
<div class="search-item">
|
||||
<label for="user_id">用户ID</label>
|
||||
<input type="text" name="user_id" id="user_id" placeholder="请输入用户ID" class="layui-input">
|
||||
</div>
|
||||
<div class="search-item">
|
||||
<label for="status">状态</label>
|
||||
<select name="status" id="status" class="layui-select">
|
||||
<option value="">全部</option>
|
||||
<option value="1">活跃</option>
|
||||
<option value="0">已结束</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="search-item">
|
||||
<button type="button" class="layui-btn layui-btn-primary" id="searchBtn">搜索</button>
|
||||
<button type="button" class="layui-btn layui-btn-primary" id="resetBtn">重置</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<!-- 表格区域 -->
|
||||
<table class="layui-table" id="conversationTable" lay-filter="conversationTable"></table>
|
||||
</div>
|
||||
|
||||
<script type="text/html" id="toolbarDemo">
|
||||
<div class="layui-btn-container">
|
||||
<!-- 可以在这里添加按钮 -->
|
||||
</div>
|
||||
</script>
|
||||
|
||||
<script type="text/html" id="statusTpl">
|
||||
{{# if(d.status === 1) {
|
||||
return '<span class="status-active">活跃</span>';
|
||||
} else {
|
||||
return '<span class="status-inactive">已结束</span>';
|
||||
}}}
|
||||
</script>
|
||||
|
||||
<script type="text/html" id="barDemo">
|
||||
<a class="layui-btn layui-btn-xs" lay-event="view">查看消息</a>
|
||||
<a class="layui-btn layui-btn-xs layui-btn-warning" lay-event="end">结束会话</a>
|
||||
<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="delete">删除</a>
|
||||
</script>
|
||||
|
||||
<script>
|
||||
layui.use(['table', 'form', 'layer'], function() {
|
||||
var table = layui.table;
|
||||
var form = layui.form;
|
||||
var layer = layui.layer;
|
||||
|
||||
// 渲染表格
|
||||
var tableIns = table.render({
|
||||
elem: '#conversationTable',
|
||||
url: ns.url("aikefu://shop/kefu/getConversationList"),
|
||||
method: 'POST',
|
||||
toolbar: '#toolbarDemo',
|
||||
defaultToolbar: ['filter', 'exports', 'print'],
|
||||
title: '会话管理',
|
||||
cols: [[
|
||||
{field: 'id', title: 'ID', width: 80, align: 'center', fixed: 'left'},
|
||||
{field: 'conversation_id', title: '会话ID', width: 200, align: 'center'},
|
||||
{field: 'user_id', title: '用户ID', width: 150, align: 'center'},
|
||||
{field: 'name', title: '会话名称', width: 180, align: 'center'},
|
||||
{field: 'status', title: '状态', width: 100, align: 'center', templet: '#statusTpl'},
|
||||
{field: 'create_time', title: '创建时间', width: 180, align: 'center'},
|
||||
{field: 'update_time', title: '更新时间', width: 180, align: 'center'},
|
||||
{fixed: 'right', title: '操作', width: 200, align: 'center', toolbar: '#barDemo'}
|
||||
]],
|
||||
page: true,
|
||||
limit: 10,
|
||||
limits: [10, 20, 30, 50, 100],
|
||||
height: 'full-200',
|
||||
text: {
|
||||
none: '暂无会话数据'
|
||||
}
|
||||
});
|
||||
|
||||
// 搜索按钮点击事件
|
||||
$('#searchBtn').click(function() {
|
||||
// 执行搜索
|
||||
tableIns.reload({
|
||||
page: {
|
||||
curr: 1
|
||||
},
|
||||
where: {
|
||||
user_id: $('#user_id').val(),
|
||||
status: $('#status').val()
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
// 重置按钮点击事件
|
||||
$('#resetBtn').click(function() {
|
||||
$('#user_id').val('');
|
||||
$('#status').val('');
|
||||
form.render('select');
|
||||
|
||||
// 执行重置后的搜索
|
||||
tableIns.reload({
|
||||
page: {
|
||||
curr: 1
|
||||
},
|
||||
where: {
|
||||
user_id: '',
|
||||
status: ''
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
// 监听行工具事件
|
||||
table.on('tool(conversationTable)', function(obj) {
|
||||
var data = obj.data;
|
||||
var layEvent = obj.event;
|
||||
|
||||
if (layEvent === 'view') {
|
||||
// 查看消息
|
||||
layer.open({
|
||||
type: 2,
|
||||
title: '消息记录',
|
||||
content: ns.url("aikefu://shop/kefu/message", {conversation_id: data.conversation_id}),
|
||||
area: ['90%', '90%']
|
||||
});
|
||||
} else if (layEvent === 'end') {
|
||||
// 结束会话
|
||||
layer.confirm('确定要结束该会话吗?', function(index) {
|
||||
$.ajax({
|
||||
url: ns.url("aikefu://shop/kefu/endConversation"),
|
||||
type: 'POST',
|
||||
data: {id: data.id},
|
||||
dataType: 'json',
|
||||
success: function(res) {
|
||||
if (res.code === 0) {
|
||||
layer.msg('会话已结束', {icon: 1});
|
||||
// 重新加载表格数据
|
||||
tableIns.reload();
|
||||
} else {
|
||||
layer.msg('操作失败:' + res.message, {icon: 2});
|
||||
}
|
||||
},
|
||||
error: function() {
|
||||
layer.msg('请求失败,请稍后重试', {icon: 2});
|
||||
}
|
||||
});
|
||||
layer.close(index);
|
||||
});
|
||||
} else if (layEvent === 'delete') {
|
||||
// 删除会话
|
||||
layer.confirm('确定要删除该会话吗?删除后将无法恢复', function(index) {
|
||||
$.ajax({
|
||||
url: ns.url("aikefu://shop/kefu/deleteConversation"),
|
||||
type: 'POST',
|
||||
data: {id: data.id},
|
||||
dataType: 'json',
|
||||
success: function(res) {
|
||||
if (res.code === 0) {
|
||||
layer.msg('会话已删除', {icon: 1});
|
||||
// 重新加载表格数据
|
||||
tableIns.reload();
|
||||
} else {
|
||||
layer.msg('操作失败:' + res.message, {icon: 2});
|
||||
}
|
||||
},
|
||||
error: function() {
|
||||
layer.msg('请求失败,请稍后重试', {icon: 2});
|
||||
}
|
||||
});
|
||||
layer.close(index);
|
||||
});
|
||||
}
|
||||
});
|
||||
});
|
||||
</script>
|
||||
274
src/addon/aikefu/shop/view/kefu/message.html
Normal file
274
src/addon/aikefu/shop/view/kefu/message.html
Normal file
@@ -0,0 +1,274 @@
|
||||
<style>
|
||||
.message-list {
|
||||
max-height: 600px;
|
||||
overflow-y: auto;
|
||||
padding: 20px;
|
||||
background-color: #f5f7fa;
|
||||
border-radius: 8px;
|
||||
margin-bottom: 20px;
|
||||
border: 1px solid #e6e6e6;
|
||||
}
|
||||
.message-item {
|
||||
margin-bottom: 20px;
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
}
|
||||
.message-item.user {
|
||||
justify-content: flex-end;
|
||||
}
|
||||
.message-item.assistant {
|
||||
justify-content: flex-start;
|
||||
}
|
||||
.message-avatar {
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
border-radius: 50%;
|
||||
margin: 0 10px;
|
||||
}
|
||||
.message-content {
|
||||
max-width: 70%;
|
||||
padding: 12px 16px;
|
||||
border-radius: 18px;
|
||||
word-wrap: break-word;
|
||||
line-height: 1.5;
|
||||
}
|
||||
.message-item.user .message-content {
|
||||
background-color: #1E9FFF;
|
||||
color: white;
|
||||
border-bottom-right-radius: 4px;
|
||||
}
|
||||
.message-item.assistant .message-content {
|
||||
background-color: white;
|
||||
color: #333;
|
||||
border-bottom-left-radius: 4px;
|
||||
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
.message-time {
|
||||
font-size: 12px;
|
||||
color: #909399;
|
||||
margin-top: 5px;
|
||||
text-align: center;
|
||||
}
|
||||
.message-role {
|
||||
font-size: 12px;
|
||||
color: #909399;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
.conversation-info {
|
||||
margin-bottom: 20px;
|
||||
padding: 15px;
|
||||
background-color: white;
|
||||
border-radius: 8px;
|
||||
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
|
||||
border: 1px solid #e6e6e6;
|
||||
}
|
||||
.conversation-info h3 {
|
||||
margin: 0 0 10px 0;
|
||||
font-size: 16px;
|
||||
color: #333;
|
||||
font-weight: bold;
|
||||
}
|
||||
.conversation-info p {
|
||||
margin: 5px 0;
|
||||
font-size: 14px;
|
||||
color: #606266;
|
||||
}
|
||||
.status-active {
|
||||
color: #52c41a;
|
||||
}
|
||||
.status-inactive {
|
||||
color: #faad14;
|
||||
}
|
||||
.search-box {
|
||||
margin-bottom: 20px;
|
||||
padding: 15px;
|
||||
background-color: white;
|
||||
border-radius: 8px;
|
||||
border: 1px solid #e6e6e6;
|
||||
}
|
||||
.search-item {
|
||||
margin-right: 15px;
|
||||
}
|
||||
.search-item label {
|
||||
display: inline-block;
|
||||
width: 80px;
|
||||
text-align: right;
|
||||
margin-right: 10px;
|
||||
}
|
||||
.layui-btn-sm {
|
||||
margin-left: 5px;
|
||||
}
|
||||
</style>
|
||||
|
||||
<div class="layui-card-body">
|
||||
<!-- 搜索区域 -->
|
||||
<div class="search-box">
|
||||
<form class="layui-form" id="searchForm">
|
||||
<div class="search-item">
|
||||
<label for="conversation_id">会话ID</label>
|
||||
<input type="text" name="conversation_id" id="conversation_id" placeholder="请输入会话ID" value="{$conversation_id ?? ''}" class="layui-input" style="width: 200px; display: inline-block;">
|
||||
</div>
|
||||
<div class="search-item">
|
||||
<button type="button" class="layui-btn layui-btn-primary" id="searchBtn">搜索</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<!-- 会话信息 -->
|
||||
<div id="conversationInfo" class="conversation-info">
|
||||
<!-- 会话信息将通过JavaScript动态加载 -->
|
||||
</div>
|
||||
|
||||
<!-- 消息列表 -->
|
||||
<div class="message-list" id="messageList">
|
||||
<!-- 消息列表将通过JavaScript动态加载 -->
|
||||
</div>
|
||||
|
||||
<!-- 分页 -->
|
||||
<div class="layui-fixbar" id="pagination"></div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
layui.use(['laypage', 'layer'], function() {
|
||||
var laypage = layui.laypage;
|
||||
var layer = layui.layer;
|
||||
|
||||
// 分页参数
|
||||
var page = 1;
|
||||
var limit = 50;
|
||||
var total = 0;
|
||||
var conversation_id = $('#conversation_id').val();
|
||||
|
||||
// 加载会话信息
|
||||
function loadConversationInfo() {
|
||||
if (!conversation_id) {
|
||||
$('#conversationInfo').html('<h3>会话详情</h3><p>请输入会话ID进行搜索</p>');
|
||||
return;
|
||||
}
|
||||
|
||||
$.ajax({
|
||||
url: ns.url("aikefu://shop/kefu/getConversationInfo"),
|
||||
type: 'POST',
|
||||
data: {
|
||||
conversation_id: conversation_id
|
||||
},
|
||||
dataType: 'json',
|
||||
success: function(res) {
|
||||
if (res.code === 0) {
|
||||
var info = res.data;
|
||||
var html = '<h3>会话详情</h3>';
|
||||
html += '<p><strong>会话ID:</strong>' + info.conversation_id + '</p>';
|
||||
html += '<p><strong>用户ID:</strong>' + info.user_id + '</p>';
|
||||
html += '<p><strong>会话名称:</strong>' + info.name + '</p>';
|
||||
html += '<p><strong>状态:</strong>' + (info.status === 1 ? '<span class="status-active">活跃</span>' : '<span class="status-inactive">已结束</span>') + '</p>';
|
||||
html += '<p><strong>创建时间:</strong>' + info.create_time + '</p>';
|
||||
html += '<p><strong>更新时间:</strong>' + info.update_time + '</p>';
|
||||
$('#conversationInfo').html(html);
|
||||
} else {
|
||||
$('#conversationInfo').html('<h3>会话详情</h3><p>未找到会话信息</p>');
|
||||
}
|
||||
},
|
||||
error: function() {
|
||||
$('#conversationInfo').html('<h3>会话详情</h3><p>加载会话信息失败</p>');
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// 加载消息列表
|
||||
function loadMessageList() {
|
||||
if (!conversation_id) {
|
||||
$('#messageList').html('<div style="text-align: center; padding: 50px; color: #999;">请输入会话ID进行搜索</div>');
|
||||
return;
|
||||
}
|
||||
|
||||
$.ajax({
|
||||
url: ns.url("aikefu://shop/kefu/getMessageList"),
|
||||
type: 'POST',
|
||||
data: {
|
||||
page: page,
|
||||
limit: limit,
|
||||
conversation_id: conversation_id
|
||||
},
|
||||
dataType: 'json',
|
||||
success: function(res) {
|
||||
if (res.code === 0) {
|
||||
var list = res.data.list;
|
||||
total = res.data.total;
|
||||
|
||||
var html = '';
|
||||
if (list.length > 0) {
|
||||
list.forEach(function(item) {
|
||||
var role = item.role === 'user' ? '用户' : '机器人';
|
||||
var roleClass = item.role === 'user' ? 'user' : 'assistant';
|
||||
var avatar = item.role === 'user' ? '/__STATIC__/admin/img/user.png' : '/__STATIC__/admin/img/robot.png';
|
||||
|
||||
html += '<div class="message-item ' + roleClass + '">';
|
||||
if (item.role === 'assistant') {
|
||||
html += '<img src="' + avatar + '" class="message-avatar">';
|
||||
}
|
||||
html += '<div>';
|
||||
html += '<div class="message-role">' + role + '</div>';
|
||||
html += '<div class="message-content">' + item.content + '</div>';
|
||||
html += '<div class="message-time">' + item.create_time + '</div>';
|
||||
html += '</div>';
|
||||
if (item.role === 'user') {
|
||||
html += '<img src="' + avatar + '" class="message-avatar">';
|
||||
}
|
||||
html += '</div>';
|
||||
});
|
||||
} else {
|
||||
html += '<div style="text-align: center; padding: 50px; color: #999;">暂无消息记录</div>';
|
||||
}
|
||||
|
||||
$('#messageList').html(html);
|
||||
// 滚动到底部
|
||||
$('#messageList').scrollTop($('#messageList')[0].scrollHeight);
|
||||
// 渲染分页
|
||||
renderPagination();
|
||||
} else {
|
||||
layer.msg('加载失败:' + res.message, {icon: 2});
|
||||
}
|
||||
},
|
||||
error: function() {
|
||||
layer.msg('请求失败,请稍后重试', {icon: 2});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// 渲染分页
|
||||
function renderPagination() {
|
||||
if (total <= limit) {
|
||||
$('#pagination').html('');
|
||||
return;
|
||||
}
|
||||
|
||||
laypage.render({
|
||||
elem: 'pagination',
|
||||
count: total,
|
||||
limit: limit,
|
||||
curr: page,
|
||||
layout: ['prev', 'page', 'next', 'count', 'skip'],
|
||||
jump: function(obj, first) {
|
||||
if (!first) {
|
||||
page = obj.curr;
|
||||
loadMessageList();
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// 搜索按钮点击事件
|
||||
$('#searchBtn').click(function() {
|
||||
conversation_id = $('#conversation_id').val();
|
||||
page = 1;
|
||||
loadConversationInfo();
|
||||
loadMessageList();
|
||||
});
|
||||
|
||||
// 初始化加载
|
||||
if (conversation_id) {
|
||||
loadConversationInfo();
|
||||
loadMessageList();
|
||||
}
|
||||
});
|
||||
</script>
|
||||
@@ -1,12 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
return [
|
||||
|
||||
// 自定义模板页面类型,格式:[ 'title' => '页面类型名称', 'name' => '页面标识', 'path' => '页面路径', 'value' => '页面数据,json格式' ]
|
||||
|
||||
@@ -1,13 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
return [
|
||||
'name' => 'alioss',
|
||||
'title' => '阿里云OSS',
|
||||
|
||||
@@ -1,12 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
|
||||
namespace addon\alioss\event;
|
||||
|
||||
@@ -1,12 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
|
||||
namespace addon\alioss\event;
|
||||
|
||||
@@ -1,12 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
|
||||
namespace addon\alioss\event;
|
||||
|
||||
@@ -1,12 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
|
||||
namespace addon\alioss\event;
|
||||
|
||||
@@ -1,12 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
|
||||
namespace addon\alioss\event;
|
||||
|
||||
@@ -1,13 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
|
||||
namespace addon\alioss\event;
|
||||
|
||||
@@ -1,12 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
namespace addon\alioss\model;
|
||||
|
||||
|
||||
@@ -1,12 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
namespace addon\alioss\model;
|
||||
|
||||
|
||||
@@ -1,12 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
namespace addon\alioss\shop\controller;
|
||||
|
||||
|
||||
@@ -1,12 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
return [
|
||||
|
||||
// 自定义模板页面类型,格式:[ 'title' => '页面类型名称', 'name' => '页面标识', 'path' => '页面路径', 'value' => '页面数据,json格式' ]
|
||||
|
||||
@@ -1,12 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
return [
|
||||
'bind' => [
|
||||
|
||||
|
||||
@@ -1,13 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
return [
|
||||
'name' => 'alipay',
|
||||
'title' => '支付宝支付',
|
||||
|
||||
@@ -1,12 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
return [
|
||||
[
|
||||
'name' => 'ALI_PAY_CONFIG',
|
||||
|
||||
@@ -1,13 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
|
||||
namespace addon\alipay\event;
|
||||
|
||||
@@ -1,12 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
namespace addon\alipay\event;
|
||||
|
||||
|
||||
@@ -1,12 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
namespace addon\alipay\event;
|
||||
|
||||
@@ -24,7 +16,7 @@ class PayClose
|
||||
*/
|
||||
public function handle($params)
|
||||
{
|
||||
// if ($params["pay_type"] == "alipay") {
|
||||
if ($params["pay_type"] == "alipay") {
|
||||
try {
|
||||
$pay_model = new PayModel($params[ 'site_id' ]);
|
||||
$result = $pay_model->close($params);
|
||||
@@ -34,6 +26,6 @@ class PayClose
|
||||
} catch (\Throwable $e) {
|
||||
return error(-1, $e->getMessage());
|
||||
}
|
||||
// }
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,12 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
namespace addon\alipay\event;
|
||||
|
||||
@@ -21,8 +13,10 @@ class PayNotify
|
||||
/**
|
||||
* 支付方式及配置
|
||||
*/
|
||||
public function handle()
|
||||
public function handle($param)
|
||||
{
|
||||
if ($param[ "pay_type" ] != "alipay") return false;
|
||||
|
||||
if (isset($_POST[ 'out_trade_no' ])) {
|
||||
$out_trade_no = $_POST[ 'out_trade_no' ];
|
||||
$pay = new PayCommon();
|
||||
|
||||
@@ -1,12 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
namespace addon\alipay\event;
|
||||
|
||||
|
||||
@@ -1,12 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
namespace addon\alipay\event;
|
||||
|
||||
|
||||
@@ -1,12 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
namespace addon\alipay\event;
|
||||
|
||||
|
||||
@@ -1,12 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
namespace addon\alipay\event;
|
||||
|
||||
|
||||
@@ -1,12 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
namespace addon\alipay\event;
|
||||
|
||||
|
||||
@@ -1,13 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
namespace addon\alipay\event;
|
||||
|
||||
|
||||
@@ -1,12 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
namespace addon\alipay\model;
|
||||
|
||||
|
||||
@@ -1,12 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
namespace addon\alipay\model;
|
||||
|
||||
|
||||
@@ -1,12 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
namespace addon\alipay\shop\controller;
|
||||
|
||||
|
||||
@@ -1,12 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
return [
|
||||
|
||||
|
||||
@@ -1,13 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
return [
|
||||
'name' => 'cases',
|
||||
'title' => '案例展示',
|
||||
|
||||
@@ -1,12 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
namespace addon\cases\event;
|
||||
|
||||
|
||||
@@ -1,13 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
namespace addon\cases\event;
|
||||
|
||||
|
||||
@@ -1,12 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
namespace addon\coupon\api\controller;
|
||||
|
||||
|
||||
@@ -1,12 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
return [
|
||||
|
||||
// 自定义模板页面类型,格式:[ 'title' => '页面类型名称', 'name' => '页面标识', 'path' => '页面路径', 'value' => '页面数据,json格式' ]
|
||||
|
||||
@@ -1,13 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
return [
|
||||
'name' => 'coupon',
|
||||
'title' => '优惠券',
|
||||
|
||||
@@ -1,14 +1,5 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
namespace addon\coupon\dict;
|
||||
|
||||
|
||||
|
||||
@@ -1,12 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
namespace addon\coupon\event;
|
||||
|
||||
|
||||
@@ -1,12 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
namespace addon\coupon\event;
|
||||
|
||||
|
||||
@@ -1,13 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
namespace addon\coupon\event;
|
||||
|
||||
|
||||
@@ -1,12 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
namespace addon\coupon\event;
|
||||
|
||||
|
||||
@@ -1,13 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
namespace addon\coupon\event;
|
||||
|
||||
|
||||
@@ -1,12 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
namespace addon\coupon\model;
|
||||
|
||||
|
||||
@@ -1,12 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
namespace addon\coupon\model;
|
||||
|
||||
|
||||
@@ -1,12 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
namespace addon\coupon\model;
|
||||
|
||||
|
||||
@@ -1,12 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
namespace addon\coupon\model;
|
||||
|
||||
|
||||
@@ -1,14 +1,5 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
namespace addon\coupon\model\share;
|
||||
|
||||
use app\model\share\WchatShareBase as BaseModel;
|
||||
|
||||
@@ -1,14 +1,5 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
namespace addon\coupon\model\share;
|
||||
|
||||
use app\model\share\WeappShareBase;
|
||||
|
||||
@@ -1,12 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
namespace addon\coupon\shopapi\controller;
|
||||
|
||||
|
||||
@@ -1,12 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
return [
|
||||
|
||||
|
||||
@@ -1,13 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
return [
|
||||
'name' => 'diy_default1',
|
||||
'title' => '官方模板一',
|
||||
|
||||
@@ -1,13 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
|
||||
namespace addon\diy_default1\event;
|
||||
|
||||
@@ -1,12 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
|
||||
namespace addon\diy_default1\event;
|
||||
|
||||
@@ -1,12 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
return [
|
||||
|
||||
// 自定义模板页面类型,格式:[ 'title' => '页面类型名称', 'name' => '页面标识', 'path' => '页面路径', 'value' => '页面数据,json格式' ]
|
||||
|
||||
@@ -1,13 +1,4 @@
|
||||
<?php
|
||||
/**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
return [
|
||||
'name' => 'diy_default2',
|
||||
'title' => '官方模板二',
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user