调整nacos配置中心

.idea/runConfigurations/CodeGet.xml

@@ -1,15 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="CodeGet" type="Application" factoryName="Application" nameIsGenerated="true">
-    <option name="MAIN_CLASS_NAME" value="com.atguigu.ssyx.CodeGet" />
-    <module name="service-util" />
-    <extension name="coverage">
-      <pattern>
-        <option name="PATTERN" value="com.atguigu.ssyx.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>

.idea/ssyx.iml

@@ -5,5 +5,6 @@
     <content url="file://$MODULE_DIR$" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="nacos-config-0.8.0" level="application" />
   </component>
 </module>

atguigu-tuan/pages/login/login.vue

@@ -17,7 +17,7 @@
       </view>
       <view class="hint">
         登录代表同意
-        <text class="link">硅谷团购平台用户协议、隐私政策，</text>
+        <text class="link">硅谷平台用户协议、隐私政策，</text>
         并授权使用您的硅谷团购平台账号信息（如昵称、头像、收获地址）以便您统一管理
       </view>
     </view>

atguigu-tuan/unpackage/dist/dev/mp-weixin/pages/login/login.wxml

@@ -1 +1 @@
-<view class="wrap data-v-b237504c"><view class="content data-v-b237504c"><view class="title data-v-b237504c">欢迎登陆硅谷团购平台</view></view><view class="buttom data-v-b237504c"><view class="loginType data-v-b237504c"><button class="loginBtn data-v-b237504c" disabled="{{isLogin}}" data-event-opts="{{[['tap',[['getUserMsg',['$event']]]]]}}" bindtap="__e"><view class="wechat item data-v-b237504c"><view class="icon data-v-b237504c"><u-icon vue-id="35a7246c-1" color="rgb(83,194,64)" name="weixin-fill" size="200" class="data-v-b237504c" bind:__l="__l"></u-icon></view>微信登陆</view></button></view><view class="hint data-v-b237504c">登录代表同意<text class="link data-v-b237504c">硅谷团购平台用户协议、隐私政策，</text>并授权使用您的硅谷团购平台账号信息（如昵称、头像、收获地址）以便您统一管理</view></view></view>
+<view class="wrap data-v-b237504c"><view class="content data-v-b237504c"><view class="title data-v-b237504c">欢迎登陆硅谷团购平台</view></view><view class="buttom data-v-b237504c"><view class="loginType data-v-b237504c"><button class="loginBtn data-v-b237504c" disabled="{{isLogin}}" data-event-opts="{{[['tap',[['getUserMsg',['$event']]]]]}}" bindtap="__e"><view class="wechat item data-v-b237504c"><view class="icon data-v-b237504c"><u-icon vue-id="35a7246c-1" color="rgb(83,194,64)" name="weixin-fill" size="200" class="data-v-b237504c" bind:__l="__l"></u-icon></view>微信登陆</view></button></view><view class="hint data-v-b237504c">登录代表同意<text class="link data-v-b237504c">硅谷平台用户协议、隐私政策，</text>并授权使用您的硅谷团购平台账号信息（如昵称、头像、收获地址）以便您统一管理</view></view></view>

guigu-ssyx-parent/pom.xml

@@ -41,7 +41,6 @@
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
     </properties>
 
     <!--配置dependencyManagement锁定依赖的版本-->

guigu-ssyx-parent/service-gateway/Dockerfile

@@ -3,3 +3,4 @@ LABEL authors="yovinchen"
 VOLUME /tmp
 ADD ./target/service-gateway.jar service-gateway.jar
 ENTRYPOINT ["java","-jar","/service-gateway.jar", "&"]
+

guigu-ssyx-parent/service-gateway/pom.xml

@@ -22,6 +22,10 @@
             <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-gateway</artifactId>

guigu-ssyx-parent/service-gateway/src/main/resources/application-dev.yml

@@ -1,59 +0,0 @@
-server:
-  port: 8200
-
-spring:
-  cloud:
-    gateway:
-      discovery:
-        locator:
-          enabled: true
-      routes:
-        - id: service-acl
-          uri: lb://service-acl
-          predicates:
-            - Path=/*/acl/**
-
-        - id: service-sys
-          uri: lb://service-sys
-          predicates:
-            - Path=/*/sys/**
-
-        - id: service-product
-          uri: lb://service-product
-          predicates:
-            - Path=/*/product/**
-
-        - id: service-activity
-          uri: lb://service-activity
-          predicates:
-            - Path=/*/activity/**
-
-        - id: service-order
-          uri: lb://service-order
-          predicates:
-            - Path=/*/order/**
-
-        - id: service-payment
-          uri: lb://service-payment
-          predicates:
-            - Path=/*/payment/**
-
-        - id: service-user
-          uri: lb://service-user
-          predicates:
-            - Path=/*/user/**
-
-        - id: service-search
-          uri: lb://service-search
-          predicates:
-            - Path=/*/search/**
-
-        - id: service-home
-          uri: lb://service-home
-          predicates:
-            - Path=/*/home/**
-
-        - id: service-cart
-          uri: lb://service-cart
-          predicates:
-            - Path=/*/cart/**

guigu-ssyx-parent/service-gateway/src/main/resources/application.yml

@@ -1,8 +1,8 @@
+server:
+  port: 8200
 spring:
   application:
     name: service-gateway
-  profiles:
-    active: dev
   cloud:
     nacos:
       discovery:

guigu-ssyx-parent/service-gateway/src/main/resources/bootstrap.yml

@@ -0,0 +1,11 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        namespace: dd5265c5-8290-45bc-9d07-395c14c977d3
+        server-addr: 82.157.68.223:8848
+        group: service
+        username: nacos
+        password: nacos
+        enabled: true
+        file-extension: yml

guigu-ssyx-parent/service/pom.xml

@@ -69,7 +69,11 @@
             <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>
         <!-- 服务调用feign -->
         <dependency>
             <groupId>org.springframework.cloud</groupId>

guigu-ssyx-parent/service/service-acl/src/main/resources/application-dev.yml

@@ -1,32 +0,0 @@
-server:
-  port: 8201
-
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-
-spring:
-  datasource:
-    type: com.zaxxer.hikari.HikariDataSource
-    #    driver-class-name: com.mysql.cj.jdbc.Driver
-    #    url: jdbc:mysql://82.157.68.223:3306/shequ-acl?characterEncoding=utf-8&useSSL=false
-    driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    url: jdbc:p6spy:mysql://82.157.68.223:3306/shequ-acl?characterEncoding=utf-8&useSSL=false
-    username: shequ-acl
-    password: shequ-acl
-  redis:
-    host: 82.157.68.223
-    port: 6379
-    database: 0
-    timeout: 1800000
-    password:
-    lettuce:
-      pool:
-        max-active: 20 #最大连接数
-        max-wait: -1    #最大阻塞等待时间(负数表示没限制)
-        max-idle: 5    #最大空闲
-        min-idle: 0     #最小空闲
-
-  jackson:
-    date-format: yyyy-MM-dd HH:mm:ss
-    time-zone: GMT+8

guigu-ssyx-parent/service/service-acl/src/main/resources/application.yml

@@ -1,8 +1,8 @@
+server:
+  port: 8201
 spring:
   application:
     name: service-acl
-  profiles:
-    active: dev
   cloud:
     nacos:
       discovery:

guigu-ssyx-parent/service/service-acl/src/main/resources/bootstrap.yml

@@ -0,0 +1,18 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        namespace: dd5265c5-8290-45bc-9d07-395c14c977d3
+        server-addr: 82.157.68.223:8848
+        group: service
+        username: nacos
+        password: nacos
+        enabled: true
+        file-extension: yml
+        extension-configs:
+          - data-id: common.yml
+            group: common
+            refresh: true
+          - data-id: service-redis.yml
+            group: common
+            refresh: true

guigu-ssyx-parent/service/service-activity/src/main/resources/application-dev.yml

@@ -1,31 +0,0 @@
-server:
-  port: 8205
-
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-  type-enums-package: com.atguigu.ssyx.enums
-
-spring:
-  datasource:
-    type: com.zaxxer.hikari.HikariDataSource
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://82.157.68.223:3306/shequ-activity?characterEncoding=utf-8&useSSL=false
-    username: shequ-activity
-    password: shequ-activity
-  redis:
-    host: 82.157.68.223
-    port: 6379
-    database: 0
-    timeout: 1800000
-    password:
-    lettuce:
-      pool:
-        max-active: 20 #最大连接数
-        max-wait: -1    #最大阻塞等待时间(负数表示没限制)
-        max-idle: 5    #最大空闲
-        min-idle: 0     #最小空闲
-
-  jackson:
-    date-format: yyyy-MM-dd HH:mm:ss
-    time-zone: GMT+8

guigu-ssyx-parent/service/service-activity/src/main/resources/application.yml

@@ -1,8 +1,8 @@
+server:
+  port: 8205
 spring:
   application:
     name: service-activity
-  profiles:
-    active: dev
   cloud:
     nacos:
       discovery:

guigu-ssyx-parent/service/service-activity/src/main/resources/bootstrap.yml

@@ -0,0 +1,18 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        namespace: dd5265c5-8290-45bc-9d07-395c14c977d3
+        server-addr: 82.157.68.223:8848
+        group: service
+        username: nacos
+        password: nacos
+        enabled: true
+        file-extension: yml
+        extension-configs:
+          - data-id: common.yml
+            group: common
+            refresh: true
+          - data-id: service-redis.yml
+            group: common
+            refresh: true

guigu-ssyx-parent/service/service-cart/Dockerfile

@@ -1,5 +1,5 @@
 FROM openjdk:8-jdk-alpine
 LABEL authors="yovinchen"
 VOLUME /tmp
-ADD ./target/service-activity.jar service-cart.jar
+ADD ./target/service-cart.jar service-cart.jar
 ENTRYPOINT ["java","-jar","/service-cart.jar", "&"]

guigu-ssyx-parent/service/service-cart/src/main/resources/application-dev.yml

@@ -1,34 +0,0 @@
-server:
-  port: 8208
-
-feign:
-  sentinel:
-    enabled: true
-  client:
-    config:
-      default: #配置全局的feign的调用超时时间  如果 有指定的服务配置 默认的配置不会生效
-        connectTimeout: 30000 # 指定的是 消费者 连接服务提供者的连接超时时间 是否能连接  单位是毫秒
-        readTimeout: 50000  # 指定的是调用服务提供者的 服务 的超时时间（）  单位是毫秒
-spring:
-  main:
-    allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
-  rabbitmq:
-    host: 43.143.164.194
-    port: 5672
-    username: guest
-    password: guest
-  redis:
-    host: 82.157.68.223
-    port: 6379
-    database: 0
-    timeout: 1800000
-    password:
-    lettuce:
-      pool:
-        max-active: 20 #最大连接数
-        max-wait: -1    #最大阻塞等待时间(负数表示没限制)
-        max-idle: 5    #最大空闲
-        min-idle: 0     #最小空闲
-  jackson:
-    date-format: yyyy-MM-dd HH:mm:ss
-    time-zone: GMT+8

guigu-ssyx-parent/service/service-cart/src/main/resources/application.yml

@@ -1,8 +1,8 @@
+server:
+  port: 8208
 spring:
   application:
     name: service-cart
-  profiles:
-    active: dev
   cloud:
     nacos:
       discovery:

guigu-ssyx-parent/service/service-cart/src/main/resources/bootstrap.yml

@@ -0,0 +1,24 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        namespace: dd5265c5-8290-45bc-9d07-395c14c977d3
+        server-addr: 82.157.68.223:8848
+        group: service
+        username: nacos
+        password: nacos
+        enabled: true
+        file-extension: yml
+        extension-configs:
+          - data-id: common.yml
+            group: common
+            refresh: true
+          - data-id: service-redis.yml
+            group: common
+            refresh: true
+          - data-id: service-rabbitmq.yml
+            group: common
+            refresh: true
+          - data-id: service-openfeign.yml
+            group: common
+            refresh: true

guigu-ssyx-parent/service/service-home/src/main/resources/application-dev.yml

@@ -1,35 +0,0 @@
-server:
-  port: 8207
-
-feign:
-  sentinel:
-    enabled: true
-  client:
-    config:
-      default: #配置全局的feign的调用超时时间  如果 有指定的服务配置 默认的配置不会生效
-        connectTimeout: 50000 # 指定的是 消费者 连接服务提供者的连接超时时间 是否能连接  单位是毫秒
-        readTimeout: 50000  # 指定的是调用服务提供者的 服务 的超时时间（）  单位是毫秒
-
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-  type-enums-package: com.atguigu.ssyx.enums
-
-spring:
-  main:
-    allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
-  jackson:
-    date-format: yyyy-MM-dd HH:mm:ss
-    time-zone: GMT+8
-  redis:
-    host: 82.157.68.223
-    port: 6379
-    database: 0
-    timeout: 1800000
-    password:
-    lettuce:
-      pool:
-        max-active: 20 #最大连接数
-        max-wait: -1    #最大阻塞等待时间(负数表示没限制)
-        max-idle: 5    #最大空闲
-        min-idle: 0     #最小空闲

guigu-ssyx-parent/service/service-home/src/main/resources/application.yml

@@ -1,8 +1,8 @@
+server:
+  port: 8207
 spring:
   application:
     name: service-home
-  profiles:
-    active: dev
   cloud:
     nacos:
       discovery:

guigu-ssyx-parent/service/service-home/src/main/resources/bootstrap.yml

@@ -0,0 +1,21 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        namespace: dd5265c5-8290-45bc-9d07-395c14c977d3
+        server-addr: 82.157.68.223:8848
+        group: service
+        username: nacos
+        password: nacos
+        enabled: true
+        file-extension: yml
+        extension-configs:
+          - data-id: common.yml
+            group: common
+            refresh: true
+          - data-id: service-redis.yml
+            group: common
+            refresh: true
+          - data-id: service-openfeign.yml
+            group: common
+            refresh: true

guigu-ssyx-parent/service/service-order/src/main/resources/application-dev.yml

@@ -1,52 +0,0 @@
-server:
-  port: 8209
-mybatis-plus:
-  type-enums-package: com.atguigu.ssyx.enums
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-  mapper-locations: classpath:mapper/*.xml
-feign:
-  sentinel:
-    enabled: true
-  client:
-    config:
-      default: #配置全局的feign的调用超时时间  如果 有指定的服务配置 默认的配置不会生效
-        connectTimeout: 30000 # 指定的是 消费者 连接服务提供者的连接超时时间 是否能连接  单位是毫秒
-        readTimeout: 50000  # 指定的是调用服务提供者的 服务 的超时时间（）  单位是毫秒
-spring:
-  main:
-    allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
-  rabbitmq:
-    host: 43.143.164.194
-    port: 5672
-    username: guest
-    password: guest
-  redis:
-    host: 82.157.68.223
-    port: 6379
-    database: 0
-    timeout: 1800000
-    password:
-    lettuce:
-      pool:
-        max-active: 20 #最大连接数
-        max-wait: -1    #最大阻塞等待时间(负数表示没限制)
-        max-idle: 5    #最大空闲
-        min-idle: 0     #最小空闲
-  datasource:
-    type: com.zaxxer.hikari.HikariDataSource
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://82.157.68.223:3306/shequ-order?characterEncoding=utf-8&useSSL=false
-    username: shequ-order
-    password: shequ-order
-    hikari:
-      connection-test-query: SELECT 1
-      connection-timeout: 60000
-      idle-timeout: 500000
-      max-lifetime: 540000
-      maximum-pool-size: 5
-      minimum-idle: 3
-      pool-name: GuliHikariPool
-  jackson:
-    date-format: yyyy-MM-dd HH:mm:ss
-    time-zone: GMT+8

guigu-ssyx-parent/service/service-order/src/main/resources/application.yml

@@ -1,8 +1,8 @@
+server:
+  port: 8209
 spring:
   application:
     name: service-order
-  profiles:
-    active: dev
   cloud:
     nacos:
       discovery:

guigu-ssyx-parent/service/service-order/src/main/resources/bootstrap.yml

@@ -0,0 +1,24 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        namespace: dd5265c5-8290-45bc-9d07-395c14c977d3
+        server-addr: 82.157.68.223:8848
+        group: service
+        username: nacos
+        password: nacos
+        enabled: true
+        file-extension: yml
+        extension-configs:
+          - data-id: common.yml
+            group: common
+            refresh: true
+          - data-id: service-redis.yml
+            group: common
+            refresh: true
+          - data-id: service-rabbitmq.yml
+            group: common
+            refresh: true
+          - data-id: service-openfeign.yml
+            group: common
+            refresh: true

guigu-ssyx-parent/service/service-payment/src/main/resources/application-dev.yml

@@ -1,60 +0,0 @@
-server:
-  port: 8210
-mybatis-plus:
-  type-enums-package: com.atguigu.ssyx.enums
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-  mapper-locations: classpath:mapper/*.xml
-feign:
-  sentinel:
-    enabled: true
-  client:
-    config:
-      default: #配置全局的feign的调用超时时间  如果 有指定的服务配置 默认的配置不会生效
-        connectTimeout: 30000 # 指定的是 消费者 连接服务提供者的连接超时时间 是否能连接  单位是毫秒
-        readTimeout: 50000  # 指定的是调用服务提供者的 服务 的超时时间（）  单位是毫秒
-spring:
-  main:
-    allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
-  rabbitmq:
-    host: 43.143.164.194
-    port: 5672
-    username: guest
-    password: guest
-  redis:
-    host: 82.157.68.223
-    port: 6379
-    database: 0
-    timeout: 1800000
-    password:
-    lettuce:
-      pool:
-        max-active: 20 #最大连接数
-        max-wait: -1    #最大阻塞等待时间(负数表示没限制)
-        max-idle: 5    #最大空闲
-        min-idle: 0     #最小空闲
-  datasource:
-    type: com.zaxxer.hikari.HikariDataSource
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://82.157.68.223:3306/shequ-order?characterEncoding=utf-8&useSSL=false
-    username: shequ-order
-    password: shequ-order
-    hikari:
-      connection-test-query: SELECT 1
-      connection-timeout: 60000
-      idle-timeout: 500000
-      max-lifetime: 540000
-      maximum-pool-size: 5
-      minimum-idle: 3
-      pool-name: GuliHikariPool
-  jackson:
-    date-format: yyyy-MM-dd HH:mm:ss
-    time-zone: GMT+8
-# 微信
-weixin:
-  #小程序微信公众平台appId
-  appid: wxcc651fcbab275e33
-  partner: 1481962542
-  partnerkey: MXb72b9RfshXZD4FRGV5KLqmv5bx9LT9
-  notifyurl: http://gmall-prod.atguigu.cn/api/payment/weixin/notify
-  cert: /Users/yovinchen/project/Java/ssyx/guigu-ssyx-parent/service/service-payment/src/main/resources/cert/apiclient_cert.p12

guigu-ssyx-parent/service/service-payment/src/main/resources/application.yml

@@ -1,8 +1,8 @@
+server:
+  port: 8210
 spring:
   application:
     name: service-payment
-  profiles:
-    active: dev
   cloud:
     nacos:
       discovery:

guigu-ssyx-parent/service/service-payment/src/main/resources/bootstrap.yml

@@ -0,0 +1,24 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        namespace: dd5265c5-8290-45bc-9d07-395c14c977d3
+        server-addr: 82.157.68.223:8848
+        group: service
+        username: nacos
+        password: nacos
+        enabled: true
+        file-extension: yml
+        extension-configs:
+          - data-id: common.yml
+            group: common
+            refresh: true
+          - data-id: service-redis.yml
+            group: common
+            refresh: true
+          - data-id: service-rabbitmq.yml
+            group: common
+            refresh: true
+          - data-id: service-openfeign.yml
+            group: common
+            refresh: true

guigu-ssyx-parent/service/service-product/pom.xml

@@ -11,6 +11,24 @@
 
     <artifactId>service-product</artifactId>
     <dependencies>
+
+        <!--        #低版本的okhttp会报错提示-->
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.9.0</version>
+        </dependency>
+        <dependency>
+            <groupId>io.minio</groupId>
+            <artifactId>minio</artifactId>
+            <version>8.5.6</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>okhttp</artifactId>
+                    <groupId>com.squareup.okhttp3</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <!-- 阿里云oss依赖 -->
         <dependency>
             <groupId>com.aliyun.oss</groupId>

guigu-ssyx-parent/service/service-product/src/main/java/com/atguigu/ssyx/product/mapper/SkuInfoMapper.java

@@ -40,7 +40,7 @@ public interface SkuInfoMapper extends BaseMapper<SkuInfo> {
      */
     void unlockStock(@Param("skuId") Long skuId, @Param("skuNum") Integer skuNum);
 
-    /**
+    /**z
      * 减库存
      *
      * @param skuId

guigu-ssyx-parent/service/service-product/src/main/java/com/atguigu/ssyx/product/service/impl/FileUploadServiceImpl.java

@@ -1,8 +1,7 @@
 package com.atguigu.ssyx.product.service.impl;
 
-import com.aliyun.oss.OSS;
-import com.aliyun.oss.OSSClientBuilder;
 import com.atguigu.ssyx.product.service.FileUploadService;
+import io.minio.MinioClient;
 import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -35,7 +34,12 @@ public class FileUploadServiceImpl implements FileUploadService {
     public String fileUpload(MultipartFile file) throws Exception {
         try {
             // 创建OSSClient实例。
-            OSS ossClient = new OSSClientBuilder().build(endPoint, accessKey, secreKey);
+//            OSS ossClient = new OSSClientBuilder().build(endPoint, accessKey, secreKey);
+            MinioClient minioClient =
+                    MinioClient.builder()
+                            .endpoint("https://play.min.io")
+                            .credentials("Q3AM3UQ867SPQQA43P2F", "zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG")
+                            .build();
             // 上传文件流。
             InputStream inputStream = file.getInputStream();
             String fileName = file.getOriginalFilename();
@@ -50,9 +54,9 @@ public class FileUploadServiceImpl implements FileUploadService {
             String timeUrl = new DateTime().toString("yyyy/MM/dd");
             fileName = timeUrl + "/" + fileName;
             //调用方法实现上传
-            ossClient.putObject(bucketName, fileName, inputStream);
+//            ossClient.putObject(bucketName, fileName, inputStream);
             // 关闭OSSClient。
-            ossClient.shutdown();
+//            ossClient.shutdown();
             //上传之后文件路径
             String url = "https://" + bucketName + "." + endPoint + "/" + fileName;
             //返回

guigu-ssyx-parent/service/service-product/src/main/java/com/atguigu/ssyx/product/utils/FileUploader.java

@@ -0,0 +1,45 @@
+package com.atguigu.ssyx.product.utils;
+
+import io.minio.BucketExistsArgs;
+import io.minio.MakeBucketArgs;
+import io.minio.MinioClient;
+import io.minio.UploadObjectArgs;
+import io.minio.errors.MinioException;
+
+import java.io.IOException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+
+/**
+ * ClassName: FileUploader
+ * Package: com.atguigu.ssyx.product.utils
+ *
+ * @author yovinchen
+ * @Create 2023/10/13 17:55
+ */
+public class FileUploader {
+
+    public static void main(String[] args) throws IOException, NoSuchAlgorithmException, InvalidKeyException {
+        try {
+            // Create a minioClient with the MinIO server playground, its access key and secret key.
+            MinioClient minioClient = MinioClient.builder().endpoint("http://154.9.228.206:9000").credentials("IaZk6fqBYY66dcE03edv", "6zzVxP6wAuu74Tft22JJZDQGVfnaHtJ221XjAwQu").build();
+
+            // Make 'asiatrip' bucket if not exist.
+            boolean found = minioClient.bucketExists(BucketExistsArgs.builder().bucket("public").build());
+            if (!found) {
+                // Make a new bucket called 'asiatrip'.
+                minioClient.makeBucket(MakeBucketArgs.builder().bucket("public").build());
+            } else {
+                System.out.println("Bucket 'public' already exists.");
+            }
+
+            // Upload '/home/user/Photos/asiaphotos.zip' as object name 'asiaphotos-2015.zip' to bucket
+            // 'asiatrip'.
+            minioClient.uploadObject(UploadObjectArgs.builder().bucket("public").object("credentials.json").filename("C:/Users/lai.huanxiong/Downloads/credentials.json").build());
+            System.out.println("'C:/Users/lai.huanxiong/Downloads/credentials.json' is successfully uploaded as " + "object 'credentials.json' to bucket 'public'.");
+        } catch (MinioException e) {
+            System.out.println("Error occurred: " + e);
+            System.out.println("HTTP trace: " + e.httpTrace());
+        }
+    }
+}

guigu-ssyx-parent/service/service-product/src/main/resources/application-dev.yml

@@ -1,48 +0,0 @@
-server:
-  port: 8203
-
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-  type-enums-package: com.atguigu.ssyx.enums
-spring:
-  datasource:
-    type: com.zaxxer.hikari.HikariDataSource
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://82.157.68.223:3306/shequ-product?characterEncoding=utf-8&useSSL=false
-    username: shequ-product
-    password: shequ-product
-  rabbitmq:
-    host: 43.143.164.194
-    port: 5672
-    username: guest
-    password: guest
-    publisher-confirm-type: CORRELATED  #发布确认模式，消息是否被成功发送到交换机
-    publisher-returns: true
-    listener:
-      simple:
-        prefetch: 1
-        concurrency: 3
-        acknowledge-mode: manual   #消费端手动确认
-  redis:
-    host: 82.157.68.223
-    port: 6379
-    database: 0
-    timeout: 1800000
-    password:
-    lettuce:
-      pool:
-        max-active: 20 #最大连接数
-        max-wait: -1    #最大阻塞等待时间(负数表示没限制)
-        max-idle: 5    #最大空闲
-        min-idle: 0     #最小空闲
-  jackson:
-    date-format: yyyy-MM-dd HH:mm:ss
-    time-zone: GMT+8
-
-aliyun:
-  endpoint: oss-cn-beijing.aliyuncs.com
-  keyid: LTAI5tHWGPq6o62dMMV1hn1i
-  keysecret: FyUK59nlI0bf1MFHLuEvtBwXl2CJjA
-  bucketname: ssyx-yovinchen
-

guigu-ssyx-parent/service/service-product/src/main/resources/application.yml

@@ -1,8 +1,8 @@
+server:
+  port: 8203
 spring:
   application:
     name: service-product
-  profiles:
-    active: dev
   cloud:
     nacos:
       discovery:

guigu-ssyx-parent/service/service-product/src/main/resources/bootstrap.yml

@@ -0,0 +1,31 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        namespace: dd5265c5-8290-45bc-9d07-395c14c977d3
+        server-addr: 82.157.68.223:8848
+        group: service
+        username: nacos
+        password: nacos
+        enabled: true
+        file-extension: yml
+        extension-configs:
+          - data-id: common.yml
+            group: common
+            refresh: true
+          - data-id: service-redis.yml
+            group: common
+            refresh: true
+          - data-id: service-rabbitmq.yml
+            group: common
+            refresh: true
+          - data-id: config-rabbitmq.yml
+            group: config
+            refresh: true
+          - data-id: service-openfeign.yml
+            group: common
+            refresh: true
+          - data-id: oss-aliyun.yml
+            group: oss
+            refresh: true
+

guigu-ssyx-parent/service/service-search/src/main/resources/application-dev.yml

@@ -1,41 +0,0 @@
-server:
-  port: 8204
-feign:
-  sentinel:
-    enabled: true
-  client:
-    config:
-      default: #配置全局的feign的调用超时时间  如果 有指定的服务配置 默认的配置不会生效
-        connectTimeout: 30000 # 指定的是 消费者 连接服务提供者的连接超时时间 是否能连接  单位是毫秒
-        readTimeout: 50000  # 指定的是调用服务提供者的 服务 的超时时间（）  单位是毫秒
-spring:
-  main:
-    allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
-  elasticsearch:
-    rest:
-      uris: http://43.143.164.194:9200
-  rabbitmq:
-    host: 43.143.164.194
-    port: 5672
-    username: guest
-    password: guest
-    publisher-confirm-type: CORRELATED  #发布确认模式，消息是否被成功发送到交换机
-    publisher-returns: true
-    listener:
-      simple:
-        prefetch: 1
-        concurrency: 3
-        acknowledge-mode: manual   #消费端手动确认
-
-  redis:
-    host: 82.157.68.223
-    port: 6379
-    database: 0
-    timeout: 1800000
-    password:
-    lettuce:
-      pool:
-        max-active: 20 #最大连接数
-        max-wait: -1    #最大阻塞等待时间(负数表示没限制)
-        max-idle: 5    #最大空闲
-        min-idle: 0     #最小空闲

guigu-ssyx-parent/service/service-search/src/main/resources/application.yml

@@ -1,8 +1,8 @@
+server:
+  port: 8204
 spring:
   application:
     name: service-search
-  profiles:
-    active: dev
   cloud:
     nacos:
       discovery:

guigu-ssyx-parent/service/service-search/src/main/resources/bootstrap.yml

@@ -0,0 +1,31 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        namespace: dd5265c5-8290-45bc-9d07-395c14c977d3
+        server-addr: 82.157.68.223:8848
+        group: service
+        username: nacos
+        password: nacos
+        enabled: true
+        file-extension: yml
+        extension-configs:
+          - data-id: common.yml
+            group: common
+            refresh: true
+          - data-id: service-redis.yml
+            group: common
+            refresh: true
+          - data-id: service-rabbitmq.yml
+            group: common
+            refresh: true
+          - data-id: config-rabbitmq.yml
+            group: config
+            refresh: true
+          - data-id: service-openfeign.yml
+            group: common
+            refresh: true
+          - data-id: service-elasticsearch.yml
+            group: common
+            refresh: true
+

guigu-ssyx-parent/service/service-sys/src/main/resources/application-dev.yml

@@ -1,30 +0,0 @@
-server:
-  port: 8202
-
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-
-spring:
-  datasource:
-    type: com.zaxxer.hikari.HikariDataSource
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://82.157.68.223:3306/shequ-sys?characterEncoding=utf-8&useSSL=false
-    username: shequ-sys
-    password: shequ-sys
-  redis:
-    host: 82.157.68.223
-    port: 6379
-    database: 0
-    timeout: 1800000
-    password:
-    lettuce:
-      pool:
-        max-active: 20 #最大连接数
-        max-wait: -1    #最大阻塞等待时间(负数表示没限制)
-        max-idle: 5    #最大空闲
-        min-idle: 0     #最小空闲
-  jackson:
-    date-format: yyyy-MM-dd HH:mm:ss
-    time-zone: GMT+8
-

guigu-ssyx-parent/service/service-sys/src/main/resources/application.yml

@@ -1,8 +1,8 @@
+server:
+  port: 8202
 spring:
   application:
     name: service-sys
-  profiles:
-    active: dev
   cloud:
     nacos:
       discovery:

guigu-ssyx-parent/service/service-sys/src/main/resources/bootstrap.yml

@@ -0,0 +1,18 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        namespace: dd5265c5-8290-45bc-9d07-395c14c977d3
+        server-addr: 82.157.68.223:8848
+        group: service
+        username: nacos
+        password: nacos
+        enabled: true
+        file-extension: yml
+        extension-configs:
+          - data-id: common.yml
+            group: common
+            refresh: true
+          - data-id: service-redis.yml
+            group: common
+            refresh: true

guigu-ssyx-parent/service/service-user/src/main/resources/application-dev.yml

@@ -1,36 +0,0 @@
-server:
-  port: 8206
-
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-  type-enums-package: com.atguigu.ssyx.enums
-
-spring:
-  datasource:
-    type: com.zaxxer.hikari.HikariDataSource
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://82.157.68.223:3306/shequ-user?characterEncoding=utf-8&useSSL=false
-    username: shequ-user
-    password: shequ-user
-  jackson:
-    date-format: yyyy-MM-dd HH:mm:ss
-    time-zone: GMT+8
-  redis:
-    host: 82.157.68.223
-    port: 6379
-    database: 0
-    timeout: 1800000
-    password:
-    lettuce:
-      pool:
-        max-active: 20 #最大连接数
-        max-wait: -1    #最大阻塞等待时间(负数表示没限制)
-        max-idle: 5    #最大空闲
-        min-idle: 0     #最小空闲
-wx:
-  open:
-    # 小程序微信公众平台appId
-    app_id: wx2edefe049c6a37b9
-    # 小程序微信公众平台api秘钥
-    app_secret: 1cb2b7aec97a28f0cdf4b74defa1792a

guigu-ssyx-parent/service/service-user/src/main/resources/application.yml

@@ -1,8 +1,8 @@
+server:
+  port: 8206
 spring:
   application:
     name: service-user
-  profiles:
-    active: dev
   cloud:
     nacos:
       discovery:

guigu-ssyx-parent/service/service-user/src/main/resources/bootstrap.yml

@@ -0,0 +1,21 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        namespace: dd5265c5-8290-45bc-9d07-395c14c977d3
+        server-addr: 82.157.68.223:8848
+        group: service
+        username: nacos
+        password: nacos
+        enabled: true
+        file-extension: yml
+        extension-configs:
+          - data-id: common.yml
+            group: common
+            refresh: true
+          - data-id: service-redis.yml
+            group: common
+            refresh: true
+          - data-id: config-wx.yml
+            group: config
+            refresh: true

ssyx-admin/src/views/login/index.vue

@@ -10,7 +10,7 @@
     >
 
       <div class="title-container">
-        <h3 class="title">尚上优选平台管理端</h3>
+        <h3 class="title">购物商城管理端</h3>
       </div>
 
       <el-form-item prop="username">
@@ -66,7 +66,7 @@
 </template>
 
 <script>
-import { validUsername } from '@/utils/validate'
+import {validUsername} from '@/utils/validate'
 
 export default {
   name: 'Login',