935090232@qq.com
2022-03-02 512a37c0fb21415efea656fe8c72ce4102d9f662
Merge branch 'developer'
3 files modified
18 ■■■■ changed files
zq-erp/src/main/resources/config/application-meidu.properties 8 ●●●● patch | view | raw | blame | history
zq-erp/src/main/resources/config/application-taiyan.properties 8 ●●●● patch | view | raw | blame | history
zq-erp/src/main/resources/config/application.properties 2 ●●● patch | view | raw | blame | history
zq-erp/src/main/resources/config/application-meidu.properties
@@ -46,17 +46,17 @@
#百度编辑器,覆盖默认配置
ueditor.imageUrlPrefix=http://resource.hive.jyymatrix.cc/uploadeFile
ueditor.imageUrlPrefix=http://filehive2.jyymatrix.cc/uploadeFile/md
ueditor.imagePathFormat=/image/{yyyy}{mm}{dd}/{time}{rand:6}
ueditor.scrawlPathFormat=/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}
ueditor.scrawlUrlPrefix=http://resource.hive.jyymatrix.cc/uploadeFile
ueditor.scrawlUrlPrefix=http://filehive2.jyymatrix.cc/uploadeFile/md
ueditor.snapscreenPathFormat=/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}
ueditor.snapscreenUrlPrefix=http://resource.hive.jyymatrix.cc/uploadeFile
ueditor.snapscreenUrlPrefix=http://filehive2.jyymatrix.cc/uploadeFile/md
ueditor.catcherPathFormat=/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}
ueditor.catcherUrlPrefix=http://resource.hive.jyymatrix.cc/uploadeFile
ueditor.catcherUrlPrefix=http://filehive2.jyymatrix.cc/uploadeFile/md
ueditor.videoPathFormat=/ueditor/jsp/upload/video/{yyyy}{mm}{dd}/{time}{rand:6}
ueditor.videoUrlPrefix=http://127.0.0.1:1088/uploadeFile/
zq-erp/src/main/resources/config/application-taiyan.properties
@@ -46,17 +46,17 @@
#百度编辑器,覆盖默认配置
ueditor.imageUrlPrefix=http://resource.hive.jyymatrix.cc/uploadeFile
ueditor.imageUrlPrefix=http://filehive2.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://resource.hive.jyymatrix.cc/uploadeFile
ueditor.scrawlUrlPrefix=http://filehive2.jyymatrix.cc/uploadeFile
ueditor.snapscreenPathFormat=/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}
ueditor.snapscreenUrlPrefix=http://resource.hive.jyymatrix.cc/uploadeFile
ueditor.snapscreenUrlPrefix=http://filehive2.jyymatrix.cc/uploadeFile
ueditor.catcherPathFormat=/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}
ueditor.catcherUrlPrefix=http://resource.hive.jyymatrix.cc/uploadeFile
ueditor.catcherUrlPrefix=http://filehive2.jyymatrix.cc/uploadeFile
ueditor.videoPathFormat=/ueditor/jsp/upload/video/{yyyy}{mm}{dd}/{time}{rand:6}
ueditor.videoUrlPrefix=http://127.0.0.1:1088/uploadeFile/
zq-erp/src/main/resources/config/application.properties
@@ -1,5 +1,5 @@
spring.profiles.active=taiyan
spring.profiles.active=meidu
evn=dev
server.port=8080