添加单点登录服务

admin-server/pom.xml

@@ -16,7 +16,7 @@
         <maven.compiler.target>8</maven.compiler.target>
         <!-- oshi监控需要指定jna版本, 问题详见 https://github.com/oshi/oshi/issues/1040 -->
         <jna.version>5.8.0</jna.version>
-        <mapstruct.version>1.3.1.Final</mapstruct.version>
+        <mapstruct.version>1.5.5.Final</mapstruct.version>
         <alipay.version>4.9.153.ALL</alipay.version>
         <qiniu.version>[7.2.0, 7.2.99]</qiniu.version>
         <configuration.version>1.9</configuration.version>
@@ -46,6 +46,10 @@
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-bootstrap</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>

admin-server/src/main/java/com/zq/admin/modules/system/domain/Job.java

@@ -72,4 +72,4 @@ public class Job extends BaseEntity implements Serializable {
         return Objects.hash(id);
     }
 
-}
\ No newline at end of file
+}

admin-server/src/main/java/com/zq/admin/modules/system/service/DeptService.java

@@ -135,6 +135,6 @@ public interface DeptService {
      */
     void verification(Set<DeptDto> deptDtos);
 
-    Dept getById(Long orgId);
+    Dept getById(Long deptId);
 
 }

admin-server/src/main/java/com/zq/admin/modules/system/service/dto/JobDto.java

@@ -44,4 +44,4 @@ public class JobDto extends BaseDTO implements Serializable {
         this.enabled = enabled;
     }
 
-}
\ No newline at end of file
+}

admin-server/src/main/java/com/zq/admin/modules/system/service/impl/DeptServiceImpl.java

@@ -253,7 +253,7 @@ public class DeptServiceImpl implements DeptService {
     }
 
     @Override
-    public Dept getById(Long orgId) {
+    public Dept getById(Long deptId) {
         Optional<Dept> deptOptional = deptRepository.findById(deptId);
         return deptOptional.orElse(null);
     }

api-server/pom.xml

@@ -32,6 +32,10 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-bootstrap</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
         </dependency>
         <!--Spring devtools 热部署-->

cas-server/pom.xml

@@ -68,6 +68,11 @@
             <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-bootstrap</artifactId>
+        </dependency>
+
         <!--CAS单点登陆-->
         <dependency>
             <groupId>org.jasig.cas.client</groupId>
@@ -80,7 +85,24 @@
             <artifactId>cas-client-autoconfig-support</artifactId>
             <version>2.1.0-GA</version>
         </dependency>
-
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+
+        <!-- 使用@profiles.active@需要添加以下内容 -->
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <!--开启过滤，用指定的参数替换directory下的文件中的参数-->
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+
 </project>

cas-server/src/main/java/com/zq/cas/OauthApplication.java → cas-server/src/main/java/com/zq/cas/CasServerApplication.java

@@ -31,12 +31,12 @@ import org.springframework.web.bind.annotation.GetMapping;
  */
 @EnableFeignClients
 @EnableDiscoveryClient
-@SpringBootApplication(scanBasePackages = {"com.zq.auth", "com.zq.common.config"},
+@SpringBootApplication(scanBasePackages = {"com.zq.cas", "com.zq.common.config"},
         exclude = DataSourceAutoConfiguration.class)
-public class OauthApplication {
+public class CasServerApplication {
 
     public static void main(String[] args) {
-        SpringApplication.run(OauthApplication.class, args);
+        SpringApplication.run(CasServerApplication.class, args);
     }
 
     /**

cas-server/src/main/java/com/zq/cas/config/feign/FeignConfig.java

 package com.zq.cas.config.feign;
 
-import com.zq.common.utils.HttpRequestUtils;
+import com.zq.common.http.HttpRequestUtils;
 import feign.RequestInterceptor;
 import feign.RequestTemplate;
 import feign.codec.Encoder;

cas-server/src/main/resources/application-dev.yml

@@ -17,4 +17,4 @@ spring:
     use-session: true
     cas-server-login-url: http://175.178.197.14:8081/cas/login/login?service=http://172.20.10.5:9888/oauth/login
     cas-server-url-prefix: http://175.178.197.14:8081/cas
-    server-name: 172.20.10.5:9888
+    server-name: 172.20.10.5:9888 #网关地址

cas-server/src/main/resources/application.yml

 server:
-  port: ${auth.port}
+  port: 9002
 #配置数据源
 spring:
   application:
-    name: ${auth.name}
+    name: CAS-SERVER
   redis:
     #数据库索引
     host: ${redis.url}
@@ -12,7 +12,3 @@ spring:
     database: 0
     #连接超时时间
     timeout: 5000
-
-#登录配置
-login:
-  single: true

file-server/pom.xml

@@ -34,6 +34,10 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-bootstrap</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

gateway-server/pom.xml

@@ -24,6 +24,10 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-gateway</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-bootstrap</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

user-server/pom.xml

@@ -59,6 +59,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-bootstrap</artifactId>
+        </dependency>
         <!--Mybatis plus-->
         <dependency>
             <groupId>com.baomidou</groupId>