From 3c2d21c058704aa9a7cfd96a5e02f6c46f8d64ec Mon Sep 17 00:00:00 2001 From: greenHandProgramer <1049664802@qq.com> Date: Tue, 8 Sep 2015 15:38:52 +0800 Subject: [PATCH] update again 09.08 --- .../dicomfile/dao/impl/UserDAOImp.java | 2 -- .../com/lungcare/dicomfile/entity/User.java | 8 +++++ .../dicomfile/dao/impl/UserDAOImp.class | Bin 5554 -> 5554 bytes .../com/lungcare/dicomfile/entity/User.class | Bin 3266 -> 3451 bytes src/main/webapp/WEB-INF/logs/ssh.log | 29 ++++++++++++++++++ src/main/webapp/htmls/User.html | 5 +-- 6 files changed, 40 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/lungcare/dicomfile/dao/impl/UserDAOImp.java b/src/main/java/com/lungcare/dicomfile/dao/impl/UserDAOImp.java index 4ce519b..9e9ca0d 100644 --- a/src/main/java/com/lungcare/dicomfile/dao/impl/UserDAOImp.java +++ b/src/main/java/com/lungcare/dicomfile/dao/impl/UserDAOImp.java @@ -70,8 +70,6 @@ public List getAllUsers(){ public void addUser(String user_account,String user_name,String user_password,int user_age,int user_gender,int user_role,String user_tel,String user_address){ - - User user = new User(); user.setAccount(user_account); user.setPassword(user_password); diff --git a/src/main/java/com/lungcare/dicomfile/entity/User.java b/src/main/java/com/lungcare/dicomfile/entity/User.java index d85609d..80d96a0 100644 --- a/src/main/java/com/lungcare/dicomfile/entity/User.java +++ b/src/main/java/com/lungcare/dicomfile/entity/User.java @@ -31,6 +31,8 @@ public class User { private Date lastLoginTime;//最后一次登陆时间 private int gender;//性别 0表示男 1表示女 + private String email;//用户邮箱 + @ManyToOne(cascade = { CascadeType.PERSIST }, fetch = FetchType.EAGER) private Role ro; @@ -40,6 +42,12 @@ public class User { + public String getEmail() { + return email; + } + public void setEmail(String email) { + this.email = email; + } public int getId() { return id; } diff --git a/src/main/webapp/WEB-INF/classes/com/lungcare/dicomfile/dao/impl/UserDAOImp.class b/src/main/webapp/WEB-INF/classes/com/lungcare/dicomfile/dao/impl/UserDAOImp.class index f5a36a5ddf25308c8d0402595d29666fa44b157a..916d1180f3ff7c46e089acf6a800517347d6a35c 100644 GIT binary patch delta 236 zcmWO1%_{?N9LMpOn>o;89B|l)S}8?2DB>W@7>yZeV@4)a-mFz~ zc4QrzcP8h;f|5lqmb}S-{zV^aGRtbMsJEusx>g(FHg(w2ZCjsR0}2N1844T;Oa`Xx zhl>N}LHyN`FUNjDuj<6F({i=(J5tmV=Ix5*r>6J#r8-xlu7k%-h<>ZbUC=It$oJua JhjKQS`v-)vF~$G@ delta 236 zcmWO1&np9P9LDjNn>o;89B|l)S}8?2DB_@)F)TAblG^ekQsh@DGATdCEXl!vzd&=9 zlk@KW1Am5ZpToPJPoL*`KGj4u@$no@Pl!lrGASmd!<25*dZhK6F=*DPIpZ>6=B>)g zTd*zXz@jrtt}H8A@e;Og);|BD<+@B>y@E#TT5V{zDQ-(wIPA4!z^);ChV2^(91Bba zrh;j~p$kV|9s6?PCulXNew|lp&EJutHkUdTD^D%&@oNokMBRpryHLHP&wcQI2$jp> Kk;h6lmiq^{Au==o diff --git a/src/main/webapp/WEB-INF/classes/com/lungcare/dicomfile/entity/User.class b/src/main/webapp/WEB-INF/classes/com/lungcare/dicomfile/entity/User.class index daa10286e0a4d333df25c1685392b7beebd66082..970b12ee3038c74b6f90201ecf18d5541cf17bef 100644 GIT binary patch literal 3451 zcma);ZFAd15XbkN2RDw=rcWtpDTPv6CxwWHKxxy2n#2h%Zjw5V=>sXq(#26KOF@=t z!VG*OUcd|;W_ZB|;6pL|S5lrXr_vYJ&fWg^?su!*lmGemufK_ClG=I73A$9`nfxSlknAGy)4xz>?ko_YlhZ&^QDrf2yrbGf-C?MP70bp(lupwU_v>b7jS z9k=PplJ5tR6}f@m5j0Zez#Vg2h8?#PN#B-c#hJ#&8popaWoSjxX;@xYLUf`N@wm17 zT0M5E?{2fcx3pGY7L>PaI{=fQGx077_i7Znev4P#wmO}cK?wZbFz_UdZ?$0xb||sk zJbpNF655Si&*T{d_E;@A@|NR-vV+6*MA8#9CEg6-QjGZfv9e;5HB*-*qlumMC>}$^#k4qW456e~X zigAPrhkj~MAN6A%p*-JPtgx&ASt%(OR^2sdh&L!el}-y9gk~kJ85YeNbc#iT5be$5 z)j+j`I%36_2AyU_9txgAmB2f9sJzbX9r2*RIB?ORGjtYm1Rj>3O;35C-aBIr#dRHv zy+L{L1`iFoNSBf{aOjQVn?&+vd_JyHUZrNxFej7G$8&MjN2ONmY#4Noo&9iPD$Q}y zG#vcYp!54V-s>fFO;nd2`=1*$!hVj&6j~9!>ft71RnwpgoT*``jyMGkK##iwO~}Fx zgWh7C0SJ>>5UmE?(3T6h>fqo4oZx#((0JNaJ8jQwy1rvt`?s0-xb4+~AS!#Zjq4E= zdr{MZ<@n-+b5!Gu`(m2j162<$;UUU#O=6VC=rl$rV41lfX^;#|pcpZg<9drNvL0Jh zS8P!%u|>jTi^Rqj35+dL6kB8%Yfq6!BzuLdlNdX(R#~r<)iF`j9@t^JwrNH1QjpIXVcQ&<1}@x6K$4d%;MZm3j+&9XT99ddM((H}GXR;*0O4}tjNH?L%%~vuwIE;UL1t8tIe^S( zfN(uC$bBtHNd;NZg3RebN-9VNAP+J?xRDrSp2~Qt#k!z^RJ9;qQ6&vNQmhLq$TC1y zGC;VK8RP+dtpTa3AT=$>5-saMsw&7DKpGh!$<-hLs_U9ZYS%o~f~@Mh=8+1r4v^;= zAbi(xM(SFSH5H_(1^Gq~vZjJafNW%d@a4)NkF~}6M13`zT99Y@Vtt~5ya0%o0m8RC zgM6z6Syw@PEy#CzkaZR02Y`ebApCh@kngo!W2qpK7R1(fjirLT1jtSX2!G!g#L?D> sRBPlXEl5jWBT@zV86dx8fba(vfAwiI{;0U|7yTr@@>>|cz|SN4586i#RR910 literal 3266 zcma);ZFAE`5Xbi%Cnkx25Fj*AN=qp?;XxD%O`9~WNt|HnJk)mFl&40KE{-y?l#ygg zzEfYcGi5r{7ySVJP@Vo)QXaURC@-v?yWPF}Y45)$|MTx(e-qI?+AdK+&{aF=nqJTE z*j6Y_$Hj2V^`t5N*p2thwMd2~Dhe9ev0hoGXZam-WphW`v7mzM2og0x;`@$XsphOugzTjIEQS?g?0>2mro`mtOF3gY}N^Cce zAKo}k?ZvKV@(dFDtPUI{%W*;(;pO^b=?OaNSy5aMIWO1quT}*Xr-C za038X`m&}ROP0Ua3RZmfmuxGtEeFeA(L~Or&a4Wh)oP*+j7!phc&=ly_mB^7@YtYnx|mjtQ*V^tCzChh z_hS|EDoX~9aP9g1crHJ{XZEr z#(vJn6j}_v`qAd$s22uZ;7W}k>Mf_BLB!*ZKyz`RWzYwVGl;-+7DUaU7us?GR~Q^D zuseMJ2%5~g=5^OIH(lQ`t%F<2T<>~~Ac(7;?Bd#kA}?xMteRYiaE@!7iSDQA6HxWx zay6*H62_>6(HV?Rz%uiYq~XL3kz%UAdP^*-o>-_Wu@FmQQSii~u!%(h6N?fh78OV= z&OY1j0_-KM{NXbak}lInbVbs~U>k=6U5w{7q?oV*wtwse5|C<7GPYd#Z9v%a^`G)SRAP=zJ!yFJkJucsuT97FfWJ(M2wH{F^IQ~>fQ2ZVLYAm7q=c&Zwys37xNkU5&qk`Fb4 zqp7GMivW3?1Hz5NAXQq>fGnyYPqZL4dZGhaR6&*ivYZ2wcBG*1wOvzJyQZN9S=M(= zT?JVKNIM6FuNJPziWX#51$n9kY3M;#Rgf0|d6@&kcNv2;wPJ0lN3)>?Y3s$>QbBBh zI5{AEnKHbvH-3K9ThHwT12 xCk*nlRwEm#MnWyfrd}f(Do76?uW~^6dxn3`WG8pIlYBr=;iD=s-omd#^dG`c`hoxe diff --git a/src/main/webapp/WEB-INF/logs/ssh.log b/src/main/webapp/WEB-INF/logs/ssh.log index 3efcd8d..cc3f82a 100644 --- a/src/main/webapp/WEB-INF/logs/ssh.log +++ b/src/main/webapp/WEB-INF/logs/ssh.log @@ -33940,3 +33940,32 @@ Caused by: org.hibernate.MappingException: Could not determine type for: com.lun 2015-09-08 15:06:32,832 INFO [org.springframework.orm.hibernate3.annotation.AnnotationSessionFactoryBean] - Building new Hibernate SessionFactory 2015-09-08 15:06:33,677 INFO [org.springframework.orm.hibernate3.HibernateTransactionManager] - Using DataSource [org.springframework.jdbc.datasource.DriverManagerDataSource@1800b96] of Hibernate SessionFactory for HibernateTransactionManager 2015-09-08 15:06:33,683 INFO [org.springframework.web.context.ContextLoader] - Root WebApplicationContext: initialization completed in 1642 ms +2015-09-08 15:21:44,690 INFO [org.springframework.web.context.ContextLoader] - Root WebApplicationContext: initialization started +2015-09-08 15:21:44,921 INFO [org.springframework.web.context.support.XmlWebApplicationContext] - Refreshing Root WebApplicationContext: startup date [Tue Sep 08 15:21:44 CST 2015]; root of context hierarchy +2015-09-08 15:21:45,070 INFO [org.springframework.beans.factory.xml.XmlBeanDefinitionReader] - Loading XML bean definitions from URL [file:/G:/wjlProgramFiles/local-git-repository/LungCareRestFulAPI/src/main/webapp/WEB-INF/classes/applicationContext.xml] +2015-09-08 15:21:45,551 INFO [org.springframework.context.annotation.ClassPathBeanDefinitionScanner] - JSR-250 'javax.annotation.ManagedBean' found and supported for component scanning +2015-09-08 15:21:45,555 INFO [org.springframework.context.annotation.ClassPathBeanDefinitionScanner] - JSR-330 'javax.inject.Named' annotation found and supported for component scanning +2015-09-08 15:21:45,949 INFO [org.springframework.beans.factory.xml.XmlBeanDefinitionReader] - Loading XML bean definitions from URL [file:/G:/wjlProgramFiles/local-git-repository/LungCareRestFulAPI/src/main/webapp/WEB-INF/classes/com/lungcare/dicomfile/config/spring-hibernate.xml] +2015-09-08 15:21:46,109 INFO [org.springframework.beans.factory.config.PropertyPlaceholderConfigurer] - Loading properties file from URL [file:/G:/wjlProgramFiles/local-git-repository/LungCareRestFulAPI/src/main/webapp/WEB-INF/classes/com/lungcare/dicomfile/config/jdbc.properties] +2015-09-08 15:21:46,117 INFO [org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor] - JSR-330 'javax.inject.Inject' annotation found and supported for autowiring +2015-09-08 15:21:46,132 INFO [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Pre-instantiating singletons in org.springframework.beans.factory.support.DefaultListableBeanFactory@2cd9fa: defining beans [org.springframework.context.annotation.internalConfigurationAnnotationProcessor,org.springframework.context.annotation.internalAutowiredAnnotationProcessor,org.springframework.context.annotation.internalRequiredAnnotationProcessor,org.springframework.context.annotation.internalCommonAnnotationProcessor,org.springframework.context.annotation.internalPersistenceAnnotationProcessor,customersResource,remoteFileTransferResource,usersResource,org.springframework.beans.factory.config.PropertyPlaceholderConfigurer#0,dataSource,sessionFactory,transactionManager,transactionBase,localFileService,localFileTransferDAO,remoteFileService,remoteFileTransferDAO,algorithmService,algorithmDAO,receiveEntityService,receiveEntityDAO,sendEntityService,sendEntityDAO,userEntityService,userEntityDAO,dicomFileDAO,fileDAO]; root of factory hierarchy +2015-09-08 15:21:46,275 INFO [org.springframework.jdbc.datasource.DriverManagerDataSource] - Loaded JDBC driver: com.mysql.jdbc.Driver +2015-09-08 15:21:46,779 INFO [org.springframework.orm.hibernate3.annotation.AnnotationSessionFactoryBean] - Building new Hibernate SessionFactory +2015-09-08 15:21:47,643 INFO [org.springframework.orm.hibernate3.HibernateTransactionManager] - Using DataSource [org.springframework.jdbc.datasource.DriverManagerDataSource@1b812ba] of Hibernate SessionFactory for HibernateTransactionManager +2015-09-08 15:21:47,650 INFO [org.springframework.web.context.ContextLoader] - Root WebApplicationContext: initialization completed in 2960 ms +2015-09-08 15:37:58,903 INFO [org.springframework.web.context.support.XmlWebApplicationContext] - Closing Root WebApplicationContext: startup date [Tue Sep 08 15:21:44 CST 2015]; root of context hierarchy +2015-09-08 15:37:58,904 INFO [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Destroying singletons in org.springframework.beans.factory.support.DefaultListableBeanFactory@2cd9fa: defining beans [org.springframework.context.annotation.internalConfigurationAnnotationProcessor,org.springframework.context.annotation.internalAutowiredAnnotationProcessor,org.springframework.context.annotation.internalRequiredAnnotationProcessor,org.springframework.context.annotation.internalCommonAnnotationProcessor,org.springframework.context.annotation.internalPersistenceAnnotationProcessor,customersResource,remoteFileTransferResource,usersResource,org.springframework.beans.factory.config.PropertyPlaceholderConfigurer#0,dataSource,sessionFactory,transactionManager,transactionBase,localFileService,localFileTransferDAO,remoteFileService,remoteFileTransferDAO,algorithmService,algorithmDAO,receiveEntityService,receiveEntityDAO,sendEntityService,sendEntityDAO,userEntityService,userEntityDAO,dicomFileDAO,fileDAO]; root of factory hierarchy +2015-09-08 15:37:58,908 INFO [org.springframework.orm.hibernate3.annotation.AnnotationSessionFactoryBean] - Closing Hibernate SessionFactory +2015-09-08 15:38:06,831 INFO [org.springframework.web.context.ContextLoader] - Root WebApplicationContext: initialization started +2015-09-08 15:38:06,854 INFO [org.springframework.web.context.support.XmlWebApplicationContext] - Refreshing Root WebApplicationContext: startup date [Tue Sep 08 15:38:06 CST 2015]; root of context hierarchy +2015-09-08 15:38:06,900 INFO [org.springframework.beans.factory.xml.XmlBeanDefinitionReader] - Loading XML bean definitions from URL [file:/G:/wjlProgramFiles/local-git-repository/LungCareRestFulAPI/src/main/webapp/WEB-INF/classes/applicationContext.xml] +2015-09-08 15:38:06,979 INFO [org.springframework.context.annotation.ClassPathBeanDefinitionScanner] - JSR-250 'javax.annotation.ManagedBean' found and supported for component scanning +2015-09-08 15:38:06,980 INFO [org.springframework.context.annotation.ClassPathBeanDefinitionScanner] - JSR-330 'javax.inject.Named' annotation found and supported for component scanning +2015-09-08 15:38:07,068 INFO [org.springframework.beans.factory.xml.XmlBeanDefinitionReader] - Loading XML bean definitions from URL [file:/G:/wjlProgramFiles/local-git-repository/LungCareRestFulAPI/src/main/webapp/WEB-INF/classes/com/lungcare/dicomfile/config/spring-hibernate.xml] +2015-09-08 15:38:07,249 INFO [org.springframework.beans.factory.config.PropertyPlaceholderConfigurer] - Loading properties file from URL [file:/G:/wjlProgramFiles/local-git-repository/LungCareRestFulAPI/src/main/webapp/WEB-INF/classes/com/lungcare/dicomfile/config/jdbc.properties] +2015-09-08 15:38:07,280 INFO [org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor] - JSR-330 'javax.inject.Inject' annotation found and supported for autowiring +2015-09-08 15:38:07,290 INFO [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Pre-instantiating singletons in org.springframework.beans.factory.support.DefaultListableBeanFactory@142636b: defining beans [org.springframework.context.annotation.internalConfigurationAnnotationProcessor,org.springframework.context.annotation.internalAutowiredAnnotationProcessor,org.springframework.context.annotation.internalRequiredAnnotationProcessor,org.springframework.context.annotation.internalCommonAnnotationProcessor,org.springframework.context.annotation.internalPersistenceAnnotationProcessor,customersResource,remoteFileTransferResource,usersResource,org.springframework.beans.factory.config.PropertyPlaceholderConfigurer#0,dataSource,sessionFactory,transactionManager,transactionBase,localFileService,localFileTransferDAO,remoteFileService,remoteFileTransferDAO,algorithmService,algorithmDAO,receiveEntityService,receiveEntityDAO,sendEntityService,sendEntityDAO,userEntityService,userEntityDAO,dicomFileDAO,fileDAO]; root of factory hierarchy +2015-09-08 15:38:07,473 INFO [org.springframework.jdbc.datasource.DriverManagerDataSource] - Loaded JDBC driver: com.mysql.jdbc.Driver +2015-09-08 15:38:07,869 INFO [org.springframework.orm.hibernate3.annotation.AnnotationSessionFactoryBean] - Building new Hibernate SessionFactory +2015-09-08 15:38:08,808 INFO [org.springframework.orm.hibernate3.HibernateTransactionManager] - Using DataSource [org.springframework.jdbc.datasource.DriverManagerDataSource@159fd87] of Hibernate SessionFactory for HibernateTransactionManager +2015-09-08 15:38:08,815 INFO [org.springframework.web.context.ContextLoader] - Root WebApplicationContext: initialization completed in 1982 ms diff --git a/src/main/webapp/htmls/User.html b/src/main/webapp/htmls/User.html index c41cbc6..0732653 100644 --- a/src/main/webapp/htmls/User.html +++ b/src/main/webapp/htmls/User.html @@ -136,7 +136,9 @@ $(function() { - + alert("111"); + findUsersByCurrentPage(); + alert("222"); $('a[data-toggle="tab"]').on('shown.bs.tab', function(e) { // 获取已激活的标签页的名称 var activeTab = $(e.target).text(); @@ -167,7 +169,6 @@ url : '/transfer/rest/user/getAllUsers', data : {}, dataType : 'JSON', - async:false, success : function(result) { if (result == "" || result == null) { alert("there is no data in the table receiveEntity!");