4 İşlemeler 548d66e9c5 ... 07d2b3c395

Yazar SHA1 Mesaj Tarih
  EDZ 07d2b3c395 Merge branch 'master' of http://web.jzdsh.com:3000/jzdsh/auto 4 yıl önce
  EDZ 3349b87680 Merge remote-tracking branch 'origin/master' 4 yıl önce
  EDZ 56379ce6b4 2020/3/23 4 yıl önce
  EDZ 9dda8fa3a3 2020/3/23 4 yıl önce

+ 2 - 2
code/auto/app/src/main/java/com/jzdsh/auto/app/AdminRoutes.java

@@ -8,11 +8,11 @@ import com.jzdsh.auto.app.interceptor.PjaxInterceptor;
 public class AdminRoutes extends Routes {
     @Override
     public void config() {
-/*        setBaseViewPath("/_view/_admin");
+        /*setBaseViewPath("/_view/_admin");
 
         addInterceptor(new PjaxInterceptor());
         addInterceptor(new AdminAuthInterceptor());*/
 
-        add("/admin", AdminIndexController.class,"indexsssssss");
+        add("/admin", AdminIndexController.class,"index");
     }
 }

+ 9 - 3
code/auto/app/src/main/java/com/jzdsh/auto/app/JFConfig.java

@@ -9,6 +9,8 @@ import com.jfinal.kit.PropKit;
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
 import com.jfinal.plugin.druid.DruidPlugin;
 import com.jfinal.plugin.ehcache.EhCachePlugin;
+import com.jfinal.render.Render;
+import com.jfinal.render.ViewType;
 import com.jfinal.server.undertow.UndertowServer;
 import com.jfinal.template.Engine;
 import com.jzdsh.auto.app.common.DruidKit;
@@ -68,7 +70,7 @@ public class JFConfig extends JFinalConfig{
     @Override
     public void configRoute(Routes me) {
         me.add(new FrontRoutes());
-        //me.add(new AdminRoutes());
+        me.add(new AdminRoutes());
     }
 
     /**
@@ -79,7 +81,11 @@ public class JFConfig extends JFinalConfig{
         me.setDevMode(p.getBoolean("engineDevMode", false));
 
         // 配置用于主菜单的 URL,导航到 https://jfinal.com
-        me.addSharedObject("SSL", p.get("SSL"));
+        //me.addSharedObject("SSL", p.get("SSL"));
+
+        me.addSharedFunction("/src/main/webapp/common/__admin_layout.html");
+        me.addSharedFunction("/src/main/webapp/common/_admin_paginate.html");
+        me.addSharedFunction("/src/main/webapp/common/_menu.html");
     }
 
     /**
@@ -122,7 +128,7 @@ public class JFConfig extends JFinalConfig{
     @Override
     public void configInterceptor(Interceptors me) {
 
-       // me.add(new LoginSessionInterceptor());
+        //me.add(new LoginSessionInterceptor());
     }
 
     @Override