feat cloud确保调通

.idea/sqldialects.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="SqlDialectMappings">
-    <file url="file:///var/folders/8b/rsvgy4px3ll0_s2vcghbn2wc0000gn/T/mybatisCodeHelper_EduTravel.sql" dialect="MySQL" />
-  </component>
-</project>

edu-travel-common/edu-travel-common-datasource/pom.xml

@@ -26,5 +26,9 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+        </dependency>
     </dependencies>
 </project>

edu-travel-common/edu-travel-common-datasource/src/main/java/edu/travel/config/DruidConfig.java

@@ -0,0 +1,17 @@
+package edu.travel.config;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import javax.sql.DataSource;
+
+@Configuration
+public class DruidConfig {
+    @Bean
+    @ConfigurationProperties(prefix = "spring.datasource")
+    public DataSource druidDataSource() {
+        return new DruidDataSource();
+    }
+}

edu-travel-gateway/src/main/java/edu/travel/config/ResourceServerConfig.java

@@ -51,7 +51,7 @@ public class ResourceServerConfig {
                 .csrf().disable()
                 .authorizeExchange()
                 //对oauth的端点进行放行
-                .pathMatchers("/oauth2/**").permitAll()
+//                .pathMatchers("/oauth2/**").permitAll()
                 .pathMatchers(whiteListConfig.getUrls().toArray(new String[whiteListConfig.getUrls().size()])).permitAll()
                 //其他请求必须鉴权，使用鉴权管理器
                 .anyExchange().access(authorizationManager)

edu-travel-oauth/src/main/java/edu/travel/config/WebSecurityConfig.java

@@ -23,7 +23,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     protected void configure(HttpSecurity http) throws Exception {
         http.csrf().disable()
                 .authorizeRequests()
-                .antMatchers(new String[]{"/publicKey","/client/**","/register","/oauth/**"}).permitAll()
+                .antMatchers("/**").permitAll()
                 .anyRequest().authenticated()
         ;
 

edu-travel-service/edu-travel-service-tenement/src/main/java/edu/travel/tenant/entity/EduTenant.java

@@ -13,6 +13,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
 import java.util.Date;
 import java.util.Map;
 
@@ -20,7 +21,8 @@ import java.util.Map;
 @AllArgsConstructor
 @NoArgsConstructor
 @TableName(value = "edu_tenant")
-public class EduTenant extends BaseEntity {
+public class EduTenant extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
     /**
      * 主键
      */
@@ -82,6 +84,5 @@ public class EduTenant extends BaseEntity {
     private String tenantUnionid;
     @TableField(exist = false)
     @LinkConst(clazz = SexDict.class,fieldName = "tenantSex")
-//    @JsonSerialize(using = MapToJsonStringSerializer.class)
     private Map obj;
 }

edu-travel-service/edu-travel-service-tenement/src/main/java/edu/travel/tenant/service/impl/ITenantServiceImpl.java

@@ -2,6 +2,7 @@ package edu.travel.tenant.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import edu.travel.tenant.entity.EduTenant;
 import edu.travel.tenant.entity.EduTenant;
 import edu.travel.tenant.service.ITenantService;
@@ -14,6 +15,6 @@ public class ITenantServiceImpl extends SysServiceImpl<EduTenantMapper, EduTenan
     @Override
     public EduTenant getTenantByID(String tenantID) {
 
-        return this.getListLink(null).get(0);
+        return super.getOneLink(new QueryWrapper<EduTenant>().eq("tenant_phone",tenantID));
     }
 }

edu-travel-service/edu-travel-service-tenement/src/main/java/edu/travel/tenant/web/TenantController.java

@@ -1,9 +1,9 @@
 package edu.travel.tenant.web;
 
-import edu.travel.tenant.entity.EduTenant;
-//import edu.travel.remote.feign.TenantFeign;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import edu.travel.resp.BaseResponse;
 import edu.travel.resp.PageResponse;
+import edu.travel.tenant.entity.EduTenant;
 import edu.travel.tenant.service.ITenantService;
 import edu.travel.web.BaseController;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,6 +12,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/tenant")
 public class TenantController  extends BaseController {
@@ -20,8 +22,9 @@ public class TenantController  extends BaseController {
 
     @GetMapping("/getTenant")
     public BaseResponse getTenant() {
-        Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
-        EduTenant tenantByID = tenantService.getTenantByID(principal.toString());
-        return PageResponse.out(200,"success",tenantByID);
+        EduTenant principal = (EduTenant)SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+
+        EduTenant list = tenantService.getTenantByID(principal.getTenantPhone());
+        return PageResponse.out(200,"success",list);
     }
 }

pom.xml

@@ -27,11 +27,11 @@
     <spring.cloud.version>Hoxton.SR12</spring.cloud.version>
     <mysql.version>8.0.22</mysql.version>
     <druid.version>1.2.16</druid.version>
-    <mybatis.plus.verion>3.5.4.1</mybatis.plus.verion>
+    <mybatis.plus.verion>3.4.0</mybatis.plus.verion>
     <fastjson.version>1.2.83</fastjson.version>
     <hutool.version>5.8.23</hutool.version>
     <alibaba.version>2.2.10-RC1</alibaba.version>
-    <mybaits.plus.annotation.version>3.5.4.1</mybaits.plus.annotation.version>
+    <mybaits.plus.annotation.version>3.4.0</mybaits.plus.annotation.version>
     <bootstrap.version>4.1.3</bootstrap.version>
 
   </properties>