diff --git a/docker/Dockerfile b/docker/Dockerfile new file mode 100644 index 0000000..c42e0ef --- /dev/null +++ b/docker/Dockerfile @@ -0,0 +1,16 @@ +FROM openjdk:11-jre-slim + +# 设置工作目录 +WORKDIR /app + +# 只复制应用程序JAR包,不复制lib目录 +COPY ./*.jar app.jar + +# 设置环境变量 +ENV APP_NAME=app.jar + +# 暴露应用端口 +EXPOSE 8080 + +# 设置启动命令 +CMD ["sh", "-c", "java -Dloader.path=./lib/ -Xms2g -Xmx2g -jar $APP_NAME --spring.profiles.active=test"] diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml new file mode 100644 index 0000000..452cf9b --- /dev/null +++ b/docker/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3' + +services: + spring-boot-app: + build: . + container_name: spring-boot-app + ports: + - "7003:7002" + volumes: + - ./lib:/app/lib # 挂载主机的lib目录到容器内的lib目录 + - ./log:/app/log # 挂载日志目录到主机 + restart: always diff --git a/list_OpenAPI.json b/list_OpenAPI.json deleted file mode 100644 index 66dbbfc..0000000 --- a/list_OpenAPI.json +++ /dev/null @@ -1,246 +0,0 @@ -{ - "swagger": "2.0", - "info": { - "description": "# 接口文档", - "version": "1.0", - "title": "接口文档", - "termsOfService": "http://www.xx.com/", - "contact": { - "name": "277769738@qq.com" - } - }, - "host": "localhost:7002", - "basePath": "/api", - "schemes": [], - "consumes": [ - "*/*" - ], - "produces": [ - "*/*" - ], - "paths": { - "/api/clerk/user/list": { - "get": { - "tags": [ - "play-clerk-user-info-controller" - ], - "summary": "list", - "operationId": "listUsingGET_5", - "produces": [ - "*/*" - ], - "parameters": [ - { - "name": "beginTime", - "in": "query", - "required": false, - "type": "string" - }, - { - "name": "clerkState", - "in": "query", - "required": false, - "type": "string" - }, - { - "name": "createdBy", - "in": "query", - "required": false, - "type": "string" - }, - { - "name": "createdTime", - "in": "query", - "required": false, - "type": "string", - "format": "date-time" - }, - { - "name": "currentPage", - "in": "query", - "required": false, - "type": "integer", - "format": "int32" - }, - { - "name": "deleted", - "in": "query", - "required": false, - "type": "boolean" - }, - { - "name": "endTime", - "in": "query", - "required": false, - "type": "string" - }, - { - "name": "levelId", - "in": "query", - "required": false, - "type": "string" - }, - { - "name": "listingState", - "in": "query", - "required": false, - "type": "string" - }, - { - "name": "nickname", - "in": "query", - "required": false, - "type": "string" - }, - { - "name": "onboardingState", - "in": "query", - "required": false, - "type": "string" - }, - { - "name": "pageNum", - "in": "query", - "required": false, - "type": "integer", - "format": "int32" - }, - { - "name": "pageSize", - "in": "query", - "required": false, - "type": "integer", - "format": "int32" - }, - { - "name": "phone", - "in": "query", - "required": false, - "type": "string" - }, - { - "name": "province", - "in": "query", - "required": false, - "type": "string" - }, - { - "name": "recommendationState", - "in": "query", - "required": false, - "type": "string" - }, - { - "name": "sex", - "in": "query", - "required": false, - "type": "string" - }, - { - "name": "typeId", - "in": "query", - "required": false, - "type": "string" - }, - { - "name": "updatedBy", - "in": "query", - "required": false, - "type": "string" - }, - { - "name": "updatedTime", - "in": "query", - "required": false, - "type": "string", - "format": "date-time" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "originalRef": "全局统一返回结果", - "$ref": "#/definitions/全局统一返回结果" - } - }, - "401": { - "description": "Unauthorized" - }, - "403": { - "description": "Forbidden" - }, - "404": { - "description": "Not Found" - } - }, - "deprecated": false - } - } - }, - "definitions": { - "全局统一返回结果": { - "type": "object", - "properties": { - "code": { - "type": "integer", - "format": "int32", - "description": "返回码" - }, - "data": { - "type": "object", - "description": "返回数据" - }, - "message": { - "type": "string", - "description": "返回消息" - }, - "pageInfo": { - "description": "分页信息", - "originalRef": "PageInfo", - "$ref": "#/definitions/PageInfo" - }, - "success": { - "type": "boolean", - "description": "是否成功" - }, - "total": { - "type": "integer", - "format": "int64", - "description": "总条数" - } - }, - "title": "全局统一返回结果" - }, - "PageInfo": { - "type": "object", - "properties": { - "currentPage": { - "type": "integer", - "format": "int32", - "description": "当前页", - "refType": null - }, - "pageSize": { - "type": "integer", - "format": "int32", - "description": "页大小", - "refType": null - }, - "totalCount": { - "type": "integer", - "format": "int64", - "description": "总记录数", - "refType": null - }, - "totalPage": { - "type": "integer", - "format": "int64", - "description": "总页数", - "refType": null - } - }, - "title": "PageInfo" - } - } -} \ No newline at end of file diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayAvatarFrameInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayAvatarFrameInfoController.java index 6f762d7..351bb29 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayAvatarFrameInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayAvatarFrameInfoController.java @@ -139,7 +139,6 @@ public class PlayAvatarFrameInfoController { @Log(title = "赠送店员头像框", businessType = BusinessType.INSERT) @PostMapping("/sendAvatarFrame") public R sendAvatarFrame(@ApiParam(value = "赠送信息", required = true) @Validated @RequestBody PlayAvatarFrameSendVo vo) { - System.out.println(vo); return R.error("添加失败"); }