mdm

dc-mdm/src/main/resources/application.yml

@@ -5,26 +5,26 @@ server:
 log:
     file:
 #        path: C:\workspace\logs
-        path: /home/dc/logs
+        path: /data/service/DC-SERVICE/dc/logs
         name: mdm.log
 datasource:
-    url: 124.70.58.209:1122/dc_test
-    username: admin
-    password: 106aD>>ql95K5S
+    url: 124.70.58.209:18806/dc
+    username: root
+    password: 123.asd
 ###############常用配置项###############
 spring:
     cloud:
-        loadbalancer: 
-            retry: 
+        loadbalancer:
+            retry:
                 enabled: true
     application:
         name: mdm
-    jmx: 
+    jmx:
         enabled: false
-    jackson: 
-        date-format: yyyy-MM-dd HH:mm:ss 
+    jackson:
+        date-format: yyyy-MM-dd HH:mm:ss
         time-zone: GMT+8
-    datasource: 
+    datasource:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: com.mysql.jdbc.Driver
         url: jdbc:mysql://${datasource.url}?characterEncoding=utf8&useSSL=false

dc-mdm/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 #server: localhost
 #port: 9876
-server: 124.70.58.209
+server: 124.71.171.71
 port: 9999
 
 #spring:
@@ -8,7 +8,7 @@ port: 9999
 #        config:
 #            profile: test
 #            label: feature-20180424
-#            discovery: 
+#            discovery:
 #                enabled: true
 #                serviceId: cap-config
 #            failFast: true
@@ -16,4 +16,4 @@ eureka:
     client:
         serviceUrl:
             defaultZone: http://${server}:${port}/eureka
-#        enabled: false
+#        enabled: false

rpm/.idea/compiler.xml

@@ -11,7 +11,7 @@
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>
-      <module name="rpm" target="1.8" />
+      <module name="rpm" target="1.5" />
     </bytecodeTargetLevel>
   </component>
   <component name="JavacSettings">

rpm/.idea/jarRepositories.xml

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="http://124.71.171.71:18881/repository/custom_group/" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="nexus" />
       <option name="name" value="Nexus Repository" />

rpm/rpm.iml

@@ -14,13 +14,15 @@
       <configuration />
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
+    <output url="file://$MODULE_DIR$/${project.build.directory}/classes" />
+    <output-test url="file://$MODULE_DIR$/${project.build.directory}/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/test-classes" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />

rpm/src/main/java/com/ozs/rpm/config/SwaggerConfig.java

@@ -38,7 +38,7 @@ public class SwaggerConfig {
 
 	private List<Parameter> setHeaderToken() {
 		ParameterBuilder tokenPar = new ParameterBuilder();
-		List<Parameter> pars = new ArrayList<>();
+		List<Parameter> pars = new ArrayList<Parameter>();
 		tokenPar.name("token").description("token").modelRef(new ModelRef("string")).parameterType("header")
 				.required(false).build();
 		pars.add(tokenPar.build());

rpm/src/main/java/com/ozs/rpm/controller/ChartClassController.java

@@ -41,7 +41,7 @@ public class ChartClassController {
 			return chartClassService.listChartClassTree(className);
 		} catch (Exception e) {
 			e.printStackTrace();
-			return new R<>(S.ERROR);
+			return new R<List<ChartClassDTO>>(S.ERROR);
 		}
 	}
 
@@ -53,7 +53,7 @@ public class ChartClassController {
 			return chartClassService.getChartClass(classCode);
 		} catch (Exception e) {
 			e.printStackTrace();
-			return new R<>(S.ERROR);
+			return new R<ChartClassDTO>(S.ERROR);
 		}
 	}