【更新】适配Oracle数据库，升级版本为1.2.0

README.md

@@ -105,7 +105,12 @@
 - 4.  新建 Pull Request
 
 ### 更新日志：
-----
+
+#### v1.2.0
+- 1、适配Oracle数据库
+- 2、日志列表增加时间段查询
+- 3、修正邮箱数据问题
+
 #### v1.1.1
 - 1、代码生成中查询条件增加为全部字段，可根据不同程序删减代码
 

_web/src/components/GlobalFooter/GlobalFooter.vue

@@ -3,7 +3,7 @@
     <div class="links">
     </div>
     <div class="copyright">
-      Copyright © 2020 <a target="_blank" href="https://www.xiaonuo.vip/">XiaoNuo</a> All rights reserved. xiaonuo-vue 1.1
+      Copyright © 2020 <a target="_blank" href="https://www.xiaonuo.vip/">XiaoNuo</a> All rights reserved. xiaonuo-vue 1.2.0
     </div>
   </div>
 </template>

_web/src/layouts/UserLayout.vue

@@ -22,7 +22,7 @@
           <a href="_self">条款</a>
         </div>
         <div class="copyright">
-          Copyright © 2020 <a target="_blank" href="https://www.xiaonuo.vip/">XiaoNuo</a> All rights reserved. xiaonuo-vue 1.1
+          Copyright © 2020 <a target="_blank" href="https://www.xiaonuo.vip/">XiaoNuo</a> All rights reserved. xiaonuo-vue 1.2.0
         </div>
       </div>
     </div>

pom.xml

@@ -28,6 +28,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <mysql-connector-java.version>8.0.17</mysql-connector-java.version>
+        <oracle.version>11.2.0.3</oracle.version>
         <druid.version>1.1.21</druid.version>
         <mp.version>3.3.2</mp.version>
         <fastjson.version>1.2.70</fastjson.version>
@@ -64,6 +65,11 @@
                 <artifactId>mysql-connector-java</artifactId>
                 <version>${mysql-connector-java.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.oracle</groupId>
+                <artifactId>ojdbc6</artifactId>
+                <version>${oracle.version}</version>
+            </dependency>
 
             <!--数据库连接池-->
             <dependency>

xiaonuo-base/xiaonuo-core/pom.xml

@@ -46,6 +46,10 @@
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.oracle</groupId>
+            <artifactId>ojdbc6</artifactId>
+        </dependency>
 
         <!-- druid连接池 -->
         <dependency>

xiaonuo-base/xiaonuo-system/src/main/java/com/cn/xiaonuo/sys/core/listener/ConstantsInitListener.java

@@ -35,15 +35,10 @@ import com.cn.xiaonuo.core.context.constant.ConstantContext;
 import com.cn.xiaonuo.core.enums.CommonStatusEnum;
 import com.cn.xiaonuo.core.exception.ServiceException;
 import com.cn.xiaonuo.sys.modular.consts.enums.SysConfigExceptionEnum;
-import com.cn.xiaonuo.core.context.constant.ConstantContext;
-import com.cn.xiaonuo.core.enums.CommonStatusEnum;
-import com.cn.xiaonuo.core.exception.ServiceException;
-import com.cn.xiaonuo.sys.modular.consts.enums.SysConfigExceptionEnum;
 import org.springframework.boot.context.event.ApplicationContextInitializedEvent;
 import org.springframework.context.ApplicationListener;
 import org.springframework.core.Ordered;
 import org.springframework.core.env.ConfigurableEnvironment;
-
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
@@ -96,7 +91,12 @@ public class ConstantsInitListener implements ApplicationListener<ApplicationCon
 
             // 将查询到的参数配置添加到缓存
             if (ObjectUtil.isNotEmpty(entityList)) {
-                entityList.forEach(sysConfig -> ConstantContext.putConstant(sysConfig.getStr("code"), sysConfig.getStr("value")));
+                entityList.forEach(sysConfig ->
+                        ConstantContext.putConstant(
+                                sysConfig.getStr("code") == null ? sysConfig.getStr("CODE") : sysConfig.getStr("code"),
+                                sysConfig.getStr("value") == null ? sysConfig.getStr("VALUE") : sysConfig.getStr("value")
+                        )
+                );
             }
         } catch (SQLException | ClassNotFoundException e) {
             log.error(">>> 读取数据库constants配置信息出错：{}", e.getMessage());

xiaonuo-main/src/main/resources/application-dev.yml

@@ -8,3 +8,14 @@ spring:
     # 连接池大小根据实际情况调整
     max-active: 20
     max-pool-prepared-statement-per-connection-size: 20
+
+# Oracle数据库
+#spring:
+#  datasource:
+#    driver-class-name: oracle.jdbc.OracleDriver
+#    url: jdbc:oracle:thin:@localhost:1521:orcl
+#    username: XIAONUO-VUE-PUB-ORACLE
+#    password: 123456
+#    # 连接池大小根据实际情况调整
+#    max-active: 20
+#    max-pool-prepared-statement-per-connection-size: 20

xiaonuo-main/src/main/resources/application-local.yml

@@ -8,3 +8,14 @@ spring:
     # 连接池大小根据实际情况调整
     max-active: 20
     max-pool-prepared-statement-per-connection-size: 20
+
+# Oracle数据库
+#spring:
+#  datasource:
+#    driver-class-name: oracle.jdbc.OracleDriver
+#    url: jdbc:oracle:thin:@localhost:1521:orcl
+#    username: XIAONUO-VUE-PUB-ORACLE
+#    password: 123456
+#    # 连接池大小根据实际情况调整
+#    max-active: 20
+#    max-pool-prepared-statement-per-connection-size: 20

xiaonuo-main/src/main/resources/application-prod.yml

@@ -8,3 +8,14 @@ spring:
     # 连接池大小根据实际情况调整
     max-active: 20
     max-pool-prepared-statement-per-connection-size: 20
+
+# Oracle数据库
+#spring:
+#  datasource:
+#    driver-class-name: oracle.jdbc.OracleDriver
+#    url: jdbc:oracle:thin:@localhost:1521:orcl
+#    username: XIAONUO-VUE-PUB-ORACLE
+#    password: 123456
+#    # 连接池大小根据实际情况调整
+#    max-active: 20
+#    max-pool-prepared-statement-per-connection-size: 20