修改配置文件，发包

Signed-off-by: tangsong <86121657@qq.com>

message-client/src/main/java/com/unis/message/client/NoticeFeign.java

@@ -0,0 +1,123 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by Fernflower decompiler)
+//
+
+package com.unis.message.client;
+
+import com.unis.common.utils.ResponseWrapper;
+import com.unis.message.common.vo.notice.PortalNoticeVO;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(
+        name = "message-server"
+)
+@Component
+public interface NoticeFeign {
+    @ApiOperation(
+            value = "根据id查询通知公告",
+            notes = "参数：通知公告id"
+    )
+    @RequestMapping(
+            method = {RequestMethod.GET},
+            value = {"/notice/{id}/"}
+    )
+    ResponseWrapper findById(@PathVariable("id") String id);
+
+    @ApiOperation(
+            value = "保存通知公告",
+            notes = "参数：通知公告对象VO"
+    )
+    @RequestMapping(
+            method = {RequestMethod.POST},
+            value = {"/notice/"}
+    )
+    ResponseWrapper save(@RequestBody PortalNoticeVO VO);
+
+    @ApiOperation(
+            value = "更新通知公告",
+            notes = "参数：通知公告VO"
+    )
+    @RequestMapping(
+            method = {RequestMethod.PUT},
+            value = {"/notice/"}
+    )
+    ResponseWrapper update(@RequestBody PortalNoticeVO VO, @RequestParam(value = "code") String code);
+
+    @ApiOperation(
+            value = "删除通知公告",
+            notes = "参数：通知公告id(可传入多个)，操作用户id"
+    )
+    @RequestMapping(
+            method = {RequestMethod.DELETE},
+            value = {"/notices"}
+    )
+    ResponseWrapper deletes(@RequestBody String[] ids, @RequestParam(value = "userId") String userId);
+
+    @ApiOperation(
+            value = "管理端：分页查询所有通知公告",
+            notes = "参数：PortalNoticeVO、当前页、页面大小"
+    )
+    @ApiImplicitParams({@ApiImplicitParam(
+            name = "page",
+            value = "起始页",
+            required = true
+    ), @ApiImplicitParam(
+            name = "size",
+            value = "每页展示行数",
+            required = true
+    )})
+    @RequestMapping(
+            method = {RequestMethod.POST},
+            value = {"/noticesPage/manager"}
+    )
+    ResponseWrapper findByPageManager(@RequestBody PortalNoticeVO VO, @RequestParam(value = "page") Integer page, @RequestParam(value = "size") Integer size);
+
+    @ApiOperation(
+            value = "用户端：分页查询所有通知公告",
+            notes = "参数：PortalNoticeVO、当前页、页面大小"
+    )
+    @ApiImplicitParams({@ApiImplicitParam(
+            name = "page",
+            value = "起始页",
+            required = true
+    ), @ApiImplicitParam(
+            name = "size",
+            value = "每页展示行数",
+            required = true
+    )})
+    @RequestMapping(
+            method = {RequestMethod.POST},
+            value = {"/noticesPage/user"}
+    )
+    ResponseWrapper findByPageUser(@RequestBody PortalNoticeVO VO, @RequestParam (value = "page")Integer page, @RequestParam(value = "size") Integer size);
+
+    @ApiOperation(
+            value = "用户端：不分页查询所有通知公告",
+            notes = "参数：PortalNoticeVO"
+    )
+    @RequestMapping(
+            method = {RequestMethod.POST},
+            value = {"/notice/user"}
+    )
+    ResponseWrapper findByUser(@RequestBody PortalNoticeVO VO);
+
+    @ApiOperation(
+            value = "获取用户通知公告数量",
+            notes = "参数：当前登陆用户userId"
+    )
+    @RequestMapping(
+            method = {RequestMethod.GET},
+            value = {"/notice/"}
+    )
+    ResponseWrapper getNoticeNum(@PathVariable("id") String id);
+}

message-common/src/main/java/com/unis/message/common/vo/BaseVO.java

@@ -0,0 +1,115 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by Fernflower decompiler)
+//
+
+package com.unis.message.common.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+
+public abstract class BaseVO {
+    @ApiModelProperty("id，自动生成")
+    private String id;
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+    @ApiModelProperty("创建人")
+    private String createBy;
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+    @ApiModelProperty("更新人")
+    private String updateBy;
+    @ApiModelProperty("删除时间")
+    private Date deleteTime;
+    @ApiModelProperty("删除人")
+    private String deleteBy;
+    @ApiModelProperty("机构id（新增时需传当前用户的orgCode）")
+    private String orgId;
+    @ApiModelProperty("部门id（新增时需传当前用户的deptCode）")
+    private String deptId;
+    @ApiModelProperty("当前登陆用户的code（增删改查时的操作记录人）")
+    private String userId;
+
+    public BaseVO() {
+    }
+
+    public String getId() {
+        return this.id;
+    }
+
+    public Date getCreateTime() {
+        return this.createTime;
+    }
+
+    public String getCreateBy() {
+        return this.createBy;
+    }
+
+    public Date getUpdateTime() {
+        return this.updateTime;
+    }
+
+    public String getUpdateBy() {
+        return this.updateBy;
+    }
+
+    public Date getDeleteTime() {
+        return this.deleteTime;
+    }
+
+    public String getDeleteBy() {
+        return this.deleteBy;
+    }
+
+    public String getOrgId() {
+        return this.orgId;
+    }
+
+    public String getDeptId() {
+        return this.deptId;
+    }
+
+    public String getUserId() {
+        return this.userId;
+    }
+
+    public void setId(final String id) {
+        this.id = id;
+    }
+
+    public void setCreateTime(final Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public void setCreateBy(final String createBy) {
+        this.createBy = createBy;
+    }
+
+    public void setUpdateTime(final Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public void setUpdateBy(final String updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    public void setDeleteTime(final Date deleteTime) {
+        this.deleteTime = deleteTime;
+    }
+
+    public void setDeleteBy(final String deleteBy) {
+        this.deleteBy = deleteBy;
+    }
+
+    public void setOrgId(final String orgId) {
+        this.orgId = orgId;
+    }
+
+    public void setDeptId(final String deptId) {
+        this.deptId = deptId;
+    }
+
+    public void setUserId(final String userId) {
+        this.userId = userId;
+    }
+}

message-common/src/main/java/com/unis/message/common/vo/notice/PortalNoticeUserVO.java

@@ -0,0 +1,137 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by Fernflower decompiler)
+//
+
+package com.unis.message.common.vo.notice;
+
+import com.unis.message.common.vo.BaseVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+@ApiModel(
+        value = "信息--通知公告与用户关联表",
+        description = "信息--通知公告与用户关联表"
+)
+public class PortalNoticeUserVO extends BaseVO {
+    @ApiModelProperty("自动生成的唯一标识")
+    private String id;
+    @ApiModelProperty(
+            value = "信息表唯一标识",
+            required = true
+    )
+    private String msgId;
+    @ApiModelProperty(
+            value = "用户表唯一标识",
+            required = true
+    )
+    private String userId;
+    @ApiModelProperty(
+            value = "信息状态 0:未读, 1:已读",
+            required = true
+    )
+    private String msgStatus;
+
+    public PortalNoticeUserVO() {
+    }
+
+    public String getId() {
+        return this.id;
+    }
+
+    public String getMsgId() {
+        return this.msgId;
+    }
+
+    public String getUserId() {
+        return this.userId;
+    }
+
+    public String getMsgStatus() {
+        return this.msgStatus;
+    }
+
+    public void setId(final String id) {
+        this.id = id;
+    }
+
+    public void setMsgId(final String msgId) {
+        this.msgId = msgId;
+    }
+
+    public void setUserId(final String userId) {
+        this.userId = userId;
+    }
+
+    public void setMsgStatus(final String msgStatus) {
+        this.msgStatus = msgStatus;
+    }
+
+    public boolean equals(final Object o) {
+        if (o == this) {
+            return true;
+        } else if (!(o instanceof PortalNoticeUserVO)) {
+            return false;
+        } else {
+            PortalNoticeUserVO other = (PortalNoticeUserVO)o;
+            if (!other.canEqual(this)) {
+                return false;
+            } else {
+                label59: {
+                    Object this$id = this.getId();
+                    Object other$id = other.getId();
+                    if (this$id == null) {
+                        if (other$id == null) {
+                            break label59;
+                        }
+                    } else if (this$id.equals(other$id)) {
+                        break label59;
+                    }
+
+                    return false;
+                }
+
+                Object this$msgId = this.getMsgId();
+                Object other$msgId = other.getMsgId();
+                if (this$msgId == null) {
+                    if (other$msgId != null) {
+                        return false;
+                    }
+                } else if (!this$msgId.equals(other$msgId)) {
+                    return false;
+                }
+
+                Object this$userId = this.getUserId();
+                Object other$userId = other.getUserId();
+                if (this$userId == null) {
+                    if (other$userId != null) {
+                        return false;
+                    }
+                } else if (!this$userId.equals(other$userId)) {
+                    return false;
+                }
+
+                Object this$msgStatus = this.getMsgStatus();
+                Object other$msgStatus = other.getMsgStatus();
+                if (this$msgStatus == null) {
+                    if (other$msgStatus != null) {
+                        return false;
+                    }
+                } else if (!this$msgStatus.equals(other$msgStatus)) {
+                    return false;
+                }
+
+                return true;
+            }
+        }
+    }
+
+    protected boolean canEqual(final Object other) {
+        return other instanceof PortalNoticeUserVO;
+    }
+
+
+    public String toString() {
+        return "PortalNoticeUserVO(id=" + this.getId() + ", msgId=" + this.getMsgId() + ", userId=" + this.getUserId() + ", msgStatus=" + this.getMsgStatus() + ")";
+    }
+}

message-server/message-server.iml

@@ -112,6 +112,8 @@
     <orderEntry type="library" name="Maven: com.gbase8s:ifxjdbc:1.0" level="project" />
     <orderEntry type="library" name="Maven: com.gbase:druid:1.0.28" level="project" />
     <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.3.2" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.18" level="project" />
+    <orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:3.6.1" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:3.0.0" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:3.0.0" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.11" level="project" />

message-server/pom.xml

@@ -44,7 +44,11 @@
 			<artifactId>hutool-all</artifactId>
 			<version>5.3.2</version>
 		</dependency>
-		
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<version>8.0.18</version>
+		</dependency>
 		   <!-- ojdbc7数据源 -->
         <!-- <dependency>
             <groupId>cn.easyproject</groupId>

message-server/src/main/resources/bootstrap.yml

@@ -1,30 +1,67 @@
 server:
   port: 13900
 spring:
+  jpa:
+    open-in-view: true
+    database: mysql
+    show-sql: true
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.MySQLDialect
   application:
     name: message
-  #配置中心配置
-  cloud:
-    config:
-      #使用discovery 时需要将eureka 写到该文件中，开发环境使用该方式,推荐使用。
-      discovery:
+  devtools:
+    restart:
+      enabled: false
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    url: jdbc:mysql://101.36.160.140:10311/message?useUnicode=true&characterEncoding=UTF-8&useSSL=true&serverTimezone=GMT%2b8
+    username: root
+    password: admin@1234
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    druid:
+#db-type: mysql
+      initial-size: 5
+      max-active: 30
+      min-idle: 5
+      max-wait: 60000
+      pool-prepared-statements: true
+      max-pool-prepared-statement-per-connection-size: 30
+      validation-query: SELECT 1 FROM DUAL
+      test-on-borrow: false
+      test-on-return: false
+      test-while-idle: true
+      time-between-connect-error-millis: 60000
+      min-evictable-idle-time-millis: 300000
+      max-evictable-idle-time-millis: 3000000
+      filters: stat,wall
+      connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+      use-global-data-source-stat: true
+      web-stat-filter:
+        url-pattern: /*
+        exclusions: /druid/*,*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico
         enabled: true
-        service-id: config
-      name: gbase8s-message,initdata,feign,redis,mq-msg
-      profile: dev
-      username: configuser
-      password: configpasd
-      retry:
-        max-attempts: 5
-        max-interval: 2000
+        session-stat-enable: true
+        session-stat-max-count: 10
+      stat-view-servlet:
+        url-pattern: /druid/*
+        reset-enable: true
+        login-username: druid
+        login-password: druid
       #如果出现错误立刻停止服务。
       #fail-fast: true
+mybatis:
+  configuration:
+    map-underscore-to-camel-case: true
+  type-aliases-package: com.unis.ynls.irpt.server.entity
+  mapper-locations:
+    - classpath:mybatis/mapper/*.xml
 #服务注册配置
 eureka:
   client:
     service-url:
 #      defaultZone: http://eureka-server:11000/eureka/
-       defaultZone: http://172.16.0.73:11000/eureka/
+      defaultZone: http://172.16.0.4:11000/eureka/
   instance:
     prefer-ip-address: true
     status-page-url-path: /swagger-ui.html

message-server/src/main/resources/bootstrapback.yml

@@ -0,0 +1,39 @@
+server:
+  port: 13900
+spring:
+  application:
+    name: message
+  #配置中心配置
+  cloud:
+    config:
+      #使用discovery 时需要将eureka 写到该文件中，开发环境使用该方式,推荐使用。
+      discovery:
+        enabled: true
+        service-id: config
+      name: gbase8s-message,initdata,feign,redis,mq-msg
+      profile: dev
+      username: configuser
+      password: configpasd
+      retry:
+        max-attempts: 5
+        max-interval: 2000
+      #如果出现错误立刻停止服务。
+      #fail-fast: true
+#服务注册配置
+eureka:
+  client:
+    service-url:
+#      defaultZone: http://eureka-server:11000/eureka/
+       defaultZone: http://172.16.0.73:11000/eureka/
+  instance:
+    prefer-ip-address: true
+    status-page-url-path: /swagger-ui.html
+#日志配置
+logging:
+  level:
+    com.unis: debug
+    root: warn
+    org.springframework.web: debug
+    org.hibernate: error
+    com.unis.demo.controller: info
+  path: ./log/