Эх сурвалжийг харах

1、gateway增加负载均衡
2、优化业务逻辑
3、业务数据量增大,优化查影响索引的查询

marxjaw 2 сар өмнө
parent
commit
48612fc108
36 өөрчлөгдсөн 288 нэмэгдсэн , 136 устгасан
  1. 0 8
      pom.xml
  2. 25 2
      yt-agent/agent-service/src/main/resources/bootstrap.yml
  3. 1 0
      yt-algebraic/algebraic-feign/pom.xml
  4. 2 5
      yt-algebraic/algebraic-service/pom.xml
  5. 6 8
      yt-algebraic/algebraic-service/src/main/resources/bootstrap.yml
  6. 5 0
      yt-algebraic/pom.xml
  7. 5 6
      yt-answer/answer-service/src/main/resources/bootstrap.yml
  8. 1 1
      yt-answer/pom.xml
  9. 9 3
      yt-app/app-service/src/main/resources/bootstrap.yml
  10. 5 6
      yt-arithmetic/arithmetic-service/src/main/resources/bootstrap.yml
  11. 5 6
      yt-calculator/calculator-service/src/main/resources/bootstrap.yml
  12. 20 4
      yt-carp/carp-service/src/main/resources/bootstrap.yml
  13. 1 3
      yt-countstep/countstep-feign/pom.xml
  14. 38 3
      yt-countstep/countstep-service/pom.xml
  15. 5 6
      yt-countstep/countstep-service/src/main/resources/bootstrap.yml
  16. 5 0
      yt-countstep/pom.xml
  17. 5 6
      yt-diary/diary-service/src/main/resources/bootstrap.yml
  18. 5 6
      yt-dtw/dtw-service/src/main/resources/bootstrap.yml
  19. 5 6
      yt-emoticons/emoticons-service/src/main/resources/bootstrap.yml
  20. 19 1
      yt-gateway/src/main/resources/bootstrap.yml
  21. 1 3
      yt-idiom/idiom-feign/pom.xml
  22. 4 4
      yt-idiom/idiom-service/src/main/resources/bootstrap.yml
  23. 6 0
      yt-idiom/pom.xml
  24. 18 2
      yt-irun/irun-service/src/main/resources/bootstrap.yml
  25. 5 6
      yt-lemon/lemon-service/src/main/resources/bootstrap.yml
  26. 7 0
      yt-lemon/pom.xml
  27. 5 8
      yt-lime/lime-service/src/main/resources/bootstrap.yml
  28. 18 2
      yt-middle/middle-platform/src/main/resources/bootstrap.yml
  29. 6 8
      yt-nofeeds/nofeeds-service/src/main/resources/bootstrap.yml
  30. 16 2
      yt-oauth/oauth-service/src/main/resources/bootstrap.yml
  31. 1 1
      yt-raisepig/pom.xml
  32. 5 6
      yt-raisepig/raisepig-service/src/main/resources/bootstrap.yml
  33. 18 2
      yt-risk/risk-manage/src/main/resources/bootstrap.yml
  34. 1 0
      yt-summary/pom.xml
  35. 5 6
      yt-summary/summary-service/src/main/resources/bootstrap.yml
  36. 5 6
      yt-walk/walk-service/src/main/resources/bootstrap.yml

+ 0 - 8
pom.xml

@@ -20,24 +20,16 @@
         <module>yt-irun</module>
         <module>yt-raisepig</module>
         <module>yt-algebraic</module>
-        <module>yt-algebraic/algebraic-feign</module>
-        <module>yt-algebraic/algebraic-service</module>
         <module>yt-countstep</module>
-        <module>yt-countstep/countstep-feign</module>
         <module>yt-idiom</module>
-        <module>yt-idiom/idiom-feign</module>
-        <module>yt-idiom/idiom-service</module>
         <module>yt-walk</module>
         <module>yt-answer</module>
         <module>yt-dtw</module>
         <module>yt-calculator</module>
         <module>yt-summary</module>
-        <module>yt-summary/summary-feign</module>
         <module>yt-diary</module>
         <module>yt-emoticons</module>
         <module>yt-lemon</module>
-        <module>yt-lemon/lemon-service</module>
-        <module>yt-lemon/lemon-feign</module>
         <module>yt-carp</module>
         <module>yt-nofeeds</module>
         <module>yt-lime</module>

+ 25 - 2
yt-agent/agent-service/src/main/resources/bootstrap.yml

@@ -3,7 +3,16 @@ server:
   port: 25521
 spring:
   profiles:
-    active: dev
+    active: prod
+feign:
+  client:
+    config:
+      lime-service:
+        connectTimeout: 600000
+        readTimeout: 1000000
+      nofeeds-service:
+        connectTimeout: 600000
+        readTimeout: 1000000
 ---
 spring:
   profiles: local
@@ -35,4 +44,18 @@ spring:
       config:
         server-addr: 127.0.0.1:8848
         file-extension: yml
-        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+---
+spring:
+  profiles: prod
+  application:
+    name: agent-service
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 146.56.196.49:8848
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae
+      config:
+        server-addr: 146.56.196.49:8848
+        file-extension: yml
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae

+ 1 - 0
yt-algebraic/algebraic-feign/pom.xml

@@ -7,6 +7,7 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
 
+    <name>algebraic-feign</name>
     <artifactId>algebraic-feign</artifactId>
     <packaging>jar</packaging>
 

+ 2 - 5
yt-algebraic/algebraic-service/pom.xml

@@ -3,18 +3,15 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.ytpm</groupId>
-        <artifactId>yt_platform</artifactId>
+        <artifactId>yt-algebraic</artifactId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
 
+    <name>algebraic-service</name>
     <artifactId>algebraic-service</artifactId>
     <packaging>jar</packaging>
     <description>代数式能手</description>
 
-    <name>algebraic-service</name>
-    <url>http://maven.apache.org</url>
-
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>

+ 6 - 8
yt-algebraic/algebraic-service/src/main/resources/bootstrap.yml

@@ -3,11 +3,11 @@ server:
 yt:
   port: 8848
   local: 127.0.0.1
-  prod_1: 127.0.0.1
+  prod_1: 119.45.146.92
   prod_2: 146.56.196.49
 spring:
   profiles:
-    active: dev
+    active: prod
 ---
 spring:
   profiles: local
@@ -35,7 +35,6 @@ spring:
     nacos:
       discovery:
         server-addr: ${yt.prod_1}:${yt.port}
-        #        ip: ${yt.prod_1}
         namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
       config:
         server-addr: ${yt.prod_1}:${yt.port}
@@ -51,10 +50,9 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${yt.prod_1}:${yt.port}
-        ip: ${yt.prod_2}
-        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+        server-addr: ${yt.prod_2}:${yt.port}
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae
       config:
-        server-addr: ${yt.prod_1}:${yt.port}
+        server-addr: ${yt.prod_2}:${yt.port}
         file-extension: yml
-        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae

+ 5 - 0
yt-algebraic/pom.xml

@@ -7,10 +7,15 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
 
+    <name>yt-algebraic</name>
     <artifactId>yt-algebraic</artifactId>
     <packaging>pom</packaging>
     <description>代数式能手</description>
 
+    <modules>
+        <module>algebraic-feign</module>
+        <module>algebraic-service</module>
+    </modules>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>

+ 5 - 6
yt-answer/answer-service/src/main/resources/bootstrap.yml

@@ -7,7 +7,7 @@ yt:
   prod_2: 146.56.196.49
 spring:
   profiles:
-    active: dev
+    active: prod
 ---
 spring:
   profiles: local
@@ -51,10 +51,9 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${yt.prod_1}:${yt.port}
-        ip: ${yt.prod_2}
-        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+        server-addr: ${yt.prod_2}:${yt.port}
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae
       config:
-        server-addr: ${yt.prod_1}:${yt.port}
+        server-addr: ${yt.prod_2}:${yt.port}
         file-extension: yml
-        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae

+ 1 - 1
yt-answer/pom.xml

@@ -17,7 +17,7 @@
         <module>answer-feign</module>
     </modules>
 
-    <name>Maven Quick Start Archetype</name>
+    <name>yt-answer</name>
     <url>http://maven.apache.org</url>
 
     <dependencies>

+ 9 - 3
yt-app/app-service/src/main/resources/bootstrap.yml

@@ -1,9 +1,15 @@
 server:
-  port: 25604
-#  port: 25603
+#  port: 25604
+  port: 25603
+feign:
+  client:
+    config:
+      default: # 全局配置,针对所有服务生效,也可以指定服务名进行单独配置,如:yourServiceName:
+        connectTimeout: 50000 # 连接超时时间(毫秒)
+        readTimeout: 100000   # 读取超时时间(毫秒)
 spring:
   profiles:
-    active: dev
+    active: local
 ---
 spring:
   profiles: local

+ 5 - 6
yt-arithmetic/arithmetic-service/src/main/resources/bootstrap.yml

@@ -7,7 +7,7 @@ yt:
   prod_2: 146.56.196.49
 spring:
   profiles:
-    active: dev
+    active: prod
 ---
 spring:
   profiles: local
@@ -51,10 +51,9 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${yt.prod_1}:${yt.port}
-        ip: ${yt.prod_2}
-        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+        server-addr: ${yt.prod_2}:${yt.port}
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae
       config:
-        server-addr: ${yt.prod_1}:${yt.port}
+        server-addr: ${yt.prod_2}:${yt.port}
         file-extension: yml
-        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae

+ 5 - 6
yt-calculator/calculator-service/src/main/resources/bootstrap.yml

@@ -7,7 +7,7 @@ yt:
   prod_2: 146.56.196.49
 spring:
   profiles:
-    active: dev
+    active: prod
 ---
 spring:
   profiles: local
@@ -51,10 +51,9 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${yt.prod_1}:${yt.port}
-        ip: ${yt.prod_2}
-        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+        server-addr: ${yt.prod_2}:${yt.port}
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae
       config:
-        server-addr: ${yt.prod_1}:${yt.port}
+        server-addr: ${yt.prod_2}:${yt.port}
         file-extension: yml
-        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae

+ 20 - 4
yt-carp/carp-service/src/main/resources/bootstrap.yml

@@ -2,7 +2,7 @@ server:
   port: 25828
 spring:
   profiles:
-    active: dev
+    active: prod
 ---
 spring:
   profiles: local
@@ -29,11 +29,27 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 119.45.71.139:8848
+        server-addr: 146.56.196.49:8848
         ip: 119.45.71.139
 #        ip: 146.56.196.49
         namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
       config:
-        server-addr: 119.45.71.139:8848
+        server-addr: 146.56.196.49:8848
         file-extension: yml
-        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+---
+spring:
+  profiles: prod
+  main:
+    allow-bean-definition-overriding: true
+  application:
+    name: carp-service
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 146.56.196.49:8848
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae
+      config:
+        server-addr: 146.56.196.49:8848
+        file-extension: yml
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae

+ 1 - 3
yt-countstep/countstep-feign/pom.xml

@@ -7,12 +7,10 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
 
+    <name>countstep-feign</name>
     <artifactId>countstep-feign</artifactId>
     <packaging>jar</packaging>
 
-    <name>countstep-feign</name>
-    <url>http://maven.apache.org</url>
-
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>

+ 38 - 3
yt-countstep/countstep-service/pom.xml

@@ -1,4 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
@@ -12,9 +14,9 @@
     <packaging>jar</packaging>
     <description>计步趣健身</description>
 
-    <url>http://maven.apache.org</url>
-
     <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -51,4 +53,37 @@
             <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <finalName>countstep-service</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                    <encoding>utf-8</encoding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.5.3</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <includeSystemScope>true</includeSystemScope>
+                    <mainClass>com.ytpm.countstep.CountStepApplication</mainClass>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

+ 5 - 6
yt-countstep/countstep-service/src/main/resources/bootstrap.yml

@@ -7,7 +7,7 @@ yt:
   prod_2: 146.56.196.49
 spring:
   profiles:
-    active: dev
+    active: prod
 ---
 spring:
   profiles: local
@@ -51,10 +51,9 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${yt.prod_1}:${yt.port}
-        ip: ${yt.prod_2}
-        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+        server-addr: ${yt.prod_2}:${yt.port}
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae
       config:
-        server-addr: ${yt.prod_1}:${yt.port}
+        server-addr: ${yt.prod_2}:${yt.port}
         file-extension: yml
-        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae

+ 5 - 0
yt-countstep/pom.xml

@@ -11,6 +11,11 @@
     <packaging>pom</packaging>
     <description>计步趣健身</description>
 
+    <modules>
+        <module>countstep-feign</module>
+        <module>countstep-service</module>
+    </modules>
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>

+ 5 - 6
yt-diary/diary-service/src/main/resources/bootstrap.yml

@@ -7,7 +7,7 @@ yt:
   prod_2: 146.56.196.49
 spring:
   profiles:
-    active: dev
+    active: prod
 ---
 spring:
   profiles: local
@@ -51,10 +51,9 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${yt.prod_1}:${yt.port}
-        ip: ${yt.prod_2}
-        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+        server-addr: ${yt.prod_2}:${yt.port}
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae
       config:
-        server-addr: ${yt.prod_1}:${yt.port}
+        server-addr: ${yt.prod_2}:${yt.port}
         file-extension: yml
-        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae

+ 5 - 6
yt-dtw/dtw-service/src/main/resources/bootstrap.yml

@@ -7,7 +7,7 @@ yt:
   prod_2: 146.56.196.49
 spring:
   profiles:
-    active: dev
+    active: prod
 ---
 spring:
   profiles: local
@@ -51,10 +51,9 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${yt.prod_1}:${yt.port}
-        ip: ${yt.prod_2}
-        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+        server-addr: ${yt.prod_2}:${yt.port}
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae
       config:
-        server-addr: ${yt.prod_1}:${yt.port}
+        server-addr: ${yt.prod_2}:${yt.port}
         file-extension: yml
-        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae

+ 5 - 6
yt-emoticons/emoticons-service/src/main/resources/bootstrap.yml

@@ -7,7 +7,7 @@ yt:
   prod_2: 146.56.196.49
 spring:
   profiles:
-    active: dev
+    active: prod
 ---
 spring:
   profiles: local
@@ -51,10 +51,9 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${yt.prod_1}:${yt.port}
-        ip: ${yt.prod_2}
-        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+        server-addr: ${yt.prod_2}:${yt.port}
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae
       config:
-        server-addr: ${yt.prod_1}:${yt.port}
+        server-addr: ${yt.prod_2}:${yt.port}
         file-extension: yml
-        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae

+ 19 - 1
yt-gateway/src/main/resources/bootstrap.yml

@@ -1,6 +1,10 @@
 spring:
   profiles:
-    active: dev
+    active: prod
+logging:
+  level:
+    com.alibaba.nacos: DEBUG
+    org.springframework.cloud: DEBUG
 ---
 spring:
   profiles: local
@@ -29,3 +33,17 @@ spring:
         server-addr: 127.0.0.1:8848
         file-extension: yml
         namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+---
+spring:
+  profiles: prod
+  application:
+    name: yt-gateway
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 146.56.196.49:8848
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae
+      config:
+        server-addr: 146.56.196.49:8848
+        file-extension: yml
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae

+ 1 - 3
yt-idiom/idiom-feign/pom.xml

@@ -7,12 +7,10 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
 
+    <name>idiom-feign</name>
     <artifactId>idiom-feign</artifactId>
     <packaging>jar</packaging>
 
-    <name>idiom-feign</name>
-    <url>http://maven.apache.org</url>
-
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>

+ 4 - 4
yt-idiom/idiom-service/src/main/resources/bootstrap.yml

@@ -51,10 +51,10 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${yt.prod_1}:${yt.port}
+        server-addr: ${yt.prod_2}:${yt.port}
         ip: ${yt.prod_2}
-        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae
       config:
-        server-addr: ${yt.prod_1}:${yt.port}
+        server-addr: ${yt.prod_2}:${yt.port}
         file-extension: yml
-        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae

+ 6 - 0
yt-idiom/pom.xml

@@ -7,10 +7,16 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
 
+    <name>yt-idiom</name>
     <artifactId>yt-idiom</artifactId>
     <packaging>pom</packaging>
     <description>成语趣解释</description>
 
+    <modules>
+        <module>idiom-feign</module>
+        <module>idiom-service</module>
+    </modules>
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>

+ 18 - 2
yt-irun/irun-service/src/main/resources/bootstrap.yml

@@ -2,7 +2,7 @@ server:
   port: 25815
 spring:
   profiles:
-    active: dev
+    active: prod
 ---
 spring:
   profiles: local
@@ -36,4 +36,20 @@ spring:
       config:
         server-addr: 119.45.71.139:8848
         file-extension: yml
-        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+---
+spring:
+  profiles: prod
+  main:
+    allow-bean-definition-overriding: true
+  application:
+    name: irun-service
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 146.56.196.49:8848
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae
+      config:
+        server-addr: 146.56.196.49:8848
+        file-extension: yml
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae

+ 5 - 6
yt-lemon/lemon-service/src/main/resources/bootstrap.yml

@@ -7,7 +7,7 @@ yt:
   prod_2: 146.56.196.49
 spring:
   profiles:
-    active: dev
+    active: prod
 ---
 spring:
   profiles: local
@@ -51,10 +51,9 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${yt.prod_1}:${yt.port}
-        ip: ${yt.prod_2}
-        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+        server-addr: ${yt.prod_2}:${yt.port}
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae
       config:
-        server-addr: ${yt.prod_1}:${yt.port}
+        server-addr: ${yt.prod_2}:${yt.port}
         file-extension: yml
-        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae

+ 7 - 0
yt-lemon/pom.xml

@@ -6,10 +6,17 @@
         <artifactId>yt_platform</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
+
+    <name>yt-lemon</name>
     <artifactId>yt-lemon</artifactId>
     <packaging>pom</packaging>
     <description>青柠檬记账</description>
 
+    <modules>
+        <module>lemon-feign</module>
+        <module>lemon-service</module>
+    </modules>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

+ 5 - 8
yt-lime/lime-service/src/main/resources/bootstrap.yml

@@ -7,7 +7,7 @@ yt:
   prod_2: 146.56.196.49
 spring:
   profiles:
-    active: dev
+    active: prod
 ---
 spring:
   profiles: local
@@ -44,17 +44,14 @@ spring:
 ---
 spring:
   profiles: prod
-  main:
-    allow-bean-definition-overriding: true
   application:
     name: lime-service
   cloud:
     nacos:
       discovery:
-        server-addr: ${yt.prod_1}:${yt.port}
-        ip: ${yt.prod_2}
-        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+        server-addr: 146.56.196.49:8848
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae
       config:
-        server-addr: ${yt.prod_1}:${yt.port}
+        server-addr: 146.56.196.49:8848
         file-extension: yml
-        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae

+ 18 - 2
yt-middle/middle-platform/src/main/resources/bootstrap.yml

@@ -3,7 +3,7 @@ server:
   port: 25715
 spring:
   profiles:
-    active: dev
+    active: prod
 ---
 spring:
   profiles: local
@@ -35,4 +35,20 @@ spring:
       config:
         server-addr: 127.0.0.1:8848
         file-extension: yml
-        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+---
+spring:
+  profiles: prod
+  main:
+    allow-bean-definition-overriding: true
+  application:
+    name: yt-middle
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 146.56.196.69:8848
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae
+      config:
+        server-addr: 146.56.196.69:8848
+        file-extension: yml
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae

+ 6 - 8
yt-nofeeds/nofeeds-service/src/main/resources/bootstrap.yml

@@ -7,7 +7,7 @@ yt:
   prod_2: 146.56.196.49
 spring:
   profiles:
-    active: dev
+    active: prod
 ---
 spring:
   profiles: local
@@ -41,20 +41,18 @@ spring:
         server-addr: ${yt.prod_1}:${yt.port}
         file-extension: yml
         namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+
 ---
 spring:
   profiles: prod
-  main:
-    allow-bean-definition-overriding: true
   application:
     name: nofeeds-service
   cloud:
     nacos:
       discovery:
-        server-addr: ${yt.prod_1}:${yt.port}
-        ip: ${yt.prod_2}
-        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+        server-addr: 146.56.196.49:8848
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae
       config:
-        server-addr: ${yt.prod_1}:${yt.port}
+        server-addr: 146.56.196.49:8848
         file-extension: yml
-        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae

+ 16 - 2
yt-oauth/oauth-service/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev
+    active: prod
 ---
 spring:
   profiles: local
@@ -32,4 +32,18 @@ spring:
       config:
         server-addr: 127.0.0.1:8848
         file-extension: yml
-        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+---
+spring:
+  profiles: prod
+  application:
+    name: yt-oauth
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 146.56.196.49:8848
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae
+      config:
+        server-addr: 146.56.196.49:8848
+        file-extension: yml
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae

+ 1 - 1
yt-raisepig/pom.xml

@@ -14,7 +14,7 @@
         <module>raisepig-feign</module>
     </modules>
 
-    <name>Maven Quick Start Archetype</name>
+    <name>yt-raisepig</name>
     <url>http://maven.apache.org</url>
 
     <dependencies>

+ 5 - 6
yt-raisepig/raisepig-service/src/main/resources/bootstrap.yml

@@ -7,7 +7,7 @@ yt:
   prod_2: 146.56.196.49
 spring:
   profiles:
-    active: dev
+    active: prod
 ---
 spring:
   profiles: local
@@ -51,10 +51,9 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${yt.prod_1}:${yt.port}
-        ip: ${yt.prod_2}
-        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+        server-addr: ${yt.prod_2}:${yt.port}
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae
       config:
-        server-addr: ${yt.prod_1}:${yt.port}
+        server-addr: ${yt.prod_2}:${yt.port}
         file-extension: yml
-        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae

+ 18 - 2
yt-risk/risk-manage/src/main/resources/bootstrap.yml

@@ -3,7 +3,8 @@ server:
 #  port: 25523
 spring:
   profiles:
-    active: dev
+
+    active: prod
 ---
 spring:
   profiles: local
@@ -35,4 +36,19 @@ spring:
       config:
         server-addr: 127.0.0.1:8848
         file-extension: yml
-        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+
+---
+spring:
+  profiles: prod
+  application:
+    name: risk-manage
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 146.56.196.49:8848
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae
+      config:
+        server-addr: 146.56.196.49:8848
+        file-extension: yml
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae

+ 1 - 0
yt-summary/pom.xml

@@ -13,6 +13,7 @@
     <packaging>pom</packaging>
     <description>归物迹</description>
     <modules>
+        <module>summary-feign</module>
         <module>summary-service</module>
     </modules>
 

+ 5 - 6
yt-summary/summary-service/src/main/resources/bootstrap.yml

@@ -7,7 +7,7 @@ yt:
   prod_2: 146.56.196.49
 spring:
   profiles:
-    active: dev
+    active: prod
 ---
 spring:
   profiles: local
@@ -51,10 +51,9 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${yt.prod_1}:${yt.port}
-        ip: ${yt.prod_2}
-        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+        server-addr: ${yt.prod_2}:${yt.port}
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae
       config:
-        server-addr: ${yt.prod_1}:${yt.port}
+        server-addr: ${yt.prod_2}:${yt.port}
         file-extension: yml
-        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae

+ 5 - 6
yt-walk/walk-service/src/main/resources/bootstrap.yml

@@ -7,7 +7,7 @@ yt:
   prod_2: 146.56.196.49
 spring:
   profiles:
-    active: dev
+    active: prod
 ---
 spring:
   profiles: local
@@ -51,10 +51,9 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${yt.prod_1}:${yt.port}
-        ip: ${yt.prod_2}
-        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+        server-addr: ${yt.prod_2}:${yt.port}
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae
       config:
-        server-addr: ${yt.prod_1}:${yt.port}
+        server-addr: ${yt.prod_2}:${yt.port}
         file-extension: yml
-        namespace: ad14a1aa-fe06-473a-9050-9afa26ec0020
+        namespace: 766c8aa7-cd4c-47c5-8540-3a4dcdbdb4ae