Merge branch 'developer' into alpha

姜友瑶

2022-05-05 c41e8d372cdabbe1fd5973c9322e38a40bfa1a39

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

@@ -1,4 +1,3 @@

#数据库链接
spring.datasource.username=ct_test
spring.datasource.password=123456
@@ -48,4 +47,30 @@

#是否启用异常上报
is_open_exception_report=true
showExcptionUrl=http://test.hive.jyymatrix.cc/showException
showExcptionUrl=http://test.hive.jyymatrix.cc/showException


#百度编辑器，覆盖默认配置
ueditor.imageUrlPrefix=http://testfile.hive.jyymatrix.cc/uploadeFile
ueditor.imagePathFormat=/image/{yyyy}{mm}{dd}/{time}{rand:6}

ueditor.scrawlPathFormat=/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}
ueditor.scrawlUrlPrefix=http://testfile.hive.jyymatrix.cc/uploadeFile

ueditor.snapscreenPathFormat=/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}
ueditor.snapscreenUrlPrefix=http://testfile.hive.jyymatrix.cc/uploadeFile

ueditor.catcherPathFormat=/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}
ueditor.catcherUrlPrefix=http://testfile.hive.jyymatrix.cc/uploadeFile

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/