diff --git a/intellagric-agriecom-web/pom.xml b/intellagric-agriecom-web/pom.xml
index e8042c9316ec02db2920b93267daf3efec9ee1f8..3b3acc13b137852ff3b2eefd6c0c626c8e790496 100644
--- a/intellagric-agriecom-web/pom.xml
+++ b/intellagric-agriecom-web/pom.xml
@@ -100,9 +100,15 @@
junit
-
- fastdfs_client
- fastdfs_client
+
+
+
+
+
+
+ com.github.tobato
+ fastdfs-client
+ 1.25.3-RELEASE
diff --git a/intellagric-agriecom-web/src/main/resources/spring/applicationContext-redis.xml b/intellagric-agriecom-web/src/main/resources/spring/applicationContext-redis.xml
index 209f1eba218cac4b6a42ee53c9ce40edfbb8b589..622c5388516865be681125c7f3c98b6c85a8ef52 100644
--- a/intellagric-agriecom-web/src/main/resources/spring/applicationContext-redis.xml
+++ b/intellagric-agriecom-web/src/main/resources/spring/applicationContext-redis.xml
@@ -8,11 +8,26 @@
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd">
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/intellagric-agriecom-web/src/main/resources/spring/springmvc.xml b/intellagric-agriecom-web/src/main/resources/spring/springmvc.xml
index ab62d97b0490c7f38792a02588df2bd8b4d018c7..50f5ad8c180ccafaea62f6360e62f6689dbafc86 100644
--- a/intellagric-agriecom-web/src/main/resources/spring/springmvc.xml
+++ b/intellagric-agriecom-web/src/main/resources/spring/springmvc.xml
@@ -60,7 +60,7 @@
-
+
diff --git a/intellagric-agritech-web/pom.xml b/intellagric-agritech-web/pom.xml
index 60708974c8b82675d31e458329aefb730e979998..58398d2800954fa9e55059fc58497720534ae7e3 100644
--- a/intellagric-agritech-web/pom.xml
+++ b/intellagric-agritech-web/pom.xml
@@ -90,9 +90,15 @@
junit
-
- fastdfs_client
- fastdfs_client
+
+
+
+
+
+
+ com.github.tobato
+ fastdfs-client
+ 1.25.3-RELEASE
diff --git a/intellagric-agritech-web/src/main/resources/spring/springmvc.xml b/intellagric-agritech-web/src/main/resources/spring/springmvc.xml
index 0289fa191e0591847d4d4bfb4dcbc8c18161c3c0..c79bd2fc4156afb26e4d0070ebc0a0a2688ea081 100644
--- a/intellagric-agritech-web/src/main/resources/spring/springmvc.xml
+++ b/intellagric-agritech-web/src/main/resources/spring/springmvc.xml
@@ -42,7 +42,7 @@
-
+
diff --git a/intellagric-common/pom.xml b/intellagric-common/pom.xml
index 75a1a65b7236583e5be1931eeddfa4415e1b87e8..9350d596c7de2018cb689b9964d69e1d1a6ec325 100644
--- a/intellagric-common/pom.xml
+++ b/intellagric-common/pom.xml
@@ -57,9 +57,15 @@
slf4j-log4j12
+
+
+
+
+
- fastdfs_client
- fastdfs_client
+ com.github.tobato
+ fastdfs-client
+ 1.25.3-RELEASE
diff --git a/intellagric-common/src/main/java/com/intellagric/common/utils/FastDFSClient.java b/intellagric-common/src/main/java/com/intellagric/common/utils/FastDFSClient.java
index 3bfd1c92c708caf1024f5bc02f5efff619b722da..99f68c53d7b5cb6db804b184326b7b161e08cc60 100644
--- a/intellagric-common/src/main/java/com/intellagric/common/utils/FastDFSClient.java
+++ b/intellagric-common/src/main/java/com/intellagric/common/utils/FastDFSClient.java
@@ -1,11 +1,6 @@
package com.intellagric.common.utils;
-import org.csource.common.NameValuePair;
-import org.csource.fastdfs.ClientGlobal;
-import org.csource.fastdfs.StorageClient1;
-import org.csource.fastdfs.StorageServer;
-import org.csource.fastdfs.TrackerClient;
-import org.csource.fastdfs.TrackerServer;
+import com.github.tobato.fastdfs.service.TrackerClient;
/**
* 文件上传工具类
diff --git a/intellagric-iftmonitor-web/pom.xml b/intellagric-iftmonitor-web/pom.xml
index 083b851069735d8c854dfe75f0d50e861ed2d42f..d043679285f0697525a0981bbc68d0dad9073cf1 100644
--- a/intellagric-iftmonitor-web/pom.xml
+++ b/intellagric-iftmonitor-web/pom.xml
@@ -91,9 +91,15 @@
junit
-
- fastdfs_client
- fastdfs_client
+
+
+
+
+
+
+ com.github.tobato
+ fastdfs-client
+ 1.25.3-RELEASE
diff --git a/intellagric-iftmonitor-web/src/main/resources/spring/springmvc.xml b/intellagric-iftmonitor-web/src/main/resources/spring/springmvc.xml
index 1368dd19976f2a2d1d5ff5937994600dda7bc62b..0d396a4988292c46b522331f5f760cfce3d0c937 100644
--- a/intellagric-iftmonitor-web/src/main/resources/spring/springmvc.xml
+++ b/intellagric-iftmonitor-web/src/main/resources/spring/springmvc.xml
@@ -42,7 +42,7 @@
-
+
\ No newline at end of file
diff --git a/intellagric-manager-web/pom.xml b/intellagric-manager-web/pom.xml
index 8c97743e6abc5276d4e0959a38a174d355729b78..8d271d1058c93134bfae2ec8db26a3ee78593bd6 100644
--- a/intellagric-manager-web/pom.xml
+++ b/intellagric-manager-web/pom.xml
@@ -155,9 +155,15 @@
junit
-
- fastdfs_client
- fastdfs_client
+
+
+
+
+
+
+ com.github.tobato
+ fastdfs-client
+ 1.25.3-RELEASE
diff --git a/intellagric-manager-web/src/main/resources/spring/applicationContext-activeMQ.xml b/intellagric-manager-web/src/main/resources/spring/applicationContext-activeMQ.xml
index 81bed469b03ed9163b47d7ed6d3301d203f2e9e0..19e6e0719a050ca11298f8eca026aefb6dc291b3 100644
--- a/intellagric-manager-web/src/main/resources/spring/applicationContext-activeMQ.xml
+++ b/intellagric-manager-web/src/main/resources/spring/applicationContext-activeMQ.xml
@@ -10,9 +10,13 @@
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd">
+
+
+
+
-
+
diff --git a/intellagric-manager-web/src/main/resources/spring/applicationContext-redis.xml b/intellagric-manager-web/src/main/resources/spring/applicationContext-redis.xml
index 209f1eba218cac4b6a42ee53c9ce40edfbb8b589..d95ce792668a58b4dd9e653a477579cbf80c5ddc 100644
--- a/intellagric-manager-web/src/main/resources/spring/applicationContext-redis.xml
+++ b/intellagric-manager-web/src/main/resources/spring/applicationContext-redis.xml
@@ -8,10 +8,25 @@
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd">
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
diff --git a/intellagric-manager-web/src/main/resources/spring/springmvc.xml b/intellagric-manager-web/src/main/resources/spring/springmvc.xml
index 122f194d5542304695df691981df1c0ff003f521..b118151e4c9a4181c2699a30703629d3ec58e405 100644
--- a/intellagric-manager-web/src/main/resources/spring/springmvc.xml
+++ b/intellagric-manager-web/src/main/resources/spring/springmvc.xml
@@ -43,7 +43,7 @@
-
+
diff --git "a/intellagric-manager-web/src/main/webapp/static/layui/mymodule/formSelects/UI/layui-v2.2.6/\346\226\207\346\241\243\344\270\216\347\244\272\344\276\213/GitHub.url" "b/intellagric-manager-web/src/main/webapp/static/layui/mymodule/formSelects/UI/layui-v2.2.6/\346\226\207\346\241\243\344\270\216\347\244\272\344\276\213/GitHub.url"
deleted file mode 100644
index cc947dd1640a912c08a8617c17c138619014bc98..0000000000000000000000000000000000000000
--- "a/intellagric-manager-web/src/main/webapp/static/layui/mymodule/formSelects/UI/layui-v2.2.6/\346\226\207\346\241\243\344\270\216\347\244\272\344\276\213/GitHub.url"
+++ /dev/null
@@ -1,8 +0,0 @@
-[{000214A0-0000-0000-C000-000000000046}]
-Prop3=19,11
-[InternetShortcut]
-URL=https://github.com/sentsin/layui/
-IDList=
-HotKey=0
-IconIndex=0
-IconFile=C:\Program Files (x86)\Google\Chrome\Application\chrome.exe
diff --git "a/intellagric-manager-web/src/main/webapp/static/layui/mymodule/formSelects/UI/layui-v2.2.6/\346\226\207\346\241\243\344\270\216\347\244\272\344\276\213/Git\347\240\201\344\272\221.url" "b/intellagric-manager-web/src/main/webapp/static/layui/mymodule/formSelects/UI/layui-v2.2.6/\346\226\207\346\241\243\344\270\216\347\244\272\344\276\213/Git\347\240\201\344\272\221.url"
deleted file mode 100644
index dd3411ca32260a16ba4a269c7c210e3c62ac0f63..0000000000000000000000000000000000000000
--- "a/intellagric-manager-web/src/main/webapp/static/layui/mymodule/formSelects/UI/layui-v2.2.6/\346\226\207\346\241\243\344\270\216\347\244\272\344\276\213/Git\347\240\201\344\272\221.url"
+++ /dev/null
@@ -1,8 +0,0 @@
-[{000214A0-0000-0000-C000-000000000046}]
-Prop3=19,11
-[InternetShortcut]
-URL=https://gitee.com/sentsin/layui?from=layui
-IDList=
-HotKey=0
-IconIndex=0
-IconFile=C:\Program Files (x86)\Google\Chrome\Application\chrome.exe
diff --git "a/intellagric-manager-web/src/main/webapp/static/layui/mymodule/formSelects/UI/layui-v2.2.6/\346\226\207\346\241\243\344\270\216\347\244\272\344\276\213/\345\234\250\347\272\277\347\244\272\344\276\213.url" "b/intellagric-manager-web/src/main/webapp/static/layui/mymodule/formSelects/UI/layui-v2.2.6/\346\226\207\346\241\243\344\270\216\347\244\272\344\276\213/\345\234\250\347\272\277\347\244\272\344\276\213.url"
deleted file mode 100644
index 161b5201cb9394443199285ac35349e28578c4c4..0000000000000000000000000000000000000000
--- "a/intellagric-manager-web/src/main/webapp/static/layui/mymodule/formSelects/UI/layui-v2.2.6/\346\226\207\346\241\243\344\270\216\347\244\272\344\276\213/\345\234\250\347\272\277\347\244\272\344\276\213.url"
+++ /dev/null
@@ -1,8 +0,0 @@
-[{000214A0-0000-0000-C000-000000000046}]
-Prop3=19,2
-[InternetShortcut]
-URL=http://www.layui.com/demo/
-IDList=
-HotKey=0
-IconIndex=0
-IconFile=C:\Program Files (x86)\Google\Chrome\Application\chrome.exe
diff --git "a/intellagric-manager-web/src/main/webapp/static/layui/mymodule/formSelects/UI/layui-v2.2.6/\346\226\207\346\241\243\344\270\216\347\244\272\344\276\213/\345\277\253\351\200\237\344\270\212\346\211\213.url" "b/intellagric-manager-web/src/main/webapp/static/layui/mymodule/formSelects/UI/layui-v2.2.6/\346\226\207\346\241\243\344\270\216\347\244\272\344\276\213/\345\277\253\351\200\237\344\270\212\346\211\213.url"
deleted file mode 100644
index aee0407510afebd20c6026d38b45ecfedd174fbb..0000000000000000000000000000000000000000
--- "a/intellagric-manager-web/src/main/webapp/static/layui/mymodule/formSelects/UI/layui-v2.2.6/\346\226\207\346\241\243\344\270\216\347\244\272\344\276\213/\345\277\253\351\200\237\344\270\212\346\211\213.url"
+++ /dev/null
@@ -1,8 +0,0 @@
-[{000214A0-0000-0000-C000-000000000046}]
-Prop3=19,2
-[InternetShortcut]
-URL=http://www.layui.com/doc/
-IDList=
-HotKey=0
-IconIndex=0
-IconFile=C:\Program Files (x86)\Google\Chrome\Application\chrome.exe
diff --git "a/intellagric-manager-web/src/main/webapp/static/layui/mymodule/formSelects/UI/layui-v2.2.6/\346\233\264\346\226\260\346\227\245\345\277\227.url" "b/intellagric-manager-web/src/main/webapp/static/layui/mymodule/formSelects/UI/layui-v2.2.6/\346\233\264\346\226\260\346\227\245\345\277\227.url"
deleted file mode 100644
index d28cda25a240bad246a6f9fc040f3c846a7f753f..0000000000000000000000000000000000000000
--- "a/intellagric-manager-web/src/main/webapp/static/layui/mymodule/formSelects/UI/layui-v2.2.6/\346\233\264\346\226\260\346\227\245\345\277\227.url"
+++ /dev/null
@@ -1,8 +0,0 @@
-[{000214A0-0000-0000-C000-000000000046}]
-Prop3=19,2
-[InternetShortcut]
-URL=http://www.layui.com/doc/base/changelog.html
-IDList=
-HotKey=0
-IconIndex=0
-IconFile=C:\Program Files (x86)\Google\Chrome\Application\chrome.exe
diff --git "a/intellagric-manager-web/src/main/webapp/static/layui/mymodule/formSelects/UI/layui-v2.3.0-rc1/\346\226\207\346\241\243\344\270\216\347\244\272\344\276\213/GitHub.url" "b/intellagric-manager-web/src/main/webapp/static/layui/mymodule/formSelects/UI/layui-v2.3.0-rc1/\346\226\207\346\241\243\344\270\216\347\244\272\344\276\213/GitHub.url"
deleted file mode 100644
index cc947dd1640a912c08a8617c17c138619014bc98..0000000000000000000000000000000000000000
--- "a/intellagric-manager-web/src/main/webapp/static/layui/mymodule/formSelects/UI/layui-v2.3.0-rc1/\346\226\207\346\241\243\344\270\216\347\244\272\344\276\213/GitHub.url"
+++ /dev/null
@@ -1,8 +0,0 @@
-[{000214A0-0000-0000-C000-000000000046}]
-Prop3=19,11
-[InternetShortcut]
-URL=https://github.com/sentsin/layui/
-IDList=
-HotKey=0
-IconIndex=0
-IconFile=C:\Program Files (x86)\Google\Chrome\Application\chrome.exe
diff --git "a/intellagric-manager-web/src/main/webapp/static/layui/mymodule/formSelects/UI/layui-v2.3.0-rc1/\346\226\207\346\241\243\344\270\216\347\244\272\344\276\213/Git\347\240\201\344\272\221.url" "b/intellagric-manager-web/src/main/webapp/static/layui/mymodule/formSelects/UI/layui-v2.3.0-rc1/\346\226\207\346\241\243\344\270\216\347\244\272\344\276\213/Git\347\240\201\344\272\221.url"
deleted file mode 100644
index dd3411ca32260a16ba4a269c7c210e3c62ac0f63..0000000000000000000000000000000000000000
--- "a/intellagric-manager-web/src/main/webapp/static/layui/mymodule/formSelects/UI/layui-v2.3.0-rc1/\346\226\207\346\241\243\344\270\216\347\244\272\344\276\213/Git\347\240\201\344\272\221.url"
+++ /dev/null
@@ -1,8 +0,0 @@
-[{000214A0-0000-0000-C000-000000000046}]
-Prop3=19,11
-[InternetShortcut]
-URL=https://gitee.com/sentsin/layui?from=layui
-IDList=
-HotKey=0
-IconIndex=0
-IconFile=C:\Program Files (x86)\Google\Chrome\Application\chrome.exe
diff --git "a/intellagric-manager-web/src/main/webapp/static/layui/mymodule/formSelects/UI/layui-v2.3.0-rc1/\346\226\207\346\241\243\344\270\216\347\244\272\344\276\213/\345\234\250\347\272\277\347\244\272\344\276\213.url" "b/intellagric-manager-web/src/main/webapp/static/layui/mymodule/formSelects/UI/layui-v2.3.0-rc1/\346\226\207\346\241\243\344\270\216\347\244\272\344\276\213/\345\234\250\347\272\277\347\244\272\344\276\213.url"
deleted file mode 100644
index 161b5201cb9394443199285ac35349e28578c4c4..0000000000000000000000000000000000000000
--- "a/intellagric-manager-web/src/main/webapp/static/layui/mymodule/formSelects/UI/layui-v2.3.0-rc1/\346\226\207\346\241\243\344\270\216\347\244\272\344\276\213/\345\234\250\347\272\277\347\244\272\344\276\213.url"
+++ /dev/null
@@ -1,8 +0,0 @@
-[{000214A0-0000-0000-C000-000000000046}]
-Prop3=19,2
-[InternetShortcut]
-URL=http://www.layui.com/demo/
-IDList=
-HotKey=0
-IconIndex=0
-IconFile=C:\Program Files (x86)\Google\Chrome\Application\chrome.exe
diff --git "a/intellagric-manager-web/src/main/webapp/static/layui/mymodule/formSelects/UI/layui-v2.3.0-rc1/\346\226\207\346\241\243\344\270\216\347\244\272\344\276\213/\345\277\253\351\200\237\344\270\212\346\211\213.url" "b/intellagric-manager-web/src/main/webapp/static/layui/mymodule/formSelects/UI/layui-v2.3.0-rc1/\346\226\207\346\241\243\344\270\216\347\244\272\344\276\213/\345\277\253\351\200\237\344\270\212\346\211\213.url"
deleted file mode 100644
index aee0407510afebd20c6026d38b45ecfedd174fbb..0000000000000000000000000000000000000000
--- "a/intellagric-manager-web/src/main/webapp/static/layui/mymodule/formSelects/UI/layui-v2.3.0-rc1/\346\226\207\346\241\243\344\270\216\347\244\272\344\276\213/\345\277\253\351\200\237\344\270\212\346\211\213.url"
+++ /dev/null
@@ -1,8 +0,0 @@
-[{000214A0-0000-0000-C000-000000000046}]
-Prop3=19,2
-[InternetShortcut]
-URL=http://www.layui.com/doc/
-IDList=
-HotKey=0
-IconIndex=0
-IconFile=C:\Program Files (x86)\Google\Chrome\Application\chrome.exe
diff --git "a/intellagric-manager-web/src/main/webapp/static/layui/mymodule/formSelects/UI/layui-v2.3.0-rc1/\346\233\264\346\226\260\346\227\245\345\277\227.url" "b/intellagric-manager-web/src/main/webapp/static/layui/mymodule/formSelects/UI/layui-v2.3.0-rc1/\346\233\264\346\226\260\346\227\245\345\277\227.url"
deleted file mode 100644
index d28cda25a240bad246a6f9fc040f3c846a7f753f..0000000000000000000000000000000000000000
--- "a/intellagric-manager-web/src/main/webapp/static/layui/mymodule/formSelects/UI/layui-v2.3.0-rc1/\346\233\264\346\226\260\346\227\245\345\277\227.url"
+++ /dev/null
@@ -1,8 +0,0 @@
-[{000214A0-0000-0000-C000-000000000046}]
-Prop3=19,2
-[InternetShortcut]
-URL=http://www.layui.com/doc/base/changelog.html
-IDList=
-HotKey=0
-IconIndex=0
-IconFile=C:\Program Files (x86)\Google\Chrome\Application\chrome.exe
diff --git a/intellagric-portal-web/pom.xml b/intellagric-portal-web/pom.xml
index cabdedd4560c0798e8ce0e9745f11f2c9e116ea0..b7008c5eb3a1f0d84192ab5296fad6ff3448d96d 100644
--- a/intellagric-portal-web/pom.xml
+++ b/intellagric-portal-web/pom.xml
@@ -105,9 +105,15 @@
junit
-
- fastdfs_client
- fastdfs_client
+
+
+
+
+
+
+ com.github.tobato
+ fastdfs-client
+ 1.25.3-RELEASE
diff --git a/intellagric-portal-web/src/main/resources/spring/springmvc.xml b/intellagric-portal-web/src/main/resources/spring/springmvc.xml
index ef0c9669dce5b6c44a8f5b019a0f08bf03511e15..3e5934318969e1d6f74b22d73d531dc5872180b4 100644
--- a/intellagric-portal-web/src/main/resources/spring/springmvc.xml
+++ b/intellagric-portal-web/src/main/resources/spring/springmvc.xml
@@ -43,7 +43,7 @@
-
+
diff --git "a/intellagric-portal-web/src/main/webapp/static/img/weather/\346\265\256\345\260\230.png" "b/intellagric-portal-web/src/main/webapp/static/img/weather/\302\270\302\241\302\263\302\276.png"
similarity index 100%
rename from "intellagric-portal-web/src/main/webapp/static/img/weather/\346\265\256\345\260\230.png"
rename to "intellagric-portal-web/src/main/webapp/static/img/weather/\302\270\302\241\302\263\302\276.png"
diff --git "a/intellagric-portal-web/src/main/webapp/static/img/weather/\344\270\255\351\233\250.png" "b/intellagric-portal-web/src/main/webapp/static/img/weather/\344\270\255\351\233\250.png"
deleted file mode 100644
index 4005893d1a52d9293f298c6233484ed7a643e494..0000000000000000000000000000000000000000
Binary files "a/intellagric-portal-web/src/main/webapp/static/img/weather/\344\270\255\351\233\250.png" and /dev/null differ
diff --git "a/intellagric-portal-web/src/main/webapp/static/img/weather/\344\270\255\351\233\250\350\275\254\345\244\247\351\233\250.png" "b/intellagric-portal-web/src/main/webapp/static/img/weather/\344\270\255\351\233\250\350\275\254\345\244\247\351\233\250.png"
deleted file mode 100644
index a59fbba38782ae923f20e15b449225c5ec550caf..0000000000000000000000000000000000000000
Binary files "a/intellagric-portal-web/src/main/webapp/static/img/weather/\344\270\255\351\233\250\350\275\254\345\244\247\351\233\250.png" and /dev/null differ
diff --git "a/intellagric-portal-web/src/main/webapp/static/img/weather/\344\270\255\351\233\252.png" "b/intellagric-portal-web/src/main/webapp/static/img/weather/\344\270\255\351\233\252.png"
deleted file mode 100644
index 61f8e549b1e180d7e140cf6a2c211e380ae1707f..0000000000000000000000000000000000000000
Binary files "a/intellagric-portal-web/src/main/webapp/static/img/weather/\344\270\255\351\233\252.png" and /dev/null differ
diff --git "a/intellagric-portal-web/src/main/webapp/static/img/weather/\344\270\255\351\233\252\350\275\254\345\244\247\351\233\252.png" "b/intellagric-portal-web/src/main/webapp/static/img/weather/\344\270\255\351\233\252\350\275\254\345\244\247\351\233\252.png"
deleted file mode 100644
index b29f96d391a81313dfc4fdb57860c426b677ad19..0000000000000000000000000000000000000000
Binary files "a/intellagric-portal-web/src/main/webapp/static/img/weather/\344\270\255\351\233\252\350\275\254\345\244\247\351\233\252.png" and /dev/null differ
diff --git "a/intellagric-portal-web/src/main/webapp/static/img/weather/\345\206\273\351\233\250.png" "b/intellagric-portal-web/src/main/webapp/static/img/weather/\345\206\273\351\233\250.png"
deleted file mode 100644
index c07315075106e9d5e8535f12dd962693eb9969e4..0000000000000000000000000000000000000000
Binary files "a/intellagric-portal-web/src/main/webapp/static/img/weather/\345\206\273\351\233\250.png" and /dev/null differ
diff --git "a/intellagric-portal-web/src/main/webapp/static/img/weather/\345\244\232\344\272\221.png" "b/intellagric-portal-web/src/main/webapp/static/img/weather/\345\244\232\344\272\221.png"
deleted file mode 100644
index d81a6514383b19b0155cf5cfbf86fb4121a06161..0000000000000000000000000000000000000000
Binary files "a/intellagric-portal-web/src/main/webapp/static/img/weather/\345\244\232\344\272\221.png" and /dev/null differ
diff --git "a/intellagric-portal-web/src/main/webapp/static/img/weather/\345\244\247\346\232\264\351\233\250.png" "b/intellagric-portal-web/src/main/webapp/static/img/weather/\345\244\247\346\232\264\351\233\250.png"
deleted file mode 100644
index bfc5e2ca13e3da8f9b3e01a74bf8149770b4fd45..0000000000000000000000000000000000000000
Binary files "a/intellagric-portal-web/src/main/webapp/static/img/weather/\345\244\247\346\232\264\351\233\250.png" and /dev/null differ
diff --git "a/intellagric-portal-web/src/main/webapp/static/img/weather/\345\244\247\346\232\264\351\233\252.png" "b/intellagric-portal-web/src/main/webapp/static/img/weather/\345\244\247\346\232\264\351\233\252.png"
deleted file mode 100644
index 7ace22ddb939f049980b5e956d5493599b3f6856..0000000000000000000000000000000000000000
Binary files "a/intellagric-portal-web/src/main/webapp/static/img/weather/\345\244\247\346\232\264\351\233\252.png" and /dev/null differ
diff --git "a/intellagric-portal-web/src/main/webapp/static/img/weather/\345\244\247\351\233\250.png" "b/intellagric-portal-web/src/main/webapp/static/img/weather/\345\244\247\351\233\250.png"
deleted file mode 100644
index 41f1d3e1ddbc77e7e78adb978dd2420855fbe825..0000000000000000000000000000000000000000
Binary files "a/intellagric-portal-web/src/main/webapp/static/img/weather/\345\244\247\351\233\250.png" and /dev/null differ
diff --git "a/intellagric-portal-web/src/main/webapp/static/img/weather/\345\244\247\351\233\250\350\275\254\346\232\264\351\233\250.png" "b/intellagric-portal-web/src/main/webapp/static/img/weather/\345\244\247\351\233\250\350\275\254\346\232\264\351\233\250.png"
deleted file mode 100644
index 8478e37c7dd8e9e4a379fc2fa6a8b6e8645eda26..0000000000000000000000000000000000000000
Binary files "a/intellagric-portal-web/src/main/webapp/static/img/weather/\345\244\247\351\233\250\350\275\254\346\232\264\351\233\250.png" and /dev/null differ
diff --git "a/intellagric-portal-web/src/main/webapp/static/img/weather/\345\244\247\351\233\252.png" "b/intellagric-portal-web/src/main/webapp/static/img/weather/\345\244\247\351\233\252.png"
deleted file mode 100644
index e4a238cde8f5acc3331f0ef97a822891bd3eb716..0000000000000000000000000000000000000000
Binary files "a/intellagric-portal-web/src/main/webapp/static/img/weather/\345\244\247\351\233\252.png" and /dev/null differ
diff --git "a/intellagric-portal-web/src/main/webapp/static/img/weather/\345\244\247\351\233\252\350\275\254\346\232\264\351\233\252.png" "b/intellagric-portal-web/src/main/webapp/static/img/weather/\345\244\247\351\233\252\350\275\254\346\232\264\351\233\252.png"
deleted file mode 100644
index 80f37fdf547b5329124fd7425fed08b37a0067c9..0000000000000000000000000000000000000000
Binary files "a/intellagric-portal-web/src/main/webapp/static/img/weather/\345\244\247\351\233\252\350\275\254\346\232\264\351\233\252.png" and /dev/null differ
diff --git "a/intellagric-portal-web/src/main/webapp/static/img/weather/\345\260\217\351\233\250.png" "b/intellagric-portal-web/src/main/webapp/static/img/weather/\345\260\217\351\233\250.png"
deleted file mode 100644
index ecfca66d16256a5e6d6aa9c4e9472d668edb7709..0000000000000000000000000000000000000000
Binary files "a/intellagric-portal-web/src/main/webapp/static/img/weather/\345\260\217\351\233\250.png" and /dev/null differ
diff --git "a/intellagric-portal-web/src/main/webapp/static/img/weather/\345\260\217\351\233\250\350\275\254\344\270\255\351\233\250.png" "b/intellagric-portal-web/src/main/webapp/static/img/weather/\345\260\217\351\233\250\350\275\254\344\270\255\351\233\250.png"
deleted file mode 100644
index dcf300bdb84748951159fb505cc2b52ac7f1f7e3..0000000000000000000000000000000000000000
Binary files "a/intellagric-portal-web/src/main/webapp/static/img/weather/\345\260\217\351\233\250\350\275\254\344\270\255\351\233\250.png" and /dev/null differ
diff --git "a/intellagric-portal-web/src/main/webapp/static/img/weather/\345\260\217\351\233\252.png" "b/intellagric-portal-web/src/main/webapp/static/img/weather/\345\260\217\351\233\252.png"
deleted file mode 100644
index a868686082f9cac1cd02c2cb9c0c392c40cee68a..0000000000000000000000000000000000000000
Binary files "a/intellagric-portal-web/src/main/webapp/static/img/weather/\345\260\217\351\233\252.png" and /dev/null differ
diff --git "a/intellagric-portal-web/src/main/webapp/static/img/weather/\345\260\217\351\233\252\350\275\254\344\270\255\351\233\252.png" "b/intellagric-portal-web/src/main/webapp/static/img/weather/\345\260\217\351\233\252\350\275\254\344\270\255\351\233\252.png"
deleted file mode 100644
index 3450362a604a703685e153a82078233a6509c0e7..0000000000000000000000000000000000000000
Binary files "a/intellagric-portal-web/src/main/webapp/static/img/weather/\345\260\217\351\233\252\350\275\254\344\270\255\351\233\252.png" and /dev/null differ
diff --git "a/intellagric-portal-web/src/main/webapp/static/img/weather/\345\274\272\346\262\231\345\260\230\346\232\264.png" "b/intellagric-portal-web/src/main/webapp/static/img/weather/\345\274\272\346\262\231\345\260\230\346\232\264.png"
deleted file mode 100644
index 1f8fc5fc45d3bc7da9c5f72874900f809acb2bd3..0000000000000000000000000000000000000000
Binary files "a/intellagric-portal-web/src/main/webapp/static/img/weather/\345\274\272\346\262\231\345\260\230\346\232\264.png" and /dev/null differ
diff --git "a/intellagric-portal-web/src/main/webapp/static/img/weather/\346\211\254\346\262\231.png" "b/intellagric-portal-web/src/main/webapp/static/img/weather/\346\211\254\346\262\231.png"
deleted file mode 100644
index 0aa8341e784d4fbc199cab0033d9fe59ea5a2ec2..0000000000000000000000000000000000000000
Binary files "a/intellagric-portal-web/src/main/webapp/static/img/weather/\346\211\254\346\262\231.png" and /dev/null differ
diff --git "a/intellagric-portal-web/src/main/webapp/static/img/weather/\346\231\264.png" "b/intellagric-portal-web/src/main/webapp/static/img/weather/\346\231\264.png"
deleted file mode 100644
index 3b184644d3339b3cf73c4d488489b6ae35bab68d..0000000000000000000000000000000000000000
Binary files "a/intellagric-portal-web/src/main/webapp/static/img/weather/\346\231\264.png" and /dev/null differ
diff --git "a/intellagric-portal-web/src/main/webapp/static/img/weather/\346\232\264\351\233\250.png" "b/intellagric-portal-web/src/main/webapp/static/img/weather/\346\232\264\351\233\250.png"
deleted file mode 100644
index 8931c39b7bae4281af46f5ffdca2e29f4d434c8a..0000000000000000000000000000000000000000
Binary files "a/intellagric-portal-web/src/main/webapp/static/img/weather/\346\232\264\351\233\250.png" and /dev/null differ
diff --git "a/intellagric-portal-web/src/main/webapp/static/img/weather/\346\232\264\351\233\250\350\275\254\345\244\247\346\232\264\351\233\250.png" "b/intellagric-portal-web/src/main/webapp/static/img/weather/\346\232\264\351\233\250\350\275\254\345\244\247\346\232\264\351\233\250.png"
deleted file mode 100644
index 9f3c34baa4ad1dfc53f10b96629ae37a89bc16bd..0000000000000000000000000000000000000000
Binary files "a/intellagric-portal-web/src/main/webapp/static/img/weather/\346\232\264\351\233\250\350\275\254\345\244\247\346\232\264\351\233\250.png" and /dev/null differ
diff --git "a/intellagric-portal-web/src/main/webapp/static/img/weather/\346\232\264\351\233\252.png" "b/intellagric-portal-web/src/main/webapp/static/img/weather/\346\232\264\351\233\252.png"
deleted file mode 100644
index af865ae0849695cd748c38dd35a703452a4556f7..0000000000000000000000000000000000000000
Binary files "a/intellagric-portal-web/src/main/webapp/static/img/weather/\346\232\264\351\233\252.png" and /dev/null differ
diff --git "a/intellagric-portal-web/src/main/webapp/static/img/weather/\346\262\231\345\260\230\346\232\264.png" "b/intellagric-portal-web/src/main/webapp/static/img/weather/\346\262\231\345\260\230\346\232\264.png"
deleted file mode 100644
index 2325b027f870717da19a28f26def87cac3bb128b..0000000000000000000000000000000000000000
Binary files "a/intellagric-portal-web/src/main/webapp/static/img/weather/\346\262\231\345\260\230\346\232\264.png" and /dev/null differ
diff --git "a/intellagric-portal-web/src/main/webapp/static/img/weather/\347\211\271\345\244\247\346\232\264\351\233\250.png" "b/intellagric-portal-web/src/main/webapp/static/img/weather/\347\211\271\345\244\247\346\232\264\351\233\250.png"
deleted file mode 100644
index 91a22bee378ab71d7cd1fc2dc0d37de1d70a163b..0000000000000000000000000000000000000000
Binary files "a/intellagric-portal-web/src/main/webapp/static/img/weather/\347\211\271\345\244\247\346\232\264\351\233\250.png" and /dev/null differ
diff --git "a/intellagric-portal-web/src/main/webapp/static/img/weather/\351\230\264.png" "b/intellagric-portal-web/src/main/webapp/static/img/weather/\351\230\264.png"
deleted file mode 100644
index e7663a8d0e5bed1ef47aa7463526d27f56ae5c11..0000000000000000000000000000000000000000
Binary files "a/intellagric-portal-web/src/main/webapp/static/img/weather/\351\230\264.png" and /dev/null differ
diff --git "a/intellagric-portal-web/src/main/webapp/static/img/weather/\351\230\265\351\233\250.png" "b/intellagric-portal-web/src/main/webapp/static/img/weather/\351\230\265\351\233\250.png"
deleted file mode 100644
index 8491e3d280431b7cc76b081e2e144abff3e744ce..0000000000000000000000000000000000000000
Binary files "a/intellagric-portal-web/src/main/webapp/static/img/weather/\351\230\265\351\233\250.png" and /dev/null differ
diff --git "a/intellagric-portal-web/src/main/webapp/static/img/weather/\351\230\265\351\233\252.png" "b/intellagric-portal-web/src/main/webapp/static/img/weather/\351\230\265\351\233\252.png"
deleted file mode 100644
index 6e69c743edf33dedb6a78c62b3e52cb7cdb8a224..0000000000000000000000000000000000000000
Binary files "a/intellagric-portal-web/src/main/webapp/static/img/weather/\351\230\265\351\233\252.png" and /dev/null differ
diff --git "a/intellagric-portal-web/src/main/webapp/static/img/weather/\351\233\250\345\212\240\351\233\252.png" "b/intellagric-portal-web/src/main/webapp/static/img/weather/\351\233\250\345\212\240\351\233\252.png"
deleted file mode 100644
index cf2c11111e813d3d7ac524d511d925ea430e37ae..0000000000000000000000000000000000000000
Binary files "a/intellagric-portal-web/src/main/webapp/static/img/weather/\351\233\250\345\212\240\351\233\252.png" and /dev/null differ
diff --git "a/intellagric-portal-web/src/main/webapp/static/img/weather/\351\233\267\351\230\265\351\233\250.png" "b/intellagric-portal-web/src/main/webapp/static/img/weather/\351\233\267\351\230\265\351\233\250.png"
deleted file mode 100644
index b78b4a4d14994bdf49d7b8fcaafd901bd72dd786..0000000000000000000000000000000000000000
Binary files "a/intellagric-portal-web/src/main/webapp/static/img/weather/\351\233\267\351\230\265\351\233\250.png" and /dev/null differ
diff --git "a/intellagric-portal-web/src/main/webapp/static/img/weather/\351\233\267\351\230\265\351\233\250\345\212\240\345\206\260\351\233\271.png" "b/intellagric-portal-web/src/main/webapp/static/img/weather/\351\233\267\351\230\265\351\233\250\345\212\240\345\206\260\351\233\271.png"
deleted file mode 100644
index 745950165cc64c158f6724741c0aa94f545b54ee..0000000000000000000000000000000000000000
Binary files "a/intellagric-portal-web/src/main/webapp/static/img/weather/\351\233\267\351\230\265\351\233\250\345\212\240\345\206\260\351\233\271.png" and /dev/null differ
diff --git "a/intellagric-portal-web/src/main/webapp/static/img/weather/\351\233\276.png" "b/intellagric-portal-web/src/main/webapp/static/img/weather/\351\233\276.png"
deleted file mode 100644
index 9e55a0a71428e86507b9507d3d2dd35e1828b298..0000000000000000000000000000000000000000
Binary files "a/intellagric-portal-web/src/main/webapp/static/img/weather/\351\233\276.png" and /dev/null differ
diff --git "a/intellagric-portal-web/src/main/webapp/static/img/weather/\351\234\276.png" "b/intellagric-portal-web/src/main/webapp/static/img/weather/\351\234\276.png"
deleted file mode 100644
index b92f80cc4f86276f94fc2d9cfa2fd6f604d8599e..0000000000000000000000000000000000000000
Binary files "a/intellagric-portal-web/src/main/webapp/static/img/weather/\351\234\276.png" and /dev/null differ
diff --git a/intellagric-sso-web/pom.xml b/intellagric-sso-web/pom.xml
index aa54515c865e04af7cf7a1f931526572e6fef1a5..870a119e7864b7d27849dbddf0ff55aaefb48eb8 100644
--- a/intellagric-sso-web/pom.xml
+++ b/intellagric-sso-web/pom.xml
@@ -90,9 +90,15 @@
junit
-
- fastdfs_client
- fastdfs_client
+
+
+
+
+
+
+ com.github.tobato
+ fastdfs-client
+ 1.25.3-RELEASE
diff --git a/intellagric-sso-web/src/main/resources/spring/springmvc.xml b/intellagric-sso-web/src/main/resources/spring/springmvc.xml
index 912885e1fee20c066ace1a7dd86c914f90671c18..1bf573e6687504fb5209bf3799ce9f5dc19d7f48 100644
--- a/intellagric-sso-web/src/main/resources/spring/springmvc.xml
+++ b/intellagric-sso-web/src/main/resources/spring/springmvc.xml
@@ -42,7 +42,7 @@
-
+
\ No newline at end of file
diff --git a/intellagric-sso/intellagric-sso-service/src/main/resources/conf/db.properties b/intellagric-sso/intellagric-sso-service/src/main/resources/conf/db.properties
index 15047319baf4e3b73cb45fcb33d80ffb7e870ccf..0608b77d125ce0683ff7796f87bb4a0cd2d11e7c 100644
--- a/intellagric-sso/intellagric-sso-service/src/main/resources/conf/db.properties
+++ b/intellagric-sso/intellagric-sso-service/src/main/resources/conf/db.properties
@@ -1,5 +1,5 @@
jdbc.driver=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://129.204.231.210:3306/intellagric?characterEncoding=utf-8
-jdbc.username=zhy
-jdbc.password=123
+jdbc.url=jdbc:mysql://120.55.45.168:3306/intellagric?characterEncoding=utf-8
+jdbc.username=root
+jdbc.password=feng980916
diff --git a/intellagric-sso/intellagric-sso-service/src/main/resources/spring/applicationContext-redis.xml b/intellagric-sso/intellagric-sso-service/src/main/resources/spring/applicationContext-redis.xml
index 209f1eba218cac4b6a42ee53c9ce40edfbb8b589..072428ed7ea619d04457aaa28d52327d423b94f9 100644
--- a/intellagric-sso/intellagric-sso-service/src/main/resources/spring/applicationContext-redis.xml
+++ b/intellagric-sso/intellagric-sso-service/src/main/resources/spring/applicationContext-redis.xml
@@ -1,53 +1,63 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pom.xml b/pom.xml
index 02d9e85176cf733bbdb78b46cbbaf65ee02e0854..2dd7322c00e53baa3b6f68fc18d0fcfa1caa0bb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -301,10 +301,16 @@
-
- fastdfs_client
- fastdfs_client
- 1.25
+
+
+
+
+
+
+
+ com.github.tobato
+ fastdfs-client
+ 1.25.3-RELEASE