引入core资源

shiwan/admin/pom.xml

@@ -65,42 +65,15 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-commons</artifactId>
-            <version>2.1.6.RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-openfeign-core</artifactId>
             <version>2.1.5.RELEASE</version>
             <scope>compile</scope>
         </dependency>
-
-        <!--
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-context</artifactId>
-            <version>2.1.0.RELEASE</version>
-        </dependency>
-         -->
-        <!--spring boot2.x下 使用feign-->
-        <!--
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>
-        -->
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <!--
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-jpa</artifactId>
-        </dependency>
-        -->
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -138,12 +111,6 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>com.huimv</groupId>
-            <artifactId>huimv-cloud-common</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
             <groupId>com.netflix.eureka</groupId>
             <artifactId>eureka-client</artifactId>
             <version>1.9.13</version>
@@ -178,28 +145,6 @@
                     <target>1.8</target>
                 </configuration>
             </plugin>
-
-            <!-- <plugin>
-                 <groupId>org.apache.maven.plugins</groupId>
-                 <artifactId>maven-shade-plugin</artifactId>
-                 <version>1.2.1</version>
-                 <executions>
-                     <execution>
-                         <phase>package</phase>
-                         <goals>
-                             <goal>shade</goal>
-                         </goals>
-                         <configuration>
-                             <transformers>
-                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                     <mainClass>handler.Main</mainClass>
-                                 </transformer>
-                             </transformers>
-                         </configuration>
-                     </execution>
-                 </executions>
-             </plugin>-->
-
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>2.3</version>

shiwan/admin/src/main/java/com/huimv/admin/AdminApplication.java

@@ -2,12 +2,10 @@ package com.huimv.admin;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
-@EnableDiscoveryClient
 @FeignClient
 @SpringBootApplication
 @EnableScheduling

shiwan/admin/src/main/java/com/huimv/admin/EntityBase.java

@@ -0,0 +1,13 @@
+package com.huimv.admin;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import javax.persistence.MappedSuperclass;
+
+@JsonInclude(value= JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(value= {"handler","hibernateLazyInitializer"})
+@MappedSuperclass
+public class EntityBase {
+
+}

shiwan/admin/src/main/java/com/huimv/admin/controller/LoginController.java

@@ -1,12 +1,12 @@
 package com.huimv.admin.controller;
 
+import com.huimv.admin.domain.SysAccountEntity;
 import com.huimv.admin.service.ILoginService;
+import com.huimv.admin.session.AccessToken;
+import com.huimv.admin.session.HmSession;
 import com.huimv.admin.utils.CheckNumber;
 import com.huimv.admin.utils.IpTools;
 import com.huimv.admin.utils.Result;
-import com.huimv.core.domain.SysAccountEntity;
-import com.huimv.session.AccessToken;
-import com.huimv.session.HmSession;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

shiwan/admin/src/main/java/com/huimv/admin/converter/JpaJsonConverter.java

@@ -0,0 +1,25 @@
+package com.huimv.admin.converter;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import javax.persistence.AttributeConverter;
+
+public abstract class JpaJsonConverter<T> implements AttributeConverter<T, String> {
+
+	
+	protected final static ObjectMapper objectMapper = new ObjectMapper();
+
+	@Override
+	public String convertToDatabaseColumn(T meta) {
+		try {
+			if(meta == null) return null;
+			return objectMapper.writeValueAsString(meta);
+		} catch (JsonProcessingException ex) {
+			ex.printStackTrace();
+			return null;
+			// or throw an error
+		}
+	}
+
+}

shiwan/admin/src/main/java/com/huimv/admin/converter/KeyValueStringConverter.java

@@ -0,0 +1,21 @@
+package com.huimv.admin.converter;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+
+import java.io.IOException;
+import java.util.Map;
+
+public class KeyValueStringConverter extends JpaJsonConverter<Map<String, Object>> {
+
+	@Override
+	public Map<String, Object> convertToEntityAttribute(String dbData) {
+		try {
+			if(dbData==null) return null;
+			return objectMapper.readValue(dbData,new TypeReference<Map<String, Object>>(){});
+		} catch (IOException ex) {
+			ex.printStackTrace();
+			return null;
+		}
+	}
+
+}

shiwan/admin/src/main/java/com/huimv/admin/converter/ListObjectConverter.java

@@ -0,0 +1,25 @@
+package com.huimv.admin.converter;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * @author yejijie
+ * @created 2020年8月24日 下午2:20:02
+*/
+public class ListObjectConverter extends JpaJsonConverter<List<Object>> {
+
+	@Override
+	public List<Object> convertToEntityAttribute(String dbData) {
+		try {
+			if(dbData==null) return null;
+			return objectMapper.readValue(dbData,new TypeReference<List<Object>>(){});
+		} catch (IOException ex) {
+			ex.printStackTrace();
+			return null;
+		}
+	}
+
+}

shiwan/admin/src/main/java/com/huimv/admin/domain/MemberAccount.java

@@ -10,7 +10,6 @@ import java.util.Date;
 //import javax.persistence.Table;
 import javax.persistence.*;
 
-import com.huimv.core.domain.MemberInfo;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 

shiwan/admin/src/main/java/com/huimv/admin/domain/MemberInfo.java

@@ -0,0 +1,191 @@
+package com.huimv.admin.domain;
+
+import com.huimv.admin.EntityBase;
+import com.huimv.admin.converter.KeyValueStringConverter;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * Member信息表
+ * @author guojian
+ */
+@Entity(name="member_info")
+@Inheritance(strategy = InheritanceType.JOINED)
+@DynamicInsert(true)
+@DynamicUpdate(true)
+public class MemberInfo extends EntityBase implements Serializable {
+
+	//序列化
+	private static final long serialVersionUID = 4728322620872694328L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    //默认 0-man 1-woman
+	@Column(name = "gender")
+    private Integer gender = 0;
+
+	@Column(name = "nickname")
+    private String nickname;
+
+	@Column(name = "avatar_url")
+	private String avatarUrl;
+
+	@Column(name = "remark")
+	private String remark;
+
+	@Column(name = "address")
+	private String address;
+
+	@Column(name = "job")
+	private String job;
+
+	@Column(name = "user_id")
+	private Long userId;
+
+	@Column(name = "mobile")
+	private String mobile;
+	
+	@Column(columnDefinition="TEXT")
+	@Convert(converter = KeyValueStringConverter.class)
+	private Map<String, Object> data;
+
+	@Column(name = "enabled")
+	private Boolean enabled;
+
+    @Column(columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
+    private Date updated;
+
+    @Column(columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", updatable = false)
+    private Date created;
+
+	public String getMobile() {
+		return mobile;
+	}
+
+	public void setMobile(String mobile) {
+		this.mobile = mobile;
+	}
+
+	public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getGender() {
+		return gender;
+	}
+
+	public void setGender(Integer gender) {
+		this.gender = gender;
+	}
+
+	public String getNickname() {
+		return nickname;
+	}
+
+	public void setNickname(String nickname) {
+		this.nickname = nickname;
+	}
+
+	public String getAvatarUrl() {
+		return avatarUrl;
+	}
+
+	public void setAvatarUrl(String avatarUrl) {
+		this.avatarUrl = avatarUrl;
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public Map<String, Object> getData() {
+		return data;
+	}
+
+	public void setData(Map<String, Object> data) {
+		this.data = data;
+	}
+
+	public Boolean getEnabled() {
+		return enabled;
+	}
+
+	public void setEnabled(Boolean enabled) {
+		this.enabled = enabled;
+	}
+
+	public Date getCreated() {
+        return created;
+    }
+
+    public void setCreated(Date created) {
+        this.created = created;
+    }
+
+    public Date getUpdated() {
+        return updated;
+    }
+
+    public void setUpdated(Date updated) {
+        this.updated = updated;
+    }
+
+	public String getAddress() {
+		return address;
+	}
+
+	public void setAddress(String address) {
+		this.address = address;
+	}
+
+	public String getJob() {
+		return job;
+	}
+
+	public void setJob(String job) {
+		this.job = job;
+	}
+
+
+	public Long getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Long userId) {
+		this.userId = userId;
+	}
+
+	@Override
+	public String toString() {
+		return "MemberInfo{" +
+				"id=" + id +
+				", gender=" + gender +
+				", nickname='" + nickname + '\'' +
+				", avatarUrl='" + avatarUrl + '\'' +
+				", remark='" + remark + '\'' +
+				", address='" + address + '\'' +
+				", job='" + job + '\'' +
+				", userId=" + userId +
+				", mobile='" + mobile + '\'' +
+				", data=" + data +
+				", enabled=" + enabled +
+				", updated=" + updated +
+				", created=" + created +
+				'}';
+	}
+}

shiwan/admin/src/main/java/com/huimv/admin/domain/OrganizeInfo.java

@@ -0,0 +1,96 @@
+package com.huimv.admin.domain;
+
+import com.huimv.admin.EntityBase;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.util.Date;
+
+/**
+ * 组织信息表
+ * @author guojian
+ */
+@Entity(name="organize_info")
+@DynamicInsert(true)
+@DynamicUpdate(true)
+public class OrganizeInfo extends EntityBase {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    private String orgName;
+
+    //法人
+    private String legalPersons;
+
+    //企业编号（工商号）
+    private String orgCode;
+
+    @Column(columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
+    private Date updated;
+
+    @Column(columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", updatable = false)
+    private Date created;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getOrgName() {
+        return orgName;
+    }
+
+    public void setOrgName(String orgName) {
+        this.orgName = orgName;
+    }
+
+    public String getLegalPersons() {
+        return legalPersons;
+    }
+
+    public void setLegalPersons(String legalPersons) {
+        this.legalPersons = legalPersons;
+    }
+
+    public String getOrgCode() {
+        return orgCode;
+    }
+
+    public void setOrgCode(String orgCode) {
+        this.orgCode = orgCode;
+    }
+
+    public Date getUpdated() {
+        return updated;
+    }
+
+    public void setUpdated(Date updated) {
+        this.updated = updated;
+    }
+
+    public Date getCreated() {
+        return created;
+    }
+
+    public void setCreated(Date created) {
+        this.created = created;
+    }
+
+    @Override
+    public String toString() {
+        return "OrganizeInfo{" +
+                "id=" + id +
+                ", orgName='" + orgName + '\'' +
+                ", legalPersons='" + legalPersons + '\'' +
+                ", orgCode='" + orgCode + '\'' +
+                ", updated=" + updated +
+                ", created=" + created +
+                '}';
+    }
+}

shiwan/admin/src/main/java/com/huimv/admin/session/AccessToken.java

@@ -0,0 +1,62 @@
+package com.huimv.admin.session;
+
+import java.util.Date;
+
+/**
+ * 登录的token信息
+ * @author guojian
+ */
+public class AccessToken {
+    private String token;
+    private String loginIp;
+    private Date created;
+    private String accountName;
+    private Integer code;
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getAccountName() {
+        return accountName;
+    }
+
+    public void setAccountName(String accountName) {
+        this.accountName = accountName;
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    public Date getCreated() {
+        return created;
+    }
+
+    public void setCreated(Date created) {
+        this.created = created;
+    }
+
+	public String getLoginIp() {
+		return loginIp;
+	}
+
+	public void setLoginIp(String loginIp) {
+		this.loginIp = loginIp;
+	}
+
+	@Override
+	public String toString() {
+		return "AccessToken [token=" + token + ", loginIp=" + loginIp + ", created=" + created + "]";
+	}
+
+
+}

shiwan/admin/src/main/java/com/huimv/admin/session/HmSession.java

@@ -0,0 +1,52 @@
+package com.huimv.admin.session;
+
+import com.huimv.admin.domain.MemberAccount;
+import com.huimv.admin.domain.OrganizeInfo;
+import com.huimv.admin.domain.SysAccountEntity;
+
+import java.io.Serializable;
+
+/**
+ * 自定义的session存储结构
+ * @author guojian
+ */
+public class HmSession implements Serializable {
+
+    private MemberAccount memberAccount;
+
+    private OrganizeInfo organizeInfo;
+    private SysAccountEntity accountEntity;
+
+    public MemberAccount getMemberAccount() {
+        return memberAccount;
+    }
+
+    public void setMemberAccount(MemberAccount memberAccount) {
+        this.memberAccount = memberAccount;
+    }
+
+    @Override
+    public String toString() {
+        return "HmSession{" +
+                "memberAccount=" + memberAccount +
+                ", organizeInfo=" + organizeInfo +
+                ", accountEntity=" + accountEntity +
+                '}';
+    }
+
+    public OrganizeInfo getOrganizeInfo() {
+        return organizeInfo;
+    }
+
+    public void setOrganizeInfo(OrganizeInfo organizeInfo) {
+        this.organizeInfo = organizeInfo;
+    }
+
+    public SysAccountEntity getAccountEntity() {
+        return accountEntity;
+    }
+
+    public void setAccountEntity(SysAccountEntity accountEntity) {
+        this.accountEntity = accountEntity;
+    }
+}