소스 검색

material-init-master-yza

yangzian 3 년 전
부모
커밋
92868d9f6e

+ 1 - 1
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/JeecgBootMaterialApplication.java

@@ -10,7 +10,7 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @SpringBootApplication(exclude = {ShiroAnnotationProcessorAutoConfiguration.class, ShiroAutoConfiguration.class, ShiroBeanAutoConfiguration.class})
-@ComponentScan(basePackages = {"org.jeecg", "cn.com.ctop"})
+@ComponentScan(basePackages = {"org.jeecg"})
 @EnableTransactionManagement
 public class JeecgBootMaterialApplication {
     public static void main(String[] args) {

+ 13 - 6
jeecg-boot-material-view/src/main/resources/application-dev.yml

@@ -106,15 +106,15 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://111.206.86.186:3390/application?characterEncoding=UTF-8&useUnicode=true&allowMultiQueries=true&serverTimezone=GMT%2B8
-          username: hcst
-          password: hcst@2021
+#          url: jdbc:mysql://111.206.86.186:3390/application?characterEncoding=UTF-8&useUnicode=true&allowMultiQueries=true&serverTimezone=GMT%2B8
+#          username: hcst
+#          password: hcst@2021
           driver-class-name: com.mysql.jdbc.Driver
           # 多数据源配置
           #multi-datasource1:
-          #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-          #username: root
-          #password: root
+          url: jdbc:mysql://192.168.0.184:3390/jeecg-boot?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          username: hcst
+          password: hcst@2021
           #driver-class-name: com.mysql.cj.jdbc.Driver
   #redis 配置
   redis:
@@ -147,6 +147,13 @@ mybatis-plus:
     call-setters-on-nulls: true
 #jeecg专用配置
 jeecg :
+  oss:
+    secretKey:
+    accessKey:
+  path:
+    webapp:
+    upload:
+
   elasticsearch:
     cluster-name: jeecg-ES
     cluster-nodes: 127.0.0.1:9200