diff --git a/pom.xml b/pom.xml
index d5c53cd..6331c37 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,6 +68,18 @@
service-role
1.0-SNAPSHOT
+
+
+ cn.com.tenlion
+ module-schedule
+ 1.0-SNAPSHOT
+
+
+
+ cn.com.tenlion
+ module-notice
+ 1.0-SNAPSHOT
+
com.aspose
diff --git a/src/main/java/cn/com/tenlion/systemoa/SystemOaApplication.java b/src/main/java/cn/com/tenlion/systemoa/SystemOaApplication.java
index c515c26..5d3e06d 100644
--- a/src/main/java/cn/com/tenlion/systemoa/SystemOaApplication.java
+++ b/src/main/java/cn/com/tenlion/systemoa/SystemOaApplication.java
@@ -3,9 +3,11 @@ package cn.com.tenlion.systemoa;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
@EnableSwagger2
+@EnableScheduling
@SpringBootApplication(scanBasePackages = {"ink.wgink", "cn.com.tenlion"})
@MapperScan(basePackages = {"ink.wgink.**.dao", "cn.com.tenlion.**.dao"})
public class SystemOaApplication {
diff --git a/src/main/resources/static/assets/images/filetype/audio.png b/src/main/resources/static/assets/images/filetype/audio.png
new file mode 100644
index 0000000..37618f0
Binary files /dev/null and b/src/main/resources/static/assets/images/filetype/audio.png differ
diff --git a/src/main/resources/static/assets/images/filetype/image.png b/src/main/resources/static/assets/images/filetype/image.png
new file mode 100644
index 0000000..c8680e6
Binary files /dev/null and b/src/main/resources/static/assets/images/filetype/image.png differ
diff --git a/src/main/resources/static/assets/images/filetype/video.png b/src/main/resources/static/assets/images/filetype/video.png
new file mode 100644
index 0000000..22ef884
Binary files /dev/null and b/src/main/resources/static/assets/images/filetype/video.png differ
diff --git a/src/main/resources/static/assets/js/vendor/wangEditor/wangEditor-fullscreen-plugin.js b/src/main/resources/static/assets/js/vendor/wangEditor/wangEditor-fullscreen-plugin.js
index 617a0b8..b4eb064 100644
--- a/src/main/resources/static/assets/js/vendor/wangEditor/wangEditor-fullscreen-plugin.js
+++ b/src/main/resources/static/assets/js/vendor/wangEditor/wangEditor-fullscreen-plugin.js
@@ -20,7 +20,10 @@ window.wangEditor.fullscreen = {
},
customInsert: function (insertImg, result, editor) {
console.log(result);
- var url = 'http://192.168.0.104:8082/news/' + result.data[0];
+ var locat = (window.location+'').split('/');
+ var server = locat[0]+'//'+locat[2]+'/'+locat[3] + "/";
+ console.log(server)
+ var url = server + result.data[0];
insertImg(url);
}
};