瀏覽代碼

官网后台VIP产品

Reiskuchen 5 年之前
父節點
當前提交
91abe018b6

+ 1 - 1
official_backend/src/main/java/com/hssx/ysofficial/entity/Article.java

@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Reiskuchen
- * @since 2019-10-24
+ * @since 2020-02-05
  */
 @Data
 @EqualsAndHashCode(callSuper = false)

+ 1 - 1
official_backend/src/main/java/com/hssx/ysofficial/entity/BannerPictures.java

@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Reiskuchen
- * @since 2019-10-24
+ * @since 2020-02-05
  */
 @Data
 @EqualsAndHashCode(callSuper = false)

+ 9 - 9
official_backend/src/main/java/com/hssx/ysofficial/entity/Comment.java

@@ -1,25 +1,25 @@
 package com.hssx.ysofficial.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * the comments left by customers
  * </p>
  *
  * @author Reiskuchen
- * @since 2019-10-24
+ * @since 2020-02-05
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -27,7 +27,7 @@ import lombok.experimental.Accessors;
 @TableName("comment")
 public class Comment extends Model<Comment> {
 
-    private static final long serialVersionUID=1L;
+    private static final long serialVersionUID = 1L;
 
     /**
      * id
@@ -56,8 +56,8 @@ public class Comment extends Model<Comment> {
     /**
      * 留言时间
      */
-    @TableField("indate")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField("indate")
     private LocalDateTime indate;
 
 

+ 1 - 7
official_backend/src/main/java/com/hssx/ysofficial/entity/CompanyProducts.java

@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Reiskuchen
- * @since 2020-02-04
+ * @since 2020-02-05
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -50,12 +50,6 @@ public class CompanyProducts extends Model<CompanyProducts> {
     @TableField("introduction")
     private String introduction;
 
-    /**
-     * 地址
-     */
-    @TableField("address")
-    private String address;
-
     /**
      * 是否显示在首页 0不显示 1显示
      */

+ 4 - 4
official_backend/src/main/java/com/hssx/ysofficial/entity/Cooperations.java

@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Reiskuchen
- * @since 2019-10-24
+ * @since 2020-02-05
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -36,7 +36,7 @@ public class Cooperations extends Model<Cooperations> {
     private String name;
 
     /**
-     * 合作者描述
+     * 合作者描述
      */
     @TableField("description")
     private String description;
@@ -48,13 +48,13 @@ public class Cooperations extends Model<Cooperations> {
     private String imageUrl;
 
     /**
-     * 合作者种类: 学校或公司
+     * 合作者种类 0-联合开发 1-材料供应商 2-芯片及PCB版合作伙伴 3-软件合作伙伴 4-投融资服务机构
      */
     @TableField("type")
     private Integer type;
 
     /**
-     * 是否显示于首页 0为不显示 1为显示
+     * 是否显示于首页 0-不显示 1-显示
      */
     @TableField("sticky")
     private Integer sticky;

+ 1 - 4
official_backend/src/main/java/com/hssx/ysofficial/entity/OnlineApplication.java

@@ -7,8 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -19,7 +17,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Reiskuchen
- * @since 2019-11-21
+ * @since 2020-02-05
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -69,7 +67,6 @@ public class OnlineApplication extends Model<OnlineApplication> {
      * 申请时间
      */
     @TableField("indate")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime indate;
 
     /**

+ 1 - 1
official_backend/src/main/java/com/hssx/ysofficial/entity/User.java

@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Reiskuchen
- * @since 2019-10-24
+ * @since 2020-02-05
  */
 @Data
 @EqualsAndHashCode(callSuper = false)

+ 1 - 1
official_backend/src/main/java/com/hssx/ysofficial/utility/CodeGenerator.java

@@ -190,7 +190,7 @@ public class CodeGenerator {
         //单独生成逗号隔开
 //        strategy.setInclude("");
         //全生成
-        strategy.setInclude("company_products");//表名,多个英文逗号分割
+//        strategy.setInclude();//表名,多个英文逗号分割
         //多个英文逗号隔开
 //        strategy.setInclude(scanner("user").split(","));
         strategy.setControllerMappingHyphenStyle(true);

+ 9 - 2
official_backend/src/main/resources/application-prod.properties

@@ -13,13 +13,16 @@ mybatis-plus.mapper-locations=mapper/*.xml
 mybatis-plus.global-config.db-config.select-strategy=not_empty
 mybatis-plus.global-config.db-config.update-strategy=not_empty
 mybatis-plus.global-config.db-config.insert-strategy=not_empty
+mybatis-plus.configuration.map-underscore-to-camel-case=true
+mybatis-plus.configuration.cache-enabled=false
+
 #Êý¾Ý¿â
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.url=jdbc:mysql://127.0.0.1:3306/cloud_model_website?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-#spring.datasource.url=jdbc:mysql://118.190.47.230:3306/cloud_model_website?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-spring.datasource.username=root
 spring.datasource.password=Hssx2019.!
+#spring.datasource.url=jdbc:mysql://118.190.47.230:3306/cloud_model_website?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
 #spring.datasource.password=p011430seya1026
+spring.datasource.username=root
 spring.datasource.hikari.max-lifetime=60000
 spring.datasource.hikari.IdleTimeout=60000
 spring.datasource.hikari.ConnectionTimeout=60000
@@ -32,6 +35,10 @@ spring.servlet.multipart.max-file-size=100MB
 spring.servlet.multipart.max-request-size=100MB
 spring.servlet.multipart.resolve-lazily=false
 
+spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
+spring.jackson.default-property-inclusion=always
+spring.jackson.time-zone=GMT+8
+
 #ÎļþÉÏ´«Â·¾¶
 #upload.path=D:/mould/upload/
 upload.path=E:/staticproject/website/upload

+ 10 - 3
official_backend/src/main/resources/application.properties

@@ -13,13 +13,16 @@ mybatis-plus.mapper-locations=mapper/*.xml
 mybatis-plus.global-config.db-config.select-strategy=not_empty
 mybatis-plus.global-config.db-config.update-strategy=not_empty
 mybatis-plus.global-config.db-config.insert-strategy=not_empty
+mybatis-plus.configuration.map-underscore-to-camel-case=true
+mybatis-plus.configuration.cache-enabled=false
+
 #Êý¾Ý¿â
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-#spring.datasource.url=jdbc:mysql://111.231.87.63:3306/cloud_model_website?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
 spring.datasource.url=jdbc:mysql://118.190.47.230:3306/cloud_model_website?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-spring.datasource.username=root
-#spring.datasource.password=Hssx2019.!
 spring.datasource.password=p011430seya1026
+#spring.datasource.url=jdbc:mysql://111.231.87.63:3306/cloud_model_website?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+#spring.datasource.password=Hssx2019.!
+spring.datasource.username=root
 spring.datasource.hikari.max-lifetime=60000
 spring.datasource.hikari.IdleTimeout=60000
 spring.datasource.hikari.ConnectionTimeout=60000
@@ -32,6 +35,10 @@ spring.servlet.multipart.max-file-size=100MB
 spring.servlet.multipart.max-request-size=100MB
 spring.servlet.multipart.resolve-lazily=false
 
+spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
+spring.jackson.default-property-inclusion=always
+spring.jackson.time-zone=GMT+8
+
 #ÎļþÉÏ´«Â·¾¶
 upload.path=D:/mould/upload/
 #upload.path=E:/staticproject/website/upload

+ 1 - 2
official_backend/src/main/resources/mapper/CompanyProductsMapper.xml

@@ -8,14 +8,13 @@
         <result column="title" property="title" />
         <result column="image_url" property="imageUrl" />
         <result column="introduction" property="introduction" />
-        <result column="address" property="address" />
         <result column="sticky" property="sticky" />
         <result column="type" property="type" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, title, image_url, introduction, address, sticky, type
+        id, title, image_url, introduction, sticky, type
     </sql>
 
 </mapper>