完善功能

pom.xml

@@ -31,7 +31,7 @@
             <artifactId>jetty-server</artifactId>
             <version>8.1.8</version>
             <scope>compile</scope>
-           <!-- <scope>test</scope>-->
+            <!-- <scope>test</scope>-->
         </dependency>
         <!--单元测试-->
         <dependency>
@@ -109,6 +109,13 @@
             <artifactId>testng</artifactId>
             <version>RELEASE</version>
         </dependency>
+        <!--定时任务-->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.7.25</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <finalName>djfp</finalName>

src/main/java/com/lsw/commons/utils/SmsSend.java

@@ -0,0 +1,25 @@
+package com.lsw.commons.utils;
+
+import com.mascloud.sdkclient.Client;
+
+/**
+ * 移动短信接口
+ */
+public class SmsSend {
+    public static void main(String[] args) {
+
+    }
+
+    public static boolean sendMessage(String[] phones,String content) {
+        Client client = Client.getInstance();
+        boolean isLogin = client.login("http://112.35.4.197:15000", "decpbs", "passwd@9156", "政企分公司测试");
+        if (isLogin) {
+            System.out.println("Login successed");
+            int sendResult = client.sendDSMS(phones, content, "123", 1, "DWItALe3A", "201812261719", false);
+            if (sendResult == phones.length) {
+                return true;
+            }
+        }
+        return false;
+    }
+}

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

@@ -5,6 +5,7 @@ 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.system.Role;
 import com.lsw.model.work.User;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 
@@ -35,8 +36,12 @@ public class UserController extends BaseController {
      * 视图页面
      */
     public void view() {
-        User app = User.dao.findById(getPara("id"));
-        setAttr("app", app);
+        String op = getPara("op");
+        if (op.equals("audit")) {
+            User app = User.dao.findById(getPara("id"));
+            setAttr("app", app);
+        }
+        setAttr("op",op);
         render("form.html");
     }
 
@@ -79,4 +84,15 @@ public class UserController extends BaseController {
         CacheKit.remove(Constant.token,getPara("account"));
         renderSuccess();
     }
+    /**
+     * 审核企业用户
+     */
+    @RequiresPermissions("appuser:audit")
+    public void audit(){
+        User user = getModel(User.class, "", true);
+        user.update();
+        //更新用户登录缓存
+        CacheKit.remove(Constant.token,user.getAccount());
+        renderSuccess();
+    }
 }

src/main/java/com/lsw/controller/front/main/NewsController.java → src/main/java/com/lsw/controller/front/news/NewsController.java

@@ -1,4 +1,4 @@
-package com.lsw.controller.front.main;
+package com.lsw.controller.front.news;
 
 import com.jfinal.plugin.activerecord.Page;
 import com.lsw.base.BaseController;

src/main/java/com/lsw/controller/front/resume/ResumeController.java

@@ -0,0 +1,44 @@
+package com.lsw.controller.front.resume;
+
+import com.jfinal.aop.Before;
+import com.jfinal.kit.PathKit;
+import com.jfinal.kit.Ret;
+import com.lsw.base.BaseController;
+import com.lsw.commons.utils.ImageZipUtil;
+import com.lsw.interceptor.TokenInterceptor;
+import com.lsw.model.work.Resume;
+
+import java.util.Random;
+
+@Before(TokenInterceptor.class)
+public class ResumeController extends BaseController {
+    String Path = "/images/ueditor/";
+
+    public void my_resume() {
+        Resume resume = Resume.dao.findFirst("SELECT * FROM tb_resume WHERE userId=?", getPara("userId"));
+        renderJson(resume);
+    }
+    /**
+     * 上传data:image格式的图片
+     */
+    public void uploadPhoto() {
+        String imgName = System.currentTimeMillis() + new Random().nextInt(10000) + ".jpg";
+        try {
+            String oldImage = PathKit.getWebRootPath() + "/upload" + Path + imgName;
+            ImageZipUtil.GenerateImage(getPara("dataImage").replace("data:image/png;base64,", ""), oldImage);
+        } catch (Exception e) {
+        }
+        renderJson(Ret.by("url", "/upload" + Path + imgName));
+    }
+    public void save_resume() {
+        Resume check = Resume.dao.findFirst("SELECT * FROM tb_resume WHERE userId=?", getPara("userId"));
+        if (check == null) {
+            Resume resume = getModel(Resume.class, "", true);
+            resume.save();
+        } else {
+            Resume resume = getModel(Resume.class, "", true);
+            resume.update();
+        }
+        renderSuccess();
+    }
+}

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

@@ -2,8 +2,6 @@ package com.lsw.controller.front.user;
 
 import com.jfinal.aop.Before;
 import com.jfinal.aop.Clear;
-import com.jfinal.kit.JsonKit;
-import com.jfinal.kit.Kv;
 import com.jfinal.kit.PathKit;
 import com.jfinal.kit.Ret;
 import com.jfinal.plugin.ehcache.CacheKit;
@@ -11,7 +9,7 @@ import com.lsw.base.BaseController;
 import com.lsw.commons.utils.CommonUtils;
 import com.lsw.commons.utils.Constant;
 import com.lsw.commons.utils.ImageZipUtil;
-import com.lsw.commons.utils.SendMessage;
+import com.lsw.commons.utils.SmsSend;
 import com.lsw.interceptor.TokenInterceptor;
 import com.lsw.model.work.User;
 
@@ -22,35 +20,69 @@ public class AppUserController extends BaseController {
     static final AppUserService appUserService = new AppUserService();
     String Path = "/images/ueditor/";
 
-    //发送短信
+    //发送注册短信
     @Clear
     @Before(AppUserValidator.class)
     public void sendMessage() {
-        String phone = getPara("account").trim();
         String code = CommonUtils.getRandomString(6);
-        boolean flag = SendMessage.sendSms(phone, "哔啵", "SMS_143665149", JsonKit.toJson(Kv.by("code", code)));
-        if (flag) {
-            CacheKit.put(Constant.code, phone, String.valueOf(code));
+        //boolean flag = SmsSend.sendMessage(new String[]{getPara("phone")}, "验证码"+code+"，您正在注册，若非本人操作，请勿泄露。");
+        if (true) {
+            System.out.println("验证码:" + code);
+            CacheKit.put(Constant.code, getPara("phone"), String.valueOf(code));
             renderSuccess();
         } else {
             renderError("发送失败");
         }
     }
 
+    //发送找回密码短信
+    @Clear
+    @Before(AppUserValidator.class)
+    public void findPassMessage() {
+        String phone = getPara("phone").trim();
+        boolean check = appUserService.check(phone);
+        if (check) {
+            renderError("该号码未注册");
+            return;
+        }
+        String code = CommonUtils.getRandomString(6);
+        boolean flag = SmsSend.sendMessage(new String[]{getPara("phone")}, "验证码" + code + "，您正在找回密码，若非本人操作，请勿泄露。");
+        if (flag) {
+            CacheKit.put(Constant.code, phone, String.valueOf(code));
+            renderSuccess();
+            return;
+        }
+        renderError("发送失败");
+    }
+
     @Clear
     @Before(AppUserValidator.class)
     public void login() {
-        System.out.println("aa:"+getPara("pass"));
         Ret ret = appUserService.login(getPara("account").trim(), getPara("pass").trim());
         renderJson(ret);
     }
 
+    @Clear
+    @Before(AppUserValidator.class)
+    public void register() {
+        User user = getModel(User.class, "", true);
+        user.put("code", getPara("code"));
+        Ret ret = appUserService.register(user);
+        renderJson(ret);
+    }
+
 
     public void userInfo() {
         User appUser = User.dao.findById(getPara("id"));
         renderSuccess(appUser);
     }
 
+    @Clear
+    @Before(AppUserValidator.class)
+    public void uploadFj() {
+        renderJson(Ret.by("url", getAttrForStr("url")));
+    }
+
     /**
      * 上传data:image格式的图片
      */
@@ -68,6 +100,15 @@ public class AppUserController extends BaseController {
         renderJson(Ret.by("url", "/upload" + Path + imgName));
     }
 
+    @Clear
+    @Before(AppUserValidator.class)
+    public void edit_pass() {
+        User user = getModel(User.class, "", true);
+        user.put("code", getPara("code"));
+        Ret ret = appUserService.edit_pass(user);
+        renderJson(ret);
+    }
+
     @Before(AppUserValidator.class)
     public void edit() {
         User appUser = new User();

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

@@ -2,12 +2,11 @@ package com.lsw.controller.front.user;
 
 import com.jfinal.kit.HashKit;
 import com.jfinal.kit.Ret;
-import com.jfinal.kit.StrKit;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.ehcache.CacheKit;
 import com.lsw.commons.utils.Constant;
-import com.lsw.model.work.User;
 import com.lsw.model.work.Token;
+import com.lsw.model.work.User;
 import org.apache.shiro.crypto.hash.SimpleHash;
 import org.apache.shiro.util.SimpleByteSource;
 
@@ -23,16 +22,16 @@ public class AppUserService {
         Ret ret = Ret.create();
         //第一次登录先保存用户信息
         User user = dao.findFirst("select * from tb_user where account=?", account);
-        if(user==null){
+        if (user == null) {
             ret.set("result", false).set("msg", "用户不存在");
             return ret;
         }
-        String v_pass=new SimpleHash("MD5", new SimpleByteSource(pass), new SimpleByteSource(user.getSalt()), 2).toHex();
-        if(!v_pass.equals(user.getPassword())){
+        String v_pass = HashKit.sha256(pass+ user.getSalt());
+        if (!v_pass.equals(user.getPassword())) {
             ret.set("result", false).set("msg", "密码错误!");
             return ret;
         }
-        if(user.getMSate()==1){
+        if (user.getMSate() == 1) {
             ret.set("result", false).set("msg", "该账户被限制登录");
             return ret;
         }
@@ -40,8 +39,8 @@ public class AppUserService {
         Token token = new Token();
         String secret = HashKit.generateSaltForSha256();
         token.setSecret(secret);
-       //token.setPhone(account);
-        token.put("mSate",0);
+        token.setPhone(account);
+        token.put("mSate", 0);
         token.save();
         user.put("token", secret);
         CacheKit.put(Constant.token, account, token);
@@ -60,7 +59,7 @@ public class AppUserService {
     public Token loginBySecret(String secret, String phone) {
         Token token = CacheKit.get(Constant.token, phone);
         if (token == null) {
-            token = Token.dao.findFirst("SELECT u.mSate FROM tb_token t LEFT JOIN tb_app_user u ON u.account = t.phone WHERE t.secret=? AND t.phone=? ORDER BY t.id DESC", secret, phone);
+            token = Token.dao.findFirst("SELECT u.mSate FROM tb_token t LEFT JOIN tb_user u ON u.account = t.phone WHERE t.secret=? AND t.phone=? ORDER BY t.id DESC", secret, phone);
             CacheKit.put(Constant.token, phone, token);
         }
         return token;
@@ -73,83 +72,64 @@ public class AppUserService {
      * @return
      */
     public boolean check(String account) {
-        User user = dao.findFirst("select * from tb_app_user where account=?", account);
+        User user = dao.findFirst("select * from tb_user where account=?", account);
         return user == null ? true : false;
     }
 
     /**
-     * 用户注册
-     *
-     * @param account  手机号
-     * @param password 密码
-     * @param newsCode 验证码
      * @return
      */
-    public Ret register(String account, String password, String newsCode) {
+    public Ret register(User user) {
         Ret ret = Ret.create();
-        boolean check = check(account);
-        if (check) {
-            String code = CacheKit.get(Constant.code, account);
-            if (code == null) {
-                ret.set("result", false).set("msg", "验证码超过有效期");
-                CacheKit.remove(Constant.code, account);
-                return ret;
-            }
-            if (code.equals(newsCode)) {
-                String salt = HashKit.generateSaltForSha256();
-                User user = new User();
-                user.setAccount(account);
-                user.setHeader("/upload/images/header/ls.png");
-                user.setSalt(salt);
-                //密码加密
-                user.setPassword(HashKit.sha256(password + salt));
-                user.setMTime(new Date());
-                user.save();
-                ret.set("result", true);
-            } else {
-                ret.set("result", false).set("msg", "验证码不正确");
-            }
-
-        } else {
-            ret.set("result", false).set("msg", "手机号已被注册");
+        boolean check = check(user.getAccount());
+        if (!check) {
+            return ret.set("result", false).set("msg", "手机号已被注册");
+        }
+        String code = CacheKit.get(Constant.code, user.getAccount());
+        if (code == null) {
+            CacheKit.remove(Constant.code, user.getAccount());
+            return ret.set("result", false).set("msg", "验证码超过有效期");
+        }
+        System.out.println("code:" + user.get("code"));
+        if (!code.equals(user.get("code"))) {
+            return ret.set("result", false).set("msg", "验证码不正确");
         }
+        //默认设置一个头像
+        user.setHeader("/upload/images/header/ls.png");
+        user.setNickName("用户");
+        //密码加密
+        String salt = HashKit.generateSaltForSha256();
+        user.setSalt(salt);
+        //刚注册的企业用户状态:未审核
+        if (user.getMType()==1){
+            user.setMSate(2);
+        }
+        user.setPassword(HashKit.sha256(user.getPassword() + salt));
+        user.setMTime(new Date());
+        user.save();
+        ret.set("result", true);
         return ret;
     }
 
     /**
-     * 找回密码
-     *
-     * @param account  账号
-     * @param password 密码
-     * @param newsCode 验证码
      * @return
      */
-    public Ret findPass(String account, String password, String newsCode) {
+    public Ret edit_pass(User user) {
         Ret ret = Ret.create();
-        boolean check = check(account);
-        if (check) {
-            ret.set("result", false).set("msg", "该号码未注册");
-        } else {
-            String code = CacheKit.get(Constant.code, account);
-            if (code == null) {
-                ret.set("result", false).set("msg", "验证码超过有效期");
-                CacheKit.remove(Constant.code, account);
-                return ret;
-            }
-            if (code.equals(newsCode)) {
-                String salt = HashKit.generateSaltForSha256();
-                //密码加密
-                password = HashKit.sha256(password + salt);
-                int row = Db.update("update tb_app_user set password =?,salt=? where account=?", password, salt, account);
-                if (row > 0) {
-                    ret.set("result", true);
-                } else {
-                    ret.set("result", false).set("msg", "找回密码失败");
-                }
-            } else {
-                ret.set("result", false).set("msg", "验证码不正确");
-            }
+        String code = CacheKit.get(Constant.code, user.getAccount());
+        if (code == null) {
+            CacheKit.remove(Constant.code, user.getAccount());
+            return ret.set("result", false).set("msg", "验证码超过有效期");
         }
+        System.out.println("code:" + user.get("code"));
+        if (!code.equals(user.get("code"))) {
+            return ret.set("result", false).set("msg", "验证码不正确");
+        }
+        //密码加密
+        String salt = HashKit.generateSaltForSha256();
+        Db.update("update tb_user set password =?,salt=? where account=?", HashKit.sha256(user.getPassword() + salt), salt, user.getAccount());
+        ret.set("result", true);
         return ret;
     }
+
 }

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

@@ -2,32 +2,30 @@ package com.lsw.controller.front.user;
 
 import com.jfinal.core.Controller;
 import com.jfinal.kit.PathKit;
+import com.jfinal.kit.StrKit;
 import com.jfinal.upload.UploadFile;
 import com.lsw.base.BaseValidator;
 import com.lsw.commons.utils.ImageKit;
-import com.lsw.commons.utils.ImageZipUtil;
 
 import java.io.File;
 import java.util.Random;
 
 public class AppUserValidator extends BaseValidator {
-    String Path = "/images/header/";
+    String Path = "/images/fj/";
     UploadFile uf = null;
     String imgName = System.currentTimeMillis() + new Random().nextInt(10000) + ".jpg";
 
 
     @Override
     protected void validate(Controller c) {
-        if (getActionKey().equals("/app/user/uploadHeader")) {
+        if (getActionKey().equals("/app/user/uploadFj")) {
             try {
-                uf = c.getFile("header", Path, 10240 * 10240);
+                uf = c.getFile("img", Path, 10240 * 10240);
                 if (ImageKit.notImageExtName(uf.getFileName())) {
                     uf.getFile().delete();
                     addError("msg", "只支持图片类型：gif、jpg、jpeg、png");
                 }
                 uf.getFile().renameTo(new File(PathKit.getWebRootPath() + "/upload" + Path + imgName));
-                //等比例压缩图片减少图片大小
-                ImageZipUtil.zipImageFile(new File(uf.getUploadPath() + imgName), new File(PathKit.getWebRootPath() + "/upload" + Path + imgName), 0.3);
                 c.setAttr("url", "/upload" + Path + imgName);
             } catch (Exception e) {
                 String msg = e.getMessage();
@@ -47,9 +45,29 @@ public class AppUserValidator extends BaseValidator {
             validateRequiredString("account", "msg", "手机号不能为空");
             validatePhone("account", "msg", "手机号格式不正确");
         }
-        if (url.equals("/app/user/sendMessage")) {
+        if (url.equals("/app/user/register")) {
             validateRequiredString("account", "msg", "手机号不能为空");
-            validatePhone("account", "msg", "格式不正确");
+            validatePhone("account", "msg", "手机号格式不正确");
+            validateRequiredString("password", "msg", "密码不能为空");
+            validateEqualString(c.getPara("password"), c.getPara("again"), "msg", "两次输入不一致");
+            validateRequiredString("code", "msg", "验证码不能为空");
+            if (c.getParaToInt("mType") == 1) {
+                validateRequiredString("company", "msg", "企业名称不能为空");
+                if (StrKit.isBlank(c.getPara("fj"))) {
+                    addError("msg", "请上传营业执照");
+                }
+            }
+        }
+        if (url.equals("/app/user/edit_pass")) {
+            validateRequiredString("account", "msg", "手机号不能为空");
+            validatePhone("account", "msg", "手机号格式不正确");
+            validateRequiredString("password", "msg", "密码不能为空");
+            validateEqualString(c.getPara("password"), c.getPara("again"), "msg", "两次输入不一致");
+            validateRequiredString("code", "msg", "验证码不能为空");
+        }
+        if (url.equals("/app/user/sendMessage")) {
+            validateRequiredString("phone", "msg", "手机号不能为空");
+            validatePhone("phone", "msg", "格式不正确");
         }
         if (url.equals("/app/user/edit")) {
             if (c.getPara("field").equals("phone")) {

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

@@ -51,7 +51,7 @@ public class News extends BaseNews<News> {
         if (StrKit.notBlank(columnId)) {
             sb.append(" AND n.columnId=" + columnId);
         }
-        sb.append(" ORDER BY n.isTop DESC");
+        sb.append(" ORDER BY n.isTop DESC,n.mTime DESC");
         return dao.paginate(page, 15, select, sb.toString());
     }
 }

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

@@ -20,7 +20,7 @@ public class _MappingKit {
 		arp.addMapping("tb_news", "id", News.class);
 		arp.addMapping("tb_news_column", "id", NewsColumn.class);
 		arp.addMapping("tb_position", "id", Position.class);
-//		arp.addMapping("tb_resume", "id", Resume.class);
+		arp.addMapping("tb_resume", "id", Resume.class);
 		arp.addMapping("tb_token", "id", Token.class);
 		arp.addMapping("tb_user", "id", User.class);
 	}

src/main/java/com/lsw/model/work/base/BaseUser.java

@@ -49,6 +49,14 @@ public abstract class BaseUser<M extends BaseUser<M>> extends Model<M> implement
 		return getStr("salt");
 	}
 
+	public void setSex(java.lang.String sex) {
+		set("sex", sex);
+	}
+
+	public java.lang.String getSex() {
+		return getStr("sex");
+	}
+
 	public void setNickName(java.lang.String nickName) {
 		set("nickName", nickName);
 	}
@@ -81,6 +89,14 @@ public abstract class BaseUser<M extends BaseUser<M>> extends Model<M> implement
 		return getStr("company");
 	}
 
+	public void setFj(java.lang.String fj) {
+		set("fj", fj);
+	}
+
+	public java.lang.String getFj() {
+		return getStr("fj");
+	}
+
 	public void setPhone(java.lang.String phone) {
 		set("phone", phone);
 	}

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

@@ -2,7 +2,8 @@ package com.lsw.route;
 
 import com.jfinal.config.Routes;
 import com.lsw.controller.front.main.MainController;
-import com.lsw.controller.front.main.NewsController;
+import com.lsw.controller.front.news.NewsController;
+import com.lsw.controller.front.resume.ResumeController;
 import com.lsw.controller.front.share.ShareController;
 import com.lsw.controller.front.user.AppUserController;
 
@@ -12,7 +13,8 @@ public class FrontRoute extends Routes {
         setBaseViewPath("/WEB-INF/view/front");
         add("/share", ShareController.class, "/share/"); // 分享页
         add("/app/user", AppUserController.class); // appuser
-        add("/app/news", NewsController.class); // appuser
+        add("/app/news", NewsController.class); // news
+        add("/app/resume", ResumeController.class); // news
         add("/app", MainController.class); // main
 
     }

src/main/resources/conf/jdbc_config.properties

@@ -9,6 +9,10 @@ jdbcUrl=jdbc\:mysql\://127.0.0.1\:3306/djfp?characterEncoding\=utf8&zeroDateTime
 #ip配置
 ip=localhost:7979
 
+#message 移动短信接口 api
+message_api=http://112.35.4.197:15000
+
+
 #邮箱配置
 emailServer=smtp.126.com
 fromEmail=lishuwen79@126.com

src/main/webapp/WEB-INF/view/admin/work/user/form.html

@@ -0,0 +1,79 @@
+#set(title="查看&审核")
+#@header()
+<body class="bg">
+        <form  id="addForm" method="post">
+            <input type="hidden"  name="id"  value="#(app.id??)">
+            <input type="hidden"  name="account"  value="#(app.account??)">
+            <table class="table">
+                <tbody>
+                <tr>
+                    <td class="l" width="150">用户账号 </td>
+                    <td>#(app.account)</td>
+                    <td class="l" width="150">用户昵称 </td>
+                    <td>#(app.nickName)</td>
+                </tr>
+                <tr>
+                    <td class="l">用户性别 </td>
+                    <td>#(app.sex)</td>
+                    <td class="l">电子邮箱 </td>
+                    <td>#(app.email)</td>
+                </tr>
+                <tr>
+                    <td class="l">账号类型 </td>
+                    <td><span class="badge badge-primary">#(app.mType==0?'个人用户':'企业用户')</span></td>
+                    <td class="l">账号状态 </td>
+                    <td>
+                        #if(app.mSate==0)
+                        <span class="badge badge-primary">正常</span>
+                        #end
+                        #if(app.mSate==1)
+                        <span class="badge badge-danger">锁定</span>
+                        #end
+                        #if(app.mSate==2)
+                        <span class="badge badge-danger">待审核</span>
+                        #end
+                        #if(app.mSate==3)
+                        <span class="badge badge-primary">审核不通过</span>
+                        #end
+                    </td>
+                </tr>
+                #if(app.mType==1)
+                <tr>
+                    <td colspan="6" style="background-color: #293846;color: white;font-size: 15px;"><span>企业信息</span></td>
+                </tr>
+                <tr>
+                    <td class="l">公司名称 </td>
+                    <td colspan="3">#(app.company)</td>
+                </tr>
+                <tr>
+                    <td class="l">营业执照 </td>
+                    <td colspan="3"><a onclick="view()">点击查看</a></td>
+                </tr>
+                <tr>
+                    <td class="l">审核状态</td>
+                    <td colspan="3">
+                        <select class="form-control" name="mSate">
+                            <option value="2" #(app.mSate??==2?'selected':'')>待审核</option>
+                            <option value="0" #(app.mSate??==0?'selected':'')>审核通过</option>
+                            <option value="3" #(app.mSate??==3?'selected':'')>审核不通过</option>
+                        </select>
+                    </td>
+                </tr>
+                #end
+                </tbody>
+            </table>
+        </form>
+#set(layer=true,util=true)
+#@op()
+#@js()
+<script>
+    function view(){
+        var json={"id":123,"start":0,"data":[{"alt":"营业执照查看","pid":666,"src":'#(path)#(app.fj)',"thumb":""}]}
+        layer.photos({photos:json,anim: 2});
+    }
+    $("#add").click(function() {
+        ajaxSubmit("#(path)/admin/work/user/#(op)",$("#addForm").serialize());
+    });
+</script>
+</body>
+</html>

src/main/webapp/WEB-INF/view/admin/work/user/list.html

@@ -41,6 +41,7 @@
         {label: '账号', name: 'account',frozen: true},
         {label: '昵称', name: 'nickName',frozen: true},
         {label: '邮箱', name: 'email',width:230},
+        {label: '公司名称', name: 'company'},
         {label: '用户类型', name: 'mType', formatter: type},
         {label: '状态', name: 'mSate', formatter: state},
         {label: '注册时间', name: 'mTime'}];
@@ -67,7 +68,18 @@
      * 账号状态
      */
     function state(cellvalue, options, rowObject) {
-        return cellvalue == 0 ? '<span class="label label-info">正常</span>' : '<span class="label label-danger">锁定</span>'
+        if(cellvalue==0){
+            return '<span class="label label-info">正常</span>';
+        }
+        if(cellvalue==1){
+            return '<span class="label label-danger">锁定</span>';
+        }
+        if(cellvalue==2){
+            return '<span class="label label-danger">未审核</span>';
+        }
+        if(cellvalue==3){
+            return '<span class="label label-danger">审核不通过</span>';
+        }
     }
     /**
      * 操作
@@ -87,6 +99,10 @@
                 layer.close(index);
             });
         }
+        if (op == 'audit') {
+            if(typeof(selectedRow())=='undefined'){return;}
+            openDialogDiy("查看&审核", "#(path)/admin/work/user/view?op=audit&id=" + selectedRow().id, "75%", "85%");
+        }
         if (op == 'delete') {
             deleteRows("#(path)/admin/work/user/delete?ids=");
         }

src/main/webapp/WEB-INF/view/admin/work/user/look.html

@@ -1,33 +0,0 @@
-#set(title="日志查看")
-#@header()
-<body class="bg">
-<form id="addForm" method="post">
-    <table class="table table-bordered">
-        <tbody>
-        <tr>
-            <td class="l" width="150px">执行人</td>
-            <td>#(log.realName??'未知用户')</td>
-        </tr>
-        <tr>
-            <td class="l">ip信息</td>
-            <td>#(log.ip??)</td>
-        </tr>
-        <tr>
-            <td class="l">操作</td>
-            <td>#(log.operation??)</td>
-        </tr>
-        <tr>
-            <td class="l" width="150px">执行时间</td>
-            <td colspan="3">#(log.createDate??)</td>
-        </tr>
-        <tr>
-            <td class="l" style="vertical-align: top;">操作信息</td>
-            <td colspan="3">
-                <div>#(log.remark??)</div>
-            </td>
-        </tr>
-        </tbody>
-    </table>
-</form>
-</body>
-</html>

src/main/webapp/static/ui/css/style.min.css

@@ -101,6 +101,7 @@ label.error{position:absolute;right:18px;top:21px;color:#ef392b;font-weight:norm
 /**标题**/
 .bod{border-bottom: 1px solid #ececec;padding-bottom: 4px;}
 .bod .t{border-bottom: 2px solid #fe5000;padding: 5px;color: #fe5000;font-size: 14px;}
+.tt{border-bottom: 2px solid #fe5000;padding: 5px;color: #fe5000;font-size: 14px;}
 .table > tbody > tr > td.l{background-color: aliceblue;font-weight: bold;text-align: center;}
 /**开关**/
 .switched {