Sfoglia il codice sorgente

Merge branch 'develop' of 192.168.0.144:xj-aks/dcuc/auth-back into mzq-sjjq-220929

mazq 2 anni fa
parent
commit
b608faedf6

+ 12 - 47
pom.xml

@@ -159,17 +159,17 @@
         </dependency>
         <!--配置 dcuc 结束-->
 
-<!--        <dependency>-->
-<!--            <groupId>net.unicon.cas</groupId>-->
-<!--            <artifactId>cas-client-autoconfig-support</artifactId>-->
-<!--            <version>2.1.0-GA</version>-->
-<!--            <exclusions>-->
-<!--                <exclusion>-->
-<!--                    <artifactId>joda-time</artifactId>-->
-<!--                    <groupId>joda-time</groupId>-->
-<!--                </exclusion>-->
-<!--            </exclusions>-->
-<!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>net.unicon.cas</groupId>-->
+        <!--            <artifactId>cas-client-autoconfig-support</artifactId>-->
+        <!--            <version>2.1.0-GA</version>-->
+        <!--            <exclusions>-->
+        <!--                <exclusion>-->
+        <!--                    <artifactId>joda-time</artifactId>-->
+        <!--                    <groupId>joda-time</groupId>-->
+        <!--                </exclusion>-->
+        <!--            </exclusions>-->
+        <!--        </dependency>-->
 
         <!-- https://mvnrepository.com/artifact/log4j/log4j -->
 
@@ -270,41 +270,6 @@
 
     <packaging>${project.packaging}</packaging>
     <profiles>
-        <!--war打包配置-->
-        <!--使用方式 mvn clean package -Pwar-->
-        <profile>
-            <id>war</id>
-            <properties>
-                <project.packaging>war</project.packaging>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>com.dragonsoft</groupId>
-                    <artifactId>duceap-boot-starter-web</artifactId>
-                    <!-- 移除嵌入式tomcat插件 -->
-                    <exclusions>
-                        <exclusion>
-                            <groupId>org.springframework.boot</groupId>
-                            <artifactId>spring-boot-starter-tomcat</artifactId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-war-plugin</artifactId>
-                        <version>2.1.1</version>
-                        <configuration>
-                            <failOnMissingWebXml>false</failOnMissingWebXml>
-                            <!--排除licenseignore包,用来禁用许可开关,防止生产环境通过关闭开关,绕过许可-->
-                           <!-- <packagingExcludes>WEB-INF/lib/duceap-support-licenseignore*.jar</packagingExcludes>-->
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <id>jar</id>
             <activation>
@@ -327,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>
                                     <!--取消依赖包的时间戳-->

+ 0 - 22
src/main/java/com/dragoninfo/dcuc/authweb/ConsumerTomcatApplication.java

@@ -1,22 +0,0 @@
-package com.dragoninfo.dcuc.authweb;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-
-/**
- * @author huangzqa
- * @date 2021/4/4
- **/
-@SpringBootApplication(scanBasePackages = {"com.dragonsoft", "com.dragoninfo"})
-public class ConsumerTomcatApplication extends SpringBootServletInitializer {
-    @Override
-    protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
-        return builder.sources(ConsumerTomcatApplication.class);
-    }
-
-    public static void main(String[] args) {
-        SpringApplication.run(ConsumerTomcatApplication.class, args);
-    }
-}

+ 0 - 64
src/main/java/com/dragoninfo/dcuc/authweb/NacosPortConfig.java

@@ -1,64 +0,0 @@
-package com.dragoninfo.dcuc.authweb;
-
-import com.alibaba.cloud.nacos.registry.NacosAutoServiceRegistration;
-import com.dragonsoft.duceap.commons.util.string.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.ApplicationArguments;
-import org.springframework.boot.ApplicationRunner;
-import org.springframework.stereotype.Component;
-
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-import javax.management.Query;
-import java.lang.management.ManagementFactory;
-import java.util.Set;
-
-@Component
-public class NacosPortConfig implements ApplicationRunner {
-    private static final Logger logger = LoggerFactory.getLogger(NacosPortConfig.class);
-    @Autowired
-    private NacosAutoServiceRegistration registration;
-    @Value("${spring.application.name}")
-    private String appName;
-    @Value("${server.port}")
-    private int port;
-    @Override
-    public void run(ApplicationArguments args) throws Exception {
-        int port = this.getTomcatPort();
-        if (registration != null) {
-            registration.setPort(port);
-            registration.start();
-        }
-    }
-    /**
-     * 获取容器端口号
-     *
-     * @return
-     * @throws Exception 容器端口号未获取到
-     */
-    public int getTomcatPort() throws Exception {
-        String port = this.getTomcatPortValue();
-        if (!StringUtils.isEmpty(port)) {
-            return Integer.valueOf(port);
-        }
-        return this.port;
-    }
-    /**
-     * 获取容器端口号(解决使用外部容器部署,nacos无法注册问题)
-     *
-     * @return port
-     */
-    private String getTomcatPortValue() throws Exception {
-        MBeanServer beanServer = ManagementFactory.getPlatformMBeanServer();
-        Set<ObjectName> objectNames = beanServer.queryNames
-                (new ObjectName("*:type=Connector,*"),
-                        Query.match(Query.attr("protocol"), Query.value("HTTP/1.1")));
-        for (ObjectName objectName : objectNames) {
-            return objectName.getKeyProperty("port");
-        }
-        return "";
-    }
-}

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

@@ -46,10 +46,10 @@ duceap:
       host: http://10.201.3.20:8070
   security-access:
     jwt:
-      enabled: true
+      enabled: false
       user-token-header-name: userToken
   security:
-    #type: dcuc # 注解掉不开启认证登录
+    type: dids # 注解掉不开启认证登录
     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.0.240:18871/dcuc/login
+      SSOServiceUrl: http://10.11.0.168:8871/dcucauth/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/