Merge branch 'master' of gitee.com:ccsens_s/ccsenscloud

cloudutil/src/main/resources/application-util-dev.yml

@@ -20,7 +20,7 @@ eureka:
     service-url:
       # 指定eureka server通信地址，注意/eureka/小尾巴不能少
       #defaultZone: http://admin:admin@peer1:8761/eureka/,http://admin:admin@peer2:8762/eureka/
-      defaultZone: http://admin:admin@49.233.89.188:7010/eureka/
+      defaultZone: http://admin:admin@test.tall.wiki:7010/eureka/
   instance:
     # 是否注册IP到eureka server，如不指定或设为false，那就回注册主机名到eureka server
     prefer-ip-address: true

ht/src/main/java/com/ccsens/ht/api/IndexController.java

@@ -51,8 +51,7 @@ public class IndexController {
 
     @RequestMapping({"","/","/index"})
     public String index(){
-        System.out.println("+++++++++++++++++++++++++++++++++:" + PropUtil.domain);
+        return "hello ht" ;
-        return "hello world:";
     }
 
 }

ht/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: dev
+    active: test
-    include: common, util-dev
+    include: common, util-test

ht/src/main/resources/druid-dev.yml

@@ -2,7 +2,7 @@ spring:
   datasource:
     druid:
       connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-      driverClassName: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
       dynamicUrl: jdbc:mysql://localhost:3306/${schema}
       filterExclusions: '*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*'
       filterName: druidFilter
@@ -15,7 +15,7 @@ spring:
       maxWait: 60000
       minEvictableIdleTimeMillis: 300000
       minIdle: 5
-      password: po3OynBO[M3579p6L7)o
+      password: b3fd300ad4694070007fdcca961c4018211dc53235dd806ad62abc0cc0abb8e5
       poolPreparedStatements: true
       servletLogSlowSql: true
       servletLoginPassword: 111111
@@ -30,3 +30,4 @@ spring:
       url: jdbc:mysql://49.233.89.188:3306/ht?useUnicode=true&characterEncoding=UTF-8
       username: root
       validationQuery: SELECT 1 FROM DUAL
+      env: CCSENS_HT

ht/src/main/resources/druid-prod.yml

@@ -2,7 +2,7 @@ spring:
   datasource:
     druid:
       connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-      driverClassName: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
       dynamicUrl: jdbc:mysql://localhost:3306/${schema}
       filterExclusions: '*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*'
       filterName: druidFilter
@@ -30,3 +30,4 @@ spring:
       url: jdbc:mysql://api.ccsens.com/pt_pro?useUnicode=true&characterEncoding=UTF-8
       username: root
       validationQuery: SELECT 1 FROM DUAL
+      env: CCSENS_HT

ht/src/main/resources/druid-test.yml

@@ -2,7 +2,7 @@ spring:
   datasource:
     druid:
       connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-      driverClassName: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
       dynamicUrl: jdbc:mysql://localhost:3306/${schema}
       filterExclusions: '*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*'
       filterName: druidFilter
@@ -15,7 +15,7 @@ spring:
       maxWait: 60000
       minEvictableIdleTimeMillis: 300000
       minIdle: 5
-      password: po3OynBO[M3579p6L7)o
+      password: c011b9b90306f0b9e24362519176551f5f9be6b4130ad2834b92c3a468273ed5
       poolPreparedStatements: true
       servletLogSlowSql: true
       servletLoginPassword: 111111
@@ -27,6 +27,7 @@ spring:
       testOnReturn: false
       testWhileIdle: true
       timeBetweenEvictionRunsMillis: 60000
-      url: jdbc:mysql://127.0.0.1:3306/ht?useUnicode=true&characterEncoding=UTF-8
+      url: jdbc:mysql://49.233.89.188:3306/ht?useUnicode=true&characterEncoding=UTF-8
       username: root
       validationQuery: SELECT 1 FROM DUAL
+      env: CCSENS_HT

tall/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: dev
+    active: test
-    include: util-dev,common
+    include: util-test,common

tall/src/main/resources/druid-dev.yml

@@ -2,7 +2,7 @@ spring:
   datasource:
     druid:
       connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-      driverClassName: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
       dynamicUrl: jdbc:mysql://localhost:3306/${schema}
       filterExclusions: '*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*'
       filterName: druidFilter
@@ -15,7 +15,7 @@ spring:
       maxWait: 60000
       minEvictableIdleTimeMillis: 300000
       minIdle: 5
-      password: po3OynBO[M3579p6L7)o
+      password: 68073a279b399baa1fa12cf39bfbb65bfc1480ffee7b659ccc81cf19be8c4473
       poolPreparedStatements: true
       servletLogSlowSql: true
       servletLoginPassword: 111111
@@ -30,3 +30,4 @@ spring:
       url: jdbc:mysql://49.233.89.188:3306/tall?useUnicode=true&characterEncoding=UTF-8
       username: root
       validationQuery: SELECT 1 FROM DUAL
+      env: CCSENS_TALL

tall/src/main/resources/druid-prod.yml

@@ -2,7 +2,7 @@ spring:
   datasource:
     druid:
       connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-      driverClassName: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
       dynamicUrl: jdbc:mysql://localhost:3306/${schema}
       filterExclusions: '*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*'
       filterName: druidFilter
@@ -30,3 +30,4 @@ spring:
       url: jdbc:mysql://api.ccsens.com/pt_pro?useUnicode=true&characterEncoding=UTF-8
       username: root
       validationQuery: SELECT 1 FROM DUAL
+      env: CCSENS_TALL

tall/src/main/resources/druid-test.yml

@@ -2,7 +2,7 @@ spring:
   datasource:
     druid:
       connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-      driverClassName: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
       dynamicUrl: jdbc:mysql://localhost:3306/${schema}
       filterExclusions: '*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*'
       filterName: druidFilter
@@ -15,7 +15,7 @@ spring:
       maxWait: 60000
       minEvictableIdleTimeMillis: 300000
       minIdle: 5
-      password: po3OynBO[M3579p6L7)o
+      password: 25e15ffd05a0123690625e1817563ba75fbd93016d888c84fbb4c849b58dafeb
       poolPreparedStatements: true
       servletLogSlowSql: true
       servletLoginPassword: 111111
@@ -30,3 +30,4 @@ spring:
       url: jdbc:mysql://49.233.89.188:3306/tall?useUnicode=true&characterEncoding=UTF-8
       username: root
       validationQuery: SELECT 1 FROM DUAL
+      env: CCSENS_TALL

util/src/main/java/com/ccsens/util/config/DruidProps.java

@@ -1,6 +1,11 @@
 package com.ccsens.util.config;
 
+import cn.hutool.core.codec.Base64;
+import cn.hutool.core.util.CharsetUtil;
+import cn.hutool.crypto.symmetric.SymmetricAlgorithm;
+import cn.hutool.crypto.symmetric.SymmetricCrypto;
 import com.alibaba.druid.pool.DruidDataSource;
+import com.ccsens.util.PropUtil;
 import com.ccsens.util.WebConstant;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -50,12 +55,19 @@ public class DruidProps {
     private String filterExclusions;
     private String filterProfileEnable;
 
+    private String env;
+
     public DataSource createDruidDataSource() {
         DruidDataSource datasource = new DruidDataSource();
 
         datasource.setUrl(url);
         datasource.setUsername(username);
-        datasource.setPassword(password);
+        String key = System.getenv(env);
+//        String key = System.getenv("CCSENS_HT_PROD");
+        SymmetricCrypto aes = new SymmetricCrypto(SymmetricAlgorithm.AES, Base64.decode(key));
+        //解密为字符串
+        String decryptStr = aes.decryptStr(password, CharsetUtil.CHARSET_UTF_8);
+        datasource.setPassword(decryptStr);
         datasource.setDriverClassName(driverClassName);
 
         //configuration
@@ -356,4 +368,12 @@ public class DruidProps {
     public void setFilterProfileEnable(String filterProfileEnable) {
         this.filterProfileEnable = filterProfileEnable;
     }
+
+    public String getEnv() {
+        return env;
+    }
+
+    public void setEnv(String env) {
+        this.env = env;
+    }
 }

util/src/test/java/com/ccsens/util/KeyTest.java

@@ -0,0 +1,45 @@
+package com.ccsens.util;
+
+import cn.hutool.core.codec.Base64;
+import cn.hutool.core.lang.Console;
+import cn.hutool.core.util.CharsetUtil;
+import cn.hutool.crypto.SecureUtil;
+import cn.hutool.crypto.symmetric.SymmetricAlgorithm;
+import cn.hutool.crypto.symmetric.SymmetricCrypto;
+import org.junit.Test;
+
+/**
+ * @description:
+ * @author: wuHuiJuan
+ * @create: 2019/12/05 18:05
+ */
+public class KeyTest {
+    /**生成密钥*/
+//    @Test
+    public void test33(){
+        byte[] key = SecureUtil.generateKey(SymmetricAlgorithm.AES.getValue()).getEncoded();
+        Console.log(Base64.encode(key));
+    }
+    /**加密*/
+//    @Test
+    public void test3(){
+        String key = "密钥";
+        String string = "数据库密码";
+        SymmetricCrypto aes = new SymmetricCrypto(SymmetricAlgorithm.AES, Base64.decode(key));
+        String encryptHex = aes.encryptHex(string);
+        Console.log("{}",encryptHex);
+    }
+
+    /**解密*/
+//    @Test
+    public void test4(){
+        //String key = "YmipVlKParz7ehnEv2K4Dw==";
+        String key = System.getenv("CCSENS_TALL_TEST");
+        String encryptString = "68073a279b399baa1fa12cf39bfbb65bfc1480ffee7b659ccc81cf19be8c4473";
+        SymmetricCrypto aes = new SymmetricCrypto(SymmetricAlgorithm.AES, Base64.decode(key));
+
+        //解密为字符串
+        String decryptStr = aes.decryptStr(encryptString, CharsetUtil.CHARSET_UTF_8);
+        Console.log("{}",decryptStr);
+    }
+}