diff --git a/src/main/webapp/WEB-INF/lib/com.abbyy.FREngine.jar b/library/com.abbyy.FREngine.jar similarity index 100% rename from src/main/webapp/WEB-INF/lib/com.abbyy.FREngine.jar rename to library/com.abbyy.FREngine.jar diff --git a/pom.xml b/pom.xml index a051342..71f5845 100644 --- a/pom.xml +++ b/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.eastrobot + com.eastrobot.kbs kbase-media - 1.1.0-Beta + 1.1.0-GA jar kbase-media @@ -196,12 +196,11 @@ FREngine 1.0 system - ${basedir}/src/main/webapp/WEB-INF/lib/com.abbyy.FREngine.jar + ${basedir}/library/com.abbyy.FREngine.jar - kbase-media org.springframework.boot diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index e3333a2..81044d2 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -22,11 +22,11 @@ convert: # sync interface config sync: upload-file-size: 500MB - output-folder: /tmp/convert/ + output-folder: ./convert/ # async interface config async: upload-file-size: 500MB - output-folder: /tmp/convert/async/ + output-folder: ./convert/async/ video: vca: default: ffmpeg @@ -38,7 +38,7 @@ convert: audio: # default asr tool asr: - default: shhan + default: baidu #baidu asr config baidu: appId: 11067243 @@ -66,23 +66,23 @@ convert: datapath: /opt/tesseract/tessdata # kbase-monitor config -spring: - application: - name: kbase-media - boot: - admin: - client: - url: "http://172.16.8.143:8888" - username: admin - password: admin -management: - endpoints: - web: - exposure: - include: "*" - endpoint: - health: - show-details: ALWAYS - server: - ssl: - enabled: false \ No newline at end of file +#spring: +# application: +# name: kbase-media +# boot: +# admin: +# client: +# url: "http://172.16.8.143:8888" +# username: admin +# password: admin +#management: +# endpoints: +# web: +# exposure: +# include: "*" +# endpoint: +# health: +# show-details: ALWAYS +# server: +# ssl: +# enabled: false \ No newline at end of file diff --git a/todoList.md b/todoList.md deleted file mode 100644 index 7c2c9e6..0000000 --- a/todoList.md +++ /dev/null @@ -1,23 +0,0 @@ -不区分优先级 - -1.xfyun配置抽到springboot中 不要单独的config.properties - -2.增加文件类型转换接口, 如传入 wmv格式视频 指定输出类型为HTML5_Compatible, -增加该接口的意义在于html5 video,audio控件播放有格式限制. - -> video格式 - -| 格式 | IE | Firefox | Opera | Chrome | Safari | -| :------: | :------: | :------: | :------: | :------: | :------: | -| Ogg Theora| No | 3.5+ |10.5+ |5.0+|No | -| MPEG4 H.264 |9.0+|No|No|5.0+|3.0+| -| WebM VP8| No|4.0+|10.6+|6.0+|No| - -> audio格式 - -| 格式 | IE | Firefox | Opera | Chrome | Safari | -| :------: | :------: | :------: | :------: | :------: | :------: | -| Ogg Vorbis | No | 3.5+ |10.5+ |5.0+|No | -| MP3 |9.0+|No|No|5.0+|3.0+| -| Wav | No|4.0+|10.6+|6.0+|No| ----------------------