Browse Source

修复jsonobject未初始化引起的异常

master
xyiege 4 years ago
parent
commit
5185e267eb
  1. 1
      src/main/java/cn/chjyj/szwh/SzwhApplication.java
  2. 2
      src/main/java/cn/chjyj/szwh/controller/BaseController.java
  3. 13
      src/main/java/cn/chjyj/szwh/controller/api/TestController.java

1
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) {

2
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();
}

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

Loading…
Cancel
Save