tomcat deploy fix

admin-console/pom.xml

@@ -4,7 +4,7 @@
 	<groupId>com.ibeetl</groupId>
 	<artifactId>admin-console</artifactId>
 	<version>1.0</version>
-	<packaging>jar</packaging>
+	<packaging>war</packaging>
 	<parent>
 		<groupId>com.ibeetl</groupId>
 		<artifactId>admin</artifactId>
@@ -12,13 +12,20 @@
 	</parent>
 
 	<dependencies>
-		<!--   会和jxls 冲突？还是需要配置一种具体实现
+		<!--   会和jxls 冲突？还是需要配置一种具体实现-->
+		<!-- https://mvnrepository.com/artifact/org.apache.poi/poi -->
+		<dependency>
+		    <groupId>org.apache.poi</groupId>
+		    <artifactId>poi</artifactId>
+		    <version>3.17</version>
+		</dependency>
+		
 		<dependency>
 			<groupId>org.jxls</groupId>
 			<artifactId>jxls-reader</artifactId>
 			<version>2.0.3</version>
 		</dependency>
-		-->
+		
 		<dependency>
 			<groupId>org.jxls</groupId>
 			<artifactId>jxls</artifactId>
@@ -36,4 +43,13 @@
 		</dependency>
 	</dependencies>
 	
+	 <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

admin-console/src/main/java/com/ibeetl/admin/console/web/DictConsoleController.java

@@ -3,8 +3,11 @@ package com.ibeetl.admin.console.web;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -12,6 +15,9 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.beetl.sql.core.engine.PageQuery;
 import org.jxls.common.Context;
+import org.jxls.reader.ReaderBuilder;
+import org.jxls.reader.XLSReadStatus;
+import org.jxls.reader.XLSReader;
 import org.jxls.util.JxlsHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -167,15 +173,15 @@ public class DictConsoleController{
         String fileName = file.getOriginalFilename();
         InputStream ins = file.getInputStream();
         
-//        InputStream inputXML = Thread.currentThread().getContextClassLoader().getResourceAsStream("excelTemplates/admin/dict/dict_mapping.xml");  
-//        XLSReader mainReader = ReaderBuilder.buildFromXML( inputXML );  
-//        InputStream inputXLS = ins;  
-//    
-//        List<CoreDict> dicts = new ArrayList<CoreDict>();  
-//        Map beans = new HashMap();  
-//        beans.put("list", dicts);
-//        XLSReadStatus readStatus = mainReader.read( inputXLS, beans); 
-//        System.out.println(dicts);
+        InputStream inputXML = Thread.currentThread().getContextClassLoader().getResourceAsStream("excelTemplates/admin/dict/dict_mapping.xml");  
+        XLSReader mainReader = ReaderBuilder.buildFromXML( inputXML );  
+        InputStream inputXLS = ins;  
+    
+        List<CoreDict> dicts = new ArrayList<CoreDict>();  
+        Map beans = new HashMap();  
+        beans.put("list", dicts);
+        XLSReadStatus readStatus = mainReader.read( inputXLS, beans); 
+        System.out.println(dicts);
         return JsonResult.success();
         
     }

admin-console/src/main/resources/application.properties

 spring.datasource.url=jdbc:mysql://127.0.0.1:3306/starter?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false
 spring.datasource.username=root
 spring.datasource.password=123456
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 #spring.datasource.url= jdbc:oracle:thin:@127.0.0.1:1521:orcl
 #spring.datasource.username=starter2
 #spring.datasource.password=starter2

admin-console/src/main/resources/excelTemplates/admin/dict/dict_mapping.xml

 <?xml version="1.0" encoding="utf-8"?>
 <workbook>
 	<worksheet name="Template">
-		<loop startRow="3" endRow="3" items="list" var="dict"
+		<loop startRow="3" endRow="10" items="list" var="dict"
 			varType="com.ibeetl.admin.core.entity.CoreDict">
 			<section startRow="3" endRow="3">
 				<mapping row="3" col="1">dict.name</mapping>

admin-console/src/main/webapp/WEB-INF/web.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
-
-
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>com.coamc.starter.CosonleApplication</param-value>
-	</context-param>
-
-	<listener>
-		<listener-class>org.springframework.boot.legacy.context.web.SpringBootContextLoaderListener</listener-class>
-	</listener>
-    <servlet>
-        <servlet-name>appServlet</servlet-name>
-        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-        <init-param>
-            <param-name>contextAttribute</param-name>
-            <param-value>org.springframework.web.context.WebApplicationContext.ROOT</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>appServlet</servlet-name>
-        <url-pattern>/</url-pattern>
-    </servlet-mapping>
-
-</web-app>
\ No newline at end of file

admin-console/src/main/webapp/WEB-INF/weblogic.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<wls:weblogic-web-app
-    xmlns:wls="http://xmlns.oracle.com/weblogic/weblogic-web-app"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
-        http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd
-        http://xmlns.oracle.com/weblogic/weblogic-web-app
-        http://xmlns.oracle.com/weblogic/weblogic-web-app/1.4/weblogic-web-app.xsd">
-    <wls:container-descriptor>
-        <wls:prefer-application-packages>
-            <wls:package-name>org.slf4j</wls:package-name>
-        </wls:prefer-application-packages>
-    </wls:container-descriptor>
-</wls:weblogic-web-app>
\ No newline at end of file

admin-core/src/main/java/com/ibeetl/admin/core/conf/DataSourceConfig.java

@@ -15,7 +15,7 @@ public class DataSourceConfig {
 		ds.setJdbcUrl(env.getProperty("spring.datasource.url"));
 		ds.setUsername(env.getProperty("spring.datasource.username"));
 		ds.setPassword(env.getProperty("spring.datasource.password"));
-//		ds.setDriverClassName(env.getProperty("spring.datasource.driver-class-name"));
+		ds.setDriverClassName(env.getProperty("spring.datasource.driver-class-name"));
 		return ds;
 	}
 }

admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreDict.java

@@ -132,4 +132,15 @@ public class CoreDict extends BaseEntity {
     public interface TypeListView{
     }
 
+
+    @Override
+    public String toString() {
+        return "CoreDict [value=" + value + ", type=" + type + ", name=" + name + "]";
+    }
+
+
+    
+
+    
+    
 }