合并sso分支

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: open.com
+
+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/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();