Browse Source

fix: 数据鉴权代码合并后配置和pom文件还原

mazq 2 years ago
parent
commit
c905de52ca
3 changed files with 8 additions and 8 deletions
  1. 5 5
      pom.xml
  2. 1 1
      src/main/resources/application-authweb.yml
  3. 2 2
      src/main/resources/application-base.yml

+ 5 - 5
pom.xml

@@ -5,14 +5,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.dragoninfo</groupId>
     <artifactId>dcuc-auth-back</artifactId>
-    <version>2.4.2-xjaks-SNAPSHOT</version>
+    <version>2.4.2-tjdsj-SNAPSHOT</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <!--revisions需写死,用于标识打包的版本号,不可删除-->
-        <revision>2.4.2-xjaks-SNAPSHOT</revision>
+        <revision>2.4.2-tjdsj-SNAPSHOT</revision>
         <duceap.version>2.1.0-SNAPSHOT</duceap.version>
         <lombok.version>1.18.2</lombok.version>
         <jwt.version>3.10.3</jwt.version>
@@ -120,13 +120,13 @@
         <dependency>
             <groupId>com.dragoninfo</groupId>
             <artifactId>dcuc-auth-api</artifactId>
-            <version>2.4.2-xjaks-SNAPSHOT</version>
+            <version>2.4.2-tjdsj-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>com.dragoninfo</groupId>
             <artifactId>dcuc-app-api</artifactId>
-            <version>2.2.4-xjaks-SNAPSHOT</version>
+            <version>2.2.4-tjdsj-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -292,7 +292,7 @@
                                 </goals>
                                 <configuration>
                                     <!--排除licenseignore包,用来禁用许可开关,防止生产环境通过关闭开关,绕过许可-->
-                                    <excludeArtifactIds>duceap-support-licenseignore</excludeArtifactIds>
+<!--                                <excludeArtifactIds>duceap-support-licenseignore</excludeArtifactIds>-->
                                     <excludeScope>provided</excludeScope>
                                     <outputDirectory>${project.build.directory}/lib</outputDirectory>
                                     <!--取消依赖包的时间戳-->

+ 1 - 1
src/main/resources/application-authweb.yml

@@ -2,4 +2,4 @@ dcuc:
   authweb:
     app-code: QXXT0000000000000001
     auth-access: true
-    check-type-enum: none
+    check-type-enum: token

+ 2 - 2
src/main/resources/application-base.yml

@@ -49,7 +49,7 @@ duceap:
       enabled: false
       user-token-header-name: userToken
   security:
-    type: dids # 注解掉不开启认证登录
+    #type: dcuc # 注解掉不开启认证登录
     dcuc:
       cas-server-url-prefix: http://192.168.10.2:8877/sso
       server-name: 10.11.1.25:8871 10.11.1.237:8871
@@ -62,7 +62,7 @@ duceap:
       #单点登录服务接口地址
       SSOValidateUrl:  http://192.168.6.128:9995/didsserver/serviceValidate
       #跳转前端地址
-      SSOServiceUrl: http://10.11.1.25:8871/dcucauth/login
+      SSOServiceUrl: http://10.11.0.240:18871/dcuc/login
       #单点登录服务接口地址
       webServiceUrl: http://192.168.6.128:9995/didsserver/webservices/
       noFilterUrl: services,hessian,commons,install.action,.xml,/install,/widgets-src/,/authorizationPage.html,/importAuthorizationFile.html,/license/LicenseManagerServlet,/authorizationFile/,/api/,/js/,/png/,/rest/,/dataresourcesrv/,/swagger-ui.html,/v2/