From 32f84fb49d7e04b1bf938072989c04fda3e0f789 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Mon, 30 Aug 2021 14:00:30 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 8 +- .../controller/CrypConfigureController.java | 134 ++++++++++++++++++ .../dao/CrypConfigureMapper.java | 10 ++ .../dao/mapper/CrypConfigureMapper.xml | 31 ++++ .../extend/crypconfigure/entity/CrypBean.java | 35 +++++ .../crypconfigure/entity/CrypConfigure.java | 73 ++++++++++ .../service/ICrypConfigureService.java | 28 ++++ .../impl/CrypConfigureServiceImpl.java | 92 ++++++++++++ 8 files changed, 410 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/dao/CrypConfigureMapper.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/dao/mapper/CrypConfigureMapper.xml create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/entity/CrypBean.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/entity/CrypConfigure.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/ICrypConfigureService.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/impl/CrypConfigureServiceImpl.java diff --git a/pom.xml b/pom.xml index 80857ba..c2bdade 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,13 @@ uboot-core 0.0.1-SNAPSHOT - + + + com.chinaunicom.mall.ebtp + uboot-common + 0.0.19-SNAPSHOT + + com.chinaunicom.ebtp mall-ebtp-cloud-attachment-sdk diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java new file mode 100644 index 0000000..47441d0 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java @@ -0,0 +1,134 @@ +package com.chinaunicom.mall.ebtp.extend.crypconfigure.controller; + + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.extend.crypconfigure.entity.CrypBean; +import com.chinaunicom.mall.ebtp.extend.crypconfigure.entity.CrypConfigure; +import com.chinaunicom.mall.ebtp.extend.crypconfigure.service.ICrypConfigureService; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import javax.annotation.Resource; +import javax.validation.Valid; +import java.util.List; + +@RestController +@Api(value = "区块链参数配置表") +@RequestMapping("/v1/crypconfigure") +public class CrypConfigureController{ + + @Resource + private ICrypConfigureService iCrypConfigureService; + +// /** +// * 插入新数据 +// * +// * @param crypConfigure +// * +// * @return +// */ +// @ApiOperation("插入新数据") +// @PostMapping +// public BaseResponse insert(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid CrypConfigure crypConfigure){ +// +// int i = iCrypConfigureService.insert(crypConfigure); +// +// return BaseResponse.success(i); +// } +// +// /** +// * 修改数据 +// * +// * @param crypConfigure +// * +// * @return +// */ +// @ApiOperation("修改数据") +// @PutMapping +// public BaseResponse update(@ApiParam(value = "对象数据", required = true) @RequestBody CrypConfigure crypConfigure){ +// +// Boolean i = iCrypConfigureService.updateCrypConfigureById(crypConfigure); +// +// return BaseResponse.success(i); +// } +// +// /** +// * 查询数据 +// * +// * @param id +// * +// * @return +// */ +// @ApiOperation("根据id查询数据") +// @GetMapping("/{id}") +// public BaseResponse get(@ApiParam(value = "主键id", required = true) @PathVariable String id){ +// +// CrypConfigure crypConfigure = iCrypConfigureService.getById(id); +// +// return BaseResponse.success(crypConfigure); +// } +// +// /** +// * 删除数据 +// * @param id 主键id +// * @return BaseResponse +// * @author dino +// * @date 2020/10/21 14:56 +// */ +// @ApiOperation(value = "delete",notes = "删除数据") +// @DeleteMapping("/{id}") +// public BaseResponse delete(@ApiParam(value = "主键id", required = true) @PathVariable Long id) { +// int i = iCrypConfigureService.deleteById(id); +// return BaseResponse.success(i); +// } + + /** + * 查询数据 + * + * @param param + * @return + */ + @ApiOperation("查询列表数据") + @GetMapping("/list") + public BaseResponse> list(@ApiParam(value = "查询对象数据", required = false) CrypConfigure param) { + //查询 + LambdaQueryWrapper query = Wrappers.lambdaQuery(param); + List list = iCrypConfigureService.list(query); + //异常处理 + //RespsExceptionEnum.FRAME_EXCEPTION_DEMO_NOT_FIND.customValid(list.isEmpty()); + return BaseResponse.success(list); + } + + /** + * 区块链数据加密 + * + * @param object + * @return + */ + @ApiOperation("区块链数据加密") + @PostMapping("/signObject") + public BaseResponse signObject(@RequestBody Object object) { + + return BaseResponse.success(this.iCrypConfigureService.signObject(object)); + } + + /** + * 区块链数据解密 + * + * @param bean + * @return + */ + @ApiOperation("区块链数据解密") + @PostMapping("/verifyObject") + public BaseResponse verifyObject(@RequestBody CrypBean bean) { + + return BaseResponse.success(this.iCrypConfigureService.verifyObject(bean)); + } +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/dao/CrypConfigureMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/dao/CrypConfigureMapper.java new file mode 100644 index 0000000..16f76f1 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/dao/CrypConfigureMapper.java @@ -0,0 +1,10 @@ +package com.chinaunicom.mall.ebtp.extend.crypconfigure.dao; + + +import com.chinaunicom.mall.ebtp.common.base.dao.IBaseMapper; +import com.chinaunicom.mall.ebtp.extend.crypconfigure.entity.CrypConfigure; +import org.springframework.stereotype.Repository; + +@Repository +public interface CrypConfigureMapper extends IBaseMapper { +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/dao/mapper/CrypConfigureMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/dao/mapper/CrypConfigureMapper.xml new file mode 100644 index 0000000..605fa81 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/dao/mapper/CrypConfigureMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + update biz_bid_cryp_configure + set + delete_flag="1" + where ID=#{id } + + \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/entity/CrypBean.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/entity/CrypBean.java new file mode 100644 index 0000000..1c6cee4 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/entity/CrypBean.java @@ -0,0 +1,35 @@ +package com.chinaunicom.mall.ebtp.extend.crypconfigure.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** +* 实体类 CrypConfigure-区块链参数配置表 +* +* @author yss +*/ +@Data +public class CrypBean { + + /** + * 签名 + */ + @ApiModelProperty(value = "签名") + public String sing; + /** + * 待签名参数 + */ + @ApiModelProperty(value = "待签名参数") + public Object object; + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/entity/CrypConfigure.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/entity/CrypConfigure.java new file mode 100644 index 0000000..bcb83cc --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/entity/CrypConfigure.java @@ -0,0 +1,73 @@ +package com.chinaunicom.mall.ebtp.extend.crypconfigure.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** +* 实体类 CrypConfigure-区块链参数配置表 +* +* @author yss +*/ +@Data +@Accessors(chain = true) +@TableName(value = "biz_bid_cryp_configure", autoResultMap = true) +@ApiModel(value = "CrypConfigure对象", description = "区块链参数配置表") +public class CrypConfigure extends BaseEntity implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId + @ApiModelProperty(value = "主键ID") + private String id; + + @ApiModelProperty(value = "配置标识") + private String cCode; + + @ApiModelProperty(value = "配置说明") + private String cShow; + + @ApiModelProperty(value = "配置类型 1-区块链") + private Integer type; + + @ApiModelProperty(value = "值") + private String cValue; + + @ApiModelProperty(value = "备注") + private String remarks; + + @ApiModelProperty(value = "状态 0-失效 1-生效") + private Integer state; + + + + + + @ApiModelProperty(value = "租户ID") + private String tenantId; + + @ApiModelProperty(value = "租户名称") + private String tenantName; + + @ApiModelProperty(value = "删除标识") + private String deleteFlag; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "删除标识") + private LocalDateTime lastUpdateTime; + + @ApiModelProperty(value = "割接状态；0-割接数据，1-新数据") + private Integer cutoverStatus; + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/ICrypConfigureService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/ICrypConfigureService.java new file mode 100644 index 0000000..663dc6b --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/ICrypConfigureService.java @@ -0,0 +1,28 @@ +package com.chinaunicom.mall.ebtp.extend.crypconfigure.service; + + +import com.chinaunicom.mall.ebtp.common.base.service.IBaseService; +import com.chinaunicom.mall.ebtp.extend.crypconfigure.entity.CrypBean; +import com.chinaunicom.mall.ebtp.extend.crypconfigure.entity.CrypConfigure; + +/** + * 对数据表 biz_bid_cryp_configure 操作的 service + * @author yss + * + */ +public interface ICrypConfigureService extends IBaseService { + + /** + * 加密 + * @param object + * @return + */ + CrypBean signObject(Object object); + + /** + * 解密 + * @param bean + * @return + */ + Boolean verifyObject(CrypBean bean); +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/impl/CrypConfigureServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/impl/CrypConfigureServiceImpl.java new file mode 100644 index 0000000..b2e6a5d --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/impl/CrypConfigureServiceImpl.java @@ -0,0 +1,92 @@ +package com.chinaunicom.mall.ebtp.extend.crypconfigure.service.impl; + + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.serializer.SerializerFeature; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; +import com.chinaunicom.mall.ebtp.common.constant.CommonConstants; +import com.chinaunicom.mall.ebtp.common.crypto.service.CrypServiceImpl; +import com.chinaunicom.mall.ebtp.extend.crypconfigure.dao.CrypConfigureMapper; +import com.chinaunicom.mall.ebtp.extend.crypconfigure.entity.CrypBean; +import com.chinaunicom.mall.ebtp.extend.crypconfigure.entity.CrypConfigure; +import com.chinaunicom.mall.ebtp.extend.crypconfigure.service.ICrypConfigureService; +import org.bouncycastle.util.encoders.Base64; +import org.springframework.stereotype.Service; + +import java.security.PrivateKey; +import java.util.List; + +/** + * 对数据表 biz_bid_cryp_configure 操作的 serviceImpl + * @author yss + * + */ +@Service +public class CrypConfigureServiceImpl extends BaseServiceImpl implements ICrypConfigureService { + /** + * 加密 + * @param object + * @return + */ + @Override + public CrypBean signObject(Object object){ + CrypBean bean = new CrypBean(); + try{ + bean.setObject(object); + //查询 + LambdaQueryWrapper query = Wrappers.lambdaQuery(); + query.eq(CrypConfigure::getState,"1") + .eq(CrypConfigure::getDeleteFlag, CommonConstants.STATUS_NORMAL) + .eq(CrypConfigure::getType,"1") + .eq(CrypConfigure::getCCode,"pem_key"); + + List list = this.list(query); + + CrypConfigure crypConfigure = list.get(0); + + String signValue = CrypServiceImpl.signObject2(bean.getObject(),crypConfigure.getCValue()); + + bean.setSing(signValue); + + return bean; + }catch (Exception e){ + log.error("加密异常:"+e); + } + + + return bean; + } + + /** + * 解密 + * @param bean + * @return + */ + @Override + public Boolean verifyObject(CrypBean bean){ + try{ + //查询 + LambdaQueryWrapper query = Wrappers.lambdaQuery(); + query.eq(CrypConfigure::getState,"1") + .eq(CrypConfigure::getDeleteFlag, CommonConstants.STATUS_NORMAL) + .eq(CrypConfigure::getType,"1") + .eq(CrypConfigure::getCCode,"crt_key"); + + List list = this.list(query); + log.debug("---------获取解密秘钥--------"); + CrypConfigure crypConfigure = list.get(0); + + Boolean b = CrypServiceImpl.verifyBytes(bean.getSing(), + JSON.toJSONBytes(bean.getObject(),SerializerFeature.MapSortField,SerializerFeature.SortField), + crypConfigure.getCValue()); + return b; + }catch (Exception e){ + + } + + + return false; + } +} From 30f342463ef3dc8a76e229779ae7de78a107c8e4 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Mon, 30 Aug 2021 14:49:56 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crypconfigure/service/impl/CrypConfigureServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/impl/CrypConfigureServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/impl/CrypConfigureServiceImpl.java index b2e6a5d..136c62e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/impl/CrypConfigureServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/impl/CrypConfigureServiceImpl.java @@ -78,8 +78,8 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl Date: Tue, 31 Aug 2021 09:38:52 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/access_token1.0.jar | Bin 0 -> 30211 bytes pom.xml | 9 +++++++++ .../controller/CrypConfigureController.java | 7 +++++++ 3 files changed, 16 insertions(+) create mode 100644 lib/access_token1.0.jar diff --git a/lib/access_token1.0.jar b/lib/access_token1.0.jar new file mode 100644 index 0000000000000000000000000000000000000000..aabd9395047f78ee2640309737a9e3893d50c417 GIT binary patch literal 30211 zcmb@tbC4&|vMt=UZFAbTZQHh{e{J`)ZQIkfZ5z|JZFj#p_na^8doS)i@xF*#QGZlK z?c5a=ktynX_V?Mu!Hz-kzg>a!uN5YiR`y0N_E!IX zHTr+C+Stg*`QLm1@4quK`RU;ZaQHWtIRBlc3&6_uKkU$eprD|DIu-xVpQib@c0wj5 zX3oy44mM`?^d`1O&d%9tHYzF_XnGuEWV-YyzYKweyiw5M@?OGJ%b~z!dvOMp-*4hJ zf+D5tJ+I*tx((J!Fa1sc!w%UP=0PdxU;bZ7Uje@7fb2{((jxiNNylmaxS{R`Mzj^p@N52zlCD- zWHQ<$e~yht8gIot6(G5;b`-D6x2Giw^87qp%><|m7$3kNGqWJ(rfKZpv#1oU;IZ7j z$uhN+={OrRRdghfiMi@)hUjXrcTFb<&3WdccK;wLWNXKX)@pZj_c3@8r6WF9E+`_> zES_cS_t=ptM#rPN=6NeemBMNhR!=QOElEa=89b?g(XQBtsiAlbG)ZIjR_R9`^IBXx zoH-(SzOjcng5m2(rN&@r5 zOH&dU2C1;$|EakjVD z@q0({d&hBR$MIoO5O5L|s`2u+^q%#?&ZeE2XB<6=y>(rMNWAl(q>w?azRFBU$GRzz~?K*>FegM&jP;){;Nod)woK(1*%}`*T*}Ujj*lQ41 zQE6Kkbu}nuU~1ZN@sVxPahhWGlm7wFXau!|b0TGuvP!uRyMw!A$Gs}bh8-ZJ+5E+t zkAqom(3Kl>yb(H_TV}D6CK&Vh66L zP4JgDUGjuLL5#a005&HWeo=2b(2e+DUC_rC{!4{2m*@rz{tEA6E6DSmDR5;a&#CYf z^WxSJekv2{>i_~O(S#I#{3dh^!}9n~020eZKXA@7(%cj+!XC(d%A#i&q9gANKGJGP zWZ1k8p_D;C)U*CU4og#`Ny5pUla!h5A;G42#&-TAoDgwG3y8wXO!(Eg{R}$?R6@&Cd&4gRtk8B`8im z<}_r&(UY2!(|Yw|N~!z^RhJn?*P0ju=yM42AxgDU?rA4kRWdD%z%;nZ>-s-rRQK`E zZsVjSn<##ZVq)k<^LA!Cx>W3QMx*a1##BACU=CE;f#OKrD6g|J; z)+PrYB1bBaks|ds4}milK-WNWgP#6?SCoN-x-z(#4+aMUvir+r{~)Y?M)&`l(kTCZ zbQe=m`^yghjO@i4uWqL z=Ix)`UC*2En}^ZgZ@CSGASeB~e0VU-5zMq4()N>{j_^mkWdog2;2c+vz0ryG8^?X- z8w~rvOafGC-4yDGWA1-`O(-G_P-Dlk<`Eb?@4)c3L&xqqVJo=T>ft$zBr=~m+MOf9us+2clKdb(xQ40Tl*b?(Ba z(7jNudkO`rQcR3Hbw;El$A)WT2G`}EmGpcx^hlKV<#Z0^L!J2*yQ@Z3d1mkvRD*4l z6&;**v|&v_M>rr(A`DpSMUy1FD+{kug+#mKkCQ@~vLO(Kwzctj*dw4QrYKN|V$Bkf z#aS70m@aIygouxT;Bm@+LzC|E`U`1GeU3ZzwaMFAE**rKqt@cn1rhBnhy*E$e5cV` zimAbJmBA$zLtQ~xd8}NwSAV6h4Lgi^>JVaQ;48(rl;3EK;4n{y42j1HW8yh7 z=Deh9TXh``6&Ep|SvS7gP&rzy(l+D=72I37n zy;}VYiSX8Ic8=YD5iLm?gZK0@4B7Q4-%$9<71@+l1-3Z07Z{7o|7eBx1$WqwigH8y zfVkGLEKcx)!MOdgxrIf8Ed!HsOR$h5pRL3Hev512Tr4X-tOZWvuF?1Y;y-$Q7FMrMu=7FRPB%f{ZW0YF5B^2?;|0nB?L$3n*-`mk;bQ(X z{2d(+yyLJrdKpamRJJW@THy8WwS|E1dvbxW=VkPjBUhlsJEX<;?kf_;H*}k(RVK{g z`~AFT(KO*^X7OwJ>DSpyU5ub6zSLwiMI&hZZ(}1y?9)puS_IQaMJrGGKbu<~tlT&P z%p57w7}`8j@^ouFJ`Mn4mUy`1gu+dgy7@n≤(lst2Qa*r!*F_wUZYY_pk!I9xbq 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 F`X6=meYOAq literal 0 HcmV?d00001 diff --git a/pom.xml b/pom.xml index c2bdade..07daa8b 100644 --- a/pom.xml +++ b/pom.xml @@ -100,6 +100,15 @@ ${basedir}/lib/aspose-words-16.8.0-jdk16.jar + + + cryp.access + accessToken + 1.0 + system + ${basedir}/lib/access_token1.0.jar + + org.apache.velocity velocity-tools diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java index 47441d0..63da22a 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java @@ -3,6 +3,7 @@ package com.chinaunicom.mall.ebtp.extend.crypconfigure.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.chinaunicom.baas.util.AccessToken; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.extend.crypconfigure.entity.CrypBean; import com.chinaunicom.mall.ebtp.extend.crypconfigure.entity.CrypConfigure; @@ -131,4 +132,10 @@ public class CrypConfigureController{ return BaseResponse.success(this.iCrypConfigureService.verifyObject(bean)); } + + public static void main(String[] args) { + String token = AccessToken.tokenCreate(); + System.out.println(token); + + } } From 445ca2720b3a3ce7336b8e95c22b3dc94103955d Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Tue, 31 Aug 2021 09:41:38 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CrypConfigureController.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java index 63da22a..92c5159 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java @@ -133,9 +133,16 @@ public class CrypConfigureController{ return BaseResponse.success(this.iCrypConfigureService.verifyObject(bean)); } - public static void main(String[] args) { - String token = AccessToken.tokenCreate(); - System.out.println(token); + /** + * accessToken获取 + * + * @param bean + * @return + */ + @ApiOperation("accessToken获取") + @PostMapping("/getAccessToken") + public BaseResponse getAccessToken(@RequestBody CrypBean bean) { + return BaseResponse.success( AccessToken.tokenCreate()); } } From a8d60cb680af3dbb02b3992c0566c939ca8bb71c Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Tue, 31 Aug 2021 10:38:17 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crypconfigure/controller/CrypConfigureController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java index 92c5159..f330be8 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java @@ -140,8 +140,8 @@ public class CrypConfigureController{ * @return */ @ApiOperation("accessToken获取") - @PostMapping("/getAccessToken") - public BaseResponse getAccessToken(@RequestBody CrypBean bean) { + @GetMapping("/getAccessToken") + public BaseResponse getAccessToken() { return BaseResponse.success( AccessToken.tokenCreate()); } From a3c404986fc2e10b46880e24b3eb62cc8fcfc388 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Tue, 31 Aug 2021 10:39:06 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crypconfigure/controller/CrypConfigureController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java index f330be8..0d60c9e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java @@ -136,7 +136,7 @@ public class CrypConfigureController{ /** * accessToken获取 * - * @param bean + * @param * @return */ @ApiOperation("accessToken获取") From 91b3957c4489d3387d31246fe2fc3a5704f20fdf Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Tue, 31 Aug 2021 13:56:44 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crypconfigure/service/impl/CrypConfigureServiceImpl.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/impl/CrypConfigureServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/impl/CrypConfigureServiceImpl.java index 136c62e..58ddd60 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/impl/CrypConfigureServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/impl/CrypConfigureServiceImpl.java @@ -1,8 +1,6 @@ package com.chinaunicom.mall.ebtp.extend.crypconfigure.service.impl; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.serializer.SerializerFeature; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; @@ -12,10 +10,8 @@ import com.chinaunicom.mall.ebtp.extend.crypconfigure.dao.CrypConfigureMapper; import com.chinaunicom.mall.ebtp.extend.crypconfigure.entity.CrypBean; import com.chinaunicom.mall.ebtp.extend.crypconfigure.entity.CrypConfigure; import com.chinaunicom.mall.ebtp.extend.crypconfigure.service.ICrypConfigureService; -import org.bouncycastle.util.encoders.Base64; import org.springframework.stereotype.Service; -import java.security.PrivateKey; import java.util.List; /**