Administrator 2 лет назад
Родитель
Сommit
c3c5f55c65
55 измененных файлов с 28 добавлено и 7 удалено
  1. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/Model/Admin.class
  2. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/Model/AdminManager.class
  3. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/Model/Admin_power.class
  4. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/Model/Booking.class
  5. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/Model/File.class
  6. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/Model/Hotel.class
  7. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/Model/HotelDict.class
  8. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/Model/House.class
  9. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/Model/weixin/Users.class
  10. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/Model/weixin/WeiXinUtil.class
  11. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/Until/Excel/toExcel.class
  12. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/Until/GetHttpParam.class
  13. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/Until/HttpUtils.class
  14. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/Until/PwdDefind.class
  15. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/Until/ResponseUtil.class
  16. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/Until/TimeExchange.class
  17. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/Until/UUIDUtil.class
  18. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/Until/weixin/JaxbUtil.class
  19. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/action/adminAction$1.class
  20. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/action/adminAction.class
  21. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/action/adminManagerAction.class
  22. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/action/autoAction.class
  23. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/action/bookAction.class
  24. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/action/configAction$1.class
  25. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/action/configAction.class
  26. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/common/wx/WxUtil.class
  27. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/constant/ResultStatusCode.class
  28. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/dao/AdminDao.class
  29. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/dao/BookDao.class
  30. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/dao/FileDao.class
  31. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/dao/HotelDao.class
  32. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/dao/HouseDao.class
  33. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/dao/UserDao.class
  34. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/dao/impl/AdminImplDao.class
  35. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/dao/impl/AdminManagerImplDao.class
  36. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/dao/impl/BookImplDao.class
  37. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/dao/impl/FileImplDao.class
  38. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/dao/impl/HotelImplDao.class
  39. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/dao/impl/HouseImplDao.class
  40. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/dao/impl/UserDaoImpl.class
  41. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/dto/IPage.class
  42. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/service/AdminManagerService.class
  43. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/service/AdminService.class
  44. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/service/BookService.class
  45. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/service/HouseService.class
  46. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/service/UserService.class
  47. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/service/impl/AdminImplService.class
  48. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/service/impl/AdminManagerImplService.class
  49. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/service/impl/BookImplService.class
  50. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/service/impl/HouseImplService.class
  51. BIN
      mhotel/WebRoot/WEB-INF/classes/com/happy/service/impl/UserServiceImpl.class
  52. 14 6
      mhotel/WebRoot/WEB-INF/classes/struts.xml
  53. BIN
      mhotel/WebRoot/WEB-INF/classes/test2.class
  54. 13 0
      mhotel/fuzhuang1.iml
  55. 1 1
      mhotel/src/com/happy/constant/ConstDefault.java

BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/Model/Admin.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/Model/AdminManager.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/Model/Admin_power.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/Model/Booking.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/Model/File.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/Model/Hotel.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/Model/HotelDict.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/Model/House.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/Model/weixin/Users.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/Model/weixin/WeiXinUtil.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/Until/Excel/toExcel.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/Until/GetHttpParam.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/Until/HttpUtils.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/Until/PwdDefind.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/Until/ResponseUtil.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/Until/TimeExchange.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/Until/UUIDUtil.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/Until/weixin/JaxbUtil.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/action/adminAction$1.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/action/adminAction.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/action/adminManagerAction.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/action/autoAction.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/action/bookAction.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/action/configAction$1.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/action/configAction.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/common/wx/WxUtil.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/constant/ResultStatusCode.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/dao/AdminDao.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/dao/BookDao.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/dao/FileDao.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/dao/HotelDao.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/dao/HouseDao.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/dao/UserDao.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/dao/impl/AdminImplDao.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/dao/impl/AdminManagerImplDao.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/dao/impl/BookImplDao.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/dao/impl/FileImplDao.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/dao/impl/HotelImplDao.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/dao/impl/HouseImplDao.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/dao/impl/UserDaoImpl.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/dto/IPage.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/service/AdminManagerService.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/service/AdminService.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/service/BookService.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/service/HouseService.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/service/UserService.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/service/impl/AdminImplService.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/service/impl/AdminManagerImplService.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/service/impl/BookImplService.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/service/impl/HouseImplService.class


BIN
mhotel/WebRoot/WEB-INF/classes/com/happy/service/impl/UserServiceImpl.class


+ 14 - 6
mhotel/WebRoot/WEB-INF/classes/struts.xml

@@ -18,27 +18,35 @@
 	<constant name="struts.multipart.maxSize" value="50000000"/>
 	<constant name="struts.multipart.maxSize" value="50000000"/>
 
 
 	<package name="happy" namespace="/" extends="struts-default">
 	<package name="happy" namespace="/" extends="struts-default">
-		<action name="data*" method = "{1}" class="com.happy.action.DataAction">
-			<result name="list">/jsp/list.jsp</result>
-		</action>
+<!--		<action name="data*" method = "{1}" class="com.happy.action.DataAction">-->
+<!--			<result name="list">/jsp/list.jsp</result>-->
+<!--		</action>-->
 		<action name="admin*" method = "{1}" class="com.happy.action.adminAction">
 		<action name="admin*" method = "{1}" class="com.happy.action.adminAction">
 		</action>
 		</action>
+		<action name="managerAdmin*" method = "{1}" class="com.happy.action.adminManagerAction">
+		</action>
 		<action name="config*" method = "{1}" class="com.happy.action.configAction">
 		<action name="config*" method = "{1}" class="com.happy.action.configAction">
 		</action>
 		</action>
+		<action name="hotel*" method = "{1}" class="com.happy.action.hotelAction">
+		</action>
 		<action name="house*" method = "{1}" class="com.happy.action.houseAction">
 		<action name="house*" method = "{1}" class="com.happy.action.houseAction">
 		</action>
 		</action>
 		<action name="book*" method = "{1}" class="com.happy.action.bookAction">
 		<action name="book*" method = "{1}" class="com.happy.action.bookAction">
 		</action>
 		</action>
-		<action name="app*" method = "{1}" class="com.happy.action.appAction">
+		<action name="app*" method = "{1}" class="com.happy.action.appAction"></action>
+		<action name="upload*" method = "{1}" class="com.happy.action.uploadAction">
+		</action>
+		<action name="idc*" method = "{1}" class="com.happy.action.IDCAction">
 		</action>
 		</action>
+
 		<action name="abk*" method = "{1}" class="com.happy.action.AppBookingAction"></action>
 		<action name="abk*" method = "{1}" class="com.happy.action.AppBookingAction"></action>
 		<action name="ahp*" method = "{1}" class="com.happy.action.AppHomePageAction"></action>
 		<action name="ahp*" method = "{1}" class="com.happy.action.AppHomePageAction"></action>
 		<action name="amp*" method = "{1}" class="com.happy.action.AppMePageAction"></action>
 		<action name="amp*" method = "{1}" class="com.happy.action.AppMePageAction"></action>
+
 	</package>
 	</package>
 	<package name="interfaces" namespace="/interfaces" extends="struts-default">
 	<package name="interfaces" namespace="/interfaces" extends="struts-default">
 		<!-- 接口总调度开始 -->
 		<!-- 接口总调度开始 -->
-		<action name="main*" method="{1}" class="com.happy.action.MainAction">
-		</action>
+<!--		<action name="main*" method="{1}" class="com.happy.action.MainAction"></action>-->
 	</package>
 	</package>
 
 
 </struts>
 </struts>

BIN
mhotel/WebRoot/WEB-INF/classes/test2.class


+ 13 - 0
mhotel/fuzhuang1.iml

@@ -1013,5 +1013,18 @@
     </orderEntry>
     </orderEntry>
     <orderEntry type="library" name="com.genuitec.runtime.library/com.genuitec.generic_5.0" level="application" />
     <orderEntry type="library" name="com.genuitec.runtime.library/com.genuitec.generic_5.0" level="application" />
     <orderEntry type="library" name="com.genuitec.runtime.library/com.genuitec.jstl_1.2" level="application" />
     <orderEntry type="library" name="com.genuitec.runtime.library/com.genuitec.jstl_1.2" level="application" />
+    <orderEntry type="module-library" exported="">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/WebRoot/WEB-INF/lib" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://$MODULE_DIR$/WebRoot/WEB-INF/lib" />
+        </SOURCES>
+        <jarDirectory url="file://$MODULE_DIR$/WebRoot/WEB-INF/lib" recursive="false" />
+        <jarDirectory url="file://$MODULE_DIR$/WebRoot/WEB-INF/lib" recursive="false" type="SOURCES" />
+      </library>
+    </orderEntry>
   </component>
   </component>
 </module>
 </module>

+ 1 - 1
mhotel/src/com/happy/constant/ConstDefault.java

@@ -6,7 +6,7 @@ import java.text.SimpleDateFormat;
 
 
 /**
 /**
  * lockcslock
  * lockcslock
- *
+ * Const123
  * @author yp
  * @author yp
  */
  */
 public final class ConstDefault {
 public final class ConstDefault {