diff --git a/service-management-system/src/main/java/org/jeecg/JeecgSystemApplication.java b/service-management-system/src/main/java/org/jeecg/JeecgSystemApplication.java index 6669b64..f0c4eba 100644 --- a/service-management-system/src/main/java/org/jeecg/JeecgSystemApplication.java +++ b/service-management-system/src/main/java/org/jeecg/JeecgSystemApplication.java @@ -7,6 +7,7 @@ import org.jeecg.common.util.oConvertUtils; import org.springframework.boot.SpringApplication; //import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; diff --git a/service-management-system/src/main/java/org/jeecg/modules/ai/entity/Room.java b/service-management-system/src/main/java/org/jeecg/modules/ai/entity/Room.java index 756a6fb..b1c491d 100644 --- a/service-management-system/src/main/java/org/jeecg/modules/ai/entity/Room.java +++ b/service-management-system/src/main/java/org/jeecg/modules/ai/entity/Room.java @@ -32,7 +32,7 @@ public class Room implements Serializable { private static final long serialVersionUID = 1L; /**主键*/ - @TableId(type = IdType.ASSIGN_ID) + @TableId(type=IdType.AUTO) @ApiModelProperty(value = "主键") private java.lang.Long id; /**删除标志*/ diff --git a/service-management-system/src/main/java/org/jeecg/modules/ai/service/impl/RoomServiceImpl.java b/service-management-system/src/main/java/org/jeecg/modules/ai/service/impl/RoomServiceImpl.java index cbea5c0..0e22eb6 100644 --- a/service-management-system/src/main/java/org/jeecg/modules/ai/service/impl/RoomServiceImpl.java +++ b/service-management-system/src/main/java/org/jeecg/modules/ai/service/impl/RoomServiceImpl.java @@ -8,12 +8,7 @@ import java.util.Iterator; import java.util.Map; import javax.annotation.Resource; -import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import org.dom4j.Document; -import org.dom4j.Element; -import org.dom4j.io.SAXReader; import org.jeecg.modules.ai.entity.Room; import org.jeecg.modules.ai.mapper.RoomMapper; import org.jeecg.modules.ai.service.IRoomService; @@ -26,6 +21,7 @@ import org.jeecg.modules.system.service.ISysAnnouncementService; import org.jeecg.modules.system.util.WebServiceUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; import com.alibaba.fastjson.JSONObject; import com.baomidou.dynamic.datasource.annotation.DS; @@ -40,14 +36,14 @@ import cn.hutool.http.webservice.SoapUtil; * @Date: 2023-11-30 * @Version: V1.0 */ -@org.springframework.stereotype.Service +@Service @DS("multi-datasource1") public class RoomServiceImpl extends ServiceImpl implements IRoomService { @Resource private RoomMapper roomMapper; @Value(value = "${openmeetings_url}") - private static String OPENMEETINGS_URL; + private String OPENMEETINGS_URL; /** * 创建房间并返回房间地址 diff --git a/service-management-system/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java b/service-management-system/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java index 9267c81..74cb63e 100644 --- a/service-management-system/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java +++ b/service-management-system/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java @@ -44,7 +44,7 @@ public class SysAnnouncementServiceImpl extends ServiceImpl