lianghq 5 år sedan
förälder
incheckning
65dad178a6

+ 1 - 1
blade-common/src/main/java/org/springblade/common/constant/CommonConstant.java

@@ -31,7 +31,7 @@ public interface CommonConstant {
 	/**
 	 * saber 系统名
 	 */
-	String SABER_NAME = "saber";
+	String SABER_NAME = "数字社区";
 
 	/**
 	 * 顶级父节点id

+ 0 - 1
blade-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java

@@ -44,7 +44,6 @@ public class LauncherServiceImpl implements LauncherService {
 
 		// 开启elk日志
 		// PropsUtil.setProperty(props, "blade.log.elk.destination", LauncherConstant.elkAddr(profile));
-
 		// seata注册地址
 		// PropsUtil.setProperty(props, "seata.service.grouplist.default", LauncherConstant.seataAddr(profile));
 		// seata注册group格式

+ 2 - 2
blade-ops/blade-flow-design/src/main/resources/application-dev.yml

@@ -2,9 +2,9 @@
 spring:
   datasource:
     # MySql
-    url: jdbc:mysql://localhost:3306/bladex_flow?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://localhost:3306/blade?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
     username: root
-    password: root
+    password: 123456
     # PostgreSQL
     #url: jdbc:postgresql://127.0.0.1:5432/bladex_flow
     #username: postgres

+ 3 - 3
blade-ops/blade-flow/src/main/resources/application-dev.yml

@@ -1,6 +1,6 @@
 #数据源配置
 spring:
   datasource:
-    url: ${blade.datasource.flow.dev.url}
-    username: ${blade.datasource.flow.dev.username}
-    password: ${blade.datasource.flow.dev.password}
+    url: ${blade.datasource.dev.url}
+    username: ${blade.datasource.dev.username}
+    password: ${blade.datasource.dev.password}

+ 3 - 3
blade-ops/blade-xxljob-admin/src/main/resources/application-dev.yml

@@ -1,7 +1,7 @@
 #数据源配置
 spring:
   datasource:
-    url: ${blade.datasource.job.dev.url}
-    username: ${blade.datasource.job.dev.username}
-    password: ${blade.datasource.job.dev.password}
+    url: ${blade.datasource.dev.url}
+    username: ${blade.datasource.dev.username}
+    password: ${blade.datasource.dev.password}
 

+ 0 - 1
blade-service/blade-desk/pom.xml

@@ -77,5 +77,4 @@
             </plugin>
         </plugins>
     </build>
-
 </project>

+ 1 - 1
doc/nacos/blade-dev.yaml

@@ -43,7 +43,7 @@ blade:
       # MySql
       url: jdbc:mysql://localhost:3306/bladex?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
       username: root
-      password: root
+      password: 123456
       # PostgreSQL
       #url: jdbc:postgresql://127.0.0.1:5432/bladex
       #username: postgres

+ 3 - 17
doc/nacos/routes/blade-gateway-dev.json

@@ -1,28 +1,14 @@
 [
   {
-    "id": "desk-route",
-    "order": 0,
-    "predicates": [
-      {
-        "name": "Path",
-        "args": {
-          "pattern": "/blade-desk/**"
-        }
-      }
-    ],
-    "filters": [],
-    "uri": "lb://blade-desk-me"
-  },
-  {
-    "id": "example-route",
+    "id": "cy-estate",
     "order": 0,
     "predicates": [{
       "name": "Path",
       "args": {
-        "pattern": "/example"
+        "pattern": "/estate/**"
       }
     }],
     "filters": [],
-    "uri": "http://www.example.com"
+    "uri": "http://localhost:801/bladex-estate/"
   }
 ]