dengsixing 9 mesiacov pred
rodič
commit
82bedb8121

+ 31 - 3
pom.xml

@@ -55,11 +55,39 @@
       <artifactId>jackson-databind</artifactId>
       <version>2.10.3</version>
     </dependency>
+
     <dependency>
-      <groupId>com.fdkankan</groupId>
-      <artifactId>4dkankan-utils-db</artifactId>
-      <version>3.0.0-SNAPSHOT</version>
+      <groupId>com.baomidou</groupId>
+      <artifactId>mybatis-plus-boot-starter</artifactId>
+      <scope>compile</scope>
+      <version>3.4.3.4</version>
+    </dependency>
+
+    <!--mybatis-plus代码生成器-->
+    <dependency>
+      <groupId>com.baomidou</groupId>
+      <artifactId>mybatis-plus-generator</artifactId>
+      <scope>compile</scope>
+      <version>3.5.1</version>
+    </dependency>
+
+    <!--velocity模板-->
+    <dependency>
+      <groupId>org.apache.velocity</groupId>
+      <artifactId>velocity-engine-core</artifactId>
+      <version>2.3</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.dameng</groupId>
+      <artifactId>DmJdbcDriver18</artifactId>
+      <version>8.1.3.140</version>
     </dependency>
+<!--    <dependency>-->
+<!--      <groupId>com.fdkankan</groupId>-->
+<!--      <artifactId>4dkankan-utils-db</artifactId>-->
+<!--      <version>3.0.0-SNAPSHOT</version>-->
+<!--    </dependency>-->
     <dependency>
       <groupId>org.yaml</groupId>
       <artifactId>snakeyaml</artifactId>

+ 0 - 40
src/main/resources/bootstrap-dev.yml

@@ -1,40 +0,0 @@
-spring:
-  cloud:
-    nacos:
-      config:
-        username: nacos
-        password: Nacos4Dage.
-        server-addr: 113.90.147.118:8848
-        file-extension: yaml
-        namespace: 4dkankan-dev
-        extension-configs:
-          - data-id: 4dkankan-center-modeling-control.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-        shared-configs:
-          - data-id: common-db-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-redis-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-rabbitmq-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-fyun-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-scaling.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-      discovery:
-        server-addr: ${spring.cloud.nacos.config.server-addr}
-        namespace: ${spring.cloud.nacos.config.namespace}

+ 0 - 44
src/main/resources/bootstrap-prod.yml

@@ -1,44 +0,0 @@
-spring:
-  cloud:
-    nacos:
-      username: nacos
-      password: Nacos4Dage.
-      config:
-        server-addr: 192.168.1.105:8848
-        file-extension: yaml
-        namespace: prod
-        extension-configs:
-          - data-id: 4dkankan-center-modeling-control.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-        shared-configs:
-          - data-id: common-db-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-redis-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-rabbitmq-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-fyun-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-scaling.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-logback-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-      discovery:
-        server-addr: ${spring.cloud.nacos.config.server-addr}
-        namespace: ${spring.cloud.nacos.config.namespace}

+ 0 - 45
src/main/resources/bootstrap-test.yml

@@ -1,45 +0,0 @@
-spring:
-  cloud:
-    nacos:
-      config:
-        username: nacos
-        password: Nacos4Dage.
-        server-addr: 113.90.147.118:8848
-        file-extension: yaml
-        namespace: 4dkankan-v4-test
-        extension-configs:
-          - data-id: 4dkankan-center-modeling-control.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-        shared-configs:
-          - data-id: common-db-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-redis-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-rabbitmq-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-fyun-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-logback-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-      discovery:
-        server-addr: ${spring.cloud.nacos.config.server-addr}
-        namespace: ${spring.cloud.nacos.config.namespace}
-
-
-
-
-

+ 42 - 3
src/main/resources/bootstrap.yml

@@ -1,5 +1,44 @@
 spring:
-  profiles:
-    active: test
   application:
-    name: model-control
+    name: modeling-control
+  cloud:
+    nacos:
+      server-addr: 192.168.0.25:8848
+      namespace: zgwhzx
+      config:
+        file-extension: yaml
+        namespace: zgwhzx
+        extension-configs:
+          - data-id: 4dkankan-center-modeling-control.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+        shared-configs:
+          - data-id: common-db-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-redis-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-rabbitmq-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-fyun-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-scaling.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-logback-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+      discovery:
+        namespace: ${spring.cloud.nacos.config.namespace}