Fedex / iClear-Connect-Pre-Clearance

Go to a project
Toggle navigation Toggle navigation pinning
tao.mo
799fbb8e 1 parent 5c64b7b8

common-dao、common-dependencies、kafka-cndc-server、manager-server、biz-customer | 修改 | 国际化配置以及表结构调整 

mt
2024年11月7日20:05:55
Expand all
Inline Side-by-side
Showing 39 changed files with 824 additions and 70 deletions
1 +package com.fedex.connect.customer.config;
2 +
3 +import org.springframework.context.annotation.Bean;
4 +import org.springframework.context.annotation.Configuration;
5 +import org.springframework.context.annotation.Profile;
6 +import springfox.documentation.builders.ApiInfoBuilder;
7 +import springfox.documentation.builders.PathSelectors;
8 +import springfox.documentation.builders.RequestHandlerSelectors;
9 +import springfox.documentation.service.ApiInfo;
10 +import springfox.documentation.service.ApiKey;
11 +import springfox.documentation.service.AuthorizationScope;
12 +import springfox.documentation.service.SecurityReference;
13 +import springfox.documentation.spi.DocumentationType;
14 +import springfox.documentation.spi.service.contexts.SecurityContext;
15 +import springfox.documentation.spring.web.plugins.Docket;
16 +import springfox.documentation.swagger2.annotations.EnableSwagger2;
17 +
18 +import java.util.ArrayList;
19 +import java.util.List;
20 +
21 +/**
22 + * SwaggerConfig配置类.开启Swagger2,自动生成文档
23 + *
24 + * @author EDY
25 + */
26 +@Configuration
27 +@EnableSwagger2
28 +@Profile({"dev", "test", "uat"})
29 +public class SwaggerConfig {
30 +
31 + /**
32 + * 扫描Controller包的路径
33 + */
34 + public static final String BASE_PACKAGE = "com.fedex.connect.customer.controller";
35 +
36 + /**
37 + * API信息
38 + */
39 + public static final String API_INFO = "iClear Connect-Pre-Clearance Biz-customer APIs";
40 + public static final String API_VERSION = "1.0";
41 +
42 + /**
43 + * 创建API应用
44 + *
45 + * @return
46 + */
47 + @Bean
48 + public Docket restApi() {
49 + return new Docket(DocumentationType.SWAGGER_2)
50 + .apiInfo(apiInfo(API_INFO, API_VERSION))
51 + .useDefaultResponseMessages(true)
52 + .forCodeGeneration(false)
53 + .select()
54 + // 扫描指定目录的API
55 + .apis(RequestHandlerSelectors.basePackage(BASE_PACKAGE))
56 + .paths(PathSelectors.any())
57 + .build()
58 + //配置全局io.swagger.model
59 + .securitySchemes(securitySchemes())
60 + //配置将安全上下文应用于哪些api操作(通过正则表达式模式)和HTTP方法
61 + .securityContexts(securityContexts());
62 + }
63 +
64 + /**
65 + * API的基本信息
66 + *
67 + * @return
68 + */
69 + private ApiInfo apiInfo(String title, String version) {
70 + return new ApiInfoBuilder().title(title).description(API_INFO).version(version).build();
71 + }
72 +
73 + private List<ApiKey> securitySchemes() {
74 + List<ApiKey> apiKeys = new ArrayList<>();
75 + /*SecurityConstants.TOKEN_HEADER*/
76 + apiKeys.add(new ApiKey("Authorization", "Authorization", "header"));
77 + return apiKeys;
78 + }
79 +
80 + private List<SecurityContext> securityContexts() {
81 + List<SecurityContext> securityContexts = new ArrayList<>();
82 + securityContexts.add(SecurityContext.builder()
83 + .securityReferences(defaultAuth())
84 + //指定/auth 请求下不会携带全局参数
85 + .forPaths(PathSelectors.regex("^(?!/auth).*$")).build());
86 + return securityContexts;
87 + }
88 + private List<SecurityReference> defaultAuth() {
89 + AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
90 + AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
91 + authorizationScopes[0] = authorizationScope;
92 + List<SecurityReference> securityReferences = new ArrayList<>();
93 + securityReferences.add(new SecurityReference("Authorization", authorizationScopes));
94 + return securityReferences;
95 + }
96 +}
...@@ -4,12 +4,14 @@ import com.fedex.connect.common.dependencies.date.model.LogShowModel; ...@@ -4,12 +4,14 @@ import com.fedex.connect.common.dependencies.date.model.LogShowModel;
4 import com.fedex.connect.common.dependencies.date.vo.ResponseVo; 4 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
5 import com.fedex.connect.common.dependencies.enums.BaseResponseCode; 5 import com.fedex.connect.common.dependencies.enums.BaseResponseCode;
6 import com.fedex.connect.common.dependencies.util.CurrentUserInfo; 6 import com.fedex.connect.common.dependencies.util.CurrentUserInfo;
7 +import com.fedex.connect.common.model.sys.User;
7 import com.fedex.connect.customer.controller.base.BaseController; 8 import com.fedex.connect.customer.controller.base.BaseController;
8 import com.fedex.connect.customer.controller.biz.IAttachmentQueryController; 9 import com.fedex.connect.customer.controller.biz.IAttachmentQueryController;
9 import com.fedex.connect.customer.data.bo.LongBo; 10 import com.fedex.connect.customer.data.bo.LongBo;
10 import io.swagger.annotations.Api; 11 import io.swagger.annotations.Api;
11 import io.swagger.annotations.ApiOperation; 12 import io.swagger.annotations.ApiOperation;
12 import lombok.extern.slf4j.Slf4j; 13 import lombok.extern.slf4j.Slf4j;
14 +import oracle.jdbc.proxy.annotation.Post;
13 import org.springframework.web.bind.annotation.PostMapping; 15 import org.springframework.web.bind.annotation.PostMapping;
14 import org.springframework.web.bind.annotation.RequestBody; 16 import org.springframework.web.bind.annotation.RequestBody;
15 import org.springframework.web.bind.annotation.RequestMapping; 17 import org.springframework.web.bind.annotation.RequestMapping;
...@@ -34,15 +36,25 @@ public class AttachmentQueryController extends BaseController implements IAttach ...@@ -34,15 +36,25 @@ public class AttachmentQueryController extends BaseController implements IAttach
34 if (responseResultVo != null){ 36 if (responseResultVo != null){
35 return responseResultVo; 37 return responseResultVo;
36 } 38 }
37 - Long userId = null; 39 + /**
38 - try { 40 + * 获取当前用户信息
39 - userId = CurrentUserInfo.getUserId(); 41 + */
40 - //userId = 0L; 42 + User user = this.getCurrentUserInfo();
41 - } catch (Exception e) { 43 + return attachmentQueryService.findHistory(user.getId(),bo.getId());
42 - log.error(LogShowModel.showException("Exception", e));
43 - return ResponseVo.fail(localeMessageUtil.getMessage(BaseResponseCode.TOKEN_FORMAT_ERROR.getMsg()));
44 - }
45 - return attachmentQueryService.findHistory(userId,bo.getId());
46 } 44 }
47 45
46 +// @PostMapping("/history")
47 +// @ApiOperation(value = "历史上传记录查询")
48 +// @Override
49 +// public ResponseVo findHistory(@RequestBody LongBo bo) {
50 +// ResponseVo responseResultVo = attachmentValidate.preCheckForFindHistory(bo);
51 +// if (responseResultVo != null){
52 +// return responseResultVo;
53 +// }
54 +// /**
55 +// * 获取当前用户信息
56 +// */
57 +// User user = this.getCurrentUserInfo();
58 +// return attachmentQueryService.findHistory(user.getId(),bo.getId());
59 +// }
48 } 60 }
......
...@@ -35,7 +35,10 @@ public class ConsignmentController extends BaseController implements IConsignmen ...@@ -35,7 +35,10 @@ public class ConsignmentController extends BaseController implements IConsignmen
35 if (responseResultVo != null){ 35 if (responseResultVo != null){
36 return responseResultVo; 36 return responseResultVo;
37 } 37 }
38 - User user = getUserInfo(localeMessageUtil); 38 + /**
39 + * 获取当前用户信息
40 + */
41 + User user = this.getCurrentUserInfo();
39 return consignmentService.add(bo,user); 42 return consignmentService.add(bo,user);
40 } 43 }
41 } 44 }
......
...@@ -42,17 +42,20 @@ public class ConsignmentQueryController extends BaseController implements IConsi ...@@ -42,17 +42,20 @@ public class ConsignmentQueryController extends BaseController implements IConsi
42 @Override 42 @Override
43 public ResponseVo findConsignmentInfo(@ApiParam(value="运单ID",required = true) @PathVariable(value = "id") Long id) { 43 public ResponseVo findConsignmentInfo(@ApiParam(value="运单ID",required = true) @PathVariable(value = "id") Long id) {
44 /** 44 /**
45 + * 运单id校验
46 + */
47 + consignmentInfoValidate.validateConsignmentId(id);
48 + /**
45 * 获取当前用户信息 49 * 获取当前用户信息
46 */ 50 */
47 User user = this.getCurrentUserInfo(); 51 User user = this.getCurrentUserInfo();
52 + ConsignmentInfoQuery consignmentInfoQuery = new ConsignmentInfoQuery();
53 + consignmentInfoQuery.setUserId(user.getId());
54 + consignmentInfoQuery.setUserUuid(user.getUserUuid());
55 + consignmentInfoQuery.setConsignmentId(id);
48 /** 56 /**
49 - * 运单id校验 57 + * 运单信息查询
50 */ 58 */
51 - consignmentInfoValidate.validateConsignmentId(id); 59 + return consignmentQueryService.findConsignmentInfo(consignmentInfoQuery);
52 - ConsignmentInfoQuery detailQuery = new ConsignmentInfoQuery();
53 - detailQuery.setUserId(user.getId());
54 - detailQuery.setUuid(user.getUserUuid());
55 - detailQuery.setConsignmentId(id);
56 - return consignmentQueryService.findConsignmentInfo(detailQuery);
57 } 60 }
58 } 61 }
......
...@@ -12,7 +12,7 @@ public class ConsignmentInfoQuery { ...@@ -12,7 +12,7 @@ public class ConsignmentInfoQuery {
12 //用户id 12 //用户id
13 private Long userId; 13 private Long userId;
14 //用户uuid 14 //用户uuid
15 - private String uuid; 15 + private String userUuid;
16 //运单id 16 //运单id
17 private Long consignmentId; 17 private Long consignmentId;
18 } 18 }
......
...@@ -2,6 +2,7 @@ package com.fedex.connect.customer.repository.dao; ...@@ -2,6 +2,7 @@ package com.fedex.connect.customer.repository.dao;
2 2
3 import com.fedex.connect.common.model.biz.Consignment; 3 import com.fedex.connect.common.model.biz.Consignment;
4 import com.fedex.connect.customer.data.dto.FindConsignmentsDto; 4 import com.fedex.connect.customer.data.dto.FindConsignmentsDto;
5 +import com.fedex.connect.customer.data.query.ConsignmentInfoQuery;
5 import com.fedex.connect.customer.data.query.ConsignmentQuery; 6 import com.fedex.connect.customer.data.query.ConsignmentQuery;
6 import org.apache.ibatis.annotations.Mapper; 7 import org.apache.ibatis.annotations.Mapper;
7 import org.apache.ibatis.annotations.Param; 8 import org.apache.ibatis.annotations.Param;
...@@ -22,4 +23,8 @@ public interface ConsignmentExtMapper { ...@@ -22,4 +23,8 @@ public interface ConsignmentExtMapper {
22 "ORDER BY CREATE_TIME DESC" + 23 "ORDER BY CREATE_TIME DESC" +
23 ") WHERE ROWNUM = 1") 24 ") WHERE ROWNUM = 1")
24 Consignment findByConsignmentCode(@Param("consignmentCode") String consignmentCode); 25 Consignment findByConsignmentCode(@Param("consignmentCode") String consignmentCode);
26 +
27 + @Select("SELECT BC.* FROM T_BIZ_CONSIGNMENT BC INNER JOIN T_BIZ_USER_CONSIGNMENT_MAPPING BUCM ON(BC.ID = BUCM.CONSIGNMENT_ID) " +
28 + "WHERE BC.ID = #{query.consignmentId} AND (BC.USER_UUID = #{query.userUuid} AND BUCM.USER_ID = #{query.userId})")
29 + Consignment findConsignmentInfo(@Param("query") ConsignmentInfoQuery query);
25 } 30 }
......
...@@ -2,6 +2,7 @@ package com.fedex.connect.customer.repository.repo; ...@@ -2,6 +2,7 @@ package com.fedex.connect.customer.repository.repo;
2 2
3 import com.fedex.connect.common.model.biz.Consignment; 3 import com.fedex.connect.common.model.biz.Consignment;
4 import com.fedex.connect.customer.data.dto.FindConsignmentsDto; 4 import com.fedex.connect.customer.data.dto.FindConsignmentsDto;
5 +import com.fedex.connect.customer.data.query.ConsignmentInfoQuery;
5 import com.fedex.connect.customer.data.query.ConsignmentQuery; 6 import com.fedex.connect.customer.data.query.ConsignmentQuery;
6 7
7 import java.util.List; 8 import java.util.List;
...@@ -12,4 +13,6 @@ public interface IConsignmentExtRepository { ...@@ -12,4 +13,6 @@ public interface IConsignmentExtRepository {
12 Long findAllCount(ConsignmentQuery query); 13 Long findAllCount(ConsignmentQuery query);
13 14
14 Consignment findByConsignmentCode(String consignmentCode); 15 Consignment findByConsignmentCode(String consignmentCode);
16 +
17 + Consignment findConsignmentInfo(ConsignmentInfoQuery consignmentInfoQuery);
15 } 18 }
......
...@@ -2,6 +2,7 @@ package com.fedex.connect.customer.repository.repo.impl; ...@@ -2,6 +2,7 @@ package com.fedex.connect.customer.repository.repo.impl;
2 2
3 import com.fedex.connect.common.model.biz.Consignment; 3 import com.fedex.connect.common.model.biz.Consignment;
4 import com.fedex.connect.customer.data.dto.FindConsignmentsDto; 4 import com.fedex.connect.customer.data.dto.FindConsignmentsDto;
5 +import com.fedex.connect.customer.data.query.ConsignmentInfoQuery;
5 import com.fedex.connect.customer.data.query.ConsignmentQuery; 6 import com.fedex.connect.customer.data.query.ConsignmentQuery;
6 import com.fedex.connect.customer.repository.base.BaseDao; 7 import com.fedex.connect.customer.repository.base.BaseDao;
7 import com.fedex.connect.customer.repository.repo.IConsignmentExtRepository; 8 import com.fedex.connect.customer.repository.repo.IConsignmentExtRepository;
...@@ -26,4 +27,8 @@ public class ConsignmentExtRepositoryImpl extends BaseDao implements IConsignmen ...@@ -26,4 +27,8 @@ public class ConsignmentExtRepositoryImpl extends BaseDao implements IConsignmen
26 public Consignment findByConsignmentCode(String consignmentCode) { 27 public Consignment findByConsignmentCode(String consignmentCode) {
27 return consignmentExtMapper.findByConsignmentCode(consignmentCode); 28 return consignmentExtMapper.findByConsignmentCode(consignmentCode);
28 } 29 }
30 +
31 + public Consignment findConsignmentInfo(ConsignmentInfoQuery consignmentInfoQuery){
32 + return consignmentExtMapper.findConsignmentInfo(consignmentInfoQuery);
33 + }
29 } 34 }
......
...@@ -14,5 +14,12 @@ public interface IConsignmentQueryService { ...@@ -14,5 +14,12 @@ public interface IConsignmentQueryService {
14 */ 14 */
15 ResponseVo findConsignments(ConsignmentQuery query); 15 ResponseVo findConsignments(ConsignmentQuery query);
16 16
17 - ResponseVo findConsignmentInfo(ConsignmentInfoQuery detailQuery); 17 + /**
18 + * @Author mt
19 + * @Description 运单信息查询
20 + * @Date 2024/11/7
21 + * @param consignmentInfoQuery
22 + * @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
23 + */
24 + ResponseVo findConsignmentInfo(ConsignmentInfoQuery consignmentInfoQuery);
18 } 25 }
......
...@@ -4,6 +4,7 @@ import com.fedex.connect.common.dependencies.contants.GlobalConstantFedex; ...@@ -4,6 +4,7 @@ import com.fedex.connect.common.dependencies.contants.GlobalConstantFedex;
4 import com.fedex.connect.common.dependencies.date.vo.PageResult; 4 import com.fedex.connect.common.dependencies.date.vo.PageResult;
5 import com.fedex.connect.common.dependencies.date.vo.ResponseVo; 5 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
6 import com.fedex.connect.common.dependencies.util.Utils; 6 import com.fedex.connect.common.dependencies.util.Utils;
7 +import com.fedex.connect.common.model.biz.Consignment;
7 import com.fedex.connect.customer.data.dto.FindConsignmentsDto; 8 import com.fedex.connect.customer.data.dto.FindConsignmentsDto;
8 import com.fedex.connect.customer.data.query.ConsignmentInfoQuery; 9 import com.fedex.connect.customer.data.query.ConsignmentInfoQuery;
9 import com.fedex.connect.customer.data.query.ConsignmentQuery; 10 import com.fedex.connect.customer.data.query.ConsignmentQuery;
...@@ -12,6 +13,7 @@ import com.fedex.connect.customer.service.biz.IConsignmentQueryService; ...@@ -12,6 +13,7 @@ import com.fedex.connect.customer.service.biz.IConsignmentQueryService;
12 import org.springframework.stereotype.Service; 13 import org.springframework.stereotype.Service;
13 14
14 import java.util.List; 15 import java.util.List;
16 +import java.util.Objects;
15 17
16 /** 18 /**
17 * @Author Szl 19 * @Author Szl
...@@ -47,7 +49,26 @@ public class ConsignmentQueryServiceImpl extends BaseService implements IConsign ...@@ -47,7 +49,26 @@ public class ConsignmentQueryServiceImpl extends BaseService implements IConsign
47 return ResponseVo.succ(pageResult); 49 return ResponseVo.succ(pageResult);
48 } 50 }
49 51
50 - public ResponseVo findConsignmentInfo(ConsignmentInfoQuery detailQuery){ 52 + /**
51 - return null; 53 + * @Author mt
54 + * @Description 运单信息查询
55 + * 如果运单UUID与登录账号UUID相同，则显示运单、收发件人信息
56 + * 如果运单UUID与登录账号UUID不同，则只显示 运单号、shipperAccount、始发国、目的国
57 + * @Date 2024/11/7
58 + * @param consignmentInfoQuery
59 + * @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
60 + */
61 + public ResponseVo findConsignmentInfo(ConsignmentInfoQuery consignmentInfoQuery){
62 + Consignment consignment = consignmentExtRepository.findConsignmentInfo(consignmentInfoQuery);
63 + if(Objects.nonNull(consignment) && !consignment.getUserUuid().equals(consignmentInfoQuery.getUserUuid())){
64 + Consignment consignmentTemp = new Consignment();
65 + consignmentTemp.setId(consignment.getId());
66 + consignmentTemp.setConsignmentCode(consignment.getConsignmentCode());
67 + consignmentTemp.setShipperAccount(consignment.getShipperAccount());
68 + consignmentTemp.setOriginCountry(consignment.getOriginCountry());
69 + consignmentTemp.setDestinationCountry(consignment.getDestinationCountry());
70 + consignment = consignmentTemp;
71 + }
72 + return ResponseVo.succ(consignment);
52 } 73 }
53 } 74 }
......
...@@ -20,6 +20,23 @@ spring: ...@@ -20,6 +20,23 @@ spring:
20 basename: message 20 basename: message
21 encoding: utf-8 21 encoding: utf-8
22 22
23 +import:
24 + jwt:
25 + securityKey: C*F-JaNdRgUkXn2r5u8x/A?D(G+KbPeShVmYq3s6v9y$B&E)H@McQfTjWnZr4u7w
26 + urlWhiteList:
27 + - /biz-customer/auth
28 + - /biz-customer/monitor/ok
29 + - /biz-customer/user/logout
30 + - /biz-customer/swagger-resources
31 + - /biz-customer/webjars
32 + uriWhiteList:
33 + - /biz-customer/swagger-ui.html
34 + - /biz-customer/swagger-ui/*
35 + - /biz-customer/v2/api-docs
36 + - /biz-customer/login.html
37 + expire_1H: 7200
38 + expire_1D: 604800
39 +
23 mybatis: 40 mybatis:
24 mapper-locations: 41 mapper-locations:
25 - classpath*:com/fedex/connect/**/mapper/**/*.xml 42 - classpath*:com/fedex/connect/**/mapper/**/*.xml
......
1 -conl_cus_declare_count_max=單次最多可查詢1000個運單號碼 1 +conl_cus_declare_count_max=單次最多可查詢1000個運單號碼
2 2
3 -#authentication包 3 +#authentication包
4 -auth_exc_no_auth=沒有訪問許可權 4 +auth_exc_no_auth=沒有訪問許可權
5 -auth_exc_no_pass_auth=沒有通過許可權認證 5 +auth_exc_no_pass_auth=沒有通過許可權認證
6 -auth_filter_user_error=登錄身份異常 6 +auth_filter_user_error=登錄身份異常
7 -auth_filter_timeout=登錄超過8小時，請重新登錄 7 +auth_filter_timeout=登錄超過8小時，請重新登錄
8 -auth_filter_stale_dated=登錄已過期 8 +auth_filter_stale_dated=登錄已過期
9 9
10 -enum_res_code_301=登錄身份異常 10 +enum_res_code_301=登錄身份異常
11 -enum_res_code_305=登錄已過期，請重新登錄 11 +enum_res_code_305=登錄已過期，請重新登錄
12 12
13 -enum_res_code_601=不正确，请重新输入 13 +enum_res_code_601=不正确，请重新输入
14 enum_res_code_602=The waybill you entered is generated by another user, whether continue uploading? Confirm, Cancel. No more prompts in the future for the same situation. 14 enum_res_code_602=The waybill you entered is generated by another user, whether continue uploading? Confirm, Cancel. No more prompts in the future for the same situation.
15 enum_res_code_603=The waybill you entered is generated by another account, whether continue uploading? Confirm, Cancel. No more prompts in the future for the same situation. 15 enum_res_code_603=The waybill you entered is generated by another account, whether continue uploading? Confirm, Cancel. No more prompts in the future for the same situation.
16 16
17 -con_shipperAccount=发货人计费账号 17 +con_shipperAccount=发货人计费账号
18 -con_shipperCountry=始发国 18 +con_shipperCountry=始发国
19 -con_recipientCountry=目的国 19 +con_recipientCountry=目的国
20 20
21 -con_add_oper=添加运单
...\ No newline at end of file ...\ No newline at end of file
21 +con_add_oper=添加运单
...\ No newline at end of file ...\ No newline at end of file
......
1 -conl_cus_declare_count_max=單次最多可查詢1000個運單號碼 1 +conl_cus_declare_count_max=單次最多可查詢1000個運單號碼
2 2
3 -enum_res_code_301=登錄身份異常 3 +#authentication包
4 -enum_res_code_305=登錄已過期，請重新登錄 4 +auth_exc_no_auth=沒有訪問許可權
5 +auth_exc_no_pass_auth=沒有通過許可權認證
6 +auth_filter_user_error=登錄身份異常
7 +auth_filter_timeout=登錄超過8小時，請重新登錄
8 +auth_filter_stale_dated=登錄已過期
5 9
6 -enum_res_code_601=不正确，请重新输入 10 +enum_res_code_301=登錄身份異常
11 +enum_res_code_305=登錄已過期，請重新登錄
12 +
13 +enum_res_code_601=不正确，请重新输入
7 enum_res_code_602=The waybill you entered is generated by another user, whether continue uploading? Confirm, Cancel. No more prompts in the future for the same situation. 14 enum_res_code_602=The waybill you entered is generated by another user, whether continue uploading? Confirm, Cancel. No more prompts in the future for the same situation.
8 enum_res_code_603=The waybill you entered is generated by another account, whether continue uploading? Confirm, Cancel. No more prompts in the future for the same situation. 15 enum_res_code_603=The waybill you entered is generated by another account, whether continue uploading? Confirm, Cancel. No more prompts in the future for the same situation.
9 16
10 -con_shipperAccount=发货人计费账号 17 +con_shipperAccount=发货人计费账号
11 -con_shipperCountry=始发国 18 +con_shipperCountry=始发国
12 -con_recipientCountry=目的国 19 +con_recipientCountry=目的国
13 20
14 -con_add_oper=添加运单
...\ No newline at end of file ...\ No newline at end of file
21 +con_add_oper=添加运单
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -2,9 +2,8 @@ package com.fedex.connect.common.dao.biz; ...@@ -2,9 +2,8 @@ package com.fedex.connect.common.dao.biz;
2 2
3 import com.fedex.connect.common.model.biz.Consignment; 3 import com.fedex.connect.common.model.biz.Consignment;
4 import com.fedex.connect.common.model.biz.ConsignmentExample; 4 import com.fedex.connect.common.model.biz.ConsignmentExample;
5 -import org.apache.ibatis.annotations.Param;
6 -
7 import java.util.List; 5 import java.util.List;
6 +import org.apache.ibatis.annotations.Param;
8 7
9 public interface ConsignmentMapper { 8 public interface ConsignmentMapper {
10 long countByExample(ConsignmentExample example); 9 long countByExample(ConsignmentExample example);
......
1 +package com.fedex.connect.common.dao.biz;
2 +
3 +import com.fedex.connect.common.model.biz.UploadRecord;
4 +import com.fedex.connect.common.model.biz.UploadRecordExample;
5 +import java.util.List;
6 +import org.apache.ibatis.annotations.Param;
7 +
8 +public interface UploadRecordMapper {
9 + long countByExample(UploadRecordExample example);
10 +
11 + int deleteByExample(UploadRecordExample example);
12 +
13 + int deleteByPrimaryKey(Long id);
14 +
15 + int insert(UploadRecord record);
16 +
17 + int insertSelective(UploadRecord record);
18 +
19 + List<UploadRecord> selectByExample(UploadRecordExample example);
20 +
21 + UploadRecord selectByPrimaryKey(Long id);
22 +
23 + int updateByExampleSelective(@Param("record") UploadRecord record, @Param("example") UploadRecordExample example);
24 +
25 + int updateByExample(@Param("record") UploadRecord record, @Param("example") UploadRecordExample example);
26 +
27 + int updateByPrimaryKeySelective(UploadRecord record);
28 +
29 + int updateByPrimaryKey(UploadRecord record);
30 +}
...\ No newline at end of file ...\ No newline at end of file
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
18 <result column="MODIFY_TIME" jdbcType="TIMESTAMP" property="modifyTime" /> 18 <result column="MODIFY_TIME" jdbcType="TIMESTAMP" property="modifyTime" />
19 <result column="MODIFY_USER_ID" jdbcType="NUMERIC" property="modifyUserId" /> 19 <result column="MODIFY_USER_ID" jdbcType="NUMERIC" property="modifyUserId" />
20 <result column="MODIFY_USER_NAME" jdbcType="VARCHAR" property="modifyUserName" /> 20 <result column="MODIFY_USER_NAME" jdbcType="VARCHAR" property="modifyUserName" />
21 + <result column="UPLOAD_RECORD_ID" jdbcType="NUMERIC" property="uploadRecordId" />
21 </resultMap> 22 </resultMap>
22 <sql id="Example_Where_Clause"> 23 <sql id="Example_Where_Clause">
23 <where> 24 <where>
...@@ -80,7 +81,7 @@ ...@@ -80,7 +81,7 @@
80 <sql id="Base_Column_List"> 81 <sql id="Base_Column_List">
81 ID, BIZ_ID, BIZ_TYPE_ID, BIZ_TYPE_NAME, SOURCE_FILE_NAME, FILE_NAME, FILE_PATH, FILE_TYPE_ID, 82 ID, BIZ_ID, BIZ_TYPE_ID, BIZ_TYPE_NAME, SOURCE_FILE_NAME, FILE_NAME, FILE_PATH, FILE_TYPE_ID,
82 FILE_TYPE_NAME, STATUS, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, 83 FILE_TYPE_NAME, STATUS, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME,
83 - MODIFY_USER_ID, MODIFY_USER_NAME 84 + MODIFY_USER_ID, MODIFY_USER_NAME, UPLOAD_RECORD_ID
84 </sql> 85 </sql>
85 <select id="selectByExample" parameterType="com.fedex.connect.common.model.biz.AttachmentExample" resultMap="BaseResultMap"> 86 <select id="selectByExample" parameterType="com.fedex.connect.common.model.biz.AttachmentExample" resultMap="BaseResultMap">
86 <include refid="OracleDialectPrefix" /> 87 <include refid="OracleDialectPrefix" />
...@@ -124,13 +125,13 @@ ...@@ -124,13 +125,13 @@
124 FILE_PATH, FILE_TYPE_ID, FILE_TYPE_NAME, 125 FILE_PATH, FILE_TYPE_ID, FILE_TYPE_NAME,
125 STATUS, CREATE_TIME, CREATE_USER_ID, 126 STATUS, CREATE_TIME, CREATE_USER_ID,
126 CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, 127 CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID,
127 - MODIFY_USER_NAME) 128 + MODIFY_USER_NAME, UPLOAD_RECORD_ID)
128 values (#{id,jdbcType=NUMERIC}, #{bizId,jdbcType=NUMERIC}, #{bizTypeId,jdbcType=NUMERIC}, 129 values (#{id,jdbcType=NUMERIC}, #{bizId,jdbcType=NUMERIC}, #{bizTypeId,jdbcType=NUMERIC},
129 #{bizTypeName,jdbcType=VARCHAR}, #{sourceFileName,jdbcType=VARCHAR}, #{fileName,jdbcType=VARCHAR}, 130 #{bizTypeName,jdbcType=VARCHAR}, #{sourceFileName,jdbcType=VARCHAR}, #{fileName,jdbcType=VARCHAR},
130 #{filePath,jdbcType=VARCHAR}, #{fileTypeId,jdbcType=NUMERIC}, #{fileTypeName,jdbcType=VARCHAR}, 131 #{filePath,jdbcType=VARCHAR}, #{fileTypeId,jdbcType=NUMERIC}, #{fileTypeName,jdbcType=VARCHAR},
131 #{status,jdbcType=NUMERIC}, #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC}, 132 #{status,jdbcType=NUMERIC}, #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC},
132 #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC}, 133 #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC},
133 - #{modifyUserName,jdbcType=VARCHAR}) 134 + #{modifyUserName,jdbcType=VARCHAR}, #{uploadRecordId,jdbcType=NUMERIC})
134 </insert> 135 </insert>
135 <insert id="insertSelective" parameterType="com.fedex.connect.common.model.biz.Attachment"> 136 <insert id="insertSelective" parameterType="com.fedex.connect.common.model.biz.Attachment">
136 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> 137 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
...@@ -184,6 +185,9 @@ ...@@ -184,6 +185,9 @@
184 <if test="modifyUserName != null"> 185 <if test="modifyUserName != null">
185 MODIFY_USER_NAME, 186 MODIFY_USER_NAME,
186 </if> 187 </if>
188 + <if test="uploadRecordId != null">
189 + UPLOAD_RECORD_ID,
190 + </if>
187 </trim> 191 </trim>
188 <trim prefix="values (" suffix=")" suffixOverrides=","> 192 <trim prefix="values (" suffix=")" suffixOverrides=",">
189 #{id,jdbcType=NUMERIC}, 193 #{id,jdbcType=NUMERIC},
...@@ -232,6 +236,9 @@ ...@@ -232,6 +236,9 @@
232 <if test="modifyUserName != null"> 236 <if test="modifyUserName != null">
233 #{modifyUserName,jdbcType=VARCHAR}, 237 #{modifyUserName,jdbcType=VARCHAR},
234 </if> 238 </if>
239 + <if test="uploadRecordId != null">
240 + #{uploadRecordId,jdbcType=NUMERIC},
241 + </if>
235 </trim> 242 </trim>
236 </insert> 243 </insert>
237 <select id="countByExample" parameterType="com.fedex.connect.common.model.biz.AttachmentExample" resultType="java.lang.Long"> 244 <select id="countByExample" parameterType="com.fedex.connect.common.model.biz.AttachmentExample" resultType="java.lang.Long">
...@@ -291,6 +298,9 @@ ...@@ -291,6 +298,9 @@
291 <if test="record.modifyUserName != null"> 298 <if test="record.modifyUserName != null">
292 MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR}, 299 MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR},
293 </if> 300 </if>
301 + <if test="record.uploadRecordId != null">
302 + UPLOAD_RECORD_ID = #{record.uploadRecordId,jdbcType=NUMERIC},
303 + </if>
294 </set> 304 </set>
295 <if test="_parameter != null"> 305 <if test="_parameter != null">
296 <include refid="Update_By_Example_Where_Clause" /> 306 <include refid="Update_By_Example_Where_Clause" />
...@@ -313,7 +323,8 @@ ...@@ -313,7 +323,8 @@
313 CREATE_USER_NAME = #{record.createUserName,jdbcType=VARCHAR}, 323 CREATE_USER_NAME = #{record.createUserName,jdbcType=VARCHAR},
314 MODIFY_TIME = #{record.modifyTime,jdbcType=TIMESTAMP}, 324 MODIFY_TIME = #{record.modifyTime,jdbcType=TIMESTAMP},
315 MODIFY_USER_ID = #{record.modifyUserId,jdbcType=NUMERIC}, 325 MODIFY_USER_ID = #{record.modifyUserId,jdbcType=NUMERIC},
316 - MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR} 326 + MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR},
327 + UPLOAD_RECORD_ID = #{record.uploadRecordId,jdbcType=NUMERIC}
317 <if test="_parameter != null"> 328 <if test="_parameter != null">
318 <include refid="Update_By_Example_Where_Clause" /> 329 <include refid="Update_By_Example_Where_Clause" />
319 </if> 330 </if>
...@@ -366,6 +377,9 @@ ...@@ -366,6 +377,9 @@
366 <if test="modifyUserName != null"> 377 <if test="modifyUserName != null">
367 MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR}, 378 MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR},
368 </if> 379 </if>
380 + <if test="uploadRecordId != null">
381 + UPLOAD_RECORD_ID = #{uploadRecordId,jdbcType=NUMERIC},
382 + </if>
369 </set> 383 </set>
370 where ID = #{id,jdbcType=NUMERIC} 384 where ID = #{id,jdbcType=NUMERIC}
371 </update> 385 </update>
...@@ -385,7 +399,8 @@ ...@@ -385,7 +399,8 @@
385 CREATE_USER_NAME = #{createUserName,jdbcType=VARCHAR}, 399 CREATE_USER_NAME = #{createUserName,jdbcType=VARCHAR},
386 MODIFY_TIME = #{modifyTime,jdbcType=TIMESTAMP}, 400 MODIFY_TIME = #{modifyTime,jdbcType=TIMESTAMP},
387 MODIFY_USER_ID = #{modifyUserId,jdbcType=NUMERIC}, 401 MODIFY_USER_ID = #{modifyUserId,jdbcType=NUMERIC},
388 - MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR} 402 + MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR},
403 + UPLOAD_RECORD_ID = #{uploadRecordId,jdbcType=NUMERIC}
389 where ID = #{id,jdbcType=NUMERIC} 404 where ID = #{id,jdbcType=NUMERIC}
390 </update> 405 </update>
391 <sql id="OracleDialectPrefix"> 406 <sql id="OracleDialectPrefix">
......
...@@ -48,6 +48,10 @@ ...@@ -48,6 +48,10 @@
48 <result column="STATUS_NAME" jdbcType="VARCHAR" property="statusName" /> 48 <result column="STATUS_NAME" jdbcType="VARCHAR" property="statusName" />
49 <result column="DOC_NONDOC_FLAG" jdbcType="VARCHAR" property="docNondocFlag" /> 49 <result column="DOC_NONDOC_FLAG" jdbcType="VARCHAR" property="docNondocFlag" />
50 <result column="USER_UUID" jdbcType="VARCHAR" property="userUuid" /> 50 <result column="USER_UUID" jdbcType="VARCHAR" property="userUuid" />
51 + <result column="USER_INPUT_SHIPPER_ACCOUNT" jdbcType="VARCHAR" property="userInputShipperAccount" />
52 + <result column="USER_INPUT_ORIGIN_COUNTRY_ID" jdbcType="NUMERIC" property="userInputOriginCountryId" />
53 + <result column="USER_INPUT_ORIGIN_COUNTRY" jdbcType="VARCHAR" property="userInputOriginCountry" />
54 + <result column="ORIGIN_COUNTRY_ID" jdbcType="NUMERIC" property="originCountryId" />
51 </resultMap> 55 </resultMap>
52 <sql id="Example_Where_Clause"> 56 <sql id="Example_Where_Clause">
53 <where> 57 <where>
...@@ -116,7 +120,8 @@ ...@@ -116,7 +120,8 @@
116 RECIPIENT_CITY, FIRST_COMMIT_TIME, FIRST_SUBMITTER_ID, FIRST_SUBMITTER, COMMIT_TIME, 120 RECIPIENT_CITY, FIRST_COMMIT_TIME, FIRST_SUBMITTER_ID, FIRST_SUBMITTER, COMMIT_TIME,
117 SUBMITTER_ID, SUBMITTER, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, 121 SUBMITTER_ID, SUBMITTER, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME,
118 MODIFY_USER_ID, MODIFY_USER_NAME, CE_INFO_ID, RECIPIENT_POSTAL_CODE, STATUS_ID, STATUS_NAME, 122 MODIFY_USER_ID, MODIFY_USER_NAME, CE_INFO_ID, RECIPIENT_POSTAL_CODE, STATUS_ID, STATUS_NAME,
119 - DOC_NONDOC_FLAG, USER_UUID 123 + DOC_NONDOC_FLAG, USER_UUID, USER_INPUT_SHIPPER_ACCOUNT, USER_INPUT_ORIGIN_COUNTRY_ID,
124 + USER_INPUT_ORIGIN_COUNTRY, ORIGIN_COUNTRY_ID
120 </sql> 125 </sql>
121 <select id="selectByExample" parameterType="com.fedex.connect.common.model.biz.ConsignmentExample" resultMap="BaseResultMap"> 126 <select id="selectByExample" parameterType="com.fedex.connect.common.model.biz.ConsignmentExample" resultMap="BaseResultMap">
122 <include refid="OracleDialectPrefix" /> 127 <include refid="OracleDialectPrefix" />
...@@ -170,7 +175,9 @@ ...@@ -170,7 +175,9 @@
170 CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, 175 CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME,
171 MODIFY_USER_ID, MODIFY_USER_NAME, CE_INFO_ID, 176 MODIFY_USER_ID, MODIFY_USER_NAME, CE_INFO_ID,
172 RECIPIENT_POSTAL_CODE, STATUS_ID, STATUS_NAME, 177 RECIPIENT_POSTAL_CODE, STATUS_ID, STATUS_NAME,
173 - DOC_NONDOC_FLAG, USER_UUID) 178 + DOC_NONDOC_FLAG, USER_UUID, USER_INPUT_SHIPPER_ACCOUNT,
179 + USER_INPUT_ORIGIN_COUNTRY_ID, USER_INPUT_ORIGIN_COUNTRY,
180 + ORIGIN_COUNTRY_ID)
174 values (#{id,jdbcType=NUMERIC}, #{consignmentCode,jdbcType=VARCHAR}, #{shipDate,jdbcType=TIMESTAMP}, 181 values (#{id,jdbcType=NUMERIC}, #{consignmentCode,jdbcType=VARCHAR}, #{shipDate,jdbcType=TIMESTAMP},
175 #{shipperCountry,jdbcType=VARCHAR}, #{recipientCountry,jdbcType=VARCHAR}, #{destIataCode,jdbcType=VARCHAR}, 182 #{shipperCountry,jdbcType=VARCHAR}, #{recipientCountry,jdbcType=VARCHAR}, #{destIataCode,jdbcType=VARCHAR},
176 #{originCountry,jdbcType=VARCHAR}, #{destinationCountry,jdbcType=VARCHAR}, #{customsCurrency,jdbcType=VARCHAR}, 183 #{originCountry,jdbcType=VARCHAR}, #{destinationCountry,jdbcType=VARCHAR}, #{customsCurrency,jdbcType=VARCHAR},
...@@ -186,7 +193,9 @@ ...@@ -186,7 +193,9 @@
186 #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, 193 #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP},
187 #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR}, #{ceInfoId,jdbcType=NUMERIC}, 194 #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR}, #{ceInfoId,jdbcType=NUMERIC},
188 #{recipientPostalCode,jdbcType=VARCHAR}, #{statusId,jdbcType=NUMERIC}, #{statusName,jdbcType=VARCHAR}, 195 #{recipientPostalCode,jdbcType=VARCHAR}, #{statusId,jdbcType=NUMERIC}, #{statusName,jdbcType=VARCHAR},
189 - #{docNondocFlag,jdbcType=VARCHAR}, #{userUuid,jdbcType=VARCHAR}) 196 + #{docNondocFlag,jdbcType=VARCHAR}, #{userUuid,jdbcType=VARCHAR}, #{userInputShipperAccount,jdbcType=VARCHAR},
197 + #{userInputOriginCountryId,jdbcType=NUMERIC}, #{userInputOriginCountry,jdbcType=VARCHAR},
198 + #{originCountryId,jdbcType=NUMERIC})
190 </insert> 199 </insert>
191 <insert id="insertSelective" parameterType="com.fedex.connect.common.model.biz.Consignment"> 200 <insert id="insertSelective" parameterType="com.fedex.connect.common.model.biz.Consignment">
192 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> 201 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
...@@ -330,6 +339,18 @@ ...@@ -330,6 +339,18 @@
330 <if test="userUuid != null"> 339 <if test="userUuid != null">
331 USER_UUID, 340 USER_UUID,
332 </if> 341 </if>
342 + <if test="userInputShipperAccount != null">
343 + USER_INPUT_SHIPPER_ACCOUNT,
344 + </if>
345 + <if test="userInputOriginCountryId != null">
346 + USER_INPUT_ORIGIN_COUNTRY_ID,
347 + </if>
348 + <if test="userInputOriginCountry != null">
349 + USER_INPUT_ORIGIN_COUNTRY,
350 + </if>
351 + <if test="originCountryId != null">
352 + ORIGIN_COUNTRY_ID,
353 + </if>
333 </trim> 354 </trim>
334 <trim prefix="values (" suffix=")" suffixOverrides=","> 355 <trim prefix="values (" suffix=")" suffixOverrides=",">
335 #{id,jdbcType=NUMERIC}, 356 #{id,jdbcType=NUMERIC},
...@@ -468,6 +489,18 @@ ...@@ -468,6 +489,18 @@
468 <if test="userUuid != null"> 489 <if test="userUuid != null">
469 #{userUuid,jdbcType=VARCHAR}, 490 #{userUuid,jdbcType=VARCHAR},
470 </if> 491 </if>
492 + <if test="userInputShipperAccount != null">
493 + #{userInputShipperAccount,jdbcType=VARCHAR},
494 + </if>
495 + <if test="userInputOriginCountryId != null">
496 + #{userInputOriginCountryId,jdbcType=NUMERIC},
497 + </if>
498 + <if test="userInputOriginCountry != null">
499 + #{userInputOriginCountry,jdbcType=VARCHAR},
500 + </if>
501 + <if test="originCountryId != null">
502 + #{originCountryId,jdbcType=NUMERIC},
503 + </if>
471 </trim> 504 </trim>
472 </insert> 505 </insert>
473 <select id="countByExample" parameterType="com.fedex.connect.common.model.biz.ConsignmentExample" resultType="java.lang.Long"> 506 <select id="countByExample" parameterType="com.fedex.connect.common.model.biz.ConsignmentExample" resultType="java.lang.Long">
...@@ -617,6 +650,18 @@ ...@@ -617,6 +650,18 @@
617 <if test="record.userUuid != null"> 650 <if test="record.userUuid != null">
618 USER_UUID = #{record.userUuid,jdbcType=VARCHAR}, 651 USER_UUID = #{record.userUuid,jdbcType=VARCHAR},
619 </if> 652 </if>
653 + <if test="record.userInputShipperAccount != null">
654 + USER_INPUT_SHIPPER_ACCOUNT = #{record.userInputShipperAccount,jdbcType=VARCHAR},
655 + </if>
656 + <if test="record.userInputOriginCountryId != null">
657 + USER_INPUT_ORIGIN_COUNTRY_ID = #{record.userInputOriginCountryId,jdbcType=NUMERIC},
658 + </if>
659 + <if test="record.userInputOriginCountry != null">
660 + USER_INPUT_ORIGIN_COUNTRY = #{record.userInputOriginCountry,jdbcType=VARCHAR},
661 + </if>
662 + <if test="record.originCountryId != null">
663 + ORIGIN_COUNTRY_ID = #{record.originCountryId,jdbcType=NUMERIC},
664 + </if>
620 </set> 665 </set>
621 <if test="_parameter != null"> 666 <if test="_parameter != null">
622 <include refid="Update_By_Example_Where_Clause" /> 667 <include refid="Update_By_Example_Where_Clause" />
...@@ -669,7 +714,11 @@ ...@@ -669,7 +714,11 @@
669 STATUS_ID = #{record.statusId,jdbcType=NUMERIC}, 714 STATUS_ID = #{record.statusId,jdbcType=NUMERIC},
670 STATUS_NAME = #{record.statusName,jdbcType=VARCHAR}, 715 STATUS_NAME = #{record.statusName,jdbcType=VARCHAR},
671 DOC_NONDOC_FLAG = #{record.docNondocFlag,jdbcType=VARCHAR}, 716 DOC_NONDOC_FLAG = #{record.docNondocFlag,jdbcType=VARCHAR},
672 - USER_UUID = #{record.userUuid,jdbcType=VARCHAR} 717 + USER_UUID = #{record.userUuid,jdbcType=VARCHAR},
718 + USER_INPUT_SHIPPER_ACCOUNT = #{record.userInputShipperAccount,jdbcType=VARCHAR},
719 + USER_INPUT_ORIGIN_COUNTRY_ID = #{record.userInputOriginCountryId,jdbcType=NUMERIC},
720 + USER_INPUT_ORIGIN_COUNTRY = #{record.userInputOriginCountry,jdbcType=VARCHAR},
721 + ORIGIN_COUNTRY_ID = #{record.originCountryId,jdbcType=NUMERIC}
673 <if test="_parameter != null"> 722 <if test="_parameter != null">
674 <include refid="Update_By_Example_Where_Clause" /> 723 <include refid="Update_By_Example_Where_Clause" />
675 </if> 724 </if>
...@@ -812,6 +861,18 @@ ...@@ -812,6 +861,18 @@
812 <if test="userUuid != null"> 861 <if test="userUuid != null">
813 USER_UUID = #{userUuid,jdbcType=VARCHAR}, 862 USER_UUID = #{userUuid,jdbcType=VARCHAR},
814 </if> 863 </if>
864 + <if test="userInputShipperAccount != null">
865 + USER_INPUT_SHIPPER_ACCOUNT = #{userInputShipperAccount,jdbcType=VARCHAR},
866 + </if>
867 + <if test="userInputOriginCountryId != null">
868 + USER_INPUT_ORIGIN_COUNTRY_ID = #{userInputOriginCountryId,jdbcType=NUMERIC},
869 + </if>
870 + <if test="userInputOriginCountry != null">
871 + USER_INPUT_ORIGIN_COUNTRY = #{userInputOriginCountry,jdbcType=VARCHAR},
872 + </if>
873 + <if test="originCountryId != null">
874 + ORIGIN_COUNTRY_ID = #{originCountryId,jdbcType=NUMERIC},
875 + </if>
815 </set> 876 </set>
816 where ID = #{id,jdbcType=NUMERIC} 877 where ID = #{id,jdbcType=NUMERIC}
817 </update> 878 </update>
...@@ -861,7 +922,11 @@ ...@@ -861,7 +922,11 @@
861 STATUS_ID = #{statusId,jdbcType=NUMERIC}, 922 STATUS_ID = #{statusId,jdbcType=NUMERIC},
862 STATUS_NAME = #{statusName,jdbcType=VARCHAR}, 923 STATUS_NAME = #{statusName,jdbcType=VARCHAR},
863 DOC_NONDOC_FLAG = #{docNondocFlag,jdbcType=VARCHAR}, 924 DOC_NONDOC_FLAG = #{docNondocFlag,jdbcType=VARCHAR},
864 - USER_UUID = #{userUuid,jdbcType=VARCHAR} 925 + USER_UUID = #{userUuid,jdbcType=VARCHAR},
926 + USER_INPUT_SHIPPER_ACCOUNT = #{userInputShipperAccount,jdbcType=VARCHAR},
927 + USER_INPUT_ORIGIN_COUNTRY_ID = #{userInputOriginCountryId,jdbcType=NUMERIC},
928 + USER_INPUT_ORIGIN_COUNTRY = #{userInputOriginCountry,jdbcType=VARCHAR},
929 + ORIGIN_COUNTRY_ID = #{originCountryId,jdbcType=NUMERIC}
865 where ID = #{id,jdbcType=NUMERIC} 930 where ID = #{id,jdbcType=NUMERIC}
866 </update> 931 </update>
867 <sql id="OracleDialectPrefix"> 932 <sql id="OracleDialectPrefix">
......
...@@ -89,6 +89,11 @@ public class Attachment implements Serializable { ...@@ -89,6 +89,11 @@ public class Attachment implements Serializable {
89 */ 89 */
90 private String modifyUserName; 90 private String modifyUserName;
91 91
92 + /**
93 + * 用户上传记录表ID
94 + */
95 + private Long uploadRecordId;
96 +
92 private static final long serialVersionUID = 1L; 97 private static final long serialVersionUID = 1L;
93 98
94 public Long getId() { 99 public Long getId() {
...@@ -219,6 +224,14 @@ public class Attachment implements Serializable { ...@@ -219,6 +224,14 @@ public class Attachment implements Serializable {
219 this.modifyUserName = modifyUserName == null ? null : modifyUserName.trim(); 224 this.modifyUserName = modifyUserName == null ? null : modifyUserName.trim();
220 } 225 }
221 226
227 + public Long getUploadRecordId() {
228 + return uploadRecordId;
229 + }
230 +
231 + public void setUploadRecordId(Long uploadRecordId) {
232 + this.uploadRecordId = uploadRecordId;
233 + }
234 +
222 @Override 235 @Override
223 public String toString() { 236 public String toString() {
224 StringBuilder sb = new StringBuilder(); 237 StringBuilder sb = new StringBuilder();
...@@ -241,6 +254,7 @@ public class Attachment implements Serializable { ...@@ -241,6 +254,7 @@ public class Attachment implements Serializable {
241 sb.append(", modifyTime=").append(modifyTime); 254 sb.append(", modifyTime=").append(modifyTime);
242 sb.append(", modifyUserId=").append(modifyUserId); 255 sb.append(", modifyUserId=").append(modifyUserId);
243 sb.append(", modifyUserName=").append(modifyUserName); 256 sb.append(", modifyUserName=").append(modifyUserName);
257 + sb.append(", uploadRecordId=").append(uploadRecordId);
244 sb.append(", serialVersionUID=").append(serialVersionUID); 258 sb.append(", serialVersionUID=").append(serialVersionUID);
245 sb.append("]"); 259 sb.append("]");
246 return sb.toString(); 260 return sb.toString();
......
...@@ -1154,6 +1154,66 @@ public class AttachmentExample { ...@@ -1154,6 +1154,66 @@ public class AttachmentExample {
1154 addCriterion("MODIFY_USER_NAME not between", value1, value2, "modifyUserName"); 1154 addCriterion("MODIFY_USER_NAME not between", value1, value2, "modifyUserName");
1155 return (Criteria) this; 1155 return (Criteria) this;
1156 } 1156 }
1157 +
1158 + public Criteria andUploadRecordIdIsNull() {
1159 + addCriterion("UPLOAD_RECORD_ID is null");
1160 + return (Criteria) this;
1161 + }
1162 +
1163 + public Criteria andUploadRecordIdIsNotNull() {
1164 + addCriterion("UPLOAD_RECORD_ID is not null");
1165 + return (Criteria) this;
1166 + }
1167 +
1168 + public Criteria andUploadRecordIdEqualTo(Long value) {
1169 + addCriterion("UPLOAD_RECORD_ID =", value, "uploadRecordId");
1170 + return (Criteria) this;
1171 + }
1172 +
1173 + public Criteria andUploadRecordIdNotEqualTo(Long value) {
1174 + addCriterion("UPLOAD_RECORD_ID <>", value, "uploadRecordId");
1175 + return (Criteria) this;
1176 + }
1177 +
1178 + public Criteria andUploadRecordIdGreaterThan(Long value) {
1179 + addCriterion("UPLOAD_RECORD_ID >", value, "uploadRecordId");
1180 + return (Criteria) this;
1181 + }
1182 +
1183 + public Criteria andUploadRecordIdGreaterThanOrEqualTo(Long value) {
1184 + addCriterion("UPLOAD_RECORD_ID >=", value, "uploadRecordId");
1185 + return (Criteria) this;
1186 + }
1187 +
1188 + public Criteria andUploadRecordIdLessThan(Long value) {
1189 + addCriterion("UPLOAD_RECORD_ID <", value, "uploadRecordId");
1190 + return (Criteria) this;
1191 + }
1192 +
1193 + public Criteria andUploadRecordIdLessThanOrEqualTo(Long value) {
1194 + addCriterion("UPLOAD_RECORD_ID <=", value, "uploadRecordId");
1195 + return (Criteria) this;
1196 + }
1197 +
1198 + public Criteria andUploadRecordIdIn(List<Long> values) {
1199 + addCriterion("UPLOAD_RECORD_ID in", values, "uploadRecordId");
1200 + return (Criteria) this;
1201 + }
1202 +
1203 + public Criteria andUploadRecordIdNotIn(List<Long> values) {
1204 + addCriterion("UPLOAD_RECORD_ID not in", values, "uploadRecordId");
1205 + return (Criteria) this;
1206 + }
1207 +
1208 + public Criteria andUploadRecordIdBetween(Long value1, Long value2) {
1209 + addCriterion("UPLOAD_RECORD_ID between", value1, value2, "uploadRecordId");
1210 + return (Criteria) this;
1211 + }
1212 +
1213 + public Criteria andUploadRecordIdNotBetween(Long value1, Long value2) {
1214 + addCriterion("UPLOAD_RECORD_ID not between", value1, value2, "uploadRecordId");
1215 + return (Criteria) this;
1216 + }
1157 } 1217 }
1158 1218
1159 public static class Criteria extends GeneratedCriteria { 1219 public static class Criteria extends GeneratedCriteria {
......
...@@ -240,6 +240,28 @@ public class Consignment implements Serializable { ...@@ -240,6 +240,28 @@ public class Consignment implements Serializable {
240 */ 240 */
241 private String userUuid; 241 private String userUuid;
242 242
243 + /**
244 + * 用户录入发货人计费账号
245 + */
246 + private String userInputShipperAccount;
247 +
248 + /**
249 + * 用户录入原产国全称
250 + */
251 + private Long userInputOriginCountryId;
252 +
253 + /**
254 + * 用户录入原产国全称ID，
255 +关联数据字典表。指定字典目录CODE：COUNTRY
256 + */
257 + private String userInputOriginCountry;
258 +
259 + /**
260 + * 原产国全称ID，
261 +关联数据字典表。指定字典目录CODE：COUNTRY
262 + */
263 + private Long originCountryId;
264 +
243 private static final long serialVersionUID = 1L; 265 private static final long serialVersionUID = 1L;
244 266
245 public Long getId() { 267 public Long getId() {
...@@ -610,6 +632,38 @@ public class Consignment implements Serializable { ...@@ -610,6 +632,38 @@ public class Consignment implements Serializable {
610 this.userUuid = userUuid == null ? null : userUuid.trim(); 632 this.userUuid = userUuid == null ? null : userUuid.trim();
611 } 633 }
612 634
635 + public String getUserInputShipperAccount() {
636 + return userInputShipperAccount;
637 + }
638 +
639 + public void setUserInputShipperAccount(String userInputShipperAccount) {
640 + this.userInputShipperAccount = userInputShipperAccount == null ? null : userInputShipperAccount.trim();
641 + }
642 +
643 + public Long getUserInputOriginCountryId() {
644 + return userInputOriginCountryId;
645 + }
646 +
647 + public void setUserInputOriginCountryId(Long userInputOriginCountryId) {
648 + this.userInputOriginCountryId = userInputOriginCountryId;
649 + }
650 +
651 + public String getUserInputOriginCountry() {
652 + return userInputOriginCountry;
653 + }
654 +
655 + public void setUserInputOriginCountry(String userInputOriginCountry) {
656 + this.userInputOriginCountry = userInputOriginCountry == null ? null : userInputOriginCountry.trim();
657 + }
658 +
659 + public Long getOriginCountryId() {
660 + return originCountryId;
661 + }
662 +
663 + public void setOriginCountryId(Long originCountryId) {
664 + this.originCountryId = originCountryId;
665 + }
666 +
613 @Override 667 @Override
614 public String toString() { 668 public String toString() {
615 StringBuilder sb = new StringBuilder(); 669 StringBuilder sb = new StringBuilder();
...@@ -662,6 +716,10 @@ public class Consignment implements Serializable { ...@@ -662,6 +716,10 @@ public class Consignment implements Serializable {
662 sb.append(", statusName=").append(statusName); 716 sb.append(", statusName=").append(statusName);
663 sb.append(", docNondocFlag=").append(docNondocFlag); 717 sb.append(", docNondocFlag=").append(docNondocFlag);
664 sb.append(", userUuid=").append(userUuid); 718 sb.append(", userUuid=").append(userUuid);
719 + sb.append(", userInputShipperAccount=").append(userInputShipperAccount);
720 + sb.append(", userInputOriginCountryId=").append(userInputOriginCountryId);
721 + sb.append(", userInputOriginCountry=").append(userInputOriginCountry);
722 + sb.append(", originCountryId=").append(originCountryId);
665 sb.append(", serialVersionUID=").append(serialVersionUID); 723 sb.append(", serialVersionUID=").append(serialVersionUID);
666 sb.append("]"); 724 sb.append("]");
667 return sb.toString(); 725 return sb.toString();
......
1 +package com.fedex.connect.common.model.biz;
2 +
3 +import java.io.Serializable;
4 +import java.util.Date;
5 +
6 +/**
7 + * DESC: 用户上传记录表
8 + * TABLE: T_BIZ_UPLOAD_RECORD
9 + */
10 +public class UploadRecord implements Serializable {
11 + /**
12 + * ID,自动增加
13 + */
14 + private Long id;
15 +
16 + /**
17 + * 运单ID，关联运单表ID
18 + */
19 + private Long consignmentId;
20 +
21 + /**
22 + * 上传状态(uploaded)
23 + */
24 + private String uploadStatus;
25 +
26 + /**
27 + * 状态(0：无效、1：有效)
28 + */
29 + private Long status;
30 +
31 + /**
32 + * 创建时间
33 + */
34 + private Date createTime;
35 +
36 + /**
37 + * 创建人ID，关联用户表ID
38 + */
39 + private Long createUserId;
40 +
41 + /**
42 + * 创建人名称
43 + */
44 + private String createUserName;
45 +
46 + /**
47 + * 修改时间
48 + */
49 + private Date modifyTime;
50 +
51 + /**
52 + * 修改人ID，关联用户表ID
53 + */
54 + private Long modifyUserId;
55 +
56 + /**
57 + * 修改人名称
58 + */
59 + private String modifyUserName;
60 +
61 + private static final long serialVersionUID = 1L;
62 +
63 + public Long getId() {
64 + return id;
65 + }
66 +
67 + public void setId(Long id) {
68 + this.id = id;
69 + }
70 +
71 + public Long getConsignmentId() {
72 + return consignmentId;
73 + }
74 +
75 + public void setConsignmentId(Long consignmentId) {
76 + this.consignmentId = consignmentId;
77 + }
78 +
79 + public String getUploadStatus() {
80 + return uploadStatus;
81 + }
82 +
83 + public void setUploadStatus(String uploadStatus) {
84 + this.uploadStatus = uploadStatus == null ? null : uploadStatus.trim();
85 + }
86 +
87 + public Long getStatus() {
88 + return status;
89 + }
90 +
91 + public void setStatus(Long status) {
92 + this.status = status;
93 + }
94 +
95 + public Date getCreateTime() {
96 + return createTime;
97 + }
98 +
99 + public void setCreateTime(Date createTime) {
100 + this.createTime = createTime;
101 + }
102 +
103 + public Long getCreateUserId() {
104 + return createUserId;
105 + }
106 +
107 + public void setCreateUserId(Long createUserId) {
108 + this.createUserId = createUserId;
109 + }
110 +
111 + public String getCreateUserName() {
112 + return createUserName;
113 + }
114 +
115 + public void setCreateUserName(String createUserName) {
116 + this.createUserName = createUserName == null ? null : createUserName.trim();
117 + }
118 +
119 + public Date getModifyTime() {
120 + return modifyTime;
121 + }
122 +
123 + public void setModifyTime(Date modifyTime) {
124 + this.modifyTime = modifyTime;
125 + }
126 +
127 + public Long getModifyUserId() {
128 + return modifyUserId;
129 + }
130 +
131 + public void setModifyUserId(Long modifyUserId) {
132 + this.modifyUserId = modifyUserId;
133 + }
134 +
135 + public String getModifyUserName() {
136 + return modifyUserName;
137 + }
138 +
139 + public void setModifyUserName(String modifyUserName) {
140 + this.modifyUserName = modifyUserName == null ? null : modifyUserName.trim();
141 + }
142 +
143 + @Override
144 + public String toString() {
145 + StringBuilder sb = new StringBuilder();
146 + sb.append(getClass().getSimpleName());
147 + sb.append(" [");
148 + sb.append("Hash = ").append(hashCode());
149 + sb.append(", id=").append(id);
150 + sb.append(", consignmentId=").append(consignmentId);
151 + sb.append(", uploadStatus=").append(uploadStatus);
152 + sb.append(", status=").append(status);
153 + sb.append(", createTime=").append(createTime);
154 + sb.append(", createUserId=").append(createUserId);
155 + sb.append(", createUserName=").append(createUserName);
156 + sb.append(", modifyTime=").append(modifyTime);
157 + sb.append(", modifyUserId=").append(modifyUserId);
158 + sb.append(", modifyUserName=").append(modifyUserName);
159 + sb.append(", serialVersionUID=").append(serialVersionUID);
160 + sb.append("]");
161 + return sb.toString();
162 + }
163 +}
...\ No newline at end of file ...\ No newline at end of file
...@@ -93,12 +93,18 @@ ...@@ -93,12 +93,18 @@
93 <!-- selectByExampleQueryId="true">--> 93 <!-- selectByExampleQueryId="true">-->
94 <!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_LOG_EMAIL_HISTORY.NEXTVAL FROM DUAL" />--> 94 <!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_LOG_EMAIL_HISTORY.NEXTVAL FROM DUAL" />-->
95 <!-- </table>--> 95 <!-- </table>-->
96 -<!-- <table tableName="T_BIZ_ATTACHMENT" domainObjectName="Attachment"--> 96 + <table tableName="T_BIZ_ATTACHMENT" domainObjectName="Attachment"
97 -<!-- enableCountByExample="true" enableUpdateByExample="true"--> 97 + enableCountByExample="true" enableUpdateByExample="true"
98 -<!-- enableDeleteByExample="true" enableSelectByExample="true"--> 98 + enableDeleteByExample="true" enableSelectByExample="true"
99 -<!-- selectByExampleQueryId="true">--> 99 + selectByExampleQueryId="true">
100 -<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_ATTACHMENT.NEXTVAL FROM DUAL" />--> 100 + <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_ATTACHMENT.NEXTVAL FROM DUAL" />
101 -<!-- </table>--> 101 + </table>
102 + <table tableName="T_BIZ_UPLOAD_RECORD" domainObjectName="UploadRecord"
103 + enableCountByExample="true" enableUpdateByExample="true"
104 + enableDeleteByExample="true" enableSelectByExample="true"
105 + selectByExampleQueryId="true">
106 + <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_UPLOAD_RECORD.NEXTVAL FROM DUAL" />
107 + </table>
102 <!-- <table schema="ICLEARIMP" tableName="T_BIZ_CE_INFO" domainObjectName="CeInfo"--> 108 <!-- <table schema="ICLEARIMP" tableName="T_BIZ_CE_INFO" domainObjectName="CeInfo"-->
103 <!-- enableCountByExample="true" enableUpdateByExample="true"--> 109 <!-- enableCountByExample="true" enableUpdateByExample="true"-->
104 <!-- enableDeleteByExample="true" enableSelectByExample="true"--> 110 <!-- enableDeleteByExample="true" enableSelectByExample="true"-->
......
1 package com.fedex.connect.common.dependencies.authentication; 1 package com.fedex.connect.common.dependencies.authentication;
2 2
3 import org.springframework.boot.context.properties.ConfigurationProperties; 3 import org.springframework.boot.context.properties.ConfigurationProperties;
4 +import org.springframework.context.annotation.Configuration;
5 +import org.springframework.context.annotation.PropertySource;
4 6
5 7
6 /** 8 /**
7 * 读取配置文件 9 * 读取配置文件
8 * @author Administrator 10 * @author Administrator
9 */ 11 */
10 -@ConfigurationProperties(prefix = "export.jwt") 12 +@Configuration
13 +@ConfigurationProperties(prefix = "import.jwt")
14 +@PropertySource("classpath:application.yml")
11 public class SecurityConstants { 15 public class SecurityConstants {
12 16
13 /** 17 /**
......
...@@ -73,6 +73,9 @@ public class JwtAuthorizationFilter extends BasicAuthenticationFilter { ...@@ -73,6 +73,9 @@ public class JwtAuthorizationFilter extends BasicAuthenticationFilter {
73 LocaleMessageUtil localeMessageUtil = SpringBeanUtil.getBean(LocaleMessageUtil.class); 73 LocaleMessageUtil localeMessageUtil = SpringBeanUtil.getBean(LocaleMessageUtil.class);
74 IRedisSlabService redisSlabService = SpringBeanUtil.getBean(IRedisSlabService.class); 74 IRedisSlabService redisSlabService = SpringBeanUtil.getBean(IRedisSlabService.class);
75 75
76 + String str = localeMessageUtil.getMessage("auth_filter_user_error");
77 + System.out.println(str);
78 +
76 if (token == null || !token.startsWith(SecurityConstants.TOKEN_PREFIX)) { 79 if (token == null || !token.startsWith(SecurityConstants.TOKEN_PREFIX)) {
77 SecurityContextHolder.clearContext(); 80 SecurityContextHolder.clearContext();
78 81
......
...@@ -2,15 +2,18 @@ package com.fedex.connect.common.dependencies.i18n; ...@@ -2,15 +2,18 @@ package com.fedex.connect.common.dependencies.i18n;
2 2
3 import org.springframework.context.MessageSource; 3 import org.springframework.context.MessageSource;
4 import org.springframework.context.MessageSourceResolvable; 4 import org.springframework.context.MessageSourceResolvable;
5 +import org.springframework.context.annotation.PropertySource;
5 import org.springframework.context.i18n.LocaleContextHolder; 6 import org.springframework.context.i18n.LocaleContextHolder;
6 import org.springframework.stereotype.Component; 7 import org.springframework.stereotype.Component;
7 8
8 import javax.annotation.Resource; 9 import javax.annotation.Resource;
10 +import java.util.Locale;
9 11
10 /** 12 /**
11 * 根据语言编码查询内容 13 * 根据语言编码查询内容
12 */ 14 */
13 @Component 15 @Component
16 +@PropertySource("classpath:application.yml")
14 public class LocaleMessageUtil { 17 public class LocaleMessageUtil {
15 18
16 @Resource 19 @Resource
......
...@@ -31,12 +31,12 @@ public class SwaggerConfig { ...@@ -31,12 +31,12 @@ public class SwaggerConfig {
31 /** 31 /**
32 * 扫描Controller包的路径 32 * 扫描Controller包的路径
33 */ 33 */
34 - public static final String BASE_PACKAGE = "com.fedex.export.controller"; 34 + public static final String BASE_PACKAGE = "com.fedex.connect.kafka.controller";
35 35
36 /** 36 /**
37 * API信息 37 * API信息
38 */ 38 */
39 - public static final String API_INFO = "Export TW APIs"; 39 + public static final String API_INFO = "iClear Connect-Pre-Clearance Kafka-cndc-server APIs";
40 public static final String API_VERSION = "1.0"; 40 public static final String API_VERSION = "1.0";
41 41
42 /** 42 /**
......
...@@ -9,7 +9,25 @@ spring: ...@@ -9,7 +9,25 @@ spring:
9 active: @activatedProperties@ 9 active: @activatedProperties@
10 messages: 10 messages:
11 basename: message 11 basename: message
12 + encoding: utf-8
12 13
14 +import:
15 + jwt:
16 + securityKey: C*F-JaNdRgUkXn2r5u8x/A?D(G+KbPeShVmYq3s6v9y$B&E)H@McQfTjWnZr4u7w
17 + urlWhiteList:
18 + - /kafka-cndc-server/auth
19 + - /kafka-cndc-server/monitor/ok
20 + - /kafka-cndc-server/user/logout
21 + - /kafka-cndc-server/swagger-resources
22 + - /kafka-cndc-server/webjars
23 + - /kafka-cndc-server/csrf
24 + uriWhiteList:
25 + - /kafka-cndc-server/swagger-ui.html
26 + - /kafka-cndc-server/swagger-ui/*
27 + - /kafka-cndc-server/v2/api-docs
28 + - /kafka-cndc-server/login.html
29 + expire_1H: 7200
30 + expire_1D: 604800
13 31
14 mybatis: 32 mybatis:
15 mapper-locations: 33 mapper-locations:
......
1 +#authentication包
2 +auth_exc_no_auth=沒有訪問許可權
3 +auth_exc_no_pass_auth=沒有通過許可權認證
4 +auth_filter_user_error=登錄身份異常
5 +auth_filter_timeout=登錄超過8小時，請重新登錄
6 +auth_filter_stale_dated=登錄已過期
7 +
8 +enum_res_code_301=登錄身份異常
9 +enum_res_code_305=登錄已過期，請重新登錄
...\ No newline at end of file ...\ No newline at end of file
1 +#authentication包
2 +auth_exc_no_auth=沒有訪問許可權
3 +auth_exc_no_pass_auth=沒有通過許可權認證
4 +auth_filter_user_error=登錄身份異常
5 +auth_filter_timeout=登錄超過8小時，請重新登錄
6 +auth_filter_stale_dated=登錄已過期
7 +
8 +enum_res_code_301=登錄身份異常
9 +enum_res_code_305=登錄已過期，請重新登錄
...\ No newline at end of file ...\ No newline at end of file
1 +package com.fedex.connect.manager.config;
2 +
3 +import org.springframework.context.annotation.Bean;
4 +import org.springframework.context.annotation.Configuration;
5 +import org.springframework.context.annotation.Profile;
6 +import springfox.documentation.builders.ApiInfoBuilder;
7 +import springfox.documentation.builders.PathSelectors;
8 +import springfox.documentation.builders.RequestHandlerSelectors;
9 +import springfox.documentation.service.ApiInfo;
10 +import springfox.documentation.service.ApiKey;
11 +import springfox.documentation.service.AuthorizationScope;
12 +import springfox.documentation.service.SecurityReference;
13 +import springfox.documentation.spi.DocumentationType;
14 +import springfox.documentation.spi.service.contexts.SecurityContext;
15 +import springfox.documentation.spring.web.plugins.Docket;
16 +import springfox.documentation.swagger2.annotations.EnableSwagger2;
17 +
18 +import java.util.ArrayList;
19 +import java.util.List;
20 +
21 +/**
22 + * SwaggerConfig配置类.开启Swagger2,自动生成文档
23 + *
24 + * @author EDY
25 + */
26 +@Configuration
27 +@EnableSwagger2
28 +@Profile({"dev", "test", "uat"})
29 +public class SwaggerConfig {
30 +
31 + /**
32 + * 扫描Controller包的路径
33 + */
34 + public static final String BASE_PACKAGE = "com.fedex.connect.manager.controller";
35 +
36 + /**
37 + * API信息
38 + */
39 + public static final String API_INFO = "iClear Connect-Pre-Clearance Manager-server APIs";
40 + public static final String API_VERSION = "1.0";
41 +
42 + /**
43 + * 创建API应用
44 + *
45 + * @return
46 + */
47 + @Bean
48 + public Docket restApi() {
49 + return new Docket(DocumentationType.SWAGGER_2)
50 + .apiInfo(apiInfo(API_INFO, API_VERSION))
51 + .useDefaultResponseMessages(true)
52 + .forCodeGeneration(false)
53 + .select()
54 + // 扫描指定目录的API
55 + .apis(RequestHandlerSelectors.basePackage(BASE_PACKAGE))
56 + .paths(PathSelectors.any())
57 + .build()
58 + //配置全局io.swagger.model
59 + .securitySchemes(securitySchemes())
60 + //配置将安全上下文应用于哪些api操作(通过正则表达式模式)和HTTP方法
61 + .securityContexts(securityContexts());
62 + }
63 +
64 + /**
65 + * API的基本信息
66 + *
67 + * @return
68 + */
69 + private ApiInfo apiInfo(String title, String version) {
70 + return new ApiInfoBuilder().title(title).description(API_INFO).version(version).build();
71 + }
72 +
73 + private List<ApiKey> securitySchemes() {
74 + List<ApiKey> apiKeys = new ArrayList<>();
75 + /*SecurityConstants.TOKEN_HEADER*/
76 + apiKeys.add(new ApiKey("Authorization", "Authorization", "header"));
77 + return apiKeys;
78 + }
79 +
80 + private List<SecurityContext> securityContexts() {
81 + List<SecurityContext> securityContexts = new ArrayList<>();
82 + securityContexts.add(SecurityContext.builder()
83 + .securityReferences(defaultAuth())
84 + //指定/auth 请求下不会携带全局参数
85 + .forPaths(PathSelectors.regex("^(?!/auth).*$")).build());
86 + return securityContexts;
87 + }
88 + private List<SecurityReference> defaultAuth() {
89 + AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
90 + AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
91 + authorizationScopes[0] = authorizationScope;
92 + List<SecurityReference> securityReferences = new ArrayList<>();
93 + securityReferences.add(new SecurityReference("Authorization", authorizationScopes));
94 + return securityReferences;
95 + }
96 +}
...@@ -20,6 +20,23 @@ spring: ...@@ -20,6 +20,23 @@ spring:
20 basename: message 20 basename: message
21 encoding: utf-8 21 encoding: utf-8
22 22
23 +import:
24 + jwt:
25 + securityKey: C*F-JaNdRgUkXn2r5u8x/A?D(G+KbPeShVmYq3s6v9y$B&E)H@McQfTjWnZr4u7w
26 + urlWhiteList:
27 + - /manager-server/auth
28 + - /manager-server/monitor/ok
29 + - /manager-server/user/logout
30 + - /manager-server/swagger-resources
31 + - /manager-server/webjars
32 + uriWhiteList:
33 + - /manager-server/swagger-ui.html
34 + - /manager-server/swagger-ui/*
35 + - /manager-server/v2/api-docs
36 + - /manager-server/login.html
37 + expire_1H: 7200
38 + expire_1D: 604800
39 +
23 mybatis: 40 mybatis:
24 mapper-locations: 41 mapper-locations:
25 - classpath*:com/fedex/connect/**/mapper/**/*.xml 42 - classpath*:com/fedex/connect/**/mapper/**/*.xml
......
1 -#authentication包
2 -auth_exc_no_auth=沒有訪問許可權
3 -auth_exc_no_pass_auth=沒有通過許可權認證
4 -auth_filter_user_error=登錄身份異常
5 -auth_filter_timeout=登錄超過8小時，請重新登錄
6 -auth_filter_stale_dated=登錄已過期
...\ No newline at end of file ...\ No newline at end of file
1 +#authentication包
2 +auth_exc_no_auth=沒有訪問許可權
3 +auth_exc_no_pass_auth=沒有通過許可權認證
4 +auth_filter_user_error=登錄身份異常
5 +auth_filter_timeout=登錄超過8小時，請重新登錄
6 +auth_filter_stale_dated=登錄已過期
...\ No newline at end of file ...\ No newline at end of file
......
1 +#authentication包
2 +auth_exc_no_auth=沒有訪問許可權
3 +auth_exc_no_pass_auth=沒有通過許可權認證
4 +auth_filter_user_error=登錄身份異常
5 +auth_filter_timeout=登錄超過8小時，請重新登錄
6 +auth_filter_stale_dated=登錄已過期
...\ No newline at end of file ...\ No newline at end of file
......