fixed

3bf5e392 · 喻春霖 · e70a2818 · 3bf5e392 · 3bf5e392 · 3bf5e392
Commit 3bf5e392 authored Jul 02, 2021 by 喻春霖
5 changed files
--- a/eden-authcenter-agent/src/main/java/com/chineseall/eden/authcenter/agent/controller/AuthController.java
+++ b/eden-authcenter-agent/src/main/java/com/chineseall/eden/authcenter/agent/controller/AuthController.java
@@ -120,14 +120,22 @@ public class AuthController {
            authLogService.save(authLog);


-            String url1 = generateLoginUrl(returnUrl, OauthType.dianjiaoguan.getCode(), authLog.getId());
-            modelAndView.addObject("loginUrl1", url1);
-            String url2 = generateLoginUrl(returnUrl, OauthType.edenoperation.getCode(), authLog.getId());
-            modelAndView.addObject("loginUrl2", url2);
-            String url3 = generateSpLoginUrl(returnUrl, OauthType.qpjy.getCode(), authLog.getId());
-            modelAndView.addObject("loginUrl3", url3);
-            modelAndView.addObject("logId", authLog.getId());
+            String dianjiaoguanLoinUrl = generateLoginUrl(returnUrl, OauthType.dianjiaoguan.getCode(), authLog.getId());
+            modelAndView.addObject("dianjiaoguanLoinUrl", dianjiaoguanLoinUrl);
+            String edenoperationLoginUrl = generateLoginUrl(returnUrl, OauthType.edenoperation.getCode(), authLog.getId());
+            modelAndView.addObject("edenoperationLoginUrl", edenoperationLoginUrl);
+
+            OauthType[] oauthTypes = OauthType.values();
+            for (OauthType oauthType : oauthTypes) {
+                if ("idp".equals(oauthType.getType())){

+                    String idpAuthTypeUrl = generateSpLoginUrl(returnUrl, oauthType.getCode(), authLog.getId());
+                    modelAndView.addObject(oauthType.getCode()+"LoginUrl", idpAuthTypeUrl);
+
+                }
+            }
+
+            modelAndView.addObject("logId", authLog.getId());
        } catch (Exception e) {
            e.printStackTrace();
            modelAndView.setViewName("error");

--- a/eden-authcenter-agent/src/main/java/com/chineseall/eden/authcenter/agent/oauth/OauthType.java
+++ b/eden-authcenter-agent/src/main/java/com/chineseall/eden/authcenter/agent/oauth/OauthType.java
@@ -2,17 +2,31 @@ package com.chineseall.eden.authcenter.agent.oauth;

 import lombok.Getter;

+import java.util.List;
+
 public enum OauthType {

-    dianjiaoguan("dianjiaoguan","电教馆账号认证"),
-    idp("idp","idp认证"),
-    jsyd("jsyd","金山教育"),
-    qpjy("qpjy","青浦教育"),
-    hpjy("hpjy","黄浦教育"),
-    fxjy("fxjy","奉贤教育"),
-    pdjy("pdjy","浦东教育"),
-    ypjy("ypjy","杨浦教育"),
-    edenoperation("edenoperation","数字教材账号认证");
+    dianjiaoguan("dianjiaoguan","电教馆账号认证","oauth"),
+
+    edenoperation("edenoperation","数字教材账号认证","oauth"),
+    jsyd("jsyd","金山教育","idp"),
+    qpjy("qpjy","青浦教育","idp"),
+    xhjy("xhjy","徐汇教育","idp"),
+    cnjy("cnjy","长宁教育","idp"),
+    jajy("jajy","静安教育","idp"),
+    ptjy("ptjy","普陀教育","idp"),
+    hkjy("hkjy","虹口教育","idp"),
+    mhjy("mhjy","闵行教育","idp"),
+    bsjy("bsjy","宝山教育","idp"),
+    jdjy("jdjy","嘉定教育","idp"),
+    jsjy("jsjy","金山教育","idp"),
+    sjjy("sjjy","松江教育","idp"),
+    fxjy("fxjy","奉贤教育","idp"),
+    cmjy("cmjy","崇明教育","idp"),
+
+    hpjy("hpjy","黄浦教育","idp"),
+    pdjy("pdjy","浦东教育","idp"),
+    ypjy("ypjy","杨浦教育","idp");


    @Getter
@@ -20,9 +34,16 @@ public enum OauthType {
    @Getter
    private final String description;

-    OauthType(String code, String description) {
+
+    @Getter
+    private final String type;
+
+
+
+    OauthType(String code, String description,String type) {
        this.code = code;
        this.description = description;
+        this.type = type;
    }

    public static OauthType getValue(String name) {

--- a/eden-authcenter-agent/src/main/resources/application.yml
+++ b/eden-authcenter-agent/src/main/resources/application.yml
@@ -49,6 +49,113 @@ oauth:
      clientSecret: VjyqUkkM5Znu
      loginSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/idp/loginsuccess
      logoutSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/logoutsuccess
+    cmjy:  #idp
+      #oauthUrl: https://operator-api-test.etextbook.cn/cas
+      oauthUrl: https://sp.etextbook.cn/authcenter/auth
+      clientId: dsClentId
+      clientSecret: VjyqUkkM5Znu
+      loginSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/idp/loginsuccess
+      logoutSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/logoutsuccess
+    fxjy:  #idp
+      #oauthUrl: https://operator-api-test.etextbook.cn/cas
+      oauthUrl: https://sp.etextbook.cn/authcenter/auth
+      clientId: dsClentId
+      clientSecret: VjyqUkkM5Znu
+      loginSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/idp/loginsuccess
+      logoutSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/logoutsuccess
+    sjjy:  #idp
+      #oauthUrl: https://operator-api-test.etextbook.cn/cas
+      oauthUrl: https://sp.etextbook.cn/authcenter/auth
+      clientId: dsClentId
+      clientSecret: VjyqUkkM5Znu
+      loginSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/idp/loginsuccess
+      logoutSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/logoutsuccess
+    jsjy:  #idp
+      #oauthUrl: https://operator-api-test.etextbook.cn/cas
+      oauthUrl: https://sp.etextbook.cn/authcenter/auth
+      clientId: dsClentId
+      clientSecret: VjyqUkkM5Znu
+      loginSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/idp/loginsuccess
+      logoutSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/logoutsuccess
+    jdjy:  #idp
+      #oauthUrl: https://operator-api-test.etextbook.cn/cas
+      oauthUrl: https://sp.etextbook.cn/authcenter/auth
+      clientId: dsClentId
+      clientSecret: VjyqUkkM5Znu
+      loginSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/idp/loginsuccess
+      logoutSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/logoutsuccess
+    bsjy:  #idp
+      #oauthUrl: https://operator-api-test.etextbook.cn/cas
+      oauthUrl: https://sp.etextbook.cn/authcenter/auth
+      clientId: dsClentId
+      clientSecret: VjyqUkkM5Znu
+      loginSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/idp/loginsuccess
+      logoutSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/logoutsuccess
+    mhjy:  #idp
+      #oauthUrl: https://operator-api-test.etextbook.cn/cas
+      oauthUrl: https://sp.etextbook.cn/authcenter/auth
+      clientId: dsClentId
+      clientSecret: VjyqUkkM5Znu
+      loginSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/idp/loginsuccess
+      logoutSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/logoutsuccess
+    pdjy:  #idp
+      #oauthUrl: https://operator-api-test.etextbook.cn/cas
+      oauthUrl: https://sp.etextbook.cn/authcenter/auth
+      clientId: dsClentId
+      clientSecret: VjyqUkkM5Znu
+      loginSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/idp/loginsuccess
+      logoutSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/logoutsuccess
+    ypjy:  #idp
+      #oauthUrl: https://operator-api-test.etextbook.cn/cas
+      oauthUrl: https://sp.etextbook.cn/authcenter/auth
+      clientId: dsClentId
+      clientSecret: VjyqUkkM5Znu
+      loginSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/idp/loginsuccess
+      logoutSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/logoutsuccess
+    hkjy:  #idp
+      #oauthUrl: https://operator-api-test.etextbook.cn/cas
+      oauthUrl: https://sp.etextbook.cn/authcenter/auth
+      clientId: dsClentId
+      clientSecret: VjyqUkkM5Znu
+      loginSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/idp/loginsuccess
+      logoutSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/logoutsuccess
+    ptjy:  #idp
+      #oauthUrl: https://operator-api-test.etextbook.cn/cas
+      oauthUrl: https://sp.etextbook.cn/authcenter/auth
+      clientId: dsClentId
+      clientSecret: VjyqUkkM5Znu
+      loginSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/idp/loginsuccess
+      logoutSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/logoutsuccess
+    jajy:  #idp
+      #oauthUrl: https://operator-api-test.etextbook.cn/cas
+      oauthUrl: https://sp.etextbook.cn/authcenter/auth
+      clientId: dsClentId
+      clientSecret: VjyqUkkM5Znu
+      loginSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/idp/loginsuccess
+      logoutSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/logoutsuccess
+    cnjy:  #idp
+      #oauthUrl: https://operator-api-test.etextbook.cn/cas
+      oauthUrl: https://sp.etextbook.cn/authcenter/auth
+      clientId: dsClentId
+      clientSecret: VjyqUkkM5Znu
+      loginSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/idp/loginsuccess
+      logoutSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/logoutsuccess
+    xhjy:  #idp
+      #oauthUrl: https://operator-api-test.etextbook.cn/cas
+      oauthUrl: https://sp.etextbook.cn/authcenter/auth
+      clientId: dsClentId
+      clientSecret: VjyqUkkM5Znu
+      loginSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/idp/loginsuccess
+      logoutSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/logoutsuccess
+    hpjy:  #idp
+      #oauthUrl: https://operator-api-test.etextbook.cn/cas
+      oauthUrl: https://sp.etextbook.cn/authcenter/auth
+      clientId: dsClentId
+      clientSecret: VjyqUkkM5Znu
+      loginSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/idp/loginsuccess
+      logoutSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/logoutsuccess
+
+
 oauthclient:
  clients:
    - clientName: 数字教材

--- a/eden-authcenter-agent/src/main/resources/bootstrap.yml
+++ b/eden-authcenter-agent/src/main/resources/bootstrap.yml
@@ -49,6 +49,112 @@ oauth:
      clientSecret: VjyqUkkM5Znu
      loginSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/idp/loginsuccess
      logoutSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/logoutsuccess
+    cmjy:  #idp
+      #oauthUrl: https://operator-api-test.etextbook.cn/cas
+      oauthUrl: https://sp.etextbook.cn/authcenter/auth
+      clientId: dsClentId
+      clientSecret: VjyqUkkM5Znu
+      loginSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/idp/loginsuccess
+      logoutSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/logoutsuccess
+    fxjy:  #idp
+      #oauthUrl: https://operator-api-test.etextbook.cn/cas
+      oauthUrl: https://sp.etextbook.cn/authcenter/auth
+      clientId: dsClentId
+      clientSecret: VjyqUkkM5Znu
+      loginSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/idp/loginsuccess
+      logoutSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/logoutsuccess
+    sjjy:  #idp
+      #oauthUrl: https://operator-api-test.etextbook.cn/cas
+      oauthUrl: https://sp.etextbook.cn/authcenter/auth
+      clientId: dsClentId
+      clientSecret: VjyqUkkM5Znu
+      loginSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/idp/loginsuccess
+      logoutSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/logoutsuccess
+    jsjy:  #idp
+      #oauthUrl: https://operator-api-test.etextbook.cn/cas
+      oauthUrl: https://sp.etextbook.cn/authcenter/auth
+      clientId: dsClentId
+      clientSecret: VjyqUkkM5Znu
+      loginSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/idp/loginsuccess
+      logoutSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/logoutsuccess
+    jdjy:  #idp
+      #oauthUrl: https://operator-api-test.etextbook.cn/cas
+      oauthUrl: https://sp.etextbook.cn/authcenter/auth
+      clientId: dsClentId
+      clientSecret: VjyqUkkM5Znu
+      loginSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/idp/loginsuccess
+      logoutSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/logoutsuccess
+    bsjy:  #idp
+      #oauthUrl: https://operator-api-test.etextbook.cn/cas
+      oauthUrl: https://sp.etextbook.cn/authcenter/auth
+      clientId: dsClentId
+      clientSecret: VjyqUkkM5Znu
+      loginSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/idp/loginsuccess
+      logoutSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/logoutsuccess
+    mhjy:  #idp
+      #oauthUrl: https://operator-api-test.etextbook.cn/cas
+      oauthUrl: https://sp.etextbook.cn/authcenter/auth
+      clientId: dsClentId
+      clientSecret: VjyqUkkM5Znu
+      loginSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/idp/loginsuccess
+      logoutSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/logoutsuccess
+    pdjy:  #idp
+      #oauthUrl: https://operator-api-test.etextbook.cn/cas
+      oauthUrl: https://sp.etextbook.cn/authcenter/auth
+      clientId: dsClentId
+      clientSecret: VjyqUkkM5Znu
+      loginSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/idp/loginsuccess
+      logoutSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/logoutsuccess
+    ypjy:  #idp
+      #oauthUrl: https://operator-api-test.etextbook.cn/cas
+      oauthUrl: https://sp.etextbook.cn/authcenter/auth
+      clientId: dsClentId
+      clientSecret: VjyqUkkM5Znu
+      loginSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/idp/loginsuccess
+      logoutSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/logoutsuccess
+    hkjy:  #idp
+      #oauthUrl: https://operator-api-test.etextbook.cn/cas
+      oauthUrl: https://sp.etextbook.cn/authcenter/auth
+      clientId: dsClentId
+      clientSecret: VjyqUkkM5Znu
+      loginSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/idp/loginsuccess
+      logoutSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/logoutsuccess
+    ptjy:  #idp
+      #oauthUrl: https://operator-api-test.etextbook.cn/cas
+      oauthUrl: https://sp.etextbook.cn/authcenter/auth
+      clientId: dsClentId
+      clientSecret: VjyqUkkM5Znu
+      loginSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/idp/loginsuccess
+      logoutSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/logoutsuccess
+    jajy:  #idp
+      #oauthUrl: https://operator-api-test.etextbook.cn/cas
+      oauthUrl: https://sp.etextbook.cn/authcenter/auth
+      clientId: dsClentId
+      clientSecret: VjyqUkkM5Znu
+      loginSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/idp/loginsuccess
+      logoutSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/logoutsuccess
+    cnjy:  #idp
+      #oauthUrl: https://operator-api-test.etextbook.cn/cas
+      oauthUrl: https://sp.etextbook.cn/authcenter/auth
+      clientId: dsClentId
+      clientSecret: VjyqUkkM5Znu
+      loginSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/idp/loginsuccess
+      logoutSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/logoutsuccess
+    xhjy:  #idp
+      #oauthUrl: https://operator-api-test.etextbook.cn/cas
+      oauthUrl: https://sp.etextbook.cn/authcenter/auth
+      clientId: dsClentId
+      clientSecret: VjyqUkkM5Znu
+      loginSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/idp/loginsuccess
+      logoutSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/logoutsuccess
+    hpjy:  #idp
+      #oauthUrl: https://operator-api-test.etextbook.cn/cas
+      oauthUrl: https://sp.etextbook.cn/authcenter/auth
+      clientId: dsClentId
+      clientSecret: VjyqUkkM5Znu
+      loginSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/idp/loginsuccess
+      logoutSuccessUrl: https://ds-test.etextbook.cn/authcenter/auth/logoutsuccess
+
 oauthclient:
  clients:
    - clientName: 数字教材

--- a/eden-authcenter-agent/src/main/resources/templates/ds.html
+++ b/eden-authcenter-agent/src/main/resources/templates/ds.html
@@ -9,52 +9,38 @@
    <script type="text/javascript" th:src="@{/static/js/browser.js}"></script>
    <script th:inline="javascript">
      /*<![CDATA[*/
-      var loginUrl1 = [[${loginUrl1}]];
-      var loginUrl2 = [[${loginUrl2}]];
-      var loginUrl3 = [[${loginUrl3}]];
-      var loginUrl4 = [[${loginUrl4}]];
-      var loginUrl5 = [[${loginUrl5}]];
-      var loginUrl6 = [[${loginUrl6}]];
-      var loginUrl7 = [[${loginUrl7}]];
-      var loginUrl8 = [[${loginUrl8}]];
-      var loginUrl9 = [[${loginUrl9}]];
-      var loginUrl10 = [[${loginUrl10}]];
-      var loginUrl11 = [[${loginUrl11}]];
-      var loginUrl12 = [[${loginUrl12}]];
-      var loginUrl13 = [[${loginUrl13}]];
-      var loginUrl14 = [[${loginUrl14}]];
-      var loginUrl15 = [[${loginUrl15}]];
-      var loginUrl16 = [[${loginUrl16}]];
+      var dianjiaoguanLoinUrl = [[${dianjiaoguanLoinUrl}]];
+      var edenoperationLoginUrl = [[${edenoperationLoginUrl}]];
      var logId = [[${logId}]];
      var loginType = [[${loginType}]];
      var ctxPath = /*[[@{/}]]*/ '';

      var idpList = {
-        qpjy: loginurl3,
-        hpjy: loginurl4,
-        xhjy: loginurl5,
-        cnjy: loginurl6,
-        ptjy: loginurl7,
-        hkjy: loginurl8,
-        ypjy: loginurl9,
-        pdjy: loginurl10,
-        mhjy: loginurl11,
-        bsjy: loginurl12,
-        jsjy: loginurl13,
-        sjjy: loginurl14,
-        fxjy: loginurl15,
-        cmjy: loginurl16,
-        jajy: '',
-        jdjy: '',
+        qpjy: [[${qpjyLoginUrl}]],
+        hpjy: [[${hpjyLoginUrl}]],
+        xhjy: [[${xhjyLoginUrl}]],
+        cnjy: [[${cnjyLoginUrl}]],
+        ptjy: [[${ptjyLoginUrl}]],
+        hkjy: [[${hkjyLoginUrl}]],
+        ypjy: [[${ypjyLoginUrl}]],
+        pdjy: [[${pdjyLoginUrl}]],
+        mhjy: [[${mhjyLoginUrl}]],
+        bsjy: [[${bsjyLoginUrl}]],
+        jsjy: [[${jsjyLoginUrl}]],
+        sjjy: [[${sjjyLoginUrl}]],
+        fxjy: [[${fxjyLoginUrl}]],
+        cmjy: [[${cmjyLoginUrl}]],
+        jajy: [[${jajyLoginUrl}]],
+        jdjy: [[${jdjyLoginUrl}]],
      }
      function toLogin(idp) {
        var info = new Browser();
        var baseUrl = ctxPath + "auth/tologin?logId="+logId+"&oauthType=";
        if (idp=="dianjiaoguan") {
-          window.location.href = baseUrl+ "dianjiaoguan&loginUrl=" + encodeURIComponent(loginUrl1)+"&browser="+info.browser+"&device="+info.device+"&os="+info.os+"&version="+info.version;
+          window.location.href = baseUrl+ "dianjiaoguan&loginUrl=" + encodeURIComponent(dianjiaoguanLoinUrl)+"&browser="+info.browser+"&device="+info.device+"&os="+info.os+"&version="+info.version;
        } else if (idp=="edenoperation") {
-          window.location.href = baseUrl+ "edenoperation&loginUrl=" + encodeURIComponent(loginUrl2)+"&browser="+info.browser+"&device="+info.device+"&os="+info.os+"&version="+info.version;
-        } else if (idpList[idp]) {
+          window.location.href = baseUrl+ "edenoperation&loginUrl=" + encodeURIComponent(edenoperationLoginUrl)+"&browser="+info.browser+"&device="+info.device+"&os="+info.os+"&version="+info.version;
+        } else {
          window.location.href = baseUrl+idp+"&loginUrl=" + encodeURIComponent(idpList[idp]+"&auth_source="+idp)+"&browser="+info.browser+"&device="+info.device+"&os="+info.os+"&version="+info.version;
        }
      }
@@ -151,14 +137,5 @@
    <div class="footer">
      <p class="footer-text">版权所有&copy;上海教育认证中心</p>
    </div>
-    <script th:inline="javascript">
-      /*<![CDATA[*/
-      var loginUrl1 = [[${loginUrl1}]];
-      var loginUrl2 = [[${loginUrl2}]];
-      var loginUrl3 = [[${loginUrl3}]];
-      var logId = [[${logId}]];
-      var ctxPath = /*[[@{/}]]*/ '';
-      /*]]>*/
-    </script>
  </body>
 </html>