diff --git a/src/main/java/cn/chjyj/szwh/SzwhApplication.java b/src/main/java/cn/chjyj/szwh/SzwhApplication.java index 952ba36..1109c55 100644 --- a/src/main/java/cn/chjyj/szwh/SzwhApplication.java +++ b/src/main/java/cn/chjyj/szwh/SzwhApplication.java @@ -5,7 +5,6 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -@MapperScan("cn.chjyj.szwh.mapper") public class SzwhApplication { public static void main(String[] args) { diff --git a/src/main/java/cn/chjyj/szwh/controller/BaseController.java b/src/main/java/cn/chjyj/szwh/controller/BaseController.java index e62a15d..433be26 100644 --- a/src/main/java/cn/chjyj/szwh/controller/BaseController.java +++ b/src/main/java/cn/chjyj/szwh/controller/BaseController.java @@ -7,5 +7,5 @@ import com.alibaba.fastjson.JSONObject; */ public abstract class BaseController { // jsonobject 全局 - protected JSONObject jsonObject=null; + protected JSONObject jsonObject=new JSONObject(); } diff --git a/src/main/java/cn/chjyj/szwh/controller/api/TestController.java b/src/main/java/cn/chjyj/szwh/controller/api/TestController.java index 50389c3..272fb8c 100644 --- a/src/main/java/cn/chjyj/szwh/controller/api/TestController.java +++ b/src/main/java/cn/chjyj/szwh/controller/api/TestController.java @@ -1,24 +1,29 @@ package cn.chjyj.szwh.controller.api; import cn.chjyj.szwh.annotation.PassToken; +import cn.chjyj.szwh.controller.BaseController; +import com.alibaba.fastjson.JSONObject; import org.springframework.boot.SpringBootVersion; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.swing.*; + /** * test controller */ - @RestController @RequestMapping("/api/v1") -public class TestController { +public class TestController extends BaseController { /** * test * @return */ @PassToken @RequestMapping("/version") - public String version(){ - return SpringBootVersion.getVersion(); + public JSONObject version(){ + jsonObject.put("data","ver:"+ SpringBootVersion.getVersion()); + jsonObject.put("code",200); + return jsonObject; } }