|
@@ -40,24 +40,16 @@ public class JsonController {
|
|
|
*/
|
|
*/
|
|
|
@RequestMapping(value = "/api/getWeather", method = RequestMethod.GET, produces = "application/json; charset=utf-8")
|
|
@RequestMapping(value = "/api/getWeather", method = RequestMethod.GET, produces = "application/json; charset=utf-8")
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
|
- public String getWeather(String token, String city) {
|
|
|
|
|
|
|
+ public String getWeather(String s, String city) {
|
|
|
|
|
+ String token = StringTool.getRawToken(s);
|
|
|
WeatherBean weatherBean = new WeatherBean();
|
|
WeatherBean weatherBean = new WeatherBean();
|
|
|
// get过来的参数,会乱码
|
|
// get过来的参数,会乱码
|
|
|
String cityUtf8 = StringTool.getUtf8String(city);
|
|
String cityUtf8 = StringTool.getUtf8String(city);
|
|
|
|
|
|
|
|
// 根据token查找用户
|
|
// 根据token查找用户
|
|
|
- User dbUserBean;
|
|
|
|
|
- try {
|
|
|
|
|
- List<User> dbUserList = userRepository.findUserByToken(token);
|
|
|
|
|
- if (dbUserList != null && dbUserList.size() == 1) {
|
|
|
|
|
- dbUserBean = dbUserList.get(0);
|
|
|
|
|
- } else {
|
|
|
|
|
- weatherBean.msg = "请重新登录";
|
|
|
|
|
- return JSON.toJSONString(weatherBean);
|
|
|
|
|
- }
|
|
|
|
|
- } catch (Exception e) {
|
|
|
|
|
- e.printStackTrace();
|
|
|
|
|
- weatherBean.msg = "请求无效";
|
|
|
|
|
|
|
+ User dbUserBean = RequestTool.getUserByToken(userRepository, token);
|
|
|
|
|
+ if (dbUserBean == null) {
|
|
|
|
|
+ weatherBean.msg = "请重新登录";
|
|
|
return JSON.toJSONString(weatherBean);
|
|
return JSON.toJSONString(weatherBean);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -76,21 +68,14 @@ public class JsonController {
|
|
|
*/
|
|
*/
|
|
|
@RequestMapping(value = "/api/getYiji", method = RequestMethod.GET, produces = "application/json; charset=utf-8")
|
|
@RequestMapping(value = "/api/getYiji", method = RequestMethod.GET, produces = "application/json; charset=utf-8")
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
|
- public String getYiji(String token) {
|
|
|
|
|
|
|
+ public String getYiji(String s) {
|
|
|
|
|
+ String token = StringTool.getRawToken(s);
|
|
|
YijiBean yijiBean = new YijiBean();
|
|
YijiBean yijiBean = new YijiBean();
|
|
|
|
|
|
|
|
// 根据token查找用户
|
|
// 根据token查找用户
|
|
|
- User dbUserBean;
|
|
|
|
|
- try {
|
|
|
|
|
- List<User> dbUserList = userRepository.findUserByToken(token);
|
|
|
|
|
- if (dbUserList != null && dbUserList.size() == 1) {
|
|
|
|
|
- dbUserBean = dbUserList.get(0);
|
|
|
|
|
- } else {
|
|
|
|
|
- yijiBean.msg = "请重新登录";
|
|
|
|
|
- return JSON.toJSONString(yijiBean);
|
|
|
|
|
- }
|
|
|
|
|
- } catch (Exception e) {
|
|
|
|
|
- yijiBean.msg = "请求无效";
|
|
|
|
|
|
|
+ User dbUserBean = RequestTool.getUserByToken(userRepository, token);
|
|
|
|
|
+ if (dbUserBean == null) {
|
|
|
|
|
+ yijiBean.msg = "请重新登录";
|
|
|
return JSON.toJSONString(yijiBean);
|
|
return JSON.toJSONString(yijiBean);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -192,13 +177,20 @@ public class JsonController {
|
|
|
*/
|
|
*/
|
|
|
@RequestMapping(value = "/api/getJson", method = RequestMethod.GET, produces = "application/json; charset=utf-8")
|
|
@RequestMapping(value = "/api/getJson", method = RequestMethod.GET, produces = "application/json; charset=utf-8")
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
|
- public String getJson(String email) {
|
|
|
|
|
|
|
+ public String getJson(String s) {
|
|
|
|
|
+ // 根据token查找用户
|
|
|
|
|
+ String token = StringTool.getRawToken(s);
|
|
|
|
|
+ User dbUserBean = RequestTool.getUserByToken(userRepository, token);
|
|
|
|
|
+ if (dbUserBean == null) {
|
|
|
|
|
+ return "请重新登录";
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
JsonBean jsonBean = null;
|
|
JsonBean jsonBean = null;
|
|
|
try {
|
|
try {
|
|
|
- jsonBean = jsonRepository.findJsonBeanByEmail(email);
|
|
|
|
|
- } catch (Exception e) {
|
|
|
|
|
- e.printStackTrace();
|
|
|
|
|
- return "数据库数据重复";
|
|
|
|
|
|
|
+ jsonBean = jsonRepository.findJsonBeanByEmail(dbUserBean.getEmail());
|
|
|
|
|
+ } catch (Exception exception) {
|
|
|
|
|
+ exception.printStackTrace();
|
|
|
|
|
+ return "请重新登录";
|
|
|
}
|
|
}
|
|
|
return jsonBean.json;
|
|
return jsonBean.json;
|
|
|
}
|
|
}
|