This commit is contained in:
@@ -40,8 +40,4 @@ jobs:
|
||||
- name: Build front image
|
||||
run: cd vue3-project && cp .env.example .env &&docker build -t $BUILD_NAME:$IMAGE_TAG-fr .
|
||||
- name: Build backend image
|
||||
run: cd express-project && cp .env.example .env &&docker build -t $BUILD_NAME:$IMAGE_TAG-bk .
|
||||
- name: Run front container
|
||||
run: docker run -d $EXTERNAL_FLAG --name $SERVICE_NAME-fr $BUILD_NAME:$IMAGE_TAG-fr
|
||||
- name: Run backend container
|
||||
run: docker run -d $EXTERNAL_FLAG --name $SERVICE_NAME-bk $BUILD_NAME:$IMAGE_TAG-bk
|
||||
run: cd express-project && cp .env.example .env &&docker build -t $BUILD_NAME:$IMAGE_TAG-bk .
|
@@ -15,7 +15,7 @@ services:
|
||||
- "3307:3306"
|
||||
volumes:
|
||||
- /mnt/persist/xsl_mysql:/var/lib/mysql
|
||||
- ./express-project/scripts/init-database.sql:/docker-entrypoint-initdb.d/init.sql
|
||||
- /mnt/persist/xsl/init-database.sql:/docker-entrypoint-initdb.d/init.sql
|
||||
- /etc/localtime:/etc/localtime:ro
|
||||
networks:
|
||||
- xiaoshiliu-network
|
||||
|
@@ -7,6 +7,7 @@
|
||||
"scripts": {
|
||||
"start": "node app.js",
|
||||
"dev": "nodemon app.js",
|
||||
"i": "npm install",
|
||||
"generate-data": "node scripts/generate-data.js",
|
||||
"init-db": "node scripts/init-database.js"
|
||||
},
|
||||
|
@@ -2202,7 +2202,7 @@ const categoriesCrudConfig = {
|
||||
GROUP BY c.id, c.name, c.category_title, c.created_at
|
||||
ORDER BY ${validSortField} ${validSortOrder}
|
||||
LIMIT ? OFFSET ?
|
||||
`, [...queryParams, parseInt(limit), offset])
|
||||
`, [...queryParams, limit.toString(), offset.toString()])
|
||||
|
||||
return {
|
||||
data: categories,
|
||||
|
@@ -47,7 +47,6 @@ router.get('/', optionalAuth, async (req, res) => {
|
||||
query += ` ORDER BY p.created_at DESC LIMIT ? OFFSET ?`;
|
||||
queryParams.push(limit.toString(), offset.toString());
|
||||
|
||||
|
||||
const [rows] = await pool.execute(query, queryParams);
|
||||
|
||||
// 获取每个草稿的图片和标签
|
||||
|
Reference in New Issue
Block a user