1. 更新取消预约接口传参方式

2. 更新登录接口，新增返回userId
3. 更新浙里办接口调用地址
4. 更新线上端口

hmit-api/src/main/java/io/hmit/controller/ApiLoginController.java

@@ -103,6 +103,9 @@ public class ApiLoginController {
                 //判断是否已经存在了这条信息
                 UserEntity oldUser=userService.queryByIdnum(URLEncoder.encode(user_map.get("idnum").toString(), "UTF8"));
 
+                userMap.put("userId", user_map.get("userid"));
+                userMap.put("userNick", "");
+
                 if(oldUser==null){
                     //将获得的信息保存到个人登陆表
                     UserEntity user=new UserEntity();
@@ -155,6 +158,11 @@ public class ApiLoginController {
                 //判断是否已经存在了这条信息
                 UserEntity oldUser=userService.queryByIdnum(URLEncoder.encode(user_map.get("idNo").toString(), "UTF8"));
 
+                try {
+                    userMap.put("userId", user_map.get("userId"));
+                    userMap.put("userNick", ((Map<String, Object>) user_map.get("attributes")).get("nickname"));
+                }catch (Exception ignore) {}
+
                 if(oldUser==null){
                     //将获得的信息保存到个人登陆表
                     String idNo = user_map.get("idNo").toString();

hmit-api/src/main/java/io/hmit/modules/appointment/controller/AppointmentOrderController.java

@@ -152,9 +152,10 @@ public class AppointmentOrderController {
     }
 
     @Login
-    @GetMapping("/cancel/{id}")
+    @GetMapping("/cancel")
     @ApiOperation("预约取消")
-    public Result cancelReservation(@PathVariable("id") Long id,@ApiIgnore @LoginUser UserEntity user){
+    public Result cancelReservation(@RequestParam("id") Long id,
+                                    @ApiIgnore @LoginUser UserEntity user){
 
         AppointmentOrderDTO data = appointmentOrderService.get(id);
         data.setStatus(Constant.ReservationStatus.CANCEL.getValue());

hmit-api/src/main/java/io/hmit/modules/zlb/constants/Constants.java

@@ -9,11 +9,12 @@ public interface Constants {
     /**
      * 单点登录 ticketId换token的地址
      */
-    String ACCESS_TOKEN_URL = "https://ibcdsg.zj.gov.cn:8443/restapi/prod/IC33000020220329000007/uc/sso/access_token";
+    String ACCESS_TOKEN_URL = "https://bcdsg.zj.gov.cn:8443/restapi/prod/IC33000020220329000007/uc/sso/access_token";
+//    String ACCESS_TOKEN_URL = "https://ibcdsg.zj.gov.cn:8443/restapi/prod/IC33000020220329000007/uc/sso/access_token";
     /**
      * 单点登录 token获取用户信息地址
      */
-    String GET_USER_INFO_URL = "https://ibcdsg.zj.gov.cn:8443/restapi/prod/IC33000020220329000008/uc/sso/getUserInfo";
+    String GET_USER_INFO_URL = "https://bcdsg.zj.gov.cn:8443/restapi/prod/IC33000020220329000008/uc/sso/getUserInfo";
 
     /**
      * IRS请求携带的请求头

hmit-api/src/main/resources/application.yml

@@ -4,7 +4,7 @@ server:
     uri-encoding: UTF-8
     max-threads: 1000
     min-spare-threads: 30
-  port: 8081
+  port: 8082
   connection-timeout: 5000ms
   servlet:
     context-path: /hmit-api