Forráskód Böngészése

4/6 yml分出内外网地址配置

chendayu 2 éve
szülő
commit
c9422baf20

+ 1 - 1
PAS/src/main/java/cn/cslg/pas/controller/ProductCategoryController.java

@@ -87,7 +87,7 @@ public class ProductCategoryController {
     @PostMapping("/showTrend")
     public String showTrend(@RequestBody ProductCategoryDTO dto) {
         List<ProductCategoryTrendVO> queryResult = productCategoryService.showTrend(dto);
-        if (queryResult != null){
+        if (queryResult != null) {
             return Response.success(queryResult);
         } else {
             return Response.error("查询失败");

PAS/src/main/resources/application-prod.yml → PAS/src/main/resources/application-prodNetIn.yml


+ 6 - 4
PAS/src/main/resources/application-prod2.yml

@@ -1,6 +1,6 @@
 spring:
   redis:
-    host: 172.27.247.174
+    host: 47.101.137.223
     port: 6379
     database: 3
     password: Xx0GWxdWQJxx6Swe
@@ -12,7 +12,7 @@ spring:
         max-wait: -1ms
     timeout: 2000ms
   datasource:
-    url: jdbc:mysql://172.27.247.174:3306/pas-prod?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://47.101.137.223:3306/pas-prod?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
     username: root
     password: TU5x6IeBi7rl
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -20,7 +20,9 @@ spring:
     druid:
       stat-view-servlet:
         login-username: admin
-        login-password: 123456
+        login-password: Cslg2022+
       web-stat-filter:
         exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
-authorUrl: http://localhost:8871
+springdoc:
+  api-docs:
+    enabled: false

PAS/src/main/resources/application-test.yml → PAS/src/main/resources/application-testNetIn.yml


+ 26 - 0
PAS/src/main/resources/application-testNetOut.yml

@@ -0,0 +1,26 @@
+spring:
+  redis:
+    host: 47.101.137.223
+    port: 6379
+    database: 3
+    password: Xx0GWxdWQJxx6Swe
+    lettuce:
+      pool:
+        max-active: 20
+        max-idle: 20
+        min-idle: 0
+        max-wait: -1ms
+    timeout: 2000ms
+  datasource:
+    url: jdbc:mysql://47.101.137.223:3306/pas?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+    username: root
+    password: TU5x6IeBi7rl
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    type: com.alibaba.druid.pool.DruidDataSource
+    druid:
+      stat-view-servlet:
+        login-username: admin
+        login-password: 123456
+      web-stat-filter:
+        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
+authorUrl: http://localhost:8880