Merge branch 'feature/sso-server-merge-1228' of http://121.40.234.130:8899/root/lanzhouhailiang_one into master_test

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,11 @@ sa-token:
   is-log: false
   jwt-secret-key: opsjajisdnnca0sdkksdfaaasdfwwq
   # token 前缀
-  token-prefix: Bearer
+  token-prefix:
+  cookie:
+    # 配置 Cookie 作用域:根据二级域名实现sso登入如lms.sso.com;acs.sso.com
+    domain:
 
 loki:
   url: http://localhost:3100/loki/api/v1
-  systemName: lms
+  systemName: lms

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

@@ -93,4 +93,19 @@ sa-token:
   #  是否在初始化配置时打印版本字符画
   is-print: false
   # token 前缀
-  token-prefix: Bearer
+  token-prefix:
+  cookie:
+    # 配置 Cookie 作用域
+    domain:
+
+mybatis-plus:
+  configuration:
+    map-underscore-to-camel-case: true
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  mapper-locations:
+    - classpath:org.nl.**.mapper/*.xml
+  global-config:
+    db-config:
+      id-type: INPUT
+
+

lms/nladmin-system/src/main/resources/logback-spring.xml

@@ -83,7 +83,7 @@ https://juejin.cn/post/6844903775631572999
         <root level="debug">
             <appender-ref ref="CONSOLE"/>
             <appender-ref ref="asyncFileAppender"/>
-            <appender-ref ref="lokiAppender" />
+<!--            <appender-ref ref="lokiAppender" />-->
         </root>
         <logger name="org.springframework" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>

lms/nladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl

@@ -14,7 +14,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import org.nl.modules.common.utils.SecurityUtils;
+import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.wql.core.bean.ResultBean;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
@@ -70,7 +70,7 @@ public List<${className}Dto> queryAll(Map whereJson){
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void create(${className}Dto dto) {
-    Long currentUserId = SecurityUtils.getCurrentUserId();
+    String currentUserId = SecurityUtils.getCurrentUserId();
     String nickName = SecurityUtils.getCurrentNickName();
     String now = DateUtil.now();
 
@@ -93,7 +93,7 @@ public List<${className}Dto> queryAll(Map whereJson){
     ${className}Dto entity = this.findById(dto.get${pkChangeColName ? cap_first }());
     if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!");
 
-    Long currentUserId = SecurityUtils.getCurrentUserId();
+    String currentUserId = SecurityUtils.getCurrentUserId();
     String nickName = SecurityUtils.getCurrentNickName();
 
     String now = DateUtil.now();
@@ -109,7 +109,7 @@ public List<${className}Dto> queryAll(Map whereJson){
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void deleteAll(${pkColumnType}[] ids) {
-    Long currentUserId = SecurityUtils.getCurrentUserId();
+    String currentUserId = SecurityUtils.getCurrentUserId();
     String nickName = SecurityUtils.getCurrentNickName();
     String now = DateUtil.now();