Skip to content

H
hnxtbaboot
Commit 3d7ab2ae by wuchengwu
Options

配置文件不一致问题修改

parent d30c249a
Showing with 39 additions and 78 deletions
pom.xml
......@@ -68,36 +68,10 @@
<!-- 布局功能的支持程序 thymeleaf3主程序 layout2以上版本 -->
<!-- thymeleaf2 layout1-->
<thymeleaf-layout-dialect.version>2.2.2</thymeleaf-layout-dialect.version>
<blade.tool.version>3.0.3</blade.tool.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-tool</artifactId>
<version>${blade.tool.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.12.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.12.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.12.0</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
......@@ -288,16 +262,6 @@
<artifactId>netty-socketio</artifactId>
<version>1.7.7</version>
</dependency>
<dependency>
<groupId>com.github.ulisesbocchio</groupId>
<artifactId>jasypt-spring-boot</artifactId>
<version>3.0.3</version>
</dependency>
<dependency>
<groupId>com.github.ulisesbocchio</groupId>
<artifactId>jasypt-spring-boot-starter</artifactId>
<version>3.0.3</version>
</dependency>
</dependencies>
<build>
......
src/main/java/com/founder/controller/DemoController.java
......@@ -15,7 +15,7 @@ import com.founder.service.IParamService;
import com.founder.service.ITbRyRyzpService;
import com.founder.utils.EasyUIPage;
import com.founder.utils.SysUitl;
import org.jasypt.encryption.StringEncryptor;
//import org.jasypt.encryption.StringEncryptor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -64,21 +64,21 @@ public class DemoController {
@Autowired
private ITbRyRyzpService tbRyRyzpService;
@Autowired
StringEncryptor encryptor;
// @Autowired
// StringEncryptor encryptor;
@RequestMapping("/getJasypt")
@ResponseBody
public String getJasypt(@RequestParam("type") String type, @RequestParam("value") String value) {
if ("en".equals(type)) {
value = encryptor.encrypt(value);
System.out.println("加密后：" + value);
}else if ("de".equals(type)) {
value = encryptor.decrypt(value);
System.out.println("解密后：" + value);
}
return "value="+value;
}
// @RequestMapping("/getJasypt")
// @ResponseBody
// public String getJasypt(@RequestParam("type") String type, @RequestParam("value") String value) {
// if ("en".equals(type)) {
// value = encryptor.encrypt(value);
// System.out.println("加密后：" + value);
// }else if ("de".equals(type)) {
// value = encryptor.decrypt(value);
// System.out.println("解密后：" + value);
// }
// return "value="+value;
// }
@RequestMapping("/test")
@ResponseBody
......
src/main/java/com/founder/login/service/impl/LoginServiceImpl.java
......@@ -8,7 +8,7 @@ import com.founder.model.UserPower;
import com.founder.model.XzxtRestResult;
import com.founder.utils.Base64PasswordEncrypter;
import org.apache.commons.lang.StringUtils;
import org.springblade.core.tool.utils.DigestUtil;
//import org.springblade.core.tool.utils.DigestUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -61,9 +61,9 @@ public class LoginServiceImpl implements LoginService {
return user;
}
//psw= Base64.getEncoder().encodeToString(psw.getBytes());
//Base64PasswordEncrypter base = new Base64PasswordEncrypter();
//psw = base.encryptPassword(psw);
psw = DigestUtil.encrypt(psw);
Base64PasswordEncrypter base = new Base64PasswordEncrypter();
psw = base.encryptPassword(psw);
// psw = DigestUtil.encrypt(psw);
param.put("userName",userName);
param.put("password",psw);
user=loginDao.queryUserByName(param);
......
src/main/resources/application-dev.properties
......@@ -15,71 +15,68 @@ spring.thymeleaf.cache=false
#?指定sql映射文件
mybatis.mapperLocations=classpath:mapper/*.xml
jasypt.encryptor.algorithm: PBEWithMD5AndDES
jasypt.encryptor.iv-generator-classname: org.jasypt.iv.NoIvGenerator
jasypt.encryptor.password: xtba-report
#协同数据源配置
spring.datasource.xzxtdb.url=jdbc:oracle:thin:@127.0.0.1:1521:ORCL
spring.datasource.xzxtdb.username=ENC(h9d/u+bhR4tkrWih6C/7cQ==)
spring.datasource.xzxtdb.password=ENC(h9d/u+bhR4tkrWih6C/7cQ==)
spring.datasource.xzxtdb.username=XZXT
spring.datasource.xzxtdb.password=XZXT
spring.datasource.xzxtdb.driver-class-name=oracle.jdbc.driver.OracleDriver
spring.datasource.xzxtdb.type: com.alibaba.druid.pool.DruidDataSource
#指纹数据源配置
spring.datasource.amsisdb.url=jdbc:oracle:thin:@127.0.0.1:1521:ORCL
spring.datasource.amsisdb.username=ENC(h9d/u+bhR4tkrWih6C/7cQ==)
spring.datasource.amsisdb.password=ENC(h9d/u+bhR4tkrWih6C/7cQ==)
spring.datasource.amsisdb.username=XZXT
spring.datasource.amsisdb.password=XZXT
spring.datasource.amsisdb.driver-class-name=oracle.jdbc.driver.OracleDriver
spring.datasource.amsisdb.type: com.alibaba.druid.pool.DruidDataSource
spring.datasource.amsisryzwdb.url=jdbc:oracle:thin:@127.0.0.1:1521:ORCL
spring.datasource.amsisryzwdb.username=ENC(h9d/u+bhR4tkrWih6C/7cQ==)
spring.datasource.amsisryzwdb.password=ENC(h9d/u+bhR4tkrWih6C/7cQ==)
spring.datasource.amsisryzwdb.username=XZXT
spring.datasource.amsisryzwdb.password=XZXT
spring.datasource.amsisryzwdb.driver-class-name=oracle.jdbc.driver.OracleDriver
spring.datasource.amsisryzwdb.type: com.alibaba.druid.pool.DruidDataSource
spring.datasource.amsisAjzwdb.url=jdbc:oracle:thin:@127.0.0.1:1521:ORCL
spring.datasource.amsisAjzwdb.username=ENC(h9d/u+bhR4tkrWih6C/7cQ==)
spring.datasource.amsisAjzwdb.password=ENC(h9d/u+bhR4tkrWih6C/7cQ==)
spring.datasource.amsisAjzwdb.username=XZXT
spring.datasource.amsisAjzwdb.password=XZXT
spring.datasource.amsisAjzwdb.driver-class-name=oracle.jdbc.driver.OracleDriver
spring.datasource.amsisAjzwdb.type: com.alibaba.druid.pool.DruidDataSource
#省厅指纹数据源配置
spring.datasource.stamsisdb.url=jdbc:oracle:thin:@127.0.0.1:1521:ORCL
spring.datasource.stamsisdb.username=ENC(h9d/u+bhR4tkrWih6C/7cQ==)
spring.datasource.stamsisdb.password=ENC(h9d/u+bhR4tkrWih6C/7cQ==)
spring.datasource.stamsisdb.username=XZXT
spring.datasource.stamsisdb.password=XZXT
spring.datasource.stamsisdb.driver-class-name=oracle.jdbc.driver.OracleDriver
spring.datasource.stamsisdb.type: com.alibaba.druid.pool.DruidDataSource
spring.datasource.stamsisryzwdb.url=jdbc:oracle:thin:@127.0.0.1:1521:ORCL
spring.datasource.stamsisryzwdb.username=ENC(h9d/u+bhR4tkrWih6C/7cQ==)
spring.datasource.stamsisryzwdb.password=ENC(h9d/u+bhR4tkrWih6C/7cQ==)
spring.datasource.stamsisryzwdb.username=XZXT
spring.datasource.stamsisryzwdb.password=XZXT
spring.datasource.stamsisryzwdb.driver-class-name=oracle.jdbc.driver.OracleDriver
spring.datasource.stamsisryzwdb.type: com.alibaba.druid.pool.DruidDataSource
spring.datasource.stamsisajzwdb.url=jdbc:oracle:thin:@127.0.0.1:1521:ORCL
spring.datasource.stamsisajzwdb.username=ENC(h9d/u+bhR4tkrWih6C/7cQ==)
spring.datasource.stamsisajzwdb.password=ENC(h9d/u+bhR4tkrWih6C/7cQ==)
spring.datasource.stamsisajzwdb.username=XZXT
spring.datasource.stamsisajzwdb.password=XZXT
spring.datasource.stamsisajzwdb.driver-class-name=oracle.jdbc.driver.OracleDriver
spring.datasource.stamsisajzwdb.type: com.alibaba.druid.pool.DruidDataSource
#警综数据源配置（山西使用）
spring.datasource.jwzhdb.url=jdbc:oracle:thin:@127.0.0.1:1521:ORCL
spring.datasource.jwzhdb.username=ENC(h9d/u+bhR4tkrWih6C/7cQ==)
spring.datasource.jwzhdb.password=ENC(h9d/u+bhR4tkrWih6C/7cQ==)
spring.datasource.jwzhdb.username=XZXT
spring.datasource.jwzhdb.password=XZXT
spring.datasource.jwzhdb.driver-class-name=oracle.jdbc.driver.OracleDriver
spring.datasource.jwzhdb.type: com.alibaba.druid.pool.DruidDataSource
#在逃数据源配置
spring.datasource.ztrydb.url=jdbc:oracle:thin:@127.0.0.1:1521:ORCL
spring.datasource.ztrydb.username=ENC(h9d/u+bhR4tkrWih6C/7cQ==)
spring.datasource.ztrydb.password=ENC(h9d/u+bhR4tkrWih6C/7cQ==)
spring.datasource.ztrydb.username=XZXT
spring.datasource.ztrydb.password=XZXT
spring.datasource.ztrydb.driver-class-name=oracle.jdbc.driver.OracleDriver
spring.datasource.ztrydb.type: com.alibaba.druid.pool.DruidDataSource
#海南刑专数据源配置
spring.datasource.hnxzxtdb.url=jdbc:oracle:thin:@127.0.0.1:1521:ORCL
spring.datasource.hnxzxtdb.username=ENC(h9d/u+bhR4tkrWih6C/7cQ==)
spring.datasource.hnxzxtdb.password=ENC(h9d/u+bhR4tkrWih6C/7cQ==)
spring.datasource.hnxzxtdb.username=XZXT
spring.datasource.hnxzxtdb.password=XZXT
spring.datasource.hnxzxtdb.driver-class-name=oracle.jdbc.driver.OracleDriver
spring.datasource.hnxzxtdb.type: com.alibaba.druid.pool.DruidDataSource
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment