oracel support

admin-console/pom.xml

@@ -43,13 +43,6 @@
 		</dependency>
 	</dependencies>
 	
-	 <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
+
 
 </project>

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
-#server.servlet.context-path=/admin-console
+#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:@172.16.86.56:1521:dfzb
+spring.datasource.username=starter2
+spring.datasource.password=starter2
+spring.datasource.driver-class-name=oracle.jdbc.OracleDriver
+
+
+
 # 1，1 是管理员密码，相当于启动后就登录，方便测试，系统需要取消这俩个配置
 user.id=1
 user.orgId=1
@@ -20,10 +24,10 @@ logging.level.org.springframework.web.servlet.mvc.method.annotation=warn
 server.port=8080
 #html视图交给beetl渲染
 beetl.suffix=html 
-beetlsql.dbStyle=org.beetl.sql.core.db.MySqlStyle
+beetlsql.dbStyle=org.beetl.sql.core.db.OracleStyle
 #beetlsql.basePackage=com.ibeetl,com.xxx.yourpackage
 beetlsql.basePackage=com.ibeetl
-app.name=Spring Boot开发平台
+app.name=SpringBoot-Plus
 logging.pattern.console=%-4relative [%thread] %-5level %logger{256} %M %L - %msg%n
 spring.devtools.restart.exclude=templates/**
 #文档预览服务的调用地址，参考https://gitee.com/kekingcn/file-online-preview 安装，没有如下配置无法使用预览功能

admin-console/src/main/resources/sql/console/menu.md

@@ -27,7 +27,7 @@ queryByCondtion
 	@}
 	
 	@pageIgnoreTag(){
-	   order by seq asc , id desc
+	   order by m.seq asc , m.id desc
 	@}
 	
 

admin-console/src/main/resources/templates/admin/dict/edit.html

@@ -4,6 +4,14 @@
 	<div class="layui-row">
 		<div class="layui-form-item">
 
+			<div class="layui-inline">
+				<label class="layui-form-label">字典值</label>
+				<div class="layui-input-block">
+					<input type="text" name="value" value="${dict.value}"
+						class="layui-input">
+				</div>
+			</div>
+			
 			<div class="layui-inline">
 				<label class="layui-form-label">字典名称</label>
 				<div class="layui-input-block">
@@ -12,9 +20,6 @@
 				</div>
 			</div>
 
-
-
-
 		</div>
 
 	</div>
@@ -70,7 +75,7 @@
 			</div>
 		</div>
 	</div>
-	<input type="hidden" name="value" value=${dict.value} />
+	<input type="hidden" name="id" value=${dict.id} />
 
 	<layui:submitButtons id="updateButton" />
 </form>

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

 package com.ibeetl.admin.core.conf;
 
+import java.io.UnsupportedEncodingException;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
@@ -122,7 +123,22 @@ public class BeetlConf {
                     @Override
                     public String call(Object[] paras, Context ctx) {
                       String key = (String)paras[0];
-                      return env.getProperty(key); 
+                      String value =  env.getProperty(key); 
+                      if(value!=null) {
+                          return getStr(value);
+                      }
+                      if(paras.length==2) {
+                          return (String)paras[1];
+                      }
+                      return null;
+                    }
+                    
+                    protected String getStr(String str) {
+                        try {
+                            return new String(str.getBytes("iso8859-1"),"UTF-8");
+                        } catch (UnsupportedEncodingException e) {
+                            throw new RuntimeException(e);
+                        }
                     }
 
                 });

admin-core/src/main/resources/templates/common/container.html

@@ -3,7 +3,7 @@
 <html>
 <head>
 	<meta content="text/html;charset=UTF-8"/>
-	<title>Spring Boot 2 Plus</title>
+	<title>${env("app.name")}</title>
 	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
 	<meta http-equiv ="Pragma" content = "no-cache"/>
 	<meta http-equiv="Cache-Control" content="no cache" />

admin-core/src/main/resources/templates/common/tag/simpleDictSelect.tag.html

@@ -14,7 +14,7 @@
 		for(dict in dicts){
 	 -->
 	 
-    <option value="${dict.value}" ${dict.value==expected?'selected'}>${dict.name}</option>
+    <option value="${dict.value}" ${dict.value==(expected+"")?'selected'}>${dict.name}</option>
       
    <!--#}-->
     </select>

admin-core/src/main/resources/templates/index.html

@@ -2,7 +2,7 @@
   <!-- 顶部 -->
   <form class="layui-form layui-form-pane">
   <div class="layui-header">
-    <a href="ibeetl.com" class="layui-hide-xs"><div class="layui-logo">Spring Boot 2 Plus</div></a>
+    <a href="ibeetl.com" class="layui-hide-xs"><div class="layui-logo">${env("app.name")}</div></a>
     <a href="javascript:;" class="layui-hide-xs"><div class="fsSwitchMenu"><i class="iconfont icon-category"></i></div></a>
     
     <!-- 顶部菜单 -->

pom.xml

@@ -81,11 +81,11 @@
 			<version>6.0.5</version>
 		</dependency>
 
-		<!--  dependency>
+		<dependency>
 		    <groupId>com.oracle</groupId>
 		    <artifactId>ojdbc6</artifactId>
 		    <version>11.2.0</version>
-	    </dependency  -->
+	    </dependency>
 
 
 		<dependency>