Merge branch '转web' into 'master'

add

See merge request !9

src/main/java/com/gic/qywx/self/QywxController.java

@@ -4,9 +4,7 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import javax.servlet.http.HttpServletRequest;
-
 import com.alibaba.fastjson.JSONObject;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.mime.content.ByteArrayBody;

src/main/webapp/WEB-INF/spring-servlet.xml

@@ -98,16 +98,4 @@
             </list>
         </property>
     </bean>
-
-    <!-- 跨域配置 -->
-    <mvc:cors>
-        <mvc:mapping path="/**"
-                     allowed-headers="*"
-                     allowed-origins="*"
-                     allowed-methods="GET,POST,PUT,DELETE,OPTIONS"
-                     allow-credentials="true"
-                     max-age="3600"
-        />
-    </mvc:cors>
-
 </beans>
\ No newline at end of file