修改获取resources路径

src/main/java/com/archser/aserver/common/config/MainConfig.java

@@ -24,6 +24,7 @@ import com.jfinal.render.ViewType;
 import com.jfinal.server.undertow.UndertowServer;
 import com.jfinal.server.undertow.WebBuilder;
 import com.jfinal.template.Engine;
+import java.io.File;
 
 public class MainConfig extends JFinalConfig {
   
@@ -107,10 +108,33 @@ public class MainConfig extends JFinalConfig {
     if (p == null) {
       p = PropKit.use("AppConfig.properties").appendIfExists("AppConfig-pro.properties");
 //      p = PropKit.use("config.properties");
+      ConfirmMiddlewareType(p);
     }
   }
 
   /**
+   * @Description: 确认中间件类型获取打包后的resource
+   * @authorAndDate: ChengYaqing create on 2021/1/14 9:23
+   * @return void
+   */
+  public static void ConfirmMiddlewareType(Prop p) {
+    String basePath;
+    String middlewareType = p.get("MiddlewareType") == null ? "" : p.get("MiddlewareType");
+    switch (middlewareType) {
+      case "zhongchuang":
+      case "dongfangtong":
+      case "baolande":
+      case "jindie":
+        basePath = PathKit.getWebRootPath() + File.separator + "WEB-INF" + File.separator + "classes" + File.separator;
+        break;
+      default:
+        basePath = PathKit.getRootClassPath() + File.separator;
+        break;
+    }
+    p.getProperties().put("resourcesPath", basePath);
+  }
+
+  /**
    * 获取数据库插件 抽取成独立的方法，便于重用该方法，减少代码冗余
    */
   public static DruidPlugin getDruidPlugin() {

src/main/java/com/archser/aserver/controller/SettingController.java

 package com.archser.aserver.controller;
 
+import com.jfinal.kit.PropKit;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.Arrays;
 import java.util.List;
-import java.util.Objects;
 import com.archser.aserver.interceptor.JwtInterceptor;
 import com.archser.aserver.model.Config;
 import com.archser.aserver.service.LogService;
@@ -18,7 +17,6 @@ import com.jfinal.aop.Before;
 import com.jfinal.aop.Clear;
 import com.jfinal.aop.Inject;
 import com.jfinal.core.Controller;
-import com.jfinal.kit.PathKit;
 import com.jfinal.kit.Ret;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.tx.Tx;
@@ -38,6 +36,8 @@ public class SettingController extends Controller {
   @Inject
   private LogService logService;
 
+  private static final String resources = PropKit.get("resourcesPath");
+
   /**
    * 通用的获取配置方法
    * 
@@ -120,8 +120,7 @@ public class SettingController extends Controller {
    * 常用配置项
    */
   public void logoUrl() {
-    String filePath =
-        PathKit.getRootClassPath()+ File.separator + "logo.png";
+    String filePath = resources + "logo.png";
     /**chenyong 20201218 文件不存在时，就不显示图标**/
     File file=new File(filePath);
     if(file.exists()) {
@@ -255,8 +254,7 @@ public class SettingController extends Controller {
     String logoUrl = ImageToBase64(uploadPath);
     
     //图标路径
-    String filePath =
-        PathKit.getRootClassPath()+ File.separator + "logo.png";
+    String filePath = resources + "logo.png";
     // 对字节数组字符串进行Base64解码并生成图片
     boolean success = Base64ToImange(logoUrl,filePath);
     new File(uploadPath).delete();

src/main/java/com/archser/aserver/service/SnService.java

@@ -17,7 +17,7 @@ public class SnService {
 
 
   static {
-    FILE_PATH =  PathKit.getRootClassPath() + File.separator + "SN.properties";
+    FILE_PATH =  PropKit.get("resourcesPath") + "SN.properties";
   }
 
 

src/main/resources/AppConfig-pro.properties

@@ -10,6 +10,9 @@ jdbc.driver=dm.jdbc.driver.DmDriver
 jdbc.username=ARCHSER_TEST
 jdbc.password=archser_test
 
+#中间件类型 汉语拼音 zhongchaung、dongfangtong、baolande、jindie、dev
+MiddlewareType=dev
+
 # redis\u914D\u7F6E
 redis.url=39.104.21.218
 redis.password=archser_redis

src/main/resources/AppConfig.properties

@@ -10,6 +10,9 @@ jdbc.driver=dm.jdbc.driver.DmDriver
 jdbc.username=ARCHSER_TEST
 jdbc.password=archser_test
 
+#中间件类型 汉语拼音 zhongchaung、dongfangtong、baolande、jindie、dev
+MiddlewareType=dev
+
 # redis\u914D\u7F6E
 redis.url=39.104.21.218
 redis.password=archser_redis