fix some package errors

CodeIsBeatiful · Dec 21, 2020 · 54e8cdc · 54e8cdc
1 parent 6bad012
commit 54e8cdc
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/application/pom.xml b/application/pom.xml
@@ -81,7 +81,6 @@
  </dependency>
  </dependencies>
  <build>
- <finalName>${pkg.name}-${project.version}</finalName>
  <plugins>
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>

diff --git a/application/src/bin/restart.sh b/application/src/bin/restart.sh
@@ -1,11 +1,15 @@
 #!/bin/sh
 
 # project name
-APPLICATION="@project.artifactId@"
+APPLICATION="@pkg.name@"
 
 # java file name
 APPLICATION_JAR="@[email protected]"
 
+# bin directory absolute path
+cd `dirname $0`
+cd ..
+
 # stop app
 echo stop ${APPLICATION} Application...
 sh shutdown.sh

diff --git a/application/src/bin/shutdown.sh b/application/src/bin/shutdown.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # project name
-APPLICATION="@project.artifactId@"
+APPLICATION="@pkg.name@"
 
 # jar file name
 APPLICATION_JAR="@[email protected]"

diff --git a/application/src/bin/startup.sh b/application/src/bin/startup.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # project name
-APPLICATION="@project.artifactId@"
+APPLICATION="@pkg.name@"
 
 # java file name
 APPLICATION_JAR="@[email protected]"

diff --git a/application/src/main/java/com/softwarelab/application/service/impl/AppSourceServiceImpl.java b/application/src/main/java/com/softwarelab/application/service/impl/AppSourceServiceImpl.java
@@ -56,6 +56,8 @@ public class AppSourceServiceImpl extends ServiceImpl<AppSourceMapper, AppSource
 
  private int ignoreDepth = 1;
 
+ private static final String APP_SOURCE_ID = "00000000-0000-0000-0000-000000000000";
+
  @Autowired
  private RestTemplate restTemplate;
 
@@ -117,9 +119,11 @@ public boolean load(MultipartFile file) {
  @Transactional
  public boolean loadToDb(){
  try {
- AppSource appSource = list().get(0);
- appSource.setStatus(DbConst.APP_SOURCE_RELOAD);
- appSourceService.updateById(appSource);
+ AppSource appSource = getById(APP_SOURCE_ID);
+ if(appSource != null) {
+ appSource.setStatus(DbConst.APP_SOURCE_RELOAD);
+ appSourceService.updateById(appSource);
+ }
  LocalDateTime now = LocalDateTime.now();
  File appsFile = new File(appsDir);
  String[] fileNames = appsFile.list();
@@ -168,7 +172,7 @@ public boolean loadToDb(){
 
  }
  appSourceService.saveOrUpdate(AppSource.builder()
- .id("00000000-0000-0000-0000-000000000000")
+ .id(APP_SOURCE_ID)
  //set true version
  .version(new String(versionContext, StandardCharsets.UTF_8))
  .repository(null)