Explorar o código

认证中心加载开发者信息表到redis
读取nacos配置中心

by su %!s(int64=3) %!d(string=hai) anos
pai
achega
0e0ad6259a

+ 39 - 21
4dkankan-center-auth/src/main/resources/bootstrap.yml

@@ -1,30 +1,48 @@
 server:
-  port:8087
+  port: 8081
 spring:
   application:
     name: 4dkankan-center-auth
   cloud:
     nacos:
+      config:
+        server-addr: 192.168.0.47:8848
+        file-extension: yaml
+        namespace: 4dkankan-dev
+        extension-configs[0]:
+          data-id: redis-config.yaml
+          group: DEFAULT_GROUP
+          refresh: true
       discovery:
         server-addr: 192.168.0.47:8848
-  datasource:
-    name: test
-    url: jdbc:mysql://47.113.81.43:3306/4dage-api-gateway?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=UTC&allowMultiQueries=true
-    username: root
-    password: zfb20211015G
-    type: com.alibaba.druid.pool.DruidDataSource
-    driver-class-name: com.mysql.cj.jdbc.Driver
-  redis:
-    host: 120.25.146.52
-    port: 6379
-    jedis:
-      pool:
-        max-active: 8
-        max-wait: -1
-        max-idle: 50
-        min-idle: 8
-    lettuce:
-      shutdown-timeout: 0
 
-logging:
-  config: classpath:logback-spring.xml
+#server:
+#  port: 8087
+#spring:
+#  application:
+#    name: 4dkankan-center-auth
+#  cloud:
+#    nacos:
+#      discovery:
+#        server-addr: 192.168.0.47:8848
+#  datasource:
+#    name: test
+#    url: jdbc:mysql://47.113.81.43:3306/4dage-api-gateway?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=UTC&allowMultiQueries=true
+#    username: root
+#    password: zfb20211015G
+#    type: com.alibaba.druid.pool.DruidDataSource
+#    driver-class-name: com.mysql.cj.jdbc.Driver
+#  redis:
+#    host: 120.25.146.52
+#    port: 6379
+#    jedis:
+#      pool:
+#        max-active: 8
+#        max-wait: -1
+#        max-idle: 50
+#        min-idle: 8
+#    lettuce:
+#      shutdown-timeout: 0
+#
+#logging:
+#  config: classpath:logback-spring.xml

+ 11 - 0
4dkankan-center-scene/pom.xml

@@ -35,6 +35,17 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+
+        <!--nacos 客户端 配置中心-->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

+ 11 - 7
4dkankan-center-scene/src/main/java/com/fdkankan/scene/SceneApplication.java

@@ -5,24 +5,32 @@ import com.fdkankan.common.exception.GlobalExceptionHandler;
 import com.fdkankan.common.jwt.JwtFilter;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.scene.dto.TestDto;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.context.annotation.Bean;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
+@SpringBootApplication
 @RestController
 @EnableDiscoveryClient
+@MapperScan("com.fdkankan.scene.mapper")
 public class SceneApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(SceneApplication.class, args);
     }
 
+    @Autowired
+    private RedisTemplate<String, String> redisTemplate;
+
+
     /**
      * 注入全局异常处理器
      */
@@ -33,12 +41,8 @@ public class SceneApplication {
 
     @PostMapping("/api/user/test/test")
     public ResultData test(@RequestBody TestDto test){
-        System.out.println("进入了");
-        if(test.getName().equals("aaa")){
-//            throw new BusinessException(1000,"asdfaswdfasdfsdf");
-            int i = test.getId() / 0;
-        }
-        return ResultData.ok(test);
+
+        return ResultData.ok(redisTemplate.opsForValue().get("developer:appid:103029352bef2a90bb51605604899791"));
     }
 
 }

+ 0 - 0
4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/file.txt


+ 0 - 0
4dkankan-center-scene/src/main/java/com/fdkankan/scene/mapper/file.txt


+ 0 - 0
4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/file.txt


+ 0 - 0
4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/file.txt


+ 0 - 16
4dkankan-center-scene/src/main/resources/application.yml

@@ -1,16 +0,0 @@
-spring:
-  application:
-    name: 4dkankan-center-scene
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 192.168.0.47:8848
-logging:
-  config: classpath:logback-spring.xml
-#  pattern:
-#    console: "%d{yyyy/MM/dd-HH:mm:ss} [%thread] %-5level %logger []- %msg%n"
-
-
-#server.port=8090
-#spring.application.name=4dkankan-center-scene
-#spring.cloud.nacos.discovery.server-addr=192.168.0.47:8848

+ 0 - 2
4dkankan-center-scene/src/main/resources/bootstrap.properties

@@ -1,2 +0,0 @@
-server.port=8090
-spring.application.name=4dkankan-gateway

+ 17 - 0
4dkankan-center-scene/src/main/resources/bootstrap.yml

@@ -0,0 +1,17 @@
+server:
+  port: 8081
+spring:
+  application:
+    name: 4dkankan-center-scene
+  cloud:
+    nacos:
+      config:
+        server-addr: 192.168.0.47:8848
+        file-extension: yaml
+        namespace: 4dkankan-dev
+        extension-configs[0]:
+          data-id: redis-config.yaml
+          group: DEFAULT_GROUP
+          refresh: true
+      discovery:
+        server-addr: 192.168.0.47:8848

+ 13 - 0
4dkankan-center-scene/src/test/java/com/fdkankan/scene/SceneApplicationTests.java

@@ -1,8 +1,13 @@
 package com.fdkankan.scene;
 
+import com.fdkankan.scene.entity.Folder;
+import com.fdkankan.scene.service.IFolderService;
 import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
+import java.util.List;
+
 @SpringBootTest
 class ApplicationTests {
 
@@ -10,4 +15,12 @@ class ApplicationTests {
     void contextLoads() {
     }
 
+    @Autowired
+    private IFolderService folderService;
+
+    @Test
+    public List<Folder> test(){
+        return folderService.list();
+    }
+
 }

+ 4 - 0
4dkankan-gateway/src/main/resources/bootstrap.yml

@@ -9,5 +9,9 @@ spring:
         server-addr: 192.168.0.47:8848
         file-extension: yaml
         namespace: 4dkankan-dev
+        extension-configs[0]:
+          data-id: redis-config.yaml
+          group: DEFAULT_GROUP
+          refresh: true
       discovery:
         server-addr: 192.168.0.47:8848

+ 0 - 5
4dkankan-pom/pom.xml

@@ -39,11 +39,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.mybatis.spring.boot</groupId>-->
-<!--            <artifactId>mybatis-spring-boot-starter</artifactId>-->
-<!--        </dependency>-->
-
 
         <dependency>
             <groupId>com.baomidou</groupId>

+ 9 - 6
4dkankan-pom/src/test/java/TestAutoGenerate.java

@@ -10,7 +10,6 @@ import org.junit.jupiter.api.Test;
 
 public class TestAutoGenerate {
 
-
     @Test
     public  void autoGenerate() {
         // Step1:代码生成器
@@ -18,7 +17,7 @@ public class TestAutoGenerate {
         // Step2:全局配置
         GlobalConfig gc = new GlobalConfig();
         // 填写代码生成的目录(需要修改)
-        String projectPath = "F:\\code2\\4dkankan-parent\\4dkankan-center-auth";
+        String projectPath = "F:\\code2\\4dkankan-parent\\4dkankan-center-scene";
         // 拼接出代码最终输出的目录
         gc.setOutputDir(projectPath + "/src/main/java");
         // 配置开发者信息(可选)(需要修改)
@@ -40,14 +39,14 @@ public class TestAutoGenerate {
         // Step3:数据源配置(需要修改)
         DataSourceConfig dsc = new DataSourceConfig();
         // 配置数据库 url 地址
-        dsc.setUrl("jdbc:mysql://47.113.81.43:3306/4dage-api-gateway?useUnicode=true&characterEncoding=utf8");
+        dsc.setUrl("jdbc:mysql://120.25.146.52:3306/4dkankan-center-scene?useUnicode=true&characterEncoding=utf8");
         // dsc.setSchemaName("testMyBatisPlus"); // 可以直接在 url 中指定数据库名
         // 配置数据库驱动
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         // 配置数据库连接用户名
         dsc.setUsername("root");
         // 配置数据库连接密码
-        dsc.setPassword("zfb20211015G");
+        dsc.setPassword("4dkk2020test%");
         mpg.setDataSource(dsc);
 
         // Step:4:包配置
@@ -55,7 +54,7 @@ public class TestAutoGenerate {
         // 配置父包名(需要修改)
         pc.setParent("com.fdkankan");
         // 配置模块名(需要修改)
-        pc.setModuleName("auth");
+        pc.setModuleName("scene");
         // 配置 entity 包名
         pc.setEntity("entity");
         // 配置 mapper 包名
@@ -69,7 +68,11 @@ public class TestAutoGenerate {
         // Step5:策略配置(数据库表配置)
         StrategyConfig strategy = new StrategyConfig();
         // 指定表名 {}
-        String [] tableNames ={"tm_developer"};
+        String [] tableNames ={"t_folder","t_folder_scene","t_scene","t_scene_3d_num","t_scene_3dfamily",
+                "t_scene_cooperation","t_scene_data_download","t_scene_download_log","t_scene_feedback",
+                "t_scene_file_build","t_scene_file_upload","t_scene_module_video","t_scene_pro",
+                "t_scene_pro_edit","t_scene_pro_edit","t_scene_pro_ext","t_scene_record","t_scene_resource",
+                "t_scene_resource_camera","t_scene_resource_cooperation","t_scene_statistics"};
         strategy.setInclude(tableNames);
         // 配置数据表与实体类名之间映射的策略
         strategy.setNaming(NamingStrategy.underline_to_camel);