Merge branch 'huangzqa-new-version-20210404' into 'develop'

Huangzqa new version 20210404

See merge request dcuc-tjdsj/auth-back!5

pom.xml

@@ -209,6 +209,13 @@
             <artifactId>duceap-security-dids</artifactId>
         </dependency>
 
+        <!--测试-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
     <!--指定仓库地址-->
     <repositories>

src/main/java/com/dragoninfo/dcuc/authweb/enums/CheckTypeEnum.java

@@ -7,6 +7,11 @@ import com.dragonsoft.duceap.base.enums.ICodeEnum;
  * @date 2021/4/6
  **/
 public enum CheckTypeEnum implements ICodeEnum {
+    /**
+     * 无凭据
+     */
+    NONE("none", "无凭据"),
+
     /**
      * 基本凭据
      */

src/main/java/com/dragoninfo/dcuc/authweb/interceptor/AuthBeforeResInterceptor.java

@@ -95,6 +95,8 @@ public class AuthBeforeResInterceptor implements HandlerInterceptor {
 
                 return hwIdentityBusiness.checkToken(userToken, appToken);
             }
+        } else if (checkTypeEnum.equals(CheckTypeEnum.NONE)) {
+            return true;
         }
 
         throw new EvidenceException(HttpStatus.MULTIPLE_CHOICES.value(), "请传入凭据");

src/main/resources/application-base.yml

@@ -38,11 +38,11 @@ duceap:
   security:
     type: dcuc
     dcuc:
-      cas-server-url-prefix: http://10.11.1.142:8877/dcucserver
-      server-name: 10.11.0.240:8871
+      cas-server-url-prefix: http://192.168.10.2:8877/sso
+      server-name: 10.11.1.151:8000
       ignore-pattern: '/js/*|/img/*|/css/*|/api/*|/*.png|/rest/*|/webSocket/*|/oauthLogin/*|/authorizationPage.html|/importAuthorizationFile.html|/license/LicenseManagerServlet|/authorizationFile/'
       app-code: QXXT0000000000000001
-      api-url: http://127.0.0.1:8861/dcucauth
+      api-url: http://192.168.10.2:8860/dcuc
     dids2:
       appCode: YHZX0000000000000001
       SSOLoginUrl: http://192.168.6.128:9995/didsserver/login

src/test/java/GenerateToken.java

@@ -0,0 +1,34 @@
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.auth0.jwt.JWT;
+import com.auth0.jwt.JWTCreator;
+import com.auth0.jwt.algorithms.Algorithm;
+import com.dragonsoft.duceap.commons.util.date.DateUtils;
+import org.junit.Test;
+
+import java.util.Date;
+
+/**
+ * @author huangzqa
+ * @date 2021/4/8
+ **/
+public class GenerateToken {
+
+    @Test
+    public void getUserToken() {
+        DateTime date = DateUtil.date();
+
+        DateTime dateTime = DateUtil.offsetDay(date, 1);
+
+        Algorithm algorithm = Algorithm.HMAC256("secret");
+        JWTCreator.Builder builder = JWT.create().withExpiresAt(dateTime).withIssuedAt(date);
+
+        builder.withClaim("idCard", "379004198203211208");
+
+        String sign = builder.sign(algorithm);
+
+        System.out.println(sign);
+
+    }
+
+}