Merge branch 'V20230915' of http://192.168.60.201/root/dsk-operate-sys into V20230915

dsk-admin/src/main/resources/application-dev.yml

@@ -196,3 +196,9 @@ dsk:
 #    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
 #    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
 #    protocol: https
+
+sa-token:
+  # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)
+  is-concurrent: true
+  # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token)
+  is-share: true
\ No newline at end of file

dsk-admin/src/main/resources/application-test.yml

@@ -196,3 +196,8 @@ dsk:
 #    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
 #    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
 #    protocol: https
+sa-token:
+  # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)
+  is-concurrent: true
+  # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token)
+  is-share: true
\ No newline at end of file

dsk-system/src/main/java/com/dsk/system/service/impl/SysConfigServiceImpl.java

@@ -245,7 +245,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
         dskAccessTokenDto.put("appSecret",appSecret);
 
         String post = HttpUtil.post(domain + accessTokenAPI, JsonUtils.toJsonString(dskAccessTokenDto));
-        Assert.notEmpty(dskName,"大司空数据accessTokenAPI响应异常");
+        Assert.notEmpty(post,"大司空数据accessTokenAPI响应异常");
         log.info("大司空数据accessToken API响应:"+post);
         Dict dict = JsonUtils.parseMap(post);
         Object dataObj = dict.getObj("data");