Browse Source

Merge branch 'yanyuan' of dd.tall.wiki:ccsens_wiki/ccsenscloud into yanyuan

yanyuan
zhizhi wu 4 years ago
parent
commit
22ace81d2b
  1. 1
      cloudutil/src/main/resources/application-util-prod.yml
  2. 32
      signin/src/main/java/com/ccsens/signin/api/UserController.java
  3. 8
      signin/src/main/java/com/ccsens/signin/service/ProjectService.java
  4. 6
      signin/src/main/resources/application-prod.yml
  5. 4
      signin/src/main/resources/application.yml
  6. 2
      signin/src/main/resources/mapper_dao/ProjectDap.xml
  7. 35
      util/src/main/java/com/ccsens/util/config/ControllerExceptionHandler.java
  8. 7
      util/src/main/java/com/ccsens/util/wx/WxXcxUtil.java

1
cloudutil/src/main/resources/application-util-prod.yml

@ -85,6 +85,7 @@ eureka:
# defaultZone: http://admin:admin@101.201.226.21:7010/eureka/
defaultZone: http://admin:admin@121.36.3.207:7010/eureka/
# defaultZone: http://admin:admin@127.0.0.1:7010/eureka/
# defaultZone: http://admin:admin@test.tall.wiki:7010/eureka/
instance:
# 是否注册IP到eureka server,如不指定或设为false,那就回注册主机名到eureka server

32
signin/src/main/java/com/ccsens/signin/api/UserController.java

@ -441,38 +441,6 @@ public class UserController {
})
@RequestMapping(value = "token",method = RequestMethod.GET,produces = {"application/json;charset=UTF-8"})
public JsonResponse<UserVo.TokenToUserId> getUserByToken(@RequestParam(required = true) String token) throws Exception {
// long start = System.currentTimeMillis();
// UserVo.TokenToUserId tokenToUserId = new UserVo.TokenToUserId();
// // 验证token是否存在
// String tokenStr = token;
// if (tokenStr == null || !tokenStr.startsWith(WebConstant.HEADER_KEY_TOKEN_PREFIX)) {
// return JsonResponse.newInstance().ok(CodeEnum.NOT_LOGIN);
// }
// String userToken = tokenStr.substring(WebConstant.HEADER_KEY_TOKEN_PREFIX.length());
//
// //验证token是否有效
// Claims claims = null;
// try {
// claims = JwtUtil.parseJWT(userToken, WebConstant.JWT_ACCESS_TOKEN_SECERT);
// }catch(Exception e){
// return JsonResponse.newInstance().ok(CodeEnum.NOT_LOGIN);
// }
// //验证用户存根
// if(userService.tokenNotExistInCache(Long.valueOf(claims.getSubject()))){
// return JsonResponse.newInstance().ok(CodeEnum.NOT_LOGIN);
// }
// //验证用户是否禁用
// SysUser user = userService.getUserById(Long.valueOf(claims.getSubject()));
// if(user.getRecStatus() == WebConstant.REC_STATUS.Disabled.value){
// return JsonResponse.newInstance().ok(CodeEnum.NOT_LOGIN);
// }
// tokenToUserId.setId(Long.valueOf(claims.getSubject()));
// long end = System.currentTimeMillis();
// log.info("根据token查找userId用时:{}",end - start);
log.info("MustLogin根据token查找UserId:{}",token);
long start = System.currentTimeMillis();

8
signin/src/main/java/com/ccsens/signin/service/ProjectService.java

@ -304,7 +304,7 @@ public class ProjectService implements IProjectService{
//调用业务系统删除项目
param.setUserId(userId);
String url = projectList.getUrl() + "/project/tallDelProject";
try {
log.info("调用业务系统的接口合并用户:{}--{}", url, param);
String postBody = RestTemplateUtil.postBody(url, param);
System.out.println(postBody);
@ -312,11 +312,7 @@ public class ProjectService implements IProjectService{
Integer code = jsonObject.getInteger("code");
if (code == null || code != 200) {
throw new BaseException(jsonObject.getString("date"));
}
}catch (Exception e){
log.error("接口调用异常",e);
throw new BaseException(CodeEnum.DELETE_PROJECT_ERROR);
throw new BaseException(jsonObject.getString("msg"));
}
}

6
signin/src/main/resources/application-prod.yml

@ -11,7 +11,7 @@ spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
rabbitmq:
host: 121.36.3.207
host: 127.0.0.1
password: 111111
port: 5672
username: admin
@ -32,11 +32,9 @@ swagger:
enable: false
eureka:
instance:
# www.tall.wiki
# ip-address: 140.143.228.3
# ip-address: 81.70.54.64
ip-address: 121.36.3.207
# ip-address: 101.201.226.21
# ip-address: 127.0.0.1
gatewayUrl: https://www.tall.wiki/gateway/
notGatewayUrl: https://www.tall.wiki/

4
signin/src/main/resources/application.yml

@ -1,5 +1,5 @@
spring:
profiles:
active: dev
include: util-dev,common
active: prod
include: util-prod,common

2
signin/src/main/resources/mapper_dao/ProjectDap.xml

@ -48,7 +48,7 @@
and u.rec_status = 0
WHERE
u.id is null
ORDER BY p.sort
ORDER BY p.sort,p.startTime DESC,id DESC
</select>

35
util/src/main/java/com/ccsens/util/config/ControllerExceptionHandler.java

@ -38,8 +38,8 @@ public class ControllerExceptionHandler {
// }
@ExceptionHandler(value = MethodArgumentNotValidException.class)
@ResponseBody
public JsonResponse validateExceptionHandlero(HttpServletRequest req,
// @ResponseBody
public void validateExceptionHandlero(HttpServletRequest req,HttpServletResponse response,
MethodArgumentNotValidException e){
BindingResult bindingResult = e.getBindingResult();
// StringBuilder errorMesssage = new StringBuilder();
@ -51,26 +51,29 @@ public class ControllerExceptionHandler {
// errorMesssage.append(bindingResult.getFieldErrors().get(0).getDefaultMessage());
// e.printStackTrace();
log.error("MethodArgumentNotValidException",e);
return JsonResponse.newInstance().fail(CodeEnum.PARAM_NULL.getCode(),bindingResult.getFieldError().getDefaultMessage());
// return JsonResponse.newInstance().fail(CodeEnum.PARAM_NULL.getCode(),bindingResult.getFieldError().getDefaultMessage());
responseError(response, JsonResponse.newInstance().fail(-1,e.getMessage()));
}
@ExceptionHandler(value = BindException.class)
@ResponseBody
public JsonResponse handleBindException(BindException e) {
// @ResponseBody
public void handleBindException(HttpServletResponse response, BindException e) {
// ex.getFieldError():随机返回一个对象属性的异常信息。如果要一次性返回所有对象属性异常信息,则调用ex.getAllErrors()
FieldError fieldError = e.getFieldError();
StringBuilder sb = new StringBuilder();
sb.append(fieldError.getField()).append("=[").append(fieldError.getRejectedValue()).append("]")
.append(fieldError.getDefaultMessage());
log.error("BindException", e);
return JsonResponse.newInstance().fail(-11,sb.toString());
responseError(response, JsonResponse.newInstance().fail(-1,e.getMessage()));
// return JsonResponse.newInstance().fail(-11,sb.toString());
}
@ExceptionHandler(value = HttpMessageNotReadableException.class)
@ResponseBody
public JsonResponse handleHttpMessageNotReadableException(HttpMessageNotReadableException e) {
// @ResponseBody
public void handleHttpMessageNotReadableException(HttpServletResponse response, HttpMessageNotReadableException e) {
log.error("HttpMessageNotReadableException", e);
return JsonResponse.newInstance().fail(-12,e.getMessage());
// return JsonResponse.newInstance().fail(-12,e.getMessage());
responseError(response, JsonResponse.newInstance().fail(-1,e.getMessage()));
}
@ExceptionHandler(value = BaseException.class)
@ -83,18 +86,24 @@ public class ControllerExceptionHandler {
} else {
ok = JsonResponse.newInstance().fail(e.getCode(),e.getMessage());
}
responseError(response, ok);
}
private void responseError(HttpServletResponse response, JsonResponse ok) {
try {
HttpServletUtil.responseJson(response,
JacksonUtil.beanToJson(ok));
} catch (Exception e1) {
log.error("返回异常出错:", e);
log.error("返回异常出错:", e1);
}
}
@ExceptionHandler(value = Exception.class)
@ResponseBody
public JsonResponse jsonExceptionHandler(HttpServletRequest req, Exception e) {
// @ResponseBody
public void jsonExceptionHandler(HttpServletRequest req, HttpServletResponse response, Exception e) {
log.error("Exception",e);
return JsonResponse.newInstance().fail(-1,e.getMessage());
responseError(response, JsonResponse.newInstance().fail(-1,e.getMessage()));
// return JsonResponse.newInstance().fail(-1,e.getMessage());
}
}

7
util/src/main/java/com/ccsens/util/wx/WxXcxUtil.java

@ -185,6 +185,9 @@ public class WxXcxUtil {
// 燕园小程序
private static final String APPID_YANYUAN = "wx733e229f00dc5c6f";
private static final String SECRET_YANYUAN = "9aa0a81973cc5f13c02548b5244accc2";
//物联网 FIOT
private static final String APP_KEY_FIOT = "mEulfDBBOFeOjGavy";
private static final String APP_SECRET_FIOT = "FaFKWiwVUWbJmfxVnSdd";
private static final String mchid = "";
private static final String key = "";
@ -208,6 +211,8 @@ public class WxXcxUtil {
return appid_basic_car;
case "yanyuan":
return APPID_YANYUAN;
case "FIOT":
return APP_KEY_FIOT;
default:
return appid;
}
@ -231,6 +236,8 @@ public class WxXcxUtil {
return secret_basic_car;
case "yanyuan":
return SECRET_YANYUAN;
case "FIOT":
return APP_SECRET_FIOT;
default:
return secret;
}

Loading…
Cancel
Save