1.增加渠道商模块

cneeds-common-data/db/cneeds_server.sql

@@ -293,4 +293,29 @@ ALTER TABLE `cneeds_server`.`device_info`
 ADD UNIQUE INDEX `IMEI_UNIQUE`(`imei`) USING BTREE COMMENT 'imei唯一';
 
 ALTER TABLE `cneeds_server`.`product_series`
-ADD UNIQUE INDEX `SERIES_NUM_UNIQUE`(`series_num`) USING BTREE COMMENT '系列号唯一';
\ No newline at end of file
+ADD UNIQUE INDEX `SERIES_NUM_UNIQUE`(`series_num`) USING BTREE COMMENT '系列号唯一';
+
+
+-- 202-05-09
+-- ----------------------------
+-- Table structure for device_channel
+-- 渠道号表
+-- ----------------------------
+CREATE TABLE `device_channel` (
+  `channel_id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `channel_num` varchar(255) DEFAULT NULL COMMENT '渠道号',
+  `brand` varchar(255) DEFAULT NULL COMMENT '品牌',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`channel_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- ----------------------------
+-- Table structure for device_info_channel
+-- 设备信息 - 渠道号 映射表
+-- ----------------------------
+CREATE TABLE `device_info_channel` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `device_id` bigint(20) DEFAULT NULL,
+  `channel_id` bigint(20) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
\ No newline at end of file

cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/DeviceChannelDao.java

+package com.mx.cneeds.server.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mx.cneeds.server.entity.DeviceChannelEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @ClassName DeviceChannelDao
+ * @Author zzrdark
+ * @Date 2020-05-09 15:28
+ * @Description TODO
+ **/
+@Mapper
+public interface DeviceChannelDao extends BaseMapper<DeviceChannelEntity> {
+}

cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/DeviceInfoChannelDao.java

+package com.mx.cneeds.server.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mx.cneeds.server.entity.DeviceInfoChannelEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @ClassName DeviceInfoChannelDao
+ * @Author zzrdark
+ * @Date 2020-05-09 15:28
+ * @Description TODO
+ **/
+@Mapper
+public interface DeviceInfoChannelDao extends BaseMapper<DeviceInfoChannelEntity> {
+}

cneeds-common-data/src/main/java/com/mx/cneeds/server/entity/DeviceChannelEntity.java

+package com.mx.cneeds.server.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName DeviceChannelEntity
+ * @Author zzrdark
+ * @Date 2020-05-09 15:28
+ * @Description TODO
+ **/
+@Data
+public class DeviceChannelEntity implements Serializable {
+
+    /**
+     * 渠道号Id
+     */
+    @TableId
+    private Long channelId;
+
+    /**
+     * 渠道号
+     */
+    private String channelNum;
+
+    /**
+     * 品牌
+     */
+    private String brand;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+}

cneeds-common-data/src/main/java/com/mx/cneeds/server/entity/DeviceInfoChannelEntity.java

+package com.mx.cneeds.server.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @ClassName DeviceInfoChannelEntity
+ * @Author zzrdark
+ * @Date 2020-05-09 16:07
+ * @Description TODO
+ **/
+@Data
+public class DeviceInfoChannelEntity implements Serializable {
+
+    @TableId
+    private Long id;
+
+    /**
+     * 设备信息表Id
+     */
+    private Long deviceId;
+
+    /**
+     * 渠道号表Id
+     */
+    private Long channelId;
+
+}

cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/OAuth2ResourceServer.java

@@ -24,6 +24,7 @@ public class OAuth2ResourceServer extends ResourceServerConfigurerAdapter {
                         "/wechat/wechatFileUpload",
                         "/wechat/wechatDownload/**",
                         "/logFile/logfile/DeviceLogFileUpload",
+                        "/logFile/logfile/proDeviceUploadLogFile",
 //                        "/user/info",
                         "/statics/**")
                 .permitAll()

cneeds-server-datashow/src/main/resources/application.yml

 spring:
   profiles:
-    active: dev
+    active: prod
   application:
     name: cneeds-server-datashow
 server:

cneeds-server-device/src/main/resources/application.yml

 spring:
   profiles:
-    active: dev
+    active: prod
   application:
     name: cneeds-server-device
 

cneeds-server-logupload/src/main/resources/application.yml

 spring:
   profiles:
-    active: dev
+    active: prod
   application:
     name: cneeds-server-logupload