fix

Helius

2022-03-15 1998fe8e09c0c4b2f5cc7e5cd5d6eb10170d718f

fix

 zq-erp/src/main/java/com/matrix/system/app/action/AppOccupancyController.java

@@ -26,6 +26,7 @@
import io.swagger.annotations.ApiResponses;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
@@ -66,7 +67,7 @@

    @ApiOperation(value = "获取床位信息", notes = "获取床位信息")
    @PostMapping(value = "/showFreedBed")
    public AjaxResult showFreedBed(@RequestBody FreeBedDto freeBedDto) {
    public AjaxResult showFreedBed(@RequestBody @Validated FreeBedDto freeBedDto) {
        SysProjServices sysProjServices = new SysProjServices();
        sysProjServices.setStartTime(freeBedDto.getStartTime());
        sysProjServices.setTotalTime(freeBedDto.getTotalTime());

 zq-erp/src/main/resources/config/application-alpha.properties

@@ -3,9 +3,9 @@


#线上测试环境
spring.datasource.username=hive
spring.datasource.password=hive123!@#
spring.datasource.url=jdbc:mysql://124.70.222.34/hive_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
spring.datasource.username=db_alpha
spring.datasource.password=Alpha!qaz@wsx
spring.datasource.url=jdbc:mysql://124.70.222.34/db_alpha?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8



@@ -73,9 +73,9 @@
default_password=123

#nginx静态资源访问地址
static_resource_url=https://hive.file.csxuncong.com/uploadeFile/
static_resource_url=https://hive.file.csxuncong.com/uploadeFile/alpha/
#文件保存地址
file_storage_path=/mnt/hive/static/uploadeFile/
file_storage_path=/mnt/hive/static/uploadeFile/alpha/
#文件上传大小字节为单位  10MB
maxUploadSize=10485760

@@ -168,3 +168,27 @@

gzh_appid=wx57e6335559bdbda6
gzh_secret=ecb408af170e3890e6544290cad33760



#百度编辑器，覆盖默认配置
ueditor.imageUrlPrefix=https://hive.file.csxuncong.com/uploadeFile/alpha
ueditor.imagePathFormat=/image/{yyyy}{mm}{dd}/{time}{rand:6}

ueditor.scrawlPathFormat=/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}
ueditor.scrawlUrlPrefix=https://hive.file.csxuncong.com/uploadeFile/alpha

ueditor.snapscreenPathFormat=/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}
ueditor.snapscreenUrlPrefix=https://hive.file.csxuncong.com/uploadeFile/alpha

ueditor.catcherPathFormat=/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}
ueditor.catcherUrlPrefix=https://hive.file.csxuncong.com/uploadeFile/alpha

ueditor.videoPathFormat=/ueditor/jsp/upload/video/{yyyy}{mm}{dd}/{time}{rand:6}
ueditor.videoUrlPrefix=http://127.0.0.1:1088/uploadeFile/

ueditor.filePathFormat=/ueditor/jsp/upload/file/{yyyy}{mm}{dd}/{time}{rand:6}
ueditor.fileUrlPrefix=http://127.0.0.1:1088/uploadeFile/

ueditor.imageManagerListPath=http://127.0.0.1:1088/uploadeFile/
ueditor.fileManagerListPath=http://127.0.0.1:1088/uploadeFile/

 zq-erp/src/main/resources/config/application.properties

@@ -1,5 +1,5 @@

spring.profiles.active=alpha
spring.profiles.active=test
evn=dev
server.port=8080