升级Spring Cloud Hoxton & Alibaba，认证授权改用Oauth2。

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

@@ -1,5 +1,5 @@
 server:
-  port: 8180
+  port: 8080
 spring:
   datasource:
     url: jdbc:mysql://localhost:3306/mall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
@@ -14,6 +14,12 @@ spring:
       stat-view-servlet: #访问监控网页的登录用户名和密码
         login-username: druid
         login-password: druid
+  redis:
+    host: localhost # Redis服务器地址
+    database: 0 # Redis数据库索引（默认为0）
+    port: 6379 # Redis服务器连接端口
+    password:  # Redis服务器连接密码（默认为空）
+    timeout: 3000ms # 连接超时时间（毫秒）
   rabbitmq: #rabbitmq相关配置
     host: localhost
     port: 5672
@@ -35,30 +41,12 @@ management: #开启SpringBoot Admin的监控
   endpoint:
     health:
       show-details: always
-jwt:
-  tokenHeader: Authorization #JWT存储的请求头
-  secret: mall-admin-secret #JWT加解密使用的密钥
-  expiration: 604800 #JWT的超期限时间(60*60*24)
-  tokenHead: Bearer  #JWT负载中拿到开头
-secure:
-  ignored:
-    urls: #安全路径白名单
-      - /swagger-ui.html
-      - /swagger-resources/**
-      - /swagger/**
-      - /**/v2/api-docs
-      - /**/*.js
-      - /**/*.css
-      - /**/*.png
-      - /**/*.ico
-      - /webjars/springfox-swagger-ui/**
-      - /actuator/**
-      - /druid/**
-      - /admin/login
-      - /admin/register
-      - /admin/info
-      - /admin/logout
-      - /minio/upload
+redis:
+  database: mall
+  key:
+    admin: 'ums:admin'
+  expire:
+    common: 86400 # 24小时
 aliyun:
   oss:
     endpoint: oss-cn-shenzhen.aliyuncs.com # oss对外服务的访问域名
@@ -75,4 +63,10 @@ minio:
   endpoint: http://192.168.6.132:9090 #MinIO服务所在地址
   bucketName: mall #存储桶名称
   accessKey: minioadmin #访问的key
-  secretKey: minioadmin #访问的秘钥
+  secretKey: minioadmin #访问的秘钥
+feign:
+  okhttp:
+    enabled: true
+ribbon:
+  ConnectTimeout: 3000 #服务请求连接超时时间（毫秒）
+  ReadTimeout: 3000 #服务请求处理超时时间（毫秒）

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

@@ -1,13 +1,8 @@
 spring:
   cloud:
-    config:
-      profile: dev #启用环境名称
-      label: master #分支名称
-      name: admin #配置文件名称
+    nacos:
       discovery:
-        enabled: true
-        service-id: mall-config
-eureka:
-  client:
-    service-url:
-      defaultZone: http://localhost:8001/eureka/
+        server-addr: http://localhost:8848
+      config:
+        server-addr: http://localhost:8848
+        file-extension: yaml

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

@@ -1,15 +1,8 @@
 spring:
   cloud:
-    config:
-      profile: prod #启用环境名称
-      label: master #分支名称
-      name: admin #配置文件名称
+    nacos:
       discovery:
-        enabled: true
-        service-id: mall-config
-eureka:
-  client:
-    service-url:
-      defaultZone: http://mall-registry:8001/eureka/
-  instance:
-    prefer-ip-address: true
+        server-addr: http://nacos-registry:8848
+      config:
+        server-addr: http://nacos-registry:8848
+        file-extension: yaml

mall-admin/src/main/resources/dao/UmsAdminRoleRelationDao.xml

@@ -71,4 +71,12 @@
         GROUP BY
             ur.id
     </select>
+    <select id="getAdminIdList" resultType="java.lang.Long">
+        SELECT
+            DISTINCT ar.admin_id
+        FROM
+            ums_role_resource_relation rr
+                LEFT JOIN ums_admin_role_relation ar ON rr.role_id = ar.role_id
+        WHERE rr.resource_id=#{resourceId}
+    </select>
 </mapper>

mall-admin/src/main/resources/logback-spring.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE configuration>
-<configuration>
-    <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
-    <include resource="org/springframework/boot/logging/logback/console-appender.xml"/>
-    <!--应用名称-->
-    <property name="APP_NAME" value="mall-admin"/>
-    <!--日志文件保存路径-->
-    <property name="LOG_FILE_PATH" value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/logs}"/>
-    <contextName>${APP_NAME}</contextName>
-    <!--每天记录日志到文件appender-->
-    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_FILE_PATH}/${APP_NAME}-%d{yyyy-MM-dd}.log</fileNamePattern>
-            <maxHistory>30</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${FILE_LOG_PATTERN}</pattern>
-        </encoder>
-    </appender>
-    <!--输出到logstash的appender-->
-    <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-        <destination>localhost:4560</destination>
-        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder"/>
-    </appender>
-    <root level="INFO">
-        <appender-ref ref="CONSOLE"/>
-        <appender-ref ref="FILE"/>
-        <!--使用logstash时打开-->
-        <appender-ref ref="LOGSTASH"/>
-    </root>
-</configuration>