Ver Fonte

合并最新master代码

syh há 5 anos atrás
pai
commit
72b1676216

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java

@@ -408,8 +408,8 @@ public class LoginController {
      */
     @GetMapping(value = "/getEncryptedString")
     public Result<Map<String,String>> getEncryptedString(){
-        Result<Map<String,String>> result = new Result<Map<String,String>>();
-        Map<String,String> map = new HashMap<String,String>();
+        Result<Map<String,String>> result = new Result<>();
+        Map<String,String> map = new HashMap<>();
         map.put("key", EncryptedString.key);
         map.put("iv",EncryptedString.iv);
         result.setResult(map);

+ 22 - 3
jeecg-boot-module-system/src/main/resources/application-wps.yml

@@ -56,7 +56,7 @@ spring:
   autoconfigure:
     exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
-    url: jdbc:mysql://139.186.27.96:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+    url: jdbc:mysql://39.106.184.70:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
     username: hcst
     password: test@20190531
     driver-class-name: com.mysql.jdbc.Driver
@@ -95,7 +95,7 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://139.186.27.96:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          url: jdbc:mysql://39.106.184.70:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
           username: hcst
           password: test@20190531
           driver-class-name: com.mysql.jdbc.Driver
@@ -128,6 +128,24 @@ mybatis-plus:
 #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 #jeecg专用配置
 jeecg:
+  elasticsearch:
+    cluster-nodes:
+    check-enabled: false
+  uploadType:
+  oss:
+    endpoint:
+    accessKey:
+    secretKey:
+    bucketName:
+    staticDomain:
+  sms:
+    accessKeyId:
+    accessKeySecret:
+  minio:
+    minio_url:
+    minio_name:
+    minio_pass:
+    bucketName:
   ffmpeg:
     bin: ffmpeg
   path:
@@ -153,7 +171,8 @@ logging:
 chrome:
   script:
     clean: sh /mnt/webapp/cleanProcess.sh
-
+cas:
+  prefixUrl:
 oss:
   replace:
     replace-value: oss-cn-beijing-internal

+ 2 - 2
jeecg-boot-module-system/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev
+    active: @activatedProperties@
 swagger:
   production: false
   basic:
@@ -27,4 +27,4 @@ justauth:
   cache:
     type: default
     prefix: 'demo::'
-    timeout: 1h
+    timeout: 1h