feat: 演示环境IP

mall-admin/src/main/resources/application-dev.yml

@@ -20,7 +20,7 @@ spring:
     timeout: 300ms # 连接超时时间（毫秒）
 
 minio:
-  endpoint: http://localhost:9000 #MinIO服务所在地址
+  endpoint: http://192.168.1.74:9000 #MinIO服务所在地址
   bucketName: mall #存储桶名称
   accessKey: minioadmin #访问的key
   secretKey: minioadmin #访问的秘钥
@@ -32,4 +32,4 @@ logging:
 
 logstash:
   host: localhost
-  enableInnerLog: false
+  enableInnerLog: false

mall-admin/src/main/resources/application-prod.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
-    url: jdbc:mysql://db:3306/mall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false
-    username: reader
-    password: 123456
+    url: jdbc:mysql://192.168.1.74:3306/mall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false
+    username: root
+    password: root_123
     druid:
       initial-size: 5 #连接池初始化大小
       min-idle: 10 #最小空闲连接数
@@ -20,7 +20,7 @@ spring:
     timeout: 300ms # 连接超时时间（毫秒）
 
 minio:
-  endpoint: http://192.168.3.101:9090 #MinIO服务所在地址
+  endpoint: http://192.168.1.74:9090 #MinIO服务所在地址
   bucketName: mall #存储桶名称
   accessKey: minioadmin #访问的key
   secretKey: minioadmin #访问的秘钥
@@ -33,4 +33,4 @@ logging:
     com.macro.mall: info
 
 logstash:
-  host: logstash
+  host: logstash

mall-admin/src/main/resources/application.yml

@@ -62,3 +62,5 @@ aliyun:
     callback: http://39.98.190.128:8080/aliyun/oss/callback # 文件上传成功后的回调地址
     dir:
       prefix: mall/images/ # 上传文件夹路径前缀
+server:
+  port: 8080

mall-portal/src/main/resources/application-prod.yml

@@ -3,9 +3,9 @@ server:
 
 spring:
   datasource:
-    url: jdbc:mysql://db:3306/mall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false
-    username: reader
-    password: 123456
+    url: jdbc:mysql://192.168.1.74:3306/mall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false
+    username: root
+    password: root_123
     druid:
       initial-size: 5 #连接池初始化大小
       min-idle: 10 #最小空闲连接数
@@ -30,7 +30,7 @@ spring:
     timeout: 300ms # 连接超时时间（毫秒）
 
   rabbitmq:
-    host: rabbit
+    host: 192.168.1.74
     port: 5672
     virtual-host: /mall
     username: mall

mall-search/src/main/resources/application-prod.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
-    url: jdbc:mysql://db:3306/mall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false
-    username: reader
-    password: 123456
+    url: jdbc:mysql://192.168.1.74:3306/mall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false
+    username: root
+    password: root_123
     druid:
       initial-size: 5 #连接池初始化大小
       min-idle: 10 #最小空闲连接数
@@ -27,4 +27,4 @@ logging:
     com.macro.mall: info
 
 logstash:
-  host: logstash
+  host: logstash

mall-security/src/main/java/com/macro/mall/security/component/RestAuthenticationEntryPoint.java

@@ -22,7 +22,7 @@ public class RestAuthenticationEntryPoint implements AuthenticationEntryPoint {
         response.setHeader("Cache-Control","no-cache");
         response.setCharacterEncoding("UTF-8");
         response.setContentType("application/json");
-        response.getWriter().println(JSONUtil.parse(CommonResult.unauthorized(authException.getMessage())));
+//        response.getWriter().println(JSONUtil.parse(CommonResult.unauthorized(authException.getMessage())));
         response.getWriter().flush();
     }
 }

pom.xml

@@ -31,7 +31,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
         <skipTests>true</skipTests>
-        <docker.host>http://192.168.3.101:2375</docker.host>
+        <docker.host>http://192.168.1.74:2375</docker.host>
         <docker.maven.plugin.version>0.40.2</docker.maven.plugin.version>
         <pagehelper-starter.version>1.4.5</pagehelper-starter.version>
         <pagehelper.version>5.3.2</pagehelper.version>
@@ -76,6 +76,8 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <version>1.18.30</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -245,7 +247,7 @@
                                         <descriptorRef>artifact</descriptorRef>
                                     </assembly>
                                     <!--定义容器启动命令-->
-                                    <entryPoint>["java", "-jar","-Dspring.profiles.active=prod","/${project.build.finalName}.jar"]</entryPoint>
+                                    <entryPoint>["java", "-jar","-Dspring.profiles.active=dev","/${project.build.finalName}.jar"]</entryPoint>
                                     <!--定义维护者-->
                                     <maintainer>macrozheng</maintainer>
                                 </build>
@@ -272,4 +274,4 @@
         </repository>
     </repositories>
 
-</project>
+</project>