代码重构

src/main/java/com/lsw/commons/generator/CodeGenerator.java

@@ -1,58 +0,0 @@
-package com.lsw.commons.generator;
-
-import javax.sql.DataSource;
-
-import com.jfinal.kit.PathKit;
-import com.jfinal.kit.PropKit;
-import com.jfinal.plugin.activerecord.generator.Generator;
-import com.jfinal.plugin.druid.DruidPlugin;
-import com.lsw.Application;
-
-/**
- * 在数据库表有任何变动时，运行一下 main 方法，极速响应变化进行代码重构
- */
-public class CodeGenerator {
-    //是否是手动代码生成
-	public static boolean CodeGeneration=false;
-	static  String baseModelOutputDir;
-	public static DataSource getDataSource() {
-		PropKit.use("conf/jdbc_config.properties");
-		DruidPlugin druidPlugin = Application.createDruidPlugin();
-		druidPlugin.start();
-		return druidPlugin.getDataSource();
-	}
-
-	public static void main(String[] args) {
-		// base model 所使用的包名
-		String baseModelPackageName = "com.lsw.model.base";
-		// base model 文件保存路径
-		if(CodeGeneration){
-			baseModelOutputDir =System.getProperty("user.dir")+ "/src/main/java/com/lsw/model/base";
-		}else{
-			baseModelOutputDir = PathKit.getWebRootPath() + "/src/main/java/com/lsw/model/base";
-		}
-
-		// model 所使用的包名 (MappingKit 默认使用的包名)
-		String modelPackageName = "com.lsw.model";
-		// model 文件保存路径 (MappingKit 与 DataDictionary 文件默认保存路径)
-		String modelOutputDir = baseModelOutputDir + "/..";
-
-		// 创建生成器
-		Generator gernerator = new Generator(getDataSource(), baseModelPackageName, baseModelOutputDir,
-				modelPackageName, modelOutputDir);
-
-		// 添加不需要生成的表名
-		 gernerator.addExcludedTable("tb_session");
-		// 设置是否在 Model 中生成 dao 对象
-		gernerator.setGenerateDaoInModel(true);
-		// 设置是否生成链式 setter 方法
-		//gernerator.setGenerateChainSetter(true);
-		// 设置是否生成字典文件
-		gernerator.setGenerateDataDictionary(false);
-		// 设置需要被移除的表名前缀用于生成modelName。例如表名 "osc_user"，移除前缀 "osc_"后生成的model名为
-		// "User"而非 OscUser
-		gernerator.setRemovedTableNamePrefixes("sys_","tb_");
-		// 生成
-		gernerator.generate();
-	}
-}

src/main/java/com/lsw/commons/generator/GeneratorSystemModel.java

@@ -0,0 +1,80 @@
+package com.lsw.commons.generator;
+
+import com.jfinal.kit.PathKit;
+import com.jfinal.kit.PropKit;
+import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
+import com.jfinal.plugin.activerecord.Db;
+import com.jfinal.plugin.activerecord.Record;
+import com.jfinal.plugin.activerecord.dialect.MysqlDialect;
+import com.jfinal.plugin.activerecord.generator.Generator;
+import com.jfinal.plugin.druid.DruidPlugin;
+import com.lsw.Application;
+import com.lsw.model._MappingKit;
+
+import javax.sql.DataSource;
+import java.util.List;
+
+/**
+ * 生成系统model,一般情况不用动
+ * 在数据库表有任何变动时，运行一下 main 方法，极速响应变化进行代码重构
+ */
+public class GeneratorSystemModel {
+    //是否是手动代码生成
+    public static boolean CodeGeneration = false;
+    static String baseModelOutputDir;
+
+    public static DataSource getDataSource() {
+        PropKit.use("conf/jdbc_config.properties");
+        DruidPlugin druidPlugin = Application.createDruidPlugin();
+        druidPlugin.start();
+        return druidPlugin.getDataSource();
+    }
+
+    public static void main(String[] args) {
+// base model 所使用的包名
+        String baseModelPackageName = "com.lsw.model.system.base";
+        // base model 文件保存路径
+        if (CodeGeneration) {
+            baseModelOutputDir = System.getProperty("user.dir") + "/src/main/java/com/lsw/model/system/base";
+        } else {
+            baseModelOutputDir = PathKit.getWebRootPath() + "/src/main/java/com/lsw/model/system/base";
+        }
+        // model 所使用的包名 (MappingKit 默认使用的包名)
+        String modelPackageName = "com.lsw.model.system";
+        // model 文件保存路径 (MappingKit 与 DataDictionary 文件默认保存路径)
+        String modelOutputDir = baseModelOutputDir + "/..";
+        // 创建生成器
+        Generator gernerator = new Generator(getDataSource(), baseModelPackageName, baseModelOutputDir,
+                modelPackageName, modelOutputDir);
+
+        initData();
+        // 添加不需要生成的表名
+        String sql = "select TABLE_NAME from information_schema.TABLES where table_schema=?";
+        List<Record> list = Db.find(sql, PropKit.get("databaseName", "djfp"));
+        for (Record table : list) {
+            if (table.getStr("TABLE_NAME").contains("tb_")) {
+                gernerator.addExcludedTable(table.getStr("TABLE_NAME"));
+            }
+        }
+        // 设置是否在 Model 中生成 dao 对象
+        gernerator.setGenerateDaoInModel(true);
+        // 设置是否生成链式 setter 方法
+        //gernerator.setGenerateChainSetter(true);
+        // 设置是否生成字典文件
+        gernerator.setGenerateDataDictionary(false);
+        // 设置需要被移除的表名前缀用于生成modelName。例如表名 "osc_user"，移除前缀 "osc_"后生成的model名为
+        // "User"而非 OscUser
+        gernerator.setRemovedTableNamePrefixes("sys_");
+        // 生成
+        gernerator.generate();
+
+
+    }
+
+    public static void initData() {
+        ActiveRecordPlugin activeRecord = new ActiveRecordPlugin(getDataSource());
+        activeRecord.setDialect(new MysqlDialect()).setDevMode(true).setShowSql(true);
+        _MappingKit.mapping(activeRecord);
+        activeRecord.start();
+    }
+}

src/main/java/com/lsw/commons/generator/GeneratorWorkModel.java

@@ -0,0 +1,80 @@
+package com.lsw.commons.generator;
+
+import com.jfinal.kit.PathKit;
+import com.jfinal.kit.PropKit;
+import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
+import com.jfinal.plugin.activerecord.Db;
+import com.jfinal.plugin.activerecord.Record;
+import com.jfinal.plugin.activerecord.dialect.MysqlDialect;
+import com.jfinal.plugin.activerecord.generator.Generator;
+import com.jfinal.plugin.druid.DruidPlugin;
+import com.lsw.Application;
+import com.lsw.model._MappingKit;
+
+import javax.sql.DataSource;
+import java.util.List;
+
+/**
+ * 生成业务model
+ * 在数据库表有任何变动时，运行一下 main 方法，极速响应变化进行代码重构
+ */
+public class GeneratorWorkModel {
+    //是否是手动代码生成
+    public static boolean CodeGeneration = false;
+    static String baseModelOutputDir;
+
+    public static DataSource getDataSource() {
+        PropKit.use("conf/jdbc_config.properties");
+        DruidPlugin druidPlugin = Application.createDruidPlugin();
+        druidPlugin.start();
+        return druidPlugin.getDataSource();
+    }
+
+    public static void main(String[] args) {
+// base model 所使用的包名
+        String baseModelPackageName = "com.lsw.model.work.base";
+        // base model 文件保存路径
+        if (CodeGeneration) {
+            baseModelOutputDir = System.getProperty("user.dir") + "/src/main/java/com/lsw/model/work/base";
+        } else {
+            baseModelOutputDir = PathKit.getWebRootPath() + "/src/main/java/com/lsw/model/work/base";
+        }
+        // model 所使用的包名 (MappingKit 默认使用的包名)
+        String modelPackageName = "com.lsw.model.work";
+        // model 文件保存路径 (MappingKit 与 DataDictionary 文件默认保存路径)
+        String modelOutputDir = baseModelOutputDir + "/..";
+        // 创建生成器
+        Generator gernerator = new Generator(getDataSource(), baseModelPackageName, baseModelOutputDir,
+                modelPackageName, modelOutputDir);
+
+        initData();
+        // 添加不需要生成的表名
+        String sql = "select TABLE_NAME from information_schema.TABLES where table_schema=?";
+        List<Record> list = Db.find(sql, PropKit.get("databaseName", "djfp"));
+        for (Record table : list) {
+            if (table.getStr("TABLE_NAME").contains("sys_")) {
+                gernerator.addExcludedTable(table.getStr("TABLE_NAME"));
+            }
+        }
+        // 设置是否在 Model 中生成 dao 对象
+        gernerator.setGenerateDaoInModel(true);
+        // 设置是否生成链式 setter 方法
+        //gernerator.setGenerateChainSetter(true);
+        // 设置是否生成字典文件
+        gernerator.setGenerateDataDictionary(false);
+        // 设置需要被移除的表名前缀用于生成modelName。例如表名 "osc_user"，移除前缀 "osc_"后生成的model名为
+        // "User"而非 OscUser
+        gernerator.setRemovedTableNamePrefixes("tb_");
+        // 生成
+        gernerator.generate();
+
+
+    }
+
+    public static void initData() {
+        ActiveRecordPlugin activeRecord = new ActiveRecordPlugin(getDataSource());
+        activeRecord.setDialect(new MysqlDialect()).setDevMode(true).setShowSql(true);
+        _MappingKit.mapping(activeRecord);
+        activeRecord.start();
+    }
+}

src/main/java/com/lsw/controller/admin/system/department/DepartmentController.java

@@ -4,7 +4,7 @@ import com.jfinal.aop.Before;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Page;
 import com.lsw.base.BaseController;
-import com.lsw.model.Department;
+import com.lsw.model.system.Department;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 
 import java.util.List;

src/main/java/com/lsw/controller/admin/system/department/DepartmentService.java

@@ -3,7 +3,7 @@ package com.lsw.controller.admin.system.department;
 import com.jfinal.kit.Kv;
 import com.jfinal.plugin.activerecord.Page;
 import com.jfinal.plugin.activerecord.SqlPara;
-import com.lsw.model.Department;
+import com.lsw.model.system.Department;
 
 import java.util.List;
 
@@ -13,15 +13,6 @@ import java.util.List;
 public class DepartmentService {
     private static final Department dao = new Department().dao();
 
-    /**
-     * 查询菜单信息
-     *
-     * @param id 菜单id
-     * @return
-     */
-    /*public Menu selectById(int id) {
-        return dao.findFirst(dao.getSql("menu.selectById"), id);
-    }*/
 
     /**
      * 获取所有部门列表

src/main/java/com/lsw/controller/admin/system/file/FileController.java

@@ -9,8 +9,8 @@ import com.jfinal.plugin.activerecord.Page;
 import com.lsw.base.BaseController;
 import com.lsw.commons.utils.FileUtil;
 import com.lsw.controller.admin.system.log.operation.OlogService;
-import com.lsw.model.Department;
-import com.lsw.model.File;
+import com.lsw.model.system.Department;
+import com.lsw.model.system.File;
 import com.lsw.shiro.tag.ShiroTag;
 
 import java.util.Date;

src/main/java/com/lsw/controller/admin/system/file/FileValidator.java

@@ -5,7 +5,7 @@ import com.jfinal.kit.HashKit;
 import com.jfinal.upload.UploadFile;
 import com.lsw.base.BaseValidator;
 import com.lsw.commons.utils.FileUtil;
-import com.lsw.model.File;
+import com.lsw.model.system.File;
 
 import java.util.Date;
 import java.util.Random;

src/main/java/com/lsw/controller/admin/system/index/IndexController.java

@@ -12,7 +12,7 @@ import com.lsw.commons.utils.IpUtil;
 import com.lsw.controller.admin.system.log.login.LlogService;
 import com.lsw.controller.admin.system.user.UserValidator;
 import com.lsw.interceptor.RoleMenuInterceptor;
-import com.lsw.model.User;
+import com.lsw.model.system.User;
 import com.lsw.shiro.tag.ShiroTag;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.IncorrectCredentialsException;

src/main/java/com/lsw/controller/admin/system/index/IndexService.java

@@ -4,7 +4,7 @@ import com.jfinal.aop.Duang;
 import com.jfinal.plugin.ehcache.CacheKit;
 import com.lsw.commons.utils.Constant;
 import com.lsw.controller.admin.system.menu.MenuService;
-import com.lsw.model.Menu;
+import com.lsw.model.system.Menu;
 
 import java.util.List;
 

src/main/java/com/lsw/controller/admin/system/letter/LetterController.java

@@ -5,9 +5,9 @@ import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Page;
 import com.jfinal.plugin.activerecord.tx.Tx;
 import com.lsw.base.BaseController;
-import com.lsw.model.Letter;
-import com.lsw.model.LetterUser;
-import com.lsw.model.User;
+import com.lsw.model.system.Letter;
+import com.lsw.model.system.LetterUser;
+import com.lsw.model.system.User;
 import com.lsw.shiro.tag.ShiroTag;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 

src/main/java/com/lsw/controller/admin/system/letter/LetterService.java

@@ -3,8 +3,8 @@ package com.lsw.controller.admin.system.letter;
 import com.jfinal.kit.Kv;
 import com.jfinal.plugin.activerecord.Page;
 import com.jfinal.plugin.activerecord.SqlPara;
-import com.lsw.model.Letter;
-import com.lsw.model.User;
+import com.lsw.model.system.Letter;
+import com.lsw.model.system.User;
 
 import java.util.List;
 

src/main/java/com/lsw/controller/admin/system/log/login/LlogController.java

@@ -3,7 +3,7 @@ package com.lsw.controller.admin.system.log.login;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Page;
 import com.lsw.base.BaseController;
-import com.lsw.model.LoginLog;
+import com.lsw.model.system.LoginLog;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 
 /**

src/main/java/com/lsw/controller/admin/system/log/login/LlogService.java

@@ -2,8 +2,8 @@ package com.lsw.controller.admin.system.log.login;
 
 import com.jfinal.kit.Kv;
 import com.jfinal.plugin.activerecord.Page;
-import com.lsw.model.LoginLog;
-import com.lsw.model.User;
+import com.lsw.model.system.LoginLog;
+import com.lsw.model.system.User;
 
 import java.util.Date;
 
@@ -22,7 +22,7 @@ public class LlogService {
      * @param remark  备注
      * @throws Exception
      */
-    public void addLog(String account,String ip, User user, String op, String remark) throws Exception {
+    public void addLog(String account, String ip, User user, String op, String remark) throws Exception {
         LoginLog log = new LoginLog();
         log.setAccount(account);
         log.setUserId(user == null ? 0 : user.getId());

src/main/java/com/lsw/controller/admin/system/log/operation/OlogController.java

@@ -3,7 +3,7 @@ package com.lsw.controller.admin.system.log.operation;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Page;
 import com.lsw.base.BaseController;
-import com.lsw.model.OperationLog;
+import com.lsw.model.system.OperationLog;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 
 /**

src/main/java/com/lsw/controller/admin/system/log/operation/OlogService.java

@@ -2,7 +2,7 @@ package com.lsw.controller.admin.system.log.operation;
 
 import com.jfinal.kit.Kv;
 import com.jfinal.plugin.activerecord.Page;
-import com.lsw.model.OperationLog;
+import com.lsw.model.system.OperationLog;
 
 import java.util.Date;
 

src/main/java/com/lsw/controller/admin/system/menu/MenuController.java

@@ -1,13 +1,12 @@
 package com.lsw.controller.admin.system.menu;
 
 import com.jfinal.aop.Before;
-import com.jfinal.kit.StrKit;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Page;
 import com.jfinal.plugin.ehcache.CacheKit;
 import com.lsw.base.BaseController;
 import com.lsw.commons.utils.Constant;
-import com.lsw.model.Menu;
+import com.lsw.model.system.Menu;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 
 import java.util.List;

src/main/java/com/lsw/controller/admin/system/menu/MenuService.java

@@ -5,8 +5,8 @@ import com.jfinal.kit.StrKit;
 import com.jfinal.plugin.activerecord.Page;
 import com.jfinal.plugin.activerecord.SqlPara;
 import com.lsw.commons.utils.Constant;
-import com.lsw.model.Menu;
-import com.lsw.model.MenuRole;
+import com.lsw.model.system.Menu;
+import com.lsw.model.system.MenuRole;
 
 import java.util.List;
 

src/main/java/com/lsw/controller/admin/system/role/RoleController.java

@@ -9,10 +9,10 @@ import com.lsw.base.BaseController;
 import com.lsw.commons.utils.Constant;
 import com.lsw.controller.admin.system.menu.MenuService;
 import com.lsw.controller.admin.system.user.UserService;
-import com.lsw.model.Menu;
-import com.lsw.model.MenuRole;
-import com.lsw.model.Role;
-import com.lsw.model.User;
+import com.lsw.model.system.Menu;
+import com.lsw.model.system.MenuRole;
+import com.lsw.model.system.Role;
+import com.lsw.model.system.User;
 import com.lsw.shiro.tag.ShiroTag;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 

src/main/java/com/lsw/controller/admin/system/role/RoleService.java

@@ -2,7 +2,7 @@ package com.lsw.controller.admin.system.role;
 
 import com.jfinal.kit.StrKit;
 import com.jfinal.plugin.activerecord.Page;
-import com.lsw.model.Role;
+import com.lsw.model.system.Role;
 
 /**
  * Created by Administrator on 2017/5/23.

src/main/java/com/lsw/controller/admin/system/site/SiteController.java

@@ -0,0 +1,38 @@
+package com.lsw.controller.admin.system.site;
+
+import com.jfinal.aop.Before;
+import com.jfinal.kit.JsonKit;
+import com.lsw.base.BaseController;
+import com.lsw.model.system.Role;
+import com.lsw.model.system.Site;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+/**
+ * @author 李书文
+ * @description 站点管理
+ * @time 2017-5-29
+ */
+public class SiteController extends BaseController {
+
+    /**
+     * 管理页面
+     */
+    @RequiresPermissions("site:index")
+    public void index() {
+        Site site=Site.dao.findById("1");
+        setAttr("site", JsonKit.toJson(site));
+        render("index.html");
+    }
+
+    /**
+     * 编辑站点
+     */
+    @RequiresPermissions("site:edit")
+    @Before(SiteValidator.class)
+    public void edit() {
+        Role site = getModel(Role.class, "", true);
+        site.update();
+        renderSuccess();
+    }
+
+}

src/main/java/com/lsw/controller/admin/system/site/SiteValidator.java

@@ -0,0 +1,15 @@
+package com.lsw.controller.admin.system.site;
+
+import com.jfinal.core.Controller;
+import com.lsw.base.BaseValidator;
+
+public class SiteValidator extends BaseValidator {
+
+    @Override
+    protected void validate(Controller c) {
+        validateRequiredString("roleName", "msg", "角色不能为空");
+        validateString("roleName", 2,10, "msg", "角色长度2-10个长度");
+        validateRequiredString("note", "msg", "描述不能为空");
+        validateString("note", 2,50, "msg", "描述长度2-50个长度");
+    }
+}

src/main/java/com/lsw/controller/admin/system/upload/UploadController.java

@@ -28,7 +28,11 @@ public class UploadController extends BaseController {
         if (getPara("action").equals("uploadimage")) {
             uploadImage();
         }
+        if (getPara("action").equals("uploadvideo")) {
+            uploadFile();
+        }
     }
+
     /**
      * 上传data:image格式的图片
      */
@@ -42,6 +46,10 @@ public class UploadController extends BaseController {
         }
         renderJson(Ret.by("url", "/upload" + Path + imgName));
     }
+
+    /**
+     * 上传图片
+     */
     public void uploadImage() {
         UploadFile uf = null;
         String imgName = System.currentTimeMillis() + new Random().nextInt(10000) + ".jpg";
@@ -55,7 +63,7 @@ public class UploadController extends BaseController {
                 return;
             }
             Ret ret = Ret.create("state", "SUCCESS")  //下面这几个都是必须返回给ueditor的数据
-                    .set("url", PropKit.get("host")+"/upload" + Path + imgName)  //文件上传后的路径
+                    .set("url", PropKit.get("host") + "/upload" + Path + imgName)  //文件上传后的路径
                     .set("title", uf.getFileName())  //文件名称
                     .set("original", uf.getOriginalFileName())
                     .set("type", "." + uf.getFileName().split("\\."))
@@ -76,4 +84,30 @@ public class UploadController extends BaseController {
         }
     }
 
+    /**
+     * 上传文件
+     */
+    public void uploadFile() {
+        UploadFile uf = null;
+        try {
+            uf = getFile("upfile", "/file/video/");
+            //判断文件类型
+            Ret ret = Ret.create("state", "SUCCESS")  //下面这几个都是必须返回给ueditor的数据
+                    .set("url", PropKit.get("host") + "/upload/file/video/" + uf.getFileName())  //文件上传后的路径
+                    .set("title", uf.getFileName())  //文件名称
+                    .set("original", uf.getOriginalFileName())
+                    .set("type", "." + uf.getFileName().split("\\."))
+                    .set("size", uf.getFile().length());
+            renderJson(ret);
+        } catch (Exception e) {
+            String msg = e.getMessage();
+            if (msg != null) {
+                if (uf != null) {
+                    uf.getFile().delete();
+                }
+                renderJson(Ret.fail("state", msg));
+            }
+        }
+    }
+
 }

src/main/java/com/lsw/controller/admin/system/user/UserController.java

@@ -10,10 +10,10 @@ import com.jfinal.plugin.ehcache.CacheKit;
 import com.lsw.base.BaseController;
 import com.lsw.commons.utils.Constant;
 import com.lsw.controller.admin.system.department.DepartmentService;
-import com.lsw.model.Department;
-import com.lsw.model.Role;
-import com.lsw.model.User;
-import com.lsw.model.UserRole;
+import com.lsw.model.system.Department;
+import com.lsw.model.system.Role;
+import com.lsw.model.system.User;
+import com.lsw.model.system.UserRole;
 import com.lsw.shiro.tag.ShiroTag;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.apache.shiro.crypto.hash.SimpleHash;

src/main/java/com/lsw/controller/admin/system/user/UserService.java

@@ -5,29 +5,32 @@ import com.jfinal.kit.StrKit;
 import com.jfinal.plugin.activerecord.Page;
 import com.jfinal.plugin.activerecord.SqlPara;
 import com.lsw.commons.utils.Constant;
-import com.lsw.model.User;
+import com.lsw.model.system.User;
 
 import java.util.List;
 
 public class UserService {
     public static final UserService service = new UserService();
     private final User dao = new User().dao();
+
     /**
      * 检查用户
+     *
      * @param account
      * @return
      */
-    public User login(String account){
+    public User login(String account) {
         return dao.findFirst("select * from sys_user where account=? limit 1", account);
     }
 
     /**
      * 通过角色获取用户用户更新角色授权
+     *
      * @param roleId
      * @return
      */
-    public List<User>getUserListByRoleId(int roleId){
-        return  dao.find(dao.getSql("user.getUserListByRoleId"),roleId);
+    public List<User> getUserListByRoleId(int roleId) {
+        return dao.find(dao.getSql("user.getUserListByRoleId"), roleId);
     }
 
     /**
@@ -45,43 +48,37 @@ public class UserService {
         }
     }
 
-    /**
-     * 获取超级管理员的电话(用于用户预约的时候通知管理员)
-     * @return
-     */
-    public List<User>getAdminPhones(){
-        return dao.find(dao.getSql("user.getAdminPhones"));
-    }
 
     public User getUserById(int id) {
         return dao.findFirst(dao.getSql("user.getUserById"), id);
     }
+
     public User getUserByAccount(String account) {
-        return dao.findFirstByCache(Constant.userCache,account,dao.getSql("user.getUserByAccount"), account);
+        return dao.findFirstByCache(Constant.userCache, account, dao.getSql("user.getUserByAccount"), account);
     }
-    
+
     /**
      * 分页查询
      *
-     * @param page 当前页
-     * @param row  分页条数
+     * @param page  当前页
+     * @param row   分页条数
      * @param field 查询条件
-     * @param val 输入查询值
+     * @param val   输入查询值
      * @param depId 部门Id
      * @param pId   上级部门id
-     * @param sidx 排序字段
-     * @param sord 排序方式 asc|desc
+     * @param sidx  排序字段
+     * @param sord  排序方式 asc|desc
      * @return
      */
-    public Page<User> userList(int page, int row, String field,String val,String depId,String pId ,String sidx, String sord) {
+    public Page<User> userList(int page, int row, String field, String val, String depId, String pId, String sidx, String sord) {
         Kv cond = Kv.create();
-        if(StrKit.notBlank(val)){
-            cond.set("AND u."+field+" LIKE", "%"+val+"%");
+        if (StrKit.notBlank(val)) {
+            cond.set("AND u." + field + " LIKE", "%" + val + "%");
         }
         cond.set("AND u.depId=", depId);
         cond.set("AND d.pId=", pId);
         cond.set("OR d.id=", pId);
-        SqlPara para = dao.getSqlPara("user.selectByPage", Kv.create().set("cond",cond).set("sidx",sidx).set("sord",sord));
+        SqlPara para = dao.getSqlPara("user.selectByPage", Kv.create().set("cond", cond).set("sidx", sidx).set("sord", sord));
         return dao.paginate(page, row, para);
     }
 

src/main/java/com/lsw/controller/admin/work/banner/BannerController.java

@@ -5,7 +5,7 @@ import com.jfinal.kit.JsonKit;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Page;
 import com.lsw.base.BaseController;
-import com.lsw.model.Banner;
+import com.lsw.model.work.Banner;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 
 import java.util.Date;

src/main/java/com/lsw/controller/admin/work/position/PositionController.java

@@ -5,7 +5,7 @@ import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Page;
 import com.jfinal.plugin.activerecord.tx.Tx;
 import com.lsw.base.BaseController;
-import com.lsw.model.Position;
+import com.lsw.model.work.Position;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 
 public class PositionController extends BaseController {

src/main/java/com/lsw/controller/front/ShareController.java

@@ -4,7 +4,7 @@ import com.jfinal.aop.Before;
 import com.jfinal.kit.PathKit;
 import com.lsw.base.BaseController;
 import com.lsw.commons.utils.TimeUtil;
-import com.lsw.model.File;
+import com.lsw.model.system.File;
 
 public class ShareController extends BaseController {
 
@@ -35,7 +35,6 @@ public class ShareController extends BaseController {
     /**
      * 下载文件
      */
-    //@Before(ShareValidator.class)
     public void download() {
         File file = File.dao.findFirst("select * from sys_file where id=? and isShare=1", getPara("id"));
         if (file == null) {

src/main/java/com/lsw/controller/front/user/AppUserController.java

@@ -1,23 +0,0 @@
-package com.lsw.controller.front.user;
-
-import com.jfinal.aop.Before;
-import com.jfinal.aop.Clear;
-import com.jfinal.kit.Ret;
-import com.lsw.base.BaseController;
-import com.lsw.interceptor.TokenInterceptor;
-
-@Before(TokenInterceptor.class)
-public class AppUserController extends BaseController {
-    static final AppUserService appUserService = new AppUserService();
-
-
-
-    @Clear
-    @Before(AppUserValidator.class)
-    public void login() {
-        Ret ret = appUserService.login(getPara("account").trim(), getPara("password").trim());
-        renderJson(ret);
-    }
-
-
-}

src/main/java/com/lsw/controller/front/user/AppUserService.java

@@ -1,71 +0,0 @@
-package com.lsw.controller.front.user;
-
-import com.jfinal.kit.HashKit;
-import com.jfinal.kit.Ret;
-import com.jfinal.plugin.ehcache.CacheKit;
-import com.lsw.commons.utils.Constant;
-import com.lsw.model.Token;
-import com.lsw.model.User;
-import org.apache.shiro.crypto.hash.SimpleHash;
-import org.apache.shiro.util.SimpleByteSource;
-
-/**
- * Created by Administrator on 2017/5/23.
- */
-public class AppUserService {
-    private final User dao = new User().dao();
-
-    public Ret login(String account, String password) {
-        Ret ret = Ret.create();
-        StringBuilder sb=new StringBuilder();
-        sb.append("SELECT u.*,ur.roleId,r.roleName,d.departmentName");
-        sb.append(" FROM sys_user u");
-        sb.append(" LEFT JOIN sys_user_role ur ON ur.userId=u.id");
-        sb.append(" LEFT JOIN sys_role r ON r.id=ur.roleId");
-        sb.append(" LEFT JOIN sys_department d ON d.id=u.depId");
-        sb.append(" WHERE u.account=?");
-        User user = dao.findFirst(sb.toString(), account);
-        if (user == null) {
-            ret.set("result", false).set("msg", "账户或密码错误!");
-            return ret;
-        }
-        String pass=new SimpleHash("MD5", new SimpleByteSource(password), new SimpleByteSource(user.getSalt()), 2).toHex();
-        if(!pass.equals(user.getPassword())){
-            ret.set("result", false).set("msg", "账户或密码错误!");
-            return ret;
-        }
-        if(user.getState()==1){
-            ret.set("result", false).set("msg", "该账户被限制登录");
-            return ret;
-        }
-        //保存token信息
-        Token token = new Token();
-        String secret = HashKit.generateSaltForSha256();
-        token.setSecret(secret);
-        token.put("state", 0);
-        token.setAccount(user.getAccount());
-        token.save();
-        user.put("token", secret);
-        CacheKit.put(Constant.token, account, token);
-        ret.set("result", true);
-        ret.set("user", user);
-        return ret;
-    }
-
-    /**
-     * 用户验证token知否有效
-     *
-     * @param secret
-     * @param account
-     * @return
-     */
-    public Token loginBySecret(String secret, String account) {
-        Token token = CacheKit.get(Constant.token, account);
-        if (token == null) {
-            token = Token.dao.findFirst("SELECT u.state FROM tb_token t LEFT JOIN sys_user u ON u.account = t.account WHERE t.secret=? AND t.account=? ORDER BY t.id DESC", secret, account);
-            CacheKit.put(Constant.token, account, token);
-        }
-        return token;
-    }
-
-}

src/main/java/com/lsw/controller/front/user/AppUserValidator.java

@@ -1,19 +0,0 @@
-package com.lsw.controller.front.user;
-
-import com.jfinal.core.Controller;
-import com.lsw.base.BaseValidator;
-
-public class AppUserValidator extends BaseValidator {
-    @Override
-    protected void validate(Controller c) {
-        String url = getActionKey();
-        if (url.equals("/app/user/login")) {
-            validateRequiredString("account", "msg", "账号不能为空");
-        }
-        if (url.equals("/app/user/edit")) {
-            if (c.getPara("field").equals("phone")) {
-                validatePhone("value", "msg", "手机号格式不正确");
-            }
-        }
-    }
-}

src/main/java/com/lsw/interceptor/RoleMenuInterceptor.java

@@ -6,8 +6,8 @@ import com.jfinal.aop.Duang;
 import com.jfinal.aop.Interceptor;
 import com.jfinal.aop.Invocation;
 import com.lsw.controller.admin.system.menu.MenuService;
-import com.lsw.model.Menu;
-import com.lsw.model.User;
+import com.lsw.model.system.Menu;
+import com.lsw.model.system.User;
 import com.lsw.shiro.tag.ShiroTag;
 
 /**

src/main/java/com/lsw/interceptor/TokenInterceptor.java

@@ -1,26 +0,0 @@
-package com.lsw.interceptor;
-
-import com.jfinal.aop.Duang;
-import com.jfinal.aop.Interceptor;
-import com.jfinal.aop.Invocation;
-import com.jfinal.core.Controller;
-import com.jfinal.kit.Ret;
-import com.lsw.controller.front.user.AppUserService;
-import com.lsw.model.Token;
-
-public class TokenInterceptor implements Interceptor {
-    public void intercept(Invocation inv) {
-        Controller c = inv.getController();
-        Token token = Duang.duang(AppUserService.class).loginBySecret(c.getHeader("token"),c.getHeader("account"));
-        if (token == null) {
-            c.renderJson(Ret.create().set("result", false).set("msg", "请先登录"));
-            return;
-        }
-        if(token.getInt("state")==1){
-            c.renderJson(Ret.create().set("result", false).set("msg", "你已被锁定,不能做其它操作"));
-            return;
-        }
-        inv.invoke();
-    }
-
-}

src/main/java/com/lsw/model/_MappingKit.java

@@ -16,21 +16,8 @@ import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
 public class _MappingKit {
 
 	public static void mapping(ActiveRecordPlugin arp) {
-		arp.addMapping("sys_department", "id", Department.class);
-		arp.addMapping("sys_file", "id", File.class);
-		arp.addMapping("sys_letter", "id", Letter.class);
-		arp.addMapping("sys_letter_user", "id", LetterUser.class);
-		arp.addMapping("sys_login_log", "id", LoginLog.class);
-		arp.addMapping("sys_menu", "id", Menu.class);
-		arp.addMapping("sys_menu_role", "id", MenuRole.class);
-		arp.addMapping("sys_operation_log", "id", OperationLog.class);
-		arp.addMapping("sys_role", "id", Role.class);
-		arp.addMapping("sys_user", "id", User.class);
-		arp.addMapping("sys_user_role", "id", UserRole.class);
-		arp.addMapping("tb_banner", "id", Banner.class);
-		arp.addMapping("tb_news_column", "id", NewsColumn.class);
-		arp.addMapping("tb_position", "id", Position.class);
-		arp.addMapping("tb_token", "id", Token.class);
+		com.lsw.model.system._MappingKit.mapping(arp);
+		com.lsw.model.work._MappingKit.mapping(arp);
 	}
 }
 

src/main/java/com/lsw/model/Department.java → src/main/java/com/lsw/model/system/Department.java

@@ -1,6 +1,7 @@
-package com.lsw.model;
+package com.lsw.model.system;
 
-import com.lsw.model.base.BaseDepartment;
+
+import com.lsw.model.system.base.BaseDepartment;
 
 /**
  * Generated by JFinal.

src/main/java/com/lsw/model/File.java → src/main/java/com/lsw/model/system/File.java

@@ -1,8 +1,8 @@
-package com.lsw.model;
+package com.lsw.model.system;
 
 import com.jfinal.kit.StrKit;
 import com.jfinal.plugin.activerecord.Page;
-import com.lsw.model.base.BaseFile;
+import com.lsw.model.system.base.BaseFile;
 
 import java.util.List;
 

src/main/java/com/lsw/model/Letter.java → src/main/java/com/lsw/model/system/Letter.java

@@ -1,6 +1,6 @@
-package com.lsw.model;
+package com.lsw.model.system;
 
-import com.lsw.model.base.BaseLetter;
+import com.lsw.model.system.base.BaseLetter;
 
 /**
  * Generated by JFinal.

src/main/java/com/lsw/model/LetterUser.java → src/main/java/com/lsw/model/system/LetterUser.java

@@ -1,6 +1,6 @@
-package com.lsw.model;
+package com.lsw.model.system;
 
-import com.lsw.model.base.BaseLetterUser;
+import com.lsw.model.system.base.BaseLetterUser;
 
 /**
  * Generated by JFinal.

src/main/java/com/lsw/model/LoginLog.java → src/main/java/com/lsw/model/system/LoginLog.java

@@ -1,6 +1,7 @@
-package com.lsw.model;
+package com.lsw.model.system;
 
-import com.lsw.model.base.BaseLoginLog;
+
+import com.lsw.model.system.base.BaseLoginLog;
 
 /**
  * Generated by JFinal.

src/main/java/com/lsw/model/Menu.java → src/main/java/com/lsw/model/system/Menu.java

@@ -1,6 +1,7 @@
-package com.lsw.model;
+package com.lsw.model.system;
 
-import com.lsw.model.base.BaseMenu;
+
+import com.lsw.model.system.base.BaseMenu;
 
 /**
  * Generated by JFinal.

src/main/java/com/lsw/model/MenuRole.java → src/main/java/com/lsw/model/system/MenuRole.java

@@ -1,6 +1,6 @@
-package com.lsw.model;
+package com.lsw.model.system;
 
-import com.lsw.model.base.BaseMenuRole;
+import com.lsw.model.system.base.BaseMenuRole;
 
 /**
  * Generated by JFinal.

src/main/java/com/lsw/model/OperationLog.java → src/main/java/com/lsw/model/system/OperationLog.java

@@ -1,6 +1,7 @@
-package com.lsw.model;
+package com.lsw.model.system;
 
-import com.lsw.model.base.BaseOperationLog;
+
+import com.lsw.model.system.base.BaseOperationLog;
 
 /**
  * Generated by JFinal.

src/main/java/com/lsw/model/Role.java → src/main/java/com/lsw/model/system/Role.java

@@ -1,6 +1,6 @@
-package com.lsw.model;
+package com.lsw.model.system;
 
-import com.lsw.model.base.BaseRole;
+import com.lsw.model.system.base.BaseRole;
 
 /**
  * Generated by JFinal.

src/main/java/com/lsw/model/system/Site.java

@@ -0,0 +1,11 @@
+package com.lsw.model.system;
+
+import com.lsw.model.system.base.BaseSite;
+
+/**
+ * Generated by JFinal.
+ */
+@SuppressWarnings("serial")
+public class Site extends BaseSite<Site> {
+	public static final Site dao = new Site().dao();
+}

src/main/java/com/lsw/model/User.java → src/main/java/com/lsw/model/system/User.java

@@ -1,6 +1,6 @@
-package com.lsw.model;
+package com.lsw.model.system;
 
-import com.lsw.model.base.BaseUser;
+import com.lsw.model.system.base.BaseUser;
 
 /**
  * Generated by JFinal.

src/main/java/com/lsw/model/UserRole.java → src/main/java/com/lsw/model/system/UserRole.java

@@ -1,6 +1,6 @@
-package com.lsw.model;
+package com.lsw.model.system;
 
-import com.lsw.model.base.BaseUserRole;
+import com.lsw.model.system.base.BaseUserRole;
 
 /**
  * Generated by JFinal.

src/main/java/com/lsw/model/system/_MappingKit.java

@@ -0,0 +1,33 @@
+package com.lsw.model.system;
+
+import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
+
+/**
+ * Generated by JFinal, do not modify this file.
+ * <pre>
+ * Example:
+ * public void configPlugin(Plugins me) {
+ *     ActiveRecordPlugin arp = new ActiveRecordPlugin(...);
+ *     _MappingKit.mapping(arp);
+ *     me.add(arp);
+ * }
+ * </pre>
+ */
+public class _MappingKit {
+
+	public static void mapping(ActiveRecordPlugin arp) {
+		arp.addMapping("sys_department", "id", Department.class);
+		arp.addMapping("sys_file", "id", File.class);
+		arp.addMapping("sys_letter", "id", Letter.class);
+		arp.addMapping("sys_letter_user", "id", LetterUser.class);
+		arp.addMapping("sys_login_log", "id", LoginLog.class);
+		arp.addMapping("sys_menu", "id", Menu.class);
+		arp.addMapping("sys_menu_role", "id", MenuRole.class);
+		arp.addMapping("sys_operation_log", "id", OperationLog.class);
+		arp.addMapping("sys_role", "id", Role.class);
+		arp.addMapping("sys_site", "id", Site.class);
+		arp.addMapping("sys_user", "id", User.class);
+		arp.addMapping("sys_user_role", "id", UserRole.class);
+	}
+}
+

src/main/java/com/lsw/model/base/BaseDepartment.java → src/main/java/com/lsw/model/system/base/BaseDepartment.java

@@ -1,4 +1,4 @@
-package com.lsw.model.base;
+package com.lsw.model.system.base;
 
 import com.jfinal.plugin.activerecord.Model;
 import com.jfinal.plugin.activerecord.IBean;

src/main/java/com/lsw/model/base/BaseFile.java → src/main/java/com/lsw/model/system/base/BaseFile.java

@@ -1,4 +1,4 @@
-package com.lsw.model.base;
+package com.lsw.model.system.base;
 
 import com.jfinal.plugin.activerecord.Model;
 import com.jfinal.plugin.activerecord.IBean;

src/main/java/com/lsw/model/base/BaseLetter.java → src/main/java/com/lsw/model/system/base/BaseLetter.java

@@ -1,4 +1,4 @@
-package com.lsw.model.base;
+package com.lsw.model.system.base;
 
 import com.jfinal.plugin.activerecord.Model;
 import com.jfinal.plugin.activerecord.IBean;

src/main/java/com/lsw/model/base/BaseLetterUser.java → src/main/java/com/lsw/model/system/base/BaseLetterUser.java

@@ -1,4 +1,4 @@
-package com.lsw.model.base;
+package com.lsw.model.system.base;
 
 import com.jfinal.plugin.activerecord.Model;
 import com.jfinal.plugin.activerecord.IBean;

src/main/java/com/lsw/model/base/BaseLoginLog.java → src/main/java/com/lsw/model/system/base/BaseLoginLog.java

@@ -1,4 +1,4 @@
-package com.lsw.model.base;
+package com.lsw.model.system.base;
 
 import com.jfinal.plugin.activerecord.Model;
 import com.jfinal.plugin.activerecord.IBean;

src/main/java/com/lsw/model/base/BaseMenu.java → src/main/java/com/lsw/model/system/base/BaseMenu.java

@@ -1,4 +1,4 @@
-package com.lsw.model.base;
+package com.lsw.model.system.base;
 
 import com.jfinal.plugin.activerecord.Model;
 import com.jfinal.plugin.activerecord.IBean;

src/main/java/com/lsw/model/base/BaseMenuRole.java → src/main/java/com/lsw/model/system/base/BaseMenuRole.java

@@ -1,4 +1,4 @@
-package com.lsw.model.base;
+package com.lsw.model.system.base;
 
 import com.jfinal.plugin.activerecord.Model;
 import com.jfinal.plugin.activerecord.IBean;

src/main/java/com/lsw/model/base/BaseOperationLog.java → src/main/java/com/lsw/model/system/base/BaseOperationLog.java

@@ -1,4 +1,4 @@
-package com.lsw.model.base;
+package com.lsw.model.system.base;
 
 import com.jfinal.plugin.activerecord.Model;
 import com.jfinal.plugin.activerecord.IBean;

src/main/java/com/lsw/model/base/BaseRole.java → src/main/java/com/lsw/model/system/base/BaseRole.java

@@ -1,4 +1,4 @@
-package com.lsw.model.base;
+package com.lsw.model.system.base;
 
 import com.jfinal.plugin.activerecord.Model;
 import com.jfinal.plugin.activerecord.IBean;

src/main/java/com/lsw/model/system/base/BaseSite.java

@@ -0,0 +1,76 @@
+package com.lsw.model.system.base;
+
+import com.jfinal.plugin.activerecord.Model;
+import com.jfinal.plugin.activerecord.IBean;
+
+/**
+ * Generated by JFinal, do not modify this file.
+ */
+@SuppressWarnings("serial")
+public abstract class BaseSite<M extends BaseSite<M>> extends Model<M> implements IBean {
+
+	public void setId(java.lang.Integer id) {
+		set("id", id);
+	}
+
+	public java.lang.Integer getId() {
+		return getInt("id");
+	}
+
+	public void setTitle(java.lang.String title) {
+		set("title", title);
+	}
+
+	public java.lang.String getTitle() {
+		return getStr("title");
+	}
+
+	public void setLogo(java.lang.String logo) {
+		set("logo", logo);
+	}
+
+	public java.lang.String getLogo() {
+		return getStr("logo");
+	}
+
+	public void setLg(java.lang.String lg) {
+		set("lg", lg);
+	}
+
+	public java.lang.String getLg() {
+		return getStr("lg");
+	}
+
+	public void setEmailServer(java.lang.String emailServer) {
+		set("emailServer", emailServer);
+	}
+
+	public java.lang.String getEmailServer() {
+		return getStr("emailServer");
+	}
+
+	public void setEmailFrom(java.lang.String emailFrom) {
+		set("emailFrom", emailFrom);
+	}
+
+	public java.lang.String getEmailFrom() {
+		return getStr("emailFrom");
+	}
+
+	public void setEmailPass(java.lang.String emailPass) {
+		set("emailPass", emailPass);
+	}
+
+	public java.lang.String getEmailPass() {
+		return getStr("emailPass");
+	}
+
+	public void setCopyright(java.lang.String copyright) {
+		set("copyright", copyright);
+	}
+
+	public java.lang.String getCopyright() {
+		return getStr("copyright");
+	}
+
+}

src/main/java/com/lsw/model/base/BaseUser.java → src/main/java/com/lsw/model/system/base/BaseUser.java

@@ -1,4 +1,4 @@
-package com.lsw.model.base;
+package com.lsw.model.system.base;
 
 import com.jfinal.plugin.activerecord.Model;
 import com.jfinal.plugin.activerecord.IBean;

src/main/java/com/lsw/model/base/BaseUserRole.java → src/main/java/com/lsw/model/system/base/BaseUserRole.java

@@ -1,4 +1,4 @@
-package com.lsw.model.base;
+package com.lsw.model.system.base;
 
 import com.jfinal.plugin.activerecord.Model;
 import com.jfinal.plugin.activerecord.IBean;

src/main/java/com/lsw/model/Banner.java → src/main/java/com/lsw/model/work/Banner.java

@@ -1,7 +1,7 @@
-package com.lsw.model;
+package com.lsw.model.work;
 
 import com.jfinal.plugin.activerecord.Page;
-import com.lsw.model.base.BaseBanner;
+import com.lsw.model.work.base.BaseBanner;
 
 /**
  * Generated by JFinal.

src/main/java/com/lsw/model/NewsColumn.java → src/main/java/com/lsw/model/work/NewsColumn.java

@@ -1,6 +1,6 @@
-package com.lsw.model;
+package com.lsw.model.work;
 
-import com.lsw.model.base.BaseNewsColumn;
+import com.lsw.model.work.base.BaseNewsColumn;
 
 /**
  * Generated by JFinal.

src/main/java/com/lsw/model/Position.java → src/main/java/com/lsw/model/work/Position.java

@@ -1,8 +1,8 @@
-package com.lsw.model;
+package com.lsw.model.work;
 
 import com.jfinal.kit.StrKit;
 import com.jfinal.plugin.activerecord.Page;
-import com.lsw.model.base.BasePosition;
+import com.lsw.model.work.base.BasePosition;
 
 /**
  * Generated by JFinal.

src/main/java/com/lsw/model/Token.java → src/main/java/com/lsw/model/work/Token.java

@@ -1,6 +1,6 @@
-package com.lsw.model;
+package com.lsw.model.work;
 
-import com.lsw.model.base.BaseToken;
+import com.lsw.model.work.base.BaseToken;
 
 /**
  * Generated by JFinal.

src/main/java/com/lsw/model/work/_MappingKit.java

@@ -0,0 +1,25 @@
+package com.lsw.model.work;
+
+import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
+
+/**
+ * Generated by JFinal, do not modify this file.
+ * <pre>
+ * Example:
+ * public void configPlugin(Plugins me) {
+ *     ActiveRecordPlugin arp = new ActiveRecordPlugin(...);
+ *     _MappingKit.mapping(arp);
+ *     me.add(arp);
+ * }
+ * </pre>
+ */
+public class _MappingKit {
+
+	public static void mapping(ActiveRecordPlugin arp) {
+		arp.addMapping("tb_banner", "id", Banner.class);
+		arp.addMapping("tb_news_column", "id", NewsColumn.class);
+		arp.addMapping("tb_position", "id", Position.class);
+		arp.addMapping("tb_token", "id", Token.class);
+	}
+}
+

src/main/java/com/lsw/model/base/BaseBanner.java → src/main/java/com/lsw/model/work/base/BaseBanner.java

@@ -1,4 +1,4 @@
-package com.lsw.model.base;
+package com.lsw.model.work.base;
 
 import com.jfinal.plugin.activerecord.Model;
 import com.jfinal.plugin.activerecord.IBean;

src/main/java/com/lsw/model/base/BaseNewsColumn.java → src/main/java/com/lsw/model/work/base/BaseNewsColumn.java

@@ -1,4 +1,4 @@
-package com.lsw.model.base;
+package com.lsw.model.work.base;
 
 import com.jfinal.plugin.activerecord.Model;
 import com.jfinal.plugin.activerecord.IBean;

src/main/java/com/lsw/model/base/BasePosition.java → src/main/java/com/lsw/model/work/base/BasePosition.java

@@ -1,4 +1,4 @@
-package com.lsw.model.base;
+package com.lsw.model.work.base;
 
 import com.jfinal.plugin.activerecord.Model;
 import com.jfinal.plugin.activerecord.IBean;

src/main/java/com/lsw/model/base/BaseToken.java → src/main/java/com/lsw/model/work/base/BaseToken.java

@@ -1,4 +1,4 @@
-package com.lsw.model.base;
+package com.lsw.model.work.base;
 
 import com.jfinal.plugin.activerecord.Model;
 import com.jfinal.plugin.activerecord.IBean;

src/main/java/com/lsw/route/AdminRoute.java

@@ -9,6 +9,7 @@ import com.lsw.controller.admin.system.log.login.LlogController;
 import com.lsw.controller.admin.system.log.operation.OlogController;
 import com.lsw.controller.admin.system.menu.MenuController;
 import com.lsw.controller.admin.system.role.RoleController;
+import com.lsw.controller.admin.system.site.SiteController;
 import com.lsw.controller.admin.system.upload.UploadController;
 import com.lsw.controller.admin.system.user.UserController;
 import com.lsw.controller.admin.work.banner.BannerController;
@@ -34,6 +35,7 @@ public class AdminRoute extends Routes {
         add("/admin/log/operation", OlogController.class, "/system/log/operation/"); // 操作日志管理
         add("/admin/upload", UploadController.class); // 上传管理
         add("/admin/file", FileController.class, "/system/file/"); // 文件管理
+        add("/admin/site", SiteController.class, "/system/site/"); // 站点管理
 
         /***************************************业务相关*****************************************/
         add("/admin/work/banner",BannerController.class, "/work/banner/"); // 广告管理

src/main/java/com/lsw/route/FrontRoute.java

@@ -2,14 +2,13 @@ package com.lsw.route;
 
 import com.jfinal.config.Routes;
 import com.lsw.controller.front.ShareController;
-import com.lsw.controller.front.user.AppUserController;
 
 public class FrontRoute extends Routes {
     @Override
     public void config() {
         setBaseViewPath("/WEB-INF/view/front");
         add("/share", ShareController.class, "/share/"); // 分享页
-        add("/app/user", AppUserController.class); // appuser
+        //add("/app/user", AppUserController.class); // appuser
 
     }
 

src/main/java/com/lsw/shiro/ShiroDbRealm.java

@@ -4,9 +4,9 @@ import com.jfinal.aop.Duang;
 import com.lsw.controller.admin.system.menu.MenuService;
 import com.lsw.controller.admin.system.role.RoleService;
 import com.lsw.controller.admin.system.user.UserService;
-import com.lsw.model.Menu;
-import com.lsw.model.Role;
-import com.lsw.model.User;
+import com.lsw.model.system.Menu;
+import com.lsw.model.system.Role;
+import com.lsw.model.system.User;
 import com.lsw.shiro.ext.ByteSource;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.*;

src/main/java/com/lsw/shiro/tag/ShiroTag.java

@@ -2,7 +2,7 @@ package com.lsw.shiro.tag;
 
 import com.jfinal.aop.Duang;
 import com.lsw.controller.admin.system.user.UserService;
-import com.lsw.model.User;
+import com.lsw.model.system.User;
 import com.lsw.shiro.ShiroDbRealm;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.mgt.RealmSecurityManager;

src/main/resources/conf/jdbc_config.properties

@@ -2,8 +2,8 @@
 user=root
 password=root
 devMode=true
+databaseName=djfp
 host=http://localhost:7979
-#jdbcUrl=jdbc\:mysql\://193.112.10.136\:3306/frcz?characterEncoding\=utf8&zeroDateTimeBehavior\=convertToNull
 jdbcUrl=jdbc\:mysql\://127.0.0.1\:3306/djfp?characterEncoding\=utf8&zeroDateTimeBehavior\=convertToNull
 
 #ipÅäÖÃ

src/main/webapp/WEB-INF/view/admin/system/file/list.html

@@ -1,4 +1,4 @@
-#set(title="法制宣传管理")
+#set(title="文件管理")
 #@header()
 <style>
     .la {border-left: 0px;font-size: 18px;font-weight: bold;}

src/main/webapp/WEB-INF/view/admin/system/file/look.html

@@ -4,7 +4,7 @@
     .row{padding: 10px 30px 30px 30px;}
     .col-sm-5{font-weight: bold;font-size: 16px;margin-top: 15px;overflow: hidden;text-align: center;}
     .col-sm-5 img{width: 100%;}
-    .col-sm-2{box-shadow: 0px 0px 0px;}
+    .col-sm-3{box-shadow: 0px 0px 0px;}
     .form-group{border-bottom: 1px solid #e6e6e6;padding: 10px;}
     .fa{font-size: 150px;color: darkgray;}
     .btn-success{margin-top: 20px;}
@@ -34,52 +34,52 @@
              </div>
              <div class="col-sm-7">
                  <div class="form-group">
-                     <label class="col-sm-2 control-label">文件名称</label>
-                     <div class="col-sm-10">
+                     <label class="col-sm-3 control-label">文件名称</label>
+                     <div class="col-sm-9">
                          #(file.fileName)
                      </div>
                      <div class="clear"></div>
                  </div>
                  <div class="form-group">
-                     <label class="col-sm-2 control-label">文件类型</label>
-                     <div class="col-sm-10">
+                     <label class="col-sm-3 control-label">文件类型</label>
+                     <div class="col-sm-9">
                          #(file.fileType)
                      </div>
                      <div class="clear"></div>
                  </div>
                  <div class="form-group">
-                     <label class="col-sm-2 control-label">文件大小</label>
-                     <div class="col-sm-10">
+                     <label class="col-sm-3 control-label">文件大小</label>
+                     <div class="col-sm-9">
                          #(file.fileSize)
                      </div>
                      <div class="clear"></div>
                  </div>
                  #if(file.dCode!=''&& user.id==file.userId)
                  <div class="form-group">
-                     <label class="col-sm-2 control-label">下载码</label>
-                     <div class="col-sm-10">
+                     <label class="col-sm-3 control-label">下载码</label>
+                     <div class="col-sm-9">
                          #(file.dCode)
                      </div>
                      <div class="clear"></div>
                  </div>
                  #end
                  <div class="form-group">
-                     <label class="col-sm-2 control-label">上传者</label>
-                     <div class="col-sm-10">
+                     <label class="col-sm-3 control-label">上传者</label>
+                     <div class="col-sm-9">
                          lishuwen
                      </div>
                      <div class="clear"></div>
                  </div>
                  <div class="form-group">
-                     <label class="col-sm-2 control-label">文件位置</label>
-                     <div class="col-sm-10">
+                     <label class="col-sm-3 control-label">文件位置</label>
+                     <div class="col-sm-9">
                          #(file.realPath)
                      </div>
                      <div class="clear"></div>
                  </div>
                  <div class="form-group">
-                     <label class="col-sm-2 control-label">上传时间</label>
-                     <div class="col-sm-10">
+                     <label class="col-sm-3 control-label">上传时间</label>
+                     <div class="col-sm-9">
                          #(file.uploadTime)
                      </div>
                      <div class="clear"></div>

src/main/webapp/WEB-INF/view/admin/system/letter/add.html

@@ -53,7 +53,7 @@
     var check_type=""; //是否选择全部对象
     UE.getEditor('editor',{
         toolbars:[['FullScreen', 'Undo','Redo','forecolor','bold', 'italic','formatmatch', 'autotypeset','justifyleft', 'justifycenter', 'justifyright', 'justifyjustify','insertorderedlist', 'insertunorderedlist',
-            'rowspacingtop', 'rowspacingbottom', 'lineheight','simpleupload','customstyle','paragraph','fontfamily', 'fontsize','inserttable', 'deletetable', 'insertparagraphbeforetable', 'insertrow', 'deleterow', 'insertcol', 'deletecol', 'mergecells', 'mergeright', 'mergedown', 'splittocells', 'splittorows', 'splittocols']]
+            'rowspacingtop', 'rowspacingbottom', 'lineheight','simpleupload','insertvideo','customstyle','paragraph','fontfamily', 'fontsize','inserttable', 'deletetable', 'insertparagraphbeforetable', 'insertrow', 'deleterow', 'insertcol', 'deletecol', 'mergecells', 'mergeright', 'mergedown', 'splittocells', 'splittorows', 'splittocols']]
     });
     /**
      * 选择全部通知对象

src/main/webapp/WEB-INF/view/admin/system/site/index.html

@@ -0,0 +1,83 @@
+#set(title="配置站点")
+#@header()
+<style>
+    body{background-color: #E7ECEF;}
+    #app{padding:30px 100px 30px 100px;}
+    form{background-color: white;box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.3);padding: 50px;}
+    .img{cursor: pointer;max-height:128px;padding: 10px;max-width: 128px;margin-left: -10px;}
+    input[type=file] {height:128px;opacity: 0;width: 128px;cursor: pointer;margin: 0 auto;}
+    .bbc{border-bottom: 3px solid #19b293;padding-bottom: 11px;color: #19b293;font-weight: bold;font-size: 15px;}
+    [v-cloak] {display: none;}
+</style>
+<body class="bg">
+<div id="app" v-cloak>
+    <form id="addForm" method="post">
+        <table class="table">
+            <tbody>
+            <tr>
+                <td colspan="6"><span class="bbc">基本信息</span></td>
+            </tr>
+            <tr>
+                <td>系统名称</td>
+                <td><input type="text" class="form-control" min="1">
+                </td>
+            </tr>
+            <tr>
+                <td>版权所有</td>
+                <td><input type="text" class="form-control" min="1">
+                </td>
+            </tr>
+            <tr>
+                <td width="150">登录背景</td>
+                <td colspan="3">
+                    <img class="img" alt="添加封面" :src="item.lg==''?'#(path)/static/ui/img/icon_p.png':item.lg">
+                    <input type="file" accept="image/*" accept='image/*' v-on:change="change($event,0)" style="margin-top:-128px;width:70%;margin-left: -30px;">
+                </td>
+            </tr>
+            <tr>
+                <td colspan="6"><span class="bbc">邮箱设置</span></td>
+            </tr>
+            <tr>
+                <td>服务名称</td>
+                <td><input type="text" class="form-control" min="1">
+                </td>
+            </tr>
+            <tr>
+                <td>发送人</td>
+                <td><input type="text" class="form-control" min="1">
+                </td>
+            </tr>
+            <tr>
+                <td>邮箱密码</td>
+                <td><input type="text" class="form-control" min="1">
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 该密码是从邮箱提供商设置的密码</span>
+                </td>
+            </tr>
+            </tbody>
+        </table>
+    </form>
+</div>
+#set(layer=true,util=true,vue=true)
+#@op()
+#@js()
+<script>
+    var vm = new Vue({
+        el: "#app",
+        data: {
+            item: {},
+        },
+        mounted: function () {
+            this.item =#(site);
+        },
+        methods: {
+
+        }
+    })
+    $("#add").click(function () {
+        vm.item.mShow=vm.item.mShow==true?0:1;
+        var data = {banner: JSON.stringify(vm.item)};
+        ajaxSubmit("#(path)/admin/work/banner/#(op)", data);
+    });
+</script>
+</body>
+</html>