Skip to content

Commit

Permalink
JavaEE Enterprise Basic Development Platform
Browse files Browse the repository at this point in the history 
New version 4.4.0 release!

1. Fixed Hibernate JBoss-logging conflict
2. Upgrade  to hibernate jpa 2.1 use :name parameter
  • Loading branch information
@ushelp
ushelp committed Dec 20, 2017
1 parent 3d850b7 commit 4cdc338
Show file tree
Hide file tree
Showing 68 changed files with 2,393 additions and 1,461 deletions.
80 changes: 28 additions & 52 deletions .readme.md.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -743,40 +743,29 @@ <h3> <a id="中文" class="anchor" href="#%E4%B8%AD%E6%96%87" aria-hidden="true"
<li>Maven 3+</li>
</ul>
<ol start="2">
<li>创建数据库</li>
<li> <p>创建数据库</p> <p>执行相应 SQL 脚本 <code>database\DATABASE_easyee_LANGUAGE[_COUNTRY].sql</code></p> </li>
</ol>
<p>执行相应 SQL 脚本 <code>database\DATABASE_easyee_LANGUAGE[_COUNTRY].sql</code></p>
<ul>
<li>MySQL</li>
<li> <p>MySQL</p>
<div class="highlight highlight-source-sql">
<pre>mysql<span class="pl-k">&gt;</span> source MySQL_easyee_LANGUAGE[_COUNTRY].sql</pre>
</div> </li>
<li> <p>Oracle（<strong>代码默认基于 MySQL，基于 Oracle 需要手动修改实体主键生成策略</strong>）</p>
<div class="highlight highlight-source-sql">
<pre>SQL<span class="pl-k">&gt;</span> start Oracle_easyee_LANGUAGE[_COUNTRY].sql</pre>
</div> </li>
</ul>
<div class="highlight highlight-source-sql">
<pre>mysql<span class="pl-k">&gt;</span> source MySQL_easyee_LANGUAGE[_COUNTRY].sql</pre>
</div>
<ul>
<li>Oracle</li>
</ul>
<div class="highlight highlight-source-sql">
<pre>SQL<span class="pl-k">&gt;</span> start Oracle_easyee_LANGUAGE[_COUNTRY].sql</pre>
</div>
<ol start="3">
<li>编辑 JDBC 数据库连接配置参数</li>
</ol>
<p>Spring Boot: <code>src/main/resources/application.properties</code></p>
<p>Non-Spring Boot: <code>src/main/resources/db.properties</code></p>
<ol start="4">
<li>启动</li>
<li> <p>编辑 JDBC 数据库连接配置参数</p> <p>Spring Boot: <code>src/main/resources/application.properties</code></p> <p>Non-Spring Boot: <code>src/main/resources/db.properties</code></p> </li>
<li> <p>启动</p> <p>执行 <code>startup.bat</code>/<code>startup.sh</code></p> </li>
</ol>
<p>执行 <code>startup.bat</code>/<code>startup.sh</code></p>
<blockquote>
<p>Spring Boot: <code>mvn compile spring-boot:run</code></p>
<p>Non-Spring Boot: <code>mvn jetty:run</code></p>
</blockquote>
<ol start="5">
<li>访问( jetty HTTP 端口 <code>9999</code>)</li>
<li> <p>访问( jetty HTTP 端口 <code>9999</code>)</p> <p><a href="http://localhost:9999/" rel="nofollow">http://localhost:9999/</a></p> <p>最高管理员用户名: <code>admin</code></p> <p>密码: <code>admin123</code></p> </li>
</ol>
<p><a href="http://localhost:9999/" rel="nofollow">http://localhost:9999/</a></p>
<p>最高管理员用户名: <code>admin</code></p>
<p>密码: <code>admin123</code></p>
<h3> <a id="english" class="anchor" href="#english" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>English</h3>
<ol>
<li>Run Enviroment</li>
Expand All @@ -787,40 +776,27 @@ <h3> <a id="english" class="anchor" href="#english" aria-hidden="true"><span ari
<li>Maven 3+</li>
</ul>
<ol start="2">
<li>Create database</li>
<li> <p>Create database</p> <p>execute <code>database\DATABASE_easyee_LANGUAGE[_COUNTRY].sql</code></p> </li>
</ol>
<p>execute <code>database\DATABASE_easyee_LANGUAGE[_COUNTRY].sql</code></p>
<ul>
<li>MySQL</li>
<li> <p>MySQL</p>
<div class="highlight highlight-source-sql">
<pre>mysql<span class="pl-k">&gt;</span> source MySQL_easyee_LANGUAGE[_COUNTRY].sql</pre>
</div> </li>
<li> <p>Oracle (<strong>The code default use MySQL, If want to run with Oracle need modify entity primary key generator</strong>)</p>
<div class="highlight highlight-source-sql">
<pre>SQL<span class="pl-k">&gt;</span> start Oracle_easyee_LANGUAGE[_COUNTRY].sql</pre>
</div> </li>
</ul>
<div class="highlight highlight-source-sql">
<pre>mysql<span class="pl-k">&gt;</span> source MySQL_easyee_LANGUAGE[_COUNTRY].sql</pre>
</div>
<ul>
<li>Oracle</li>
</ul>
<div class="highlight highlight-source-sql">
<pre>SQL<span class="pl-k">&gt;</span> start Oracle_easyee_LANGUAGE[_COUNTRY].sql</pre>
</div>
<ol start="3">
<li>Edit jdbc properties</li>
</ol>
<p>Spring Boot: <code>src/main/resources/application.properties</code></p>
<p>Non-Spring Boot: <code>src/main/resources/db.properties</code></p>
<ol start="4">
<li>Start</li>
</ol>
<p>Run <code>startup.bat</code>/<code>startup.sh</code></p>
<blockquote>
<p>Spring Boot: <code>mvn compile spring-boot:run</code></p>
<p>Non-Spring Boot: <code>mvn jetty:run</code></p>
</blockquote>
<ol start="5">
<li>Visit( jetty HTTP port <code>9999</code>)</li>
<li> <p>Edit jdbc properties</p> <p>Spring Boot: <code>src/main/resources/application.properties</code></p> <p>Non-Spring Boot: <code>src/main/resources/db.properties</code></p> </li>
<li> <p>Start</p> <p>Run <code>startup.bat</code>/<code>startup.sh</code></p>
<blockquote>
<p>Spring Boot: <code>mvn compile spring-boot:run</code></p>
<p>Non-Spring Boot: <code>mvn jetty:run</code></p>
</blockquote> </li>
<li> <p>Visit( jetty HTTP port <code>9999</code>)</p> <p><a href="http://localhost:9999/" rel="nofollow">http://localhost:9999/</a></p> <p>Username: <code>admin</code></p> <p>Password: <code>admin123</code></p> </li>
</ol>
<p><a href="http://localhost:9999/" rel="nofollow">http://localhost:9999/</a></p>
<p>Username: <code>admin</code></p>
<p>Password: <code>admin123</code></p>
<h2> <a id="monitoring监控" class="anchor" href="#monitoring%E7%9B%91%E6%8E%A7" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Monitoring/监控</h2>
<p><a href="https://github.com/javamelody/javamelody/wiki">JavaMelody</a> based performance monitoring, <strong>Must log in EasyEE first</strong>.</p>
<p><code>http://127.0.0.1:9999/monitoring</code></p>
Expand Down
6 changes: 3 additions & 3 deletions project/easyee-sh-springboot/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>cn.easyproject</groupId>
<artifactId>easyee-sh-springboot</artifactId>
<version>4.3.0-RELEASE</version>
<version>4.4.0-RELEASE</version>
<packaging>jar</packaging>
<name>easyee-sh Maven Webapp</name>
<url>http://easyproject.cn/easyee</url>
Expand All @@ -15,7 +15,7 @@
<java.version>1.7</java.version>
<tomcat.version>8.5.8</tomcat.version>

<hibernate.version>5.2.4.Final</hibernate.version>
<hibernate.version>5.1.10.Final</hibernate.version>
<springboot.version>1.5.9.RELEASE</springboot.version>

<slf4j.version>1.7.21</slf4j.version>
Expand All @@ -32,7 +32,7 @@
<shiro.version>1.2.6</shiro.version>
<easyshiro.version>2.6.0-RELEASE</easyshiro.version>
<easyshiro.redis.cache.version>2.6.0-RELEASE</easyshiro.redis.cache.version>
<easyfilte.version>2.0.1-RELEASE</easyfilte.version>
<easyfilte.version>2.0.2-RELEASE</easyfilte.version>
<jstl.version>1.2</jstl.version>
<!-- JavaMelody -->
<javamelody.version>1.70.0</javamelody.version>
Expand Down
6 changes: 3 additions & 3 deletions project/easyee-sh-springboot/pom_jar.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>cn.easyproject</groupId>
<artifactId>easyee-sh-springboot</artifactId>
<version>4.2.0-RELEASE</version>
<version>4.4.0-RELEASE</version>
<packaging>jar</packaging>
<name>easyee-sh Maven Webapp</name>
<url>http://easyproject.cn/easyee</url>
Expand All @@ -32,7 +32,7 @@
<shiro.version>1.2.6</shiro.version>
<easyshiro.version>2.6.0-RELEASE</easyshiro.version>
<easyshiro.redis.cache.version>2.6.0-RELEASE</easyshiro.redis.cache.version>
<easyfilte.version>2.0.1-RELEASE</easyfilte.version>
<easyfilter.version>2.0.2-RELEASE</easyfilter.version>
<jstl.version>1.2</jstl.version>
<!-- JavaMelody -->
<javamelody.version>1.70.0</javamelody.version>
Expand Down Expand Up @@ -277,7 +277,7 @@
<dependency>
<groupId>cn.easyproject</groupId>
<artifactId>easyfilter</artifactId>
<version>${easyfilte.version}</version>
<version>${easyfilter.version}</version>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions project/easyee-sh-springboot/pom_war.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>cn.easyproject</groupId>
<artifactId>easyee-sh-springboot</artifactId>
<version>4.2.0-RELEASE</version>
<version>4.4.0-RELEASE</version>
<packaging>war</packaging>
<name>easyee-sh Maven Webapp</name>
<url>http://easyproject.cn/easyee</url>
Expand All @@ -32,7 +32,7 @@
<shiro.version>1.2.6</shiro.version>
<easyshiro.version>2.6.0-RELEASE</easyshiro.version>
<easyshiro.redis.cache.version>2.6.0-RELEASE</easyshiro.redis.cache.version>
<easyfilte.version>2.0.1-RELEASE</easyfilte.version>
<easyfilter.version>2.0.2-RELEASE</easyfilter.version>
<jstl.version>1.2</jstl.version>
<!-- JavaMelody -->
<javamelody.version>1.70.0</javamelody.version>
Expand Down Expand Up @@ -285,7 +285,7 @@
<dependency>
<groupId>cn.easyproject</groupId>
<artifactId>easyfilter</artifactId>
<version>${easyfilte.version}</version>
<version>${easyfilter.version}</version>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions ...-sh-springboot/src/main/java/cn/easyproject/easyee/sh/base/controller/BaseController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ protected Map<Object, Object> setJsonMsgMap(Object... jsonKeyAndValuePair) {
jsonMap.put("locationUrl", locationUrl.get());
if (jsonKeyAndValuePair.length > 0) {
for (int i = 0; i < jsonKeyAndValuePair.length / 2; i++) {
jsonMap.put(jsonKeyAndValuePair[i], jsonKeyAndValuePair[2 * i + 1]);
jsonMap.put(jsonKeyAndValuePair[2*i], jsonKeyAndValuePair[2 * i + 1]);
}
}
clearThreadLocalResponse();
Expand Down Expand Up @@ -168,7 +168,7 @@ protected Map<Object, Object> setJsonPaginationMap(PageBean pb, Object... jsonKe
jsonMap.put("locationUrl", locationUrl.get());
if (jsonKeyAndValuePair.length > 0) {
for (int i = 0; i < jsonKeyAndValuePair.length / 2; i++) {
jsonMap.put(jsonKeyAndValuePair[i], jsonKeyAndValuePair[2 * i + 1]);
jsonMap.put(jsonKeyAndValuePair[2*i], jsonKeyAndValuePair[2 * i + 1]);
}
}
clearThreadLocalResponse();
Expand Down
Loading

0 comments on commit 4cdc338

Please sign in to comment.