'commit'

src/main/java/com/dsideal/QingLong/Base/Controller/BaseController.java

@@ -571,79 +571,4 @@ public class BaseController extends Controller {
         Record record = bm.getDakaById(id);
         renderJson(record);
     }
-
-    /**
-     * 功能：增加一个统一认证登录的系统
-     *
-     * @param system_name
-     * @param redirect_url
-     */
-    @Before({POST.class, RepeatIntercetpor.class})
-    @IsLoginInterface({})
-    @IsSysAdminInterface({"1"})
-    @EmptyInterface({"redirect_url", "system_name"})
-    public void addSsoSystem(String system_name, String redirect_url) {
-        boolean result = bm.addSsoSystem(system_name, redirect_url);
-        Kv kv = Kv.create();
-        if (result) {
-            kv.set("success", true);
-            kv.set("message", "保存成功！");
-            renderJson(kv);
-        } else {
-            kv.set("success", false);
-            kv.set("message", "保存失败！请检查是否回调地址与现有系统的回调地址重复！");
-            renderJson(kv);
-        }
-    }
-
-    /**
-     * 功能：删除一个统一认证登录的系统
-     */
-    @Before({POST.class, RepeatIntercetpor.class})
-    @IsLoginInterface({})
-    @IsSysAdminInterface({"1"})
-    @EmptyInterface({"redirect_url", "system_name"})
-    public void delSsoSystem(int system_id) {
-        bm.delSsoSystem(system_id);
-        Kv kv = Kv.create();
-        kv.set("success", true);
-        kv.set("message", "保存成功！");
-        renderJson(kv);
-    }
-
-    /**
-     * 功能：修改一个统一认证系统
-     */
-    @Before({POST.class, RepeatIntercetpor.class})
-    @IsLoginInterface({})
-    @IsSysAdminInterface({"1"})
-    @EmptyInterface({"redirect_url", "system_name"})
-    public void updateSsoSystem(int system_id, String system_name, String redirect_url, int b_use) {
-        boolean result = bm.updateSsoSystem(system_id, system_name, redirect_url, b_use);
-        Kv kv = Kv.create();
-        if (result) {
-            kv.set("success", true);
-            kv.set("message", "保存成功！");
-            renderJson(kv);
-        } else {
-            kv.set("success", false);
-            kv.set("message", "保存失败！请检查是否回调地址与现有系统的回调地址重复！");
-            renderJson(kv);
-        }
-    }
-
-    /**
-     * 功能：获取统一认证系统列表
-     *
-     * @param page
-     * @param limit
-     */
-    @Before({GET.class})
-    @IsLoginInterface({})
-    @IsSysAdminInterface({"1"})
-    @IsNumericInterface({"page", "limit"})
-    public void listSsoSystem(int page, int limit) {
-        Page<Record> list = bm.listSsoSystem(page, limit);
-        renderJson(CommonUtil.renderJsonForLayUI(list));
-    }
 }

src/main/java/com/dsideal/QingLong/Base/Model/BaseModel.java

@@ -605,72 +605,4 @@ public class BaseModel {
         }
         return res;
     }
-
-    /**
-     * 功能：增加一个统一认证登录的系统
-     *
-     * @param system_name
-     * @param redirect_url
-     */
-    public boolean addSsoSystem(String system_name, String redirect_url) {
-        //1、检查是不是系统回调地址与现有的回调地址重复
-        if (checkRedirectUrlCongFu(-1, redirect_url)) {
-            return false;
-        }
-        //2、不重复则保存
-        Record record = new Record();
-        record.set("system_name", system_name);
-        record.set("redirect_url", redirect_url);
-        record.set("b_use", 1);
-        Db.save("t_sso_system", "system_id", record);
-        return true;
-    }
-
-    /**
-     * 功能：检查回调地址是否重复
-     *
-     * @param system_id
-     * @param redirect_url
-     * @return
-     */
-    public boolean checkRedirectUrlCongFu(int system_id, String redirect_url) {
-        String sql = "select count(1) as c from t_sso_system where redirect_url=? and system_id<>?";
-        int c = Db.findFirst(sql, redirect_url, system_id).getInt("c");
-        return c > 0;
-    }
-
-    /**
-     * 功能：删除一个统一认证登录的系统
-     */
-    public void delSsoSystem(int system_id) {
-        Db.deleteById("t_sso_system", "system_id", system_id);
-    }
-
-    /**
-     * 功能：修改一个统一认证系统
-     */
-    public boolean updateSsoSystem(int system_id, String system_name, String redirect_url, int b_use) {
-        //1、检查是不是系统回调地址与现有的回调地址重复
-        if (checkRedirectUrlCongFu(system_id, redirect_url)) {
-            return false;
-        }
-        //2、不重复则保存
-        Record record = Db.findById("t_sso_system", "system_id", system_id);
-        record.set("system_name", system_name);
-        record.set("redirect_url", redirect_url);
-        record.set("b_use", b_use);
-        Db.update("t_sso_system", record);
-        return true;
-    }
-
-    /**
-     * 功能：获取统一认证系统列表
-     *
-     * @param page
-     * @param limit
-     */
-    public Page<Record> listSsoSystem(int page, int limit) {
-        String sql = " from t_sso_system order by system_id";
-        return Db.paginate(page, limit, "select *", sql);
-    }
 }

src/main/java/com/dsideal/QingLong/DataShare/Controller/DataShareController.java

@@ -54,14 +54,20 @@ public class DataShareController extends Controller {
     @IsLoginInterface({})
     @IsSysAdminInterface({"1"})
     @EmptyInterface({"system_name", "user_name"})
-    public void addSystem(String system_name, String user_name) {
+    public void addSystem(String system_name, String user_name, String redirect_url) {
         if (dm.isExistUserName(user_name)) {
             Kv kv = Kv.by("success", false);
             kv.set("message", "访问账号已存在，请更换！");
             renderJson(kv);
             return;
         }
-        dm.addSystem(system_name, user_name);
+        if (dm.isExistRedirectUrl(redirect_url)) {
+            Kv kv = Kv.by("success", false);
+            kv.set("message", "指定的回调地址已存在，请检查后重新提交！");
+            renderJson(kv);
+            return;
+        }
+        dm.addSystem(system_name, user_name,redirect_url);
         Kv kv = Kv.by("success", true);
         kv.set("message", "保存成功！");
         renderJson(kv);

src/main/java/com/dsideal/QingLong/DataShare/Model/DataShareModel.java

@@ -41,10 +41,11 @@ public class DataShareModel {
         return !Db.find(sql, user_name).isEmpty();
     }
 
-    public void addSystem(String system_name, String user_name) {
+    public void addSystem(String system_name, String user_name, String redirect_url) {
         Record record = new Record();
         record.set("system_name", system_name);
         record.set("user_name", user_name);
+        record.set("redirect_url", redirect_url);
         String pwd = CommonUtil.generatePassword(10);
         record.set("pwd", pwd);
         if (PgUtil.isExistUser(user_name)) {
@@ -325,6 +326,18 @@ public class DataShareModel {
         String sql = "update t_datashare_system set pwd=? where system_id=?";
         Db.update(sql, pwd, system_id);
     }
+
+    /**
+     * 功能：检查redirect_url 是否已存在
+     *
+     * @param redirect_url
+     * @return
+     */
+    public boolean isExistRedirectUrl(String redirect_url) {
+        if (StrKit.isBlank(redirect_url)) return false;
+        String sql = "select * from t_datashare_system where redirect_url=?";
+        return Db.findFirst(sql, redirect_url) != null;
+    }
 }