合并sso分支

lms/nladmin-system/src/main/resources/config/application-dev.yml

@@ -6,11 +6,11 @@ spring:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:lzhl_one_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:lz_lms_sso}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
       #      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:nladmin}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
       #      username: ${DB_USER:root}
       username: ${DB_USER:root}
-      password: ${DB_PWD:P@ssw0rd}
+      password: ${DB_PWD:Root.123456}
       #      password: ${DB_PWD:12356}
       # 初始连接数
       initial-size: 5
@@ -53,12 +53,12 @@ spring:
         wall:
           config:
             multi-statement-allow: true
-redis:
-  #数据库索引
-  database: ${REDIS_DB:15}
-  host: ${REDIS_HOST:127.0.0.1}
-  port: ${REDIS_PORT:6379}
-  password: ${REDIS_PWD:}
+  redis:
+    #数据库索引
+    database: ${REDIS_DB:1}
+    host: ${REDIS_HOST:47.96.133.178}
+    port: ${REDIS_PORT:6479}
+    password: ${REDIS_PWD:942464Yy}
 
 # 登录相关配置
 login:
@@ -150,8 +150,8 @@ sa-token:
   is-log: false
   jwt-secret-key: opsjajisdnnca0sdkksdfaaasdfwwq
   # token 前缀
-  token-prefix: Bearer
+  token-prefix:
 
 loki:
   url: http://localhost:3100/loki/api/v1
-  systemName: lms
+  systemName: lms

lms/nladmin-system/src/main/resources/config/application.yml

@@ -96,7 +96,7 @@ sa-token:
   token-prefix:
   cookie:
     # 配置 Cookie 作用域
-    domain: open.com
+    domain: localhost
 
 mybatis-plus:
   configuration: