git преди 5 години
родител
ревизия
110ca1db67

+ 5 - 1
core/pom.xml

@@ -155,7 +155,11 @@
         <artifactId>fastjson</artifactId>
         <version>1.2.66</version>
     </dependency>
-
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.58</version>
+        </dependency>
 
 
     </dependencies>

Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
site/src/main/java/com/mooctest/crowd/site/controller/CommonController.java


+ 4 - 0
site/src/main/java/com/mooctest/crowd/site/controller/CrowdProjectController.java

@@ -198,6 +198,10 @@ public class CrowdProjectController {
         return projectService.modifyAllData();
     }
 
+    /**
+     * 获取平台总体数据
+     * @return
+     */
     @RequestMapping(value = "/api/allproject", method = RequestMethod.GET)
     public  List<CrowdTestProject>  getByProject(){
         return projectService.getByProject();

+ 0 - 1
site/src/main/java/com/mooctest/crowd/site/controller/PersonalDataController.java

@@ -11,7 +11,6 @@ import org.codehaus.jettison.json.JSONException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-
 @RestController
 @RequestMapping("/api/personal")
 public class PersonalDataController {

+ 0 - 1
site/src/main/java/com/mooctest/crowd/site/controller/UserController.java

@@ -308,7 +308,6 @@ public class UserController extends BaseController {
      */
     @RequestMapping(value = "index/address",method = RequestMethod.GET)
     public Area getAddressByIp(HttpServletRequest request) throws UnsupportedEncodingException {
-
          String ip=DataUtils.getClientIp(request);
          LOG.info("ip地址是========"+ip);
           Area   area= AddressUtils.getProvinceName(ip);

Някои файлове не бяха показани, защото твърде много файлове са промени