zyp

fs-admin/src/main/resources/application.yml

@@ -5,10 +5,5 @@ server:
 spring:
   profiles:
     active: dev
-    include: common,config-dev
-#    active: druid-hcl
-#    include: common,config-druid-hcl
-#    active: druid-hdt
-#    include: common,config-druid-hdt
-#    active: druid-sxjz
-#    include: common,config-druid-sxjz
+    include: common,config-myhk
+

fs-company/web/WEB-INF/web.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
-         version="4.0">
-</web-app>

fs-service/src/main/java/com/fs/course/domain/FsCourseDomainName.java

@@ -22,6 +22,10 @@ public class FsCourseDomainName extends BaseEntity
     @Excel(name = "域名")
     private String domainName;
 
+    private Long companyId;
+
+    private Long companyUserId;
+
     /** 状态 0 停用  1正常 */
     @Excel(name = "状态 0 停用  1正常")
     private Long status;

fs-service/src/main/resources/application-config-druid-myhk.yml → fs-service/src/main/resources/application-config-myhk.yml

@@ -1,3 +1,5 @@
+baidu:
+  token: 1231321232
 #配置
 logging:
   level:

fs-service/src/main/resources/application-dev.yml

@@ -1,7 +1,7 @@
 # 数据源配置
 spring:
-    profiles:
-        include: config-dev,common
+#    profiles:
+#        include: config-dev,common
     # redis 配置
     redis:
         # 地址