'commit'

2 months ago · a48d235916
parent 14fe8e13c9
commit a48d235916
9 changed files with 17 additions and 36 deletions
--- a/dsBase/src/main/java/Tools/Init/clearDataBase.java
+++ b/dsBase/src/main/java/Tools/Init/clearDataBase.java
@ -9,7 +9,7 @@ import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
 import com.jfinal.plugin.activerecord.CaseInsensitiveContainerFactory;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
-import com.jfinal.plugin.activerecord.dialect.PostgreSqlDialect;
+import com.jfinal.plugin.activerecord.dialect.MysqlDialect;
 import com.jfinal.plugin.druid.DruidPlugin;
 import com.jfinal.plugin.redis.RedisPlugin;
 import org.slf4j.Logger;
@ -43,7 +43,7 @@ public class clearDataBase {
        //配置默认小写
        arp.setContainerFactory(new CaseInsensitiveContainerFactory(true));
        //方言,这个很重要，否则执行SQL会报错
-        arp.setDialect(new PostgreSqlDialect());
+        arp.setDialect(new MysqlDialect());

        //应用系统Sql模板
        String basePath = BaseApplication.class.getClassLoader().getResource(".").getPath();
--- a/dsBase/src/main/java/com/dsideal/dsBase/BaseApplication.java
+++ b/dsBase/src/main/java/com/dsideal/dsBase/BaseApplication.java
@ -22,7 +22,7 @@ import com.jfinal.config.*;
 import com.jfinal.kit.Prop;
 import com.dsideal.dsBase.Plugin.YamlProp;
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
-import com.jfinal.plugin.activerecord.dialect.PostgreSqlDialect;
+import com.jfinal.plugin.activerecord.dialect.MysqlDialect;
 import com.jfinal.plugin.druid.DruidPlugin;
 import com.jfinal.plugin.redis.RedisPlugin;
 import com.jfinal.server.undertow.UndertowServer;
@ -119,7 +119,7 @@ public class BaseApplication extends JFinalConfig {
                PropKit.get("mysql.user"), PropKit.get("mysql.password"), PropKit.get("mysql.driverClassName"));
        me.add(druid);
        ActiveRecordPlugin arp = new ActiveRecordPlugin(druid);
-        arp.setDialect(new PostgreSqlDialect());
+        arp.setDialect(new MysqlDialect());
        String basePath = Objects.requireNonNull(BaseApplication.class.getClassLoader().getResource(".")).getPath();
        File sqlDir = new File(basePath + "/Sql");
        for (File sqlFile : Objects.requireNonNull(sqlDir.listFiles())) {
--- a/dsBase/src/main/java/com/dsideal/dsBase/ExcelImportTemplate/StudentInitImportTemplate.java
+++ b/dsBase/src/main/java/com/dsideal/dsBase/ExcelImportTemplate/StudentInitImportTemplate.java
@ -3,7 +3,7 @@ package com.dsideal.dsBase.ExcelImportTemplate;
 import com.jfinal.kit.PropKit;
 import com.jfinal.log.Log;
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
-import com.jfinal.plugin.activerecord.dialect.PostgreSqlDialect;
+import com.jfinal.plugin.activerecord.dialect.MysqlDialect;
 import com.jfinal.plugin.hikaricp.HikariCpPlugin;

 import java.io.IOException;
@ -29,7 +29,7 @@ public class StudentInitImportTemplate {
        // 配置ActiveRecord插件
        ActiveRecordPlugin arp = new ActiveRecordPlugin(hikariCpPlugin);
        //方言
-        arp.setDialect(new PostgreSqlDialect());
+        arp.setDialect(new MysqlDialect());
        //应用系统
        String basePath = "/Sql/";
        arp.addSqlTemplate(basePath + "dm.sql");
--- a/dsBase/src/main/java/com/dsideal/dsBase/ExcelImportTemplate/TeacherInitImportTemplate.java
+++ b/dsBase/src/main/java/com/dsideal/dsBase/ExcelImportTemplate/TeacherInitImportTemplate.java
@ -2,7 +2,7 @@ package com.dsideal.dsBase.ExcelImportTemplate;

 import com.jfinal.kit.PropKit;
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
-import com.jfinal.plugin.activerecord.dialect.PostgreSqlDialect;
+import com.jfinal.plugin.activerecord.dialect.MysqlDialect;
 import com.jfinal.plugin.hikaricp.HikariCpPlugin;

 import java.io.IOException;
@ -25,7 +25,7 @@ public class TeacherInitImportTemplate {
        // 配置ActiveRecord插件
        ActiveRecordPlugin arp = new ActiveRecordPlugin(hikariCpPlugin);
        //方言
-        arp.setDialect(new PostgreSqlDialect());
+        arp.setDialect(new MysqlDialect());
        //应用系统
        String basePath = "/Sql/";
        arp.addSqlTemplate(basePath + "dm.sql");
--- a/dsSso/WebRoot/html/login.html
+++ b/dsSso/WebRoot/html/login.html
@ -126,10 +126,6 @@
    function userLogin(username, password, captcha) {
        if (userLoginCheck(username, password, captcha)) {
            var redirect_url = getUrlParam("redirect_url");
-            var default_redirect_url = getDefaultRedirectUrl();
-            if (default_redirect_url.length > 0) {
-                redirect_url = default_redirect_url;
-            }
            $.ajax({
                type: "POST",
                dataType: "json",
--- a/dsSso/src/main/java/com/dsideal/Sso/Controller/WebLoginController.java
+++ b/dsSso/src/main/java/com/dsideal/Sso/Controller/WebLoginController.java
@ -12,6 +12,7 @@ import javax.servlet.http.HttpSession;
 import com.dsideal.Sso.Interceptor.EmptyInterface;
 import com.dsideal.Sso.Model.LoginModel;
 import com.dsideal.Sso.Util.*;
+import com.dsideal.SsoApplication;
 import com.jfinal.aop.Before;
 import com.jfinal.ext.interceptor.GET;
 import com.jfinal.ext.interceptor.POST;
@ -25,7 +26,7 @@ public class WebLoginController extends Controller {

    @Before({GET.class})
    public void index() {
-        renderText("Welcome to dsSso World!");
+        redirect("/html/login.html");
    }

    /**
@ -128,21 +129,6 @@ public class WebLoginController extends Controller {
        redirect(redirect_url);
    }

-    /**
-     * 获取默认RedirectUrl地址
-     */
-    @Before(GET.class)
-    public void getDefaultRedirectUrl() {
-        JSONObject resultJson = new JSONObject();
-        String defaultRedirectUrl = PropKit.get("default.redirect.url");
-        if (defaultRedirectUrl != null) {
-            resultJson.put("success", true);
-            resultJson.put("defaultRedirectUrl", defaultRedirectUrl);
-        } else {
-            resultJson.put("success", false);
-        }
-        renderJson(resultJson);
-    }

    /**
     * 获取验证码
--- a/dsSso/src/main/java/com/dsideal/SsoApplication.java
+++ b/dsSso/src/main/java/com/dsideal/SsoApplication.java
@ -7,7 +7,8 @@ import com.dsideal.Sso.Util.YamlProp;
 import com.jfinal.config.*;
 import com.jfinal.kit.Prop;
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
-import com.jfinal.plugin.activerecord.dialect.PostgreSqlDialect;
+import com.jfinal.plugin.activerecord.dialect.MysqlDialect;
+import com.jfinal.plugin.activerecord.dialect.MysqlDialect;
 import com.jfinal.plugin.druid.DruidPlugin;
 import com.jfinal.plugin.redis.RedisPlugin;
 import com.jfinal.server.undertow.UndertowServer;
@ -81,7 +82,7 @@ public class SsoApplication extends JFinalConfig {
                PropKit.get("mysql.password").trim(), PropKit.get("mysql.driverClassName"));
        me.add(druid);
        ActiveRecordPlugin arp = new ActiveRecordPlugin(druid);
-        arp.setDialect(new PostgreSqlDialect());
+        arp.setDialect(new MysqlDialect());
        String basePath = Objects.requireNonNull(SsoApplication.class.getClassLoader().getResource(".")).getPath();
        File sqlDir = new File(basePath + "/Sql");
        for (File sqlFile : Objects.requireNonNull(sqlDir.listFiles())) {
--- a/dsSso/src/main/resources/application_dev.yaml
+++ b/dsSso/src/main/resources/application_dev.yaml
@ -13,9 +13,8 @@ redis:
 sso:
  sessionid: ds_sso_sessionid

-log:
-  # 记录登录日志的范围
-  loginLogIdentity: 1,2,3,4,5,6,7
+# 可以登录的身份
+loginLogIdentity: 1,2,3,4,5,6,7

 password:
  # MysqlAES加密解密的密码
--- a/dsSso/target/classes/application_dev.yaml
+++ b/dsSso/target/classes/application_dev.yaml
@ -13,9 +13,8 @@ redis:
 sso:
  sessionid: ds_sso_sessionid

-log:
-  # 记录登录日志的范围
-  loginLogIdentity: 1,2,3,4,5,6,7
+# 可以登录的身份
+loginLogIdentity: 1,2,3,4,5,6,7

 password:
  # MysqlAES加密解密的密码