From 5185e267eb8bd20b558b8378394fef22bbe841c6 Mon Sep 17 00:00:00 2001
From: xioayue <xc@xyiege.com>
Date: Sat, 2 Jul 2022 23:24:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Djsonobject=E6=9C=AA=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96=E5=BC=95=E8=B5=B7=E7=9A=84=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/cn/chjyj/szwh/SzwhApplication.java    |  1 -
 .../cn/chjyj/szwh/controller/BaseController.java    |  2 +-
 .../chjyj/szwh/controller/api/TestController.java   | 13 +++++++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

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;
     }
 }