Skip to content

polysoft-nafmii / polysoft-parent

Go to a project
Commit 4738d4c7 by ypenglv
Options

调整配置

1 parent 7016e94f
Inline Side-by-side
Showing 49 changed files with 567 additions and 326 deletions
nafmii-app-burypoint/pom.xml
...@@ -45,9 +45,9 @@ ...@@ -45,9 +45,9 @@
</profiles> </profiles>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>oracle</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>ojdbc6</artifactId>
<version>8.0.20</version> <version>11.2.0.4.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.nafmii</groupId> <groupId>org.nafmii</groupId>
......
nafmii-app-burypoint/src/main/resources/application-dev.yml
...@@ -16,10 +16,10 @@ mybatis: ...@@ -16,10 +16,10 @@ mybatis:
mapper-locations: classpath:mapper/*.xml mapper-locations: classpath:mapper/*.xml
spring: spring:
datasource: datasource:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: oracle.jdbc.driver.OracleDriver
password: Moxi123# password: nafmiiwindows
url: jdbc:mysql://114.112.96.30:30029/NAFMII_2.1?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC username: nafmiiwindows
username: root url: jdbc:oracle:thin:@10.10.82.1:1521:devdb00
type: com.zaxxer.hikari.HikariDataSource type: com.zaxxer.hikari.HikariDataSource
hikari: hikari:
maximum-pool-size: 50 maximum-pool-size: 50
...@@ -28,7 +28,11 @@ spring: ...@@ -28,7 +28,11 @@ spring:
auto-commit: true auto-commit: true
connection-timeout: 3000 connection-timeout: 3000
pool-name: NFMII_HikariCP pool-name: NFMII_HikariCP
connection-test-query: SELECT 1 connection-test-query: SELECT 1 from dual
jackson:
default-property-inclusion: ALWAYS
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
redis: redis:
# Redis数据库索引（默认为0） # Redis数据库索引（默认为0）
database: 0 database: 0
......
nafmii-app-burypoint/src/main/resources/application-prod.yml
...@@ -16,10 +16,10 @@ mybatis: ...@@ -16,10 +16,10 @@ mybatis:
mapper-locations: classpath:mapper/*.xml mapper-locations: classpath:mapper/*.xml
spring: spring:
datasource: datasource:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: oracle.jdbc.driver.OracleDriver
password: Moxi123# password: nafmiiwindows
url: jdbc:mysql://114.112.96.30:30029/NAFMII_2.1?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC username: nafmiiwindows
username: root url: jdbc:oracle:thin:@10.10.82.1:1521:devdb00
type: com.zaxxer.hikari.HikariDataSource type: com.zaxxer.hikari.HikariDataSource
hikari: hikari:
maximum-pool-size: 50 maximum-pool-size: 50
...@@ -28,7 +28,11 @@ spring: ...@@ -28,7 +28,11 @@ spring:
auto-commit: true auto-commit: true
connection-timeout: 3000 connection-timeout: 3000
pool-name: NFMII_HikariCP pool-name: NFMII_HikariCP
connection-test-query: SELECT 1 connection-test-query: SELECT 1 from dual
jackson:
default-property-inclusion: ALWAYS
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
redis: redis:
# Redis数据库索引（默认为0） # Redis数据库索引（默认为0）
database: 0 database: 0
......
nafmii-app-burypoint/src/main/resources/application-test.yml
...@@ -16,10 +16,10 @@ mybatis: ...@@ -16,10 +16,10 @@ mybatis:
mapper-locations: classpath:mapper/*.xml mapper-locations: classpath:mapper/*.xml
spring: spring:
datasource: datasource:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: oracle.jdbc.driver.OracleDriver
password: Moxi123# password: nafmiiwindows
url: jdbc:mysql://114.112.96.30:30029/NAFMII_2.1?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC username: nafmiiwindows
username: root url: jdbc:oracle:thin:@10.10.82.1:1521:devdb00
type: com.zaxxer.hikari.HikariDataSource type: com.zaxxer.hikari.HikariDataSource
hikari: hikari:
maximum-pool-size: 50 maximum-pool-size: 50
...@@ -28,7 +28,11 @@ spring: ...@@ -28,7 +28,11 @@ spring:
auto-commit: true auto-commit: true
connection-timeout: 3000 connection-timeout: 3000
pool-name: NFMII_HikariCP pool-name: NFMII_HikariCP
connection-test-query: SELECT 1 connection-test-query: SELECT 1 from dual
jackson:
default-property-inclusion: ALWAYS
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
redis: redis:
# Redis数据库索引（默认为0） # Redis数据库索引（默认为0）
database: 0 database: 0
......
nafmii-app-business/pom.xml
...@@ -45,9 +45,9 @@ ...@@ -45,9 +45,9 @@
</profiles> </profiles>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>oracle</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>ojdbc6</artifactId>
<version>8.0.20</version> <version>11.2.0.4.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.nafmii</groupId> <groupId>org.nafmii</groupId>
......
nafmii-app-business/src/main/resources/application-dev.yml
...@@ -16,10 +16,10 @@ mybatis: ...@@ -16,10 +16,10 @@ mybatis:
mapper-locations: classpath:mapper/*.xml mapper-locations: classpath:mapper/*.xml
spring: spring:
datasource: datasource:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: oracle.jdbc.driver.OracleDriver
password: Moxi123# password: nafmiiwindows
url: jdbc:mysql://114.112.96.30:30029/NAFMII_2.1?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC username: nafmiiwindows
username: root url: jdbc:oracle:thin:@10.10.82.1:1521:devdb00
type: com.zaxxer.hikari.HikariDataSource type: com.zaxxer.hikari.HikariDataSource
hikari: hikari:
maximum-pool-size: 50 maximum-pool-size: 50
...@@ -28,7 +28,11 @@ spring: ...@@ -28,7 +28,11 @@ spring:
auto-commit: true auto-commit: true
connection-timeout: 3000 connection-timeout: 3000
pool-name: NFMII_HikariCP pool-name: NFMII_HikariCP
connection-test-query: SELECT 1 connection-test-query: SELECT 1 from dual
jackson:
default-property-inclusion: ALWAYS
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
redis: redis:
# Redis数据库索引（默认为0） # Redis数据库索引（默认为0）
database: 0 database: 0
......
nafmii-app-business/src/main/resources/application-prod.yml
...@@ -16,10 +16,10 @@ mybatis: ...@@ -16,10 +16,10 @@ mybatis:
mapper-locations: classpath:mapper/*.xml mapper-locations: classpath:mapper/*.xml
spring: spring:
datasource: datasource:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: oracle.jdbc.driver.OracleDriver
password: Moxi123# password: nafmiiwindows
url: jdbc:mysql://114.112.96.30:30029/NAFMII_2.1?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC username: nafmiiwindows
username: root url: jdbc:oracle:thin:@10.10.82.1:1521:devdb00
type: com.zaxxer.hikari.HikariDataSource type: com.zaxxer.hikari.HikariDataSource
hikari: hikari:
maximum-pool-size: 50 maximum-pool-size: 50
...@@ -28,7 +28,11 @@ spring: ...@@ -28,7 +28,11 @@ spring:
auto-commit: true auto-commit: true
connection-timeout: 3000 connection-timeout: 3000
pool-name: NFMII_HikariCP pool-name: NFMII_HikariCP
connection-test-query: SELECT 1 connection-test-query: SELECT 1 from dual
jackson:
default-property-inclusion: ALWAYS
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
redis: redis:
# Redis数据库索引（默认为0） # Redis数据库索引（默认为0）
database: 0 database: 0
......
nafmii-app-business/src/main/resources/application-test.yml
...@@ -16,10 +16,10 @@ mybatis: ...@@ -16,10 +16,10 @@ mybatis:
mapper-locations: classpath:mapper/*.xml mapper-locations: classpath:mapper/*.xml
spring: spring:
datasource: datasource:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: oracle.jdbc.driver.OracleDriver
password: Moxi123# password: nafmiiwindows
url: jdbc:mysql://114.112.96.30:30029/NAFMII_2.1?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC username: nafmiiwindows
username: root url: jdbc:oracle:thin:@10.10.82.1:1521:devdb00
type: com.zaxxer.hikari.HikariDataSource type: com.zaxxer.hikari.HikariDataSource
hikari: hikari:
maximum-pool-size: 50 maximum-pool-size: 50
...@@ -28,7 +28,11 @@ spring: ...@@ -28,7 +28,11 @@ spring:
auto-commit: true auto-commit: true
connection-timeout: 3000 connection-timeout: 3000
pool-name: NFMII_HikariCP pool-name: NFMII_HikariCP
connection-test-query: SELECT 1 connection-test-query: SELECT 1 from dual
jackson:
default-property-inclusion: ALWAYS
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
redis: redis:
# Redis数据库索引（默认为0） # Redis数据库索引（默认为0）
database: 0 database: 0
...@@ -46,7 +50,7 @@ spring: ...@@ -46,7 +50,7 @@ spring:
min-idle: 0 min-idle: 0
timeout: 1000ms timeout: 1000ms
nafmii: nafmii:
log-path: E:/NAFMII log-path: D:/NAFMII
dao-uri: org.nafmii.appbusiness dao-uri: org.nafmii.appbusiness
ftp: ftp:
host: 127.0.0.1 host: 127.0.0.1
......
nafmii-app-user/pom.xml
...@@ -52,9 +52,9 @@ ...@@ -52,9 +52,9 @@
<version>1.0.0</version> <version>1.0.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>oracle</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>ojdbc6</artifactId>
<version>8.0.20</version> <version>11.2.0.4.0</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-actuator --> <!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-actuator -->
<dependency> <dependency>
......
nafmii-app-user/src/main/resources/application-dev.yml
...@@ -16,10 +16,10 @@ mybatis: ...@@ -16,10 +16,10 @@ mybatis:
mapper-locations: classpath:mapper/*.xml mapper-locations: classpath:mapper/*.xml
spring: spring:
datasource: datasource:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: oracle.jdbc.driver.OracleDriver
password: Moxi123# password: nafmiiwindows
url: jdbc:mysql://114.112.96.30:30029/NAFMII_2.1?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC username: nafmiiwindows
username: root url: jdbc:oracle:thin:@10.10.82.1:1521:devdb00
type: com.zaxxer.hikari.HikariDataSource type: com.zaxxer.hikari.HikariDataSource
hikari: hikari:
maximum-pool-size: 50 maximum-pool-size: 50
...@@ -28,7 +28,11 @@ spring: ...@@ -28,7 +28,11 @@ spring:
auto-commit: true auto-commit: true
connection-timeout: 3000 connection-timeout: 3000
pool-name: NFMII_HikariCP pool-name: NFMII_HikariCP
connection-test-query: SELECT 1 connection-test-query: SELECT 1 from dual
jackson:
default-property-inclusion: ALWAYS
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
redis: redis:
# Redis数据库索引（默认为0） # Redis数据库索引（默认为0）
database: 0 database: 0
......
nafmii-app-user/src/main/resources/application-prod.yml
...@@ -16,10 +16,10 @@ mybatis: ...@@ -16,10 +16,10 @@ mybatis:
mapper-locations: classpath:mapper/*.xml mapper-locations: classpath:mapper/*.xml
spring: spring:
datasource: datasource:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: oracle.jdbc.driver.OracleDriver
password: Moxi123# password: nafmiiwindows
url: jdbc:mysql://114.112.96.30:30029/NAFMII_2.1?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC username: nafmiiwindows
username: root url: jdbc:oracle:thin:@10.10.82.1:1521:devdb00
type: com.zaxxer.hikari.HikariDataSource type: com.zaxxer.hikari.HikariDataSource
hikari: hikari:
maximum-pool-size: 50 maximum-pool-size: 50
...@@ -28,7 +28,11 @@ spring: ...@@ -28,7 +28,11 @@ spring:
auto-commit: true auto-commit: true
connection-timeout: 3000 connection-timeout: 3000
pool-name: NFMII_HikariCP pool-name: NFMII_HikariCP
connection-test-query: SELECT 1 connection-test-query: SELECT 1 from dual
jackson:
default-property-inclusion: ALWAYS
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
redis: redis:
# Redis数据库索引（默认为0） # Redis数据库索引（默认为0）
database: 0 database: 0
......
nafmii-app-user/src/main/resources/application-test.yml
...@@ -16,10 +16,10 @@ mybatis: ...@@ -16,10 +16,10 @@ mybatis:
mapper-locations: classpath:mapper/*.xml mapper-locations: classpath:mapper/*.xml
spring: spring:
datasource: datasource:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: oracle.jdbc.driver.OracleDriver
password: Moxi123# password: nafmiiwindows
url: jdbc:mysql://114.112.96.30:30029/NAFMII_2.1?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC username: nafmiiwindows
username: root url: jdbc:oracle:thin:@10.10.82.1:1521:devdb00
type: com.zaxxer.hikari.HikariDataSource type: com.zaxxer.hikari.HikariDataSource
hikari: hikari:
maximum-pool-size: 50 maximum-pool-size: 50
...@@ -28,7 +28,11 @@ spring: ...@@ -28,7 +28,11 @@ spring:
auto-commit: true auto-commit: true
connection-timeout: 3000 connection-timeout: 3000
pool-name: NFMII_HikariCP pool-name: NFMII_HikariCP
connection-test-query: SELECT 1 connection-test-query: SELECT 1 from dual
jackson:
default-property-inclusion: ALWAYS
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
redis: redis:
# Redis数据库索引（默认为0） # Redis数据库索引（默认为0）
database: 0 database: 0
...@@ -46,7 +50,7 @@ spring: ...@@ -46,7 +50,7 @@ spring:
min-idle: 0 min-idle: 0
timeout: 1000ms timeout: 1000ms
nafmii: nafmii:
log-path: E:/NAFMII log-path: D:/NAFMII
dao-uri: org.nafmii.app dao-uri: org.nafmii.app
ftp: ftp:
host: 127.0.0.1 host: 127.0.0.1
......
nafmii-common/pom.xml
...@@ -201,11 +201,6 @@ ...@@ -201,11 +201,6 @@
<artifactId>javax.servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version> <version>3.1.0</version>
</dependency> </dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.20</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.zaxxer/HikariCP --> <!-- https://mvnrepository.com/artifact/com.zaxxer/HikariCP -->
<dependency> <dependency>
<groupId>com.zaxxer</groupId> <groupId>com.zaxxer</groupId>
...@@ -234,6 +229,7 @@ ...@@ -234,6 +229,7 @@
<artifactId>spring-boot-configuration-processor</artifactId> <artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
</dependencies> </dependencies>
<!-- 项目部署到私服配置 --> <!-- 项目部署到私服配置 -->
<distributionManagement> <!-- 远程部署管理信息 --> <distributionManagement> <!-- 远程部署管理信息 -->
...@@ -242,12 +238,12 @@ ...@@ -242,12 +238,12 @@
<name>Nexus Release Repository</name> <name>Nexus Release Repository</name>
<url>http://10.10.81.188:8081/repository/maven-releases/</url> <url>http://10.10.81.188:8081/repository/maven-releases/</url>
</repository> </repository>
<!--
<snapshotRepository> <!-- 如果没有配置该元素，默认部署到repository元素配置的仓库 --> <snapshotRepository> &lt;!&ndash; 如果没有配置该元素，默认部署到repository元素配置的仓库 &ndash;&gt;
<id>nafmii-nexus-snapshots</id> <id>nafmii-nexus-snapshots</id>
<name>Nexus Snapshot Repository</name> <name>Nexus Snapshot Repository</name>
<url>http://10.10.81.188:8081/repository/maven-snapshots/</url> <url>http://10.10.81.188:8081/repository/maven-snapshots/</url>
</snapshotRepository> </snapshotRepository>-->
</distributionManagement> </distributionManagement>
</project> </project>
nafmii-common/src/main/java/org/nafmii/common/constant/MessageEnum.java
...@@ -22,10 +22,6 @@ public enum MessageEnum { ...@@ -22,10 +22,6 @@ public enum MessageEnum {
FILE_PICTURE(-113L, "图片格式非法！"), FILE_PICTURE(-113L, "图片格式非法！"),
CODE_ERROR(-114L, "验证码错误或失效！"), CODE_ERROR(-114L, "验证码错误或失效！"),
EXCEL_ERROR(-115L, "导入模板列数不匹配！"), EXCEL_ERROR(-115L, "导入模板列数不匹配！"),
FAIR_PASSWORD(-116L, "密码有误！"),
FAIR_WEBLOGIN(-117L, "账号或密码为空！"),
FAIR_USERENABLE(-118L, "该用户无效！"),
FAIR_PWD_NAME(-118L, "账号或密码错误！"),
; ;
private Long code; private Long code;
......
nafmii-common/src/main/java/org/nafmii/common/constant/WebCenterEnum.java 0 → 100644
package org.nafmii.common.constant;
import lombok.Data;
/**
* @author lvyp
* @date 2021/5/24
*/
public enum WebCenterEnum {
WEB_CENTER_CAP("WEB_CAP","中心的图形验证码");
private String code;
private String desc;
WebCenterEnum(String code, String desc) {
this.code = code;
this.desc = desc;
}
WebCenterEnum() {
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getDesc() {
return desc;
}
public void setDesc(String desc) {
this.desc = desc;
}
}
nafmii-common/src/main/java/org/nafmii/common/utils/RealIpUtils.java 0 → 100644
package org.nafmii.common.utils;
import javax.servlet.http.HttpServletRequest;
/**
* @author lvyp
* @date 2021/5/24
*/
public class RealIpUtils {
/**
* 获取真实访问IP
* @param request request
* @return String
*/
public static String getIpAddress(HttpServletRequest request){
String ip;
try {
String unknown = "unknown";
String milt = ",";
ip = request.getHeader("X-Forwarded-For");
if (ip != null && ip.length() != 0 && !unknown.equalsIgnoreCase(ip)) {
// 多次反向代理后会有多个ip值，第一个ip才是真实ip
if(ip.contains(milt)){
ip = ip.split(milt)[0];
}
}
if (ip == null || ip.length() == 0 || unknown.equalsIgnoreCase(ip)) {
ip = request.getHeader("Proxy-Client-IP");
}
if (ip == null || ip.length() == 0 || unknown.equalsIgnoreCase(ip)) {
ip = request.getHeader("WL-Proxy-Client-IP");
}
if (ip == null || ip.length() == 0 || unknown.equalsIgnoreCase(ip)) {
ip = request.getHeader("HTTP_CLIENT_IP");
}
if (ip == null || ip.length() == 0 || unknown.equalsIgnoreCase(ip)) {
ip = request.getHeader("HTTP_X_FORWARDED_FOR");
}
if (ip == null || ip.length() == 0 || unknown.equalsIgnoreCase(ip)) {
ip = request.getHeader("X-Real-IP");
}
if (ip == null || ip.length() == 0 || unknown.equalsIgnoreCase(ip)) {
ip = request.getRemoteAddr();
}
} catch (Exception e) {
e.printStackTrace();
return null;
}
return ip;
}
}
nafmii-feign/pom.xml
...@@ -35,11 +35,11 @@ ...@@ -35,11 +35,11 @@
<url>http://10.10.81.188:8081/repository/maven-releases/</url> <url>http://10.10.81.188:8081/repository/maven-releases/</url>
</repository> </repository>
<snapshotRepository> <!-- 如果没有配置该元素，默认部署到repository元素配置的仓库 --> <!--<snapshotRepository> &lt;!&ndash; 如果没有配置该元素，默认部署到repository元素配置的仓库 &ndash;&gt;
<id>nafmii-nexus-snapshots</id> <id>nafmii-nexus-snapshots</id>
<name>Nexus Snapshot Repository</name> <name>Nexus Snapshot Repository</name>
<url>http://10.10.81.188:8081/repository/maven-snapshots/</url> <url>http://10.10.81.188:8081/repository/maven-snapshots/</url>
</snapshotRepository> </snapshotRepository>-->
</distributionManagement> </distributionManagement>
</project> </project>
nafmii-outside-server/pom.xml
...@@ -44,9 +44,9 @@ ...@@ -44,9 +44,9 @@
</profiles> </profiles>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>oracle</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>ojdbc6</artifactId>
<version>8.0.20</version> <version>11.2.0.4.0</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-actuator --> <!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-actuator -->
<dependency> <dependency>
......
nafmii-outside-server/src/main/resources/application-dev.yml
...@@ -16,10 +16,10 @@ mybatis: ...@@ -16,10 +16,10 @@ mybatis:
mapper-locations: classpath:mapper/*.xml mapper-locations: classpath:mapper/*.xml
spring: spring:
datasource: datasource:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: oracle.jdbc.driver.OracleDriver
password: Moxi123# password: nafmiiwindows
url: jdbc:mysql://114.112.96.30:30029/NAFMII_2.1?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC username: nafmiiwindows
username: root url: jdbc:oracle:thin:@10.10.82.1:1521:devdb00
type: com.zaxxer.hikari.HikariDataSource type: com.zaxxer.hikari.HikariDataSource
hikari: hikari:
maximum-pool-size: 50 maximum-pool-size: 50
...@@ -28,7 +28,11 @@ spring: ...@@ -28,7 +28,11 @@ spring:
auto-commit: true auto-commit: true
connection-timeout: 3000 connection-timeout: 3000
pool-name: NFMII_HikariCP pool-name: NFMII_HikariCP
connection-test-query: SELECT 1 connection-test-query: SELECT 1 from dual
jackson:
default-property-inclusion: ALWAYS
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
redis: redis:
# Redis数据库索引（默认为0） # Redis数据库索引（默认为0）
database: 0 database: 0
......
nafmii-outside-server/src/main/resources/application-prod.yml
...@@ -16,10 +16,10 @@ mybatis: ...@@ -16,10 +16,10 @@ mybatis:
mapper-locations: classpath:mapper/*.xml mapper-locations: classpath:mapper/*.xml
spring: spring:
datasource: datasource:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: oracle.jdbc.driver.OracleDriver
password: Moxi123# password: nafmiiwindows
url: jdbc:mysql://114.112.96.30:30029/NAFMII_2.1?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC username: nafmiiwindows
username: root url: jdbc:oracle:thin:@10.10.82.1:1521:devdb00
type: com.zaxxer.hikari.HikariDataSource type: com.zaxxer.hikari.HikariDataSource
hikari: hikari:
maximum-pool-size: 50 maximum-pool-size: 50
...@@ -28,7 +28,11 @@ spring: ...@@ -28,7 +28,11 @@ spring:
auto-commit: true auto-commit: true
connection-timeout: 3000 connection-timeout: 3000
pool-name: NFMII_HikariCP pool-name: NFMII_HikariCP
connection-test-query: SELECT 1 connection-test-query: SELECT 1 from dual
jackson:
default-property-inclusion: ALWAYS
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
redis: redis:
# Redis数据库索引（默认为0） # Redis数据库索引（默认为0）
database: 0 database: 0
...@@ -47,7 +51,7 @@ spring: ...@@ -47,7 +51,7 @@ spring:
timeout: 1000ms timeout: 1000ms
nafmii: nafmii:
log-path: D:/NAFMII log-path: D:/NAFMII
dao-uri: org.nafmii.app dao-uri: org.nafmii.outside.server
ftp: ftp:
host: 127.0.0.1 host: 127.0.0.1
password: peng1003 password: peng1003
......
nafmii-outside-server/src/main/resources/application-test.yml
...@@ -16,10 +16,10 @@ mybatis: ...@@ -16,10 +16,10 @@ mybatis:
mapper-locations: classpath:mapper/*.xml mapper-locations: classpath:mapper/*.xml
spring: spring:
datasource: datasource:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: oracle.jdbc.driver.OracleDriver
password: Moxi123# password: nafmiiwindows
url: jdbc:mysql://114.112.96.30:30029/NAFMII_2.1?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC username: nafmiiwindows
username: root url: jdbc:oracle:thin:@10.10.82.1:1521:devdb00
type: com.zaxxer.hikari.HikariDataSource type: com.zaxxer.hikari.HikariDataSource
hikari: hikari:
maximum-pool-size: 50 maximum-pool-size: 50
...@@ -28,7 +28,11 @@ spring: ...@@ -28,7 +28,11 @@ spring:
auto-commit: true auto-commit: true
connection-timeout: 3000 connection-timeout: 3000
pool-name: NFMII_HikariCP pool-name: NFMII_HikariCP
connection-test-query: SELECT 1 connection-test-query: SELECT 1 from dual
jackson:
default-property-inclusion: ALWAYS
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
redis: redis:
# Redis数据库索引（默认为0） # Redis数据库索引（默认为0）
database: 0 database: 0
...@@ -46,8 +50,8 @@ spring: ...@@ -46,8 +50,8 @@ spring:
min-idle: 0 min-idle: 0
timeout: 1000ms timeout: 1000ms
nafmii: nafmii:
log-path: E:/NAFMII log-path: D:/NAFMII
dao-uri: org.nafmii.app dao-uri: org.nafmii.outside.server
ftp: ftp:
host: 127.0.0.1 host: 127.0.0.1
password: peng1003 password: peng1003
......
nafmii-quartz/pom.xml
...@@ -70,9 +70,9 @@ ...@@ -70,9 +70,9 @@
<version>1.0.0</version> <version>1.0.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>oracle</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>ojdbc6</artifactId>
<version>8.0.20</version> <version>11.2.0.4.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
......
nafmii-quartz/src/main/java/org/nafmii/quartz/scheduler/SchedulerStartupListener.java deleted 100644 → 0
package org.nafmii.quartz.scheduler;
import org.nafmii.quartz.scheduler.job.TestJob;
import org.quartz.*;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.context.annotation.Bean;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
@Component
@Order
public class SchedulerStartupListener implements ApplicationRunner {
@Value("0/5 * * * * ? ")
private String innventoryWarningTime;
@Bean
public JobDetail stockJobDetail() {
return JobBuilder.newJob(TestJob.class)
.withIdentity("TestJob")
.storeDurably()
.build();
}
@Bean
public Trigger stockTrigger() {
CronScheduleBuilder scheduleBuilder =
CronScheduleBuilder.cronSchedule(innventoryWarningTime);
return TriggerBuilder.newTrigger().forJob(stockJobDetail())
.withIdentity("stockJobDetail")
.withSchedule(scheduleBuilder)
.build();
}
@Override
public void run(ApplicationArguments var1){
System.out.println("成功");
}
}
\ No newline at end of file \ No newline at end of file
nafmii-quartz/src/main/java/org/nafmii/quartz/scheduler/job/TestJob.java deleted 100644 → 0
package org.nafmii.quartz.scheduler.job;
import org.nafmii.quartz.datasource.annotation.DataSource;
import org.quartz.DisallowConcurrentExecution;
import org.quartz.JobExecutionContext;
import org.quartz.PersistJobDataAfterExecution;
import org.springframework.scheduling.quartz.QuartzJobBean;
import java.text.SimpleDateFormat;
import java.util.Date;
/**
* test
*/
@PersistJobDataAfterExecution
@DisallowConcurrentExecution
public class TestJob extends QuartzJobBean {
@Override
@DataSource("dm")
protected void executeInternal(JobExecutionContext context) {
SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
System.out.println("QuartzJob1----" + sdf.format(new Date()));
}
}
nafmii-quartz/src/main/resources/application-dev.yml
...@@ -11,38 +11,11 @@ eureka: ...@@ -11,38 +11,11 @@ eureka:
prefer-ip-address: true prefer-ip-address: true
statusPageUrl: http://127.0.0.1:${server.port}/swagger-ui.html statusPageUrl: http://127.0.0.1:${server.port}/swagger-ui.html
spring: spring:
quartz:
job-store-type: jdbc
properties:
org:
quartz:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://114.112.96.30:30029/NAFMII_2.1?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC
username: root
password: Moxi123#
scheduler:
instancName: clusteredScheduler
instanceId: AUTO
jobStore:
class: org.quartz.impl.jdbcjobstore.JobStoreTX
driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
tablePrefix: QRTZ_
isClustered: true
clusterCheckinInterval: 1000
useProperties: false
threadPool:
class: org.quartz.simpl.SimpleThreadPool
threadCount: 20
threadPriority: 5
jdbc:
initialize-schema: always
datasource: datasource:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: oracle.jdbc.driver.OracleDriver
druid: password: nafmiiwindows
password: Moxi123# username: nafmiiwindows
url: jdbc:mysql://114.112.96.30:30029/NAFMII_2.1?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC url: jdbc:oracle:thin:@10.10.82.1:1521:devdb00
username: root
type: com.zaxxer.hikari.HikariDataSource type: com.zaxxer.hikari.HikariDataSource
hikari: hikari:
maximum-pool-size: 50 maximum-pool-size: 50
...@@ -51,16 +24,20 @@ spring: ...@@ -51,16 +24,20 @@ spring:
auto-commit: true auto-commit: true
connection-timeout: 3000 connection-timeout: 3000
pool-name: NFMII_HikariCP pool-name: NFMII_HikariCP
connection-test-query: SELECT 1 connection-test-query: SELECT 1 from dual
jackson:
default-property-inclusion: ALWAYS
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
dynamic: dynamic:
#其他数据源 #其他数据源
datasource: datasource:
dm: dm:
#dm数据源 在相应的方法上使用 @DataSource("dm") #dm数据源 在相应的方法上使用 @DataSource("dm")
password: Moxi123# password: nafmiiwindows
url: jdbc:mysql://114.112.96.30:30029/NAFMII_2.1?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC url: jdbc:oracle:thin:@10.10.82.1:1521:devdb00
username: root username: nafmiiwindows
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: oracle.jdbc.driver.OracleDriver
logging: logging:
config: classpath:logback-spring.xml config: classpath:logback-spring.xml
nafmii: nafmii:
......
nafmii-quartz/src/main/resources/application-prod.yml
...@@ -11,38 +11,11 @@ eureka: ...@@ -11,38 +11,11 @@ eureka:
prefer-ip-address: true prefer-ip-address: true
statusPageUrl: http://127.0.0.1:${server.port}/swagger-ui.html statusPageUrl: http://127.0.0.1:${server.port}/swagger-ui.html
spring: spring:
quartz:
job-store-type: jdbc
properties:
org:
quartz:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://114.112.96.30:30029/NAFMII_2.1?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC
username: root
password: Moxi123#
scheduler:
instancName: clusteredScheduler
instanceId: AUTO
jobStore:
class: org.quartz.impl.jdbcjobstore.JobStoreTX
driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
tablePrefix: QRTZ_
isClustered: true
clusterCheckinInterval: 1000
useProperties: false
threadPool:
class: org.quartz.simpl.SimpleThreadPool
threadCount: 20
threadPriority: 5
jdbc:
initialize-schema: always
datasource: datasource:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: oracle.jdbc.driver.OracleDriver
druid: password: nafmiiwindows
password: Moxi123# username: nafmiiwindows
url: jdbc:mysql://114.112.96.30:30029/NAFMII_2.1?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC url: jdbc:oracle:thin:@10.10.82.1:1521:devdb00
username: root
type: com.zaxxer.hikari.HikariDataSource type: com.zaxxer.hikari.HikariDataSource
hikari: hikari:
maximum-pool-size: 50 maximum-pool-size: 50
...@@ -51,16 +24,20 @@ spring: ...@@ -51,16 +24,20 @@ spring:
auto-commit: true auto-commit: true
connection-timeout: 3000 connection-timeout: 3000
pool-name: NFMII_HikariCP pool-name: NFMII_HikariCP
connection-test-query: SELECT 1 connection-test-query: SELECT 1 from dual
jackson:
default-property-inclusion: ALWAYS
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
dynamic: dynamic:
#其他数据源 #其他数据源
datasource: datasource:
dm: dm:
#dm数据源 在相应的方法上使用 @DataSource("dm") #dm数据源 在相应的方法上使用 @DataSource("dm")
password: Moxi123# password: nafmiiwindows
url: jdbc:mysql://114.112.96.30:30029/NAFMII_2.1?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC url: jdbc:oracle:thin:@10.10.82.1:1521:devdb00
username: root username: nafmiiwindows
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: oracle.jdbc.driver.OracleDriver
logging: logging:
config: classpath:logback-spring.xml config: classpath:logback-spring.xml
nafmii: nafmii:
......
nafmii-quartz/src/main/resources/application-test.yml
...@@ -11,38 +11,11 @@ eureka: ...@@ -11,38 +11,11 @@ eureka:
prefer-ip-address: true prefer-ip-address: true
statusPageUrl: http://127.0.0.1:${server.port}/swagger-ui.html statusPageUrl: http://127.0.0.1:${server.port}/swagger-ui.html
spring: spring:
quartz:
job-store-type: jdbc
properties:
org:
quartz:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://114.112.96.30:30029/NAFMII_2.1?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC
username: root
password: Moxi123#
scheduler:
instancName: clusteredScheduler
instanceId: AUTO
jobStore:
class: org.quartz.impl.jdbcjobstore.JobStoreTX
driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
tablePrefix: QRTZ_
isClustered: true
clusterCheckinInterval: 1000
useProperties: false
threadPool:
class: org.quartz.simpl.SimpleThreadPool
threadCount: 20
threadPriority: 5
jdbc:
initialize-schema: always
datasource: datasource:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: oracle.jdbc.driver.OracleDriver
druid: password: nafmiiwindows
password: Moxi123# username: nafmiiwindows
url: jdbc:mysql://114.112.96.30:30029/NAFMII_2.1?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC url: jdbc:oracle:thin:@10.10.82.1:1521:devdb00
username: root
type: com.zaxxer.hikari.HikariDataSource type: com.zaxxer.hikari.HikariDataSource
hikari: hikari:
maximum-pool-size: 50 maximum-pool-size: 50
...@@ -51,16 +24,20 @@ spring: ...@@ -51,16 +24,20 @@ spring:
auto-commit: true auto-commit: true
connection-timeout: 3000 connection-timeout: 3000
pool-name: NFMII_HikariCP pool-name: NFMII_HikariCP
connection-test-query: SELECT 1 connection-test-query: SELECT 1 from dual
jackson:
default-property-inclusion: ALWAYS
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
dynamic: dynamic:
#其他数据源 #其他数据源
datasource: datasource:
dm: dm:
#dm数据源 在相应的方法上使用 @DataSource("dm") #dm数据源 在相应的方法上使用 @DataSource("dm")
password: Moxi123# password: nafmiiwindows
url: jdbc:mysql://114.112.96.30:30029/NAFMII_2.1?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC url: jdbc:oracle:thin:@10.10.82.1:1521:devdb00
username: root username: nafmiiwindows
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: oracle.jdbc.driver.OracleDriver
logging: logging:
config: classpath:logback-spring.xml config: classpath:logback-spring.xml
nafmii: nafmii:
......
nafmii-web-center/pom.xml
...@@ -48,10 +48,11 @@ ...@@ -48,10 +48,11 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>oracle</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>ojdbc6</artifactId>
<version>8.0.20</version> <version>11.2.0.4.0</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-actuator --> <!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-actuator -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
...@@ -83,6 +84,17 @@ ...@@ -83,6 +84,17 @@
<artifactId>spring-cloud-starter-zipkin</artifactId> <artifactId>spring-cloud-starter-zipkin</artifactId>
<version>2.2.4.RELEASE</version> <version>2.2.4.RELEASE</version>
</dependency> </dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
<version>1.2.6</version>
</dependency>
<!-- 图形验证码 -->
<dependency>
<groupId>com.github.penggle</groupId>
<artifactId>kaptcha</artifactId>
<version>2.3.2</version>
</dependency>
</dependencies> </dependencies>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
......
nafmii-web-center/src/main/java/org/nafmii/webcenter/att/controller/AttController.java
...@@ -24,7 +24,7 @@ import java.io.InputStream; ...@@ -24,7 +24,7 @@ import java.io.InputStream;
*/ */
@RestController @RestController
@RequestMapping("/nafmii/admin/att") @RequestMapping("/nafmii/admin/att")
@Api(tags = "2.0.2", description = "上传文件到文件服务器【zjh】") @Api(tags = "2.1.2", description = "上传文件到文件服务器【zjh】")
@Slf4j @Slf4j
public class AttController { public class AttController {
......
nafmii-web-center/src/main/java/org/nafmii/webcenter/att/controller/ImportExcelController.java
...@@ -15,7 +15,7 @@ import java.io.IOException; ...@@ -15,7 +15,7 @@ import java.io.IOException;
@RestController @RestController
@RequestMapping("/nafmii/admin/excel") @RequestMapping("/nafmii/admin/excel")
@Api(tags = "2.0.3", description = "中心端批量导入Excel接口【zjh】") @Api(tags = "2.1.3", description = "中心端批量导入Excel接口【zjh】")
public class ImportExcelController { public class ImportExcelController {
@Resource @Resource
private ImportExcelService iImportExcelService; private ImportExcelService iImportExcelService;
......
nafmii-web-center/src/main/java/org/nafmii/webcenter/config/CaptchaConfig.java 0 → 100644
package org.nafmii.webcenter.config;
import com.google.code.kaptcha.Constants;
import com.google.code.kaptcha.impl.DefaultKaptcha;
import com.google.code.kaptcha.util.Config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import java.util.Properties;
/**
* 生成验证码配置
*/
@Configuration
public class CaptchaConfig {
@Bean
public DefaultKaptcha captcha() {
Properties properties = new Properties();
// 图片边框
properties.put(Constants.KAPTCHA_BORDER, "no");
// 边框颜色
properties.put(Constants.KAPTCHA_BORDER_COLOR, "105,179,90");
// 字体颜色
properties.put(Constants.KAPTCHA_TEXTPRODUCER_FONT_COLOR, "black");
// 图片宽
properties.put(Constants.KAPTCHA_IMAGE_WIDTH, "150");
// 图片高
properties.put(Constants.KAPTCHA_IMAGE_HEIGHT, "45");
// 字体大小
properties.put(Constants.KAPTCHA_TEXTPRODUCER_FONT_SIZE, "40");
// 验证码长度
properties.put(Constants.KAPTCHA_TEXTPRODUCER_CHAR_LENGTH, "4");
// 文本集合
properties.put(Constants.KAPTCHA_TEXTPRODUCER_CHAR_STRING, "1234567890");
// 字体
properties.put(Constants.KAPTCHA_TEXTPRODUCER_FONT_NAMES, "宋体,楷体,微软雅黑");
//图片样式
properties.put(Constants.KAPTCHA_OBSCURIFICATOR_IMPL, "com.google.code.kaptcha.impl.WaterRipple");
Config config = new Config(properties);
DefaultKaptcha defaultKaptcha = new DefaultKaptcha();
defaultKaptcha.setConfig(config);
return defaultKaptcha;
}
}
nafmii-web-center/src/main/java/org/nafmii/webcenter/user/controller/CenterCommonController.java 0 → 100644
package org.nafmii.webcenter.user.controller;
import com.alibaba.druid.util.Base64;
import com.google.code.kaptcha.impl.DefaultKaptcha;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.nafmii.common.constant.MessageEnum;
import org.nafmii.common.response.ApiResponse;
import org.nafmii.common.utils.RealIpUtils;
import org.nafmii.webcenter.user.service.ICommonService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
/**
* @author lvyp
* @date 2021/5/24
*/
@RestController
@RequestMapping("/nafmii/webcenter/common")
@Api(tags = "2.1.6", description = "中心端公共接口")
public class CenterCommonController {
@Resource
private ICommonService commonService;
@ApiOperation(value = "获取图形验证码",notes = "获取图形验证码")
@GetMapping("/captcha")
@ResponseBody
public ApiResponse<String> captcha(HttpServletRequest request){
return commonService.captcha(request);
}
}
nafmii-web-center/src/main/java/org/nafmii/webcenter/user/controller/CenterMenuController.java
...@@ -26,8 +26,8 @@ import java.util.List; ...@@ -26,8 +26,8 @@ import java.util.List;
* @since 2021-04-28 * @since 2021-04-28
*/ */
@RestController @RestController
@RequestMapping("/nafmii/admin/menu") @RequestMapping("/nafmii/webcenter/menu")
@Api(tags = "2.0.5", description = "中心端菜单接口") @Api(tags = "2.1.3", description = "中心端菜单接口")
public class CenterMenuController { public class CenterMenuController {
@Resource @Resource
private ICenterMenuService centerMenuService; private ICenterMenuService centerMenuService;
...@@ -39,5 +39,6 @@ public class CenterMenuController { ...@@ -39,5 +39,6 @@ public class CenterMenuController {
ApiResponse result = centerMenuService.queryMenus(); ApiResponse result = centerMenuService.queryMenus();
return result; return result;
} }
} }
nafmii-web-center/src/main/java/org/nafmii/webcenter/user/controller/CenterRoleController.java
...@@ -27,8 +27,8 @@ import java.util.List; ...@@ -27,8 +27,8 @@ import java.util.List;
* @since 2021-04-27 * @since 2021-04-27
*/ */
@RestController @RestController
@RequestMapping("/nafmii/admin/role") @RequestMapping("/nafmii/webcenter/role")
@Api(tags = "2.0.5", description = "中心端角色接口") @Api(tags = "2.1.4", description = "中心端角色接口")
public class CenterRoleController { public class CenterRoleController {
@Resource @Resource
private ICenterRoleService centerRoleService; private ICenterRoleService centerRoleService;
......
nafmii-web-center/src/main/java/org/nafmii/webcenter/user/controller/CenterUserController.java
...@@ -17,6 +17,7 @@ import org.springframework.validation.annotation.Validated; ...@@ -17,6 +17,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.List; import java.util.List;
/** /**
...@@ -28,8 +29,8 @@ import java.util.List; ...@@ -28,8 +29,8 @@ import java.util.List;
* @since 2021-04-27 * @since 2021-04-27
*/ */
@RestController @RestController
@RequestMapping("/nafmii/admin/user") @RequestMapping("/nafmii/webcenter/user")
@Api(tags = "2.0.0", description = "中心端用户接口【zjh】") @Api(tags = "2.1.5", description = "中心端用户接口【zjh】")
public class CenterUserController { public class CenterUserController {
@Resource @Resource
private ICenterUserService centerUserService; private ICenterUserService centerUserService;
...@@ -37,8 +38,8 @@ public class CenterUserController { ...@@ -37,8 +38,8 @@ public class CenterUserController {
@ApiOperation( value = "中心端用户登陆",notes = "中心端用户登陆") @ApiOperation( value = "中心端用户登陆",notes = "中心端用户登陆")
@PostMapping("/login") @PostMapping("/login")
@ResponseBody @ResponseBody
public ApiResponse login (@RequestBody @Validated LoginParam param){ public ApiResponse login (@RequestBody @Validated LoginParam param, HttpServletRequest request){
ApiResponse login = centerUserService.userLogin(param); ApiResponse login = centerUserService.userLogin(param,request);
return login; return login;
} }
......
nafmii-web-center/src/main/java/org/nafmii/webcenter/user/dao/CenterMenuMapper.java
package org.nafmii.webcenter.user.dao; package org.nafmii.webcenter.user.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.nafmii.webcenter.user.dto.QueryMenusDto; import org.nafmii.webcenter.user.dto.QueryMenusDto;
import org.nafmii.webcenter.user.entity.CenterMenuPO; import org.nafmii.webcenter.user.entity.CenterMenuPO;
import org.nafmii.webcenter.user.vo.CenterMenuVO; import org.nafmii.webcenter.user.vo.CenterMenuVO;
import org.nafmii.webcenter.user.vo.MenuListVo; import org.nafmii.webcenter.user.vo.MenuListVo;
import org.nafmii.webcenter.user.vo.MenuToUserVO;
import java.util.List; import java.util.List;
...@@ -22,5 +24,6 @@ public interface CenterMenuMapper extends BaseMapper<CenterMenuPO> { ...@@ -22,5 +24,6 @@ public interface CenterMenuMapper extends BaseMapper<CenterMenuPO> {
* @return * @return
*/ */
List<MenuListVo> selectAll(); List<MenuListVo> selectAll();
List<MenuToUserVO> queryMenuByUser(@Param("userId") Long userId);
} }
nafmii-web-center/src/main/java/org/nafmii/webcenter/user/param/LoginParam.java
...@@ -19,9 +19,12 @@ import javax.validation.constraints.NotNull; ...@@ -19,9 +19,12 @@ import javax.validation.constraints.NotNull;
public class LoginParam { public class LoginParam {
@ApiModelProperty("账号") @ApiModelProperty("账号")
@NotNull(message = "登录账号不能为空")
private String loginName; private String loginName;
@ApiModelProperty("登陆密码") @ApiModelProperty("登陆密码")
@NotNull @NotNull(message = "密码不能为空")
private String loginPwd; private String loginPwd;
@ApiModelProperty("验证码")
@NotNull(message = "验证码不能为空")
private String captcha;
} }
nafmii-web-center/src/main/java/org/nafmii/webcenter/user/service/ICenterUserService.java
...@@ -8,6 +8,7 @@ import org.nafmii.webcenter.user.vo.CenterUserAndRoleVo; ...@@ -8,6 +8,7 @@ import org.nafmii.webcenter.user.vo.CenterUserAndRoleVo;
import org.nafmii.webcenter.user.vo.CenterUserVO; import org.nafmii.webcenter.user.vo.CenterUserVO;
import org.nafmii.common.response.ApiResponse; import org.nafmii.common.response.ApiResponse;
import javax.servlet.http.HttpServletRequest;
import java.util.List; import java.util.List;
/** /**
...@@ -56,5 +57,5 @@ public interface ICenterUserService { ...@@ -56,5 +57,5 @@ public interface ICenterUserService {
* @version: * @version:
* @remark: * @remark:
*/ */
ApiResponse userLogin(LoginParam param); ApiResponse userLogin(LoginParam param,HttpServletRequest request);
} }
nafmii-web-center/src/main/java/org/nafmii/webcenter/user/service/ICommonService.java 0 → 100644
package org.nafmii.webcenter.user.service;
import org.nafmii.common.response.ApiResponse;
import javax.servlet.http.HttpServletRequest;
/**
* @author lvyp
* @date 2021/5/24
*/
public interface ICommonService {
ApiResponse<String> captcha(HttpServletRequest request);
}
nafmii-web-center/src/main/java/org/nafmii/webcenter/user/service/impl/CenterUserServiceImpl.java
...@@ -3,6 +3,10 @@ package org.nafmii.webcenter.user.service.impl; ...@@ -3,6 +3,10 @@ package org.nafmii.webcenter.user.service.impl;
import cn.hutool.crypto.digest.DigestUtil; import cn.hutool.crypto.digest.DigestUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.nafmii.common.constant.WebCenterEnum;
import org.nafmii.common.utils.RealIpUtils;
import org.nafmii.common.utils.RedisUtils;
import org.nafmii.webcenter.user.dao.CenterMenuMapper;
import org.nafmii.webcenter.user.dao.CenterUserMapper; import org.nafmii.webcenter.user.dao.CenterUserMapper;
import org.nafmii.webcenter.user.dao.CenterUserRoleMapper; import org.nafmii.webcenter.user.dao.CenterUserRoleMapper;
import org.nafmii.webcenter.user.dto.AddOrUpdateUserDto; import org.nafmii.webcenter.user.dto.AddOrUpdateUserDto;
...@@ -27,6 +31,7 @@ import org.nafmii.common.utils.SnowFlakeUtil; ...@@ -27,6 +31,7 @@ import org.nafmii.common.utils.SnowFlakeUtil;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
...@@ -47,6 +52,9 @@ public class CenterUserServiceImpl implements ICenterUserService { ...@@ -47,6 +52,9 @@ public class CenterUserServiceImpl implements ICenterUserService {
@Resource @Resource
private CenterUserRoleMapper userRoleMapper; private CenterUserRoleMapper userRoleMapper;
@Resource
private CenterMenuMapper menuMapper;
/** /**
* 新建或编辑用户接口 * 新建或编辑用户接口
* @param param * @param param
...@@ -175,21 +183,26 @@ public class CenterUserServiceImpl implements ICenterUserService { ...@@ -175,21 +183,26 @@ public class CenterUserServiceImpl implements ICenterUserService {
* @return * @return
*/ */
@Override @Override
public ApiResponse userLogin(LoginParam param) { public ApiResponse userLogin(LoginParam param,HttpServletRequest request) {
if (param.getLoginPwd().isEmpty() || param.getLoginName().isEmpty()){ String ip = RealIpUtils.getIpAddress(request).replace(".","");
return new ApiResponse(ApiResponse.FAIL, MessageEnum.FAIR_WEBLOGIN.getRemarks()); // String captcha = RedisUtils.hGetObject(WebCenterEnum.WEB_CENTER_CAP.getCode(),ip,String.class);
} //// if(StringUtils.isBlank(captcha)){
//// return new ApiResponse(ApiResponse.FAIL,"验证码错误");
//// }
LoginDto loginDto = BeanTransferUtils.transfer(param, LoginDto.class); LoginDto loginDto = BeanTransferUtils.transfer(param, LoginDto.class);
log.info("===============中心端用户登录请求参数======》{}",loginDto);
//账号密码登陆 //账号密码登陆
CenterUserVO userVo = centerUserMapper.selectUserByPhone(loginDto); CenterUserVO userVo = centerUserMapper.selectUserByPhone(loginDto);
log.info("====================中心端登录时返回的数据=============userVo=="+userVo);
if (null == userVo){ if (null == userVo){
return new ApiResponse(ApiResponse.FAIL,MessageEnum.FAIR_PWD_NAME.getRemarks()); return new ApiResponse(ApiResponse.FAIL,"账户错误");
}
if (!userVo.getLoginPwd().equals(loginDto.getLoginPwd())){
return new ApiResponse(ApiResponse.FAIL,"密码错误");
} }
if (userVo.getIsEnable().equals(UserEnum.NOTENABLE.getCode())){ if (!"0".equals(userVo.getIsEnable())){
return new ApiResponse(ApiResponse.FAIL,MessageEnum.FAIR_USERENABLE.getRemarks()); return new ApiResponse(ApiResponse.FAIL,"无效用户");
} }
//获取用户权限
userVo.setMenuList(menuMapper.queryMenuByUser(userVo.getId()));
return new ApiResponse(ApiResponse.SUCCESS,ApiResponse.SUCCESS_TEXT,userVo); return new ApiResponse(ApiResponse.SUCCESS,ApiResponse.SUCCESS_TEXT,userVo);
} }
} }
nafmii-web-center/src/main/java/org/nafmii/webcenter/user/service/impl/CommonServiceImpl.java 0 → 100644
package org.nafmii.webcenter.user.service.impl;
import com.alibaba.druid.util.Base64;
import com.alibaba.fastjson.JSONObject;
import com.google.code.kaptcha.impl.DefaultKaptcha;
import org.nafmii.common.constant.MessageEnum;
import org.nafmii.common.constant.WebCenterEnum;
import org.nafmii.common.response.ApiResponse;
import org.nafmii.common.utils.RealIpUtils;
import org.nafmii.common.utils.RedisUtils;
import org.nafmii.webcenter.user.service.ICommonService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletRequest;
import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
/**
* @author lvyp
* @date 2021/5/24
*/
@Service
public class CommonServiceImpl implements ICommonService {
@Resource
private DefaultKaptcha defaultKaptcha;
@Override
public ApiResponse<String> captcha(HttpServletRequest request) {
String capText = defaultKaptcha.createText();
//获取IP，并存储到redis
String ip = RealIpUtils.getIpAddress(request).replace(".","");
RedisUtils.hSet(WebCenterEnum.WEB_CENTER_CAP.getCode(),ip, JSONObject.toJSONString(ip));
BufferedImage bi = defaultKaptcha.createImage(capText);
try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
ImageIO.write(bi, "jpg", out);
return new ApiResponse<>(Base64.byteArrayToBase64(out.toByteArray()));
} catch (IOException e) {
e.printStackTrace();
}
return new ApiResponse<>(MessageEnum.FAIL.getCode(), "请重新刷新", null);
}
}
nafmii-web-center/src/main/java/org/nafmii/webcenter/user/vo/CenterUserVO.java
...@@ -5,7 +5,8 @@ import io.swagger.annotations.ApiModel; ...@@ -5,7 +5,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.time.LocalDateTime; import java.util.Date;
import java.util.List;
/** /**
* <p> * <p>
...@@ -55,13 +56,15 @@ public class CenterUserVO extends Model { ...@@ -55,13 +56,15 @@ public class CenterUserVO extends Model {
private Long updateUserId; private Long updateUserId;
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
private LocalDateTime createTime; private Date createTime;
@ApiModelProperty(value = "更新时间") @ApiModelProperty(value = "更新时间")
private LocalDateTime updateTime; private Date updateTime;
@ApiModelProperty(value = "0 有效 1 无效") @ApiModelProperty(value = "0 有效 1 无效")
private String isEnable; private String isEnable;
@ApiModelProperty(value = "菜单集合")
private List<MenuToUserVO> menuList;
} }
nafmii-web-center/src/main/java/org/nafmii/webcenter/user/vo/MenuToUserVO.java 0 → 100644
package org.nafmii.webcenter.user.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author lvyp
* @date 2021/5/24
*/
@Data
@ApiModel(value = "登录用户菜单")
public class MenuToUserVO {
@ApiModelProperty(value = "菜单主键")
private String menuId;
@ApiModelProperty(value = "菜单名称")
private String menuName;
@ApiModelProperty(value = "菜单级别")
private String menuLevel;
@ApiModelProperty(value = "父级ID")
private String parentId;
@ApiModelProperty(value = "菜单链接")
private String menuUrl;
@ApiModelProperty(value = "排序")
private String orderSeq;
}
nafmii-web-center/src/main/resources/application-dev.yml
...@@ -16,10 +16,10 @@ mybatis: ...@@ -16,10 +16,10 @@ mybatis:
mapper-locations: classpath:mapper/*.xml mapper-locations: classpath:mapper/*.xml
spring: spring:
datasource: datasource:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: oracle.jdbc.driver.OracleDriver
password: Moxi123# password: nafmiiwindows
url: jdbc:mysql://114.112.96.30:30029/NAFMII_2.1?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC username: nafmiiwindows
username: root url: jdbc:oracle:thin:@10.10.82.1:1521:devdb00
type: com.zaxxer.hikari.HikariDataSource type: com.zaxxer.hikari.HikariDataSource
hikari: hikari:
maximum-pool-size: 50 maximum-pool-size: 50
...@@ -28,7 +28,11 @@ spring: ...@@ -28,7 +28,11 @@ spring:
auto-commit: true auto-commit: true
connection-timeout: 3000 connection-timeout: 3000
pool-name: NFMII_HikariCP pool-name: NFMII_HikariCP
connection-test-query: SELECT 1 connection-test-query: SELECT 1 from dual
jackson:
default-property-inclusion: ALWAYS
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
zipkin: zipkin:
base-url: http://localhost:9411 base-url: http://localhost:9411
enabled: true enabled: true
......
nafmii-web-center/src/main/resources/application-prod.yml
...@@ -16,10 +16,10 @@ mybatis: ...@@ -16,10 +16,10 @@ mybatis:
mapper-locations: classpath:mapper/*.xml mapper-locations: classpath:mapper/*.xml
spring: spring:
datasource: datasource:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: oracle.jdbc.driver.OracleDriver
password: Moxi123# password: nafmiiwindows
url: jdbc:mysql://114.112.96.30:30029/NAFMII_2.1?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC username: nafmiiwindows
username: root url: jdbc:oracle:thin:@10.10.82.1:1521:devdb00
type: com.zaxxer.hikari.HikariDataSource type: com.zaxxer.hikari.HikariDataSource
hikari: hikari:
maximum-pool-size: 50 maximum-pool-size: 50
...@@ -28,7 +28,20 @@ spring: ...@@ -28,7 +28,20 @@ spring:
auto-commit: true auto-commit: true
connection-timeout: 3000 connection-timeout: 3000
pool-name: NFMII_HikariCP pool-name: NFMII_HikariCP
connection-test-query: SELECT 1 connection-test-query: SELECT 1 from dual
jackson:
default-property-inclusion: ALWAYS
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
zipkin:
base-url: http://localhost:9411
enabled: true
sleuth:
web:
client:
enabled: true
sampler:
probability: 1.0 #zipkin采集率 0.1表示 10%采集率
nafmii: nafmii:
log-path: D:/NAFMII log-path: D:/NAFMII
dao-uri: org.nafmii.admin dao-uri: org.nafmii.admin
......
nafmii-web-center/src/main/resources/application-test.yml
...@@ -16,10 +16,10 @@ mybatis: ...@@ -16,10 +16,10 @@ mybatis:
mapper-locations: classpath:mapper/*.xml mapper-locations: classpath:mapper/*.xml
spring: spring:
datasource: datasource:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: oracle.jdbc.driver.OracleDriver
password: Moxi123# password: nafmiiwindows
url: jdbc:mysql://114.112.96.30:30029/NAFMII_2.1?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC username: nafmiiwindows
username: root url: jdbc:oracle:thin:@10.10.82.1:1521:devdb00
type: com.zaxxer.hikari.HikariDataSource type: com.zaxxer.hikari.HikariDataSource
hikari: hikari:
maximum-pool-size: 50 maximum-pool-size: 50
...@@ -28,7 +28,20 @@ spring: ...@@ -28,7 +28,20 @@ spring:
auto-commit: true auto-commit: true
connection-timeout: 3000 connection-timeout: 3000
pool-name: NFMII_HikariCP pool-name: NFMII_HikariCP
connection-test-query: SELECT 1 connection-test-query: SELECT 1 from dual
jackson:
default-property-inclusion: ALWAYS
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
zipkin:
base-url: http://localhost:9411
enabled: true
sleuth:
web:
client:
enabled: true
sampler:
probability: 1.0 #zipkin采集率 0.1表示 10%采集率
nafmii: nafmii:
log-path: D:/NAFMII log-path: D:/NAFMII
dao-uri: org.nafmii.admin dao-uri: org.nafmii.admin
......
nafmii-web-center/src/main/resources/mapper/CenterMenuMapper.xml
...@@ -30,4 +30,29 @@ ...@@ -30,4 +30,29 @@
from CENTER_MENU from CENTER_MENU
where IS_ENABLE = 0 where IS_ENABLE = 0
</select> </select>
<select id="queryMenuByUser" resultType="org.nafmii.webcenter.user.vo.MenuToUserVO">
SELECT DISTINCT
( CM.ID ) AS menuId,
CM.MENU_NAME,
CM.MENU_LEVLE,
CM.PARENT_ID,
CM.MENUM_URL,
CM.ORDER_SEQ
FROM
CENTER_USER CU
INNER JOIN CENTER_USER_ROLE CUr ON ( CUr.USER_ID = CU.ID )
INNER JOIN CENTER_ROLE_MENU CRM ON ( CRM.ROLE_ID = CUr.ROLE_ID )
INNER JOIN CENTER_MENU CM ON ( CM.ID = CRM.MENU_ID )
INNER JOIN CENTER_ROLE CR ON ( CUr.ROLE_ID = CR.ID )
WHERE
CU.ID = #{userId}
AND CU.IS_ENABLE = '0'
AND CUr.IS_ENABLE = '0'
AND CRM.IS_ENABLE = '0'
AND CM.IS_ENABLE = '0'
AND CR.IS_ENABLE = '0'
ORDER BY
CM.PARENT_ID ASC
</select>
</mapper> </mapper>
nafmii-web-center/src/main/resources/mapper/CenterUserMapper.xml
...@@ -32,13 +32,8 @@ ...@@ -32,13 +32,8 @@
TELPHONE as telphone, SEX as sex, EMAIL as email, CREATE_USER_ID as createUserId, UPDATE_USER_ID as updateUserId, TELPHONE as telphone, SEX as sex, EMAIL as email, CREATE_USER_ID as createUserId, UPDATE_USER_ID as updateUserId,
CREATE_TIME as createTime, UPDATE_TIME as updateTime, IS_ENABLE as isEnable CREATE_TIME as createTime, UPDATE_TIME as updateTime, IS_ENABLE as isEnable
from CENTER_USER from CENTER_USER
where 1 = 1 where
<if test="loginName !=null"> LOGIN_NAME =#{loginName}
and LOGIN_NAME =#{loginName}
</if>
<if test="loginPwd !=null">
and LOGIN_PWD =#{loginPwd}
</if>
</select> </select>
<select id="selectUserAndRole" parameterType="org.nafmii.webcenter.user.dto.QueryUsersDto" resultType="org.nafmii.webcenter.user.vo.CenterUserAndRoleVo"> <select id="selectUserAndRole" parameterType="org.nafmii.webcenter.user.dto.QueryUsersDto" resultType="org.nafmii.webcenter.user.vo.CenterUserAndRoleVo">
select select
......
pom.xml
...@@ -34,12 +34,12 @@ ...@@ -34,12 +34,12 @@
<name>Nexus Release Repository</name> <name>Nexus Release Repository</name>
<url>http://10.10.81.188:8081/repository/maven-releases</url> <url>http://10.10.81.188:8081/repository/maven-releases</url>
</repository> </repository>
<!--
<snapshotRepository> <!-- 如果没有配置该元素，默认部署到repository元素配置的仓库 --> <snapshotRepository> &lt;!&ndash; 如果没有配置该元素，默认部署到repository元素配置的仓库 &ndash;&gt;
<id>nafmii-nexus-snapshots</id> <id>nafmii-nexus-snapshots</id>
<name>Nexus Snapshot Repository</name> <name>Nexus Snapshot Repository</name>
<url>http://10.10.81.188:8081/repository/maven-snapshots/</url> <url>http://10.10.81.188:8081/repository/maven-snapshots/</url>
</snapshotRepository> </snapshotRepository>-->
</distributionManagement> </distributionManagement>
</project> </project>
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!