添加登录退出接口

jpress-web-core/src/main/config/sso.properties

@@ -1,3 +1,4 @@
 sso.app=cms
 sso.secret-key=0taQcW073Z7G628g5H
-sso.cookie.browser=false
+sso.cookie.browser=false
+sso.cookie.domain=usoftchina.com

jpress-web-core/src/main/java/io/jpress/Config.java

@@ -69,6 +69,7 @@ public class Config extends JpressConfig {
 		SSOConfig ssoConfig = SSOHelper.getSSOService().getConfig();
 		ssoConfig.setAppName(PropKit.use("sso.properties").get("sso.app"));
 		ssoConfig.setSecretkey(PropKit.use("sso.properties").get("sso.secret-key"));
+		ssoConfig.setCookieDomain(PropKit.use("sso.properties").get("sso.cookie.domain"));
 		SSOHelper.getSSOService().getConfig().setCookieBrowser(PropKit.use("sso.properties").getBoolean("sso.cookie.browser"));
 	}
 

jpress-web-core/src/main/java/io/jpress/ui/freemarker/tag/ApiDataTag.java

@@ -64,7 +64,7 @@ public class ApiDataTag extends JTag {
 	 */
 	public static void initCollection() {
 		// 商城最新询价
-		apiDataCollection.put("mall_inquiry_new", new ApiData("mall_inquiry_new", "https://www.usoftmall.com/inquiry/public?pageNumber=1&pageSize=12"));
+		apiDataCollection.put("mall_inquiry_new", new ApiData("mall_inquiry_new", "https://api-inquiry.usoftmall.com/inquiry/public?pageNumber=1&pageSize=12"));
 		// 商城热卖店铺
 		apiDataCollection.put("mall_stores_hot", new ApiData("mall_stores_hot", "https://www.usoftmall.com/api/store-service/stores?page=1&count=8&type=AGENCY-DISTRIBUTION&field=&op=similar"));
 		// 商城热卖产品

jpress-web-front/src/main/java/io/jpress/front/controller/SsoLoginController.java

@@ -44,4 +44,22 @@ public class SsoLoginController extends BaseFrontController {
             return StringUtils.isBlank(ssoToken.getData()) ? null : JSON.parseObject(ssoToken.getData(), UserAccount.class);
         }
     }
+
+    public void loginOther() {
+        UserAccount userAccount = new UserAccount();
+        userAccount.setUserUU(getParaToLong("userUU"));
+        userAccount.setSpaceUU(getParaToLong("spaceUU"));
+        userAccount.setVipName(getPara("vipName"));
+        userAccount.setSpaceName(getPara("spaceName"));
+        userAccount.setMobile(getPara("mobile"));
+        SSOToken st = new SSOToken(getRequest(), userAccount.getMobile());
+        st.setData(JSON.toJSONString(userAccount));
+        SSOHelper.setSSOCookie(getRequest(), getResponse(), st, true);
+        renderText(getPara("callback") + "({success:'1'})");
+    }
+
+    public void logout() {
+        SSOHelper.clearLogin(getRequest(), getResponse());
+        renderText(getPara("callback") + "({success:'1'})");
+    }
 }

jpress-web-template-mallcms/src/main/webapp/templates/mallcms/_layout.html

@@ -53,7 +53,7 @@
                 <ul>
                     <li class="active"><a href="${CPATH}/">首页</a></li>
                     <li><a href="https://www.usoftmall.com/">U软商城</a></li>
-                    <li><a href="http://www.yitoa-fintech.com/">U智金融</a></li>
+                    <li><a href="https://fin.ubtob.com">U智金融</a></li>
                     <li><a href="https://zb.uuzcc.com/">U创网</a></li>
                     <li><a href="http://uas.usoftchina.com/">UAS</a></li>
                     <li><a href="http://bbs.uuzcc.com/">U客论坛</a></li>

jpress-web-template-mallcms/src/main/webapp/templates/mallcms/assets/js/index.js

@@ -76,8 +76,10 @@ $(function () {
         });
 
     })
-    $('.case_indus_list:first-child').addClass('active')
-    $('.u_items:nth-child(2)').addClass('active')
+    $(document).ready(function(){
+        $('.case_indus_list:first-child').addClass('active')
+        $('.u_items:nth-child(2)').addClass('active')
+    });
     // u客论坛
     // $('.k_item_list').on('click', function () {
     //     $(this).addClass('active').siblings().removeClass('active');
@@ -163,7 +165,11 @@ $(function () {
         dataType: "json",
         success: function (data) {
             if (data.success && data.userAccount) {
-                $('#username').html(data.userAccount.vipName + '  |  ' + data.userAccount.spaceName);
+                if (data.userAccount.spaceName) {
+                    $('#username').html(data.userAccount.vipName + '  |  ' + data.userAccount.spaceName);
+                } else {
+                    $('#username').html(data.userAccount.vipName);
+                }
                 $('.login').show();
                 $('.unLogin').hide();
             } else {

jpress-web-template-mallcms/src/main/webapp/templates/mallcms/index.html

@@ -154,29 +154,6 @@
 		<div class="str-bus"><span class="tabs"></span>实力商家</div>
 		<div class="dynamic-scroll">
 			<div class="scroll">
-				<!--<@jp.apiData id="mall_stores_hot">
-                    <#assign text >
-                        ${data!}
-                    </#assign>
-                    <#assign json=text?eval />
-                    <#list json.content as item>
-
-                        <div class="item-list">
-                            <img src="${item.logoUrl!}" alt="">
-                            <div class="text">
-                                <a href="" class="comp">${item.storeName}</a>
-                                <div class="store-des">
-                                    <span class="text-ellipsis">主营产品：<span>${item.description!'-'}</span></span>
-                                    <span class="text-ellipsis">经营范围：<span>${item.storeApplication!'-'}</span></span>
-                                    <span class="text-ellipsis">电话：<span>${item.enterprise.enTel!'-'}</span></span>
-                                    <span class="text-ellipsis">地址：<span>${item.enterprise.enAddress!'-'}</span></span>
-                                </div>
-                            </div>
-                            <a href="" class="btn">进入店铺 &gt;</a>
-                        </div>
-
-                    </#list>
-                </@jp.apiData>-->
 				<div class="item-list">
 					<img src="https://dfs.ubtob.com/group1/M00/61/CA/CgpkyFpHWVaAOfN0AAB2E7dkjxM082.jpg" alt="">
 					<div class="text">