svr-configurations配置纠正

base/common-cache/src/main/resources/template.yml

@@ -1,6 +1,6 @@
cache: # 1-内存 2-redis
  type: 1
  expire-time: 2
  expire-time: 2 #单位为小时
  refresh-time: 1.5
spring:

common/common-entity/src/main/java/META-INF/persistence.xml

@@ -1,18 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="2.0">
    <persistence-unit name="NewPersistenceUnit">
        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
        <class>com.yihu.jw.base.user.BaseLoginAccountDO</class>
        <properties>
            <property name="hibernate.connection.url" value="jdbc:mysql://172.19.103.77:3306/"/>
            <property name="hibernate.connection.driver_class" value="com.mysql.jdbc.Driver"/>
            <property name="hibernate.connection.username" value=""/>
            <property name="hibernate.connection.password" value=""/>
            <property name="hibernate.archive.autodetection" value="class"/>
            <property name="hibernate.show_sql" value="true"/>
            <property name="hibernate.format_sql" value="true"/>
            <property name="hbm2ddl.auto" value="update"/>
        </properties>
    </persistence-unit>
</persistence>

server/svr-configuration/pom.xml

@@ -14,7 +14,7 @@
    <groupId>com.yihu.jw</groupId>
    <artifactId>svr-configuration</artifactId>
    <version>1.0.0</version>
    <packaging>war</packaging>
    <packaging>jar</packaging>
    <dependencies>
        <dependency>
@@ -40,7 +40,7 @@
    </dependencies>
    <build>
        <finalName>ROOT</finalName>
        <finalName>svr-configurations</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>

server/svr-configuration/src/main/resources/bootstrap.yml

@@ -32,9 +32,8 @@ spring:
        git:
#          uri: http://192.168.1.220:10080/chenweida/jw.config.git
#          uri: http://192.168.116.100:10080/chenweida/mini.jw.config.git
#         uri: http://192.168.1.220:10080/jiwei/jw.config.git
         uri: 172.19.103.33:1221/jiwei/jw.config.git
        default-label: jwdev
         uri: http://192.168.1.220:10080/jiwei/jw.config.git
        default-label: master
---
@@ -76,4 +75,4 @@ spring:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        native:
          search-locations: file:D:\Software\soft\IdeaWorkSpace\jw-project\jw.config  ##本地的got配置路径
          search-locations: file:D:\software\soft_dev\IdeaWorkSpace\jw2.0-dev\jw.config  ##本地的got配置路径

server/svr-discovery/pom.xml

@@ -13,7 +13,7 @@
    <groupId>com.yihu.jw</groupId>
    <artifactId>svr-discovery</artifactId>
    <version>1.0.0</version>
    <packaging>war</packaging>
    <packaging>jar</packaging>
    <dependencies>
        <dependency>
@@ -39,7 +39,7 @@
        </dependency>
    </dependencies>
    <build>
        <finalName>ROOT</finalName>
        <finalName>svr-discovery</finalName>
        <plugins>
            <plugin>
                <artifactId>maven-war-plugin</artifactId>

server/svr-discovery/src/main/resources/application.yml

@@ -15,8 +15,8 @@ eureka:
    fetch-registry: false #如果是做高可用的发现服务那就要改成true
  server:
    enable-self-preservation: true  ##是否开启自我保护模式，默认为true。
    eviction-interval-timer-in-ms: 60000 ##eureka server清理无效节点的时间间隔，默认60000毫秒，即60秒
    enable-self-preservation: true  #是否开启自我保护模式，默认为true。
    eviction-interval-timer-in-ms: 60000 #eureka server清理无效节点的时间间隔，默认60000毫秒，即60秒
@@ -59,4 +59,17 @@ spring:
eureka:
  client:
    service-url:
      defaultZone: http://jw:jkzl@172.19.103.33:8761/eureka
      defaultZone: http://jw:jkzl@172.19.103.33:8761/eureka
---
spring:
  profiles: native
eureka:
  client:
    service-url:
      defaultZone: http://jw:jkzl@127.0.0.1:8761/eureka

svr/svr-base/src/main/java/META-INF/persistence.xml

@@ -1,17 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="2.0">
    <persistence-unit name="NewPersistenceUnit">
        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
        <properties>
            <property name="hibernate.connection.url" value=""/>
            <property name="hibernate.connection.driver_class" value=""/>
            <property name="hibernate.connection.username" value=""/>
            <property name="hibernate.connection.password" value=""/>
            <property name="hibernate.archive.autodetection" value="class"/>
            <property name="hibernate.show_sql" value="true"/>
            <property name="hibernate.format_sql" value="true"/>
            <property name="hbm2ddl.auto" value="update"/>
        </properties>
    </persistence-unit>
</persistence>

svr/svr-base/src/main/java/com/yihu/jw/business/wx/service/WxMenuService.java

@@ -72,7 +72,6 @@ public class WxMenuService extends BaseJpaService<WxMenuDO, WxMenuDao> {
    public void deleteWxMenu(String ids, String userId, String userName) {
        if(!StringUtils.isEmpty(ids)) {
            String[] codeArray = ids.split(",");
            Date date = new Date();
            for (String code : codeArray) {
                WxMenuDO wxMenu = wxMenuDao.findById(code);
                if (wxMenu == null) {

svr/svr-base/src/main/java/com/yihu/jw/util/HttpUtil.java

@@ -69,7 +69,7 @@ public class HttpUtil {
	 */
	public static String sendPost(String url, String param) {
		StringBuffer buffer = new StringBuffer();
		PrintWriter out = null;
		OutputStreamWriter osw = null;
		BufferedReader in = null;
		HttpURLConnection conn = null;
		try {
@@ -85,14 +85,14 @@ public class HttpUtil {
			conn.setRequestProperty("accept", "*/*");
			conn.setRequestProperty("connection", "Keep-Alive");
			conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
			OutputStreamWriter osw = new OutputStreamWriter(conn.getOutputStream(), "UTF-8");
			osw = new OutputStreamWriter(conn.getOutputStream(), "UTF-8");
			osw.write(param.toString());
			osw.flush();
			// 读取返回内容
			BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream(), "UTF-8"));
			in = new BufferedReader(new InputStreamReader(conn.getInputStream(), "UTF-8"));
			String temp;
			while ((temp = br.readLine()) != null) {
			while ((temp = in.readLine()) != null) {
				buffer.append(temp);
				buffer.append("\n");
			}
@@ -100,8 +100,8 @@ public class HttpUtil {
			logger.error("push message error:", e);
		} finally {
			try {
				if (out != null) {
					out.close();
				if (osw != null) {
					osw.close();
				}
				if (in != null) {
					in.close();

web-gateway/src/main/resources/application.yml

@@ -1,7 +1,7 @@
##如果有配置服务的话，远程服务器和本地服务器配置不一致的情况下，优先远程的为主
spring:
  application:
    name:  web-gateway  #注册到发现服务的id 如果id一样 eurika会自动做负载
    name:  web-gateway-lith  #注册到发现服务的id 如果id一样 eurika会自动做负载
  http:
    multipart:
      enabled: true