Commit 437f453b authored by 赵啸非's avatar 赵啸非

测试~~~~~~~~~~~

parent 74d6c09e
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<id>test</id> <id>test</id>
<properties> <properties>
<profiles.active>test</profiles.active> <profiles.active>test</profiles.active>
<profiles.server.debug>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=6514</profiles.server.debug> <profiles.server.debug>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=6515</profiles.server.debug>
<profiles.nacos.server-addr>192.168.0.252:8848</profiles.nacos.server-addr> <profiles.nacos.server-addr>192.168.0.252:8848</profiles.nacos.server-addr>
<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group> <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace> <profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
......
...@@ -45,7 +45,7 @@ public class LicenseServiceImpl extends AbstractCRUDServiceImpl<LicenseDao, Lice ...@@ -45,7 +45,7 @@ public class LicenseServiceImpl extends AbstractCRUDServiceImpl<LicenseDao, Lice
if(between <= 0){ if(between <= 0){
throw new AppException("开始时间必须小于结束时间"); throw new AppException("开始时间必须小于结束时间");
} }
entity.setLicenseCode(String.format("mac=%s&ip=%s",entity.getMac(),entity.getIp())); entity.setLicenseCode(String.format("mac=%s|ip=%s",entity.getMac(),entity.getIp()));
//存放文件 xxx/ //存放文件 xxx/
if (!ObjectUtils.isEmpty(entity.getLicenseCode())) { if (!ObjectUtils.isEmpty(entity.getLicenseCode())) {
String pubPath = uploadService.getFilePath(entity.getLicenseCode() + "/license.pub"); String pubPath = uploadService.getFilePath(entity.getLicenseCode() + "/license.pub");
...@@ -61,7 +61,7 @@ public class LicenseServiceImpl extends AbstractCRUDServiceImpl<LicenseDao, Lice ...@@ -61,7 +61,7 @@ public class LicenseServiceImpl extends AbstractCRUDServiceImpl<LicenseDao, Lice
@Override @Override
protected void updateBefore(LicenseEntity entity, Context context) throws AppException { protected void updateBefore(LicenseEntity entity, Context context) throws AppException {
entity.setLicenseCode(String.format("mac=%s&ip=%s",entity.getMac(),entity.getIp())); entity.setLicenseCode(String.format("mac=%s|ip=%s",entity.getMac(),entity.getIp()));
super.updateBefore(entity, context); super.updateBefore(entity, context);
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment