zhba/zhba_management_w_bf.git

parent: 91890bac | patch | commit | ignore whitespace

Administrator

2022-01-13 e5d2427bf7a846a815cdd766869efeda1346c137

1. 接口放行修改
2. 数据库连接配置修改

7 files modified

	src/main/java/org/springblade/common/config/BladeConfiguration.java	53 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/org/springblade/common/config/FtpConfig.java	19 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/org/springblade/modules/FTP/MysqlCenlint.java	17 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/application-dev.yml	4 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/application-prod.yml	4 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/application-test.yml	4 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/application.yml	28 ●●●●● patch \| view \| raw \| blame \| history

 src/main/java/org/springblade/common/config/BladeConfiguration.java

@@ -53,39 +53,38 @@
        secureRegistry.excludePathPatterns("/webjars/**");
        secureRegistry.excludePathPatterns("/swagger-resources/**");
        secureRegistry.excludePathPatterns("/druid/**");
        secureRegistry.excludePathPatterns("/performance/**");
        secureRegistry.excludePathPatterns("/information/**");
        secureRegistry.excludePathPatterns("/shareholder/**");
        secureRegistry.excludePathPatterns("/member/**");
        secureRegistry.excludePathPatterns("/honor/**");
        secureRegistry.excludePathPatterns("/dispatcher/**");
        secureRegistry.excludePathPatterns("/employment/**");
        secureRegistry.excludePathPatterns("/train/**");
        secureRegistry.excludePathPatterns("/examination/**");
        secureRegistry.excludePathPatterns("/experience/**");
//        secureRegistry.excludePathPatterns("/performance/**");
//        secureRegistry.excludePathPatterns("/information/**");
//        secureRegistry.excludePathPatterns("/shareholder/**");
//        secureRegistry.excludePathPatterns("/member/**");
//        secureRegistry.excludePathPatterns("/honor/**");
//        secureRegistry.excludePathPatterns("/dispatcher/**");
//        secureRegistry.excludePathPatterns("/employment/**");
//        secureRegistry.excludePathPatterns("/train/**");
//        secureRegistry.excludePathPatterns("/examination/**");
//        secureRegistry.excludePathPatterns("/experience/**");
        secureRegistry.excludePathPatterns("/record/**");
        secureRegistry.excludePathPatterns("/revoke/**");
        secureRegistry.excludePathPatterns("/recordk/**");
        secureRegistry.excludePathPatterns("/jurisdiction/**");
//        secureRegistry.excludePathPatterns("/jurisdiction/**");
        secureRegistry.excludePathPatterns("/permit/**");
        secureRegistry.excludePathPatterns("/car/**");
        secureRegistry.excludePathPatterns("/gun/**");
        secureRegistry.excludePathPatterns("/equipage/**");
        secureRegistry.excludePathPatterns("/blade-user/**");
        secureRegistry.excludePathPatterns("/trainingRegistration/**");
        secureRegistry.excludePathPatterns("/seinspect/**");
        secureRegistry.excludePathPatterns("/coinspect/**");
        secureRegistry.excludePathPatterns("/blade-user/**");
        secureRegistry.excludePathPatterns("/pushMsg/**");
        secureRegistry.excludePathPatterns("/owner/**");
        secureRegistry.excludePathPatterns("/friend/**");
        secureRegistry.excludePathPatterns("/chat-records/**");
        secureRegistry.excludePathPatterns("/chatgroup/**");
        secureRegistry.excludePathPatterns("/chatgroupc/**");
        secureRegistry.excludePathPatterns("/zc/**");
//        secureRegistry.excludePathPatterns("/car/**");
//        secureRegistry.excludePathPatterns("/gun/**");
//        secureRegistry.excludePathPatterns("/equipage/**");
//        secureRegistry.excludePathPatterns("/blade-user/**");
//        secureRegistry.excludePathPatterns("/trainingRegistration/**");
//        secureRegistry.excludePathPatterns("/seinspect/**");
//        secureRegistry.excludePathPatterns("/coinspect/**");
//        secureRegistry.excludePathPatterns("/blade-user/**");
//        secureRegistry.excludePathPatterns("/pushMsg/**");
//        secureRegistry.excludePathPatterns("/owner/**");
//        secureRegistry.excludePathPatterns("/friend/**");
//        secureRegistry.excludePathPatterns("/chat-records/**");
//        secureRegistry.excludePathPatterns("/chatgroup/**");
//        secureRegistry.excludePathPatterns("/chatgroupc/**");
//        secureRegistry.excludePathPatterns("/zc/**");
        secureRegistry.excludePathPatterns("/licet/**");
        secureRegistry.excludePathPatterns("/licetuser/**");
        secureRegistry.excludePathPatterns("/locus/**");
        return secureRegistry;
    }


 src/main/java/org/springblade/common/config/FtpConfig.java

@@ -62,6 +62,17 @@
    public static String jsonUrl;


    /**
     * 数据库连接用户名
     */
    public static String username;

    /**
     * 数据库连接密码
     */
    public static String password;


    public void setSqlConnect(String sqlConnect) {
        FtpConfig.sqlConnect = sqlConnect;
    }
@@ -97,4 +108,12 @@
    public void setJsonUrl(String jsonUrl) {
        FtpConfig.jsonUrl = jsonUrl;
    }

    public void setUsername(String username) {
        FtpConfig.username = username;
    }

    public void setPassword(String password) {
        FtpConfig.password = password;
    }
}

 src/main/java/org/springblade/modules/FTP/MysqlCenlint.java

@@ -1,14 +1,15 @@
package org.springblade.modules.FTP;


import org.springblade.common.config.FtpConfig;

import java.io.File;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.PreparedStatement;
import java.sql.SQLException;

import static org.springblade.common.config.FtpConfig.localPath;
import static org.springblade.common.config.FtpConfig.sqlConnect;
import static org.springblade.common.config.FtpConfig.*;


public class MysqlCenlint {
@@ -23,8 +24,8 @@
            //int RowCount;
            String driver = "com.mysql.jdbc.Driver";
            String url = sqlConnect; //换成要连接的数据库信息
            String user = "root";
            String password = "zhba0728";
            String user = username;
            String password = FtpConfig.password;
            Class.forName ( driver );
            Connection conn = (Connection) DriverManager.getConnection ( url, user, password );
            if (!conn.isClosed ()) {
@@ -52,8 +53,8 @@
            //int RowCount;
            String driver = "com.mysql.jdbc.Driver";
            String url = sqlConnect; //换成要连接的数据库信息
            String user = "root";
            String password = "zhba0728";
            String user = username;
            String password = FtpConfig.password;
            Class.forName ( driver );
            Connection conn = (Connection) DriverManager.getConnection ( url, user, password );
            if (!conn.isClosed ()) {
@@ -81,8 +82,8 @@
            //int RowCount;
            String driver = "com.mysql.jdbc.Driver";
            String url = sqlConnect; //换成要连接的数据库信息
            String user = "root";
            String password = "zhba0728";
            String user = username;
            String password = FtpConfig.password;
            Class.forName ( driver );
            Connection conn = (Connection) DriverManager.getConnection ( url, user, password );
            if (!conn.isClosed ()) {

 src/main/resources/application-dev.yml

@@ -15,7 +15,7 @@
    # MySql
    url: jdbc:mysql://localhost:2083/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
    username: root
    password: zhba0728
    password: ZHba@0112

    # PostgreSQL
    #url: jdbc:postgresql://127.0.0.1:5432/bladex_boot
@@ -48,6 +48,8 @@
  localPath: /home/zhongsong/anbao/
  ip: http://47.49.36.190:9000
  jsonUrl: /home/zhongsong/anbao/
  username: root
  password: ZHba@0112

#第三方登陆
social:

 src/main/resources/application-prod.yml

@@ -15,7 +15,7 @@
    # MySql
    url: jdbc:mysql://223.82.109.183:2083/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
    username: root
    password: zhba0728
    password: ZHba@0112

    # PostgreSQL
    #url: jdbc:postgresql://127.0.0.1:5432/bladex_boot
@@ -48,6 +48,8 @@
  localPath: D:\\anbao\\
  ip: http://223.82.109.183:2081
  jsonUrl: D:\\anbao\\
  username: root
  password: ZHba@0112

#第三方登陆
social:

 src/main/resources/application-test.yml

@@ -15,7 +15,7 @@
    # MySql
    url: jdbc:mysql://223.82.109.183:2083/zhbaw-test?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
    username: root
    password: zhba0728
    password: ZHba@0112

    # PostgreSQL
    #url: jdbc:postgresql://127.0.0.1:5432/bladex_boot
@@ -48,6 +48,8 @@
  localPath: D:\\anbao\\
  ip: http://223.82.109.183:2081
  jsonUrl: D:\\anbao\\
  username: root
  password: ZHba@0112

#第三方登陆
social:

 src/main/resources/application.yml

@@ -193,29 +193,15 @@
    #接口放行
    skip-url:
      - /blade-test/**
      - /recruitment/**
      - /dispatcherUnit/**
      - /dispatcher/**
      - /equipage/**
      - /car/**
      - /gun/**
      - /trainingRegistration/**
      - /workReport/**
      - /examSubjectChoices/**
      - /exampaper/**
      - /examScore/**
      - /exampaper/**
      - /apply/**
      - /trainExam/**
      - /blade-desk/**
      - /directive/**
      - /blade-system/**
      - /blade-user/**
      - /blade-resource/**
      - /liveLocation/**
      - /blade-system/dept/selectInfo
      - /blade-user/zc
      - /jurisdiction/lazy-trees
      - /blade-resource/oss/endpoint/put-files
      - /qrCode/**
      - /blade-resource/attach/detail
      - /accreditationRecords/export-security-paper
      - /registerUnit/save
      - /zc/inster
      - /apply/getApplyDetailList


    #授权认证配置

			@@ -53,39 +53,38 @@
			secureRegistry.excludePathPatterns("/webjars/**");
			secureRegistry.excludePathPatterns("/swagger-resources/**");
			secureRegistry.excludePathPatterns("/druid/**");
			secureRegistry.excludePathPatterns("/performance/**");
			secureRegistry.excludePathPatterns("/information/**");
			secureRegistry.excludePathPatterns("/shareholder/**");
			secureRegistry.excludePathPatterns("/member/**");
			secureRegistry.excludePathPatterns("/honor/**");
			secureRegistry.excludePathPatterns("/dispatcher/**");
			secureRegistry.excludePathPatterns("/employment/**");
			secureRegistry.excludePathPatterns("/train/**");
			secureRegistry.excludePathPatterns("/examination/**");
			secureRegistry.excludePathPatterns("/experience/**");
			// secureRegistry.excludePathPatterns("/performance/**");
			// secureRegistry.excludePathPatterns("/information/**");
			// secureRegistry.excludePathPatterns("/shareholder/**");
			// secureRegistry.excludePathPatterns("/member/**");
			// secureRegistry.excludePathPatterns("/honor/**");
			// secureRegistry.excludePathPatterns("/dispatcher/**");
			// secureRegistry.excludePathPatterns("/employment/**");
			// secureRegistry.excludePathPatterns("/train/**");
			// secureRegistry.excludePathPatterns("/examination/**");
			// secureRegistry.excludePathPatterns("/experience/**");
			secureRegistry.excludePathPatterns("/record/**");
			secureRegistry.excludePathPatterns("/revoke/**");
			secureRegistry.excludePathPatterns("/recordk/**");
			secureRegistry.excludePathPatterns("/jurisdiction/**");
			// secureRegistry.excludePathPatterns("/jurisdiction/**");
			secureRegistry.excludePathPatterns("/permit/**");
			secureRegistry.excludePathPatterns("/car/**");
			secureRegistry.excludePathPatterns("/gun/**");
			secureRegistry.excludePathPatterns("/equipage/**");
			secureRegistry.excludePathPatterns("/blade-user/**");
			secureRegistry.excludePathPatterns("/trainingRegistration/**");
			secureRegistry.excludePathPatterns("/seinspect/**");
			secureRegistry.excludePathPatterns("/coinspect/**");
			secureRegistry.excludePathPatterns("/blade-user/**");
			secureRegistry.excludePathPatterns("/pushMsg/**");
			secureRegistry.excludePathPatterns("/owner/**");
			secureRegistry.excludePathPatterns("/friend/**");
			secureRegistry.excludePathPatterns("/chat-records/**");
			secureRegistry.excludePathPatterns("/chatgroup/**");
			secureRegistry.excludePathPatterns("/chatgroupc/**");
			secureRegistry.excludePathPatterns("/zc/**");
			// secureRegistry.excludePathPatterns("/car/**");
			// secureRegistry.excludePathPatterns("/gun/**");
			// secureRegistry.excludePathPatterns("/equipage/**");
			// secureRegistry.excludePathPatterns("/blade-user/**");
			// secureRegistry.excludePathPatterns("/trainingRegistration/**");
			// secureRegistry.excludePathPatterns("/seinspect/**");
			// secureRegistry.excludePathPatterns("/coinspect/**");
			// secureRegistry.excludePathPatterns("/blade-user/**");
			// secureRegistry.excludePathPatterns("/pushMsg/**");
			// secureRegistry.excludePathPatterns("/owner/**");
			// secureRegistry.excludePathPatterns("/friend/**");
			// secureRegistry.excludePathPatterns("/chat-records/**");
			// secureRegistry.excludePathPatterns("/chatgroup/**");
			// secureRegistry.excludePathPatterns("/chatgroupc/**");
			// secureRegistry.excludePathPatterns("/zc/**");
			secureRegistry.excludePathPatterns("/licet/**");
			secureRegistry.excludePathPatterns("/licetuser/**");
			secureRegistry.excludePathPatterns("/locus/**");
			return secureRegistry;
			}

			@@ -62,6 +62,17 @@
			public static String jsonUrl;


			/**
			* 数据库连接用户名
			*/
			public static String username;

			/**
			* 数据库连接密码
			*/
			public static String password;


			public void setSqlConnect(String sqlConnect) {
			FtpConfig.sqlConnect = sqlConnect;
			}
			@@ -97,4 +108,12 @@
			public void setJsonUrl(String jsonUrl) {
			FtpConfig.jsonUrl = jsonUrl;
			}

			public void setUsername(String username) {
			FtpConfig.username = username;
			}

			public void setPassword(String password) {
			FtpConfig.password = password;
			}
			}

			@@ -1,14 +1,15 @@
			package org.springblade.modules.FTP;


			import org.springblade.common.config.FtpConfig;

			import java.io.File;
			import java.sql.Connection;
			import java.sql.DriverManager;
			import java.sql.PreparedStatement;
			import java.sql.SQLException;

			import static org.springblade.common.config.FtpConfig.localPath;
			import static org.springblade.common.config.FtpConfig.sqlConnect;
			import static org.springblade.common.config.FtpConfig.*;


			public class MysqlCenlint {
			@@ -23,8 +24,8 @@
			//int RowCount;
			String driver = "com.mysql.jdbc.Driver";
			String url = sqlConnect; //换成要连接的数据库信息
			String user = "root";
			String password = "zhba0728";
			String user = username;
			String password = FtpConfig.password;
			Class.forName ( driver );
			Connection conn = (Connection) DriverManager.getConnection ( url, user, password );
			if (!conn.isClosed ()) {
			@@ -52,8 +53,8 @@
			//int RowCount;
			String driver = "com.mysql.jdbc.Driver";
			String url = sqlConnect; //换成要连接的数据库信息
			String user = "root";
			String password = "zhba0728";
			String user = username;
			String password = FtpConfig.password;
			Class.forName ( driver );
			Connection conn = (Connection) DriverManager.getConnection ( url, user, password );
			if (!conn.isClosed ()) {
			@@ -81,8 +82,8 @@
			//int RowCount;
			String driver = "com.mysql.jdbc.Driver";
			String url = sqlConnect; //换成要连接的数据库信息
			String user = "root";
			String password = "zhba0728";
			String user = username;
			String password = FtpConfig.password;
			Class.forName ( driver );
			Connection conn = (Connection) DriverManager.getConnection ( url, user, password );
			if (!conn.isClosed ()) {

			@@ -15,7 +15,7 @@
			# MySql
			url: jdbc:mysql://localhost:2083/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
			username: root
			password: zhba0728
			password: ZHba@0112

			# PostgreSQL
			#url: jdbc:postgresql://127.0.0.1:5432/bladex_boot
			@@ -48,6 +48,8 @@
			localPath: /home/zhongsong/anbao/
			ip: http://47.49.36.190:9000
			jsonUrl: /home/zhongsong/anbao/
			username: root
			password: ZHba@0112

			#第三方登陆
			social:

			@@ -15,7 +15,7 @@
			# MySql
			url: jdbc:mysql://223.82.109.183:2083/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
			username: root
			password: zhba0728
			password: ZHba@0112

			# PostgreSQL
			#url: jdbc:postgresql://127.0.0.1:5432/bladex_boot
			@@ -48,6 +48,8 @@
			localPath: D:\\anbao\\
			ip: http://223.82.109.183:2081
			jsonUrl: D:\\anbao\\
			username: root
			password: ZHba@0112

			#第三方登陆
			social:

			@@ -193,29 +193,15 @@
			#接口放行
			skip-url:
			- /blade-test/**
			- /recruitment/**
			- /dispatcherUnit/**
			- /dispatcher/**
			- /equipage/**
			- /car/**
			- /gun/**
			- /trainingRegistration/**
			- /workReport/**
			- /examSubjectChoices/**
			- /exampaper/**
			- /examScore/**
			- /exampaper/**
			- /apply/**
			- /trainExam/**
			- /blade-desk/**
			- /directive/**
			- /blade-system/**
			- /blade-user/**
			- /blade-resource/**
			- /liveLocation/**
			- /blade-system/dept/selectInfo
			- /blade-user/zc
			- /jurisdiction/lazy-trees
			- /blade-resource/oss/endpoint/put-files
			- /qrCode/**
			- /blade-resource/attach/detail
			- /accreditationRecords/export-security-paper
			- /registerUnit/save
			- /zc/inster
			- /apply/getApplyDetailList


			#授权认证配置