From da7dfbcb50e9930dbbb5dceb1a89ce0b1b9bd053 Mon Sep 17 00:00:00 2001 From: MrZhai Date: Thu, 24 Mar 2022 11:12:25 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E6=8E=88=E6=9D=83=E8=A1=A8?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E5=AE=9E=E4=BD=93=E7=B1=BB=EF=BC=8C=E7=AC=AC?= =?UTF-8?q?=E4=B8=89=E6=96=B9=E7=B3=BB=E7=BB=9F=E8=A1=A8=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=8E=88=E6=9D=83=E7=A0=81=E5=92=8C=E7=A7=98=E9=92=A5=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=202.=E7=AC=AC=E4=B8=89=E6=96=B9=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=92=8C=E6=9B=B4=E6=96=B0=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=AF=B9=E6=9C=AC=E7=B3=BB=E7=BB=9F=E6=8E=88?= =?UTF-8?q?=E6=9D=83=E7=A0=81=E5=92=8C=E7=A7=98=E9=92=A5=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=80=BC=E5=9B=9E=E6=98=BE=E5=92=8C=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 授权表sql DROP TABLE IF EXISTS `auth_license`; CREATE TABLE `auth_license` ( `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL, `appid` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL, `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL, `apikey` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL, `secretkey` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL, `createDate` datetime(0) NULL DEFAULT NULL, `customerId` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL, `companyName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL, PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC; SET FOREIGN_KEY_CHECKS = 1; 第三方系统表增加字段sql ALTER TABLE `basic_third_sys` ADD COLUMN `apikey` varchar(255) NULL COMMENT '第三方系统接口授权码' AFTER `thirdName`, ADD COLUMN `secretkey` varchar(255) NULL COMMENT '第三方系统接口秘钥' AFTER `apikey`; --- .../api/admin/dao/auth/AuthLicenseDao.java | 36 +++++++++++++ .../entity/basic/BasicThirdSysEntity.java | 14 +++++ .../basic/impl/BasicThirdSysServiceImpl.java | 26 ++++++++- .../mybatis/mapper/auth/AuthLicenseDao.xml | 54 +++++++++++++++++++ .../mybatis/mapper/basic/BasicThirdSysDao.xml | 2 + 5 files changed, 131 insertions(+), 1 deletion(-) create mode 100644 api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthLicenseDao.java create mode 100644 api-admin/src/main/resources/mybatis/mapper/auth/AuthLicenseDao.xml diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthLicenseDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthLicenseDao.java new file mode 100644 index 00000000..ee3386c0 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthLicenseDao.java @@ -0,0 +1,36 @@ +package com.glxp.api.admin.dao.auth; + +import com.glxp.api.admin.entity.auth.AuthLicense; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +@Mapper +public interface AuthLicenseDao { + + AuthLicense get(String id); + + int save(AuthLicense authLicense); + + int update(AuthLicense authLicense); + + int remove(String appid); + + int romveByCustomerId(String customerId); + + /** + * 根据名称查询授权码和秘钥 + * + * @param name + * @return + */ + AuthLicense selectLicenseByName(@Param("name") String name); + + /** + * 根据名称修改系统的授权码和秘钥 + * + * @param licenseApikey + * @param secretkey + * @param name + */ + void updateLicenseByName(@Param("apikey") String licenseApikey, @Param("secretkey") String secretkey, @Param("name") String name); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicThirdSysEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicThirdSysEntity.java index fe366076..8768fd8c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicThirdSysEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicThirdSysEntity.java @@ -12,4 +12,18 @@ public class BasicThirdSysEntity { private String guideUrl; private String thridUrl; private Boolean mainSys; + + //第三方系统授权码 + private String apikey; + + //第三方系统接口秘钥 + private String secretkey; + + //业务字段 + + //本系统授权码 + private String licenseApikey; + + //本系统秘钥 + private String licenseSecretkey; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicThirdSysServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicThirdSysServiceImpl.java index c079858f..c877bcc2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicThirdSysServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicThirdSysServiceImpl.java @@ -1,25 +1,41 @@ package com.glxp.api.admin.service.basic.impl; +import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.auth.AuthLicenseDao; import com.glxp.api.admin.dao.basic.BasicThirdSysDao; +import com.glxp.api.admin.entity.auth.AuthLicense; import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; import com.glxp.api.admin.req.basic.FilterBasicThirdSysRequest; import com.glxp.api.admin.service.basic.BasicThirdSysService; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Collections; import java.util.List; +@Slf4j @Service public class BasicThirdSysServiceImpl implements BasicThirdSysService { @Resource BasicThirdSysDao basicThirdSysDao; + @Resource + private AuthLicenseDao authLicenseDao; @Override public boolean updateBasicThiSys(BasicThirdSysEntity basicThirdSysEntity) { - return basicThirdSysDao.updateBasicThiSys(basicThirdSysEntity); + try { + //同步更新本系统的授权码和秘钥 + if (StrUtil.isNotBlank(basicThirdSysEntity.getLicenseApikey()) || StrUtil.isNotBlank(basicThirdSysEntity.getLicenseSecretkey())) { + authLicenseDao.updateLicenseByName(basicThirdSysEntity.getLicenseApikey(), basicThirdSysEntity.getLicenseSecretkey(), "UDI管理系统"); + } + basicThirdSysDao.updateBasicThiSys(basicThirdSysEntity); + } catch (Exception e) { + log.error("更新第三方系统信息异常", e); + } + return true; } @Override @@ -38,6 +54,14 @@ public class BasicThirdSysServiceImpl implements BasicThirdSysService { PageHelper.offsetPage(offset, filterBasicThirdSysRequest.getLimit()); } List data = basicThirdSysDao.filterBasicThiSys(filterBasicThirdSysRequest); + //查询本系统的授权码 + AuthLicense license = authLicenseDao.selectLicenseByName("UDI管理系统"); + if (null != license) { + data.forEach(basicThirdSysEntity -> { + basicThirdSysEntity.setLicenseApikey(license.getApiKey()); + basicThirdSysEntity.setLicenseSecretkey(license.getSecretKey()); + }); + } return data; } diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/AuthLicenseDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/AuthLicenseDao.xml new file mode 100644 index 00000000..ef33b71e --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/auth/AuthLicenseDao.xml @@ -0,0 +1,54 @@ + + + + + + + INSERT INTO auth_license(id, appid, name, apiKey, secretKey, createDate, customerId, companyName) + values (#{id}, #{appid}, #{name,jdbcType=VARCHAR}, #{apiKey,jdbcType=VARCHAR}, + #{secretKey,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{customerId}, #{companyName}) + + + + UPDATE auth_license + + appid=#{appid}, + name=#{name}, + apiKey=#{apiKey}, + secretKey=#{secretKey}, + createDate=#{createDate} + customerId=#{customerId} + companyName=#{companyName} + + WHERE id=#{id} + + + + delete + from auth_license + where id = #{id} + + + + delete + from auth_license + where customerId = #{customerId} + + + + + + update auth_license + + apikey=#{apikey}, + secretkey=#{secretkey}, + + where name = #{name} + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml index d1d89a9a..2b3df95c 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml @@ -13,6 +13,8 @@ thridUrl=#{thridUrl}, enabled=#{enabled}, mainSys=#{mainSys}, + apikey=#{apikey}, + secretkey=#{secretkey} WHERE id=#{id}