diff --git a/sky-server/src/main/java/com/sky/controller/admin/WorkSpaceController.java b/sky-server/src/main/java/com/sky/controller/admin/WorkSpaceController.java index cbd3f01..4f8320e 100644 --- a/sky-server/src/main/java/com/sky/controller/admin/WorkSpaceController.java +++ b/sky-server/src/main/java/com/sky/controller/admin/WorkSpaceController.java @@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; + import java.time.LocalDateTime; import java.time.LocalTime; @@ -30,47 +31,53 @@ public class WorkSpaceController { /** * 工作台今日数据查询 + * * @return */ @GetMapping("/businessData") @ApiOperation("工作台今日数据查询") - public Result businessData(){ + public Result businessData() { //获得当天的开始时间 LocalDateTime begin = LocalDateTime.now().with(LocalTime.MIN); //获得当天的结束时间 LocalDateTime end = LocalDateTime.now().with(LocalTime.MAX); BusinessDataVO businessDataVO = workspaceService.getBusinessData(begin, end); + return Result.success(businessDataVO); } /** * 查询订单管理数据 + * * @return */ @GetMapping("/overviewOrders") @ApiOperation("查询订单管理数据") - public Result orderOverView(){ + public Result orderOverView() { return Result.success(workspaceService.getOrderOverView()); } /** * 查询菜品总览 + * * @return */ @GetMapping("/overviewDishes") @ApiOperation("查询菜品总览") - public Result dishOverView(){ + public Result dishOverView() { return Result.success(workspaceService.getDishOverView()); } /** * 查询套餐总览 + * * @return */ @GetMapping("/overviewSetmeals") @ApiOperation("查询套餐总览") - public Result setmealOverView(){ + public Result setmealOverView() { return Result.success(workspaceService.getSetmealOverView()); } } + diff --git a/sky-server/src/main/resources/application-prod.yml b/sky-server/src/main/resources/application-prod.yml new file mode 100644 index 0000000..75e112d --- /dev/null +++ b/sky-server/src/main/resources/application-prod.yml @@ -0,0 +1,28 @@ +sky: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + host: ${DB_HOST} + port: ${DB_PORT} + database: ${DB_NAME} + username: ${DB_USERNAME} + password: ${DB_PASSWORD} + alioss: + access-key-id: LTAI5tAggPBTvvugwGhD3onk + access-key-secret: YyUv8YJZjHStekVVoh8ilpCevL2NY4 + endpoint: oss-cn-guangzhou.aliyuncs.com + bucket-name: sky-take-out-1919810 + redis: + host: ${REDIS_HOST} + port: ${REDIS_PORT} + database: ${REDIS_DATABASE} + password: ${REDIS_PASSWORD} + wechat: + appid: wx34fbbbace9943d4a + secret: 3e5f899be36fa508bb41dc5611bff0c7 + mchid: 1561414331 + mchSerialNo: 4B3B3DC35414AD50B1B755BAF8DE9CC7CF407606 + privateKeyFilePath: D:\apiclient_key.pem + apiV3Key: CZBK51236435wxpay435434323FFDuv3 + weChatPayCertFilePath: D:\wechatpay_166D96F876F45C7D07CE98952A96EC980368ACFC.pem + notifyUrl: https://www.weixin.qq.com/wxpay/pay.php + refundNotifyUrl: https://www.weixin.qq.com/wxpay/pay.php diff --git a/sky-server/src/main/resources/application.yml b/sky-server/src/main/resources/application.yml index cac93fb..ace9700 100644 --- a/sky-server/src/main/resources/application.yml +++ b/sky-server/src/main/resources/application.yml @@ -16,6 +16,7 @@ spring: host: ${sky.redis.host} port: ${sky.redis.port} database: ${sky.redis.database} +# password: ${sky.redis.password} mybatis: #mapper配置文件 @@ -45,7 +46,7 @@ sky: # 用户端jwt签名加密时使用的秘钥 user-secret-key: itheima # 用户端jwt过期时间 - # user-ttl: 7200000 +# user-ttl: 7200000 user-ttl: 720000000 # 用户端前端传递过来的令牌名称 user-token-name: authentication