Ver código fonte

一些改动

DingXiaoYu 3 anos atrás
pai
commit
8a1d2930e4

+ 8 - 1
.idea/libraries/Maven__org_scala_lang_scala_library_2_12_10.xml

@@ -1,5 +1,12 @@
 <component name="libraryTable">
-  <library name="Maven: org.scala-lang:scala-library:2.12.10">
+  <library name="Maven: org.scala-lang:scala-library:2.12.10" type="Scala">
+    <properties>
+      <compiler-classpath>
+        <root url="file://$MAVEN_REPOSITORY$/org/scala-lang/scala-compiler/2.12.10/scala-compiler-2.12.10.jar" />
+        <root url="file://$MAVEN_REPOSITORY$/org/scala-lang/scala-library/2.12.10/scala-library-2.12.10.jar" />
+        <root url="file://$MAVEN_REPOSITORY$/org/scala-lang/scala-reflect/2.12.10/scala-reflect-2.12.10.jar" />
+      </compiler-classpath>
+    </properties>
     <CLASSES>
       <root url="jar://$MAVEN_REPOSITORY$/org/scala-lang/scala-library/2.12.10/scala-library-2.12.10.jar!/" />
     </CLASSES>

+ 1 - 1
java_compile/src/main/java/com/example/controller/ConfigController.java

@@ -101,7 +101,7 @@ public class ConfigController {
     }
 
     @GetMapping(value = "/delete")
-    public Response deleteModelByModelId(@RequestParam(value = "configId", required = false) String configId) {
+    public Response deleteModelByConfigId(@RequestParam(value = "configId", required = false) String configId) {
         try {
             return new NormalRes(configService.deleteConfigById(Integer.parseInt(configId)));
         } catch (Exception e) {

+ 2 - 1
java_compile/src/main/java/com/example/controller/LoginController.java

@@ -5,6 +5,7 @@ import com.example.controller.response.NormalRes;
 import com.example.controller.response.Response;
 import com.example.entity.User;
 import com.example.services.LoginService;
+import com.example.services.pojo.LoginPojo;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,7 +32,7 @@ public class LoginController {
     public Response userLogin(@RequestParam(value="username", required = false) String username,
                               @RequestParam(value = "password", required = false) String password) {
         try {
-            val rsl = loginService.verifyUser(username, password);
+            LoginPojo rsl = loginService.verifyUser(username, password);
             return new NormalRes(rsl);
         } catch (NullPointerException e) {
             e.printStackTrace();

+ 2 - 0
java_compile/src/main/java/com/example/controller/response/Response.java

@@ -1,12 +1,14 @@
 package com.example.controller.response;
 
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * response
  * Created by lucas on 2016/11/10.
  */
 @Data
+@NoArgsConstructor
 public class Response {
     private final Long timestamp = System.currentTimeMillis();
     private int status;

+ 2 - 2
java_compile/src/main/java/com/example/controller/vo/FileInfoVO.java

@@ -22,8 +22,8 @@ public class FileInfoVO {
     private String userId;
     //filename
     private String filename;
-    //filename
-    private String              folder;
+    //fileFolderName
+    private String folder;
     //file structure
     private Map<String, String> fileStrucInfo;