diff --git a/README.md b/README.md index 0635eb8e..5211f585 100644 --- a/README.md +++ b/README.md @@ -86,16 +86,14 @@ JEECG 技术文档 ----------------------------------- -* [JEECG_3.7.2新版开发工具](http://blog.csdn.net/zhangdaiscott/article/details/78072438) +* 演示地址：[http://demo.jeecg.org](http://demo.jeecg.org) +* [JEECG_开发工具](http://blog.csdn.net/zhangdaiscott/article/details/78072438) * [JEECG 开发环境搭建入门](http://blog.csdn.net/zhangdaiscott/article/details/50915206) * [JEECG 常见问题贴](http://www.jeecg.org/forum.php?mod=viewthread&tid=1830&extra=page%3D1) -* [JEECG maven本地仓库下载](http://git.oschina.net/jeecg/jeecg-local-maven) -* [JEECG 开发手册](http://git.oschina.net/jeecg/jeecg/attach_files) * [JEECG 视频教程](https://edu.csdn.net/lecturer/929) * [JEECG 版本日志](http://www.jeecg.org/forum.php?mod=viewthread&tid=365&extra=page%3D1) -* JEECG官方Maven镜像配置 : [http://t.cn/RJCp7wO](http://t.cn/RJCp7wO) -* 在线演示地址：[http://demo.jeecg.org](http://demo.jeecg.org) - +* [JEECG Maven本地仓库下载](http://git.oschina.net/jeecg/jeecg-local-maven) +* [JEECG 开发手册](http://git.oschina.net/jeecg/jeecg/attach_files) 技术交流 ----------------------------------- @@ -103,7 +101,6 @@ JEECG * 官方论坛： [http://www.jeecg.org](http://www.jeecg.org) * 官方网站： [http://www.guojusoft.com](http://www.guojusoft.com) * 官方博客： [http://blog.csdn.net/zhangdaiscott](http://blog.csdn.net/zhangdaiscott) -* 技术支持： [JEECG社区官方支持QQ群汇总](http://www.jeecg.org/forum.php?mod=viewthread&tid=1249&extra=page%3D1) @@ -148,6 +145,7 @@ JEECG ![github](http://img.blog.csdn.net/20160428121122932?watermark/2/text/aHR0cDovL2Jsb2cuY3Nkbi5uZXQv/font/5a6L5L2T/fontsize/400/fill/I0JBQkFCMA==/dissolve/70/gravity/Center "jeecg") ![github](http://img.blog.csdn.net/20150607214324659?watermark/2/text/aHR0cDovL2Jsb2cuY3Nkbi5uZXQvemhhbmdkYWlzY290dA==/font/5a6L5L2T/fontsize/400/fill/I0JBQkFCMA==/dissolve/70/gravity/Center "jeecg") ![github](http://img.blog.csdn.net/20150607214353113?watermark/2/text/aHR0cDovL2Jsb2cuY3Nkbi5uZXQvemhhbmdkYWlzY290dA==/font/5a6L5L2T/fontsize/400/fill/I0JBQkFCMA==/dissolve/70/gravity/Center "jeecg") +![github](http://img.blog.csdn.net/20180124192859781?watermark/2/text/aHR0cDovL2Jsb2cuY3Nkbi5uZXQvemhhbmdkYWlzY290dA==/font/5a6L5L2T/fontsize/400/fill/I0JBQkFCMA==/dissolve/70/gravity/SouthEast "jeecg") ![github](http://img.blog.csdn.net/20180123160223677?watermark/2/text/aHR0cDovL2Jsb2cuY3Nkbi5uZXQvemhhbmdkYWlzY290dA==/font/5a6L5L2T/fontsize/400/fill/I0JBQkFCMA==/dissolve/70/gravity/SouthEast "jeecg") ![github](http://img.blog.csdn.net/20180123160244931?watermark/2/text/aHR0cDovL2Jsb2cuY3Nkbi5uZXQvemhhbmdkYWlzY290dA==/font/5a6L5L2T/fontsize/400/fill/I0JBQkFCMA==/dissolve/70/gravity/SouthEast "jeecg") diff --git a/src/main/java/org/jeecgframework/tag/ftl/superquery.ftl b/src/main/java/org/jeecgframework/tag/ftl/superquery.ftl index bd339cc8..c3988f27 100644 --- a/src/main/java/org/jeecgframework/tag/ftl/superquery.ftl +++ b/src/main/java/org/jeecgframework/tag/ftl/superquery.ftl @@ -51,7 +51,7 @@ <#--update-begin--Author:xuelin Date:20171108 for锛歔#2404]銆愬钩鍙癠I鏀归犮慤I鏍峰紡鏀归犵偣--楂樼骇鏌ヨ寮瑰嚭绐楀彛閬尅 --> <#if '${column.hidden?string("true", "false")}' != "true"> <#--update-begin--Author:LiShaoQing Date:20180110 for锛歔#2452]銆愭柊鍔熻兘銆戦珮绾ф煡璇紝鏀寔popup鍔熻兘 --> - + <#--update-end--Author:LiShaoQing Date:20180110 for锛歔#2452]銆愭柊鍔熻兘銆戦珮绾ф煡璇紝鏀寔popup鍔熻兘 --> <#--update-end--Author:xuelin Date:20171108 for锛歔#2404]銆愬钩鍙癠I鏀归犮慤I鏍峰紡鏀归犵偣--楂樼骇鏌ヨ寮瑰嚭绐楀彛閬尅 --> @@ -106,7 +106,7 @@ <#list fields as column> <#--update-begin--Author:xuelin Date:20171108 for锛歔#2404]銆愬钩鍙癠I鏀归犮慤I鏍峰紡鏀归犵偣--楂樼骇鏌ヨ寮瑰嚭绐楀彛閬尅 --> <#if '${column.hidden?string("true", "false")}' != "true"> - + <#--update-end--Author:xuelin Date:20171108 for锛歔#2404]銆愬钩鍙癠I鏀归犮慤I鏍峰紡鏀归犵偣--楂樼骇鏌ヨ寮瑰嚭绐楀彛閬尅 --> diff --git a/src/main/resources/dbconfig.properties b/src/main/resources/dbconfig.properties index cc7af76d..b71daecd 100644 --- a/src/main/resources/dbconfig.properties +++ b/src/main/resources/dbconfig.properties @@ -18,9 +18,9 @@ #MySQL hibernate.dialect=org.hibernate.dialect.MySQLDialect validationQuery.sqlserver=SELECT 1 -jdbc.url.jeecg=jdbc:mysql://192.168.1.199:3306/jeecg_3.7.2?useUnicode=true&characterEncoding=UTF-8 -jdbc.username.jeecg=guoju -jdbc.password.jeecg=guoju123123 +jdbc.url.jeecg=jdbc:mysql://localhost:3306/jeecg?useUnicode=true&characterEncoding=UTF-8 +jdbc.username.jeecg=root +jdbc.password.jeecg=root jdbc.dbType=mysql #Oracle diff --git a/src/main/resources/jeecg/jeecg_database.properties b/src/main/resources/jeecg/jeecg_database.properties index 02abfdb1..d4a15d6a 100644 --- a/src/main/resources/jeecg/jeecg_database.properties +++ b/src/main/resources/jeecg/jeecg_database.properties @@ -1,9 +1,9 @@ #mysql diver_name=com.mysql.jdbc.Driver -url=jdbc:mysql://192.168.1.199:3306/jeecg_3.7.2?useUnicode=true&characterEncoding=UTF-8 -username=guoju -password=guoju123123 -database_name=jeecg_3.7.2 +url=jdbc:mysql://localhost:3306/jeecg?useUnicode=true&characterEncoding=UTF-8 +username=root +password=root +database_name=jeecg #oracle #diver_name=oracle.jdbc.driver.OracleDriver