配置文件更改

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/core/domain/BaseEntity.java

@@ -5,13 +5,13 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.IdGen;
 import com.jeeplus.sys.utils.UserUtils;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.UUID;
 
 /*
  * 数据Entity类
@@ -89,7 +89,7 @@ public abstract class BaseEntity implements Serializable {
      * 插入之前执行方法，需要手动调用
      */
     public void preInsert(){
-        setId(IdGen.uuid());
+        setId(UUID.randomUUID().toString().replaceAll("-", ""));
         UserDTO user = UserUtils.getCurrentUserDTO();
         if (StringUtils.isNotBlank(user.getId())){
             this.setCreateBy(user.getId());

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/utils/IdGen.java

@@ -1,63 +0,0 @@
-/**
- * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
- */
-package com.jeeplus.sys.utils;
-
-import org.apache.shiro.session.Session;
-import org.apache.shiro.session.mgt.eis.SessionIdGenerator;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-
-import java.io.Serializable;
-import java.security.SecureRandom;
-import java.util.UUID;
-
-/**
- * 封装各种生成唯一性ID算法的工具类.
- * @author jeeplus
- * @version 2016-01-15
- */
-@Service
-@Lazy(false)
-public class IdGen implements SessionIdGenerator {
-
-	private static SecureRandom random = new SecureRandom();
-	
-	/**
-	 * 封装JDK自带的UUID, 通过Random数字生成, 中间无-分割.
-	 */
-	public static String uuid() {
-		return UUID.randomUUID().toString().replaceAll("-", "");
-	}
-	
-	/**
-	 * 使用SecureRandom随机生成Long. 
-	 */
-	public static long randomLong() {
-		return Math.abs(random.nextLong());
-	}
-
-	/**
-	 * 基于Base62编码的SecureRandom随机生成bytes.
-	 */
-	public static String randomBase62(int length) {
-		byte[] randomBytes = new byte[length];
-		random.nextBytes(randomBytes);
-		return Encodes.encodeBase62(randomBytes);
-	}
-	
-
-	@Override
-	public Serializable generateId(Session session) {
-		return IdGen.uuid();
-	}
-	
-	public static void main(String[] args) {
-		System.out.println(IdGen.uuid());
-		System.out.println(IdGen.uuid().length());
-		for (int i=0; i<1000; i++){
-			System.out.println(IdGen.randomLong() + "  " + IdGen.randomBase62(5));
-		}
-	}
-
-}

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/utils/StringUtils.java

@@ -5,12 +5,6 @@ package com.jeeplus.sys.utils;
 
 import com.google.common.collect.Lists;
 import net.sf.json.JSONObject;
-import net.sourceforge.pinyin4j.PinyinHelper;
-import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType;
-import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat;
-import net.sourceforge.pinyin4j.format.HanyuPinyinToneType;
-import net.sourceforge.pinyin4j.format.HanyuPinyinVCharType;
-import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -391,45 +385,6 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
 
 
 
-	/**
-	 * 获取字符首字母大小写
-	 */
-
-	public static String getPinYinHeadChar(String zn_str, int caseType) {
-		if(zn_str != null && !zn_str.trim().equalsIgnoreCase("")) {
-			char[] strChar = zn_str.toCharArray();
-			// 汉语拼音格式输出类
-			HanyuPinyinOutputFormat hanYuPinOutputFormat = new HanyuPinyinOutputFormat();
-			// 输出设置，大小写，音标方式等
-			if(1 == caseType) {
-				hanYuPinOutputFormat.setCaseType(HanyuPinyinCaseType.LOWERCASE);
-			} else {
-				hanYuPinOutputFormat.setCaseType(HanyuPinyinCaseType.UPPERCASE);
-			}
-			hanYuPinOutputFormat.setToneType(HanyuPinyinToneType.WITHOUT_TONE);
-			hanYuPinOutputFormat.setVCharType(HanyuPinyinVCharType.WITH_V);
-			StringBuffer pyStringBuffer = new StringBuffer();
-			for(int i=0; i<strChar.length; i++) {
-				char c = strChar[i];
-				char pyc = strChar[i];
-				if(String.valueOf(c).matches("[\\u4E00-\\u9FA5]+")) {//是中文或者a-z或者A-Z转换拼音
-					try {
-						String[] pyStirngArray = PinyinHelper.toHanyuPinyinStringArray(strChar[i], hanYuPinOutputFormat);
-						if(null != pyStirngArray && pyStirngArray[0]!=null) {
-							pyc = pyStirngArray[0].charAt(0);
-							pyStringBuffer.append(pyc);
-						}
-					} catch(BadHanyuPinyinOutputFormatCombination e) {
-						e.printStackTrace();
-					}
-				}
-			}
-			return pyStringBuffer.toString();
-		}
-		return null;
-	}
-
-
 	public static boolean isChinese(char c) {
 		Character.UnicodeBlock ub = Character.UnicodeBlock.of(c);
 		if (ub == Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS || ub == Character.UnicodeBlock.CJK_COMPATIBILITY_IDEOGRAPHS

pom.xml

@@ -241,7 +241,7 @@
             <artifactId>poi-ooxml-schemas</artifactId>
             <version>3.17</version>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>com.belerweb</groupId>
             <artifactId>pinyin4j</artifactId>
             <version>2.5.0</version>
@@ -250,13 +250,7 @@
             <groupId>com.belerweb</groupId>
             <artifactId>pinyin4j</artifactId>
             <version>2.5.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-core</artifactId>
-            <version>1.2.3</version>
-        </dependency>
-
+        </dependency>-->
 
 
 

sql文件/auth.html

@@ -1,302 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>Jeeplus开发框架</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <link rel="stylesheet" href="${ctxStatic}/blog/fly-3.0/res/layui/css/layui.css" media="all">
-    <link rel="stylesheet" href="${ctxStatic}/blog/fly-3.0/res/layui/css/global.css" media="all">
-    <link rel="stylesheet" href="${ctxStatic}/blog/fly-3.0/res/layui/css/style.css" media="all">
-    <!-- 设置浏览器图标 -->
-    <link rel="shortcut icon" href="${ctxStatic}/favicon.ico">
-    <!-- 注意：如果你直接复制所有代码到本地，上述css路径需要改成你本地的 -->
-    <style>
-
-        *{margin:0;padding:0;list-style-type:none;}
-        a,img{border:0;}
-        a{text-decoration:none;}
-        a:hover{text-decoration:underline;}
-        body{font:12px/180% Arial, Helvetica, sans-serif, "新宋体";color:#333333;}
-
-        /* 主要css样式*/
-        .main-im{position:fixed;right:10px;top:300px;z-index:100;width:110px;height:272px;}
-        .main-im .qq-a{display:block;width:106px;height:116px;font-size:14px;color:#0484cd;text-align:center;position:relative;}
-        .main-im .qq-a span{bottom:5px;position:absolute;width:90px;left:10px;}
-        .main-im .qq-hover-c{width:70px;height:70px;border-radius:35px;position:absolute;left:18px;top:10px;overflow:hidden;z-index:9;}
-        .main-im .qq-container{z-index:99;position:absolute;width:109px;height:118px;border-top-left-radius:10px;border-top-right-radius:10px;border-bottom:1px solid #dddddd;background:url(http://demo.lanrenzhijia.com/2015/service0119/images/qq-icon-bg.png) no-repeat center 8px;}
-        .main-im .img-qq{max-width:60px;display:block;position:absolute;left:6px;top:3px;-moz-transition:all 0.5s;-webkit-transition:all 0.5s;-o-transition:all 0.5s;transition:all 0.5s;}
-        .main-im .im-qq:hover .img-qq{max-width:70px;left:1px;top:8px;position:absolute;}
-        .main-im .im_main{background:#F9FAFB;border:1px solid #dddddd;border-radius:10px;background:#F9FAFB;display:none;}
-        .main-im .im_main .im-tel{color:#000000;text-align:center;width:109px;height:105px;border-bottom:1px solid #dddddd;}
-        .main-im .im_main .im-tel div{font-weight:bold;font-size:12px;margin-top:6px;}
-        .main-im .im_main .im-tel .tel-num{font-family:Arial;font-weight:bold;color:#e66d15;}
-        .main-im .im_main .im-tel:hover{background:#fafafa;}
-        .main-im .im_main .weixing-container{width:55px;height:47px;border-right:1px solid #dddddd;background:#f5f5f5;border-bottom-left-radius:10px;background:url(http://demo.lanrenzhijia.com/2015/service0119/images/weixing-icon.png) no-repeat center center;float:left;}
-        .main-im .im_main .weixing-show{width:112px;height:172px;background:#ffffff;border-radius:10px;border:1px solid #dddddd;position:absolute;left:-125px;top:-126px;}
-        .main-im .im_main .weixing-show .weixing-sanjiao{width:0;height:0;border-style:solid;border-color:transparent transparent transparent #ffffff;border-width:6px;left:112px;top:134px;position:absolute;z-index:2;}
-        .main-im .im_main .weixing-show .weixing-sanjiao-big{width:0;height:0;border-style:solid;border-color:transparent transparent transparent #dddddd;border-width:8px;left:112px;top:132px;position:absolute;}
-        .main-im .im_main .weixing-show .weixing-ma{width:200px;height:200px;padding-left:5px;padding-top:5px;}
-        .main-im .im_main .weixing-show .weixing-txt{position:absolute;top:110px;left:7px;width:100px;margin:0 auto;text-align:center;}
-        .main-im .im_main .go-top{width:50px;height:47px;background:#f5f5f5;border-bottom-right-radius:10px;background:url(http://demo.lanrenzhijia.com/2015/service0119/images/totop-icon.png) no-repeat center center;;}
-        .main-im .im_main .go-top a{display:block;width:52px;height:47px;}
-        .main-im .close-im{position:absolute;right:10px;top:-12px;z-index:100;width:24px;height:24px;}
-        .main-im .close-im a{display:block;width:24px;height:24px;background:url(http://demo.lanrenzhijia.com/2015/service0119/images/close_im.png) no-repeat left top;}
-        .main-im .close-im a:hover{text-decoration:none;}
-        .main-im .open-im{cursor:pointer;margin-left:68px;width:40px;height:133px;background:url(http://demo.lanrenzhijia.com/2015/service0119/images/open_im.png) no-repeat left top;}
-    </style>
-</head>
-<body>
-
-
-<div class="header">
-    <div class="layui-main">
-        <a class="logo" style="color:#c2c2c2;"  href="http://www.jeeplus.org">
-            <img src="${ctxStatic}/logo.png" alt="jeeplus">
-        </a>
-
-        <ul class="layui-nav">
-            <li class="layui-nav-item">
-                <a href="http://wiki.jeeplus.org/docs/show/75" target="_blank">
-                    <span class="layui-hide-xs">开发者文档</span><span class="layui-show-xs layui-hide-sm">文档</span>
-                </a>
-            </li>
-
-
-            <li class="layui-nav-item layui-hide-xs">
-                <a href="javascript:;">
-                    在线演示
-                    <span class="layui-badge-dot" style="margin: -4px -15px 0;"></span>
-                </a>
-                <dl class="layui-nav-child">
-                    <dd><a href="http://demo1.jeeplus.org" target="_blank">springboot-vue <span class="layui-badge-dot"></span></a></dd>
-                    <dd><a href="http://demo1.jeeplus.org/jeeplus" target="_blank">springboot-beetl <span class="layui-badge-dot"></span></a></dd>
-                    <dd><a href="http://demo2.jeeplus.org/pjax" target="_blank">springboot-pjax <span class="layui-badge-dot"></span></a></dd>
-                    <dd><a href="http://demo3.jeeplus.org/ani" target="_blank">ani版演示 <span class="layui-badge-dot"></span></a></dd>
-                    <dd><a href="http://www.jeeplus.org/blog/case/page/1?project=jeeplus" target="_blank">经典版演示</a></dd>
-                </dl>
-            </li>
-
-
-            <!--<li class="layui-nav-item layui-hide-xs">-->
-                <!--<a href="" target="_blank">-->
-                    <!--更新日志-->
-                <!--</a>-->
-            <!--</li>-->
-            <!--<li class="layui-nav-item">-->
-                <!--<a href="" target="_blank">-->
-                    <!--<span class="layui-hide-xs">会员专区</span>-->
-                    <!--<span class="layui-show-xs layui-hide-sm">专区</span>-->
-                <!--</a>-->
-            <!--</li>-->
-        </ul>
-    </div>
-</div>
-
-<div class="alone-banner">
-    <div class="layui-main">
-        <h1>Jeeplus快速开发框架</h1>
-        <p class="layui-hide-xs">一个集成了代码生成器的JAVAEE框架</p>
-        <!--<p><span id="adminCountdown" style="display: inline-block; padding: 0 10px; line-height: 30px; border-radius: 2px; background-color: #c00;"></span></p>-->
-    </div>
-</div>
-
-<div class="alone-preview">
-
-    <p class="alone-download-btn">
-        <a href="${blog}/user/product" target="_blank" class="layui-btn">
-            立即下载
-        </a>
-        <a href="#get" class="layui-btn layui-btn-primary alone-download-right">
-            获取授权
-        </a>
-
-    </p>
-
-
-</div>
-
-<a name="get"> </a>
-
-<div class="layui-main alone-items">
-    <fieldset class="layui-elem-field layui-field-title" style="width:1000px">
-        <legend>客服1：<a target="_blank" href="http://wpa.qq.com/msgrd?v=3&uin=836559730&site=qq&menu=yes"><img border="0" src="http://wpa.qq.com/pa?p=2:117575171:51" alt="点击这里给我发消息" title="点击这里给我发消息"/></a>，
-          客服2： <a target="_blank" href="http://wpa.qq.com/msgrd?v=3&uin=940860956&site=qq&menu=yes"><img border="0" src="http://wpa.qq.com/pa?p=2:117575171:51" alt="点击这里给我发消息" title="点击这里给我发消息"/></a>，电话：18114800352</legend>
-          <p>QQ咨询状态有时候会收不到客服回复消息，如果联系客服长时间没有回应，请先添加客服QQ好友再发送消息就可以收到回复消息了，或者直接打电话咨询。</p>
-    </fieldset>
-    <div class="layui-row layui-col-space20">
-        <div class="layui-col-sm4">
-            <div class="alone-version-desc layui-text">
-                <h2>ani版本</h2>
-                <p>
-          <span class="alone-badge">
-            持续免费升级，不限项目域名
-            <i class="layui-icon alone-tips" lay-tips="推荐追求开发效率和缺乏前端开发经验的使用，后端开发者的最爱。">&#xe702;</i>
-          </span>
-                </p>
-                <i class="layui-badge" style="position: absolute; right: 30px; top: 30px;">hot</i>
-                <ul>
-                    <li style="color: #FF5722;">适合企业项目</li>
-                    <li style="color: #FF5722;">单一应用，快速上手</li>
-                    <li>spring mvc + mybatis + jsp + jquery</li>
-                    <li>项目源代码</li>
-                    <li>技术支持</li>
-                    <li>不限项目和域名</li>
-                    <li>支持版本升级</li>
-                    <li>社区 VIP 标识</li>
-                    <li>专属的QQ会员群，与同道中人隔空交流</li>
-                    <li>灵活的主题色配置</li>
-                    <li>专属的开发者文档，助你快速掌握</li>
-                </ul>
-                <div class="alone-buy layui-btn-container">
-                    <a href="http://demo3.jeeplus.org/ani" target="_blank" class="layui-btn layui-btn-primary layui-hide-xs">
-                        查看演示
-                    </a>
-                    <a href="${blog}/product/buy" target="_blank" class="layui-btn">选择授权</a>
-                        选择授权
-                    </a>
-                </div>
-            </div>
-        </div>
-        <div class="layui-col-sm4">
-            <div class="alone-version-desc layui-text">
-                <h2>springboot-beetl</h2>
-                <p>
-          <span class="alone-badge">
-         持续免费升级，不限项目域名
-            <i class="layui-icon alone-tips" lay-tips="推荐追求开发效率和缺乏前端开发经验的使，后端开发者的最爱。">&#xe702;</i>
-          </span>
-                </p>
-                <i class="layui-badge" style="position: absolute; right: 30px; top: 30px;">hot</i>
-                <ul>
-                    <li style="color: #FF5722;">适合企业项目</li>
-                    <li style="color: #FF5722;">maven多模块开发，方便多人协同开发</li>
-                    <li>springboot2 + mybatis + beetl/ pjax</li>
-                    <li>工作流、数据权限、报表、多数据源</li>
-                    <li>代码生成器支持连接不同的数据库，生成的模块可以连接指定的数据库，方便扩展为saas系统</li>
-                    <li>dashboard设计器，支持设计不同的首页看板</li>
-                    <li>echarts设计器，支持在线设计echarts图表</li>
-                    <li>插件化开发，系统内置多个插件，可以在线升级</li>
-                </ul>
-                <div class="alone-buy layui-btn-container">
-                    <a href="http://demo1.jeeplus.org/jeeplus" target="_blank" class="layui-btn layui-btn-primary layui-hide-xs">
-                        查看演示
-                    </a>
-                    <a href="${blog}/product/buy" target="_blank" class="layui-btn">选择授权</a>
-                    选择授权
-                    </a>
-                </div>
-            </div>
-        </div>
-        <div class="layui-col-sm4">
-            <div class="alone-version-desc layui-text">
-                <h2>springboot-vue</h2>
-                <p>
-          <span class="alone-badge">
-         持续免费升级，不限项目域名
-            <i class="layui-icon alone-tips" lay-tips="推荐追求开发效率和具有前端开发经验的使用。">&#xe702;</i>
-          </span>
-                </p>
-                <i class="layui-badge" style="position: absolute; right: 30px; top: 30px;">hot</i>
-                <ul>
-                    <li style="color: #FF5722;">前后端分离、maven多模块开发，方便多人协同开发</li>
-                    <li>springboot2 + mybatis + shiro + jwt token</li>
-                    <li>vue + element-ui + es6 + webpack</li>
-                    <li>代码生成器支持连接不同的数据库，生成的模块可以连接指定的数据库，支持自定义模板，可以无限扩展，生成各种复杂的代码</li>
-                    <li>一套代码支持mysql, oracel, postgresql,sqlserver数据库</li>
-                    <li>html5工作流设计器 + 动态表单 + 数据权限 + 报表</li>
-                </ul>
-                <div class="alone-buy layui-btn-container">
-                    <a href="http://demo1.jeeplus.org" target="_blank" class="layui-btn layui-btn-primary layui-hide-xs">
-                        查看演示
-                    </a>
-                    <a href="${blog}/product/buy" target="_blank" class="layui-btn">选择授权</a>
-                    选择授权
-                    </a>
-                </div>
-            </div>
-        </div>
-
-
-
-
-    </div>
-</div>
-
-
-<div class="layui-footer footer footer-index">
-    <div class="layui-main">
-        <p>&copy; 2018 <a href="http://www.jeeplus.org/">jeeplus.org</a> 版权所有</p>
-        <p>
-            官方出品
-        </p>
-    </div>
-</div>
-
-<!-- 代码部分 begin -->
-<div class="main-im">
-    <div id="open_im" class="open-im">&nbsp;</div>
-    <div class="im_main" id="im_main">
-        <div id="close_im" class="close-im"><a href="javascript:void(0);" title="点击关闭">&nbsp;</a></div>
-        <a href="http://wpa.qq.com/msgrd?v=3&uin=836559730&site=qq&menu=yes" target="_blank" class="im-qq qq-a" title="在线QQ客服">
-            <div class="qq-container"></div>
-            <div class="qq-hover-c"><img class="img-qq" src="http://demo.lanrenzhijia.com/2015/service0119/images/qq.png"></div>
-            <span> QQ在线咨询</span>
-        </a>
-        <!--<div class="im-tel">-->
-            <!--<div>售前咨询热线</div>-->
-            <!--<div class="tel-num">400-123-45678</div>-->
-            <!--<div>售后咨询热线</div>-->
-            <!--<div class="tel-num">010-12345678</div>-->
-        <!--</div>-->
-        <div class="im-footer" style="position:relative">
-            <!--<div class="weixing-container">-->
-                <!--<div class="weixing-show">-->
-                    <!--<div class="weixing-txt">微信扫一扫<br>打开懒人之家</div>-->
-                    <!--<img class="weixing-ma" src="${ctxStatic}/wx.jpg">-->
-                    <!--<div class="weixing-sanjiao"></div>-->
-                    <!--<div class="weixing-sanjiao-big"></div>-->
-                <!--</div>-->
-            <!--</div>-->
-            <div class="go-top"><a href="javascript:;" title="返回顶部"></a> </div>
-            <div style="clear:both"></div>
-        </div>
-    </div>
-</div>
-<script src="http://www.lanrenzhijia.com/ajaxjs/jquery.min.js"></script>
-<script>
-    $(function(){
-        $('#close_im').bind('click',function(){
-            $('#main-im').css("height","0");
-            $('#im_main').hide();
-            $('#open_im').show();
-        });
-        $('#open_im').bind('click',function(e){
-            $('#main-im').css("height","272");
-            $('#im_main').show();
-            $(this).hide();
-        });
-        $('.go-top').bind('click',function(){
-            $(window).scrollTop(0);
-        });
-        $(".weixing-container").bind('mouseenter',function(){
-            $('.weixing-show').show();
-        })
-        $(".weixing-container").bind('mouseleave',function(){
-            $('.weixing-show').hide();
-        });
-    });
-</script>
-<script src="${ctxStatic}/blog/fly-3.0/res/layui/layui.js"></script>
-<!-- 注意：如果你直接复制所有代码到本地，上述js路径需要改成你本地的 -->
-<script>
-    layui.use('element', function(){
-        var element = layui.element; //导航的hover效果、二级菜单等功能，需要依赖element模块
-
-        //监听导航点击
-    });
-</script>
-
-</body>
-</html>