!31 同步

Merge pull request !31 from Bo/bo_dev

.gitignore

@@ -41,4 +41,5 @@ nbdist/
 !*/build/*.java
 !*/build/*.html
 !*/build/*.xml
-/ruoyi-admin/src/main/resources/application-druid.yml
+
+application-druid.yml

ruoyi-admin/pom.xml

@@ -158,7 +158,10 @@
                 </configuration>
             </plugin> -->
         </plugins>
+        <!--
         <finalName>${project.artifactId}</finalName>
+       -->
+        <finalName>it_war</finalName>
     </build>
 
 </project>

ruoyi-admin/src/main/resources/application-druid.yml

@@ -1,85 +0,0 @@
-# 数据源配置
-spring:
-    datasource:
-        type: com.alibaba.druid.pool.DruidDataSource
-        #driverClassName: com.mysql.cj.jdbc.Driver
-        druid:
-            # 主库数据源
-            master:
-                url: jdbc:mysql://192.168.2.18:3306/bps?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: root
-                password: abc.123
-            # 从库数据源
-            slave:
-                # 从数据源开关/默认关闭
-                enabled: true
-                url: jdbc:oracle:thin:@192.168.2.91:1521/toptest
-                username: ds7
-                password: ds7
-                driverClassName: oracle.jdbc.OracleDriver
-            #SQlServer数据源
-            sqlsvr:
-                # 从数据源开关/默认关闭
-                enabled: true
-                url: jdbc:sqlserver://192.168.2.84:1433;SelectMethod=cursor;DatabaseName=ITDemo
-                username: sa
-                password: abc.123
-                driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
-
-            # Topprod_ds_report
-            topproddsreport:
-                # 从数据源开关/默认关闭
-                enabled: true
-                url: jdbc:oracle:thin:@192.168.2.91:1521/topprod
-                username: ds_report
-                password: ds_report
-                driverClassName: oracle.jdbc.OracleDriver
-
-            # Toptest_ds_report
-            toptestdsreport:
-                # 从数据源开关/默认关闭
-                enabled: true
-                url: jdbc:oracle:thin:@192.168.2.91:1521/toptest
-                username: ds_report
-                password: ds_report
-                driverClassName: oracle.jdbc.OracleDriver
-
-            # 初始连接数
-            initialSize: 5
-            # 最小连接池数量
-            minIdle: 10
-            # 最大连接池数量
-            maxActive: 20
-            # 配置获取连接等待超时的时间
-            maxWait: 60000
-            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-            timeBetweenEvictionRunsMillis: 60000
-            # 配置一个连接在池中最小生存的时间，单位是毫秒
-            minEvictableIdleTimeMillis: 300000
-            # 配置一个连接在池中最大生存的时间，单位是毫秒
-            maxEvictableIdleTimeMillis: 900000
-            # 配置检测连接是否有效
-            validationQuery: SELECT 1 FROM DUAL
-            testWhileIdle: true
-            testOnBorrow: false
-            testOnReturn: false
-            webStatFilter: 
-                enabled: true
-            statViewServlet:
-                enabled: true
-                # 设置白名单，不填则允许所有访问
-                allow:
-                url-pattern: /druid/*
-                # 控制台管理用户名和密码
-                login-username: admin
-                login-password: bps2019
-            filter:
-                stat:
-                    enabled: true
-                    # 慢SQL记录
-                    log-slow-sql: true
-                    slow-sql-millis: 1000
-                    merge-sql: true
-                wall:
-                    config:
-                        multi-statement-allow: true