diff --git a/niucloud-core/src/main/java/com/niu/core/controller/api/sys/SysConfigController.java b/niucloud-core/src/main/java/com/niu/core/controller/api/sys/SysConfigController.java index 334bea9b..c19dc5ef 100644 --- a/niucloud-core/src/main/java/com/niu/core/controller/api/sys/SysConfigController.java +++ b/niucloud-core/src/main/java/com/niu/core/controller/api/sys/SysConfigController.java @@ -1,5 +1,6 @@ package com.niu.core.controller.api.sys; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.niu.core.common.domain.Result; @@ -110,7 +111,12 @@ public class SysConfigController { vo.setTabbarList(diyService.tabbarList(new DiyTabbarListParam())); vo.setMapConfig(sysConfigService.map(new SysConfigMapParam())); vo.setLoginConfig(loginService.getLoginConfig()); - vo.setSiteInfo(coreSiteService.getSiteCache(RequestUtils.siteId())); + + SysInitVo.SiteInfoVo siteInfoVo = new SysInitVo.SiteInfoVo(); + BeanUtil.copyProperties(coreSiteService.getSiteCache(RequestUtils.siteId()), siteInfoVo); + siteInfoVo.setWapUrl(sysConfigService.sceneDomain(new SysConfigSceneDomainParam()).getWapUrl()); + + vo.setSiteInfo(siteInfoVo); vo.setMemberLevel(memberLevelService.list(new MemberLevelParam())); vo.setThemeList(diyThemeService.getDiyTheme()); vo.setAppConfig(appService.getAppConfig()); diff --git a/niucloud-core/src/main/java/com/niu/core/service/api/channel/IAppService.java b/niucloud-core/src/main/java/com/niu/core/service/api/channel/IAppService.java index cb926805..5877e4ea 100644 --- a/niucloud-core/src/main/java/com/niu/core/service/api/channel/IAppService.java +++ b/niucloud-core/src/main/java/com/niu/core/service/api/channel/IAppService.java @@ -1,11 +1,11 @@ package com.niu.core.service.api.channel; import com.niu.core.service.api.channel.param.GetNewVersionParam; +import com.niu.core.service.api.channel.vo.ApiAppConfigVo; import com.niu.core.service.api.channel.vo.NewVersionVo; import com.niu.core.service.api.login.vo.LoginVo; import com.niu.core.service.api.wechat.param.AuthRegisterParam; import com.niu.core.service.api.wechat.param.WechatAuthParam; -import com.niu.core.service.core.channel.vo.AppConfigVo; public interface IAppService { @@ -30,5 +30,5 @@ public interface IAppService { */ LoginVo register(AuthRegisterParam param); - AppConfigVo getAppConfig(); + ApiAppConfigVo getAppConfig(); } diff --git a/niucloud-core/src/main/java/com/niu/core/service/api/channel/impl/AppServiceImpl.java b/niucloud-core/src/main/java/com/niu/core/service/api/channel/impl/AppServiceImpl.java index 0aabb469..210ee0f7 100644 --- a/niucloud-core/src/main/java/com/niu/core/service/api/channel/impl/AppServiceImpl.java +++ b/niucloud-core/src/main/java/com/niu/core/service/api/channel/impl/AppServiceImpl.java @@ -14,6 +14,7 @@ import com.niu.core.mapper.sys.AppVersionMapper; import com.niu.core.service.admin.member.vo.LoginConfigVo; import com.niu.core.service.api.channel.IAppService; import com.niu.core.service.api.channel.param.GetNewVersionParam; +import com.niu.core.service.api.channel.vo.ApiAppConfigVo; import com.niu.core.service.api.channel.vo.NewVersionVo; import com.niu.core.service.api.login.ILoginService; import com.niu.core.service.api.login.IRegisterService; @@ -23,6 +24,8 @@ import com.niu.core.service.api.wechat.param.WechatAuthParam; import com.niu.core.service.core.channel.ICoreAppService; import com.niu.core.service.core.channel.vo.AppConfigVo; import com.niu.core.service.core.member.ICoreMemberConfigService; +import com.niu.core.service.core.weapp.ICoreWeappConfigService; +import com.niu.core.service.core.weapp.vo.WeappConfigVo; import jakarta.annotation.Resource; import me.chanjar.weixin.common.bean.WxOAuth2UserInfo; import me.chanjar.weixin.common.bean.oauth2.WxOAuth2AccessToken; @@ -50,6 +53,9 @@ public class AppServiceImpl implements IAppService { @Resource ICoreAppService coreAppService; + @Resource + ICoreWeappConfigService coreWeappConfigService; + @Override public LoginVo wechatLogin(WechatAuthParam param) { try { @@ -161,8 +167,14 @@ public class AppServiceImpl implements IAppService { } @Override - public AppConfigVo getAppConfig() { - return coreAppService.getConfig(RequestUtils.siteId()); + public ApiAppConfigVo getAppConfig() { + ApiAppConfigVo vo = new ApiAppConfigVo(); + AppConfigVo config = coreAppService.getConfig(RequestUtils.siteId()); + BeanUtil.copyProperties(config, vo); + + WeappConfigVo weappConfig = coreWeappConfigService.getWeappConfig(RequestUtils.siteId()); + vo.setWeappOriginal(weappConfig.getWeappOriginal()); + return vo; } public LoginVo wechatRegister(AuthRegisterParam param) { diff --git a/niucloud-core/src/main/java/com/niu/core/service/api/channel/vo/ApiAppConfigVo.java b/niucloud-core/src/main/java/com/niu/core/service/api/channel/vo/ApiAppConfigVo.java new file mode 100644 index 00000000..c8eb86c2 --- /dev/null +++ b/niucloud-core/src/main/java/com/niu/core/service/api/channel/vo/ApiAppConfigVo.java @@ -0,0 +1,27 @@ +package com.niu.core.service.api.channel.vo; + +import lombok.Data; + +/** + * APP配置信息VO + */ +@Data +public class ApiAppConfigVo { + + /** + * 微信AppID + */ + private String wechatAppId; + + /** + * UniApp ID + */ + private String uniAppId; + + /** + * App名称 + */ + private String appName; + + private String weappOriginal; +} \ No newline at end of file diff --git a/niucloud-core/src/main/java/com/niu/core/service/api/sys/vo/SysInitVo.java b/niucloud-core/src/main/java/com/niu/core/service/api/sys/vo/SysInitVo.java index 5b804919..f3ca1647 100644 --- a/niucloud-core/src/main/java/com/niu/core/service/api/sys/vo/SysInitVo.java +++ b/niucloud-core/src/main/java/com/niu/core/service/api/sys/vo/SysInitVo.java @@ -2,10 +2,9 @@ package com.niu.core.service.api.sys.vo; import cn.hutool.json.JSONObject; import com.niu.core.service.admin.sys.vo.SysMapVo; +import com.niu.core.service.api.channel.vo.ApiAppConfigVo; import com.niu.core.service.api.member.vo.MemberLevelInfoVo; -import com.niu.core.service.core.channel.vo.AppConfigVo; import com.niu.core.service.core.diy.vo.BottomConfigVo; -import com.niu.core.service.admin.site.vo.SiteInfoVo; import lombok.Data; import com.niu.core.service.admin.member.vo.LoginConfigVo; @@ -20,7 +19,16 @@ public class SysInitVo { private List memberLevel; private LoginConfigVo loginConfig; private JSONObject themeList; - private AppConfigVo appConfig; + private ApiAppConfigVo appConfig; private Integer memberExist = 0; private Integer memberMobileExist = 0; + + @Data + public static class SiteInfoVo extends com.niu.core.service.admin.site.vo.SiteInfoVo { + private String wapUrl; + + public String getWapUrl() { + return wapUrl; + } + } } diff --git a/webroot/jar/web-app-exec.jar b/webroot/jar/web-app-exec.jar index c475f45f..816d5378 100644 Binary files a/webroot/jar/web-app-exec.jar and b/webroot/jar/web-app-exec.jar differ diff --git a/webroot/public/wap/index.html b/webroot/public/wap/index.html index 5289fda7..2d8225fe 100644 --- a/webroot/public/wap/index.html +++ b/webroot/public/wap/index.html @@ -14,7 +14,7 @@ 商城 - +