Merge branch 'master' into dev

jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpController.java

@@ -43,6 +43,8 @@ public class JumpController extends BaseController {
         logger.info("User-Agent:{}", request.getHeader("user-agent"));
         RestApiResponse<?> response = null;
         try {
+            // 进入充电桩详情做一下鉴权
+            getMemberIdByAuthorization(request);
             PileConnectorVO vo = pileService.getPileDetailByPileSn(pileSn);
             response = new RestApiResponse<>(vo);
         } catch (BusinessException e) {
@@ -66,6 +68,8 @@ public class JumpController extends BaseController {
         logger.info("User-Agent:{}", request.getHeader("user-agent"));
         RestApiResponse<?> response = null;
         try {
+            // 进入充电桩详情做一下鉴权
+            getMemberIdByAuthorization(request);
             PileConnectorVO vo = pileService.getConnectorDetail(pileConnectorCode);
             response = new RestApiResponse<>(vo);
         } catch (BusinessException e) {

jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileConnectorInfoController.java

@@ -81,6 +81,7 @@ public class PileConnectorInfoController extends BaseController {
 	@Log(title = "充电桩枪口信息", businessType = BusinessType.UPDATE)
 	@PostMapping("/updateParkNo")
 	public RestApiResponse<?> updateParkNo(@RequestBody UpdateConnectorParkNoDTO dto) {
+		logger.info("修改车位号 param:{}", JSONObject.toJSONString(dto));
 		RestApiResponse<?> response = null;
 		try {
 			int i = pileConnectorInfoService.updateConnectorParkNo(dto);

jsowell-admin/src/main/resources/application.yml

@@ -36,10 +36,10 @@ token:
   header: Authorization
   # 令牌密钥
   secret: cdnflglzjoxjovuusklsqjtuup
-  # 令牌有效期（默认300分钟）
-  expireTime: 360
-  # 接口令牌有效期 一个月
-  serviceExpireTime: 43200
+  # 令牌有效期一天（分钟）
+  expireTime: 1440
+  # 接口令牌有效期 六个月 （分钟）
+  serviceExpireTime: 259200
 
 # 用户配置
 user: