|
@@ -72,6 +72,9 @@ public class AuthInfoServiceImpl implements AuthInfoService {
|
|
|
@Resource
|
|
|
DictionaryConfig dictionaryConfig;
|
|
|
|
|
|
+ @Resource
|
|
|
+ AuthInfoService authInfoService;
|
|
|
+
|
|
|
/**
|
|
|
* 授权信息初始化
|
|
|
*
|
|
@@ -87,10 +90,10 @@ public class AuthInfoServiceImpl implements AuthInfoService {
|
|
|
&& !Objects.equals(solarProperties.getAccessKey().trim(), "")
|
|
|
&& Objects.nonNull(solarProperties.getAccessSecret())
|
|
|
&& !Objects.equals(solarProperties.getAccessSecret().trim(), "")) {//在线激活
|
|
|
- saveAuthInfo(appInfo, AuthEnum.ON_LINE, null);
|
|
|
+ authInfoService.saveAuthInfo(appInfo, AuthEnum.ON_LINE, null);
|
|
|
} else if (Objects.nonNull(solarProperties.getLicense())
|
|
|
&& !Objects.equals(solarProperties.getLicense().trim(), "")) {//离线激活
|
|
|
- saveAuthInfo(appInfo, AuthEnum.OFF_LINE, null);
|
|
|
+ authInfoService.saveAuthInfo(appInfo, AuthEnum.OFF_LINE, null);
|
|
|
}
|
|
|
} else {
|
|
|
QueryWrapper<TSAuth> tsAuthQueryWrapper = new QueryWrapper<>();
|
|
@@ -100,7 +103,7 @@ public class AuthInfoServiceImpl implements AuthInfoService {
|
|
|
for (TSAuth t : tsAuthList) {
|
|
|
appInfo = solarService.update(t.getFile());
|
|
|
log.info("appInfo:{}", JacksonUtil.parseJson(appInfo));
|
|
|
- saveAuthInfo(appInfo, AuthEnum.OFF_LINE, t.getFile());
|
|
|
+ authInfoService.saveAuthInfo(appInfo, AuthEnum.OFF_LINE, t.getFile());
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -137,7 +140,7 @@ public class AuthInfoServiceImpl implements AuthInfoService {
|
|
|
if (Objects.isNull(appInfo)) {
|
|
|
throw ExceptionResultEnum.ERROR.exception("激活失败");
|
|
|
}
|
|
|
- saveAuthInfo(appInfo, AuthEnum.OFF_LINE, licenseData);
|
|
|
+ authInfoService.saveAuthInfo(appInfo, AuthEnum.OFF_LINE, licenseData);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -160,6 +163,7 @@ public class AuthInfoServiceImpl implements AuthInfoService {
|
|
|
* @param appInfo
|
|
|
* @param authEnum
|
|
|
*/
|
|
|
+ @Override
|
|
|
@Transactional
|
|
|
public void saveAuthInfo(AppInfo appInfo, AuthEnum authEnum, byte[] file) throws Exception {
|
|
|
List<OrgInfo> orgInfoList = solarService.getOrgList();
|