文件分类接口修改

ibps-provider-root/modules/provider-platform-default/src/main/java/com/lc/ibps/common/provider/TypeProvider.java

@@ -69,7 +69,9 @@ public class TypeProvider extends GenericProvider implements ITypeService, IType
 		APIResult<TypePo> result = new APIResult<>();
 		try {
 			TypePo typePo = typeRepository.get(typeId);
-			typePo.setAuthorityObject(JSONUtil.parseObj(typePo.getAuthorityName()));
+			if (!"".equals(typePo.getAuthorityName())){
+				typePo.setAuthorityObject(JSONUtil.parseObj(typePo.getAuthorityName()));
+			}
 			result.setData(typePo);
 		} catch (Exception e) {
 			setExceptionResult(result, StateEnum.ERROR_CAT_TYPE.getCode(), I18nUtil.getMessage(StateEnum.ERROR_CAT_TYPE.getCode()+""), e);

ibps-provider-root/modules/provider-platform/src/main/resources/conf/dataSource-dev.xml

@@ -5,43 +5,33 @@
     <alias>dataSource_default</alias>
 
     <!-- dev下使用该链接 -->
- 	<dbType>mysql</dbType>
-  	<driver>com.mysql.jdbc.Driver</driver>
+    <dbType>mysql</dbType>
+    <driver>com.mysql.jdbc.Driver</driver>
+    <!-- 金源   172.18.157.44      119.23.210.103  -->
     <driverUrl>jdbc:mysql://119.23.210.103:3306/klims-ibps3?useUnicode=true&amp;characterEncoding=utf-8</driverUrl>
     <user>root</user>
     <password>!$%^QWER</password>
 
-    <!-- 吴懿 -->
-<!--    <driverUrl>jdbc:mysql://192.168.2.134:3306/klims-ibps3?useUnicode=true&amp;characterEncoding=utf-8</driverUrl>-->
-<!--    <user>root</user>-->
-<!--    <password/>-->
+    <!-- 罗湖生产 -->
+    <!--    <driverUrl>jdbc:mysql://172.16.40.182:3306/klims-ibps3?useUnicode=true&amp;characterEncoding=utf-8</driverUrl>-->
+    <!--    <user>root</user>-->
+    <!--    <password>Lh789456123</password>-->
 
-    <!-- localhost -->
-<!--    <driverUrl>jdbc:mysql://127.0.0.1:3306/klims-ibps3?useUnicode=true&amp;characterEncoding=utf-8</driverUrl>-->
-<!--    <user>root</user>-->
-<!--    <password>123456</password>-->
+    <!-- 明鉴 -->
+    <!--    <driverUrl>jdbc:mysql://139.159.225.4:3306/klims-ibps3?useUnicode=true&amp;characterEncoding=utf-8</driverUrl>-->
+    <!--    <user>root</user>-->
+    <!--    <password>Jyxt%$*1466.</password>-->
+
+    <!-- 罗湖120       172.18.157.47        120.78.154.31      -->
+    <!--    <driverUrl>jdbc:mysql://120.78.154.31:3306/klims-ibps3?useUnicode=true&amp;characterEncoding=utf-8</driverUrl>-->
+    <!--    <user>root</user>-->
+    <!--    <password>Jyxt168.</password>-->
+
+    <!-- 本机VM 192.168.22.3 -->
+    <!--    <driverUrl>jdbc:mysql://192.168.22.3:3306/klims-ibps3?useUnicode=true&amp;characterEncoding=utf-8</driverUrl>-->
+    <!--    <user>root</user>-->
+    <!--    <password>szjyt168</password>-->
 
-    <!--
-	<dbType>oracle</dbType>
-    <driver>oracle.jdbc.OracleDriver</driver>
-    <driverUrl>jdbc:oracle:thin:@192.168.3.203:1521:ORCL</driverUrl>
-    <user>lc</user>
-    <password>lc</password>
-    -->
-    <!--
-    <dbType>postgres</dbType>
-  	<driver>org.postgresql.Driver</driver>
-	<driverUrl>jdbc:postgresql://192.168.3.206:5432/platform</driverUrl>
-    <user>root</user>
-    <password>root</password>
-    -->
-    <!--
-    <dbType>mssql</dbType>
-    <driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</driver>
-    <driverUrl>jdbc:sqlserver://192.168.3.206:1433;DatabaseName=ibps_platform;integratedSecurity=false</driverUrl>
-    <user>ibps_platform</user>
-    <password>uij987eE90hgD</password>
-    -->
 
     <status>actived</status>
     <isDefault>true</isDefault>