正品联盟part6

pom.xml

@@ -13,7 +13,6 @@
     <artifactId>caimei-zplm-admin-api</artifactId>
     <version>0.0.1-SNAPSHOT</version>
 
-
     <properties>
         <java.version>1.8</java.version>
         <!--maven.build.timestamp保存了maven编译时间戳-->
@@ -22,165 +21,6 @@
         <maven.build.timestamp.format>yyyyMMdd-HHmmss</maven.build.timestamp.format>
     </properties>
 
-
-<!--    <dependencies>-->
-<!--        &lt;!&ndash;-->
-<!--        添加此依赖会导致跨域问题，用org.apache.tomcat.embed代替-->
-<!--        &ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-starter-web</artifactId>-->
-<!--        </dependency>-->
-
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-starter-thymeleaf</artifactId>-->
-<!--        </dependency>-->
-<!--        &lt;!&ndash;<dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-starter-webflux</artifactId>-->
-<!--        </dependency>&ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>mysql</groupId>-->
-<!--            <artifactId>mysql-connector-java</artifactId>-->
-<!--            <scope>runtime</scope>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>org.mybatis.spring.boot</groupId>-->
-<!--            <artifactId>mybatis-spring-boot-starter</artifactId>-->
-<!--            <version>2.1.1</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-configuration-processor</artifactId>-->
-<!--            <optional>true</optional>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-starter-cache</artifactId>-->
-<!--        </dependency>-->
-<!--        &lt;!&ndash; redis依赖包 &ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-starter-data-redis</artifactId>-->
-<!--            <exclusions>-->
-<!--                <exclusion>-->
-<!--                    <groupId>io.lettuce</groupId>-->
-<!--                    <artifactId>lettuce-core</artifactId>-->
-<!--                </exclusion>-->
-<!--            </exclusions>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>redis.clients</groupId>-->
-<!--            <artifactId>jedis</artifactId>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-devtools</artifactId>-->
-<!--            <scope>provided</scope>-->
-<!--            <optional>true</optional>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>org.projectlombok</groupId>-->
-<!--            <artifactId>lombok</artifactId>-->
-<!--            <optional>true</optional>-->
-<!--        </dependency>-->
-
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-starter-test</artifactId>-->
-<!--            <scope>test</scope>-->
-<!--            <exclusions>-->
-<!--                <exclusion>-->
-<!--                    <groupId>org.junit.vintage</groupId>-->
-<!--                    <artifactId>junit-vintage-engine</artifactId>-->
-<!--                </exclusion>-->
-<!--            </exclusions>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>io.projectreactor</groupId>-->
-<!--            <artifactId>reactor-test</artifactId>-->
-<!--            <scope>test</scope>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>junit</groupId>-->
-<!--            <artifactId>junit</artifactId>-->
-<!--            <scope>test</scope>-->
-<!--        </dependency>-->
-
-<!--        <dependency>-->
-<!--            <groupId>com.github.pagehelper</groupId>-->
-<!--            <artifactId>pagehelper-spring-boot-starter</artifactId>-->
-<!--            <version>1.2.5</version>-->
-<!--            <exclusions>-->
-<!--                <exclusion>-->
-<!--                    <artifactId>mybatis-spring-boot-starter</artifactId>-->
-<!--                    <groupId>org.mybatis.spring.boot</groupId>-->
-<!--                </exclusion>-->
-<!--            </exclusions>-->
-<!--        </dependency>-->
-
-<!--        <dependency>-->
-<!--            <groupId>com.alibaba</groupId>-->
-<!--            <artifactId>fastjson</artifactId>-->
-<!--            <version>1.2.6</version>-->
-<!--        </dependency>-->
-
-<!--        &lt;!&ndash;手机短信&ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>caimei</groupId>-->
-<!--            <artifactId>smsClient</artifactId>-->
-<!--            <version>1.0</version>-->
-<!--        </dependency>-->
-
-<!--        &lt;!&ndash;knife4j接口文档&ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>com.github.xiaoymin</groupId>-->
-<!--            <artifactId>knife4j-spring-boot-starter</artifactId>-->
-<!--            <version>3.0.2</version>-->
-<!--        </dependency>-->
-
-<!--        <dependency>-->
-<!--            <groupId>org.apache.httpcomponents</groupId>-->
-<!--            <artifactId>httpclient</artifactId>-->
-<!--            <version>4.5.7</version>-->
-<!--        </dependency>-->
-
-<!--        &lt;!&ndash; jwt &ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>com.auth0</groupId>-->
-<!--            <artifactId>java-jwt</artifactId>-->
-<!--            <version>3.14.0</version>-->
-<!--        </dependency>-->
-
-<!--        &lt;!&ndash; 阿里云短信sdk &ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>com.aliyun</groupId>-->
-<!--            <artifactId>aliyun-java-sdk-core</artifactId>-->
-<!--            <version>4.5.18</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>com.aliyun</groupId>-->
-<!--            <artifactId>aliyun-java-sdk-dysmsapi</artifactId>-->
-<!--            <version>2.1.0</version>-->
-<!--        </dependency>-->
-
-<!--        &lt;!&ndash;对象存储oss&ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>com.aliyun.oss</groupId>-->
-<!--            <artifactId>aliyun-sdk-oss</artifactId>-->
-<!--            <version>3.10.2</version>-->
-<!--        </dependency>-->
-
-<!--        &lt;!&ndash;dfs&ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>com.github.tobato</groupId>-->
-<!--            <artifactId>fastdfs-client</artifactId>-->
-<!--            <version>1.26.1-RELEASE</version>-->
-<!--        </dependency>-->
-<!--    </dependencies>-->
-
-
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

src/main/java/com/caimei/model/vo/ShopFormVo.java

@@ -90,7 +90,7 @@ public class ShopFormVo implements Serializable {
      * 声明链接
      */
     @ApiModelProperty("声明链接")
-    private String statementlink;
+    private String statementLink;
 
     /**
      * 声明图片

src/main/java/com/caimei/service/impl/ShopServiceImpl.java

@@ -1,6 +1,5 @@
 package com.caimei.service.impl;
 
-import com.caimei.components.RedisService;
 import com.caimei.mapper.ShopMapper;
 import com.caimei.mapper.UserMapper;
 import com.caimei.model.ResponseJson;
@@ -23,7 +22,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 import java.io.FileInputStream;
 import java.util.Date;
@@ -91,6 +89,7 @@ public class ShopServiceImpl implements ShopService {
 
     @Override
     public ResponseJson<Integer> uploadFile(Integer authUserId, MultipartFile file) {
+        authUserId = (null != authUserId && authUserId > 0) ? authUserId : null;
         String fileAllName = file.getOriginalFilename();
         String fileType = fileAllName.substring(fileAllName.lastIndexOf(".") + 1);
         String fileName = file.getResource().getFilename();
@@ -141,7 +140,9 @@ public class ShopServiceImpl implements ShopService {
         CmBrandAuthFilePo oldFile = shopMapper.getStatementFile(searchFile);
         if (oldFile != null) {
             Integer num = shopMapper.getFileNumByMd5Hex(oldFile.getMd5Hex());
+            log.info(">>>>>>>>>>>>>>>文件使用数:" + num);
             if (num == 1) {
+                log.info(">>>>>>>>>>>>>>>删除文件:" + oldFile.getOssName());
                 // 如果这个文件只有这个供应商在使用，删除oss服务器上的文件
                 OSSUtils.deleteSingleFile(oldFile.getOssName());
             }
@@ -202,7 +203,7 @@ public class ShopServiceImpl implements ShopService {
             }
             // 插入供应商用户
             shopMapper.insertShop(shop);
-            log.info("添加供应商，供应商用户id：" + shop.getAuthUserId() + ",密码：" + password);
+            log.info("添加供应商，供应商用户id：" + shop.getAuthUserId());
         } else {
             shop.setAuthUserId(shopSaveDto.getAuthUserId());
             // 更新供应商用户

src/main/java/com/caimei/service/impl/UserServiceImpl.java

@@ -114,7 +114,7 @@ public class UserServiceImpl implements UserService {
         // 更新密码
         newPassword = Md5Util.md5(newPassword);
         userMapper.updatePasswordByUserId(authUserId, newPassword);
-        log.info("用户修改密码，用户id：" + authUserId + "，新密码：" + newPassword);
+        log.info("用户修改密码，用户id：" + authUserId);
         return ResponseJson.success("密码修改成功");
     }
 

src/main/java/com/caimei/utils/OSSUtils.java

@@ -182,7 +182,7 @@ public class OSSUtils {
         OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
         // 删除文件。如需删除文件夹，请将ObjectName设置为对应的文件夹名称。
         // 如果文件夹非空，则需要将文件夹下的所有object删除后才能删除该文件夹。
-        ossClient.deleteObject(privateBucket, fileName);
+        ossClient.deleteObject(privateBucket, active + "/" + fileName);
         // 关闭OSSClient。
         ossClient.shutdown();
     }

src/main/resources/config/beta/application-beta.yml

@@ -18,12 +18,12 @@ spring:
   #数据源连接--end
 
   redis:
-    #    host: 10.104.50.235
-    #    port: 6379
-    #    #password: 6#xsI%b4o@5c3RoE
-    host: 47.119.112.46
+    host: 10.104.50.235
     port: 6379
-    password: 6#xsI%b4o@5c3RoE
+        #password: 6#xsI%b4o@5c3RoE
+#    host: 47.119.112.46
+#    port: 6379
+#    password: 6#xsI%b4o@5c3RoE
     #Redis数据库索引（默认为0）
     database: 0
     #连接池最大连接数（使用负值表示没有限制）
@@ -48,7 +48,7 @@ spring:
 #日志配置
 logging:
   file:
-    path: /mnt/newdatadrive/data/runtime/jar-instance/mall2b/logs
+    path: /mnt/newdatadrive/data/runtime/tomcat-instance/zplma/logs
   level:
     root: info
 
@@ -56,20 +56,10 @@ logging:
 swagger:
   enabled: false
 
-#自定义配置
-wx:
-  AppId: wxca7172d7a20bdf7a
-  AppSecret: d7f853a64b73d01ef93f3829852a790e
-  crmAppId: wxea43a0f9ebce9e66
-  crmAppSecret: 1c3cd60908e72dd280840bee9e15f7f6
-
 # 新旧www服务域名
 caimei:
   oldapi: https://www-b.caimei365.com
-  #支付异步回调地址
-  notifyUrl: https://spi-b.caimei365.com/PayOrder/paymentCallback
-  #支付链接重定向地址
-  redirectLink: https://spi-b.caimei365.com/PayOrder/jumpPage
+  zplmapi: https://zplma-b.caimei365.com
   #图片服务器
   imageDomain: https://img-b.caimei365.com
 
@@ -81,4 +71,4 @@ fdfs:
     width: 150
     height: 150
   tracker-list:            #TrackerList参数,支持多个
-    - 119.29.0.46:22122
+    - 10.104.50.235:22122

src/main/resources/config/dev/application-dev.yml

@@ -53,21 +53,10 @@ logging:
 swagger:
   enabled: true
 
-#自定义配置
-wx:
-  AppId: wxca7172d7a20bdf7a
-  AppSecret: d7f853a64b73d01ef93f3829852a790e
-  crmAppId: wxea43a0f9ebce9e66
-  crmAppSecret: 1c3cd60908e72dd280840bee9e15f7f6
-
 # 新旧www服务域名
 caimei:
   oldapi: http://localhost:8100
   zplmapi: http://localhost:8012
-  #支付异步回调地址
-  notifyUrl: https://spi-b.caimei365.com/PayOrder/paymentCallback
-  #支付链接重定向地址
-  redirectLink: https://spi-b.caimei365.com/PayOrder/jumpPage
   #图片服务器
   imageDomain: https://img-b.caimei365.com
 

src/main/resources/config/prod/application-prod.yml

@@ -53,21 +53,10 @@ logging:
 swagger:
   enabled: false
 
-
-#自定义配置
-wx:
-  AppId: wxca7172d7a20bdf7a
-  AppSecret: d7f853a64b73d01ef93f3829852a790e
-  crmAppId: wxea43a0f9ebce9e66
-  crmAppSecret: 1c3cd60908e72dd280840bee9e15f7f6
-
 # 新旧www服务域名
 caimei:
   oldapi: https://www.caimei365.com
-  #支付异步回调地址
-  notifyUrl: https://spi.caimei365.com/PayOrder/paymentCallback
-  #支付链接重定向地址
-  redirectLink: https://spi.caimei365.com/PayOrder/jumpPage
+  zplmapi: https://zplma.caimei365.com
   #图片服务器
   imageDomain: https://img.caimei365.com
 

src/main/resources/mapper/ShopMapper.xml

@@ -147,7 +147,7 @@
         select id,name,authLogo from cm_brand
         <where>
             <if test="type == 1">
-                id not in (select brandId from cm_brand_auth_shop_info where type = 1)
+                id not in (select brandId from cm_brand_auth_shop_info where type = 1 and brandId is not null)
             </if>
         </where>
     </select>

src/test/java/com/caimei/AdminApplicationTests.java

@@ -1,6 +1,7 @@
 package com.caimei;
 
 import com.caimei.utils.JwtUtil;
+import com.caimei.utils.OSSUtils;
 import org.junit.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
@@ -9,8 +10,6 @@ public class AdminApplicationTests {
 
     @Test
     public void JWTToken(){
-        System.out.println(JwtUtil.createToken(111));
-        System.out.println(JwtUtil.createToken(222));
-        System.out.println(JwtUtil.createToken(111));
+        OSSUtils.deleteSingleFile("5dbb6eb668174438ae5f9b5a1d99f7cf.ppt");
     }
 }