feat cloud确保调通

.idea/dataSources.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
+    <data-source source="LOCAL" name="edu@localhost" uuid="15dd682f-e04b-4d7b-8aaf-cdd2eff77b9a">
+      <driver-ref>mysql.8</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
+      <jdbc-url>jdbc:mysql://localhost:3306/edu</jdbc-url>
+      <jdbc-additional-properties>
+        <property name="com.intellij.clouds.kubernetes.db.host.port" />
+        <property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
+        <property name="com.intellij.clouds.kubernetes.db.container.port" />
+      </jdbc-additional-properties>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
+  </component>
+</project>

.idea/encodings.xml

@@ -5,11 +5,17 @@
     <file url="file://$PROJECT_DIR$/edu-travel-common/edu-travel-common-core/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/edu-travel-common/edu-travel-common-datasource/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/edu-travel-common/edu-travel-common-feign/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/edu-travel-common/edu-travel-common-openfeign/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/edu-travel-common/edu-travel-common-resp/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/edu-travel-common/edu-travel-common-util/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/edu-travel-common/edu-travel-common-utils/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/edu-travel-common/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/edu-travel-common/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/edu-travel-gateway/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/edu-travel-mapper/edu-travel-mapper-tenant/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/edu-travel-mapper/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/edu-travel-mapper/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/edu-travel-model/edu-travel-model-base/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/edu-travel-model/edu-travel-model-tenant/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/edu-travel-model/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/edu-travel-model/src/main/resources" charset="UTF-8" />
@@ -19,6 +25,7 @@
     <file url="file://$PROJECT_DIR$/edu-travel-remote/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/edu-travel-remote/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/edu-travel-service/edu-travel-service-tenant/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/edu-travel-service/edu-travel-service-tenement/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/edu-travel-service/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/edu-travel-service/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />

.idea/misc.xml

@@ -9,7 +9,13 @@
     </option>
     <option name="ignoredFiles">
       <set>
+        <option value="$PROJECT_DIR$/edu-travel-common/edu-travel-common-feign/pom.xml" />
+        <option value="$PROJECT_DIR$/edu-travel-common/edu-travel-common-utils/pom.xml" />
+        <option value="$PROJECT_DIR$/edu-travel-mapper/edu-travel-mapper-tenant/pom.xml" />
+        <option value="$PROJECT_DIR$/edu-travel-mapper/pom.xml" />
+        <option value="$PROJECT_DIR$/edu-travel-model/edu-travel-model-tenant/pom.xml" />
         <option value="$PROJECT_DIR$/edu-travel-remote/edu-travel-remote-user/pom.xml" />
+        <option value="$PROJECT_DIR$/edu-travel-service/edu-travel-service-tenant/pom.xml" />
       </set>
     </option>
   </component>

.idea/sqldialects.xml

@@ -0,0 +1,6 @@
+<?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-constant/src/test/java/edu/travel/AppTest.java

@@ -1,38 +0,0 @@
-package edu.travel;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest 
-    extends TestCase
-{
-    /**
-     * Create the test case
-     *
-     * @param testName name of the test case
-     */
-    public AppTest( String testName )
-    {
-        super( testName );
-    }
-
-    /**
-     * @return the suite of tests being tested
-     */
-    public static Test suite()
-    {
-        return new TestSuite( AppTest.class );
-    }
-
-    /**
-     * Rigourous Test :-)
-     */
-    public void testApp()
-    {
-        assertTrue( true );
-    }
-}

edu-travel-common/edu-travel-common-core/src/main/java/edu/travel/web/MapToJsonStringSerializer.java

@@ -0,0 +1,16 @@
+package edu.travel.web;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializerProvider;
+
+import java.io.IOException;
+import java.util.Map;
+
+public class MapToJsonStringSerializer extends JsonSerializer<Map<?, ?>> {
+    @Override
+    public void serialize(Map<?, ?> value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+        gen.writeObject(new ObjectMapper().writeValueAsString(value));
+    }
+}

edu-travel-common/edu-travel-common-datasource/src/main/java/edu/travel/annotation/LinkConst.java

@@ -7,5 +7,6 @@ import java.lang.annotation.*;
 @Target(ElementType.FIELD)
 @Inherited
 public @interface LinkConst {
-    Class clazz() default Object.class;
+    Class clazz() ;
+    String fieldName();
 }

edu-travel-common/edu-travel-common-datasource/src/main/java/edu/travel/service/SysServiceImpl.java

@@ -1,5 +1,6 @@
 package edu.travel.service;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -13,9 +14,11 @@ import org.springframework.context.ApplicationContext;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * 扩展mbp ServiceImpl
@@ -35,7 +38,7 @@ public class SysServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M,T>
      * @param queryWrapper
      * @return
      */
-    public T getOneLink(QueryWrapper<T> queryWrapper) {
+    public T getOneLink(Wrapper<T> queryWrapper) {
         T one = super.getOne(queryWrapper);
         if (one == null) {
             return null;
@@ -49,7 +52,7 @@ public class SysServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M,T>
      * @param queryWrapper
      * @return
      */
-    public List<T> getListLink(QueryWrapper<T> queryWrapper) {
+    public List<T> getListLink(Wrapper<T> queryWrapper) {
         List<T> list = super.list(queryWrapper);
         if (list == null || list.isEmpty()) {
             return list;
@@ -64,7 +67,7 @@ public class SysServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M,T>
      * @param page
      * @return
      */
-    public IPage<T> getPageLink(QueryWrapper<T> queryWrapper,IPage<T> page) {
+    public IPage<T> getPageLink(Wrapper<T> queryWrapper,IPage<T> page) {
         IPage<T> iPage = super.page(page, queryWrapper);
         if (iPage == null ) {
             return new Page();
@@ -110,17 +113,23 @@ public class SysServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M,T>
             LinkConst linkConst = field.getAnnotation(LinkConst.class);
             if (linkConst != null) {
                 Class clazz = linkConst.clazz();
+                System.out.println(Arrays.toString(clazz.getDeclaredFields()));
                 Object object = clazz.newInstance();
-                Method getValueMethod = clazz.getMethod("getValue");
+                Method getValueMethod = clazz.getDeclaredMethod("getValue", Integer.class);
                 if (getValueMethod == null) {
                     throw new RuntimeException("没有获取到getValue方法");
                 }
-                Object getValue = getValueMethod.invoke(object, Integer.valueOf(field.get(one).toString()));
+                getValueMethod.setAccessible(true);
+                Field declaredField = one.getClass().getDeclaredField(linkConst.fieldName());
+                declaredField.setAccessible(true);
+                Object getValue = getValueMethod.invoke(object, Integer.valueOf(declaredField.get(one).toString()));
                 if (getValue == null) {
                     throw new RuntimeException("常量字典没有这个类");
                 }
-                HashMap<String, String> objectObjectHashMap = new HashMap<>();
-                objectObjectHashMap.put(field.get(one).toString(), getValue.toString());
+                ConcurrentHashMap objectObjectHashMap = new ConcurrentHashMap();
+                objectObjectHashMap.put("key",Integer.valueOf(declaredField.get(one).toString()));
+                objectObjectHashMap.put("value", getValue);
+                System.out.println(objectObjectHashMap);
                 field.set(one, objectObjectHashMap);
             }
         }catch (Exception e) {

edu-travel-common/edu-travel-common-feign/src/test/java/edu/travel/AppTest.java

@@ -1,38 +0,0 @@
-package edu.travel;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest 
-    extends TestCase
-{
-    /**
-     * Create the test case
-     *
-     * @param testName name of the test case
-     */
-    public AppTest( String testName )
-    {
-        super( testName );
-    }
-
-    /**
-     * @return the suite of tests being tested
-     */
-    public static Test suite()
-    {
-        return new TestSuite( AppTest.class );
-    }
-
-    /**
-     * Rigourous Test :-)
-     */
-    public void testApp()
-    {
-        assertTrue( true );
-    }
-}

edu-travel-common/edu-travel-common-feign/pom.xml → edu-travel-common/edu-travel-common-openfeign/pom.xml

@@ -7,10 +7,10 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>edu-travel-common-feign</artifactId>
+    <artifactId>edu-travel-common-openfeign</artifactId>
     <packaging>jar</packaging>
 
-    <name>edu-travel-common-feign</name>
+    <name>edu-travel-common-openfeign</name>
     <url>http://maven.apache.org</url>
 
     <properties>

edu-travel-common/edu-travel-common-resp/src/test/java/edu/travel/AppTest.java

@@ -1,38 +0,0 @@
-package edu.travel;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest 
-    extends TestCase
-{
-    /**
-     * Create the test case
-     *
-     * @param testName name of the test case
-     */
-    public AppTest( String testName )
-    {
-        super( testName );
-    }
-
-    /**
-     * @return the suite of tests being tested
-     */
-    public static Test suite()
-    {
-        return new TestSuite( AppTest.class );
-    }
-
-    /**
-     * Rigourous Test :-)
-     */
-    public void testApp()
-    {
-        assertTrue( true );
-    }
-}

edu-travel-common/edu-travel-common-utils/pom.xml → edu-travel-common/edu-travel-common-util/pom.xml

@@ -7,15 +7,22 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>edu-travel-common-utils</artifactId>
+    <artifactId>edu-travel-common-util</artifactId>
     <packaging>jar</packaging>
 
-    <name>edu-travel-common-utils</name>
+    <name>edu-travel-common-util</name>
     <url>http://maven.apache.org</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
-
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 </project>

edu-travel-common/edu-travel-common-util/src/main/java/edu/travel/App.java

@@ -0,0 +1,13 @@
+package edu.travel;
+
+/**
+ * Hello world!
+ *
+ */
+public class App 
+{
+    public static void main( String[] args )
+    {
+        System.out.println( "Hello World!" );
+    }
+}

edu-travel-common/edu-travel-common-utils/src/test/java/edu/travel/AppTest.java

@@ -1,38 +0,0 @@
-package edu.travel;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest 
-    extends TestCase
-{
-    /**
-     * Create the test case
-     *
-     * @param testName name of the test case
-     */
-    public AppTest( String testName )
-    {
-        super( testName );
-    }
-
-    /**
-     * @return the suite of tests being tested
-     */
-    public static Test suite()
-    {
-        return new TestSuite( AppTest.class );
-    }
-
-    /**
-     * Rigourous Test :-)
-     */
-    public void testApp()
-    {
-        assertTrue( true );
-    }
-}

edu-travel-common/pom.xml

@@ -14,11 +14,13 @@
     <url>http://maven.apache.org</url>
     <modules>
         <module>edu-travel-common-core</module>
-        <module>edu-travel-common-feign</module>
+<!--        <module>edu-travel-common-feign</module>-->
         <module>edu-travel-common-datasource</module>
         <module>edu-travel-common-constant</module>
-        <module>edu-travel-common-utils</module>
+<!--        <module>edu-travel-common-utils</module>-->
         <module>edu-travel-common-resp</module>
+        <module>edu-travel-common-util</module>
+        <module>edu-travel-common-openfeign</module>
     </modules>
 
     <properties>

edu-travel-gateway/pom.xml

@@ -77,7 +77,7 @@
         </dependency>
         <dependency>
             <groupId>edu.travel</groupId>
-            <artifactId>edu-travel-common-utils</artifactId>
+            <artifactId>edu-travel-common-util</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>

edu-travel-gateway/src/main/java/edu/travel/filter/GateWayFilter.java

@@ -32,9 +32,14 @@ public class GateWayFilter implements GlobalFilter, Ordered {
             JWSObject jwsObject = JWSObject.parse(realToken);
             String userStr = jwsObject.getPayload().toString();
             JSONObject jsonObject = JSON.parseObject(userStr);
-            String all = jsonObject.get(FinalParam.AUTHORITY_CLAIM_NAME).toString().replaceAll("\"", "");
-            String[] split = all.substring(all.indexOf("[") + 1, all.length() - 1).split(",");
-            List<String> authorities = new ArrayList<String>(Arrays.asList(split));
+            Object object = jsonObject.get(FinalParam.AUTHORITY_CLAIM_NAME);
+            List<String> authorities = null;
+            if (object != null){
+                String all = jsonObject.get(FinalParam.AUTHORITY_CLAIM_NAME).toString().replaceAll("\"", "");
+                String[] split = all.substring(all.indexOf("[") + 1, all.length() - 1).split(",");
+                authorities = new ArrayList<String>(Arrays.asList(split));
+            }
+            authorities = new ArrayList<String>();
             String principal = jsonObject.getObject("user_name", String.class);
             String client_id = jsonObject.getObject("client_id", String.class);
             Map<String, Object> map = new HashMap<>();

edu-travel-model/edu-travel-model-tenant/pom.xml → edu-travel-model/edu-travel-model-base/pom.xml

@@ -7,10 +7,10 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>edu-travel-model-tenant</artifactId>
+    <artifactId>edu-travel-model-base</artifactId>
     <packaging>jar</packaging>
 
-    <name>edu-travel-model-tenant</name>
+    <name>edu-travel-model-po</name>
     <url>http://maven.apache.org</url>
 
     <properties>
@@ -18,6 +18,13 @@
     </properties>
 
     <dependencies>
-
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-annotation</artifactId>
+        </dependency>
     </dependencies>
 </project>

edu-travel-model/edu-travel-model-base/src/main/java/edu/travel/entity/BaseEntity.java

@@ -0,0 +1,23 @@
+package edu.travel.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+
+import java.util.Date;
+@Data
+public class BaseEntity {
+    @TableField(value = "project")
+    public String project;
+    @TableField("create_time")
+    public Date createTime;
+    @TableField("create_user_id")
+    public String createUserId;
+    @TableField("update_time")
+    public Date updateTime;
+    @TableField("update_user_id")
+    public String updateUserId;
+    @TableField("delete_flag")
+    @TableLogic
+    public Integer deleteFlag;
+}

edu-travel-model/edu-travel-model-base/src/main/java/edu/travel/po/BasePO.java

@@ -0,0 +1,19 @@
+package edu.travel.po;
+
+import lombok.Data;
+
+import java.util.Date;
+@Data
+public class BasePO {
+    private String project;
+
+    private Date createTime;
+
+    private String createUserId;
+
+    private Date updateTime;
+
+    private String updateUserId;
+
+    private Integer deleteFlag;
+}

edu-travel-model/edu-travel-model-base/src/main/java/edu/travel/po/PagePO.java

@@ -0,0 +1,14 @@
+package edu.travel.po;
+
+import lombok.Data;
+
+@Data
+public class PagePO extends BasePO{
+    private Integer currentPage;
+
+    private Integer pageSize;
+
+    private Integer total;
+
+    private Integer count;
+}

edu-travel-model/edu-travel-model-tenant/src/test/java/edu/travel/AppTest.java

@@ -1,38 +0,0 @@
-package edu.travel;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest 
-    extends TestCase
-{
-    /**
-     * Create the test case
-     *
-     * @param testName name of the test case
-     */
-    public AppTest( String testName )
-    {
-        super( testName );
-    }
-
-    /**
-     * @return the suite of tests being tested
-     */
-    public static Test suite()
-    {
-        return new TestSuite( AppTest.class );
-    }
-
-    /**
-     * Rigourous Test :-)
-     */
-    public void testApp()
-    {
-        assertTrue( true );
-    }
-}

edu-travel-model/pom.xml

@@ -13,7 +13,7 @@
     <name>edu-travel-model</name>
     <url>http://maven.apache.org</url>
     <modules>
-        <module>edu-travel-model-tenant</module>
+        <module>edu-travel-model-base</module>
     </modules>
 
     <properties>

edu-travel-oauth/pom.xml

@@ -87,7 +87,12 @@
         </dependency>
         <dependency>
             <groupId>edu.travel</groupId>
-            <artifactId>edu-travel-common-utils</artifactId>
+            <artifactId>edu-travel-model-base</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>edu.travel</groupId>
+            <artifactId>edu-travel-common-util</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>

edu-travel-oauth/src/main/java/edu/travel/OauthServerApplication.java

@@ -1,5 +1,6 @@
 package edu.travel;
 
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
@@ -10,6 +11,7 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
  */
 @SpringBootApplication
 @EnableDiscoveryClient
+@MapperScan("edu.travel.mapper")
 public class OauthServerApplication
 {
     public static void main( String[] args )

edu-travel-oauth/src/main/java/edu/travel/entity/EduTenant.java

@@ -0,0 +1,84 @@
+package edu.travel.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import edu.travel.annotation.LinkConst;
+import edu.travel.entity.BaseEntity;
+import edu.travel.entity.dict.SexDict;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.util.Map;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "edu_tenant")
+public class EduTenant extends BaseEntity {
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 姓
+     */
+    @TableField(value = "tenant_surname")
+    private String tenantSurname;
+
+    /**
+     * 名
+     */
+    @TableField(value = "tenant_name")
+    private String tenantName;
+
+    /**
+     * 性别 0男 1女
+     */
+    @TableField(value = "tenant_sex")
+    private Integer tenantSex;
+
+    /**
+     * 头像
+     */
+    @TableField(value = "tenant_avatar")
+    private String tenantAvatar;
+
+    /**
+     * 手机号
+     */
+    @TableField(value = "tenant_phone")
+    private String tenantPhone;
+
+    /**
+     * 地区区号
+     */
+    @TableField(value = "tenant_area")
+    private String tenantArea;
+
+    /**
+     * 生日日期
+     */
+    @TableField(value = "tenant_birthday")
+    private Date tenantBirthday;
+
+    /**
+     * 微信小程序openid
+     */
+    @TableField(value = "tenant_open_id")
+    private String tenantOpenId;
+
+    /**
+     * 微信小程序unionid
+     */
+    @TableField(value = "tenant_unionid")
+    private String tenantUnionid;
+
+
+}

edu-travel-oauth/src/main/java/edu/travel/entity/dict/SexDict.java

@@ -0,0 +1,17 @@
+package edu.travel.entity.dict;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class SexDict {
+
+    private final  Map<Integer,String> sexMap = new HashMap<Integer,String>();
+
+    public SexDict(){
+        sexMap.put(0,"男");
+        sexMap.put(1,"女");
+    }
+    public String getValue(Integer key){
+        return sexMap.containsKey(key) ?  sexMap.get(key) : null;
+    }
+}

edu-travel-oauth/src/main/java/edu/travel/mapper/EduTenantMapper.java

@@ -0,0 +1,7 @@
+package edu.travel.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import edu.travel.entity.EduTenant;
+
+public interface EduTenantMapper extends BaseMapper<EduTenant> {
+}

edu-travel-oauth/src/main/java/edu/travel/service/UserServiceImpl.java

@@ -1,5 +1,11 @@
 package edu.travel.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import edu.travel.entity.EduTenant;
+import edu.travel.mapper.EduTenantMapper;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
@@ -13,11 +19,31 @@ import java.util.ArrayList;
 
 @Service
 public class UserServiceImpl implements UserDetailsService {
-
+    @Autowired
+    private EduTenantMapper eduTenantMapper;
+    @Autowired
+    private RedisTemplate redisTemplate;
     @Override
-    public UserDetails loadUserByUsername(String s) throws UsernameNotFoundException {
+    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
+        if (StringUtils.isBlank(username)) {
+            throw new UsernameNotFoundException("username is empty");
+        }
+        EduTenant tenant = eduTenantMapper.selectOne(new LambdaQueryWrapper<EduTenant>().eq(EduTenant::getTenantPhone, username));
+        if (tenant == null) {
+            throw new UsernameNotFoundException("username not found");
+        }
         HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
-        System.out.println(request.getParameter("password"));
-        return new User("demoUser1","123456",new ArrayList<>());
+        String code = request.getParameter("password");
+        if (StringUtils.isBlank(code)) {
+            throw new UsernameNotFoundException("验证码为空");
+        }
+        Object object = "1234";//redisTemplate.opsForValue().get("code_" + username);
+        if (object == null) {
+            throw new UsernameNotFoundException("验证码为空");
+        }
+        if (code.equals(object.toString())){
+            return new User(tenant.getTenantPhone(),code,new ArrayList<>());
+        }
+        throw new UsernameNotFoundException("验证码错误");
     }
 }

edu-travel-oauth/src/main/resources/mapper/EduTenantMapper.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="edu.travel.mapper.EduTenantMapper">
+  <resultMap id="BaseResultMap" type="edu.travel.entity.EduTenant">
+    <!--@mbg.generated-->
+    <!--@Table edu_tenant-->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="tenant_surname" jdbcType="VARCHAR" property="tenantSurname" />
+    <result column="tenant_name" jdbcType="VARCHAR" property="tenantName" />
+    <result column="tenant_sex" jdbcType="INTEGER" property="tenantSex" />
+    <result column="tenant_avatar" jdbcType="VARCHAR" property="tenantAvatar" />
+    <result column="tenant_phone" jdbcType="VARCHAR" property="tenantPhone" />
+    <result column="tenant_area" jdbcType="VARCHAR" property="tenantArea" />
+    <result column="tenant_birthday" jdbcType="TIMESTAMP" property="tenantBirthday" />
+    <result column="tenant_open_id" jdbcType="VARCHAR" property="tenantOpenId" />
+    <result column="tenant_unionid" jdbcType="VARCHAR" property="tenantUnionid" />
+    <result column="project" jdbcType="VARCHAR" property="project" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="create_user_id" jdbcType="BIGINT" property="createUserId" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="update_user_id" jdbcType="BIGINT" property="updateUserId" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, tenant_surname, tenant_name, tenant_sex, tenant_avatar, tenant_phone, tenant_area, 
+    tenant_birthday, tenant_open_id, tenant_unionid, project, create_time, create_user_id, 
+    update_time, update_user_id, delete_flag
+  </sql>
+</mapper>

edu-travel-remote/edu-travel-remote-tenant/pom.xml

@@ -20,11 +20,6 @@
     <dependencies>
         <dependency>
             <groupId>edu.travel</groupId>
-            <artifactId>edu-travel-common-feign</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>edu.travel</groupId>
             <artifactId>edu-travel-common-resp</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>

edu-travel-remote/edu-travel-remote-tenant/src/main/java/edu/travel/remote/feign/TenantFeign.java

@@ -1,11 +1,7 @@
 package edu.travel.remote.feign;
 
 import edu.travel.rpc.RPCBaseResponse;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
 
-@FeignClient
 public interface TenantFeign {
-    @GetMapping("/getTenantById")
-    public RPCBaseResponse getTenant(Long tenantId);
+
 }

edu-travel-remote/edu-travel-remote-tenant/src/test/java/edu/travel/AppTest.java

@@ -1,38 +0,0 @@
-package edu.travel;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest 
-    extends TestCase
-{
-    /**
-     * Create the test case
-     *
-     * @param testName name of the test case
-     */
-    public AppTest( String testName )
-    {
-        super( testName );
-    }
-
-    /**
-     * @return the suite of tests being tested
-     */
-    public static Test suite()
-    {
-        return new TestSuite( AppTest.class );
-    }
-
-    /**
-     * Rigourous Test :-)
-     */
-    public void testApp()
-    {
-        assertTrue( true );
-    }
-}

edu-travel-remote/pom.xml

@@ -20,12 +20,4 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>3.8.1</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
 </project>

edu-travel-service/edu-travel-service-tenant/pom.xml

@@ -1,49 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>edu.travel</groupId>
-        <artifactId>edu-travel-service</artifactId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>edu-travel-service-tenant</artifactId>
-    <packaging>jar</packaging>
-
-    <name>edu-travel-service-tenant</name>
-    <url>http://maven.apache.org</url>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-zipkin</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>edu.travel</groupId>
-            <artifactId>edu-travel-common-datasource</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>edu.travel</groupId>
-            <artifactId>edu-travel-common-core</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>edu.travel</groupId>
-            <artifactId>edu-travel-remote-tenant</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-</project>

edu-travel-service/edu-travel-service-tenant/src/main/java/edu/travel/TenantApplication.java

@@ -1,4 +0,0 @@
-package edu.travel;
-
-public class TenantApplication {
-}

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

@@ -1,19 +0,0 @@
-package edu.travel.web;
-
-import edu.travel.remote.feign.TenantFeign;
-import edu.travel.resp.BaseResponse;
-import edu.travel.rpc.RPCBaseResponse;
-import org.springframework.validation.Errors;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/tenant")
-public class TenantController  extends BaseController implements TenantFeign {
-    @Override
-    @GetMapping("/getTenantById")
-    public RPCBaseResponse getTenant(Long tenantId) {
-        return null;
-    }
-}

edu-travel-service/edu-travel-service-tenant/src/test/java/edu/travel/AppTest.java

@@ -1,38 +0,0 @@
-package edu.travel;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest 
-    extends TestCase
-{
-    /**
-     * Create the test case
-     *
-     * @param testName name of the test case
-     */
-    public AppTest( String testName )
-    {
-        super( testName );
-    }
-
-    /**
-     * @return the suite of tests being tested
-     */
-    public static Test suite()
-    {
-        return new TestSuite( AppTest.class );
-    }
-
-    /**
-     * Rigourous Test :-)
-     */
-    public void testApp()
-    {
-        assertTrue( true );
-    }
-}

edu-travel-service/edu-travel-service-tenement/pom.xml

@@ -0,0 +1,158 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>edu.travel</groupId>
+        <artifactId>edu-travel-service</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>edu-travel-service-tenement</artifactId>
+    <packaging>jar</packaging>
+
+    <name>edu-travel-service-tenement</name>
+    <url>http://maven.apache.org</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-zipkin</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-oauth2</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-bootstrap</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
+                <dependency>
+                    <groupId>edu.travel</groupId>
+                    <artifactId>edu-travel-remote-tenant</artifactId>
+                    <version>1.0-SNAPSHOT</version>
+                </dependency>
+        <dependency>
+            <groupId>edu.travel</groupId>
+            <artifactId>edu-travel-common-util</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>edu.travel</groupId>
+            <artifactId>edu-travel-model-base</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>edu.travel</groupId>
+            <artifactId>edu-travel-common-datasource</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>edu.travel</groupId>
+            <artifactId>edu-travel-common-constant</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>edu.travel</groupId>
+            <artifactId>edu-travel-common-core</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <properties>
+                <env>dev</env>
+                <versionCode>${version}-SNAPSHOT</versionCode>
+                <spark.compiler.score>compile</spark.compiler.score>
+            </properties>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+        <profile>
+            <id>prod</id>
+            <properties>
+                <env>prod</env>
+                <versionCode>${version}</versionCode>
+                <spark.compiler.score>provided</spark.compiler.score>
+            </properties>
+        </profile>
+    </profiles>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <configuration>
+                    <delimiters>@</delimiters>
+                    <useDefaultDelimiters>false</useDefaultDelimiters>
+                </configuration>
+            </plugin>
+            <!-- 打包插件 -->
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <!-- maven 打包时跳过测试 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+        </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <!--开启过滤，用指定的参数替换directory下的文件中的参数-->
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+</project>

edu-travel-service/edu-travel-service-tenement/src/main/java/edu/travel/TenantApplication.java

@@ -0,0 +1,15 @@
+package edu.travel;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+
+@SpringBootApplication
+@EnableDiscoveryClient
+@MapperScan("edu.travel.tenant.mapper")
+public class TenantApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(TenantApplication.class, args);
+    }
+}

edu-travel-service/edu-travel-service-tenement/src/main/java/edu/travel/tenant/config/MyAccessDeniedHandler.java

@@ -0,0 +1,32 @@
+package edu.travel.tenant.config;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.web.access.AccessDeniedHandler;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+public class MyAccessDeniedHandler  implements AccessDeniedHandler {
+    @Override
+    public void handle(HttpServletRequest req, HttpServletResponse resp, AccessDeniedException e) throws IOException, ServletException {
+        resp.setContentType("application/json;charset=UTF-8");
+        Map map = new HashMap();
+        map.put("code", "450");
+        map.put("message", e.getMessage());
+        map.put("path", req.getServletPath());
+        map.put("timestamp", String.valueOf(System.currentTimeMillis()));
+        resp.setContentType("application/json");
+        resp.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+        try {
+            ObjectMapper mapper = new ObjectMapper();
+            mapper.writeValue(resp.getOutputStream(), map);
+        } catch (Exception ex) {
+            throw new ServletException();
+        }
+    }
+}

edu-travel-service/edu-travel-service-tenement/src/main/java/edu/travel/tenant/config/MyAuthenticationEntryPoint.java

@@ -0,0 +1,31 @@
+package edu.travel.tenant.config;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.web.AuthenticationEntryPoint;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+public class MyAuthenticationEntryPoint implements AuthenticationEntryPoint {
+    @Override
+    public void commence(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, AuthenticationException e) throws IOException, ServletException {
+        Map map = new HashMap();
+        map.put("code", "451");
+        map.put("message", "无权限访问");
+        map.put("path", httpServletRequest.getServletPath());
+        map.put("timestamp", String.valueOf(System.currentTimeMillis()));
+        httpServletResponse.setContentType("application/json");
+        httpServletResponse.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+        try {
+            ObjectMapper mapper = new ObjectMapper();
+            mapper.writeValue(httpServletResponse.getOutputStream(), map);
+        } catch (Exception ex) {
+            throw new ServletException();
+        }
+    }
+}

edu-travel-service/edu-travel-service-tenement/src/main/java/edu/travel/tenant/config/ResourceServerConfig.java

@@ -0,0 +1,39 @@
+package edu.travel.tenant.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer;
+import org.springframework.security.oauth2.config.annotation.web.configuration.ResourceServerConfigurerAdapter;
+import org.springframework.security.oauth2.config.annotation.web.configurers.ResourceServerSecurityConfigurer;
+import org.springframework.security.oauth2.provider.token.TokenStore;
+
+@Configuration
+@EnableResourceServer
+public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
+    private static  final String RESOURCE_ID = "admin";
+
+    @Autowired
+    private TokenStore tokenStore;
+
+    @Override
+    public void configure(ResourceServerSecurityConfigurer resources) {
+        resources.resourceId(RESOURCE_ID)//资源 id
+                .tokenStore(tokenStore)
+                .authenticationEntryPoint(new MyAuthenticationEntryPoint())
+                .accessDeniedHandler(new MyAccessDeniedHandler())
+//                .tokenServices(tokenService())//验证令牌的服务
+                .stateless(true);
+    }
+
+    @Override
+    public void configure(HttpSecurity http) throws Exception {
+
+        http
+                .authorizeRequests()
+                .antMatchers("/**").permitAll()
+                .and().csrf().disable()
+                .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS);
+    }
+}

edu-travel-service/edu-travel-service-tenement/src/main/java/edu/travel/tenant/config/TokenConfig.java

@@ -0,0 +1,49 @@
+package edu.travel.tenant.config;
+
+import edu.travel.RSAUtill;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.NoOpPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.security.oauth2.provider.token.TokenStore;
+import org.springframework.security.oauth2.provider.token.store.JwtAccessTokenConverter;
+import org.springframework.security.oauth2.provider.token.store.JwtTokenStore;
+
+import java.security.PrivateKey;
+
+@Configuration
+public class TokenConfig {
+    @Value("${OAUTH_KEY}")
+    private String key;
+    @Value("${PRIVATE_KEY}")
+    private String privateKey;
+    @Bean
+    public PasswordEncoder passwordEncoder(){
+        return NoOpPasswordEncoder.getInstance();
+    }
+    @Bean
+    public TokenStore tokenStore() {
+        //JWT令牌存储方案
+        return new JwtTokenStore(accessTokenConverter());
+    }
+
+    @Bean
+    public JwtAccessTokenConverter accessTokenConverter() {
+        try {
+            PrivateKey privateKeyFromString = RSAUtill.getPrivateKeyFromString(privateKey);
+            String decrypt = RSAUtill.decrypt(key, privateKeyFromString);
+            JwtAccessTokenConverter converter = new JwtAccessTokenConverter();
+            //对称秘钥，资源服务器使用该秘钥来验证
+//        converter.setKeyPair(keyPair());
+            converter.setSigningKey(decrypt);
+            return converter;
+
+        }catch (Exception e){
+            e.printStackTrace();
+            return null;
+        }
+
+    }
+}

edu-travel-service/edu-travel-service-tenement/src/main/java/edu/travel/tenant/config/WebSecurityConfig.java

@@ -0,0 +1,21 @@
+package edu.travel.tenant.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+
+@Configuration
+@EnableGlobalMethodSecurity(securedEnabled = true, prePostEnabled = true)
+public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
+    //安全拦截机制（最重要）
+    @Override
+    protected void configure(HttpSecurity http) throws Exception {
+        http.csrf().disable()
+                .authorizeRequests()
+                .anyRequest().authenticated()
+        ;
+
+
+    }
+}

edu-travel-service/edu-travel-service-tenement/src/main/java/edu/travel/tenant/config/WebServerFactoryConfigs.java

@@ -0,0 +1,23 @@
+package edu.travel.tenant.config;
+
+import org.apache.catalina.connector.Connector;
+import org.springframework.boot.web.embedded.tomcat.TomcatConnectorCustomizer;
+import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
+import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class WebServerFactoryConfigs {
+    @Bean
+    public ConfigurableServletWebServerFactory webServerFactory() {
+        TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory();
+        factory.addConnectorCustomizers(new TomcatConnectorCustomizer() {
+            @Override
+            public void customize(Connector connector) {
+                connector.setProperty("relaxedQueryChars", "|{}[]");
+            }
+        });
+        return factory;
+    }
+}

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

@@ -0,0 +1,87 @@
+package edu.travel.tenant.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import edu.travel.annotation.LinkConst;
+import edu.travel.entity.BaseEntity;
+import edu.travel.tenant.entity.dict.SexDict;
+import edu.travel.web.MapToJsonStringSerializer;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.util.Map;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "edu_tenant")
+public class EduTenant extends BaseEntity {
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 姓
+     */
+    @TableField(value = "tenant_surname")
+    private String tenantSurname;
+
+    /**
+     * 名
+     */
+    @TableField(value = "tenant_name")
+    private String tenantName;
+
+    /**
+     * 性别 0男 1女
+     */
+    @TableField(value = "tenant_sex")
+    private Integer tenantSex;
+
+    /**
+     * 头像
+     */
+    @TableField(value = "tenant_avatar")
+    private String tenantAvatar;
+
+    /**
+     * 手机号
+     */
+    @TableField(value = "tenant_phone")
+    private String tenantPhone;
+
+    /**
+     * 地区区号
+     */
+    @TableField(value = "tenant_area")
+    private String tenantArea;
+
+    /**
+     * 生日日期
+     */
+    @TableField(value = "tenant_birthday")
+    private Date tenantBirthday;
+
+    /**
+     * 微信小程序openid
+     */
+    @TableField(value = "tenant_open_id")
+    private String tenantOpenId;
+
+    /**
+     * 微信小程序unionid
+     */
+    @TableField(value = "tenant_unionid")
+    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/entity/dict/SexDict.java

@@ -0,0 +1,17 @@
+package edu.travel.tenant.entity.dict;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class SexDict {
+
+    private final  Map<Integer,String> sexMap = new HashMap<Integer,String>();
+
+    public SexDict(){
+        sexMap.put(0,"男");
+        sexMap.put(1,"女");
+    }
+    public String getValue(Integer key){
+        return sexMap.containsKey(key) ?  sexMap.get(key) : null;
+    }
+}

edu-travel-service/edu-travel-service-tenement/src/main/java/edu/travel/tenant/filter/TokenAuthenticationFilter.java

@@ -0,0 +1,46 @@
+package edu.travel.tenant.filter;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import edu.travel.EncryptUtil;
+import edu.travel.tenant.entity.EduTenant;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.authority.AuthorityUtils;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
+import org.springframework.stereotype.Component;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@Component
+public class TokenAuthenticationFilter extends OncePerRequestFilter {
+    @Override
+    protected void doFilterInternal(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, FilterChain filterChain) throws ServletException, IOException {
+        String token = httpServletRequest.getHeader("token");
+        if (StringUtils.isNotBlank(token)){
+            String json = EncryptUtil.decodeUTF8StringBase64(token);
+            //将token转成json对象
+            JSONObject jsonObject = JSON.parseObject(json);
+            //用户身份信息
+            String username  = jsonObject.getString("principal");
+            EduTenant tenant = new EduTenant();
+            tenant.setTenantPhone(username);
+            //用户权限
+            JSONArray authoritiesArray = jsonObject.getJSONArray("authorities");
+            String[] authorities = authoritiesArray.toArray(new String[authoritiesArray.size()]);
+            //将用户信息和权限填充 到用户身份token对象中
+            UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(tenant, null, AuthorityUtils.createAuthorityList(authorities));
+            authenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(httpServletRequest));
+            //将authenticationToken填充到安全上下文
+            SecurityContextHolder.getContext().setAuthentication(authenticationToken);
+        }
+        filterChain.doFilter(httpServletRequest,httpServletResponse);
+    }
+}

edu-travel-service/edu-travel-service-tenement/src/main/java/edu/travel/tenant/mapper/EduTenantMapper.java

@@ -0,0 +1,7 @@
+package edu.travel.tenant.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import edu.travel.tenant.entity.EduTenant;
+
+public interface EduTenantMapper extends BaseMapper<EduTenant> {
+}

edu-travel-service/edu-travel-service-tenement/src/main/java/edu/travel/tenant/service/ITenantService.java

@@ -0,0 +1,8 @@
+package edu.travel.tenant.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import edu.travel.tenant.entity.EduTenant;
+
+public interface ITenantService extends IService<EduTenant> {
+    public EduTenant getTenantByID(String tenantID);
+}

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

@@ -0,0 +1,19 @@
+package edu.travel.tenant.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import edu.travel.tenant.entity.EduTenant;
+import edu.travel.tenant.entity.EduTenant;
+import edu.travel.tenant.service.ITenantService;
+import edu.travel.service.SysServiceImpl;
+import edu.travel.tenant.mapper.EduTenantMapper;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ITenantServiceImpl extends SysServiceImpl<EduTenantMapper, EduTenant> implements ITenantService {
+    @Override
+    public EduTenant getTenantByID(String tenantID) {
+
+        return this.getListLink(null).get(0);
+    }
+}

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

@@ -0,0 +1,27 @@
+package edu.travel.tenant.web;
+
+import edu.travel.tenant.entity.EduTenant;
+//import edu.travel.remote.feign.TenantFeign;
+import edu.travel.resp.BaseResponse;
+import edu.travel.resp.PageResponse;
+import edu.travel.tenant.service.ITenantService;
+import edu.travel.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/tenant")
+public class TenantController  extends BaseController {
+    @Autowired
+    private ITenantService tenantService;
+
+    @GetMapping("/getTenant")
+    public BaseResponse getTenant() {
+        Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+        EduTenant tenantByID = tenantService.getTenantByID(principal.toString());
+        return PageResponse.out(200,"success",tenantByID);
+    }
+}

edu-travel-service/edu-travel-service-tenement/src/main/resources/bootstrap-dev.yml

@@ -0,0 +1,27 @@
+spring:
+  cloud:
+    nacos:
+      discovery:
+        server-addr: localhost:8848,localhost:8849,localhost:8858
+        namespace: edu-@env@
+      config:
+        file-extension: yaml
+        server-addr: localhost:8848,localhost:8849,localhost:8858
+        refresh-enabled: true
+        namespace: edu-@env@
+        shared-configs:
+          - data-id: mybatis-config-dev.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+          - data-id: reids-config-dev.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+          - data-id: datasource-config-dev.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+          - data-id: system-config-dev.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+          - data-id: zipkin.yml
+            group: DEFAULT_GROUP
+            refresh: true

edu-travel-service/edu-travel-service-tenement/src/main/resources/bootstrap-prod.yml

@@ -0,0 +1,27 @@
+spring:
+  cloud:
+    nacos:
+      discovery:
+        server-addr: localhost:8848,localhost:8849,localhost:8858
+        namespace: edu-@env@
+      config:
+        file-extension: yaml
+        server-addr: localhost:8848,localhost:8849,localhost:8858
+        refresh-enabled: true
+        namespace: edu-@env@
+        shared-configs:
+          - data-id: mybatis-config-dev.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+          - data-id: reids-config-dev.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+          - data-id: datasource-config-dev.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+          - data-id: system-config-dev.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+          - data-id: zipkin.yml
+            group: DEFAULT_GROUP
+            refresh: true

edu-travel-service/edu-travel-service-tenement/src/main/resources/bootstrap.yml

@@ -0,0 +1,9 @@
+server:
+  port: 10005
+spring:
+  application:
+    name: tenant-@env@
+  profiles:
+    active: @env@
+  main:
+    allow-bean-definition-overriding: true

edu-travel-service/edu-travel-service-tenement/src/main/resources/mapper/EduTenantMapper.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="edu.travel.tenant.mapper.EduTenantMapper">
+  <resultMap id="BaseResultMap" type="edu.travel.tenant.entity.EduTenant">
+    <!--@mbg.generated-->
+    <!--@Table edu_tenant-->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="tenant_surname" jdbcType="VARCHAR" property="tenantSurname" />
+    <result column="tenant_name" jdbcType="VARCHAR" property="tenantName" />
+    <result column="tenant_sex" jdbcType="INTEGER" property="tenantSex" />
+    <result column="tenant_avatar" jdbcType="VARCHAR" property="tenantAvatar" />
+    <result column="tenant_phone" jdbcType="VARCHAR" property="tenantPhone" />
+    <result column="tenant_area" jdbcType="VARCHAR" property="tenantArea" />
+    <result column="tenant_birthday" jdbcType="TIMESTAMP" property="tenantBirthday" />
+    <result column="tenant_open_id" jdbcType="VARCHAR" property="tenantOpenId" />
+    <result column="tenant_unionid" jdbcType="VARCHAR" property="tenantUnionid" />
+    <result column="project" jdbcType="VARCHAR" property="project" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="create_user_id" jdbcType="BIGINT" property="createUserId" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="update_user_id" jdbcType="BIGINT" property="updateUserId" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, tenant_surname, tenant_name, tenant_sex, tenant_avatar, tenant_phone, tenant_area, 
+    tenant_birthday, tenant_open_id, tenant_unionid, project, create_time, create_user_id, 
+    update_time, update_user_id, delete_flag
+  </sql>
+</mapper>

edu-travel-service/pom.xml

@@ -10,7 +10,7 @@
 
     <artifactId>edu-travel-service</artifactId>
     <modules>
-        <module>edu-travel-service-tenant</module>
+        <module>edu-travel-service-tenement</module>
     </modules>
 
     <name>edu-travel-service</name>
@@ -20,7 +20,4 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
-    <dependencies>
-
-    </dependencies>
 </project>

pom.xml

@@ -10,12 +10,9 @@
     <module>edu-travel-common</module>
     <module>edu-travel-gateway</module>
     <module>edu-travel-service</module>
-    <module>edu-travel-common/edu-travel-common-feign</module>
     <module>edu-travel-remote</module>
     <module>edu-travel-oauth</module>
     <module>edu-travel-model</module>
-    <module>edu-travel-service/edu-travel-service-tenant</module>
-    <module>edu-travel-common/edu-travel-common-utils</module>
   </modules>
   <parent>
     <groupId>org.springframework.boot</groupId>