去掉首页、分类页必须登陆功能及其去掉不必要的信息,不然小程序审核不通过的
This commit is contained in:
1 parent
a56f719066
commit
dc4d388c5c
16 files changed
+30
-149
No files matched your search
@@ -222,7 +222,6 @@
|
|||||||
<module>ruoyi-generator</module>
|
<module>ruoyi-generator</module>
|
||||||
<module>ruoyi-common</module>
|
<module>ruoyi-common</module>
|
||||||
<module>ruoyi-api</module>
|
<module>ruoyi-api</module>
|
||||||
<module>ruoyi-plus-api</module>
|
|
||||||
</modules>
|
</modules>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
|
|||||||
@@ -1,29 +1,6 @@
|
|||||||
/**
|
|
||||||
* Copyright 2019-2029 geekidea(https://github.com/geekidea)
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.ruoyi.app.common.api;
|
package com.ruoyi.app.common.api;
|
||||||
|
|
||||||
/**
|
|
||||||
* <p>
|
|
||||||
* REST API 响应码
|
|
||||||
* </p>
|
|
||||||
*
|
|
||||||
* @author geekidea
|
|
||||||
* @since 2018-11-08
|
|
||||||
*/
|
|
||||||
public enum ApiCode {
|
public enum ApiCode {
|
||||||
|
|
||||||
SUCCESS(200, "操作成功"),
|
SUCCESS(200, "操作成功"),
|
||||||
|
|||||||
@@ -1,31 +1,9 @@
|
|||||||
/**
|
|
||||||
* Copyright 2019-2029 geekidea(https://github.com/geekidea)
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.ruoyi.app.common.api;
|
package com.ruoyi.app.common.api;
|
||||||
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
|
||||||
/**
|
|
||||||
* <p>
|
|
||||||
* ApiResultEST API 公共控制器
|
|
||||||
* </p>
|
|
||||||
*
|
|
||||||
* @author geekidea
|
|
||||||
* @since 2018-11-08
|
|
||||||
*/
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
public class ApiController {
|
public class ApiController {
|
||||||
|
|
||||||
|
|||||||
@@ -1,19 +1,3 @@
|
|||||||
/**
|
|
||||||
* Copyright 2019-2029 geekidea(https://github.com/geekidea)
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.ruoyi.app.common.api;
|
package com.ruoyi.app.common.api;
|
||||||
|
|
||||||
import com.alibaba.fastjson.annotation.JSONField;
|
import com.alibaba.fastjson.annotation.JSONField;
|
||||||
@@ -29,14 +13,7 @@ import java.util.Date;
|
|||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
|
||||||
* <p>
|
|
||||||
* REST API 返回结果
|
|
||||||
* </p>
|
|
||||||
*
|
|
||||||
* @author geekidea
|
|
||||||
* @since 2018-11-08
|
|
||||||
*/
|
|
||||||
@Data
|
@Data
|
||||||
@Accessors(chain = true)
|
@Accessors(chain = true)
|
||||||
@Builder
|
@Builder
|
||||||
|
|||||||
@@ -1,19 +1,3 @@
|
|||||||
/**
|
|
||||||
* Copyright 2019-2029 geekidea(https://github.com/geekidea)
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.ruoyi.app.common.api;
|
package com.ruoyi.app.common.api;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
||||||
@@ -24,15 +8,7 @@ import com.baomidou.mybatisplus.extension.exceptions.ApiException;
|
|||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
|
||||||
* <p>
|
|
||||||
* REST API 业务断言<br>
|
|
||||||
* 参考:org.junit.Assert
|
|
||||||
* </p>
|
|
||||||
*
|
|
||||||
* @author geekidea
|
|
||||||
* @since 2018-11-08
|
|
||||||
*/
|
|
||||||
public class Assert {
|
public class Assert {
|
||||||
|
|
||||||
protected Assert() {
|
protected Assert() {
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
|
|
||||||
|
|
||||||
package com.ruoyi.app.common.constant;
|
package com.ruoyi.app.common.constant;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
|
|
||||||
|
|
||||||
package com.ruoyi.app.common.constant;
|
package com.ruoyi.app.common.constant;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
|
|
||||||
|
|
||||||
package com.ruoyi.app.common.constant;
|
package com.ruoyi.app.common.constant;
|
||||||
|
|
||||||
public interface CommonRedisKey {
|
public interface CommonRedisKey {
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
|
|
||||||
|
|
||||||
package com.ruoyi.app.common.constant;
|
package com.ruoyi.app.common.constant;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
package com.ruoyi.app.common.entity;
|
package com.ruoyi.app.common.entity;
|
||||||
|
|
||||||
import io.swagger.annotations.ApiModel;
|
import io.swagger.annotations.ApiModel;
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
package com.ruoyi.app.common.service;
|
package com.ruoyi.app.common.service;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
|
|||||||
@@ -1,19 +1,3 @@
|
|||||||
/**
|
|
||||||
* Copyright 2019-2029 geekidea(https://github.com/geekidea)
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.ruoyi.app.common.service.impl;
|
package com.ruoyi.app.common.service.impl;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
@@ -28,10 +12,7 @@ import org.apache.commons.collections.CollectionUtils;
|
|||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
|
||||||
* @author geekidea
|
|
||||||
* @date 2018-11-08
|
|
||||||
*/
|
|
||||||
public abstract class BaseServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M, T> implements BaseService<T> {
|
public abstract class BaseServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M, T> implements BaseService<T> {
|
||||||
|
|
||||||
protected Page setPageParam(QueryParam queryParam) {
|
protected Page setPageParam(QueryParam queryParam) {
|
||||||
|
|||||||
@@ -41,7 +41,8 @@ public class IndexController {
|
|||||||
@GetMapping("/shop/index-list")
|
@GetMapping("/shop/index-list")
|
||||||
@ApiOperation(value = "首页信息",notes = "首页信息")
|
@ApiOperation(value = "首页信息",notes = "首页信息")
|
||||||
public R index(){
|
public R index(){
|
||||||
int userId = userOperator.getUser().getId();
|
//int userId = userOperator.getUser().getId();
|
||||||
|
int userId = 0;
|
||||||
List<GoodsDTO> recommedGoods = goodsService.getList(0,1,3,userId,"",1);
|
List<GoodsDTO> recommedGoods = goodsService.getList(0,1,3,userId,"",1);
|
||||||
List<GoodsDTO> newGoods = goodsService.getList(0,1,6,userId,"",2);
|
List<GoodsDTO> newGoods = goodsService.getList(0,1,6,userId,"",2);
|
||||||
List<NewsDTO> newsList = newsService.getList(1,3);
|
List<NewsDTO> newsList = newsService.getList(1,3);
|
||||||
|
|||||||
@@ -46,7 +46,8 @@ public class MallController {
|
|||||||
@ApiOperation(value = "商品分类模块列表",notes = "商品分类模块列表")
|
@ApiOperation(value = "商品分类模块列表",notes = "商品分类模块列表")
|
||||||
public R lists(@RequestParam(value = "page",defaultValue = "0") int page,
|
public R lists(@RequestParam(value = "page",defaultValue = "0") int page,
|
||||||
@RequestParam(value = "limit",defaultValue = "10") int limit){
|
@RequestParam(value = "limit",defaultValue = "10") int limit){
|
||||||
int userId = userOperator.getUser().getId();
|
//int userId = userOperator.getUser().getId();
|
||||||
|
int userId = 0;
|
||||||
List<CateDTO> goodsCates = cateService.getList();
|
List<CateDTO> goodsCates = cateService.getList();
|
||||||
List<GoodsDTO> recommedGoods = goodsService.getList(0,
|
List<GoodsDTO> recommedGoods = goodsService.getList(0,
|
||||||
page,limit,userId,"",1);
|
page,limit,userId,"",1);
|
||||||
|
|||||||
@@ -9,12 +9,12 @@ light-security:
|
|||||||
- http-method: ANY
|
- http-method: ANY
|
||||||
path: /shop/notify
|
path: /shop/notify
|
||||||
expression: "anon()"
|
expression: "anon()"
|
||||||
# - http-method: ANY
|
- http-method: get
|
||||||
# path: /shop/index-list
|
path: /shop/index-list
|
||||||
# expression: "anon()"
|
expression: "anon()"
|
||||||
# - http-method: ANY
|
- http-method: get
|
||||||
# path: /shop/mall-lists
|
path: /shop/mall-lists
|
||||||
# expression: "anon()"
|
expression: "anon()"
|
||||||
- http-method: get
|
- http-method: get
|
||||||
path: /doc.html
|
path: /doc.html
|
||||||
expression: "anon()"
|
expression: "anon()"
|
||||||
@@ -68,8 +68,9 @@ spring:
|
|||||||
driver-class-name: com.p6spy.engine.spy.P6SpyDriver
|
driver-class-name: com.p6spy.engine.spy.P6SpyDriver
|
||||||
#driverClassName: com.mysql.cj.jdbc.Driver
|
#driverClassName: com.mysql.cj.jdbc.Driver
|
||||||
username: root
|
username: root
|
||||||
password: root
|
password: supply#@147
|
||||||
url: jdbc:p6spy:mysql://localhost:3306/ruoyi?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=UTC
|
#password: root
|
||||||
|
url: jdbc:p6spy:mysql://localhost:3306/supply?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=UTC
|
||||||
#url: jdbc:mysql://localhost:3306/ruoyi?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=UTC
|
#url: jdbc:mysql://localhost:3306/ruoyi?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=UTC
|
||||||
type: com.alibaba.druid.pool.DruidDataSource #这里是配置druid连接池,以下都是druid的配置信息
|
type: com.alibaba.druid.pool.DruidDataSource #这里是配置druid连接池,以下都是druid的配置信息
|
||||||
druid:
|
druid:
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
|
//
|
||||||
package com.ruoyi.plus.test;
|
//package com.ruoyi.plus.test;
|
||||||
|
//
|
||||||
import org.junit.runner.RunWith;
|
//import org.junit.runner.RunWith;
|
||||||
import org.springframework.boot.test.context.SpringBootTest;
|
//import org.springframework.boot.test.context.SpringBootTest;
|
||||||
import org.springframework.test.context.junit4.SpringRunner;
|
//import org.springframework.test.context.junit4.SpringRunner;
|
||||||
|
//
|
||||||
@RunWith(SpringRunner.class)
|
//@RunWith(SpringRunner.class)
|
||||||
@SpringBootTest
|
//@SpringBootTest
|
||||||
public class BaseTest {
|
//public class BaseTest {
|
||||||
|
//
|
||||||
}
|
//}
|
||||||
Reference in new issue
Block a user