bug fix

admin-console/pom.xml

@@ -17,11 +17,6 @@
 			<artifactId>jxls</artifactId>
 			<version>2.4.3</version>
 		</dependency>
-		<dependency>
-			<groupId>org.jxls</groupId>
-			<artifactId>jxls-reader</artifactId>
-			<version>2.0.3</version>
-		</dependency>
 		<dependency>
 			<groupId>org.jxls</groupId>
 			<artifactId>jxls-poi</artifactId>

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

@@ -15,9 +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.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;
@@ -173,14 +173,14 @@ 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> dict = new ArrayList<CoreDict>();  
-        Map beans = new HashMap();  
-        beans.put("list", dict);
-        XLSReadStatus readStatus = mainReader.read( inputXLS, beans); 
+//        InputStream inputXML = Thread.currentThread().getContextClassLoader().getResourceAsStream("excelTemplates/admin/dict/dict_mapping.xml");  
+//        XLSReader mainReader = ReaderBuilder.buildFromXML( inputXML );  
+//        InputStream inputXLS = ins;  
+//    
+//        List<CoreDict> dict = new ArrayList<CoreDict>();  
+//        Map beans = new HashMap();  
+//        beans.put("list", dict);
+//        XLSReadStatus readStatus = mainReader.read( inputXLS, beans); 
         return JsonResult.success();
         
     }

admin-console/src/main/resources/static/js/admin/role/add.js

@@ -8,8 +8,8 @@ layui.define([ 'form', 'laydate', 'table','roleApi'], function(exports) {
 				this.initSubmit();
 			},
 			initSubmit:function(){
-				$("#addButton").click($("#addForm"),function(){
-					roleApi.addRole(function(){
+				$("#addButton").click(function(){
+					roleApi.addRole($("#addForm"),function(){
 						parent.window.dataReload();
 						Common.info("添加成功");
 						Lib.closeFrame();

admin-console/src/main/resources/templates/admin/role/add.html

@@ -29,10 +29,8 @@
 		</div>
 	</div>
 
-	
-	
-	
-	<layui:submitButtons id="add" />
+		
+	<layui:submitButtons id="addButton" />
 </form>
 <!--#} -->
 <script>

admin-core/src/main/resources/static/js/core/codeGen/codeApi.js

@@ -3,9 +3,9 @@ layui.define([], function(exports) {
 	var api={
 			gen:function(callback){
 				Common.post("/core/codeGen/getPath.json", {}, function(path){
-					Common.openPrompt("代码保存路径?",path,function(){
-						var url ="/core/codeGen/gen.json"
-						Lib.submitForm(url,$('#updateForm'),{path:path},callback)
+					Common.openPrompt("代码保存路径?",path,function(newPath){
+						var url ="/core/codeGen/gen.json";
+						Lib.submitForm(url,$('#updateForm'),{path:newPath},callback)
 					})
 				});
 			},

pom.xml

@@ -59,7 +59,7 @@
 		<dependency>
 			<groupId>com.ibeetl</groupId>
 			<artifactId>beetl-framework-starter</artifactId>
-			<version>1.1.38.RELEASE</version>
+			<version>1.1.40.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>com.trigersoft</groupId>