mjava 版本管理

mjava-cloudpure/pom.xml

@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.malk</groupId>
             <artifactId>mjava</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${mjava.version}</version>
         </dependency>
     </dependencies>
 

mjava-cloudpure/src/main/resources/application-dev.yml

@@ -12,6 +12,8 @@ spel:
 spring:
   # database
   datasource:
+    hikari:
+      connection-init-sql: SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci           # SqlServer, Oracle 无需设置类型
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
     password: mu123

mjava-cloudpure/src/main/resources/application-prod.yml

@@ -10,6 +10,8 @@ spel:
 spring:
   # database
   datasource:
+    hikari:
+      connection-init-sql: SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci           # SqlServer, Oracle 无需设置类型
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
     password: cp-root@2022++

mjava-guyuan/pom.xml

@@ -22,13 +22,12 @@
         <dependency>
             <groupId>com.malk</groupId>
             <artifactId>mjava</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${mjava.version}</version>
         </dependency>
-        <!-- go to https://search.maven.org/search?q=tencentcloud-sdk-java and get the latest version. -->
+        <!-- 腾讯云 [go to https://search.maven.org/search?q=tencentcloud-sdk-java and get the latest version.] -->
         <dependency>
             <groupId>com.tencentcloudapi</groupId>
             <artifactId>tencentcloud-sdk-java</artifactId>
-            <version>3.1.778</version>
         </dependency>
     </dependencies>
 

mjava-guyuan/src/main/resources/application-dev.yml

@@ -12,6 +12,8 @@ spel:
 spring:
   # database
   datasource:
+    hikari:
+      connection-init-sql: SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci           # SqlServer, Oracle 无需设置类型
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
     password: mu123

mjava-guyuan/src/main/resources/application-prod.yml

@@ -12,6 +12,8 @@ spel:
 spring:
   # database
   datasource:
+    hikari:
+      connection-init-sql: SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci           # SqlServer, Oracle 无需设置类型
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
     password: cp-root@2022++

mjava-hangshi/pom.xml

@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.malk</groupId>
             <artifactId>mjava</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${mjava.version}</version>
         </dependency>
     </dependencies>
 

mjava-hangshi/src/main/resources/application-dev.yml

@@ -12,6 +12,8 @@ spel:
 spring:
   # database
   datasource:
+    hikari:
+      connection-init-sql: SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci           # SqlServer, Oracle 无需设置类型
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
     password: mu123

mjava-hangshi/src/main/resources/application-prod.yml

@@ -10,6 +10,8 @@ spel:
 spring:
   # database
   datasource:
+    hikari:
+      connection-init-sql: SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci           # SqlServer, Oracle 无需设置类型
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
     password: cp-root@2022++

mjava-mcli/pom.xml

@@ -31,7 +31,7 @@
         <dependency>
             <groupId>com.malk</groupId>
             <artifactId>mjava</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${mjava.version}</version>
         </dependency>
 
         <!-- url转pdf -->

mjava-mcli/src/main/java/com/malk/mcli/test/MGTestController.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
  * 指定运行环境 [参考TestController]
  * 1. # MongoDB配置 [yml文件]
  * data: mongodb: uri: mongodb://tbread:Teambition999@192.168.31.201:27017/teambition   # 固定格式 [连接成功后, 需要为 teambition 库添加 admin 权限才可查询]
- * 2. 添加pom依赖 [未全局添加, 仅当前项目使用市添加]
+ * 2. 添加pom依赖 [未全局添加, 子项目单独依赖]
  * 3. 添加对应的entity与Dao, 实体通过@Document注解
  */
 @Profile({"dev", "test"})

mjava-mcli/src/main/resources/application-dev.yml

@@ -12,6 +12,8 @@ spel:
 spring:
   # database
   datasource:
+    hikari:
+      connection-init-sql: SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci           # SqlServer, Oracle 无需设置类型
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
     password: cp-root@2022++

mjava-mcli/src/main/resources/application-prod.yml

@@ -12,6 +12,8 @@ spel:
 spring:
   # database
   datasource:
+    hikari:
+      connection-init-sql: SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci           # SqlServer, Oracle 无需设置类型
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
     password: cp-root@2022++

mjava-suodisi/pom.xml

@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.malk</groupId>
             <artifactId>mjava</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${mjava.version}</version>
         </dependency>
     </dependencies>
 

mjava-suodisi/src/main/resources/application-dev.yml

@@ -12,6 +12,8 @@ spel:
 spring:
   # database
   datasource:
+    hikari:
+      connection-init-sql: SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci           # SqlServer, Oracle 无需设置类型
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
     password: mu123

mjava-suodisi/src/main/resources/application-prod.yml

@@ -12,6 +12,8 @@ spel:
 spring:
   # database
   datasource:
+    hikari:
+      connection-init-sql: SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci           # SqlServer, Oracle 无需设置类型
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
     password: cp-root@2022++

mjava/pom.xml

@@ -8,6 +8,8 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
+    <!-- mjava版本, 不同java-cli项目区分底层依赖, 使用变量有警告 -->
+    <version>0.0.3</version>
 
     <artifactId>mjava</artifactId>
     <description>mjava framework</description>

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

@@ -12,6 +12,8 @@ spel:
 spring:
   # database
   datasource:
+    hikari:
+      connection-init-sql: SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci           # SqlServer, Oracle 无需设置类型
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
     password: mu123

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

@@ -1,6 +1,8 @@
 spring:
   # database
   datasource:
+    hikari:
+      connection-init-sql: SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci           # SqlServer, Oracle 无需设置类型
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: mjava
     password: mjava@mc

mjava/src/main/resources/application-test.yml

@@ -12,6 +12,8 @@ spel:
 spring:
   # database
   datasource:
+    hikari:
+      connection-init-sql: SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci           # SqlServer, Oracle 无需设置类型
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: mjava
     password: mjava@mc

mjava/src/main/resources/application.yml

@@ -3,16 +3,18 @@ server:
   port: 9001
   servlet:
     context-path: /api  # 全局接口前缀: 同一个域名提供转发不同路径到不同端口方案
-
+  tomcat:
+    additional-tld-skip-patterns: osdt_core.jar,osdt_cert.jar   # oracle6 忽略依赖包警告
+    
 # 条件注入
 spel:
   scheduling: true       # 定时任务是否执行
   multiSource: true      # 是否多数据源配置
-  `
+
 # 资源配置
 spring:
-  profiles:`
-  active: prod
+  profiles:
+    active: prod
   # 热部署
   devtools:
     restart:
@@ -28,7 +30,6 @@ spring:
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
     hikari:
-      connection-init-sql: SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci           # SqlServer若设置类型不一致, 需关闭才可连接
       pool-name: DateHikariCP
       minimum-idle: 0
       maximum-pool-size: 10
@@ -60,8 +61,6 @@ spring:
     view:
       prefix: /WEB-INF/jsp/
       suffix: .jsp
-  flyway:
-    enabled: false        #  需要配置 jpa.hibernate.ddl-auto 为 none. 否则 flyway.enabled 配置会无效, 在没有数库连接情况下程序无法启动
 
 # 日志配置
 logging:

mjava/src/test/resources/driver.yml

@@ -9,13 +9,13 @@
 # database
 spring:
   datasource:
+    hikari:
+      connection-init-sql: SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci           # SqlServer, Oracle 无需设置类型
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
     password: mu123
     url: jdbc:mysql://127.0.0.1:3306/mjava?serverTimezone=Asia/Shanghai&useUnicode=yes&characterEncoding=UTF-8&useSSL=true
-    hikari:
-      # todo: 更新
-      connection-init-sql: SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci           # SqlServer, Oracle 无需设置类型
+
   # JPA
   jpa:
     database: MYSQL

mjava/target/generated-sources/java/com/malk/base/QBasePo.java

@@ -0,0 +1,41 @@
+package com.malk.base;
+
+import static com.querydsl.core.types.PathMetadataFactory.*;
+
+import com.querydsl.core.types.dsl.*;
+
+import com.querydsl.core.types.PathMetadata;
+import javax.annotation.Generated;
+import com.querydsl.core.types.Path;
+
+
+/**
+ * QBasePo is a Querydsl query type for BasePo
+ */
+@Generated("com.querydsl.codegen.SupertypeSerializer")
+public class QBasePo extends EntityPathBase<BasePo> {
+
+    private static final long serialVersionUID = -2112308225L;
+
+    public static final QBasePo basePo = new QBasePo("basePo");
+
+    public final DateTimePath<java.util.Date> createTime = createDateTime("createTime", java.util.Date.class);
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final DateTimePath<java.util.Date> updateTime = createDateTime("updateTime", java.util.Date.class);
+
+    public QBasePo(String variable) {
+        super(BasePo.class, forVariable(variable));
+    }
+
+    public QBasePo(Path<? extends BasePo> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QBasePo(PathMetadata metadata) {
+        super(BasePo.class, metadata);
+    }
+
+}
+

mjava/target/generated-sources/java/com/malk/base/QJpaMap.java

@@ -0,0 +1,37 @@
+package com.malk.base;
+
+import static com.querydsl.core.types.PathMetadataFactory.*;
+
+import com.querydsl.core.types.dsl.*;
+
+import com.querydsl.core.types.PathMetadata;
+import javax.annotation.Generated;
+import com.querydsl.core.types.Path;
+
+
+/**
+ * QJpaMap is a Querydsl query type for JpaMap
+ */
+@Generated("com.querydsl.codegen.EntitySerializer")
+public class QJpaMap extends EntityPathBase<JpaMap> {
+
+    private static final long serialVersionUID = -1869980976L;
+
+    public static final QJpaMap jpaMap = new QJpaMap("jpaMap");
+
+    public final StringPath id = createString("id");
+
+    public QJpaMap(String variable) {
+        super(JpaMap.class, forVariable(variable));
+    }
+
+    public QJpaMap(Path<? extends JpaMap> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QJpaMap(PathMetadata metadata) {
+        super(JpaMap.class, metadata);
+    }
+
+}
+

mjava/target/generated-sources/java/com/malk/repository/entity/primary/QMcAuthorizationPo.java

@@ -0,0 +1,70 @@
+package com.malk.repository.entity.primary;
+
+import static com.querydsl.core.types.PathMetadataFactory.*;
+
+import com.querydsl.core.types.dsl.*;
+
+import com.querydsl.core.types.PathMetadata;
+import javax.annotation.Generated;
+import com.querydsl.core.types.Path;
+
+
+/**
+ * QMcAuthorizationPo is a Querydsl query type for McAuthorizationPo
+ */
+@Generated("com.querydsl.codegen.EntitySerializer")
+public class QMcAuthorizationPo extends EntityPathBase<McAuthorizationPo> {
+
+    private static final long serialVersionUID = -260554719L;
+
+    public static final QMcAuthorizationPo mcAuthorizationPo = new QMcAuthorizationPo("mcAuthorizationPo");
+
+    public final com.malk.base.QBasePo _super = new com.malk.base.QBasePo(this);
+
+    public final StringPath appName = createString("appName");
+
+    public final StringPath appType = createString("appType");
+
+    public final StringPath corpId = createString("corpId");
+
+    public final StringPath corpName = createString("corpName");
+
+    //inherited
+    public final DateTimePath<java.util.Date> createTime = _super.createTime;
+
+    public final NumberPath<Integer> delStatus = createNumber("delStatus", Integer.class);
+
+    public final StringPath deptId = createString("deptId");
+
+    public final StringPath deptName = createString("deptName");
+
+    public final StringPath description = createString("description");
+
+    //inherited
+    public final NumberPath<Long> id = _super.id;
+
+    public final StringPath remark = createString("remark");
+
+    public final StringPath systemToken = createString("systemToken");
+
+    //inherited
+    public final DateTimePath<java.util.Date> updateTime = _super.updateTime;
+
+    public final StringPath userId = createString("userId");
+
+    public final StringPath userName = createString("userName");
+
+    public QMcAuthorizationPo(String variable) {
+        super(McAuthorizationPo.class, forVariable(variable));
+    }
+
+    public QMcAuthorizationPo(Path<? extends McAuthorizationPo> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QMcAuthorizationPo(PathMetadata metadata) {
+        super(McAuthorizationPo.class, metadata);
+    }
+
+}
+

mjava/target/generated-sources/java/com/malk/repository/entity/primary/QMcTablePo.java

@@ -0,0 +1,50 @@
+package com.malk.repository.entity.primary;
+
+import static com.querydsl.core.types.PathMetadataFactory.*;
+
+import com.querydsl.core.types.dsl.*;
+
+import com.querydsl.core.types.PathMetadata;
+import javax.annotation.Generated;
+import com.querydsl.core.types.Path;
+
+
+/**
+ * QMcTablePo is a Querydsl query type for McTablePo
+ */
+@Generated("com.querydsl.codegen.EntitySerializer")
+public class QMcTablePo extends EntityPathBase<McTablePo> {
+
+    private static final long serialVersionUID = 597816118L;
+
+    public static final QMcTablePo mcTablePo = new QMcTablePo("mcTablePo");
+
+    public final com.malk.base.QBasePo _super = new com.malk.base.QBasePo(this);
+
+    //inherited
+    public final DateTimePath<java.util.Date> createTime = _super.createTime;
+
+    //inherited
+    public final NumberPath<Long> id = _super.id;
+
+    public final StringPath tDesc = createString("tDesc");
+
+    public final StringPath tName = createString("tName");
+
+    //inherited
+    public final DateTimePath<java.util.Date> updateTime = _super.updateTime;
+
+    public QMcTablePo(String variable) {
+        super(McTablePo.class, forVariable(variable));
+    }
+
+    public QMcTablePo(Path<? extends McTablePo> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QMcTablePo(PathMetadata metadata) {
+        super(McTablePo.class, metadata);
+    }
+
+}
+

mjava/target/generated-sources/java/com/malk/repository/entity/slave/QMcTablePo.java

@@ -0,0 +1,50 @@
+package com.malk.repository.entity.slave;
+
+import static com.querydsl.core.types.PathMetadataFactory.*;
+
+import com.querydsl.core.types.dsl.*;
+
+import com.querydsl.core.types.PathMetadata;
+import javax.annotation.Generated;
+import com.querydsl.core.types.Path;
+
+
+/**
+ * QMcTablePo is a Querydsl query type for McTablePo
+ */
+@Generated("com.querydsl.codegen.EntitySerializer")
+public class QMcTablePo extends EntityPathBase<McTablePo> {
+
+    private static final long serialVersionUID = 428185483L;
+
+    public static final QMcTablePo mcTablePo = new QMcTablePo("mcTablePo");
+
+    public final com.malk.base.QBasePo _super = new com.malk.base.QBasePo(this);
+
+    //inherited
+    public final DateTimePath<java.util.Date> createTime = _super.createTime;
+
+    //inherited
+    public final NumberPath<Long> id = _super.id;
+
+    public final StringPath tDesc = createString("tDesc");
+
+    public final StringPath tName = createString("tName");
+
+    //inherited
+    public final DateTimePath<java.util.Date> updateTime = _super.updateTime;
+
+    public QMcTablePo(String variable) {
+        super(McTablePo.class, forVariable(variable));
+    }
+
+    public QMcTablePo(Path<? extends McTablePo> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QMcTablePo(PathMetadata metadata) {
+        super(McTablePo.class, metadata);
+    }
+
+}
+

pom.xml

@@ -23,11 +23,13 @@
 
     <!-- 版本管理 Management -->
     <properties>
-        <!-- 公共依赖 -->
-        <java-mcli.version>3.0.0</java-mcli.version>
+        <!-- mjava版本: 修改mjava pom配置 -->
+        <mjava.version>0.0.3</mjava.version>
+        <!-- 全局配置 -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
+        <!-- 公共依赖 -->
         <spring-boot-dependencies.version>2.2.13.RELEASE</spring-boot-dependencies.version>
         <junit.verson>4.12</junit.verson>
         <lombok.version>1.18.8</lombok.version>
@@ -38,25 +40,27 @@
         <spring-boot-starter-data-jpa.version>2.1.3.RELEASE</spring-boot-starter-data-jpa.version>
         <querydsl-apt.version>4.2.1</querydsl-apt.version>
         <querydsl-jpa.version>4.2.1</querydsl-jpa.version>
-        <!-- 数据库连接 -->
+        <spring-boot-starter-jdbc.version>2.2.13.RELEASE</spring-boot-starter-jdbc.version>
+        <easyexcel.version>2.2.7</easyexcel.version>
+        <!-- 数据库连接 [仅mysql为全局依赖] -->
         <mysql-connector-java.version>8.0.22</mysql-connector-java.version>
         <mssql-jdbc.version>6.4.0.jre8</mssql-jdbc.version>
+        <ojdbc6.version>11.2.0.4</ojdbc6.version>
         <mongo-java-driver.version>3.12.7</mongo-java-driver.version>
         <spring-boot-starter-data-mongodb.version>2.2.13.RELEASE</spring-boot-starter-data-mongodb.version>
-        <!-- jsp -->
+        <!-- jsp [非全局依赖] -->
         <tomcat-embed-jasper.version>9.0.41</tomcat-embed-jasper.version>
         <jstl.version>1.2</jstl.version>
         <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
         <javax.servlet.jsp-api.version>2.3.1</javax.servlet.jsp-api.version>
-        <!-- 其他依赖 -->
+        <!-- jwt [非全局依赖] -->
         <java-jwt.version>3.4.0</java-jwt.version>
-        <easyexcel.version>2.2.7</easyexcel.version>
-        <!-- swagger3 -->
+        <!-- swagger3: todo -->
         <springfox-boot-starter.version>3.0.0</springfox-boot-starter.version>
-        <!-- 网页转pdf -->
+        <!-- 网页转pdf [非全局依赖] -->
         <flying-saucer-pdf-itext5.version>9.0.3</flying-saucer-pdf-itext5.version>
-        <!-- 腾讯云[发票识别] -->
-        <tencentcloud-sdk-java.version>3.1.322</tencentcloud-sdk-java.version>
+        <!-- 腾讯云[发票识别] [非全局依赖] -->
+        <tencentcloud-sdk-java.version>3.1.778</tencentcloud-sdk-java.version>
         <!-- 不执行单元测试，也不编译测试类 -->
         <skipTests>true</skipTests>
         <!-- 不执行单元测试，但会编译测试类，并在target/test-classes目录下生成相应的class -->
@@ -137,6 +141,13 @@
                 <version>${querydsl-jpa.version}</version>
             </dependency>
 
+            <!-- AOP多数据源切换 -->
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-jdbc</artifactId>
+                <version>${spring-boot-starter-jdbc.version}</version>
+            </dependency>
+
             <!-- easyExcel 优化 poi [不影响单独引入poi, 会冲突] -->
             <dependency>
                 <groupId>com.alibaba</groupId>
@@ -159,6 +170,13 @@
                 <version>${mssql-jdbc.version}</version>
             </dependency>
 
+            <!-- Oracle 依赖 -->
+            <dependency>
+                <groupId>com.oracle.database.jdbc</groupId>
+                <artifactId>ojdbc6</artifactId>
+                <version>${ojdbc6.version}</version>
+            </dependency>
+
             <!-- MongoDB 驱动 -->
             <dependency>
                 <groupId>org.mongodb</groupId>
@@ -251,11 +269,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <!-- AOP多数据源切换 todo -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-jdbc</artifactId>
-        </dependency>
 
         <!-- lombok -->
         <dependency>
@@ -304,6 +317,12 @@
             <artifactId>querydsl-jpa</artifactId>
         </dependency>
 
+        <!-- AOP多数据源切换 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jdbc</artifactId>
+        </dependency>
+
         <!-- easyExcel 优化 poi [不影响单独引入poi, 会冲突] -->
         <dependency>
             <groupId>com.alibaba</groupId>
@@ -316,12 +335,19 @@
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
 
+        <!-- Oracle 依赖 -->
+        <!--        <dependency>-->
+        <!--            <groupId>com.oracle.database.jdbc</groupId>-->
+        <!--            <artifactId>ojdbc6</artifactId>-->
+        <!--        </dependency>-->
+
         <!-- sqlserver 依赖 -->
-        <dependency>
-            <groupId>com.microsoft.sqlserver</groupId>
-            <artifactId>mssql-jdbc</artifactId>
-            <scope>runtime</scope>
-        </dependency>
+        <!--        <dependency>-->
+        <!--            <groupId>com.microsoft.sqlserver</groupId>-->
+        <!--            <artifactId>mssql-jdbc</artifactId>-->
+        <!--            <scope>runtime</scope>-->
+        <!--        </dependency>-->
+
 
         <!-- MongoDB 驱动 -->
         <!--        <dependency>-->