editors;//记录可编辑者
+
+
+ //----------------------norm标准属性-----------------------
+ @Column(length = 126)
+ protected String name;//名称
+
+ protected Boolean avtag=true;//可用标记 1启用，0禁用
+
+ @ManyToOne
+ @JoinColumn(name = "crman", updatable = false)
+ protected SysOrg crman;//创建人
+
+ @Column(updatable = false)
+ protected Date crtim = new Date();//创建时间
+
+ @ManyToOne
+ @JoinColumn(name = "upman")
+ protected SysOrg upman;//更新人
+
+ protected Date uptim;//更新时间
+
+
+
+
+}
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/exception/BadConfigurationException.java b/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/exception/BadConfigurationException.java
new file mode 100644
index 0000000..fd96a60
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/exception/BadConfigurationException.java
@@ -0,0 +1,77 @@
+package com.zsvg.vboot.common.mvc.exception;
+
+public class BadConfigurationException extends RuntimeException {
+ /**
+ * Constructs a new runtime exception with {@code null} as its
+ * detail message. The cause is not initialized, and may subsequently be
+ * initialized by a call to {@link #initCause}.
+ */
+ public BadConfigurationException() {
+ super();
+ }
+
+ /**
+ * Constructs a new runtime exception with the specified detail message.
+ * The cause is not initialized, and may subsequently be initialized by a
+ * call to {@link #initCause}.
+ *
+ * @param message the detail message. The detail message is saved for
+ * later retrieval by the {@link #getMessage()} method.
+ */
+ public BadConfigurationException(String message) {
+ super(message);
+ }
+
+ /**
+ * Constructs a new runtime exception with the specified detail message and
+ * cause. Note that the detail message associated with
+ * {@code cause} is not automatically incorporated in
+ * this runtime exception's detail message.
+ *
+ * @param message the detail message (which is saved for later retrieval
+ * by the {@link #getMessage()} method).
+ * @param cause the cause (which is saved for later retrieval by the
+ * {@link #getCause()} method). (A {@code null} value is
+ * permitted, and indicates that the cause is nonexistent or
+ * unknown.)
+ * @since 1.4
+ */
+ public BadConfigurationException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ /**
+ * Constructs a new runtime exception with the specified cause and a
+ * detail message of {@code (cause==null ? null : cause.toString())}
+ * (which typically contains the class and detail message of
+ * {@code cause}). This constructor is useful for runtime exceptions
+ * that are little more than wrappers for other throwables.
+ *
+ * @param cause the cause (which is saved for later retrieval by the
+ * {@link #getCause()} method). (A {@code null} value is
+ * permitted, and indicates that the cause is nonexistent or
+ * unknown.)
+ * @since 1.4
+ */
+ public BadConfigurationException(Throwable cause) {
+ super(cause);
+ }
+
+ /**
+ * Constructs a new runtime exception with the specified detail
+ * message, cause, suppression enabled or disabled, and writable
+ * stack trace enabled or disabled.
+ *
+ * @param message the detail message.
+ * @param cause the cause. (A {@code null} value is permitted,
+ * and indicates that the cause is nonexistent or unknown.)
+ * @param enableSuppression whether or not suppression is enabled
+ * or disabled
+ * @param writableStackTrace whether or not the stack trace should
+ * be writable
+ * @since 1.7
+ */
+ protected BadConfigurationException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+ super(message, cause, enableSuppression, writableStackTrace);
+ }
+}
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/exception/BadRequestException.java b/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/exception/BadRequestException.java
new file mode 100644
index 0000000..f607426
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/exception/BadRequestException.java
@@ -0,0 +1,21 @@
+package com.zsvg.vboot.common.mvc.exception;
+
+import lombok.Getter;
+import org.springframework.http.HttpStatus;
+
+import static org.springframework.http.HttpStatus.BAD_REQUEST;
+
+@Getter
+public class BadRequestException extends RuntimeException{
+
+ private Integer status = BAD_REQUEST.value();
+
+ public BadRequestException(String msg){
+ super(msg);
+ }
+
+ public BadRequestException(HttpStatus status, String msg){
+ super(msg);
+ this.status = status.value();
+ }
+}
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/exception/EntityExistException.java b/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/exception/EntityExistException.java
new file mode 100644
index 0000000..8fe28b9
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/exception/EntityExistException.java
@@ -0,0 +1,15 @@
+package com.zsvg.vboot.common.mvc.exception;
+
+import org.springframework.util.StringUtils;
+
+public class EntityExistException extends RuntimeException {
+
+ public EntityExistException(Class clazz, String field, String val) {
+ super(EntityExistException.generateMessage(clazz.getSimpleName(), field, val));
+ }
+
+ private static String generateMessage(String entity, String field, String val) {
+ return StringUtils.capitalize(entity)
+ + " with " + field + " "+ val + " existed";
+ }
+}
\ No newline at end of file
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/exception/EntityNotFoundException.java b/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/exception/EntityNotFoundException.java
new file mode 100644
index 0000000..362eb59
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/exception/EntityNotFoundException.java
@@ -0,0 +1,15 @@
+package com.zsvg.vboot.common.mvc.exception;
+
+import org.springframework.util.StringUtils;
+
+public class EntityNotFoundException extends RuntimeException {
+
+ public EntityNotFoundException(Class clazz, String field, String val) {
+ super(EntityNotFoundException.generateMessage(clazz.getSimpleName(), field, val));
+ }
+
+ private static String generateMessage(String entity, String field, String val) {
+ return StringUtils.capitalize(entity)
+ + " with " + field + " "+ val + " does not exist";
+ }
+}
\ No newline at end of file
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/exception/handler/ApiError.java b/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/exception/handler/ApiError.java
new file mode 100644
index 0000000..2623c68
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/exception/handler/ApiError.java
@@ -0,0 +1,34 @@
+package com.zsvg.vboot.common.mvc.exception.handler;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+class ApiError {
+
+ private Integer status = 500;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime timestamp;
+ private String message;
+
+ private ApiError() {
+ timestamp = LocalDateTime.now();
+ }
+
+ public static ApiError error(String message){
+ ApiError apiError = new ApiError();
+ apiError.setMessage(message);
+ return apiError;
+ }
+
+ public static ApiError error(Integer status, String message){
+ ApiError apiError = new ApiError();
+ apiError.setStatus(status);
+ apiError.setMessage(message);
+ return apiError;
+ }
+}
+
+
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/exception/handler/GlobalExceptionHandler.java b/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/exception/handler/GlobalExceptionHandler.java
new file mode 100644
index 0000000..fd3f7bc
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/exception/handler/GlobalExceptionHandler.java
@@ -0,0 +1,95 @@
+package com.zsvg.vboot.common.mvc.exception.handler;
+
+import com.zsvg.vboot.common.mvc.exception.BadRequestException;
+import com.zsvg.vboot.common.mvc.exception.EntityExistException;
+import com.zsvg.vboot.common.mvc.exception.EntityNotFoundException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+import java.util.Objects;
+
+import static org.springframework.http.HttpStatus.NOT_FOUND;
+
+@Slf4j
+@RestControllerAdvice
+public class GlobalExceptionHandler {
+
+ /**
+ * 处理所有不可知的异常
+ */
+ @ExceptionHandler(Throwable.class)
+ public ResponseEntity handleException(Throwable e){
+ // 打印堆栈信息
+ log.error(ThrowableUtil.getStackTrace(e));
+ return buildResponseEntity(ApiError.error(e.getMessage()));
+ }
+
+ /**
+ * BadCredentialsException
+ */
+ @ExceptionHandler(BadCredentialsException.class)
+ public ResponseEntity badCredentialsException(BadCredentialsException e){
+ // 打印堆栈信息
+ String message = "坏的凭证".equals(e.getMessage()) ? "用户名或密码不正确" : e.getMessage();
+ log.error(message);
+ return buildResponseEntity(ApiError.error(message));
+ }
+
+ /**
+ * 处理自定义异常
+ */
+ @ExceptionHandler(value = BadRequestException.class)
+ public ResponseEntity badRequestException(BadRequestException e) {
+ // 打印堆栈信息
+ log.error(ThrowableUtil.getStackTrace(e));
+ return buildResponseEntity(ApiError.error(e.getStatus(),e.getMessage()));
+ }
+
+ /**
+ * 处理 EntityExist
+ */
+ @ExceptionHandler(value = EntityExistException.class)
+ public ResponseEntity entityExistException(EntityExistException e) {
+ // 打印堆栈信息
+ log.error(ThrowableUtil.getStackTrace(e));
+ return buildResponseEntity(ApiError.error(e.getMessage()));
+ }
+
+ /**
+ * 处理 EntityNotFound
+ */
+ @ExceptionHandler(value = EntityNotFoundException.class)
+ public ResponseEntity entityNotFoundException(EntityNotFoundException e) {
+ // 打印堆栈信息
+ log.error(ThrowableUtil.getStackTrace(e));
+ return buildResponseEntity(ApiError.error(NOT_FOUND.value(),e.getMessage()));
+ }
+
+ /**
+ * 处理所有接口数据验证异常
+ */
+ @ExceptionHandler(MethodArgumentNotValidException.class)
+ public ResponseEntity handleMethodArgumentNotValidException(MethodArgumentNotValidException e){
+ // 打印堆栈信息
+ log.error(ThrowableUtil.getStackTrace(e));
+ String[] str = Objects.requireNonNull(e.getBindingResult().getAllErrors().get(0).getCodes())[1].split("\\.");
+ String message = e.getBindingResult().getAllErrors().get(0).getDefaultMessage();
+ String msg = "不能为空";
+ if(msg.equals(message)){
+ message = str[1] + ":" + message;
+ }
+ return buildResponseEntity(ApiError.error(message));
+ }
+
+ /**
+ * 统一返回
+ */
+ private ResponseEntity buildResponseEntity(ApiError apiError) {
+ return new ResponseEntity<>(apiError, HttpStatus.valueOf(apiError.getStatus()));
+ }
+}
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/exception/handler/ThrowableUtil.java b/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/exception/handler/ThrowableUtil.java
new file mode 100644
index 0000000..252de81
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/exception/handler/ThrowableUtil.java
@@ -0,0 +1,18 @@
+package com.zsvg.vboot.common.mvc.exception.handler;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+public class ThrowableUtil {
+
+ /**
+ * 获取堆栈信息
+ */
+ public static String getStackTrace(Throwable throwable){
+ StringWriter sw = new StringWriter();
+ try (PrintWriter pw = new PrintWriter(sw)) {
+ throwable.printStackTrace(pw);
+ return sw.toString();
+ }
+ }
+}
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/others/MapHelper.java b/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/others/MapHelper.java
new file mode 100644
index 0000000..5dfc661
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/others/MapHelper.java
@@ -0,0 +1,34 @@
+package com.zsvg.vboot.common.mvc.others;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+public class MapHelper {
+ private Map map;
+
+ public MapHelper(){
+ map = new LinkedHashMap<>();
+ }
+
+ public MapHelper(String field,String title){
+ map = new LinkedHashMap<>();
+ map.put("field", field);
+ map.put("title", title);
+ }
+
+ public MapHelper put(String key,String value){
+ map.put(key, value);
+ return this;
+ }
+
+ public Map get(){
+ return map;
+ }
+
+ public MapHelper addTo(List list){
+ list.add(map);
+ return this;
+ }
+
+}
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/pojo/Zconn.java b/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/pojo/Zconn.java
new file mode 100644
index 0000000..7203c50
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/pojo/Zconn.java
@@ -0,0 +1,72 @@
+package com.zsvg.vboot.common.mvc.pojo;
+
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class Zconn {
+ private String type;
+
+ private String url;
+
+ private String username;
+
+ private String passcode;
+
+
+
+ public String getSid()
+ {
+ if(isMysql())
+ {
+ return url.substring(url.lastIndexOf("/")+1).replaceAll("/","");
+ }
+ else if (isOracle())
+ {
+ return url.substring(url.lastIndexOf(":")+1);
+ }
+ else if (isDB2())
+ {
+ return url.substring(url.lastIndexOf("/")+1);
+ }
+ else{
+ return null;
+ }
+ }
+
+ public String getDriver(){
+ if(isOracle()){
+ return "oracle.jdbc.driver.OracleDriver";
+ }else if(isMysql()){
+ return "com.mysql.jdbc.Driver";
+ }else if(isMysql8()){
+ return "com.mysql.cj.jdbc.Driver";
+ }else if(isDB2()){
+ return "com.ibm.db2.jcc.DB2Driver";
+ }else{
+ return "暂不支持";
+ }
+ }
+
+ public boolean isOracle()
+ {
+ return "ORACLE".equals(type);
+ }
+ public boolean isMysql()
+ {
+ return "MYSQL".equals(type);
+ }
+ public boolean isMysql8()
+ {
+ return "MYSQL8".equals(type);
+ }
+ public boolean isDB2()
+ {
+ return "DB2".equals(type);
+ }
+}
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/pojo/ZidName.java b/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/pojo/ZidName.java
new file mode 100644
index 0000000..155c42a
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/pojo/ZidName.java
@@ -0,0 +1,47 @@
+package com.zsvg.vboot.common.mvc.pojo;
+
+
+public class ZidName
+{
+ private String id;
+ private String name;
+
+ @Override
+ public String toString() {
+ return "ZidName{" +
+ "id='" + id + '\'' +
+ ", name='" + name + '\'' +
+ '}';
+ }
+
+ public ZidName(String id, String name)
+ {
+ this.id = id;
+ this.name = name;
+ }
+
+ public ZidName()
+ {
+ }
+
+ //get and set-------
+ public String getId()
+ {
+ return id;
+ }
+
+ public void setId(String id)
+ {
+ this.id = id;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+}
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/pojo/Zinp.java b/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/pojo/Zinp.java
new file mode 100644
index 0000000..ab52953
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/pojo/Zinp.java
@@ -0,0 +1,49 @@
+package com.zsvg.vboot.common.mvc.pojo;
+
+public class Zinp {
+ private String id;
+ private String name;
+ private String pid;
+
+ public Zinp() {
+ }
+
+ public Zinp(String id) {
+ this.id = id;
+ }
+
+ public Zinp(String id, String name) {
+ this.id = id;
+ this.name = name;
+ }
+
+ public Zinp(String id, String name, String pid) {
+ this.id = id;
+ this.name = name;
+ this.pid = pid;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getPid() {
+ return pid;
+ }
+
+ public void setPid(String pid) {
+ this.pid = pid;
+ }
+}
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/pojo/Ztree.java b/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/pojo/Ztree.java
new file mode 100644
index 0000000..ab8f2af
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/pojo/Ztree.java
@@ -0,0 +1,23 @@
+package com.zsvg.vboot.common.mvc.pojo;
+
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class Ztree {
+ private String id;
+
+ private String name;
+
+ @JsonIgnore
+ private String pid;
+
+ private List children;
+
+ private Map data;
+
+}
\ No newline at end of file
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/service/BaseCateService.java b/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/service/BaseCateService.java
new file mode 100644
index 0000000..bcb69d2
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/service/BaseCateService.java
@@ -0,0 +1,229 @@
+package com.zsvg.vboot.common.mvc.service;
+
+import com.zsvg.vboot.common.mvc.api.RestResult;
+import com.zsvg.vboot.common.mvc.dao.JdbcDao;
+import com.zsvg.vboot.common.mvc.dao.Sqler;
+import com.zsvg.vboot.common.mvc.pojo.ZidName;
+import com.zsvg.vboot.common.mvc.pojo.Ztree;
+import com.zsvg.vboot.common.mvc.entity.BaseCateEntity;
+import com.zsvg.vboot.common.mvc.api.PageData;
+import com.zsvg.vboot.common.mvc.pojo.Zinp;
+import com.zsvg.vboot.common.util.lang.XstringUtil;
+import com.zsvg.vboot.common.util.web.XuserUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Transactional(rollbackFor = Exception.class)
+public abstract class BaseCateService {
+
+ @Transactional(readOnly = true)
+ public PageData findPageData(Sqler sqler) {
+ sqler.selectCUinfo().addSelect("t.label");
+ sqler.addOrder("t.ornum");
+ return jdbcDao.findPageData(sqler);
+ }
+
+ @Transactional(readOnly = true)
+ public List findIdNameRes(Sqler sqler) {
+ return jdbcDao.findIdNameList(sqler);
+ }
+
+
+
+ //用户编辑时选择父类别，不能选择自己及孩子节点，否则会造成无线循环
+ @Transactional(readOnly = true)
+ public List inpChoose(String table, String id, String name){
+ Sqler sqler = new Sqler(table);
+ sqler.addSelect("pid");
+ sqler.addWhere("t.avtag = 1");
+ if (XstringUtil.isNotBlank(id)) {
+ sqler.addWhere("t.tier not like ?", "%;" + id + ";%");
+ sqler.addWhere("t.id <> ?", id);
+ }
+ if(XstringUtil.isNotBlank(name)){
+ sqler.addLike("t.name", name);
+ }
+ sqler.addOrder("t.ornum");
+ return jdbcDao.findInpList(sqler);
+ }
+
+ @Transactional(readOnly = true)
+ public List tier2Choose(String table, String id, String name){
+ Sqler sqler = new Sqler(table);
+ sqler.addSelect("pid");
+ sqler.addWhere("t.avtag = 1");
+ if (XstringUtil.isNotBlank(id)) {
+ sqler.addWhere("t.tier not like ?", "%;" + id + ";%");
+ sqler.addWhere("t.id <> ?", id);
+ }
+ if(XstringUtil.isNotBlank(name)){
+ sqler.addLike("t.name", name);
+ }
+ sqler.addOrder("t.ornum");
+ return jdbcDao.findTreeList(sqler);
+ }
+
+
+ @Transactional(readOnly = true)
+ public RestResult inpFind(String table){
+ Sqler sqlHelper = new Sqler(table);
+ sqlHelper.addSelect("pid");
+ sqlHelper.addWhere("t.avtag = 1");
+ sqlHelper.addOrder("t.ornum");
+ return RestResult.ok(jdbcDao.findInpList(sqlHelper));
+ }
+
+ public RestResult inpDele(String table, String id){
+ String sql = "select id from " + table + " where tier like ? order by tier";
+ List stringList = jdbcDao.findStringList(sql, "%;" + id + ";%");
+ for (String sid : stringList) {
+ repo.deleteById(sid);
+ }
+ repo.deleteById(id);
+ return RestResult.ok();
+ }
+
+ public String insert(T cate) {
+ if(cate.getId()==null||"".equals(cate.getId())){
+ cate.setId(XstringUtil.getUUID());
+ }
+ if(cate.getCrman()==null){
+ cate.setCrman(XuserUtil.getUser());
+ }
+ if (cate.getParent() != null) {
+ T parent = repo.findById(cate.getParent().getId()).get();
+ cate.setTier(parent.getTier()+parent.getId()+ ";");
+ } else {
+ cate.setTier("null;");
+ }
+ repo.save(cate);
+ return cate.getId();
+ }
+
+ public String update(T cate){
+ cate.setUptim(new Date());
+ if(cate.getUpman()==null){
+ cate.setUpman(XuserUtil.getUser());
+ }
+ repo.save(cate);
+ return cate.getId();
+ }
+
+
+ public String update(T cate,String table){
+ cate.setUptim(new Date());
+ if(cate.getUpman()==null){
+ cate.setUpman(XuserUtil.getUser());
+ }
+ String newPid = "";
+ if(cate.getParent()!=null){
+ newPid=cate.getParent().getId();
+ }
+ T oldCate=repo.findById(cate.getId()).get();
+ String oldPid="";
+ if(oldCate.getParent()!=null){
+ oldPid =oldCate.getParent().getId();
+ }
+ String oldTier=oldCate.getTier();
+ if(oldPid.equals(newPid)){//如果父节点没有变，则只更新自己
+// System.out.println("父节点没有变");
+ cate.setTier(oldTier);
+ repo.save(cate);
+ }else{//如果父节点变了，则另外需要更新自己孩子节点的tier层级
+ String newTier = "null;";
+ if(cate.getParent()!=null){
+// System.out.println("父节点变成其他点了");
+ T newParentCate=repo.findById(cate.getParent().getId()).get();
+ newTier =newParentCate.getTier()+newParentCate.getId()+";";
+ }else{
+// System.out.println("父节点变成更节点了");
+ }
+ cate.setTier(newTier);
+ repo.save(cate);
+ //更新子节点
+ String sql = "select id,tier as name from " + table + " where tier like ? and id<>?";
+// System.out.println(sql);
+ List list = jdbcDao.findIdNameList(sql, oldTier+oldCate.getId()+";%",cate.getId());
+
+ String updateSql = "update " + table + " set tier=? where id=?";
+ List updateList = new ArrayList();
+ for (ZidName ztwo : list) {
+ Object[] arr = new Object[2];
+ arr[0] = ztwo.getName().replace(oldTier,newTier);
+ arr[1] = ztwo.getId();
+ updateList.add(arr);
+ }
+ jdbcDao.batch(updateSql, updateList);
+ }
+ return cate.getId();
+
+ }
+
+ @Autowired
+ protected JdbcDao jdbcDao;
+
+ protected JpaRepository repo;
+
+ public void setRepo(JpaRepository repo) {
+ this.repo = repo;
+ }
+
+// public T save(T t) {
+// return repo.save(t);
+// }
+//
+// public T update(T t) {
+// return repo.saveAndFlush(t);
+// }
+//
+ @Transactional(readOnly = true)
+ public T findOne(String id) {
+ return repo.findById(id).get();
+ }
+
+ public int delete(String[] ids) {
+ for (String id : ids) {
+ repo.deleteById(id);
+ }
+ return ids.length;
+ }
+//
+// public void deleteOne(T t) {
+// repo.delete(t);
+// }
+//
+//// public boolean exists(String id) {
+//// return baseDao.exists(id);
+//// }
+//
+// public long count() {
+// return baseDao.count();
+// }
+//
+// public List findAll() {
+// return baseDao.findAll();
+// }
+//
+// public List findAll(Sort sort) {
+// return baseDao.findAll(sort);
+// }
+//
+// public List findAll(Specification specification) {
+// // TODO Auto-generated method stub
+// return null;
+// }
+//
+// public Page findAll(Pageable pageable) {
+// return baseDao.findAll(pageable);
+// }
+//
+// public Page findAll(Specification specification, Pageable pageable) {
+// // TODO Auto-generated method stub
+// return null;
+// }
+}
\ No newline at end of file
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/service/BaseMainService.java b/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/service/BaseMainService.java
new file mode 100644
index 0000000..8ca761e
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/service/BaseMainService.java
@@ -0,0 +1,98 @@
+package com.zsvg.vboot.common.mvc.service;
+
+import com.zsvg.vboot.common.mvc.dao.JdbcDao;
+import com.zsvg.vboot.common.mvc.dao.Sqler;
+import com.zsvg.vboot.common.mvc.entity.BaseMainEntity;
+import com.zsvg.vboot.common.mvc.api.PageData;
+import com.zsvg.vboot.common.util.lang.XstringUtil;
+import com.zsvg.vboot.common.util.web.XuserUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Transactional(rollbackFor = Exception.class)
+public abstract class BaseMainService {
+
+ //---------------------------------------查询-------------------------------------
+ @Transactional(readOnly = true)
+ public PageData findPageData(Sqler sqler) {
+ if (sqler.getAutoType() == 1) {
+ sqler.selectCUinfo();
+ sqler.addOrder("t.crtim desc");
+ }
+ return jdbcDao.findPageData(sqler);
+ }
+
+ @Transactional(readOnly = true)
+ public List> findMapList(Sqler sqler) {
+ return jdbcDao.findMapList(sqler);
+ }
+
+ @Transactional(readOnly = true)
+ public List> findMapList(String sql, Object... args) {
+ return jdbcDao.findMapList(sql, args);
+ }
+
+ @Transactional(readOnly = true)
+ public boolean existsById(String id) {
+ return repo.existsById(id);
+ }
+
+ @Transactional(readOnly = true)
+ public T findOne(String id) {
+ return repo.findById(id).get();
+ }
+
+ @Transactional(readOnly = true)
+ public List findAll() {
+ return repo.findAll();
+ }
+
+ //---------------------------------------增删改-------------------------------------
+ public T insert(T main) {
+ if (main.getId() == null || "".equals(main.getId())) {
+ main.setId(XstringUtil.getUUID());
+ }
+ main.setCrtim(new Date());
+ if (main.getCrman() == null) {
+ main.setCrman(XuserUtil.getUser());
+ }
+ return repo.save(main);
+ }
+
+ public int delete(String[] ids) {
+ for (String id : ids) {
+ repo.deleteById(id);
+ }
+ return ids.length;
+ }
+
+ public T update(T main) {
+ main.setUptim(new Date());
+ if (main.getUpman() == null) {
+ main.setUpman(XuserUtil.getUser());
+ }
+ return repo.save(main);
+ }
+
+ public T save(T t) {
+ return repo.save(t);
+ }
+
+
+ //---------------------------------------bean注入-------------------------------------
+ @Autowired
+ protected JdbcDao jdbcDao;
+
+ protected JpaRepository repo;
+
+ public void setRepo(JpaRepository repo) {
+ this.repo = repo;
+ }
+
+
+}
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/service/BaseService.java b/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/service/BaseService.java
new file mode 100644
index 0000000..7a32a7d
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/service/BaseService.java
@@ -0,0 +1,85 @@
+package com.zsvg.vboot.common.mvc.service;
+
+import com.zsvg.vboot.common.mvc.dao.JdbcDao;
+import com.zsvg.vboot.common.mvc.dao.Sqler;
+import com.zsvg.vboot.common.mvc.api.PageData;
+import com.zsvg.vboot.common.mvc.entity.BaseEntity;
+import com.zsvg.vboot.common.util.lang.XstringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+@Transactional(rollbackFor = Exception.class)
+public abstract class BaseService {
+
+ //---------------------------------------查询-------------------------------------
+ @Transactional(readOnly = true)
+ public PageData findPageData(Sqler sqler) {
+ return jdbcDao.findPageData(sqler);
+ }
+
+ @Transactional(readOnly = true)
+ public List> findMapList(Sqler sqler) {
+ return jdbcDao.findMapList(sqler);
+ }
+
+ @Transactional(readOnly = true)
+ public List> findMapList(String sql,Object... args) {
+ return jdbcDao.findMapList(sql,args);
+ }
+
+ @Transactional(readOnly = true)
+ public boolean existsById(String id) {
+ return repo.existsById(id);
+ }
+
+ @Transactional(readOnly = true)
+ public T findOne(String id) {
+ return repo.findById(id).get();
+ }
+
+ @Transactional(readOnly = true)
+ public List findAll() {
+ return repo.findAll();
+ }
+
+
+ //---------------------------------------增删改-------------------------------------
+ public T insert(T main) {
+ if (main.getId() == null||"".equals(main.getId())) {
+ main.setId(XstringUtil.getUUID());
+ }
+ return repo.save(main);
+ }
+
+ public int delete(String[] ids) {
+ for (String id : ids) {
+ repo.deleteById(id);
+ }
+ return ids.length;
+ }
+
+ public T update(T main) {
+ return repo.save(main);
+ }
+
+ public T save(T t) {
+ return repo.save(t);
+ }
+
+
+ //---------------------------------------bean注入-------------------------------------
+ @Autowired
+ protected JdbcDao jdbcDao;
+
+ protected JpaRepository repo;
+
+ public void setRepo(JpaRepository repo) {
+ this.repo = repo;
+ }
+
+
+}
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/util/file/XexcelUtil.java b/vboot-core/src/main/java/com/zsvg/vboot/common/util/file/XexcelUtil.java
new file mode 100644
index 0000000..e6f595a
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/common/util/file/XexcelUtil.java
@@ -0,0 +1,159 @@
+package com.zsvg.vboot.common.util.file;
+
+import com.zsvg.vboot.common.util.lang.XdateUtil;
+import org.apache.poi.hssf.usermodel.HSSFCellStyle;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
+
+import java.util.Iterator;
+
+@SuppressWarnings("unchecked")
+public class XexcelUtil
+{
+ //转换列数字序号列字母序号
+ public static String excelColIndexToStr(int columnIndex)
+ {
+ if (columnIndex <= 0)
+ {
+ return null;
+ }
+ String columnStr = "";
+ columnIndex--;
+ do
+ {
+ if (columnStr.length() > 0)
+ {
+ columnIndex--;
+ }
+ columnStr = ((char) (columnIndex % 26 + (int) 'A')) + columnStr;
+ columnIndex = ((columnIndex - columnIndex % 26) / 26);
+ } while (columnIndex > 0);
+ return columnStr;
+ }
+
+
+ //---------------------以下为EXCEL复制功能-----------------
+
+
+ //行复制功能
+ public static void copyRow(Row fromRow, Row toRow, boolean copyValueFlag) {
+ toRow.setHeight(fromRow.getHeight());
+ for(Iterator cellIt = fromRow.cellIterator(); cellIt.hasNext(); ) {
+ Cell tmpCell = (Cell) cellIt.next();
+ Cell newCell = toRow.createCell(tmpCell.getColumnIndex());
+ copyCell(tmpCell, newCell, copyValueFlag);
+ }
+ Sheet worksheet = fromRow.getSheet();
+ for(int i = 0; i < worksheet.getNumMergedRegions(); i++) {
+ CellRangeAddress cellRangeAddress = worksheet.getMergedRegion(i);
+ if(cellRangeAddress.getFirstRow() == fromRow.getRowNum()) {
+ CellRangeAddress newCellRangeAddress = new CellRangeAddress(toRow.getRowNum(), (toRow.getRowNum() +
+ (cellRangeAddress.getLastRow() - cellRangeAddress.getFirstRow())), cellRangeAddress
+ .getFirstColumn(), cellRangeAddress.getLastColumn());
+ worksheet.addMergedRegionUnsafe(newCellRangeAddress);
+ }
+ }
+ }
+
+ //复制单元格 true则连同cell的内容一起复制
+ public static void copyCell(Cell srcCell, Cell distCell, boolean copyValueFlag) {
+ //样式
+ distCell.setCellStyle(srcCell.getCellStyle());
+ //评论
+ if(srcCell.getCellComment() != null) {
+ distCell.setCellComment(srcCell.getCellComment());
+ }
+ // 不同数据类型处理
+ CellType srcCellType = srcCell.getCellTypeEnum();
+ distCell.setCellType(srcCellType);
+ if(copyValueFlag) {
+ if(srcCellType == CellType.NUMERIC) {
+ if(DateUtil.isCellDateFormatted(srcCell)) {
+ distCell.setCellValue(srcCell.getDateCellValue());
+ } else {
+ distCell.setCellValue(srcCell.getNumericCellValue());
+ }
+ } else if(srcCellType == CellType.STRING) {
+ distCell.setCellValue(srcCell.getRichStringCellValue());
+ } else if(srcCellType == CellType.BLANK) {
+
+ } else if(srcCellType == CellType.BOOLEAN) {
+ distCell.setCellValue(srcCell.getBooleanCellValue());
+ } else if(srcCellType == CellType.ERROR) {
+ distCell.setCellErrorValue(srcCell.getErrorCellValue());
+ } else if(srcCellType == CellType.FORMULA) {
+ distCell.setCellFormula(srcCell.getCellFormula());
+ } else {
+ }
+ }
+ }
+
+ //复制单元格 true则连同cell的内容一起复制
+ public static HSSFCellStyle createCellStyle(HSSFWorkbook workbook,short index)
+ {
+ HSSFCellStyle style = workbook.createCellStyle();
+ style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+ style.setFillForegroundColor(index);
+ style.setBorderBottom(BorderStyle.HAIR);
+ style.setBorderTop(BorderStyle.HAIR);
+ style.setBorderLeft(BorderStyle.HAIR);
+ style.setBorderRight(BorderStyle.HAIR);
+ return style;
+ }
+
+ public static Object getCellValue(Cell cell)
+ {
+ Object back = null;
+ if (null != cell)
+ {
+ switch (cell.getCellType())
+ {
+ case Cell.CELL_TYPE_BLANK:
+ back = null;
+ break;
+ case Cell.CELL_TYPE_BOOLEAN:
+ back = Boolean.toString(cell.getBooleanCellValue());
+ break;
+ //数值
+ case Cell.CELL_TYPE_NUMERIC:
+ if (DateUtil.isCellDateFormatted(cell))
+ {
+ back = XdateUtil.getDate(cell.getDateCellValue());
+ } else
+ {
+ cell.setCellType(Cell.CELL_TYPE_STRING);
+ String temp = cell.getStringCellValue();
+ //判断是否包含小数点，如果不含小数点，则以字符串读取，如果含小数点，则转换为Double类型的字符串
+ if (temp.indexOf(".") > -1)
+ {
+ back = String.valueOf(new Double(temp)).trim();
+ } else
+ {
+ back = temp.trim();
+ }
+ }
+ break;
+ case Cell.CELL_TYPE_STRING:
+ back = cell.getStringCellValue().trim();
+ if ("".equals(back))
+ {
+ back = null;
+ }
+ break;
+ case Cell.CELL_TYPE_ERROR:
+ back = null;
+ break;
+ case Cell.CELL_TYPE_FORMULA:
+ cell.setCellType(Cell.CELL_TYPE_STRING);
+ back = cell.getStringCellValue();
+ break;
+ default:
+ back = null;
+ break;
+ }
+ }
+ return back;
+ }
+
+}
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/util/file/XfileUtil.java b/vboot-core/src/main/java/com/zsvg/vboot/common/util/file/XfileUtil.java
new file mode 100644
index 0000000..d633fc2
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/common/util/file/XfileUtil.java
@@ -0,0 +1,76 @@
+package com.zsvg.vboot.common.util.file;
+
+import java.io.*;
+import java.nio.charset.Charset;
+import java.text.DecimalFormat;
+import java.util.Enumeration;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+public class XfileUtil
+{
+ public static String getFileSize(long fileS)
+ {
+ String size = "";
+ DecimalFormat df = new DecimalFormat("#.00");
+ if (fileS < 1024)
+ {
+ size = df.format((double) fileS) + "B";
+ } else if (fileS < 1048576)
+ {
+ size = df.format((double) fileS / 1024) + "KB";
+ } else if (fileS < 1073741824)
+ {
+ size = df.format((double) fileS / 1048576) + "MB";
+ } else
+ {
+ size = df.format((double) fileS / 1073741824) + "GB";
+ }
+ return size;
+ }
+
+ public static void unZipFiles(File zipFile,String descDir)throws IOException
+ {
+ File pathFile = new File(descDir);
+ if(!pathFile.exists())
+ {
+ pathFile.mkdirs();
+ }
+ //解决zip文件中有中文目录或者中文文件
+ ZipFile zip = new ZipFile(zipFile, Charset.forName("GBK"));
+ for(Enumeration entries = zip.entries(); entries.hasMoreElements();)
+ {
+ ZipEntry entry = (ZipEntry)entries.nextElement();
+ String zipEntryName = entry.getName();
+ int len2=zipEntryName.split("/")[0].length();
+ zipEntryName = zipEntryName.substring(len2, zipEntryName.length());
+ System.out.println(zipEntryName);
+ InputStream in = zip.getInputStream(entry);
+ String outPath = (descDir+zipEntryName).replaceAll("\\*", "/");;
+ //判断路径是否存在,不存在则创建文件路径
+ File file = new File(outPath.substring(0, outPath.lastIndexOf('/')));
+ if(!file.exists())
+ {
+ file.mkdirs();
+ }
+ //判断文件全路径是否为文件夹,如果是上面已经上传,不需要解压
+ if(new File(outPath).isDirectory())
+ {
+ continue;
+ }
+ //输出文件路径信息
+// System.out.println(outPath);
+ OutputStream out = new FileOutputStream(outPath);
+ byte[] buf1 = new byte[1024];
+ int len;
+ while((len=in.read(buf1))>0)
+ {
+ out.write(buf1,0,len);
+ }
+ in.close();
+ out.close();
+ }
+// System.out.println("******************解压完毕********************");
+ }
+
+}
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/util/file/XpdfUtil.java b/vboot-core/src/main/java/com/zsvg/vboot/common/util/file/XpdfUtil.java
new file mode 100644
index 0000000..556cbcf
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/common/util/file/XpdfUtil.java
@@ -0,0 +1,104 @@
+package com.zsvg.vboot.common.util.file;
+
+import com.itextpdf.text.BaseColor;
+import com.itextpdf.text.DocumentException;
+import com.itextpdf.text.Element;
+import com.itextpdf.text.pdf.BaseFont;
+import com.itextpdf.text.pdf.PdfContentByte;
+import com.itextpdf.text.pdf.PdfGState;
+import com.itextpdf.text.pdf.PdfReader;
+import com.itextpdf.text.pdf.PdfStamper;
+
+import java.io.*;
+
+public class XpdfUtil {
+// public static void main(String[] args) throws IOException {
+// setWatermark(new BufferedOutputStream(new FileOutputStream(new File("D:\\bb.pdf"))),
+// new FileInputStream("D:\\aa.pdf"), "借阅借阅水印借阅水印借阅水印水印", 1);
+// }
+
+
+ /**
+ * 中间或者两边水印
+ * @param bos 添加完水印的输出
+ * @param input 原PDF文件输入
+ * @param word 水印内容
+ * @param model 水印添加位置1中间，2两边
+ */
+ public static void setWatermark(BufferedOutputStream bos, InputStream input, String word, int model) {
+ PdfReader reader = null;
+ try {
+ reader = new PdfReader(input);
+ PdfStamper stamper = new PdfStamper(reader, bos);
+ PdfContentByte content;
+ // 创建字体,第一个参数是字体路径,itext有一些默认的字体比如说：
+// BaseFont base = BaseFont.createFont("STSong-Light", "UniGB-UCS2-H", BaseFont.EMBEDDED);
+ //2 BaseFont base = BaseFont.createFont("/msyh.ttf", BaseFont.IDENTITY_H,
+ // BaseFont.EMBEDDED);
+ //这个是为了解决linux服务器，水印乱码问题，如果是windows服务器，用第一个就可以。
+ // 需要指定的字体，用第2，3个写法，在resources文件夹下放置对应字体就行。
+
+// BaseFont base = BaseFont.createFont("STSong-Light", "UniGB-UCS2-H",BaseFont.NOT_EMBEDDED);
+ BaseFont base = BaseFont.createFont("C:/WINDOWS/Fonts/simhei.ttf", BaseFont.IDENTITY_H,BaseFont.EMBEDDED);
+// BaseFont base = BaseFont.createFont();
+
+ PdfGState gs = new PdfGState();
+ // 获取PDF页数
+ int total = reader.getNumberOfPages();
+ // 遍历每一页
+ for (int i = 0; i < total; i++) {
+ // 页宽度
+ float width = reader.getPageSize(i + 1).getWidth();
+ // 页高度
+ float height = reader.getPageSize(i + 1).getHeight();
+ // 内容
+ content = stamper.getOverContent(i + 1);
+ //开始写入文本
+ content.beginText();
+ //水印透明度
+ gs.setFillOpacity(0.2f);
+ content.setGState(gs);
+ content.setColorFill(BaseColor.LIGHT_GRAY);
+ //设置字体的输出位置
+ content.setTextMatrix(70, 200);
+
+ if (model == 1) {
+ //平行居中的3条水印
+ //字体大小
+ content.setFontAndSize(base, 50);
+ //showTextAligned 方法的参数分别是（文字对齐方式，位置内容，输出水印X轴位置，Y轴位置，旋转角度）
+ content.showTextAligned(Element.ALIGN_CENTER, word, width / 2, 650, 30);
+ content.showTextAligned(Element.ALIGN_CENTER, word, width / 2, 400, 30);
+ content.showTextAligned(Element.ALIGN_CENTER, word, width / 2, 150, 30);
+ } else {
+ // 左右两边个从上到下4条水印
+ // 水印旋转度数
+ float rotation = 30;
+ content.setFontAndSize(base, 20);
+ content.showTextAligned(Element.ALIGN_LEFT, word, 20, height - 50, rotation);
+ content.showTextAligned(Element.ALIGN_LEFT, word, 20, height / 4 * 3 - 50, rotation);
+ content.showTextAligned(Element.ALIGN_LEFT, word, 20, height / 2 - 50, rotation);
+ content.showTextAligned(Element.ALIGN_LEFT, word, 20, height / 4 - 50, rotation);
+
+ content.setFontAndSize(base, 22);
+ content.showTextAligned(Element.ALIGN_RIGHT, word, width - 20, height - 50, rotation);
+ content.showTextAligned(Element.ALIGN_RIGHT, word, width - 20, height / 4 * 3 - 50, rotation);
+ content.showTextAligned(Element.ALIGN_RIGHT, word, width - 20, height / 2 - 50, rotation);
+ content.showTextAligned(Element.ALIGN_RIGHT, word, width - 20, height / 4 - 50, rotation);
+ }
+ //结束写入文本
+ content.endText();
+ //要打图片水印的话
+ //Image image = Image.getInstance("c:/1.jpg");
+ //content.addImage(image);
+ }
+ stamper.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ } catch (DocumentException e) {
+ e.printStackTrace();
+ }
+
+ }
+
+}
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/util/file/XqcodeUtil.java b/vboot-core/src/main/java/com/zsvg/vboot/common/util/file/XqcodeUtil.java
new file mode 100644
index 0000000..611c79f
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/common/util/file/XqcodeUtil.java
@@ -0,0 +1,111 @@
+package com.zsvg.vboot.common.util.file;
+
+import com.google.zxing.*;
+import com.google.zxing.client.j2se.BufferedImageLuminanceSource;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.common.HybridBinarizer;
+import com.google.zxing.qrcode.QRCodeReader;
+import com.google.zxing.qrcode.QRCodeWriter;
+import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.*;
+import java.util.Hashtable;
+
+public class XqcodeUtil {
+ /**
+ * 生成包含字符串信息的二维码图片
+ * @param outputStream 文件输出流路径
+ * @param content 二维码携带信息
+ * @param qrCodeSize 二维码图片大小
+ * @param imageFormat 二维码的格式
+ * @throws WriterException
+ * @throws IOException
+ */
+ public static boolean createQrCode(OutputStream outputStream, String content, int qrCodeSize, String imageFormat) throws WriterException, IOException{
+ //设置二维码纠错级别ＭＡＰ
+ Hashtable hintMap = new Hashtable();
+ hintMap.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.L); // 矫错级别
+ QRCodeWriter qrCodeWriter = new QRCodeWriter();
+ //创建比特矩阵(位矩阵)的QR码编码的字符串
+ BitMatrix byteMatrix = qrCodeWriter.encode(content, BarcodeFormat.QR_CODE, qrCodeSize, qrCodeSize, hintMap);
+ // 使BufferedImage勾画QRCode (matrixWidth 是行二维码像素点)
+ int matrixWidth = byteMatrix.getWidth();
+ BufferedImage image = new BufferedImage(matrixWidth-200, matrixWidth-200, BufferedImage.TYPE_INT_RGB);
+ image.createGraphics();
+ Graphics2D graphics = (Graphics2D) image.getGraphics();
+ graphics.setColor(Color.WHITE);
+ graphics.fillRect(0, 0, matrixWidth, matrixWidth);
+ // 使用比特矩阵画并保存图像
+ graphics.setColor(Color.BLACK);
+ for (int i = 0; i < matrixWidth; i++){
+ for (int j = 0; j < matrixWidth; j++){
+ if (byteMatrix.get(i, j)){
+ graphics.fillRect(i-100, j-100, 1, 1);
+ }
+ }
+ }
+ return ImageIO.write(image, imageFormat, outputStream);
+ }
+
+
+ public static InputStream createQrCode(String content, int qrCodeSize, String imageFormat) throws WriterException, IOException{
+ //设置二维码纠错级别ＭＡＰ
+ Hashtable hintMap = new Hashtable();
+ hintMap.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.L); // 矫错级别
+ QRCodeWriter qrCodeWriter = new QRCodeWriter();
+ //创建比特矩阵(位矩阵)的QR码编码的字符串
+ BitMatrix byteMatrix = qrCodeWriter.encode(content, BarcodeFormat.QR_CODE, qrCodeSize, qrCodeSize, hintMap);
+ // 使BufferedImage勾画QRCode (matrixWidth 是行二维码像素点)
+ int matrixWidth = byteMatrix.getWidth();
+ BufferedImage image = new BufferedImage(matrixWidth-200, matrixWidth-200, BufferedImage.TYPE_INT_RGB);
+ image.createGraphics();
+ Graphics2D graphics = (Graphics2D) image.getGraphics();
+ graphics.setColor(Color.WHITE);
+ graphics.fillRect(0, 0, matrixWidth, matrixWidth);
+ // 使用比特矩阵画并保存图像
+ graphics.setColor(Color.BLACK);
+ for (int i = 0; i < matrixWidth; i++){
+ for (int j = 0; j < matrixWidth; j++){
+ if (byteMatrix.get(i, j)){
+ graphics.fillRect(i-100, j-100, 1, 1);
+ }
+ }
+ }
+ ByteArrayOutputStream os = new ByteArrayOutputStream();
+ ImageIO.write(image, imageFormat, os);
+ return new ByteArrayInputStream(os.toByteArray());
+ }
+
+
+ /**
+ * 读二维码并输出携带的信息
+ */
+ public static void readQrCode(InputStream inputStream) throws IOException{
+ //从输入流中获取字符串信息
+ BufferedImage image = ImageIO.read(inputStream);
+ //将图像转换为二进制位图源
+ LuminanceSource source = new BufferedImageLuminanceSource(image);
+ BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source));
+ QRCodeReader reader = new QRCodeReader();
+ Result result = null ;
+ try {
+ result = reader.decode(bitmap);
+ } catch (ReaderException e) {
+ e.printStackTrace();
+ }
+// System.out.println(result.getText());
+ }
+
+ /**
+ * 测试代码
+ * @throws WriterException
+ */
+ public static void main(String[] args) throws IOException, WriterException {
+ createQrCode(new FileOutputStream(new File("d:\\qrcode.jpg")),"WE1231238239128sASDASDSADSDWEWWREWRERWSDFDFSDSDF123123123123213123",900,"JPEG");
+ readQrCode(new FileInputStream(new File("d:\\qrcode.jpg")));
+ }
+
+}
\ No newline at end of file
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/util/lang/XdateUtil.java b/vboot-core/src/main/java/com/zsvg/vboot/common/util/lang/XdateUtil.java
new file mode 100644
index 0000000..380a6fb
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/common/util/lang/XdateUtil.java
@@ -0,0 +1,162 @@
+package com.zsvg.vboot.common.util.lang;
+
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.XMLGregorianCalendar;
+import java.text.ParsePosition;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
+public class XdateUtil {
+
+ public static XMLGregorianCalendar dateToXmlDate(Date date) {
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(date);
+ DatatypeFactory dtf = null;
+ try {
+ dtf = DatatypeFactory.newInstance();
+ } catch (DatatypeConfigurationException e) {
+ }
+ XMLGregorianCalendar dateType = dtf.newXMLGregorianCalendar();
+ dateType.setYear(cal.get(Calendar.YEAR));
+ //由于Calendar.MONTH取值范围为0~11,需要加1
+ dateType.setMonth(cal.get(Calendar.MONTH) + 1);
+ dateType.setDay(cal.get(Calendar.DAY_OF_MONTH));
+ dateType.setHour(cal.get(Calendar.HOUR_OF_DAY));
+ dateType.setMinute(cal.get(Calendar.MINUTE));
+ dateType.setSecond(cal.get(Calendar.SECOND));
+ return dateType;
+ }
+
+ public static Date xmlDate2Date(XMLGregorianCalendar cal) {
+ return cal.toGregorianCalendar().getTime();
+ }
+
+ public static String getYYYY() {
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy");
+ return dateFormat.format(new Date());
+ }
+
+ public static String getYYYYMM() {
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMM");
+ return dateFormat.format(new Date());
+ }
+
+ public static String getMM() {
+ SimpleDateFormat dateFormat = new SimpleDateFormat("MM");
+ return dateFormat.format(new Date());
+ }
+
+ public static String getDD() {
+ SimpleDateFormat dateFormat = new SimpleDateFormat("dd");
+ return dateFormat.format(new Date());
+ }
+
+ public static Date strToDate(String strDate) {
+ if (XstringUtil.isBlank(strDate)) {
+ return null;
+ }
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+ ParsePosition pos = new ParsePosition(0);
+ Date strtodate = formatter.parse(strDate, pos);
+ return strtodate;
+ }
+
+ public static Date strToDateBySap(String strDate) {
+ if (XstringUtil.isBlank(strDate)) {
+ return null;
+ }
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
+ ParsePosition pos = new ParsePosition(0);
+ Date strtodate = formatter.parse(strDate, pos);
+ return strtodate;
+ }
+
+ public static String getDate() {
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ return dateFormat.format(new Date());
+ }
+
+ public static String getDate(int i) {
+ Calendar c = Calendar.getInstance();
+ int day = c.get(Calendar.DATE);
+ c.set(Calendar.DATE, day + i);
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ return dateFormat.format(c.getTime());
+ }
+
+ public static String getSapDate(int i) {
+ Calendar c = Calendar.getInstance();
+ int day = c.get(Calendar.DATE);
+ c.set(Calendar.DATE, day + i);
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
+ return dateFormat.format(c.getTime());
+ }
+
+ public static String getDate(String geshi) {
+ SimpleDateFormat dateFormat = new SimpleDateFormat(geshi);
+ return dateFormat.format(new Date());
+ }
+
+ public static String getDate(Date date) {
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ return dateFormat.format(date);
+ }
+
+
+ public static int getDifferDays(Date data1, Date date2) {
+ if (null == data1 || null == date2) {
+ return -1;
+
+ }
+ long intervalMilli = data1.getTime() - date2.getTime();
+ return (int) (intervalMilli / (24 * 60 * 60 * 1000));
+ }
+
+ public static int getDifferDays(String strDate1, String strDate2) {
+ Date date1 = strToDate(strDate1);
+ Date date2 = strToDate(strDate2);
+ if (null == date1 || null == date2) {
+ return -1;
+ }
+ long intervalMilli = date1.getTime() - date2.getTime();
+ return (int) (intervalMilli / (24 * 60 * 60 * 1000));
+ }
+
+ public static int getDifferDaysBySap(String strDate1, String strDate2) {
+ Date date1 = strToDateBySap(strDate1);
+ Date date2 = strToDateBySap(strDate2);
+ if (null == date1 || null == date2) {
+ return -1;
+ }
+ long intervalMilli = date1.getTime() - date2.getTime();
+ return (int) (intervalMilli / (24 * 60 * 60 * 1000));
+ }
+
+ public static String getStringDateAfterTian(String strDate, int i) {
+ Calendar c = Calendar.getInstance();
+ c.setTime(strToDateBySap(strDate));
+ int day = c.get(Calendar.DATE);
+ c.set(Calendar.DATE, day + i);
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
+ return dateFormat.format(c.getTime());
+ }
+
+ public static String getMonthFirstDay() {
+ SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
+ Calendar c = Calendar.getInstance();
+ c.add(Calendar.MONTH, 0);
+ c.set(Calendar.DAY_OF_MONTH, 1);//设置为1号,当前日期既为本月第一天
+ return format.format(c.getTime());
+ }
+
+ public static String getMonthLastDay() {
+ SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
+ Calendar ca = Calendar.getInstance();
+ ca.set(Calendar.DAY_OF_MONTH, ca.getActualMaximum(Calendar.DAY_OF_MONTH));
+ return format.format(ca.getTime());
+ }
+
+
+}
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/util/lang/XjsonUtil.java b/vboot-core/src/main/java/com/zsvg/vboot/common/util/lang/XjsonUtil.java
new file mode 100644
index 0000000..3b08cb9
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/common/util/lang/XjsonUtil.java
@@ -0,0 +1,70 @@
+package com.zsvg.vboot.common.util.lang;
+
+import com.zsvg.vboot.common.mvc.pojo.Zinp;
+import com.zsvg.vboot.common.mvc.pojo.Ztree;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class XjsonUtil {
+
+
+ //使用递归方法建树
+ public static List buildByRecursive(List treeNodes) {
+ List trees = new ArrayList<>();
+ for (Ztree treeNode : treeNodes) {
+ if (treeNode.getPid()==null) {
+ trees.add(findChildrenByTier(treeNode,treeNodes));
+ }
+ }
+ return trees;
+ }
+
+
+
+
+ //递归查找子节点
+ public static Ztree findChildrenByTier(Ztree treeNode, List treeNodes) {
+// treeNode.setChildren(new ArrayList<>());
+ for (Ztree it : treeNodes) {
+ if(treeNode.getId().equals(it.getPid())) {
+ if (treeNode.getChildren() == null) {
+ treeNode.setChildren(new ArrayList<>());
+ }
+ treeNode.getChildren().add(findChildrenByTier(it,treeNodes));
+ }
+ }
+ return treeNode;
+ }
+
+
+ //
+ public static List inpToTree(List inpList) {
+ List trees = new ArrayList<>();
+ for (Zinp zinp : inpList) {
+ if (zinp.getPid()==null) {
+ trees.add(findChildrenByTree(zinp,inpList));
+ }
+ }
+ return trees;
+ }
+
+
+ public static Ztree findChildrenByTree(Zinp zinp, List zinpList) {
+// treeNode.setChildren(new ArrayList<>());
+ Ztree ztree =new Ztree();
+ ztree.setId(zinp.getId());
+ ztree.setName(zinp.getName());
+ for (Zinp it : zinpList) {
+ if(zinp.getId().equals(it.getPid())) {
+ if (ztree.getChildren() == null) {
+ ztree.setChildren(new ArrayList<>());
+ }
+ ztree.getChildren().add(findChildrenByTree(it,zinpList));
+ }
+ }
+ return ztree;
+ }
+
+
+}
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/util/lang/XmapUtil.java b/vboot-core/src/main/java/com/zsvg/vboot/common/util/lang/XmapUtil.java
new file mode 100644
index 0000000..0a40562
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/common/util/lang/XmapUtil.java
@@ -0,0 +1,135 @@
+package com.zsvg.vboot.common.util.lang;
+
+import java.util.HashMap;
+import java.util.Map;
+public class XmapUtil
+{
+ public static String getName(String id)
+ {
+ String[] arr = id.split("/");
+ String back = "";
+ for (int i = 0; i < arr.length; i++)
+ {
+ if (!"".equals(arr[i]))
+ {
+ String mapValue = map.get(arr[i]);
+ if (mapValue != null)
+ {
+ back += map.get(arr[i]) + "-";
+ }
+ else
+ {
+ back += arr[i] + "-";
+ }
+ }
+ }
+ return back.substring(0, back.length() - 1);
+ }
+
+ public static Map map = new HashMap();
+
+ static
+ {
+ //a
+ map.put("admin", "管理员");
+ map.put("address", "地址");
+ map.put("att", "附件");
+ map.put("auth", "认证");
+ map.put("actual", "实际");
+ //b
+ map.put("bar", "块");
+ //c
+ map.put("choose", "选择");
+ map.put("customer", "客户");
+ map.put("config", "配置");
+ map.put("choose_data", "选择数据");
+ //d
+ map.put("demo", "样例");
+ //e
+ map.put("edit", "编辑");
+ map.put("edit_save", "编辑保存");
+
+ //f
+ map.put("file", "文件");
+ map.put("flow", "流程");
+
+ //g
+ map.put("group", "组");
+
+ //l
+ map.put("log", "日志");
+ map.put("login", "登入");
+
+ //i
+ map.put("index", "主页");
+ map.put("info", "信息");
+ //t
+ map.put("task", "任务");
+ map.put("type", "分类");
+
+ //m
+ map.put("mail", "邮箱");
+ map.put("main", "主信息");
+ map.put("move", "移动");
+ map.put("mobile", "移动端");
+ //n
+ map.put("node", "节点");
+
+ //o
+ map.put("org", "组织架构");
+ //p
+ map.put("password", "密码");
+ map.put("product", "产品");
+ map.put("project", "项目");
+ map.put("pp", "生产");
+ //q
+ map.put("quote", "报价");
+
+ //k
+
+ //l
+ map.put("line", "线");
+ map.put("list", "列表");
+ map.put("list_data", "列表数据");
+ map.put("list_dele", "列表删除");
+ map.put("layout", "扶梯排布");
+
+ //r
+ map.put("register", "注册");
+ map.put("report", "报表");
+ map.put("perm", "权限");
+ map.put("role", "角色");
+ map.put("scheme", "方案");
+
+ //s
+ map.put("save", "保存");
+ map.put("sd", "销售");
+ map.put("send", "发送");
+ map.put("set", "设置");
+ map.put("show", "展示");
+ map.put("stock", "股票");
+
+ //t
+ map.put("task", "任务");
+ map.put("template", "模块");
+ map.put("test", "测试");
+ map.put("tool", "工具");
+ map.put("tree", "树");
+ map.put("turn", "转换");
+ map.put("tree_data", "树数据");
+ map.put("tree_move", "树移动");
+ map.put("tree_remove", "树删除");
+
+ //v
+ map.put("view", "查看");
+
+ //w
+ map.put("warn", "警告");
+ map.put("weather", "天气");
+ map.put("write", "撰写");
+
+ }
+
+
+
+}
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/util/lang/XnumberUtil.java b/vboot-core/src/main/java/com/zsvg/vboot/common/util/lang/XnumberUtil.java
new file mode 100644
index 0000000..200b76b
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/common/util/lang/XnumberUtil.java
@@ -0,0 +1,32 @@
+package com.zsvg.vboot.common.util.lang;
+
+import java.util.Random;
+
+public class XnumberUtil {
+ public static double tsize = 1024L * 1024;
+
+ public static double gsize = 1024L;
+
+
+ public static String tranWellSize(Long space) {
+
+ if (space > tsize) {
+ return String.format("%.2f", space / tsize) + "T";
+ } else if (space > gsize) {
+ return String.format("%.2f", space / gsize) + "G";
+ } else if(space>0){
+ return space + "M";
+ }else{
+ return "0";
+ }
+ }
+
+ public static int getRandom6(){
+ int radom = new Random().nextInt(999999);
+ if (radom < 100000) {
+ radom += 100000;
+ }
+ return radom;
+ }
+
+}
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/util/lang/XreflectUtil.java b/vboot-core/src/main/java/com/zsvg/vboot/common/util/lang/XreflectUtil.java
new file mode 100644
index 0000000..a13fc75
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/common/util/lang/XreflectUtil.java
@@ -0,0 +1,138 @@
+package com.zsvg.vboot.common.util.lang;
+
+import com.zsvg.vboot.common.util.obj.AlterPropertyInfo;
+import com.zsvg.vboot.common.util.obj.PropertyModelInfo;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.BeanUtils;
+
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.math.BigDecimal;
+import java.util.*;
+
+public class XreflectUtil {
+
+ public static void print(Object obj){
+ Field[] fields = obj.getClass().getDeclaredFields();
+ System.out.println("---------------------------------");
+ for (Field field:fields) {
+ field.setAccessible(true);
+ try {
+ System.out.println(field.getName()+":"+field.get(obj));
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ /**
+ * 比较两个对象属性值是否相同
+ * 如果不同返回修改过的属性信息
+ * @param oldObj
+ * @param newObj
+ * @param ignoreProperties
+ * @param
+ * @return 修改过的属性字段
+ */
+ public static List getDifferentProperty(T oldObj , T newObj , String... ignoreProperties){
+ if (oldObj != null && newObj != null) {
+ // 比较全部字段
+ if (ignoreProperties == null || ignoreProperties.length > 0) {
+ if (oldObj.equals(newObj)) {
+ return Collections.emptyList();
+ }
+ }
+ List oldObjectPropertyValue = getObjectPropertyValue(oldObj, ignoreProperties);
+ if (!CollectionUtils.isEmpty(oldObjectPropertyValue)) {
+ List modifiedPropertyInfos = new ArrayList<>(oldObjectPropertyValue.size());
+
+ List newObjectPropertyValue = getObjectPropertyValue(newObj, ignoreProperties);
+ Map objectMap = new HashMap<>(newObjectPropertyValue.size());
+ // 获取新对象所有属性值
+ for (PropertyModelInfo propertyModelInfo : newObjectPropertyValue) {
+ String prnam = propertyModelInfo.getPrnam();
+ Object value = propertyModelInfo.getValue();
+ objectMap.put(prnam , value);
+ }
+
+ for (PropertyModelInfo propertyModelInfo : oldObjectPropertyValue) {
+ String prnam = propertyModelInfo.getPrnam();
+ Object value = propertyModelInfo.getValue();
+ if (objectMap.containsKey(prnam)) {
+ Object newValue = objectMap.get(prnam);
+ AlterPropertyInfo modifiedPropertyInfo = new AlterPropertyInfo();
+// System.out.println("----------------------");
+// System.out.println(propertyName);
+// System.out.println(value);
+// System.out.println(newValue);
+ if (value != null && newValue != null) {
+ if(value instanceof BigDecimal){
+ if ((new BigDecimal(value.toString())).compareTo(new BigDecimal(newValue.toString()))!=0) {
+ modifiedPropertyInfo.setPrnam(prnam);
+ modifiedPropertyInfo.setOlval(value);
+ modifiedPropertyInfo.setNeval(newValue);
+ modifiedPropertyInfos.add(modifiedPropertyInfo);
+ }
+ }else{
+ if (!(value.toString()).equals(newValue.toString())) {
+ modifiedPropertyInfo.setPrnam(prnam);
+ modifiedPropertyInfo.setOlval(value);
+ modifiedPropertyInfo.setNeval(newValue);
+ modifiedPropertyInfos.add(modifiedPropertyInfo);
+ }
+ }
+ }else if ((XstringUtil.isNotBlank(""+value)&& newValue == null) ||(value== null && XstringUtil.isNotBlank(""+newValue))){
+ modifiedPropertyInfo.setPrnam(prnam);
+ modifiedPropertyInfo.setOlval(value);
+ modifiedPropertyInfo.setNeval(newValue);
+ modifiedPropertyInfos.add(modifiedPropertyInfo);
+ }
+ }
+ }
+ return modifiedPropertyInfos;
+ }
+ }
+ return Collections.emptyList();
+ }
+
+
+ /**
+ * 通过反射获取对象的属性名称、getter返回值类型、属性值等信息
+ * @param obj
+ * @param ignoreProperties
+ * @param
+ * @return
+ */
+ public static List getObjectPropertyValue(T obj , String... ignoreProperties){
+ if (obj != null) {
+
+ Class objClass = obj.getClass();
+ PropertyDescriptor[] propertyDescriptors = BeanUtils.getPropertyDescriptors(objClass);
+ List modelInfos = new ArrayList<>(propertyDescriptors.length);
+
+ List ignoreList = (ignoreProperties != null ? Arrays.asList(ignoreProperties) : null);
+ for (PropertyDescriptor propertyDescriptor : propertyDescriptors) {
+ Method readMethod = propertyDescriptor.getReadMethod();
+ String name = propertyDescriptor.getName();
+ if (readMethod != null && (ignoreList == null || !ignoreList.contains(name))) {
+ Object invoke = null;
+ Class returnType = readMethod.getReturnType();
+ try {
+ invoke = readMethod.invoke(obj);
+ PropertyModelInfo propertyModelInfo = new PropertyModelInfo();
+ propertyModelInfo.setPrnam(name);
+ propertyModelInfo.setValue(invoke);
+ propertyModelInfo.setRetyp(returnType);
+ modelInfos.add(propertyModelInfo);
+ } catch (IllegalAccessException | InvocationTargetException e) {
+ System.out.println("反射获取类【"+objClass.getName()+"】方法异常，");
+ }
+ }
+ }
+ return modelInfos;
+ }
+ return Collections.emptyList();
+ }
+}
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/util/lang/XregUtil.java b/vboot-core/src/main/java/com/zsvg/vboot/common/util/lang/XregUtil.java
new file mode 100644
index 0000000..890d82c
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/common/util/lang/XregUtil.java
@@ -0,0 +1,37 @@
+package com.zsvg.vboot.common.util.lang;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class XregUtil {
+ public static boolean match(String reg, String str) {
+ return Pattern.matches(reg, str);
+ }
+
+ public static List find(String reg, String str) {
+ Matcher matcher = Pattern.compile(reg).matcher(str);
+ List list = new ArrayList();
+ while (matcher.find()) {
+ list.add(matcher.group());
+ }
+ return list;
+ }
+
+ public static String find(String reg, String str, int index) {
+ Matcher matcher = Pattern.compile(reg).matcher(str);
+ if (matcher.find()) {
+ return matcher.group(index);
+ }
+ return null;
+ }
+
+ public static String findString(String reg, String str) {
+ String returnStr = null;
+ List list = find(reg, str);
+ if (list.size() != 0)
+ returnStr = list.get(0);
+ return returnStr;
+ }
+}
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/util/lang/XscanUtil.java b/vboot-core/src/main/java/com/zsvg/vboot/common/util/lang/XscanUtil.java
new file mode 100644
index 0000000..93467af
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/common/util/lang/XscanUtil.java
@@ -0,0 +1,149 @@
+package com.zsvg.vboot.common.util.lang;
+import java.io.File;
+import java.io.FileFilter;
+import java.io.IOException;
+import java.net.JarURLConnection;
+import java.net.URL;
+import java.net.URLDecoder;
+import java.util.Enumeration;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+
+public class XscanUtil
+{
+ //从包package中获取所有的Class
+ public static Set> getClasses(String pack) {
+
+ // 第一个class类的集合
+ Set> classes = new LinkedHashSet>();
+ // 是否循环迭代
+ boolean recursive = true;
+ // 获取包的名字 并进行替换
+ String packageName = pack;
+ String packageDirName = packageName.replace('.', '/');
+ // 定义一个枚举的集合 并进行循环来处理这个目录下的things
+ Enumeration dirs;
+ try {
+ dirs = Thread.currentThread().getContextClassLoader().getResources(packageDirName);
+ // 循环迭代下去
+ while (dirs.hasMoreElements()) {
+ // 获取下一个元素
+ URL url = dirs.nextElement();
+ // 得到协议的名称
+ String protocol = url.getProtocol();
+ // 如果是以文件的形式保存在服务器上
+ if ("file".equals(protocol)) {
+// System.err.println("file类型的扫描");
+ // 获取包的物理路径
+ String filePath = URLDecoder.decode(url.getFile(), "UTF-8");
+ // 以文件的方式扫描整个包下的文件 并添加到集合中
+ findAndAddClassesInPackageByFile(packageName, filePath,recursive, classes);
+ } else if ("jar".equals(protocol)) {
+ // 如果是jar包文件
+ // 定义一个JarFile
+// System.err.println("jar类型的扫描");
+ JarFile jar;
+ try {
+ // 获取jar
+ jar = ((JarURLConnection) url.openConnection())
+ .getJarFile();
+ // 从此jar包 得到一个枚举类
+ Enumeration entries = jar.entries();
+ // 同样的进行循环迭代
+ while (entries.hasMoreElements()) {
+ // 获取jar里的一个实体 可以是目录 和一些jar包里的其他文件 如META-INF等文件
+ JarEntry entry = entries.nextElement();
+ String name = entry.getName();
+ // 如果是以/开头的
+ if (name.charAt(0) == '/') {
+ // 获取后面的字符串
+ name = name.substring(1);
+ }
+ // 如果前半部分和定义的包名相同
+ if (name.startsWith(packageDirName)) {
+ int idx = name.lastIndexOf('/');
+ // 如果以"/"结尾 是一个包
+ if (idx != -1) {
+ // 获取包名 把"/"替换成"."
+ packageName = name.substring(0, idx)
+ .replace('/', '.');
+ }
+ // 如果可以迭代下去 并且是一个包
+ if ((idx != -1) || recursive) {
+ // 如果是一个.class文件 而且不是目录
+ if (name.endsWith(".class")
+ && !entry.isDirectory()) {
+ // 去掉后面的".class" 获取真正的类名
+ String className = name.substring(
+ packageName.length() + 1, name
+ .length() - 6);
+ try {
+ // 添加到classes
+ classes.add(Class
+ .forName(packageName + '.'
+ + className));
+ } catch (ClassNotFoundException e) {
+ // log
+ // .error("添加用户自定义视图类错误 找不到此类的.class文件");
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+ }
+ } catch (IOException e) {
+ // log.error("在扫描用户定义视图时从jar包获取文件出错");
+ e.printStackTrace();
+ }
+ }
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return classes;
+ }
+
+ //以文件的形式来获取包下的所有Class
+ public static void findAndAddClassesInPackageByFile(String packageName,
+ String packagePath, final boolean recursive, Set> classes) {
+ // 获取此包的目录 建立一个File
+ File dir = new File(packagePath);
+ // 如果不存在或者 也不是目录就直接返回
+ if (!dir.exists() || !dir.isDirectory()) {
+ // log.warn("用户定义包名 " + packageName + " 下没有任何文件");
+ return;
+ }
+ // 如果存在 就获取包下的所有文件 包括目录
+ File[] dirfiles = dir.listFiles(new FileFilter() {
+ // 自定义过滤规则 如果可以循环(包含子目录) 或则是以.class结尾的文件(编译好的java类文件)
+ public boolean accept(File file) {
+ return (recursive && file.isDirectory())
+ || (file.getName().endsWith(".class"));
+ }
+ });
+ // 循环所有文件
+ for (File file : dirfiles) {
+ // 如果是目录 则继续扫描
+ if (file.isDirectory()) {
+ findAndAddClassesInPackageByFile(packageName + "."
+ + file.getName(), file.getAbsolutePath(), recursive,
+ classes);
+ } else {
+ // 如果是java类文件 去掉后面的.class 只留下类名
+ String className = file.getName().substring(0,
+ file.getName().length() - 6);
+ try {
+ // 添加到集合中去
+ //classes.add(Class.forName(packageName + '.' + className));
+ //经过回复同学的提醒，这里用forName有一些不好，会触发static方法，没有使用classLoader的load干净
+ classes.add(Thread.currentThread().getContextClassLoader().loadClass(packageName + '.' + className));
+ } catch (ClassNotFoundException e) {
+ // log.error("添加用户自定义视图类错误 找不到此类的.class文件");
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+}
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/util/lang/XstringUtil.java b/vboot-core/src/main/java/com/zsvg/vboot/common/util/lang/XstringUtil.java
new file mode 100644
index 0000000..2b22516
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/common/util/lang/XstringUtil.java
@@ -0,0 +1,143 @@
+package com.zsvg.vboot.common.util.lang;
+
+import java.util.List;
+import java.util.Random;
+import java.util.UUID;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class XstringUtil {
+
+ public static boolean containChinese(String str) {
+ Pattern p = Pattern.compile("[\u4e00-\u9fa5]");
+ Matcher m = p.matcher(str);
+ if (m.find()) {
+ return true;
+ }
+ return false;
+ }
+
+// public static boolean isEmpty(String str) {
+// return str == null || str.length() == 0|| "null".equals(str);
+// }
+//
+// public static boolean isNotEmpty(String str) {
+// return !XstringUtil.isEmpty(str);
+// }
+
+ public static boolean isBlank(String str) {
+ int strLen;
+ if (str == null || (strLen = str.length()) == 0|| "null".equals(str)) {
+ return true;
+ }
+ for (int i = 0; i < strLen; i++) {
+ if ((!Character.isWhitespace(str.charAt(i)))) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ public static boolean isAllBlank(String str1,String str2) {
+ return XstringUtil.isBlank(str1)&&XstringUtil.isBlank(str2);
+ }
+
+ public static boolean isAllBlank(String str1,String str2,String str3) {
+ return XstringUtil.isBlank(str1)&&XstringUtil.isBlank(str2)&&XstringUtil.isBlank(str3);
+ }
+
+ public static boolean isNotBlank(String str) {
+ return !XstringUtil.isBlank(str);
+ }
+
+ public static String addWhereInCondition(String field,List list){
+ if(list==null||list.size()==0){
+ return " 1=0 ";
+ }
+ StringBuilder sb=new StringBuilder(field).append(" in (");
+ for (String str : list) {
+ sb.append("'").append(str).append("',");
+ }
+ sb.setCharAt(sb.length()-1,')');
+ return sb.toString();
+ }
+
+ public static String getUUID()
+ {
+ return UUID.randomUUID().toString().replace("-", "");
+ }
+
+ //生成随机字母和数字,
+ public static String getRSID(int length) {
+ String val = "";
+ Random random = new Random();
+ //参数length，表示生成几位随机数
+ for(int i = 0; i < length; i++) {
+ String charOrNum = random.nextInt(2) % 2 == 0 ? "char" : "num";
+ //输出字母还是数字
+ if( "char".equalsIgnoreCase(charOrNum) ) {
+ //输出是大写字母还是小写字母
+// int temp = random.nextInt(2) % 2 == 0 ? 65 : 97;
+ val += (char)(random.nextInt(26) + 97);
+ } else if( "num".equalsIgnoreCase(charOrNum) ) {
+ val += String.valueOf(random.nextInt(10));
+ }
+ }
+ return val;
+ }
+
+ public static String getRSID4() {
+ return getRSID(4);
+ }
+
+ public static String getRSID8() {
+ return getRSID(8);
+ }
+
+ //首字母转小写
+ public static String toLowerfirst(String s)
+ {
+ if (Character.isLowerCase(s.charAt(0)))
+ {
+ return s;
+ } else
+ {
+ return (new StringBuilder()).append(Character.toLowerCase(s.charAt(0))).append(s.substring(1)).toString();
+ }
+ }
+
+ //首字母转大写
+ public static String toUpperfirst(String s)
+ {
+ if (Character.isUpperCase(s.charAt(0)))
+ {
+ return s;
+ } else
+ {
+ return (new StringBuilder()).append(Character.toUpperCase(s.charAt(0))).append(s.substring(1)).toString();
+ }
+ }
+
+
+ public static String DelZeroBefore(String str){
+ return str.replaceAll("^(0+)", "");
+ }
+
+ public static String addZeroBefore(String str, int strLength) {
+ int strLen = str.length();
+ if (strLen < strLength) {
+ while (strLen < strLength) {
+ StringBuffer sb = new StringBuffer();
+ sb.append("0").append(str);// 左补0
+ // sb.append(str).append("0");//右补0
+ str = sb.toString();
+ strLen = str.length();
+ }
+ }
+
+ return str;
+ }
+
+
+
+}
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/util/lang/XtimeUtil.java b/vboot-core/src/main/java/com/zsvg/vboot/common/util/lang/XtimeUtil.java
new file mode 100644
index 0000000..900c022
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/common/util/lang/XtimeUtil.java
@@ -0,0 +1,71 @@
+package com.zsvg.vboot.common.util.lang;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class XtimeUtil
+{
+ private static long lastTime;
+ private static long startTime;
+
+ public static String getTime()
+ {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ return sdf.format(new Date());
+ }
+
+ public static void calStart()
+ {
+ SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss SSS");
+ startTime=System.currentTimeMillis();
+ lastTime=startTime;
+ System.err.println("----"+sdf.format(new Date())+" 计时开始▼ ");
+ }
+
+ public static void calMid()
+ {
+ SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss SSS");
+ long curTime=System.currentTimeMillis();
+ long time = curTime - lastTime;
+ System.err.println("----"+sdf.format(new Date())+" 中间用时■ "+time + "毫秒");
+ lastTime=curTime;
+ }
+
+ public static void calEnd()
+ {
+ SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss SSS");
+ long curTime=System.currentTimeMillis();
+ long time = curTime - lastTime;
+ long time2 = curTime - startTime;
+ System.err.println("----"+sdf.format(new Date())+" 计时结束▲ "+time + "毫秒,合计：" + time2+ "毫秒");
+
+ }
+
+ public static String getTimeByDate(Date date)
+ {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ return sdf.format(date);
+ }
+
+ public static Boolean compare(String s1, String s2)
+ {
+ if(s1==null){
+ return false;
+ }else if(s2==null){
+ return true;
+ }
+ int i = s1.compareTo(s2);
+ if (i >= 0)
+ {
+ return true;
+ } else
+ {
+ return false;
+ }
+ }
+
+ public static long getTimeGap(long beforeTimeMillis)
+ {
+ return (System.currentTimeMillis() - beforeTimeMillis) / 1000;
+ }
+}
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/util/obj/AlterPropertyInfo.java b/vboot-core/src/main/java/com/zsvg/vboot/common/util/obj/AlterPropertyInfo.java
new file mode 100644
index 0000000..1b3528e
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/common/util/obj/AlterPropertyInfo.java
@@ -0,0 +1,18 @@
+package com.zsvg.vboot.common.util.obj;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class AlterPropertyInfo implements Serializable {
+
+ // 对应的属性名
+ private String prnam;
+
+ // 未修改之前的值
+ private Object olval;
+
+ // 修改后的值
+ private Object neval;
+}
\ No newline at end of file
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/util/obj/JsonDateValueProcessor.java b/vboot-core/src/main/java/com/zsvg/vboot/common/util/obj/JsonDateValueProcessor.java
new file mode 100644
index 0000000..ace2a57
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/common/util/obj/JsonDateValueProcessor.java
@@ -0,0 +1,34 @@
+package com.zsvg.vboot.common.util.obj;
+
+import net.sf.json.JsonConfig;
+import net.sf.json.processors.JsonValueProcessor;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
+public class JsonDateValueProcessor implements JsonValueProcessor {
+ @Override
+ public Object processArrayValue(Object obj, JsonConfig jsonconfig) {
+ return process(obj);
+ }
+ @Override
+ public Object processObjectValue(String s, Object obj, JsonConfig jsonconfig) {
+ return process(obj);
+ }
+ private Object process(Object obj) {
+ if (obj == null) {// 如果时间为null，则返回空字串
+ return "";
+ }
+ if (obj instanceof Date) {
+ obj = new java.util.Date(((Date) obj).getTime());
+ }
+ if (obj instanceof java.util.Date) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss",
+ Locale.CHINA);// 格式化时间为yyyy-MM-dd类型
+ return sdf.format(obj);
+ } else {
+ return new Object();
+ }
+ }
+}
\ No newline at end of file
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/util/obj/PropertyModelInfo.java b/vboot-core/src/main/java/com/zsvg/vboot/common/util/obj/PropertyModelInfo.java
new file mode 100644
index 0000000..78b0b53
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/common/util/obj/PropertyModelInfo.java
@@ -0,0 +1,13 @@
+package com.zsvg.vboot.common.util.obj;
+
+import lombok.Data;
+
+@Data
+public class PropertyModelInfo {
+ //属性名
+ private String prnam;
+ // 属性值
+ private Object value;
+ // 返回值类型
+ private Class retyp;
+}
\ No newline at end of file
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/util/web/XhttpUtil.java b/vboot-core/src/main/java/com/zsvg/vboot/common/util/web/XhttpUtil.java
new file mode 100644
index 0000000..d443c69
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/common/util/web/XhttpUtil.java
@@ -0,0 +1,145 @@
+package com.zsvg.vboot.common.util.web;
+
+import org.apache.commons.lang.StringUtils;
+
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+
+public class XhttpUtil {
+
+ public static String httpGetConnect(String httpUrl, String key) {
+ String back = "error";
+ if (StringUtils.isBlank(httpUrl)) {
+ return back;
+ }
+ HttpURLConnection connection = null;
+ InputStream is = null;
+ BufferedReader br = null;
+ String result = "";
+ try {
+ URL url = new URL(httpUrl);
+ connection = (HttpURLConnection) url.openConnection();
+ connection.setRequestMethod("GET");
+ connection.setRequestProperty("Content-Type", "text/html");
+ connection.setRequestProperty("Cache-Control", "no-cache");
+ connection.setRequestProperty("Charsert", "UTF-8");
+ connection.setConnectTimeout(15000);
+ connection.setReadTimeout(60000);
+ connection.connect();
+ if (connection.getResponseCode() == 200) {
+ is = connection.getInputStream();
+ // 封装输入流is，并指定字符集
+ br = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+ // 存放数据
+ StringBuffer sbf = new StringBuffer();
+ String temp = null;
+ while ((temp = br.readLine()) != null) {
+ sbf.append(temp);
+ //sbf.append("\r\n");
+ }
+ result = sbf.toString();
+ back = result;
+ } else {
+ System.out.println("http链接错误！" + key);
+ back = "error";
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ back = "error";
+ } finally {
+ // 关闭资源
+ if (null != br) {
+ try {
+ br.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+ if (null != is) {
+ try {
+ is.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+ connection.disconnect();// 关闭远程连接
+ }
+ return back;
+ }
+
+ public static String httpPostConnect(String httpUrl, String param, String key) {
+ String back = "";
+ if (StringUtils.isBlank(httpUrl)) {
+ return back;
+ }
+ HttpURLConnection connection = null;
+ InputStream is = null;
+ OutputStream os = null;
+ BufferedReader br = null;
+ try {
+ URL url = new URL(httpUrl);
+ connection = (HttpURLConnection) url.openConnection();
+ connection.setRequestMethod("POST");
+ connection.setConnectTimeout(15000);
+ connection.setReadTimeout(60000);
+ /** 设置是否向httpUrlConnection输出，设置是否从httpUrlConnection读入，此外发送post请求必须设置这两个 */
+ // 默认值为：false，当向远程服务器传送数据/写数据时，需要设置为true
+ connection.setDoOutput(true);
+ // 默认值为：true，当前向远程服务读取数据时，设置为true，该参数可有可无
+ connection.setDoInput(true);
+ // 设置是否使用缓存
+ connection.setUseCaches(false);
+ /** 设置通用的请求属性 */
+ connection.setRequestProperty("accept", "*/*");
+ connection.setRequestProperty("connection", "Keep-Alive");
+ connection.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
+ // 设置传入参数的格式
+ connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded"); //name1=value1&name2=value2 的形式
+ //connection.setRequestProperty("Content-Type", "application/json;charset=utf-8"); //json格式
+ //connection.connect();
+
+ os = connection.getOutputStream();
+ if (StringUtils.isNotBlank(param)) {
+ os.write(param.getBytes());
+ }
+
+ if (connection.getResponseCode() == 200) {
+ is = connection.getInputStream();
+ br = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+ StringBuffer sbf = new StringBuffer();
+ String line = null;
+ while ((line = br.readLine()) != null) {
+ sbf.append(line);
+ //sbf.append("\r\n");
+ }
+ back = sbf.toString();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ back = "error";
+ } finally {
+ // 关闭资源
+ try {
+ if (null != br) {
+ br.close();
+ }
+ if (null != is) {
+ is.close();
+ }
+ if (null != os) {
+ os.close();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ connection.disconnect();// 关闭远程连接
+ }
+ return back;
+ }
+
+
+}
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/util/web/XpageUtil.java b/vboot-core/src/main/java/com/zsvg/vboot/common/util/web/XpageUtil.java
new file mode 100644
index 0000000..5155f08
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/common/util/web/XpageUtil.java
@@ -0,0 +1,7 @@
+package com.zsvg.vboot.common.util.web;
+
+public class XpageUtil {
+
+
+
+}
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/util/web/XreqUtil.java b/vboot-core/src/main/java/com/zsvg/vboot/common/util/web/XreqUtil.java
new file mode 100644
index 0000000..c150b06
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/common/util/web/XreqUtil.java
@@ -0,0 +1,206 @@
+package com.zsvg.vboot.common.util.web;
+
+import cn.hutool.core.convert.Convert;
+import com.zsvg.vboot.common.mvc.dao.Sqler;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+import java.util.Enumeration;
+
+public class XreqUtil {
+ /**
+ * 当前记录起始索引
+ */
+ public static final String PAGE_NUM = "page";
+
+ /**
+ * 每页显示记录数
+ */
+ public static final String PAGE_SIZE = "pageSize";
+
+
+ public static void testParams(HttpServletRequest request) {
+ Enumeration pNames = request.getParameterNames();
+ while (pNames.hasMoreElements()) {
+ String pName = (String) pNames.nextElement();
+ Object pValue = request.getParameter(pName);
+ System.out.println(pName + ":" + pValue);
+ }
+ }
+
+
+
+ public static String getIpAddress(HttpServletRequest request) {
+ String ip = request.getHeader("x-forwarded-for");
+ if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+ ip = request.getHeader("Proxy-Client-IP");
+ }
+ if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+ ip = request.getHeader("WL-Proxy-Client-IP");
+ }
+ if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+ ip = request.getHeader("HTTP_CLIENT_IP");
+ }
+ if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+ ip = request.getHeader("HTTP_X_FORWARDED_FOR");
+ }
+ if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+ ip = request.getRemoteAddr();
+ }
+ return ip;
+ }
+
+
+ public static void setPageParam(Sqler sqler) {
+ HttpServletRequest request = getRequest();
+ Integer pageNum = Convert.toInt(request.getParameter(PAGE_NUM));
+ Integer pageSize = Convert.toInt(request.getParameter(PAGE_SIZE));
+ if(pageNum!=null){
+ sqler.setPanum(pageNum);
+ }
+ if(pageSize!=null){
+ sqler.setPasiz(pageSize);
+ }
+ }
+
+
+ /**
+ * 获取String参数
+ */
+ public static String getParameter(String name)
+ {
+ return getRequest().getParameter(name);
+ }
+
+ /**
+ * 获取String参数
+ */
+ public static String getParameter(String name, String defaultValue)
+ {
+ return Convert.toStr(getRequest().getParameter(name), defaultValue);
+ }
+
+ /**
+ * 获取Integer参数
+ */
+ public static Integer getParameterToInt(String name)
+ {
+ return Convert.toInt(getRequest().getParameter(name));
+ }
+
+ /**
+ * 获取Integer参数
+ */
+ public static Integer getParameterToInt(String name, Integer defaultValue)
+ {
+ return Convert.toInt(getRequest().getParameter(name), defaultValue);
+ }
+
+ /**
+ * 获取Boolean参数
+ */
+ public static Boolean getParameterToBool(String name)
+ {
+ return Convert.toBool(getRequest().getParameter(name));
+ }
+
+ /**
+ * 获取Boolean参数
+ */
+ public static Boolean getParameterToBool(String name, Boolean defaultValue)
+ {
+ return Convert.toBool(getRequest().getParameter(name), defaultValue);
+ }
+
+ /**
+ * 获取request
+ */
+ public static HttpServletRequest getRequest()
+ {
+ return getRequestAttributes().getRequest();
+ }
+
+ /**
+ * 获取response
+ */
+ public static HttpServletResponse getResponse()
+ {
+ return getRequestAttributes().getResponse();
+ }
+
+ /**
+ * 获取session
+ */
+ public static HttpSession getSession()
+ {
+ return getRequest().getSession();
+ }
+
+ public static ServletRequestAttributes getRequestAttributes()
+ {
+ RequestAttributes attributes = RequestContextHolder.getRequestAttributes();
+ return (ServletRequestAttributes) attributes;
+ }
+
+ /**
+ * 将字符串渲染到客户端
+ *
+ * @param response 渲染对象
+ * @param string 待渲染的字符串
+ * @return null
+ */
+ public static String renderString(HttpServletResponse response, String string)
+ {
+ try
+ {
+ response.setStatus(200);
+ response.setContentType("application/json");
+ response.setCharacterEncoding("utf-8");
+ response.getWriter().print(string);
+ }
+ catch (IOException e)
+ {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ /**
+ * 是否是Ajax异步请求
+ *
+ * @param request
+ */
+// public static boolean isAjaxRequest(HttpServletRequest request)
+// {
+// String accept = request.getHeader("accept");
+// if (accept != null && accept.indexOf("application/json") != -1)
+// {
+// return true;
+// }
+//
+// String xRequestedWith = request.getHeader("X-Requested-With");
+// if (xRequestedWith != null && xRequestedWith.indexOf("XMLHttpRequest") != -1)
+// {
+// return true;
+// }
+//
+// String uri = request.getRequestURI();
+// if (StringUtils.inStringIgnoreCase(uri, ".json", ".xml"))
+// {
+// return true;
+// }
+//
+// String ajax = request.getParameter("__ajax");
+// if (StringUtils.inStringIgnoreCase(ajax, "json", "xml"))
+// {
+// return true;
+// }
+// return false;
+// }
+
+}
\ No newline at end of file
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/util/web/XresUtil.java b/vboot-core/src/main/java/com/zsvg/vboot/common/util/web/XresUtil.java
new file mode 100644
index 0000000..d529bb4
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/common/util/web/XresUtil.java
@@ -0,0 +1,35 @@
+package com.zsvg.vboot.common.util.web;
+
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.URLEncoder;
+
+public class XresUtil {
+
+
+ public static void downloadExcelXls(HttpServletResponse response, HSSFWorkbook workbook, String name) throws IOException
+ {
+ String fileName = URLEncoder.encode(name, "UTF-8");
+ response.setHeader("content-disposition", "attachment;filename=" + fileName + ".xls");
+ response.setContentType("application/vnd.ms-excel");
+ OutputStream out = response.getOutputStream();
+ workbook.write(out);
+ out.flush();
+ out.close();
+ }
+
+ public static void downloadExcelXlsx(HttpServletResponse response, XSSFWorkbook workbook, String name) throws IOException
+ {
+ String fileName = URLEncoder.encode(name, "UTF-8");
+ response.setHeader("content-disposition", "attachment;filename=" + fileName + ".xlsx");
+ response.setContentType("application/vnd.ms-excel");
+ OutputStream out = response.getOutputStream();
+ workbook.write(out);
+ out.flush();
+ out.close();
+ }
+}
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/util/web/XspringUtil.java b/vboot-core/src/main/java/com/zsvg/vboot/common/util/web/XspringUtil.java
new file mode 100644
index 0000000..52f6fc6
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/common/util/web/XspringUtil.java
@@ -0,0 +1,32 @@
+package com.zsvg.vboot.common.util.web;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+
+public class XspringUtil {
+
+ private static ApplicationContext applicationContext = null;
+
+ public static void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+ if(XspringUtil.applicationContext == null){
+ XspringUtil.applicationContext = applicationContext;
+ }
+ }
+
+ public static ApplicationContext getApp() {
+ return applicationContext;
+ }
+
+ public static Object getBean(String name){
+ return getApp().getBean(name);
+ }
+
+ public static T getBean(Class clazz){
+ return getApp().getBean(clazz);
+ }
+
+ public static T getBean(String name,Class clazz){
+ return getApp().getBean(name, clazz);
+ }
+
+}
\ No newline at end of file
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/util/web/XuserUtil.java b/vboot-core/src/main/java/com/zsvg/vboot/common/util/web/XuserUtil.java
new file mode 100644
index 0000000..d2c2ab8
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/common/util/web/XuserUtil.java
@@ -0,0 +1,48 @@
+package com.zsvg.vboot.common.util.web;
+
+import com.zsvg.vboot.module.sys.org.root.SysOrg;
+import com.zsvg.vboot.config.security.pojo.Zuser;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+
+public class XuserUtil {
+
+ public static String[] admins;
+
+ public static boolean isAdmin(String usnam) {
+ if ("sa".equals(usnam)) {
+ return true;
+ }
+ for (int i = 0; i < XuserUtil.admins.length; i++) {
+ if (XuserUtil.admins[i].equals(usnam)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public static SysOrg getUser() {
+ String userId = null;
+ Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+ userId = calcUserId(userId, authentication);
+ return new SysOrg(userId, "");
+ }
+
+ public static String getUserId() {
+ String userId = null;
+ Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+ userId = calcUserId(userId, authentication);
+ return userId;
+ }
+
+ private static String calcUserId(String userId, Authentication authentication) {
+ if (authentication.getPrincipal() instanceof String) {
+ userId = (String) authentication.getPrincipal();
+ } else if (authentication.getPrincipal() instanceof Zuser) {
+ Zuser zuser = (Zuser) authentication.getPrincipal();
+ userId = zuser.getId();
+ }
+ return userId;
+ }
+
+}
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/config/AppConfig.java b/vboot-core/src/main/java/com/zsvg/vboot/config/AppConfig.java
new file mode 100644
index 0000000..88e330d
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/config/AppConfig.java
@@ -0,0 +1,51 @@
+package com.zsvg.vboot.config;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.validation.annotation.Validated;
+
+import javax.validation.Valid;
+
+@Validated
+@Configuration
+@ConfigurationProperties(prefix = "zsvg")
+public class AppConfig {
+
+ @Getter
+ @Setter
+ @Valid
+ private Jwt jwt = new Jwt();
+
+ @Getter
+ @Setter
+ public static class Jwt {
+ private String header = "Authorization"; //HTTP 报头的认证字段的 key
+ private String prefix = "Bearer "; //HTTP 报头的认证字段的值的前缀
+
+ private long atime = 28800L; //accessToken过期时间 此处单位秒 ，默认8小时 28800
+
+ private long rtime = 3456000L; //accessToken过期时间 此处单位秒 ，默认30天 3456000
+
+ private String akey;//生成accessToken用的key
+
+ private String rkey;//生成refreshToken用的key
+
+
+ //以下赞未用到
+// //在线用户 key，根据 key 查询 redis 中在线用户的数据
+// private String onlineKey;
+//
+// //验证码 key
+// private String codeKey;
+//
+// //token 续期检查
+// private Long detect;
+//
+// //续期时间
+// private Long renew;
+
+ }
+
+}
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/config/db/init/DbInitListener.java b/vboot-core/src/main/java/com/zsvg/vboot/config/db/init/DbInitListener.java
new file mode 100644
index 0000000..d9d3461
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/config/db/init/DbInitListener.java
@@ -0,0 +1,57 @@
+package com.zsvg.vboot.config.db.init;
+
+import com.zsvg.vboot.module.sys.org.user.SysOrgUserRepo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.event.ContextRefreshedEvent;
+
+import java.lang.management.ManagementFactory;
+import java.net.InetAddress;
+
+@Configuration
+@Slf4j
+public class DbInitListener implements ApplicationListener {
+
+
+ /**
+ * 首次数据库生成后，初始化组织架构，菜单，权限角色等信息
+ * 增加sa，admin管理员账号及相关测试账号
+ * 判断依据是sys_org_user是否含有id为sa的账号
+ */
+ @Override
+ public void onApplicationEvent(ContextRefreshedEvent event) {
+ try {
+ if (!userDao.existsById("sa")) {
+ System.out.println("首次启动系统，正在进行数据库初始化，请耐心等待。");
+ sysOrgInit.initCorp();
+ System.out.println("1.1 初始化部门完毕");
+ sysOrgInit.initUser();
+ sysOrgInit.initZsf();
+ sysOrgInit.initSa();
+ System.out.println("1.2 初始化用户完毕");
+// sysOrgInit.initPost();
+// sysOrgInit.initGroup();
+
+ sysAuthInit.initMenu();
+ System.out.println("2.1 初始化菜单完毕");
+ }
+ } catch (Exception e) {
+ System.err.println("初始化出错");
+ e.printStackTrace();
+ }
+ }
+
+ @Autowired
+ private SysOrgUserRepo userDao;
+
+
+ @Autowired
+ private SysOrgInit sysOrgInit;
+
+ @Autowired
+ private SysAuthInit sysAuthInit;
+
+
+}
\ No newline at end of file
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/config/db/init/SysAuthInit.java b/vboot-core/src/main/java/com/zsvg/vboot/config/db/init/SysAuthInit.java
new file mode 100644
index 0000000..baa0794
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/config/db/init/SysAuthInit.java
@@ -0,0 +1,146 @@
+package com.zsvg.vboot.config.db.init;
+
+import com.zsvg.vboot.module.sys.auth.menu.SysAuthMenu;
+import com.zsvg.vboot.module.sys.auth.menu.SysAuthMenuService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class SysAuthInit {
+
+ protected void initMenu() {
+ SysAuthMenu menu1 = new SysAuthMenu();
+ menu1.setId("Sys");
+ menu1.setName("系统管理");
+ menu1.setCode("Sys");
+ menu1.setComp("LAYOUT");
+ menu1.setPath("/sys");
+ menu1.setRedirect("/sys/org/user");
+ menu1.setOrnum(1);
+ menu1.setIcon("ant-design:setting-outlined");
+ menu1.setAvtag(true);
+ menu1.setShtag(true);
+ menu1.setType("D");
+ menuService.insert(menu1);
+
+ SysAuthMenu menu11 = new SysAuthMenu();
+ menu11.setId("SysOrg");
+ menu11.setName("组织架构");
+ menu11.setCode("SysOrg");
+ menu11.setComp("LAYOUT");
+ menu11.setPath("/sys/org");
+ menu11.setRedirect("/sys/org/user");
+ menu11.setOrnum(1);
+ menu11.setIcon("ant-design:partition-outlined");
+ menu11.setPid("Sys");
+ menu11.setAvtag(true);
+ menu11.setShtag(true);
+ menu11.setType("D");
+ menuService.insert(menu11);
+
+ SysAuthMenu menu111 = new SysAuthMenu();
+ menu111.setId("SysOrgDept");
+ menu111.setName("部门管理");
+ menu111.setCode("SysOrgDept");
+ menu111.setPath("/sys/org/dept");
+ menu111.setComp("/sys/org/dept/index.vue");
+ menu111.setOrnum(1);
+ menu111.setPid("SysOrg");
+ menu111.setCatag(false);
+ menu111.setAvtag(true);
+ menu111.setShtag(true);
+ menu111.setType("M");
+ menuService.insert(menu111);
+
+ SysAuthMenu menu112 = new SysAuthMenu();
+ menu112.setId("SysOrgUser");
+ menu112.setName("用户管理");
+ menu112.setCode("SysOrgUser");
+ menu112.setPath("/sys/org/user");
+ menu112.setComp("/sys/org/user/index.vue");
+ menu112.setOrnum(2);
+ menu112.setPid("SysOrg");
+ menu112.setCatag(false);
+ menu112.setAvtag(true);
+ menu112.setShtag(true);
+ menu112.setType("M");
+ menuService.insert(menu112);
+
+ SysAuthMenu menu113 = new SysAuthMenu();
+ menu113.setId("SysOrgPost");
+ menu113.setName("岗位管理");
+ menu113.setCode("SysOrgPost");
+ menu113.setPath("/sys/org/post");
+ menu113.setComp("/sys/org/post/index.vue");
+ menu113.setOrnum(3);
+ menu113.setPid("SysOrg");
+ menu113.setCatag(false);
+ menu113.setAvtag(true);
+ menu113.setShtag(true);
+ menu113.setType("M");
+ menuService.insert(menu113);
+
+ SysAuthMenu menu114 = new SysAuthMenu();
+ menu114.setId("SysOrgGroup");
+ menu114.setName("群组管理");
+ menu114.setCode("SysOrgGroup");
+ menu114.setPath("/sys/org/group");
+ menu114.setComp("/sys/org/group/index.vue");
+ menu114.setOrnum(4);
+ menu114.setPid("SysOrg");
+ menu114.setCatag(false);
+ menu114.setAvtag(true);
+ menu114.setShtag(true);
+ menu114.setType("M");
+ menuService.insert(menu114);
+
+ SysAuthMenu menu12 = new SysAuthMenu();
+ menu12.setId("SysAuth");
+ menu12.setName("权限管理");
+ menu12.setCode("SysAuth");
+ menu12.setComp("LAYOUT");
+ menu12.setPath("/sys/auth");
+ menu12.setRedirect("/sys/auth/menu");
+ menu12.setOrnum(2);
+ menu12.setIcon("ant-design:safety-certificate-outlined");
+ menu12.setPid("Sys");
+ menu12.setAvtag(true);
+ menu12.setShtag(true);
+ menu12.setType("D");
+ menuService.insert(menu12);
+
+ SysAuthMenu menu121 = new SysAuthMenu();
+ menu121.setId("SysAuthMenu");
+ menu121.setName("菜单管理");
+ menu121.setCode("SysAuthMenu");
+ menu121.setPath("/sys/auth/menu");
+ menu121.setComp("/sys/auth/menu/index.vue");
+ menu121.setOrnum(1);
+ menu121.setPid("SysAuth");
+ menu121.setCatag(false);
+ menu121.setAvtag(true);
+ menu121.setShtag(true);
+ menu121.setType("M");
+ menuService.insert(menu121);
+
+ SysAuthMenu menu122 = new SysAuthMenu();
+ menu122.setId("SysAuthRole");
+ menu122.setName("角色管理");
+ menu122.setCode("SysAuthRole");
+ menu122.setPath("/sys/auth/role");
+ menu122.setComp("/sys/auth/role/index.vue");
+ menu122.setOrnum(1);
+ menu122.setPid("SysAuth");
+ menu122.setCatag(false);
+ menu122.setAvtag(true);
+ menu122.setShtag(true);
+ menu122.setType("M");
+ menuService.insert(menu122);
+
+ }
+
+ @Autowired
+ private SysAuthMenuService menuService;
+
+
+}
\ No newline at end of file
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/config/db/init/SysOrgInit.java b/vboot-core/src/main/java/com/zsvg/vboot/config/db/init/SysOrgInit.java
new file mode 100644
index 0000000..db987b5
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/config/db/init/SysOrgInit.java
@@ -0,0 +1,317 @@
+package com.zsvg.vboot.config.db.init;
+
+import com.zsvg.vboot.common.mvc.dao.JdbcDao;
+import com.zsvg.vboot.common.util.lang.XstringUtil;
+import com.zsvg.vboot.module.sys.org.dept.SysOrgDeptService;
+import com.zsvg.vboot.module.sys.org.root.SysOrg;
+import com.zsvg.vboot.module.sys.org.user.SysOrgUser;
+import com.zsvg.vboot.module.sys.org.user.SysOrgUserService;
+import com.zsvg.vboot.module.sys.org.dept.SysOrgDept;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Component
+public class SysOrgInit {
+
+
+ //公司及子公司初始化
+ protected void initCorp() throws Exception {
+ List deptList = new ArrayList<>();
+ initDept(deptList,"刘", "LIU",1);
+ initDept(deptList,"陈", "CHEN",2);
+ initDept(deptList,"张", "ZHANG",3);
+ initDept(deptList,"李", "LI",4);
+ initDept(deptList,"王", "WANG",5);
+ initDept(deptList,"赵", "ZHAO",6);
+ initDept(deptList,"孙", "SUN",7);
+ initDept(deptList,"周", "ZHOU",8);
+ initDept(deptList,"吴", "WU",9);
+ initDept(deptList,"郑", "ZHENG",10);
+ deptService.insertAll(deptList);
+ }
+
+ //部门初始化
+ private void initDept(List deptList,String name, String id,Integer ornum) throws Exception {
+ SysOrgDept corp = new SysOrgDept();
+ corp.setType(1);
+ corp.setId(id);
+ corp.setName(name + "家科技");
+ corp.setLabel(id);
+ corp.setOrnum(ornum);
+ corp.setAvtag(true);
+ corp.setTier("x"+id+"x");
+ deptList.add(corp);
+
+ SysOrgDept dept1 = new SysOrgDept();
+ dept1.setType(2);
+ dept1.setId(id + "-1");
+ dept1.setName(name + "一总金办");
+ dept1.setLabel(id);
+ dept1.setParent(new SysOrg(id));
+ dept1.setOrnum(1);
+ dept1.setAvtag(true);
+ dept1.setTier("x"+id+"x"+id + "-1"+"x");
+ deptList.add(dept1);
+
+ SysOrgDept dept2 = new SysOrgDept();
+ dept2.setType(2);
+ dept2.setId(id + "-2");
+ dept2.setName(name + "二人事部");
+ dept2.setLabel(id);
+ dept2.setParent(new SysOrg(id));
+ dept2.setOrnum(2);
+ dept2.setAvtag(true);
+ dept2.setTier("x"+id+"x"+id + "-2"+"x");
+ deptList.add(dept2);
+
+ SysOrgDept dept3 = new SysOrgDept();
+ dept3.setType(2);
+ dept3.setId(id + "-3");
+ dept3.setName(name + "三销售部");
+ dept3.setLabel(id);
+ dept3.setParent(new SysOrg(id));
+ dept3.setOrnum(3);
+ dept3.setAvtag(true);
+ dept3.setTier("x"+id+"x"+id + "-3"+"x");
+ deptList.add(dept3);
+
+ SysOrgDept dept4 = new SysOrgDept();
+ dept4.setType(2);
+ dept4.setId(id + "-4");
+ dept4.setName(name + "四财务部");
+ dept4.setLabel(id);
+ dept4.setParent(new SysOrg(id));
+ dept4.setOrnum(4);
+ dept4.setAvtag(true);
+ dept4.setTier("x"+id+"x"+id + "-4"+"x");
+ deptList.add(dept4);
+
+ SysOrgDept dept5 = new SysOrgDept();
+ dept5.setType(2);
+ dept5.setId(id + "-5");
+ dept5.setName(name + "五采购部");
+ dept5.setLabel(id);
+ dept5.setParent(new SysOrg(id));
+ dept5.setOrnum(5);
+ dept5.setAvtag(true);
+ dept5.setTier("x"+id+"x"+id + "-5"+"x");
+ deptList.add(dept5);
+
+ SysOrgDept dept6 = new SysOrgDept();
+ dept6.setType(2);
+ dept6.setId(id + "-6");
+ dept6.setName(name + "六技术部");
+ dept6.setLabel(id);
+ dept6.setParent(new SysOrg(id));
+ dept6.setOrnum(6);
+ dept6.setAvtag(true);
+ dept6.setTier("x"+id+"x"+id + "-6"+"x");
+ deptList.add(dept6);
+
+ SysOrgDept dept7 = new SysOrgDept();
+ dept7.setType(2);
+ dept7.setId(id + "-7");
+ dept7.setName(name + "七制造部");
+ dept7.setLabel(id);
+ dept7.setParent(new SysOrg(id));
+ dept7.setOrnum(7);
+ dept7.setAvtag(true);
+ dept7.setTier("x"+id+"x"+id + "-7"+"x");
+ deptList.add(dept7);
+
+ SysOrgDept dept8 = new SysOrgDept();
+ dept8.setType(2);
+ dept8.setId(id + "-8");
+ dept8.setName(name + "八法务部");
+ dept8.setLabel(id);
+ dept8.setParent(new SysOrg(id));
+ dept8.setOrnum(8);
+ dept8.setAvtag(true);
+ dept8.setTier("x"+id+"x"+id + "-8"+"x");
+ deptList.add(dept8);
+
+ SysOrgDept dept9 = new SysOrgDept();
+ dept9.setType(2);
+ dept9.setId(id + "-9");
+ dept9.setName(name + "九信息部");
+ dept9.setLabel(id);
+ dept9.setParent(new SysOrg(id));
+ dept9.setOrnum(9);
+ dept9.setAvtag(true);
+ dept9.setTier("x"+id+"x"+id + "-9"+"x");
+ deptList.add(dept9);
+
+ for (int i = 1; i <= 50; i++) {
+ String RSID8= XstringUtil.getRSID8();
+ SysOrgDept xdept = new SysOrgDept();
+ xdept.setType(2);
+ xdept.setId(id + "--"+i);
+ xdept.setName(RSID8);
+ xdept.setLabel(id);
+ xdept.setParent(new SysOrg(id+"-"+(i%10==0?1:i%10)));
+ xdept.setAvtag(true);
+ xdept.setTier("x"+id+"x"+id+"-"+(i%10==0?1:i%10)+"x"+id + "--"+i+"x");
+ deptList.add(xdept);
+ }
+
+ }
+
+ protected void initUser() {
+ List userList = new ArrayList<>();
+ initUser(userList,"刘", "liu", "LIU");
+ initUser(userList,"陈", "c", "CHEN");
+ initUser(userList,"张", "z", "ZHANG");
+ initUser(userList,"李", "l", "LI");
+ initUser(userList,"王", "w", "WANG");
+ initUser(userList,"赵", "zhao", "ZHAO");
+ initUser(userList,"孙", "s", "SUN");
+ initUser(userList,"周", "zhou", "ZHOU");
+ initUser(userList,"吴", "wu", "WU");
+ initUser(userList,"郑", "zheng", "ZHENG");
+ userService.insertAll(userList);
+ }
+
+ private void initUser(List userList,String name, String id, String pid) {
+ SysOrgUser user0 = new SysOrgUser();
+ user0.setId(id+"lao");
+ user0.setUsnam(id);
+ user0.setName(name + "老");
+ user0.setDept(new SysOrg(pid));
+ user0.setPacod("1");//1
+ user0.setAvtag(true);
+ user0.setTier("x"+pid+"x"+id+"lao");
+ userList.add(user0);
+
+ for (int i = 1; i <= 9; i++) {
+ SysOrgUser userx = new SysOrgUser();
+ userx.setId(id + i);
+ userx.setUsnam(id + i);
+ userx.setName(name + numChange("" + i));
+ userx.setDept(new SysOrg(pid + "-" + i));
+ userx.setOrnum(i);
+ userx.setPacod("1");//1
+ userx.setAvtag(true);
+ userx.setTier("x"+pid+"x"+pid + "-" + i+"x"+id + i+"x");
+ userList.add(userx);
+
+ for (int j = 1; j <= 9; j++) {
+ SysOrgUser usery = new SysOrgUser();
+ usery.setId(id + i + j);
+ usery.setUsnam(id + i + j);
+ usery.setName(name + numChange("" + i) + numChange("" + j));
+ usery.setDept(new SysOrg(pid + "-" + i));
+ usery.setOrnum(j);
+ usery.setPacod("1");//1
+ usery.setAvtag(true);
+ usery.setTier("x"+pid+"x"+pid + "-" + i+"x"+id + i + j+"x");
+ userList.add(usery);
+ }
+ }
+ }
+
+
+ protected void initZsf() {
+
+ SysOrgDept dept1 = new SysOrgDept();
+ dept1.setType(2);
+ dept1.setId("ZHANG-3-1");
+ dept1.setName("张三销售一室");
+ dept1.setLabel("ZHANG");
+ dept1.setParent(new SysOrg("ZHANG-3"));
+ dept1.setOrnum(1);
+ dept1.setAvtag(true);
+ dept1.setTier("xZHANGxZHANG-3xZHANG-3-1x");
+ deptService.insert(dept1);
+
+ SysOrgDept dept2 = new SysOrgDept();
+ dept2.setType(2);
+ dept2.setId("ZHANG-3-2");
+ dept2.setName("张三销售二室");
+ dept2.setLabel("ZHANG");
+ dept2.setParent(new SysOrg("ZHANG-3"));
+ dept2.setOrnum(1);
+ dept2.setAvtag(true);
+ dept2.setTier("xZHANGxZHANG-3xZHANG-3-2x");
+ deptService.insert(dept2);
+
+ SysOrgUser user4 = new SysOrgUser();
+ user4.setId("zsf");
+ user4.setUsnam("zsf");
+ user4.setName("张三丰");
+ user4.setDept(new SysOrg("ZHANG-3-2"));
+ user4.setOrnum(1);
+ user4.setPacod("1");
+ user4.setAvtag(true);
+ user4.setTier("xZHANGxZHANG-3xZHANG-3-2xzsfx");
+ userService.insert(user4);
+ }
+
+ protected void initSa() {
+ SysOrgUser user = new SysOrgUser();
+ user.setId("sa");
+ user.setUsnam("sa");
+ user.setName("管理员");
+ user.setPacod("1");
+ user.setAvtag(true);
+ user.setTier("xsax");
+ userService.insert(user);
+
+ SysOrgUser user2 = new SysOrgUser();
+ user2.setId("vben");
+ user2.setUsnam("vben");
+ user2.setName("小维");
+ user2.setPacod("123456");
+ user2.setAvtag(true);
+ user2.setTier("xvbenx");
+ userService.insert(user2);
+ }
+
+ private String numChange(String num) {
+ switch (num) {
+ case "1":
+ return "一";
+ case "2":
+ return "二";
+ case "3":
+ return "三";
+ case "4":
+ return "四";
+ case "5":
+ return "五";
+ case "6":
+ return "六";
+ case "7":
+ return "七";
+ case "8":
+ return "八";
+ case "9":
+ return "九";
+ case "10":
+ return "十";
+ }
+ return "零";
+ }
+
+//
+// //岗位初始化
+// private void initPost() {
+//
+// }
+//
+// //组织架构组初始化
+// private void initGroup() {
+//
+// }
+
+ @Autowired
+ private JdbcDao jdbcDao;
+
+ @Autowired
+ private SysOrgDeptService deptService;
+
+ @Autowired
+ private SysOrgUserService userService;
+}
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/config/dbx/ldap/LdapConfig.java b/vboot-core/src/main/java/com/zsvg/vboot/config/dbx/ldap/LdapConfig.java
new file mode 100644
index 0000000..b180516
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/config/dbx/ldap/LdapConfig.java
@@ -0,0 +1,50 @@
+package com.zsvg.vboot.config.dbx.ldap;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.ldap.core.LdapTemplate;
+import org.springframework.ldap.core.support.LdapContextSource;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Configuration
+public class LdapConfig {
+
+ @Value("${ldap.url}")
+ private String ldapUrl;
+
+ @Value("${ldap.base}")
+ private String ldapBase;
+
+ @Value("${ldap.userDn}")
+ private String ldapUserDn;
+
+ @Value("${ldap.userPwd}")
+ private String ldapUserPwd;
+
+ @Value("${ldap.referral}")
+ private String ldapReferral;
+
+ @Bean
+ public LdapTemplate ldapTemplate() {
+ return new LdapTemplate(contextSourceTarget());
+ }
+
+ @Bean
+ public LdapContextSource contextSourceTarget() {
+ LdapContextSource ldapContextSource = new LdapContextSource();
+ ldapContextSource.setUrl(ldapUrl);
+ ldapContextSource.setBase(ldapBase);
+ ldapContextSource.setUserDn(ldapUserDn);
+ ldapContextSource.setPassword(ldapUserPwd);
+ ldapContextSource.setReferral(ldapReferral);
+ Map config = new HashMap();
+ config.put("java.naming.ldap.attributes.binary", "objectGUID");
+// config.put("com.sun.jndi.ldap.read.timeout","3000");
+ ldapContextSource.setPooled(false);
+ ldapContextSource.setBaseEnvironmentProperties(config);
+ return ldapContextSource;
+ }
+}
\ No newline at end of file
diff --git a/vboot-core/src/main/java/com/zsvg/vboot/config/dbx/redis/RedisConfig.java b/vboot-core/src/main/java/com/zsvg/vboot/config/dbx/redis/RedisConfig.java
new file mode 100644
index 0000000..bdf20d2
--- /dev/null
+++ b/vboot-core/src/main/java/com/zsvg/vboot/config/dbx/redis/RedisConfig.java
@@ -0,0 +1,197 @@
+package com.zsvg.vboot.config.dbx.redis;
+
+import cn.hutool.core.lang.Assert;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.parser.ParserConfig;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import lombok.extern.slf4j.Slf4j;
+import com.zsvg.vboot.common.util.lang.XstringUtil;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cache.Cache;
+import org.springframework.cache.annotation.CachingConfigurerSupport;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.cache.interceptor.CacheErrorHandler;
+import org.springframework.cache.interceptor.KeyGenerator;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.cache.RedisCacheConfiguration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.RedisOperations;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.RedisSerializationContext;
+import org.springframework.data.redis.serializer.RedisSerializer;
+
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.time.Duration;
+import java.util.HashMap;
+import java.util.Map;
+
+@Slf4j
+@Configuration
+@EnableCaching
+@ConditionalOnClass(RedisOperations.class)
+@EnableConfigurationProperties(RedisProperties.class)
+public class RedisConfig extends CachingConfigurerSupport {
+
+ /**
+ * 设置 redis 数据默认过期时间，默认2小时
+ * 设置@cacheable 序列化方式
+ */
+ @Bean
+ public RedisCacheConfiguration redisCacheConfiguration() {
+ FastJsonRedisSerializer