jtoms 4 سال پیش
والد
کامیت
97bf452d42

+ 3 - 2
pom.xml

@@ -24,6 +24,7 @@
         <mysql-connector-java.version>8.0.27</mysql-connector-java.version>
         <mybatis-spring-boot-starter.version>2.2.0</mybatis-spring-boot-starter.version>
         <mybatis.version>3.5.7</mybatis.version>
+        <framework.version>1.0.12</framework.version>
 
         <!--        <slf4j.version>1.7.32</slf4j.version>-->
         <!--        <commons-lang3.version>3.12.0</commons-lang3.version>-->
@@ -37,12 +38,12 @@
         <dependency>
             <groupId>com.dliyun</groupId>
             <artifactId>framework-sprint-boot</artifactId>
-            <version>1.0.7</version>
+            <version>${framework.version}</version>
         </dependency>
         <dependency>
             <groupId>com.dliyun</groupId>
             <artifactId>framework-docs</artifactId>
-            <version>1.0.7</version>
+            <version>${framework.version}</version>
         </dependency>
         <dependency>
             <groupId>com.dliyun</groupId>

+ 2 - 2
src/main/java/com/zhiqiyun/open/apis/UserApi.java → src/main/java/com/zhiqiyun/open/router/apis/UserApi.java

@@ -1,10 +1,10 @@
-package com.zhiqiyun.open.apis;
+package com.zhiqiyun.open.router.apis;
 
 import com.dliyun.oap.framework.annotation.ServiceMethod;
 import com.dliyun.oap.framework.annotation.ServiceMethodBean;
 import com.dliyun.oap.framework.response.OapResponse;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.zhiqiyun.open.apis.request.LogonRequest;
+import com.zhiqiyun.open.router.apis.request.LogonRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 

+ 1 - 1
src/main/java/com/zhiqiyun/open/apis/request/LogonRequest.java → src/main/java/com/zhiqiyun/open/router/apis/request/LogonRequest.java

@@ -2,7 +2,7 @@
  * 版权声明:中图一购网络科技有限公司 版权所有 违者必究 2012
  * 日    期:12-7-14
  */
-package com.zhiqiyun.open.apis.request;
+package com.zhiqiyun.open.router.apis.request;
 
 import com.dliyun.oap.framework.annotation.ServiceParamField;
 import com.dliyun.oap.framework.request.AbstractOapRequest;

+ 18 - 0
src/main/java/com/zhiqiyun/open/router/config/DbBaseAppSecretManager.java

@@ -0,0 +1,18 @@
+package com.zhiqiyun.open.router.config;
+
+import com.dliyun.oap.framework.security.AppSecretManager;
+import com.zhiqiyun.open.core.models.AppKeyInfo;
+import com.zhiqiyun.open.core.service.AppKeyInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class DbBaseAppSecretManager implements AppSecretManager {
+
+    @Autowired
+    private AppKeyInfoService appKeyInfoService;
+
+    @Override
+    public boolean isValidAppKey(String appKey) {
+        AppKeyInfo appSecretInfo = this.appKeyInfoService.getById(appKey);
+        return appSecretInfo != null;
+    }
+}

+ 32 - 0
src/main/java/com/zhiqiyun/open/router/config/DesTransportSecurity.java

@@ -0,0 +1,32 @@
+package com.zhiqiyun.open.router.config;
+
+import com.dliyun.oap.framework.security.TransportSecurity;
+import com.dliyun.oap.framework.security.algorithm.DES;
+import com.zhiqiyun.open.core.models.AppKeyInfo;
+import com.zhiqiyun.open.core.service.AppKeyInfoService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class DesTransportSecurity implements TransportSecurity {
+
+    @Autowired
+    private AppKeyInfoService appKeyInfoService;
+
+    @Override
+    public String responseEncrypt(String appKey, String s) {
+        if (StringUtils.isNotBlank(appKey)) {
+            AppKeyInfo appSecretInfo = this.appKeyInfoService.getById(appKey);
+            s = DES.encrypt(appSecretInfo.getEncryptKey(), s);
+        }
+        return s;
+    }
+
+    @Override
+    public String requestDecrypt(String appKey, String s) {
+        if (StringUtils.isNotBlank(appKey)) {
+            AppKeyInfo appSecretInfo = this.appKeyInfoService.getById(appKey);
+            s = DES.decrypt(appSecretInfo.getEncryptKey(), s);
+        }
+        return s;
+    }
+}

+ 2 - 2
src/main/resources/application.properties

@@ -23,7 +23,8 @@ spring.redis.port=6379
 spring.redis.database=0
 ####################### oap config ###############################
 #spring.oap.security.file-upload-controller-class=com.dliyun.oap.framework.impl.DefaultFileUploadController
-#spring.oap.security.app-secret-manager-class=com.dliyun.oap.framework.impl.FileBaseAppSecretManager
+spring.oap.security.app-secret-manager-class=com.zhiqiyun.open.router.config.DbBaseAppSecretManager
+spring.oap.service.transport-security-class=com.zhiqiyun.open.router.config.DesTransportSecurity
 #spring.oap.security.service-access-controller-class=com.dliyun.oap.framework.impl.DefaultServiceAccessController
 #spring.oap.security.invoke-times-controller-class=com.dliyun.oap.framework.impl.DefaultInvokeTimesController
 #\u7EBF\u7A0B\u6C60\u914D\u7F6E
@@ -37,4 +38,3 @@ spring.redis.database=0
 #spring.oap.upload.file-types=jpg,png,doc,zip
 #\u7CFB\u7EDF\u914D\u7F6E
 #spring.oap.service.timeout-seconds=60
-#spring.oap.service.transport-security-class=com.dliyun.demo.apis.RsaTransportSecurity